projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 95f881b)
Bug 19983: Switch single-column templates to Bootstrap grid: Authorities
authorOwen Leonard <oleonard@myacpl.org>
Tue, 16 Jan 2018 16:55:36 +0000 (16:55 +0000)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Mon, 26 Mar 2018 20:31:26 +0000 (17:31 -0300)
This patch updates several single-column Authorities module templates to
use the Bootstrap grid.

- authorities-home - The home page of the Authorities module.
- authorities.tt - The authority add/edit page.
- blinddetail-biblio-search.tt - Not really testable -- It's the small
  popup window which appears during the process of linking an authority
  to a MARC record.
- detail.tt - The authority detail page. Search for an authority record
  and click on the "details" link in the search results.
- merge.tt - From a list of authority search results, select "Merge"
  from the Actions menu of two authority records. Test both the initial
  selection screen and the source/destination merging view.
- searchresultlist.tt - The authority search results page.

Each of these pages should look correct, with a single centered column
with wide margins on either side. At lower browser widths the margins
should disappear.

Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt patch | blob | history

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt
index 9a71269..3a9867d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt
@@ -10,17 +10,15 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Authorities</div>
 
-<div id="doc" class="yui-t7">
-  <div id="bd">
-    <div id="yui-main">
-    <div class="yui-g">
-    
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
+
     [% INCLUDE 'authorities-toolbar.inc' %]
 
     <div id="merge_in_progress"></div>
 
     </div>
-    </div>
   </div>
 
 [% MACRO jsinclude BLOCK %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
index cf978b1..785f854 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
@@ -175,11 +175,9 @@ function confirmnotdup(redirect){
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> &rsaquo; [% IF ( authid ) %]Modify authority #[% authid %] ([% authtypetext %])[% ELSE %]Adding authority [% authtypetext %][% END %]  </div>
 
-<div id="doc" class="yui-t7">
-
-<div id="bd">
-        <div id="yui-main">
-        <div class="yui-g">
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
 
 [% IF ( authid ) %]
 <h1>Modify authority #[% authid %] [% authtypetext %]</h1>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt
index 8bd3bcd..e8b07a4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt
@@ -6,15 +6,15 @@
 
 <body id="auth_blinddetail-biblio-search" class="auth">
 
-<div id="doc" class="yui-t7">
-   <div id="bd">
-       <div class="yui-g">
+    <div class="main container-fluid">
+        <div class="row">
+            <div class="col-md-8 col-md-offset-2">
 
         <div id="loading"> <img src="[% interface %]/[% theme %]/img/spinner-small.gif" alt="" /> Loading </div>
 
-</div>
-</div>
-</div>
+            </div>
+        </div>
+
 
 [% MACRO jsinclude BLOCK %]
     <script type="text/javascript">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
index f09801a..95c331f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
@@ -22,11 +22,9 @@
     [% END %]
 </div>
 
-<div id="doc" class="yui-t7">
-
-<div id="bd">
-        <div id="yui-main">
-        <div class="yui-g">
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
 
     [% INCLUDE 'authorities-toolbar.inc' %]
        
@@ -94,7 +92,6 @@
 </div>
 </div>
 [% END %]
-</div>
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'authorities_js.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
index 4badb7b..20ade54 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
@@ -15,11 +15,9 @@ div#result { margin-top: 1em; }
 [% INCLUDE 'authorities-search.inc' %]
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>  &rsaquo; Merging records</div>
 
-<div id="doc" class="yui-t7">
-
-<div id="bd">
-        <div id="yui-main">
-
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
 
 <h1>Merging records</h1>
 
@@ -103,8 +101,6 @@ div#result { margin-top: 1em; }
 
 [% END %]
 
-</div>
-</div>
 </div>
 
 [% MACRO jsinclude BLOCK %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
index 2c8e8e0..37fe6de 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
@@ -11,12 +11,10 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> &rsaquo; Authority search results</div>
 
-<div id="doc" class="yui-t7">
-   
-   <div id="bd">
-    <div id="yui-main">
-    <div class="yui-g">
-    
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
+
     [% INCLUDE 'authorities-toolbar.inc' %]
 <h1>Authority search results</h1>
 
@@ -79,7 +77,6 @@
 [% END %]
 </div>
 </div>
-</div>
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'authorities_js.inc' %]
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git