Commit 6f31868e authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge "Fixing regression from theme update, where pages couldn't be added to new collections"

parents 58c40a44 921e765c
...@@ -5,9 +5,6 @@ ...@@ -5,9 +5,6 @@
<div id="collectionpageswrap"> <div id="collectionpageswrap">
<div id="collectionpages"> <div id="collectionpages">
<h3>{str tag=Collection section=collection}</h3> <h3>{str tag=Collection section=collection}</h3>
{if !$views}
<div class="message">{str tag=noviews section=collection}</div>
{else}
<fieldset id="pagestoadd"> <fieldset id="pagestoadd">
<legend>{str tag=addviewstocollection section=collection}</legend> <legend>{str tag=addviewstocollection section=collection}</legend>
{if $viewsform} {if $viewsform}
...@@ -16,36 +13,39 @@ ...@@ -16,36 +13,39 @@
{str tag=noviewsavailable section=collection} {str tag=noviewsavailable section=collection}
{/if} {/if}
</fieldset> </fieldset>
<table id="collectionviews" class="fullwidth"> {if !$views}
<tbody> <div class="message">{str tag=noviews section=collection}</div>
{foreach from=$views.views item=view} {else}
<tr class="{cycle values='r0,r1'}"> <table id="collectionviews" class="fullwidth">
{if $views.count > 1} <tbody>
<td class="displayordercontrols btns2"> {foreach from=$views.views item=view}
{if $view->displayorder == $views.min} <tr class="{cycle values='r0,r1'}">
<div id="viewdisplayorder_{$view->view}" class="justdown"> {if $views.count > 1}
<a href="{$displayurl}&amp;view={$view->view}&amp;direction=down"><img src="{theme_url filename='images/btn_movedown.png'}" alt="Move Down" ></a> <td class="displayordercontrols btns2">
</div> {if $view->displayorder == $views.min}
{elseif $view->displayorder == $views.max} <div id="viewdisplayorder_{$view->view}" class="justdown">
<div id="viewdisplayorder_{$view->view}" class="justup"> <a href="{$displayurl}&amp;view={$view->view}&amp;direction=down"><img src="{theme_url filename='images/btn_movedown.png'}" alt="Move Down" ></a>
<a href="{$displayurl}&amp;view={$view->view}&amp;direction=up"><img src="{theme_url filename='images/btn_moveup.png'}" alt="Move Up" ></a> </div>
</div> {elseif $view->displayorder == $views.max}
<div id="viewdisplayorder_{$view->view}" class="justup">
<a href="{$displayurl}&amp;view={$view->view}&amp;direction=up"><img src="{theme_url filename='images/btn_moveup.png'}" alt="Move Up" ></a>
</div>
{else}
<div id="viewdisplayorder_{$view->view}">
<a href="{$displayurl}&amp;view={$view->view}&amp;direction=up"><img src="{theme_url filename='images/btn_moveup.png'}" alt="Move Up" ></a>
<a href="{$displayurl}&amp;view={$view->view}&amp;direction=down"><img src="{theme_url filename='images/btn_movedown.png'}" alt="Move Down" ></a>
</div>
{/if}
</td>
{else} {else}
<div id="viewdisplayorder_{$view->view}"> <td>&nbsp;</td>
<a href="{$displayurl}&amp;view={$view->view}&amp;direction=up"><img src="{theme_url filename='images/btn_moveup.png'}" alt="Move Up" ></a>
<a href="{$displayurl}&amp;view={$view->view}&amp;direction=down"><img src="{theme_url filename='images/btn_movedown.png'}" alt="Move Down" ></a>
</div>
{/if} {/if}
</td> <td><label><a href="{$view->fullurl}">{$view->title}</a></label></td>
{else} <td><div class="fr">{$view->remove|safe}</div></td>
<td>&nbsp;</td> </tr>
{/if} {/foreach}
<td><label><a href="{$view->fullurl}">{$view->title}</a></label></td> </tbody>
<td><div class="fr">{$view->remove|safe}</div></td> </table>
</tr>
{/foreach}
</tbody>
</table>
{/if} {/if}
<div class="cb"></div> <div class="cb"></div>
</div></div> </div></div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment