projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9d27237)
Bringing error page templates up to date with current layout, adding intranet-main...
authorOwen Leonard <oleonard@myacpl.org>
Mon, 5 Nov 2007 22:43:29 +0000 (16:43 -0600)
committerJoshua Ferraro <jmf@liblime.com>
Tue, 6 Nov 2007 12:29:35 +0000 (06:29 -0600)
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tmpl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tmpl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tmpl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tmpl patch | blob | history

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
index 00c51c2..041c031 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -1,5 +1,5 @@
 <!-- Begin Catalogue Resident Search Box -->
-<!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+<!-- TMPL_IF NAME="CircAutocompl" --><!-- TMPL_IF NAME="CAN_user_circulate" --><script type="text/javascript">
 //<![CDATA[
 YAHOO.util.Event.onContentReady("header_search", function() {
     new function() {
@@ -42,8 +42,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 }
 });    
 //]]>
-</script><!-- /TMPL_IF -->
+</script><!-- /TMPL_IF --><!-- /TMPL_IF -->
 <div id="header_search">
+       <!-- TMPL_IF NAME="CAN_user_circulate" -->
        <div id="circ_search" class="residentsearch">
        <p class="tip">Enter patron card number or partial name:</p>
     <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
@@ -65,8 +66,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
        <!-- /TMPL_IF -->
     </form>
        </div>
+       <!-- /TMPL_IF -->
        
-
+<!-- TMPL_IF NAME="CAN_user_circulate" -->
 <div id="checkin_search" class="residentsearch">
     <p class="tip">Scan a barcode to check in:</p>
     <form method="post" action="/cgi-bin/koha/circ/returns.pl">
@@ -74,7 +76,8 @@ YAHOO.util.Event.onContentReady("header_search", function() {
         <input value="Submit" type="submit" />
     </form>
 </div>
-       
+       <!-- /TMPL_IF -->
+       <!-- TMPL_IF NAME="CAN_user_catalogue" -->
        <div id="catalog_search" class="residentsearch">
        <p class="tip">Enter search keywords:</p>
                <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
@@ -82,10 +85,12 @@ YAHOO.util.Event.onContentReady("header_search", function() {
                                <input type="submit" class="form-submit" value="Submit" />
                </form>
        </div>
+       <!-- /TMPL_IF -->
+       
                        <ul>
-                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
-    <li><a href="/cgi-bin/koha/circ/returns.pl#checkin_search">Check In</a></li>
-                       <li class="tabs-selected"><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>
+                       <!-- TMPL_IF NAME="CAN_user_circulate" --><li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_circulate" --><li><a href="/cgi-bin/koha/circ/returns.pl#checkin_search">Check In</a></li><!-- /TMPL_IF -->
+                       <!-- TMPL_IF NAME="CAN_user_catalogue" --><li class="tabs-selected"><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li><!-- /TMPL_IF -->
                        </ul>   
 </div>
 <!-- End Catalogue Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tmpl
index 85803cb..7fa6b01 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tmpl
@@ -3,9 +3,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
+
 <!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Error 400</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
        <div id="yui-main">
@@ -18,9 +22,83 @@
     <li>Use top menu bar to navigate to another part of Koha.</li>
     </ul>
 </div>
+
+<div class="yui-g">
+<div class="yui-u first">
+       <!-- TMPL_IF NAME="CAN_user_circulate" -->
+       <h3><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a></h3>
+       <ul><li>
+       <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+        <label for="navfindborrower">Check out to:</label>
+            <input id="navfindborrower" name="findborrower" type="text" size="10" />
+            <input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" />
+            <input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" />
+            <input type="submit" class="submit" value="OK" />
+       </form>
+       </li>
+       <li><a accesskey="r" href="/cgi-bin/koha/circ/returns.pl">Check in</a></li>
+        <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li></ul>
+               <!-- /TMPL_IF -->
+                 <!-- TMPL_IF NAME="CAN_user_borrowers" -->
+               <h3><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></h3>
+               <ul>
+        <li><form action="/cgi-bin/koha/members/member.pl" method="post">
+           <label for="navmember">Search:&nbsp;</label>
+           <input id="navmember" type="text" size="10" name="member" />
+           <input type="submit" value="OK" class="submit" />
+            </form>
+        </li>
+    </ul>
+       <!-- /TMPL_IF -->
+                 <!-- TMPL_IF NAME="CAN_user_catalogue" -->
+                <h3><a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a></h3>
+                               <ul>
+                    <li>
+                        <form name="searchform" method="get" action="/cgi-bin/koha/catalogue/search.pl" id="searchform">
+                        <input type="hidden" name="idx" value="" />
+                        <label for="navkeyword">
+                            Search:&nbsp;
+                        </label><input type="text" id="navkeyword" name="q" size="10" accesskey="s" />
+                        <input type="submit" value=" OK " class="submit" />
+                        </form>
+                     </li>
+                    <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Virtual Shelves</a></li>
+                </ul>
+   <!-- /TMPL_IF -->
+       </div>
+
+
+<div class="yui-u">
+
+    <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
+    <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a></h3>
+       <ul>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC</a></li>
+        <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
+        <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
+    </ul>
+    <h3><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></h3>
+    <!-- /TMPL_IF --><!-- TMPL_IF NAME="CAN_user_reports" -->
+          <h3><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></h3>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_parameters" -->
+   <h3> <a href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a></h3>
+                       <ul>
+            <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a></li>
+        </ul>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_tools" -->
+    <h3><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></h3>
+    <!-- /TMPL_IF -->
+    <h3><a href="/cgi-bin/koha/about.pl">About Koha</a></h3>
+       </div>
+       
+       
+       </div>
+
+
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tmpl
index 0c1056e..f62dff3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tmpl
@@ -1,11 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Error</title>
+<title>Koha &rsaquo; Error 401</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
+
 <!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Error 401</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
        <div id="yui-main">
@@ -18,9 +22,82 @@
         <li>Use top menu bar to navigate to another part of Koha.</li>
     </ul>
 </div>
+
+<div class="yui-g">
+<div class="yui-u first">
+       <!-- TMPL_IF NAME="CAN_user_circulate" -->
+       <h3><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a></h3>
+       <ul><li>
+       <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+        <label for="navfindborrower">Check out to:</label>
+            <input id="navfindborrower" name="findborrower" type="text" size="10" />
+            <input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" />
+            <input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" />
+            <input type="submit" class="submit" value="OK" />
+       </form>
+       </li>
+       <li><a accesskey="r" href="/cgi-bin/koha/circ/returns.pl">Check in</a></li>
+        <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li></ul>
+               <!-- /TMPL_IF -->
+                 <!-- TMPL_IF NAME="CAN_user_borrowers" -->
+               <h3><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></h3>
+               <ul>
+        <li><form action="/cgi-bin/koha/members/member.pl" method="post">
+           <label for="navmember">Search:&nbsp;</label>
+           <input id="navmember" type="text" size="10" name="member" />
+           <input type="submit" value="OK" class="submit" />
+            </form>
+        </li>
+    </ul>
+       <!-- /TMPL_IF -->
+                 <!-- TMPL_IF NAME="CAN_user_catalogue" -->
+                <h3><a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a></h3>
+                               <ul>
+                    <li>
+                        <form name="searchform" method="get" action="/cgi-bin/koha/catalogue/search.pl" id="searchform">
+                        <input type="hidden" name="idx" value="" />
+                        <label for="navkeyword">
+                            Search:&nbsp;
+                        </label><input type="text" id="navkeyword" name="q" size="10" accesskey="s" />
+                        <input type="submit" value=" OK " class="submit" />
+                        </form>
+                     </li>
+                    <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Virtual Shelves</a></li>
+                </ul>
+   <!-- /TMPL_IF -->
+       </div>
+
+
+<div class="yui-u">
+
+    <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
+    <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a></h3>
+       <ul>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC</a></li>
+        <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
+        <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
+    </ul>
+    <h3><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></h3>
+    <!-- /TMPL_IF --><!-- TMPL_IF NAME="CAN_user_reports" -->
+          <h3><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></h3>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_parameters" -->
+   <h3> <a href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a></h3>
+                       <ul>
+            <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a></li>
+        </ul>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_tools" -->
+    <h3><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></h3>
+    <!-- /TMPL_IF -->
+    <h3><a href="/cgi-bin/koha/about.pl">About Koha</a></h3>
+       </div>
+       
+       
+       </div>
+
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl
index f1269b1..55946ac 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl
@@ -1,12 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Error</title>
+<title>Koha &rsaquo; Error 402</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
+
 <!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Error 402</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
        <div id="yui-main">
@@ -19,9 +22,82 @@
         <li>Use top menu bar to navigate to another part of Koha.</li>
     </ul>
 </div>
+
+<div class="yui-g">
+<div class="yui-u first">
+       <!-- TMPL_IF NAME="CAN_user_circulate" -->
+       <h3><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a></h3>
+       <ul><li>
+       <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+        <label for="navfindborrower">Check out to:</label>
+            <input id="navfindborrower" name="findborrower" type="text" size="10" />
+            <input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" />
+            <input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" />
+            <input type="submit" class="submit" value="OK" />
+       </form>
+       </li>
+       <li><a accesskey="r" href="/cgi-bin/koha/circ/returns.pl">Check in</a></li>
+        <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li></ul>
+               <!-- /TMPL_IF -->
+                 <!-- TMPL_IF NAME="CAN_user_borrowers" -->
+               <h3><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></h3>
+               <ul>
+        <li><form action="/cgi-bin/koha/members/member.pl" method="post">
+           <label for="navmember">Search:&nbsp;</label>
+           <input id="navmember" type="text" size="10" name="member" />
+           <input type="submit" value="OK" class="submit" />
+            </form>
+        </li>
+    </ul>
+       <!-- /TMPL_IF -->
+                 <!-- TMPL_IF NAME="CAN_user_catalogue" -->
+                <h3><a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a></h3>
+                               <ul>
+                    <li>
+                        <form name="searchform" method="get" action="/cgi-bin/koha/catalogue/search.pl" id="searchform">
+                        <input type="hidden" name="idx" value="" />
+                        <label for="navkeyword">
+                            Search:&nbsp;
+                        </label><input type="text" id="navkeyword" name="q" size="10" accesskey="s" />
+                        <input type="submit" value=" OK " class="submit" />
+                        </form>
+                     </li>
+                    <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Virtual Shelves</a></li>
+                </ul>
+   <!-- /TMPL_IF -->
+       </div>
+
+
+<div class="yui-u">
+
+    <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
+    <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a></h3>
+       <ul>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC</a></li>
+        <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
+        <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
+    </ul>
+    <h3><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></h3>
+    <!-- /TMPL_IF --><!-- TMPL_IF NAME="CAN_user_reports" -->
+          <h3><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></h3>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_parameters" -->
+   <h3> <a href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a></h3>
+                       <ul>
+            <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a></li>
+        </ul>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_tools" -->
+    <h3><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></h3>
+    <!-- /TMPL_IF -->
+    <h3><a href="/cgi-bin/koha/about.pl">About Koha</a></h3>
+       </div>
+       
+       
+       </div>
+
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tmpl
index 2a949df..56ebc86 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tmpl
@@ -1,12 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Error</title>
+<title>Koha &rsaquo; Error 403</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
+
 <!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Error 403</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
        <div id="yui-main">
@@ -19,9 +22,82 @@
     <li>Use top menu bar to navigate to another part of Koha.</li>
     </ul>
 </div>
+
+<div class="yui-g">
+<div class="yui-u first">
+       <!-- TMPL_IF NAME="CAN_user_circulate" -->
+       <h3><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a></h3>
+       <ul><li>
+       <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+        <label for="navfindborrower">Check out to:</label>
+            <input id="navfindborrower" name="findborrower" type="text" size="10" />
+            <input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" />
+            <input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" />
+            <input type="submit" class="submit" value="OK" />
+       </form>
+       </li>
+       <li><a accesskey="r" href="/cgi-bin/koha/circ/returns.pl">Check in</a></li>
+        <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li></ul>
+               <!-- /TMPL_IF -->
+                 <!-- TMPL_IF NAME="CAN_user_borrowers" -->
+               <h3><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></h3>
+               <ul>
+        <li><form action="/cgi-bin/koha/members/member.pl" method="post">
+           <label for="navmember">Search:&nbsp;</label>
+           <input id="navmember" type="text" size="10" name="member" />
+           <input type="submit" value="OK" class="submit" />
+            </form>
+        </li>
+    </ul>
+       <!-- /TMPL_IF -->
+                 <!-- TMPL_IF NAME="CAN_user_catalogue" -->
+                <h3><a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a></h3>
+                               <ul>
+                    <li>
+                        <form name="searchform" method="get" action="/cgi-bin/koha/catalogue/search.pl" id="searchform">
+                        <input type="hidden" name="idx" value="" />
+                        <label for="navkeyword">
+                            Search:&nbsp;
+                        </label><input type="text" id="navkeyword" name="q" size="10" accesskey="s" />
+                        <input type="submit" value=" OK " class="submit" />
+                        </form>
+                     </li>
+                    <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Virtual Shelves</a></li>
+                </ul>
+   <!-- /TMPL_IF -->
+       </div>
+
+
+<div class="yui-u">
+
+    <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
+    <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a></h3>
+       <ul>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC</a></li>
+        <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
+        <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
+    </ul>
+    <h3><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></h3>
+    <!-- /TMPL_IF --><!-- TMPL_IF NAME="CAN_user_reports" -->
+          <h3><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></h3>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_parameters" -->
+   <h3> <a href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a></h3>
+                       <ul>
+            <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a></li>
+        </ul>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_tools" -->
+    <h3><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></h3>
+    <!-- /TMPL_IF -->
+    <h3><a href="/cgi-bin/koha/about.pl">About Koha</a></h3>
+       </div>
+       
+       
+       </div>
+
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl
index f86af66..13611e4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl
@@ -1,27 +1,103 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Error</title>
+<title>Koha &rsaquo; Error 404</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
+
 <!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Error 404</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
     <h1>An Error has Occurred!</h1>
     <h2>Error 404</h2>
-    <ul>
+    <ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
         <li>This error means that the link was broken and that the page doesn't exist</li>     
         <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
         <li>Use top menu bar to navigate to another part of Koha.</li>
     </ul>
 </div>
+
+<div class="yui-g">
+<div class="yui-u first">
+       <!-- TMPL_IF NAME="CAN_user_circulate" -->
+       <h3><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a></h3>
+       <ul><li>
+       <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+        <label for="navfindborrower">Check out to:</label>
+            <input id="navfindborrower" name="findborrower" type="text" size="10" />
+            <input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" />
+            <input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" />
+            <input type="submit" class="submit" value="OK" />
+       </form>
+       </li>
+       <li><a accesskey="r" href="/cgi-bin/koha/circ/returns.pl">Check in</a></li>
+        <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li></ul>
+               <!-- /TMPL_IF -->
+                 <!-- TMPL_IF NAME="CAN_user_borrowers" -->
+               <h3><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></h3>
+               <ul>
+        <li><form action="/cgi-bin/koha/members/member.pl" method="post">
+           <label for="navmember">Search:&nbsp;</label>
+           <input id="navmember" type="text" size="10" name="member" />
+           <input type="submit" value="OK" class="submit" />
+            </form>
+        </li>
+    </ul>
+       <!-- /TMPL_IF -->
+                 <!-- TMPL_IF NAME="CAN_user_catalogue" -->
+                <h3><a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a></h3>
+                               <ul>
+                    <li>
+                        <form name="searchform" method="get" action="/cgi-bin/koha/catalogue/search.pl" id="searchform">
+                        <input type="hidden" name="idx" value="" />
+                        <label for="navkeyword">
+                            Search:&nbsp;
+                        </label><input type="text" id="navkeyword" name="q" size="10" accesskey="s" />
+                        <input type="submit" value=" OK " class="submit" />
+                        </form>
+                     </li>
+                    <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Virtual Shelves</a></li>
+                </ul>
+   <!-- /TMPL_IF -->
+       </div>
+
+
+<div class="yui-u">
+
+    <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
+    <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a></h3>
+       <ul>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC</a></li>
+        <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
+        <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
+    </ul>
+    <h3><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></h3>
+    <!-- /TMPL_IF --><!-- TMPL_IF NAME="CAN_user_reports" -->
+          <h3><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></h3>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_parameters" -->
+   <h3> <a href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a></h3>
+                       <ul>
+            <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a></li>
+        </ul>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_tools" -->
+    <h3><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></h3>
+    <!-- /TMPL_IF -->
+    <h3><a href="/cgi-bin/koha/about.pl">About Koha</a></h3>
+       </div>
+       
+       
+       </div>
+
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl
index 243bd68..c008e46 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl
@@ -1,11 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Error</title>
+<title>Koha &rsaquo; Error 405</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
+
 <!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Error 405</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
        <div id="yui-main">
@@ -18,9 +22,82 @@
         <li>Use top menu bar to navigate to another part of Koha.</li>
     </ul>
 </div>
+
+<div class="yui-g">
+<div class="yui-u first">
+       <!-- TMPL_IF NAME="CAN_user_circulate" -->
+       <h3><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a></h3>
+       <ul><li>
+       <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+        <label for="navfindborrower">Check out to:</label>
+            <input id="navfindborrower" name="findborrower" type="text" size="10" />
+            <input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" />
+            <input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" />
+            <input type="submit" class="submit" value="OK" />
+       </form>
+       </li>
+       <li><a accesskey="r" href="/cgi-bin/koha/circ/returns.pl">Check in</a></li>
+        <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li></ul>
+               <!-- /TMPL_IF -->
+                 <!-- TMPL_IF NAME="CAN_user_borrowers" -->
+               <h3><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></h3>
+               <ul>
+        <li><form action="/cgi-bin/koha/members/member.pl" method="post">
+           <label for="navmember">Search:&nbsp;</label>
+           <input id="navmember" type="text" size="10" name="member" />
+           <input type="submit" value="OK" class="submit" />
+            </form>
+        </li>
+    </ul>
+       <!-- /TMPL_IF -->
+                 <!-- TMPL_IF NAME="CAN_user_catalogue" -->
+                <h3><a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a></h3>
+                               <ul>
+                    <li>
+                        <form name="searchform" method="get" action="/cgi-bin/koha/catalogue/search.pl" id="searchform">
+                        <input type="hidden" name="idx" value="" />
+                        <label for="navkeyword">
+                            Search:&nbsp;
+                        </label><input type="text" id="navkeyword" name="q" size="10" accesskey="s" />
+                        <input type="submit" value=" OK " class="submit" />
+                        </form>
+                     </li>
+                    <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Virtual Shelves</a></li>
+                </ul>
+   <!-- /TMPL_IF -->
+       </div>
+
+
+<div class="yui-u">
+
+    <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
+    <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a></h3>
+       <ul>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC</a></li>
+        <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
+        <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
+    </ul>
+    <h3><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></h3>
+    <!-- /TMPL_IF --><!-- TMPL_IF NAME="CAN_user_reports" -->
+          <h3><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></h3>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_parameters" -->
+   <h3> <a href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a></h3>
+                       <ul>
+            <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a></li>
+        </ul>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_tools" -->
+    <h3><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></h3>
+    <!-- /TMPL_IF -->
+    <h3><a href="/cgi-bin/koha/about.pl">About Koha</a></h3>
+       </div>
+       
+       
+       </div>
+
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tmpl
index 5b5712d..36ee580 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tmpl
@@ -1,11 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Error</title>
+<title>Koha &rsaquo; Error 500</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
+
 <!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Error 500</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
        <div id="yui-main">
@@ -18,8 +22,81 @@
         <li>Use top menu bar to navigate to another part of Koha.</li>
     </ul>
 </div>
+
+<div class="yui-g">
+<div class="yui-u first">
+       <!-- TMPL_IF NAME="CAN_user_circulate" -->
+       <h3><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a></h3>
+       <ul><li>
+       <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+        <label for="navfindborrower">Check out to:</label>
+            <input id="navfindborrower" name="findborrower" type="text" size="10" />
+            <input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" />
+            <input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" />
+            <input type="submit" class="submit" value="OK" />
+       </form>
+       </li>
+       <li><a accesskey="r" href="/cgi-bin/koha/circ/returns.pl">Check in</a></li>
+        <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li></ul>
+               <!-- /TMPL_IF -->
+                 <!-- TMPL_IF NAME="CAN_user_borrowers" -->
+               <h3><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></h3>
+               <ul>
+        <li><form action="/cgi-bin/koha/members/member.pl" method="post">
+           <label for="navmember">Search:&nbsp;</label>
+           <input id="navmember" type="text" size="10" name="member" />
+           <input type="submit" value="OK" class="submit" />
+            </form>
+        </li>
+    </ul>
+       <!-- /TMPL_IF -->
+                 <!-- TMPL_IF NAME="CAN_user_catalogue" -->
+                <h3><a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a></h3>
+                               <ul>
+                    <li>
+                        <form name="searchform" method="get" action="/cgi-bin/koha/catalogue/search.pl" id="searchform">
+                        <input type="hidden" name="idx" value="" />
+                        <label for="navkeyword">
+                            Search:&nbsp;
+                        </label><input type="text" id="navkeyword" name="q" size="10" accesskey="s" />
+                        <input type="submit" value=" OK " class="submit" />
+                        </form>
+                     </li>
+                    <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Virtual Shelves</a></li>
+                </ul>
+   <!-- /TMPL_IF -->
+       </div>
+
+
+<div class="yui-u">
+
+    <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
+    <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a></h3>
+       <ul>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC</a></li>
+        <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
+        <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
+    </ul>
+    <h3><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></h3>
+    <!-- /TMPL_IF --><!-- TMPL_IF NAME="CAN_user_reports" -->
+          <h3><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></h3>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_parameters" -->
+   <h3> <a href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a></h3>
+                       <ul>
+            <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a></li>
+        </ul>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_tools" -->
+    <h3><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></h3>
+    <!-- /TMPL_IF -->
+    <h3><a href="/cgi-bin/koha/about.pl">About Koha</a></h3>
+       </div>
+       
+       
+       </div>
+
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git