Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 20740: Update two-column templates with Bootstrap grid, Administration part 4

Browse source 
This patch modifies several administration templates to use the
Bootstrap grid instead of YUI.

This patch also removes obsolete "text/javascript" attributes from
<script> tags in the modified templates.

To test, apply the patch and view the following pages, confirming that
they look correct at various browser widths:

 - Administration -> Currencies and exchange rates
   - View and edit currencies
 - Administration -> Did you mean?
 - Administration -> EDI accounts
   - View and edit accounts
 - Administration -> Library EANs
   - View and edit EANs
 - Administration -> Item search fields
   - View and edit item search fields

Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Owen Leonard 2018-05-04 15:18:59 +00:00 committed by Nick Clemens
parent 80ff78413e
commit ac93446a89
6 changed files with 83 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
View file

@ -23,11 +23,11 @@
[% END %] [% END %]
</div> </div>
<div id="doc3" class="yui-t2"> <div class="main container-fluid">
<div class="row">
<div class="col-sm-10 col-sm-push-2">
<main>
<div id="bd">
<div id="yui-main">
<div class="yui-b">
[% IF op == 'list' %] [% IF op == 'list' %]
<div id="toolbar" class="btn-toolbar"> <div id="toolbar" class="btn-toolbar">
<a class="btn btn-default btn-sm" id="newcurrency" href="/cgi-bin/koha/admin/currency.pl?op=add_form"><i class="fa fa-plus"></i> New currency</a> <a class="btn btn-default btn-sm" id="newcurrency" href="/cgi-bin/koha/admin/currency.pl?op=add_form"><i class="fa fa-plus"></i> New currency</a>
@ -219,18 +219,21 @@
[% END %] [% END %]
</div> </main>
</div> </div> <!-- /.col-sm-10.col-sm-push-2 -->
<div class="yui-b">
[% INCLUDE 'admin-menu.inc' %] <div class="col-sm-2 col-sm-pull-10">
</div> <aside>
</div> [% INCLUDE 'admin-menu.inc' %]
</aside>
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
</div> <!-- /.row -->
[% MACRO jsinclude BLOCK %] [% MACRO jsinclude BLOCK %]
[% Asset.js("js/admin-menu.js") | $raw %] [% Asset.js("js/admin-menu.js") | $raw %]
[% INCLUDE 'datatables.inc' %] [% INCLUDE 'datatables.inc' %]
[% INCLUDE 'columns_settings.inc' %] [% INCLUDE 'columns_settings.inc' %]
<script type="text/javascript"> <script>
function check_currency(val) { function check_currency(val) {
if ( val == 1.0 ) { if ( val == 1.0 ) {

25
koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt
View file

@ -31,11 +31,11 @@
[% INCLUDE 'prefs-admin-search.inc' %] [% INCLUDE 'prefs-admin-search.inc' %]
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Did you mean?</div> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Did you mean?</div>
<div id="doc3" class="yui-t2"> <div class="main container-fluid">
<div class="row">
<div class="col-sm-10 col-sm-push-2">
<main>
<div id="bd">
<div id="yui-main">
<div class="yui-b">
<h3>Did you mean?</h3> <h3>Did you mean?</h3>
<noscript><div class="dialog alert"><strong>Please enable Javascript:</strong> <noscript><div class="dialog alert"><strong>Please enable Javascript:</strong>
Configuring 'Did you mean?' plugins requires Javascript. If Configuring 'Did you mean?' plugins requires Javascript. If
@ -62,16 +62,19 @@
<fieldset class="action"><button class="save-all submit" type="submit">Save configuration</button> <a href="/cgi-bin/koha/admin/didyoumean.pl" class="force_reload cancel">Cancel</a></fieldset> <fieldset class="action"><button class="save-all submit" type="submit">Save configuration</button> <a href="/cgi-bin/koha/admin/didyoumean.pl" class="force_reload cancel">Cancel</a></fieldset>
</form> </form>
</div> </main>
</div> </div> <!-- /.col-sm-10.col-sm-push-2 -->
<div class="yui-b">
[% INCLUDE 'admin-menu.inc' %] <div class="col-sm-2 col-sm-pull-10">
</div> <aside>
</div> [% INCLUDE 'admin-menu.inc' %]
</aside>
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
</div> <!-- /.row -->
[% MACRO jsinclude BLOCK %] [% MACRO jsinclude BLOCK %]
[% Asset.js("js/admin-menu.js") | $raw %] [% Asset.js("js/admin-menu.js") | $raw %]
<script type="text/javascript"> <script>
$(document).ready(function() { $(document).ready(function() {
$( ".pluginlist" ).sortable(); $( ".pluginlist" ).sortable();
$( ".plugin" ).addClass( "ui-widget ui-widget-content ui-helper-clearfix ui-corner-all" ) $( ".plugin" ).addClass( "ui-widget ui-widget-content ui-helper-clearfix ui-corner-all" )

23
koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
View file

@ -36,11 +36,11 @@
[% END %] [% END %]
</div> </div>
<div id="doc3" class="yui-t2"> <div class="main container-fluid">
<div class="row">
<div class="col-sm-10 col-sm-push-2">
<main>
<div id="bd">
<div id="yui-main">
<div class="yui-b">
[% IF display %] [% IF display %]
<div id="toolbar" class="btn-toolbar"> <div id="toolbar" class="btn-toolbar">
<a class="btn btn-default btn-sm" id="newediacct" href="/cgi-bin/koha/admin/edi_accounts.pl?op=acct_form"> <a class="btn btn-default btn-sm" id="newediacct" href="/cgi-bin/koha/admin/edi_accounts.pl?op=acct_form">
@ -319,12 +319,15 @@
[% END %] [% END %]
[% END %] [% END %]
</div> </main>
</div> </div> <!-- /.col-sm-10.col-sm-push-2 -->
<div class="yui-b">
[% INCLUDE 'admin-menu.inc' %] <div class="col-sm-2 col-sm-pull-10">
</div> <aside>
</div> [% INCLUDE 'admin-menu.inc' %]
</aside>
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
</div> <!-- /.row -->
[% MACRO jsinclude BLOCK %] [% MACRO jsinclude BLOCK %]
[% Asset.js("js/admin-menu.js") | $raw %] [% Asset.js("js/admin-menu.js") | $raw %]

23
koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
View file

@ -36,11 +36,11 @@
[% END %] [% END %]
</div> </div>
<div id="doc3" class="yui-t2"> <div class="main container-fluid">
<div class="row">
<div class="col-sm-10 col-sm-push-2">
<main>
<div id="bd">
<div id="yui-main">
<div class="yui-b">
[% IF display %] [% IF display %]
<div id="toolbar" class="btn-toolbar"> <div id="toolbar" class="btn-toolbar">
<a class="btn btn-default btn-sm" id="newediean" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form"> <a class="btn btn-default btn-sm" id="newediean" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form">
@ -165,12 +165,15 @@
[% END %] [% END %]
[% END %] [% END %]
</div> </main>
</div> </div> <!-- /.col-sm-10.col-sm-push-2 -->
<div class="yui-b">
[% INCLUDE 'admin-menu.inc' %] <div class="col-sm-2 col-sm-pull-10">
</div> <aside>
</div> [% INCLUDE 'admin-menu.inc' %]
</aside>
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
</div> <!-- /.row -->
[% MACRO jsinclude BLOCK %] [% MACRO jsinclude BLOCK %]
[% Asset.js("js/admin-menu.js") | $raw %] [% Asset.js("js/admin-menu.js") | $raw %]

25
koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
View file

@ -16,10 +16,11 @@
[% field.name | html %] [% field.name | html %]
</div> </div>
<div id="doc3" class="yui-t2"> <div class="main container-fluid">
<div id="bd"> <div class="row">
<div id="yui-main"> <div class="col-sm-10 col-sm-push-2">
<div class="yui-b"> <main>
<h1>Item search field: [% field.label | html %]</h1> <h1>Item search field: [% field.label | html %]</h1>
<form action="/cgi-bin/koha/admin/items_search_field.pl" method="POST" class="validated"> <form action="/cgi-bin/koha/admin/items_search_field.pl" method="POST" class="validated">
@ -35,12 +36,16 @@
<a class="cancel" href="/cgi-bin/koha/admin/items_search_fields.pl">Cancel</a> <a class="cancel" href="/cgi-bin/koha/admin/items_search_fields.pl">Cancel</a>
</fieldset> </fieldset>
</form> </form>
</div>
</div> </main>
<div class="yui-b"> </div> <!-- /.col-sm-10.col-sm-push-2 -->
[% INCLUDE 'admin-menu.inc' %]
</div> <div class="col-sm-2 col-sm-pull-10">
</div> <aside>
[% INCLUDE 'admin-menu.inc' %]
</aside>
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
</div> <!-- /.row -->
[% MACRO jsinclude BLOCK %] [% MACRO jsinclude BLOCK %]
[% Asset.js("js/admin-menu.js") | $raw %] [% Asset.js("js/admin-menu.js") | $raw %]

25
koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
View file

@ -16,10 +16,10 @@
Item search fields Item search fields
</div> </div>
<div id="doc3" class="yui-t2"> <div class="main container-fluid">
<div id="bd"> <div class="row">
<div id="yui-main"> <div class="col-sm-10 col-sm-push-2">
<div class="yui-b"> <main>
<div id="toolbar" class="btn-toolbar"> <div id="toolbar" class="btn-toolbar">
<a class="btn btn-default btn-sm" id="new_search_field" href="/cgi-bin/koha/admin/items_search_fields.pl"><i class="fa fa-plus"></i> New search field</a> <a class="btn btn-default btn-sm" id="new_search_field" href="/cgi-bin/koha/admin/items_search_fields.pl"><i class="fa fa-plus"></i> New search field</a>
@ -103,16 +103,19 @@
</fieldset> </fieldset>
</form> </form>
</div> </main>
</div> </div> <!-- /.col-sm-10.col-sm-push-2 -->
<div class="yui-b">
[% INCLUDE 'admin-menu.inc' %] <div class="col-sm-2 col-sm-pull-10">
</div> <aside>
</div> [% INCLUDE 'admin-menu.inc' %]
</aside>
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
</div> <!-- /.row -->
[% MACRO jsinclude BLOCK %] [% MACRO jsinclude BLOCK %]
[% Asset.js("js/admin-menu.js") | $raw %] [% Asset.js("js/admin-menu.js") | $raw %]
<script type="text/javascript"> <script>
var MSG_ITEM_SEARCH_DELETE_CONFIRM = _("Are you sure you want to delete this field?"); var MSG_ITEM_SEARCH_DELETE_CONFIRM = _("Are you sure you want to delete this field?");
</script> </script>
[% Asset.js("js/item_search_fields.js") | $raw %] [% Asset.js("js/item_search_fields.js") | $raw %]