diff --git a/themes/bootstrap/templates/alphabrowse/home.phtml b/themes/bootstrap/templates/alphabrowse/home.phtml index 6dd5105202a7f4e311869e56a4dc3016f1d02004..bd95df61a2c5da133ff30ad91891559f001cabc4 100644 --- a/themes/bootstrap/templates/alphabrowse/home.phtml +++ b/themes/bootstrap/templates/alphabrowse/home.phtml @@ -79,38 +79,35 @@ ?> </td> <? endforeach; ?> - <? if (count($item['useInstead']) > 0): ?> - <td> - <?=$this->transEsc('Use instead') ?>: - <ul> - <? foreach ($item['useInstead'] as $heading): ?> - <li><a href="<?=$this->escapeHtmlAttr($this->url('alphabrowse-home', array(), array('query' => array('from' => $heading) + $baseQuery)))?>"><?=$this->escapeHtml($heading)?></a></li> - <? endforeach; ?> - </ul> - </td> - <? endif; ?> <? if (count($item['seeAlso']) > 0): ?> - <td> - <?=$this->transEsc('See also') ?>: - <ul> - <? foreach ($item['seeAlso'] as $heading): ?> - <li><a href="<?=$this->escapeHtmlAttr($this->url('alphabrowse-home', array(), array('query' => array('from' => $heading) + $baseQuery)))?>"><?=$this->escapeHtml($heading)?></a></li> - <? endforeach; ?> - </ul> - </td> + <?=$this->transEsc('See also') ?>: + <ul> + <? foreach ($item['seeAlso'] as $heading): ?> + <li><a href="<?=$this->escapeHtmlAttr($this->url('alphabrowse-home', array(), array('query' => array('from' => $heading) + $baseQuery)))?>"><?=$this->escapeHtml($heading)?></a></li> + <? endforeach; ?> + </ul> <? endif; ?> <? if ($item['note']): ?> - <td> - <?=$this->transEsc('Note') ?>: - <ul> - <li><?=$this->escapeHtml($item['note'])?></li> - </ul> - </td> + <?=$this->transEsc('Note') ?>: + <ul> + <li><?=$this->escapeHtml($item['note'])?></li> + </ul> + <? endif; ?> + </td> + <td> + <? if ($item['count'] > 0): ?> + <?=$item['count']; ?> + <? elseif (count($item['useInstead']) > 0): ?> + <?=$this->transEsc('Use instead') ?>: + <ul> + <? foreach ($item['useInstead'] as $heading): ?> + <li><a href="<?=$this->escapeHtmlAttr($this->url('alphabrowse-home', array(), array('query' => array('from' => $heading) + $baseQuery)))?>"><?=$this->escapeHtml($heading)?></a></li> + <? endforeach; ?> + </ul> <? endif; ?> </td> - <td><? if ($item['count'] > 0): echo $item['count']; endif; ?></td> <? endforeach; ?> </tbody> </table> diff --git a/themes/bootstrap3/templates/alphabrowse/home.phtml b/themes/bootstrap3/templates/alphabrowse/home.phtml index da21d204790940e542d7d177c4f5627a241aa8f7..07a88970d169c02b48ddfd8c1859dc80ee37cea1 100644 --- a/themes/bootstrap3/templates/alphabrowse/home.phtml +++ b/themes/bootstrap3/templates/alphabrowse/home.phtml @@ -63,39 +63,35 @@ <? else: ?> <span><?=$this->escapeHtml($item['heading'])?></span> <? endif; ?> - </td> - <? foreach ($this->extras as $extraName): ?> - <td> - <? - $extraDisplayArray = array(); - foreach ($item['extras'][$extraName] as $j => $e): - $extraDisplayArray = array_unique(array_merge($extraDisplayArray, $e)); - endforeach; - echo empty($extraDisplayArray) ? ' ' : implode('<br />', $extraDisplayArray); - ?> - </td> - <? endforeach; ?> - - <? if (count($item['seeAlso']) > 0): ?> - <td> + <? if (count($item['seeAlso']) > 0): ?> <?=$this->transEsc('See also') ?>: <ul> <? foreach ($item['seeAlso'] as $heading): ?> <li><a href="<?=$this->escapeHtmlAttr($this->url('alphabrowse-home', array(), array('query' => array('from' => $heading) + $baseQuery)))?>"><?=$this->escapeHtml($heading)?></a></li> <? endforeach; ?> </ul> - </td> - <? endif; ?> + <? endif; ?> - <? if ($item['note']): ?> - <td> + <? if ($item['note']): ?> <?=$this->transEsc('Note') ?>: <ul> <li><?=$this->escapeHtml($item['note'])?></li> </ul> + <? endif; ?> + </td> + + <? foreach ($this->extras as $extraName): ?> + <td> + <? + $extraDisplayArray = array(); + foreach ($item['extras'][$extraName] as $j => $e): + $extraDisplayArray = array_unique(array_merge($extraDisplayArray, $e)); + endforeach; + echo empty($extraDisplayArray) ? ' ' : implode('<br />', $extraDisplayArray); + ?> </td> - <? endif; ?> + <? endforeach; ?> <td class="titles"> <? if ($item['count'] > 0): ?>