diff --git a/themes/blueprint/templates/search/history.phtml b/themes/blueprint/templates/search/history.phtml index 3611bccab1e3f1d19c3da2e9680d9680f4ab6afc..c36446774a59c61505d1e80e9849e5f2bb56e3f0 100644 --- a/themes/blueprint/templates/search/history.phtml +++ b/themes/blueprint/templates/search/history.phtml @@ -23,15 +23,13 @@ <? endif; ?> </div> -<? if ($user = $this->auth()->isLoggedIn()): ?> - <div class="<?=$this->layoutClass('sidebar')?>"> - <?=$this->context($this)->renderInContext( - "myresearch/menu.phtml", - // Only activate search history in account menu if user is logged in. - $this->auth()->isLoggedIn() ? array('active' => 'history') : array() - ); - ?> - </div> -<? endif; ?> +<div class="<?=$this->layoutClass('sidebar')?>"> + <?=$this->context($this)->renderInContext( + "myresearch/menu.phtml", + // Only activate search history in account menu if user is logged in. + $this->auth()->isLoggedIn() ? array('active' => 'history') : array() + ); + ?> +</div> <div class="clear"></div> \ No newline at end of file diff --git a/themes/bootstrap/templates/search/history.phtml b/themes/bootstrap/templates/search/history.phtml index d2c3499deb1ba1a7e848ca9b22f75b5fd56d6128..65e508057f9bc170fe91e783727eeba6c6190007 100644 --- a/themes/bootstrap/templates/search/history.phtml +++ b/themes/bootstrap/templates/search/history.phtml @@ -21,13 +21,11 @@ <? endif; ?> </div> -<? if ($user = $this->auth()->isLoggedIn()): ?> - <div class="<?=$this->layoutClass('sidebar')?>"> - <?=$this->context($this)->renderInContext( - "myresearch/menu.phtml", - // Only activate search history in account menu if user is logged in. - $this->auth()->isLoggedIn() ? array('active' => 'history') : array() - ); - ?> - </div> -<? endif; ?> \ No newline at end of file +<div class="<?=$this->layoutClass('sidebar')?>"> + <?=$this->context($this)->renderInContext( + "myresearch/menu.phtml", + // Only activate search history in account menu if user is logged in. + $this->auth()->isLoggedIn() ? array('active' => 'history') : array() + ); + ?> +</div> \ No newline at end of file diff --git a/themes/bootstrap3/templates/search/history.phtml b/themes/bootstrap3/templates/search/history.phtml index 02de3570f2738c2dbd05779fa0bb59e05883943d..04874808ab5df41caf5b83551951e41a5c33342c 100644 --- a/themes/bootstrap3/templates/search/history.phtml +++ b/themes/bootstrap3/templates/search/history.phtml @@ -1,34 +1,33 @@ -<? - // Set page title. - $this->headTitle($this->translate('Search History')); - - // Set up breadcrumbs: - $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li>' - . '<li class="active">' . $this->transEsc('History') . '</li>'; -?> - -<div class="row"> - <div class="<?=$this->layoutClass('mainbody')?>"> - <? if (!empty($this->saved)): ?> - <h2><?=$this->transEsc("history_saved_searches")?></h2> - <?=$this->context()->renderInContext('search/history-table.phtml', array('showSaved' => true));?> - <? endif; ?> - - <h2><?=$this->transEsc("history_recent_searches")?></h2> - <? if (!empty($this->unsaved)): ?> - <?=$this->context()->renderInContext('search/history-table.phtml', array('showSaved' => false));?> - <? else: ?> - <?=$this->transEsc("history_no_searches")?> - <? endif; ?> - </div> - <? if ($user = $this->auth()->isLoggedIn()): ?> - <div class="<?=$this->layoutClass('sidebar')?>"> - <?=$this->context($this)->renderInContext( - "myresearch/menu.phtml", - // Only activate search history in account menu if user is logged in. - $this->auth()->isLoggedIn() ? array('active' => 'history') : array() - ); - ?> - </div> - <? endif; ?> +<? + // Set page title. + $this->headTitle($this->translate('Search History')); + + // Set up breadcrumbs: + $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li>' + . '<li class="active">' . $this->transEsc('History') . '</li>'; +?> + +<div class="row"> + <div class="<?=$this->layoutClass('mainbody')?>"> + <? if (!empty($this->saved)): ?> + <h2><?=$this->transEsc("history_saved_searches")?></h2> + <?=$this->context()->renderInContext('search/history-table.phtml', array('showSaved' => true));?> + <? endif; ?> + + <h2><?=$this->transEsc("history_recent_searches")?></h2> + <? if (!empty($this->unsaved)): ?> + <?=$this->context()->renderInContext('search/history-table.phtml', array('showSaved' => false));?> + <? else: ?> + <?=$this->transEsc("history_no_searches")?> + <? endif; ?> + </div> + + <div class="<?=$this->layoutClass('sidebar')?>"> + <?=$this->context($this)->renderInContext( + "myresearch/menu.phtml", + // Only activate search history in account menu if user is logged in. + $this->auth()->isLoggedIn() ? array('active' => 'history') : array() + ); + ?> + </div> </div> \ No newline at end of file