[Koha-patches] [PATCH] [SIGNED-OFF] Bug 6825 OpacNav menu hide user menu on opac-user.pl page

Christophe Croullebois christophe.croullebois at biblibre.com
Fri Sep 2 11:02:00 CEST 2011


From: Frédéric Demians <f.demians at tamil.fr>

This patch inverse OpacNav and user menu on opac-user.pl page and other user
pages.

Signed-off-by: Christophe Croullebois <christophe.croullebois at biblibre.com>
---
 .../opac-tmpl/prog/en/modules/opac-account.tt      |    2 +-
 .../opac-tmpl/prog/en/modules/opac-messaging.tt    |    2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt |    2 +-
 .../opac-tmpl/prog/en/modules/opac-privacy.tt      |    2 +-
 .../prog/en/modules/opac-readingrecord.tt          |    2 +-
 .../prog/en/modules/opac-search-history.tt         |    4 ++--
 .../opac-tmpl/prog/en/modules/opac-shelves.tt      |    2 +-
 .../opac-tmpl/prog/en/modules/opac-suggestions.tt  |    2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt   |    2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt   |    2 +-
 .../opac-tmpl/prog/en/modules/opac-userupdate.tt   |    2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt
index eed66d3..6af4781 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt
@@ -54,8 +54,8 @@
 </div>
 <div class="yui-b">
 <div id="leftmenus" class="container">
-[% INCLUDE 'navigation.inc' %]
 [% INCLUDE 'usermenu.inc' %]
+[% INCLUDE 'navigation.inc' %]
 </div>
 </div>
 </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt
index ebb1e26..61db54d 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt
@@ -115,8 +115,8 @@
 </div>
 <div class="yui-b">
 <div id="leftmenus" class="container">
-[% INCLUDE 'navigation.inc' %]
 [% INCLUDE 'usermenu.inc' %]
+[% INCLUDE 'navigation.inc' %]
 </div>
 </div>
 </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt
index 16c4532..8084a44 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt
@@ -54,8 +54,8 @@
 </div>
 <div class="yui-b">
 <div id="leftmenus" class="container">
-[% INCLUDE 'navigation.inc' %]
 [% INCLUDE 'usermenu.inc' %]
+[% INCLUDE 'navigation.inc' %]
 </div>
 </div>
 </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
index de34e02..6de1b6c 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
@@ -64,8 +64,8 @@
 </div>
 <div class="yui-b">
 <div id="leftmenus" class="container">
-[% INCLUDE 'navigation.inc' %]
 [% INCLUDE 'usermenu.inc' %]
+[% INCLUDE 'navigation.inc' %]
 </div>
 </div>
 </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt
index 2c097b5..e3cf66e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt
@@ -95,8 +95,8 @@ You have never borrowed anything from this library.
 </div>
 <div class="yui-b">
 <div id="leftmenus" class="container">
-[% INCLUDE 'navigation.inc' %]
 [% INCLUDE 'usermenu.inc' %]
+[% INCLUDE 'navigation.inc' %]
 </div>
 </div>
 </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt
index e9f6be1..7c03d20 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt
@@ -82,13 +82,13 @@
 
 [% IF ( OpacNav ) %]
 <div class="yui-b"><div id="leftmenus" class="container">
-[% INCLUDE 'navigation.inc' %]
 [% INCLUDE 'usermenu.inc' %]
+[% INCLUDE 'navigation.inc' %]
 </div></div>
 [% ELSIF ( loggedinusername ) %]
 <div class="yui-b"><div id="leftmenus" class="container">
-[% INCLUDE 'navigation.inc' %]
 [% INCLUDE 'usermenu.inc' %]
+[% INCLUDE 'navigation.inc' %]
 </div></div>
 [% ELSE %]
 [% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
index 344f822..0e035e9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
@@ -601,8 +601,8 @@ $(function() {
       [% IF ( OpacNav||loggedinusername ) %]
         <div class="yui-b">
           <div is="leftmenus" class="container">
-            [% INCLUDE 'navigation.inc' %]
             [% INCLUDE 'usermenu.inc' %]
+            [% INCLUDE 'navigation.inc' %]
           </div>
         </div>
       [% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
index 3f3aa34..e65f286 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
@@ -212,8 +212,8 @@ $.tablesorter.addParser({
 </div>
 <div class="yui-b">
 <div id="leftmenus" class="container">
-[% INCLUDE 'navigation.inc' %]
 [% INCLUDE 'usermenu.inc' %]
+[% INCLUDE 'navigation.inc' %]
 </div>
 </div>
 </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt
index e99d201..30b4f07 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt
@@ -131,8 +131,8 @@
 </div>
 [% IF ( OpacNav||loggedinusername ) %]
 <div class="yui-b"><div id="leftmenus" class="container">
-[% INCLUDE 'navigation.inc' %]
 [% INCLUDE 'usermenu.inc' %]
+[% INCLUDE 'navigation.inc' %]
 </div></div>
 [% END %]
 </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
index 9d7a2a7..f95d2d5 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
@@ -423,8 +423,8 @@ $.tablesorter.addParser({
 </div>
 <div class="yui-b">
 <div id="leftmenus" class="container">
-[% INCLUDE 'navigation.inc' %]
 [% INCLUDE 'usermenu.inc' %]
+[% INCLUDE 'navigation.inc' %]
 </div>
 </div>
 </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt
index db5f7f5..08825eb 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt
@@ -180,8 +180,8 @@
 </div>
 <div class="yui-b">
 <div id="leftmenus" class="container">
-[% INCLUDE 'navigation.inc' %]
 [% INCLUDE 'usermenu.inc' %]
+[% INCLUDE 'navigation.inc' %]
 </div>
 </div>
 </div>
-- 
1.7.0.4



More information about the Koha-patches mailing list