From 726ef467a3ad3b10966141f141014c7a39504408 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Mon, 25 Jun 2007 15:02:15 +0000
Subject: [PATCH] some graphic changes (minor)

---
 .../prog/en/serials/subscription-detail.tmpl  | 28 ++++++++++---------
 .../opac-tmpl/prog/en/includes/navigation.inc | 13 +++++----
 koha-tmpl/opac-tmpl/prog/en/includes/opac.css | 12 +++++---
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl
index 37034a5fce..1735e8725b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl
@@ -138,21 +138,23 @@ function irregularity(){
     <h1>Subscription #<!--TMPL_VAR name="subscriptionid"--></h1>
     <!--TMPL_IF Name="abouttoexpire"--><div class="problem">Subscription is by its end. It should be renewed now.</div><!--/TMPL_IF-->
     <div id="action">
-        <a href="subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Edit</a>
-        <a href="subscription-add.pl?op=dup&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Duplicate </a>
-        <a href="subscription-renew.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Renew </a>
-        <a href="serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;serstatus=1">Receive</a>
-        <a href="serials-collection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Serial Collection</a>
-        <!-- TMPL_IF NAME="routing" -->
-        <a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->">Edit Routing List</a>
-        <!-- TMPL_ELSE -->
-        <a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&op=new">Create Routing List</a>
-        <!-- /TMPL_IF -->
-        <!-- TMPL_UNLESS name="totalissues" -->
+        <div class="edit">
+            <a href="subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Edit</a>
+            <a href="subscription-add.pl?op=dup&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Duplicate </a>
+            <a href="subscription-renew.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Renew </a>
+            <a href="serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;serstatus=1">Receive</a>
             <a href="javascript:confirm_deletion()">
-                delete
+                Delete
             </a>
-        <!-- /TMPL_UNLESS -->
+        </div>
+        <div class="view">
+            <a href="serials-collection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Serial Collection</a>
+            <!-- TMPL_IF NAME="routing" -->
+            <a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->">Edit Routing List</a>
+            <!-- TMPL_ELSE -->
+            <a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&op=new">Create Routing List</a>
+            <!-- /TMPL_IF -->
+        </div>
     </div>
     <div id="subscription_info">
         <h2>Subscription information</h2>
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
index 479a79ed66..b4194001c8 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
@@ -1,20 +1,22 @@
 <div id="menu">
-        <ul>
             <!-- TMPL_VAR NAME="OpacNav" -->
             <li><a href="/cgi-bin/koha/opac-main.pl">Search Home</a></li>
             <li><a href="/cgi-bin/koha/opac-search.pl">Advanced Search</a></li>
+            <li>Browse catalogue:</li>
+            <ul>
             <!-- TMPL_IF name="OpacBrowser" -->
-                <li><a href="/cgi-bin/koha/opac-browser.pl">Browse Catalogue</a></li>
+                <li><a href="/cgi-bin/koha/opac-browser.pl">by hierarchy</a></li>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="OpacAuthorities" -->
-                <li><a href="/cgi-bin/koha/opac-authorities-home.pl">Authorities Headings</a></li>
+                <li><a href="/cgi-bin/koha/opac-authorities-home.pl">by headings</a></li>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="OpacTopissue" -->
-                <li><a href="/cgi-bin/koha/opac-topissues.pl">Top Issues</a></li>
+                <li><a href="/cgi-bin/koha/opac-topissues.pl">by top issues</a></li>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="OpacCloud" -->
-                <li><a href="/cgi-bin/koha/opac-tags_subject.pl">Subject Cloud</a></li>
+                <li><a href="/cgi-bin/koha/opac-tags_subject.pl">by cloud</a></li>
             <!-- /TMPL_IF -->
+            </ul>
             <li>
                 <a href="#" onclick="javascript:openBasket();" title="A &quot;shopping cart&quot; for your selections">Book Bag<span id="basket">
                     <script language="javascript" type="text/javascript">
@@ -30,7 +32,6 @@
                     <li><a href="opac-suggestions.pl">Suggestions</a></li>
                 <!-- /TMPL_IF -->
             <!-- /TMPL_IF -->
-        </ul>
  </div>
 
  <div id="main"> <!-- MAIN Body start here -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac.css b/koha-tmpl/opac-tmpl/prog/en/includes/opac.css
index bed3eecef6..54cb4bda52 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac.css
@@ -224,14 +224,18 @@ tr.highlight td, tr.highlight th {
     white-space: nowrap;
 }
 #menu ul {
-    padding-left:0px;
-    margin:0;
-    padding-bottom:0px;
+    padding:0 0 0 10px;
+    margin-left:5px;
 }
 #menu li {
     list-style-type:none;
     margin:0px;
-    padding-bottom:10px;
+    padding:0 0 10px 0;
+}
+#menu ul li {
+    list-style-type:circle;
+    margin:0px;
+    padding:0 0 10px 0;
 }
 
 
-- 
2.39.5