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

Merge "fixed the broken modal on the copy collections page (Bug #1465107)"

parents fac3080f a4904a85
<div class="modal fade page-modal js-page-modal" id="page-modal" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-body">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
</div>
......@@ -19,5 +19,3 @@
</div>
{/foreach}
</div>
{include file="pagemodal.tpl"}
\ No newline at end of file
......@@ -16,10 +16,18 @@
<input type="hidden" name="viewlimit" value="{$views->limit}">
<input type="hidden" name="viewoffset" value="0">
{if $views->group}<input type="hidden" name="group" value="{$views->group}">{/if}
{if $views->institution}<input type="hidden" name="institution" value="{$views->institution}">{/if}
{if $views->collection}<input type="hidden" name="searchcollection" value="{$views->collection}">{/if}
{if $views->collection}<input type="hidden" name="searchcollection" value="{$views->collection}">{/if}
{if $views->group}
<input type="hidden" name="group" value="{$views->group}">
{/if}
{if $views->institution}
<input type="hidden" name="institution" value="{$views->institution}">
{/if}
{if $views->collection}
<input type="hidden" name="searchcollection" value="{$views->collection}">
{/if}
{if $views->collection}
<input type="hidden" name="searchcollection" value="{$views->collection}">
{/if}
</form>
{if $GROUP}
......@@ -28,13 +36,13 @@
<div class="lead mtl">{$helptext|safe}</div>
<div id="copyview">
<div id="templatesearch" class="searchlist mtxl">
<div id="templatesearch_table" class="mtxl panel panel-default">
{$views->html|safe}
</div>
{$views->pagination.html|safe}
</div>
<div id="templatesearch" class="searchlist mtxl">
<div id="templatesearch_table" class="mtxl panel panel-default">
{$views->html|safe}
</div>
{$views->pagination.html|safe}
</div>
</div>
{include file="pagemodal.tpl"}
{include file="footer.tpl"}
......@@ -132,7 +132,6 @@ EOF;
$smarty = smarty(
array('js/preview.js', 'searchtable'),
array('<link rel="stylesheet" type="text/css" href="' . append_version_number(get_config('wwwroot') . 'theme/views.css') . '">'),
array(),
array('stylesheets' => array('style/views.css'))
);
......
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