From 1750e6d819d14590204104ef1d968712937c344c Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Thu, 9 Oct 2014 13:34:53 -0400
Subject: [PATCH] Proper columns in hierarchy tree.
---
.../RecordTab/collectionhierarchytree.phtml | 4 +-
.../templates/RecordTab/hierarchytree.phtml | 72 +++++++++----------
2 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/themes/bootstrap3/templates/RecordTab/collectionhierarchytree.phtml b/themes/bootstrap3/templates/RecordTab/collectionhierarchytree.phtml
index 887c8e3ae8d..a4bda17e27b 100644
--- a/themes/bootstrap3/templates/RecordTab/collectionhierarchytree.phtml
+++ b/themes/bootstrap3/templates/RecordTab/collectionhierarchytree.phtml
@@ -3,7 +3,9 @@
$this->treeContext = 'Collection';
?>
<div class="row">
- <?=$this->render('RecordTab/hierarchytree.phtml')?>
+ <div class="col-sm-6">
+ <?=$this->render('RecordTab/hierarchytree.phtml')?>
+ </div>
<div class="col-sm-6">
<div id="hierarchyRecordHolder">
<div id="hierarchyRecord">
diff --git a/themes/bootstrap3/templates/RecordTab/hierarchytree.phtml b/themes/bootstrap3/templates/RecordTab/hierarchytree.phtml
index 42cca69b4b9..c7f5787bd60 100644
--- a/themes/bootstrap3/templates/RecordTab/hierarchytree.phtml
+++ b/themes/bootstrap3/templates/RecordTab/hierarchytree.phtml
@@ -19,43 +19,41 @@
$this->inlineScript(\Zend\View\Helper\HeadScript::FILE, 'hierarchyTree.js');
echo $this->inlineScript();
?>
-<div<?=isset($this->mainTreeClass) ? ' class="' . $this->mainTreeClass . '"' : ''?>>
- <? if (count($hierarchyTreeList) > 1): ?>
- <div id="treeSelector">
- <? foreach ($hierarchyTreeList as $hierarchy => $hierarchyTitle): ?>
- <? if($activeTree == $hierarchy): ?>
- <i class="fa fa-sitemap"></i> <?=$this->escapeHtml($hierarchyTitle)?>
- <? else: ?>
- <i class="fa fa-sitemap text-muted"></i> <a href="<?=$this->recordLink()->getTabUrl($this->driver, 'HierarchyTree')?>?hierarchy=<?=urlencode($hierarchy)?>"><?=$this->escapeHtml($hierarchyTitle)?></a>
- <? endif; ?>
- <? endforeach; ?>
- </div>
- <? endif; ?>
- <? if ($activeTree): ?>
- <div id="hierarchyTreeHolder">
- <? if ($this->tab->searchActive()): ?>
- <div id="treeSearch" class="form-inline hidden">
- <input type="text" id="treeSearchText" class="form-control search-query" value="">
- <select class="form-control" id="treeSearchType" name="type">
- <option value="AllFields"><?=$this->transEsc('All Fields')?></option>
- <option value="Title"><?=$this->transEsc('Title')?></option>
- </select>
- <input type="submit" class="btn btn-default" value="<?=$this->transEsc('Search') ?>"/>
- <i id="treeSearchLoadingImg" class="fa fa-spinner fa-spin hidden"></i>
- </div>
- <div id="treeSearchNoResults" class="alert alert-danger hidden"><?=$this->translate('nohit_heading')?></div>
- <div id="treeSearchLimitReached" class="alert alert-danger hidden"><?=$this->translate('tree_search_limit_reached_html', array('%%url%%' => $this->url('search-results'), '%%limit%%' => $this->tab->getSearchLimit()))?></div>
+<? if (count($hierarchyTreeList) > 1): ?>
+ <div id="treeSelector">
+ <? foreach ($hierarchyTreeList as $hierarchy => $hierarchyTitle): ?>
+ <? if($activeTree == $hierarchy): ?>
+ <i class="fa fa-sitemap"></i> <?=$this->escapeHtml($hierarchyTitle)?>
+ <? else: ?>
+ <i class="fa fa-sitemap text-muted"></i> <a href="<?=$this->recordLink()->getTabUrl($this->driver, 'HierarchyTree')?>?hierarchy=<?=urlencode($hierarchy)?>"><?=$this->escapeHtml($hierarchyTitle)?></a>
<? endif; ?>
- <div id="hierarchyTree">
- <input type="hidden" value="<?=$this->escapeHtml($this->driver->getUniqueId())?>" class="hiddenRecordId" />
- <input type="hidden" value="<?=$this->escapeHtml($activeTree)?>" class="hiddenHierarchyId" />
- <input type="hidden" value="<?=isset($this->treeContext) ? $this->treeContext : 'Record'?>" class="hiddenContext" />
- <? if ($this->layout()->getTemplate() != 'layout/lightbox'): ?>
- <noscript>
- <?=$this->tab->renderTree($this->url('home'))?>
- </noscript>
- <? endif; ?>
+ <? endforeach; ?>
+ </div>
+<? endif; ?>
+<? if ($activeTree): ?>
+ <div id="hierarchyTreeHolder">
+ <? if ($this->tab->searchActive()): ?>
+ <div id="treeSearch" class="form-inline hidden">
+ <input type="text" id="treeSearchText" class="form-control search-query" value="">
+ <select class="form-control" id="treeSearchType" name="type">
+ <option value="AllFields"><?=$this->transEsc('All Fields')?></option>
+ <option value="Title"><?=$this->transEsc('Title')?></option>
+ </select>
+ <input type="submit" class="btn btn-default" value="<?=$this->transEsc('Search') ?>"/>
+ <i id="treeSearchLoadingImg" class="fa fa-spinner fa-spin hidden"></i>
</div>
+ <div id="treeSearchNoResults" class="alert alert-danger hidden"><?=$this->translate('nohit_heading')?></div>
+ <div id="treeSearchLimitReached" class="alert alert-danger hidden"><?=$this->translate('tree_search_limit_reached_html', array('%%url%%' => $this->url('search-results'), '%%limit%%' => $this->tab->getSearchLimit()))?></div>
+ <? endif; ?>
+ <div id="hierarchyTree">
+ <input type="hidden" value="<?=$this->escapeHtml($this->driver->getUniqueId())?>" class="hiddenRecordId" />
+ <input type="hidden" value="<?=$this->escapeHtml($activeTree)?>" class="hiddenHierarchyId" />
+ <input type="hidden" value="<?=isset($this->treeContext) ? $this->treeContext : 'Record'?>" class="hiddenContext" />
+ <? if ($this->layout()->getTemplate() != 'layout/lightbox'): ?>
+ <noscript>
+ <?=$this->tab->renderTree($this->url('home'))?>
+ </noscript>
+ <? endif; ?>
</div>
- <? endif; ?>
-</div>
+ </div>
+<? endif; ?>
--
GitLab