Bugzilla – Attachment 78198 Details for
Bug 20743
Update two-column templates with Bootstrap grid: Administration part 7
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20743: Update two-column templates with Bootstrap grid: Administration part 7
Bug-20743-Update-two-column-templates-with-Bootstr.patch (text/plain), 37.93 KB, created by
Katrin Fischer
on 2018-08-27 20:04:42 UTC
(
hide
)
Description:
Bug 20743: Update two-column templates with Bootstrap grid: Administration part 7
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2018-08-27 20:04:42 UTC
Size:
37.93 KB
patch
obsolete
>From 3b229d5368bc1b65a411f5b334c227eb04821c6f Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Wed, 2 May 2018 13:12:33 +0000 >Subject: [PATCH] Bug 20743: Update two-column templates with Bootstrap grid: > Administration part 7 > >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 and "text/css" attributes from <style> tags in the >modified templates. > >To test, apply the patch and view the following pages, confirming that >they look correct at various browser widths: > > - Navigate directly to /cgi-bin/koha/admin/printers.pl > - View and edit printers > - Administration -> Search engine configuration (or navigate directly > to /cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl > - Administration -> Circulation and fines rules > - Administration -> SMS cellular providers (enable SMSSendDriver or > navigate directly to /cgi-bin/koha/admin/sms_providers.pl) > - Administration -> Z39.50/SRU servers -> New SRU server -> Modify SRU > search fields mapping > - Administration -> System preferences -> Local use > - View and edit local use preferences > - Administration -> Transport cost matrix > - With UsageStats enabled, go to Administration -> Share your usage > statistics. > >Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../prog/en/modules/admin/printers.tt | 27 +- > .../admin/searchengine/elasticsearch/mappings.tt | 29 +- > .../prog/en/modules/admin/smart-rules.tt | 24 +- > .../prog/en/modules/admin/sms_providers.tt | 26 +- > .../prog/en/modules/admin/sru_modmapping.tt | 10 +- > .../prog/en/modules/admin/systempreferences.tt | 28 +- > .../prog/en/modules/admin/transport-cost-matrix.tt | 28 +- > .../prog/en/modules/admin/usage_statistics.tt | 357 +++++++++++---------- > 8 files changed, 284 insertions(+), 245 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt >index 5aa3e9b..c38b67f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt >@@ -11,7 +11,7 @@ > [% IF ( loop ) %] > [% Asset.css("css/datatables.css") | $raw %] > [% INCLUDE 'datatables.inc' %] >-<script type="text/javascript"> >+<script> > //<![CDATA[ > $(document).ready(function() { > $("#printerst").dataTable($.extend(true, {}, dataTablesDefaults, { >@@ -36,11 +36,10 @@ > [% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> › Printer deleted[% END %] > [% IF ( else ) %]Printers[% END %]</div> > >-<div id="doc3" class="yui-t2"> >- >- <div id="bd"> >- <div id="yui-main"> >- <div class="yui-b"> >+<div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-sm-10 col-sm-push-2"> >+ <main> > > [% IF ( add_form ) %] > >@@ -162,10 +161,14 @@ > </table>[% ELSE %]<div class="dialog message">No printers defined.</div>[% END %] > [% END %] > >-</div> >-</div> >-<div class="yui-b"> >-[% INCLUDE 'admin-menu.inc' %] >-</div> >-</div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'admin-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> >+ > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >index c049b01..8f406f5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >@@ -4,7 +4,7 @@ > <title>Koha › Administration › Search engine configuration</title> > [% INCLUDE 'doc-head-close.inc' %] > [% Asset.js("lib/jquery/plugins/jquery.tablednd.js") | $raw %] >-<script type="text/javascript"> >+<script> > function clean_line( line ) { > $(line).find('input[type="text"]').val(""); > $(line).find('select').find('option:first').attr("selected", "selected"); >@@ -54,7 +54,7 @@ > }); > }); > </script> >-<style type="text/css"> >+<style> > a.add, a.delete { > cursor: pointer; > } >@@ -66,11 +66,10 @@ a.add, a.delete { > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › Search engine configuration</div> > >-<div id="doc3" class="yui-t1"> >- >- <div id="bd"> >- <div id="yui-main"> >- <div class="yui-b"> >+<div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-sm-10 col-sm-push-2"> >+ <main> > > [% FOR m IN messages %] > <div class="dialog [% m.type | html %]"> >@@ -317,11 +316,15 @@ a.add, a.delete { > <button class="btn btn-default" type="submit" name="op" value="reset_confirm"><i class="fa fa-refresh" aria-hidden="true"></i> Reset Mappings</button> > </p> > </form> >-</div> > >-</div> >-<div class="yui-b"> >-[% INCLUDE 'admin-menu.inc' %] >-</div> >-</div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'admin-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> >+ > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >index 058e70a..5bc7e00 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >@@ -13,11 +13,11 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › Circulation and fine rules</div> > >-<div id="doc3" class="yui-t1"> >+<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"> > <h1 class="parameters"> > [% IF humanbranch %] > Defining circulation and fine rules for "[% Branches.GetName( humanbranch ) | html %]" >@@ -736,18 +736,20 @@ > </table> > </form> > </div> >-</div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> > >-</div> >-<div class="yui-b"> >-[% INCLUDE 'admin-menu.inc' %] >-</div> >-</div> >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'admin-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] > [% INCLUDE 'calendar.inc' %] >- <script type="text/javascript"> >+ <script> > > function clear_edit(){ > var cancel = confirm(_("Are you sure you want to cancel your changes?")); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >index 58c3a25..ccd6dd4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >@@ -12,10 +12,10 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › SMS cellular providers</div> > >-<div id="doc3" class="yui-t2"> >- <div id="bd"> >- <div id="yui-main"> >- <div class="yui-b"> >+<div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-sm-10 col-sm-push-2"> >+ <main> > > <div id="toolbar" class="btn-toolbar"> > <a class="btn btn-default btn-sm" id="new_provider" href="#"><i class="fa fa-plus"></i> New SMS provider</a> >@@ -89,17 +89,19 @@ > </form> > </div> > >- </div> >- </div> >- <div class="yui-b"> >- [% INCLUDE 'admin-menu.inc' %] >- </div> >- </div> >-</div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'admin-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >- <script type="text/javascript"> >+ <script> > var MSG_SMS_PATRONS_USING = _("Are you sure you want to delete %s? %s patron(s) are using it!"); > var MSG_SMS_DELETE_CONFIRM = _("Are you sure you want to delete %s?"); > var LABEL_SMS_ADD_PROVIDER = _("Add an SMS cellular provider"); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt >index 5fe0261..bdbf4ef 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt >@@ -8,10 +8,11 @@ > > <body id="admin_sru_modmapping" class="admin"> > >-<div id="custom-doc" class="yui-t7"> >+<div class="main container-fluid"> > >- <div id="bd"> >+ <main> > <h1>Modify SRU search fields mapping for bibliographic records</h1> >+ > <form id="form01" method="post"> > <fieldset class="rows"> > <div class="yui-g"> >@@ -70,11 +71,12 @@ > <a class="close cancel" href="#">Cancel</a> > </fieldset> > </form> >- </div> >+ </main> >+ > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function() { > $("#form01").submit(function(event) { > if(window.opener) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >index 7cd8e8d..d1c7dd7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >@@ -16,11 +16,10 @@ > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › [% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a> › [% IF ( modify ) %]Modify system preference '[% searchfield | html %]'[% ELSE %]Add a system preference[% END %][% END %][% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a> › Data added[% END %] > [% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a> › <a href="/cgi-bin/koha/admin/systempreferences.pl?op=add_form&searchfield=[% searchfield | html %]">[% searchfield | html %]</a> › Confirm deletion of parameter '[% searchfield | html %]'[% END %][% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a> › Parameter deleted[% END %][% IF ( else ) %]System preferences[% END %]</div> > >-<div id="doc3" class="yui-t2"> >- >- <div id="bd"> >- <div id="yui-main"> >- <div class="yui-b"> >+<div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-sm-10 col-sm-push-2"> >+ <main> > > [% IF ( add_form ) %] > [% IF ( type_upload ) %] >@@ -372,19 +371,22 @@ > > [% END %] > >-</div> >-</div> >-<div class="yui-b"> >-[% INCLUDE 'prefs-menu.inc' %] >-</div> >-</div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'admin-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [%# Add WYSIWYG editor for htmlarea system preferences %] > [% INCLUDE 'wysiwyg-systempreferences.inc' %] > [% IF ( else ) %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function() { > [% IF ( loop ) %]$("#sysprefst").dataTable($.extend(true, {}, dataTablesDefaults, { > "sDom": '<"top pager"ilf>t', >@@ -396,7 +398,7 @@ > }); > </script> > [% END %] >- <script type="text/javascript"> >+ <script> > [% IF ( add_form ) %] > $(document).ready(function() { > $('.variabletype').css({ color: "#0000CC", cursor: "pointer" }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt >index fd06e16..831fa08 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt >@@ -5,7 +5,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Transport cost matrix</title> > [% INCLUDE 'doc-head-close.inc' %] >-<style type="text/css"> >+<style> > .disabled-transfer { > background-color: #FF8888; > } >@@ -18,11 +18,11 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › Transport cost matrix</div> > >-<div id="doc3" class="yui-t1"> >+<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"> > <h1 class="parameters"> > Defining transport costs between libraries > </h1> >@@ -85,16 +85,20 @@ > <input type="submit" value="Save" class="submit" /> <a href="/cgi-bin/koha/admin/transport-cost-matrix.pl" class="cancel">Cancel</a> > </fieldset> > </form> >- </div> >- </div> >-<div class="yui-b"> >-[% INCLUDE 'admin-menu.inc' %] >-</div> >-</div> >+ >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'admin-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >- <script type="text/javascript"> >+ <script> > function check_transport_cost(e) { > var val = e.value; > if (val && val != '' && !isNaN(parseFloat(val)) && val >= 0.0) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt >index 4868c9a..1749928 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt >@@ -16,10 +16,10 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › Usage statistics</div> > >-<div id="doc3" class="yui-t2"> >- <div id="bd"> >- <div id="yui-main"> >- <div class="yui-b"> >+<div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-sm-10 col-sm-push-2"> >+ <main> > > [% FOR m IN messages %] > <div class="dialog [% m.type | html %]"> >@@ -50,170 +50,187 @@ > > <form id="category_form" action="/cgi-bin/koha/admin/usage_statistics.pl" method="post"> > <h1>Modify the statistics you share with the Koha community</h1> >- <fieldset class="rows"> >- <ol style="float:left;"> >- <li> >- <label for="UsageStats">Share my Koha usage statistics: </label> >- <select name="UsageStats" id="UsageStats"> >- [% IF Koha.Preference('UsageStats') %] >- <option value="1" selected="selected">Yes</option> >- <option value="0">No</option> >- [% ELSE %] >- <option value="1">Yes</option> >- <option value="0" selected="selected">No</option> >- [% END %] >- </select> >- </li> >- <li> >- <label for="UsageStatsCountry">Your country: </label> >- [% SET UsageStatsCountry = Koha.Preference('UsageStatsCountry') %] >- [% SET IsUsageStatsCountryValid = 0 %] >- [% IF NOT UsageStatsCountry %] >- [% SET IsUsageStatsCountryValid = 1 %] >- [% END %] >- [% PROCESS 'country-list.inc' %] >- <select name="UsageStatsCountry" id="UsageStatsCountry"> >- <option value=""> </option> >- [% FOR country IN countries %] >- [% IF country == UsageStatsCountry %] >- <option value="[% country | html %]" selected="selected">[% country | html %]</option> >- [% SET IsUsageStatsCountryValid = 1 %] >+ <div class="row"> >+ <div class="col-xs-12 col-sm-6"> >+ <fieldset class="rows"> >+ <ol> >+ <li> >+ <label for="UsageStats">Share my Koha usage statistics: </label> >+ <select name="UsageStats" id="UsageStats"> >+ [% IF Koha.Preference('UsageStats') %] >+ <option value="1" selected="selected">Yes</option> >+ <option value="0">No</option> > [% ELSE %] >- <option value="[% country | html %]">[% country | html %]</option> >+ <option value="1">Yes</option> >+ <option value="0" selected="selected">No</option> > [% END %] >- [% END %] >- </select> >- [% UNLESS IsUsageStatsCountryValid %] >- Note: The value of your system preference 'UsageStatsCountry' is not valid ([% UsageStatsCountry | html %]). >- Please select a valid one. >- [% END %] >- </li> >- <li> >- <label for="UsageStatsLibraryName">Library name: </label> >- <input type="text" value="[% Koha.Preference('UsageStatsLibraryName') | html %]" name="UsageStatsLibraryName" id="UsageStatsLibraryName" /> >- </li> >- <li> >- <label for="UsageStatsLibraryType">Library type: </label> >- [% SET UsageStatsLibraryType = Koha.Preference('UsageStatsLibraryType') %] >- <select name="UsageStatsLibraryType" id="UsageStatsLibraryType"> >- <option value=""> </option> >- [% IF UsageStatsLibraryType == 'public' %] >- <option value="public" selected="selected">Public</option> >- [% ELSE %] >- <option value="public">Public</option> >- [% END %] >+ </select> >+ </li> >+ <li> >+ <label for="UsageStatsCountry">Your country: </label> >+ [% SET UsageStatsCountry = Koha.Preference('UsageStatsCountry') %] >+ [% SET IsUsageStatsCountryValid = 0 %] >+ [% IF NOT UsageStatsCountry %] >+ [% SET IsUsageStatsCountryValid = 1 %] >+ [% END %] >+ [% PROCESS 'country-list.inc' %] >+ <select name="UsageStatsCountry" id="UsageStatsCountry"> >+ <option value=""> </option> >+ [% FOR country IN countries %] >+ [% IF country == UsageStatsCountry %] >+ <option value="[% country | html %]" selected="selected">[% country | html %]</option> >+ [% SET IsUsageStatsCountryValid = 1 %] >+ [% ELSE %] >+ <option value="[% country | html %]">[% country | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ [% UNLESS IsUsageStatsCountryValid %] >+ Note: The value of your system preference 'UsageStatsCountry' is not valid ([% UsageStatsCountry | html %]). >+ Please select a valid one. >+ [% END %] >+ </li> >+ <li> >+ <label for="UsageStatsLibraryName">Library name: </label> >+ <input type="text" value="[% Koha.Preference('UsageStatsLibraryName') | html %]" name="UsageStatsLibraryName" id="UsageStatsLibraryName" /> >+ </li> >+ <li> >+ <label for="UsageStatsLibraryType">Library type: </label> >+ [% SET UsageStatsLibraryType = Koha.Preference('UsageStatsLibraryType') %] >+ <select name="UsageStatsLibraryType" id="UsageStatsLibraryType"> >+ <option value=""> </option> >+ [% IF UsageStatsLibraryType == 'public' %] >+ <option value="public" selected="selected">Public</option> >+ [% ELSE %] >+ <option value="public">Public</option> >+ [% END %] > >- [% IF UsageStatsLibraryType == 'school' %] >- <option value="school" selected="selected">School</option> >- [% ELSE %] >- <option value="school">School</option> >- [% END %] >- [% IF UsageStatsLibraryType == 'academic' %] >- <option value="academic" selected="selected">Academic</option> >- [% ELSE %] >- <option value="academic">Academic</option> >- [% END %] >- [% IF UsageStatsLibraryType == 'research' %] >- <option value="research" selected="selected">Research</option> >- [% ELSE %] >- <option value="research">Research</option> >- [% END %] >- [% IF UsageStatsLibraryType == 'private' %] >- <option value="private" selected="selected">Private</option> >- [% ELSE %] >- <option value="private">Private</option> >- [% END %] >- [% IF UsageStatsLibraryType == 'societyAssociation' %] >- <option value="societyAssociation" selected="selected">Society or association</option> >- [% ELSE %] >- <option value="societyAssociation">Society or association</option> >- [% END %] >- [% IF UsageStatsLibraryType == 'corporate' %] >- <option value="corporate" selected="selected">Corporate</option> >- [% ELSE %] >- <option value="corporate">Corporate</option> >- [% END %] >- [% IF UsageStatsLibraryType == 'government' %] >- <option value="government" selected="selected">Government</option> >- [% ELSE %] >- <option value="government">Government</option> >- [% END %] >- [% IF UsageStatsLibraryType == 'religiousOrg' %] >- <option value="religiousOrg" selected="selected">Religious organization</option> >- [% ELSE %] >- <option value="religiousOrg">Religious organization</option> >- [% END %] >- [% IF UsageStatsLibraryType == 'subscription' %] >- <option value="subscription" selected="selected">Subscription</option> >- [% ELSE %] >- <option value="subscription">Subscription</option> >- [% END %] >- </select> >- </li> >- <li> >- <label for="UsageStatsLibraryUrl">Library URL: </label> >- <input type="text" name="UsageStatsLibraryUrl" value="[% Koha.Preference('UsageStatsLibraryUrl') | html %]" id="UsageStatsLibraryUrl" /> >- </li> >- <li> >- <span class="label">Last update: </span> >- [% IF UsageStatsLastUpdateTime %] >- [% UsageStatsLastUpdateTime | html %] >- [% ELSE %] >- Your data have never been shared >- [% END %] >- </li> >- <li> >- <label for="UsageStatsGeolocation">Geolocation: </label> >- <input id="UsageStatsGeolocation" name="UsageStatsGeolocation" value="[% Koha.Preference('UsageStatsGeolocation') | html %]" type="text" value="[% Koha.Preference('UsageStatsLibrariesInfo') | html %]" size="35" readonly="readonly" /> >- <a href="#" class="change_geolocation" data-branchname="" data-id="UsageStatsGeolocation"><img src="[% interface | html %]/lib/leaflet/images/marker-icon.png" title="Set geolocation" style="max-height: 2em;" /></a> >- </li> >- <li> >- <label for="UsageStatsLibrariesInfo">Libraries informations: </label> >- <select name="UsageStatsLibrariesInfo" id="UsageStatsLibrariesInfo"> >- [% IF Koha.Preference('UsageStatsLibrariesInfo') %] >- <option value="1" selected="selected">Yes</option> >- <option value="0">No</option> >- [% ELSE %] >- <option value="1">Yes</option> >- <option value="0" selected="selected">No</option> >- [% END %] >- </select> >- </li> >+ [% IF UsageStatsLibraryType == 'school' %] >+ <option value="school" selected="selected">School</option> >+ [% ELSE %] >+ <option value="school">School</option> >+ [% END %] >+ [% IF UsageStatsLibraryType == 'academic' %] >+ <option value="academic" selected="selected">Academic</option> >+ [% ELSE %] >+ <option value="academic">Academic</option> >+ [% END %] >+ [% IF UsageStatsLibraryType == 'research' %] >+ <option value="research" selected="selected">Research</option> >+ [% ELSE %] >+ <option value="research">Research</option> >+ [% END %] >+ [% IF UsageStatsLibraryType == 'private' %] >+ <option value="private" selected="selected">Private</option> >+ [% ELSE %] >+ <option value="private">Private</option> >+ [% END %] >+ [% IF UsageStatsLibraryType == 'societyAssociation' %] >+ <option value="societyAssociation" selected="selected">Society or association</option> >+ [% ELSE %] >+ <option value="societyAssociation">Society or association</option> >+ [% END %] >+ [% IF UsageStatsLibraryType == 'corporate' %] >+ <option value="corporate" selected="selected">Corporate</option> >+ [% ELSE %] >+ <option value="corporate">Corporate</option> >+ [% END %] >+ [% IF UsageStatsLibraryType == 'government' %] >+ <option value="government" selected="selected">Government</option> >+ [% ELSE %] >+ <option value="government">Government</option> >+ [% END %] >+ [% IF UsageStatsLibraryType == 'religiousOrg' %] >+ <option value="religiousOrg" selected="selected">Religious organization</option> >+ [% ELSE %] >+ <option value="religiousOrg">Religious organization</option> >+ [% END %] >+ [% IF UsageStatsLibraryType == 'subscription' %] >+ <option value="subscription" selected="selected">Subscription</option> >+ [% ELSE %] >+ <option value="subscription">Subscription</option> >+ [% END %] >+ </select> >+ </li> >+ <li> >+ <label for="UsageStatsLibraryUrl">Library URL: </label> >+ <input type="text" name="UsageStatsLibraryUrl" value="[% Koha.Preference('UsageStatsLibraryUrl') | html %]" id="UsageStatsLibraryUrl" /> >+ </li> >+ <li> >+ <span class="label">Last update: </span> >+ [% IF UsageStatsLastUpdateTime %] >+ [% UsageStatsLastUpdateTime | html %] >+ [% ELSE %] >+ Your data have never been shared >+ [% END %] >+ </li> >+ <li> >+ <label for="UsageStatsGeolocation">Geolocation: </label> >+ <input id="UsageStatsGeolocation" name="UsageStatsGeolocation" value="[% Koha.Preference('UsageStatsGeolocation') | html %]" type="text" value="[% Koha.Preference('UsageStatsLibrariesInfo') | html %]" size="35" readonly="readonly" /> >+ <a href="#" class="change_geolocation" data-branchname="" data-id="UsageStatsGeolocation"><img src="[% interface | html %]/lib/leaflet/images/marker-icon.png" title="Set geolocation" style="max-height: 2em;" /></a> >+ </li> >+ <li> >+ <label for="UsageStatsLibrariesInfo">Libraries informations: </label> >+ <select name="UsageStatsLibrariesInfo" id="UsageStatsLibrariesInfo"> >+ [% IF Koha.Preference('UsageStatsLibrariesInfo') %] >+ <option value="1" selected="selected">Yes</option> >+ <option value="0">No</option> >+ [% ELSE %] >+ <option value="1">Yes</option> >+ <option value="0" selected="selected">No</option> >+ [% END %] >+ </select> >+ </li> > >- <li id="libraries_info"> >- <fieldset class="rows"> >- <legend>Libraries</legend> >- <ol> >- [% FOR l IN libraries %] >+ <li id="libraries_info"> >+ <fieldset class="rows"> >+ <legend>Libraries</legend> >+ <ol> >+ [% FOR l IN libraries %] >+ <li> >+ <label for="[% l.branchcode | html %]">[% l.branchname | html %]: </label> >+ <div style="float:left;"> >+ <div>Country: [% l.branchcountry | html %]</div> >+ <div>Url: [% l.branchurl | html %]</div> >+ <div> >+ Geolocation: <input type="text" id="geolocation_[% l.branchcode | html %]" name="geolocation_[% l.branchcode | html %]" value="[% l.geolocation | html %]" size="35" readonly="readonly" /> >+ <a href="#" class="change_geolocation" data-branchname="[% l.branchname | html %]" data-id="geolocation_[% l.branchcode | html %]"><img src="[% interface | html %]/lib/leaflet/images/marker-icon.png" title="Set geolocation for [% l.branchname | html %]" style="max-height: 2em;" /></a> >+ </div> >+ </div> >+ </li> >+ [% END %] >+ </ol> >+ </fieldset> >+ </li> > <li> >- <label for="[% l.branchcode | html %]">[% l.branchname | html %]: </label> >- <div style="float:left;"> >- <div>Country: [% l.branchcountry | html %]</div> >- <div>Url: [% l.branchurl | html %]</div> >- <div> >- Geolocation: <input type="text" id="geolocation_[% l.branchcode | html %]" name="geolocation_[% l.branchcode | html %]" value="[% l.geolocation | html %]" size="35" readonly="readonly" /> >- <a href="#" class="change_geolocation" data-branchname="[% l.branchname | html %]" data-id="geolocation_[% l.branchcode | html %]"><img src="[% interface | html %]/lib/leaflet/images/marker-icon.png" title="Set geolocation for [% l.branchname | html %]" style="max-height: 2em;" /></a> >- </div> >- </div> >+ <label for="MyPublicLink">See your public page: </label> >+ [% IF Koha.Preference('UsageStatsPublicID') %] >+ [% SET my_url = 'https://hea.koha-community.org/libraries/' _ Koha.Preference('UsageStatsPublicID') %] >+ <a href="[% my_url | html %]">[% my_url | html %]</a> >+ [% ELSE %] >+ You do not have anything public yet. >+ [% END %] >+ </li> >+ <li> >+ <label for="MyPublicLink">See your public page: </label> >+ [% IF Koha.Preference('UsageStatsPublicID') %] >+ [% SET my_url = 'https://hea.koha-community.org/libraries/' _ Koha.Preference('UsageStatsPublicID') %] >+ <a href="[% my_url | html %]">[% my_url | html %]</a> >+ [% ELSE %] >+ You do not have anything public yet. >+ [% END %] > </li> >- [% END %] >+ > </ol> >- </fieldset> >- </li> >- <li> >- <label for="MyPublicLink">See your public page: </label> >- [% IF Koha.Preference('UsageStatsPublicID') %] >- [% SET my_url = 'https://hea.koha-community.org/libraries/' _ Koha.Preference('UsageStatsPublicID') %] >- <a href="[% my_url | html %]">[% my_url | html %]</a> >- [% ELSE %] >- You do not have anything public yet. >- [% END %] >- </li> >+ </fieldset> >+ </div> >+ <div class="col-xs-12 col-sm-6"> >+ <div> >+ <div id="mapid" style="width:100%;height: 400px;"></div> >+ </div> >+ </div> > >- </ol> >- <div style="clear:right"></div> >- <div id="mapid" style="width: 600px; height: 400px; margin-left: 40%:"></div> >- </fieldset> >+ </div> > > <fieldset class="action"> > <input type="hidden" name="op" value="update" /> >@@ -221,18 +238,22 @@ > <a class="cancel" href="/cgi-bin/koha/admin/usage_statistics.pl">Cancel</a> > </fieldset> > </form> >-</div> >-</div> >-<div class="yui-b"> >-[% INCLUDE 'admin-menu.inc' %] >-</div> >-</div> >+ >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'admin-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] > [% Asset.js("js/admin-menu.js") | $raw %] >- <script src="[% interface | html %]/lib/leaflet/leaflet.js"></script> >- <script type="text/javascript"> >+ [% Asset.js("/lib/leaflet/leaflet.js") | $raw %] >+ <script> > function positionMap() { > var tbh = $("#mapid"); > var mapContainer = tbh.parent(); >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 20743
:
77983
|
78018
|
78027
| 78198 |
79224