From 6bea46b097db2cd905c2aace75fbd5eab3b71a40 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 12 Dec 2007 10:29:38 -0600
Subject: [PATCH] More minor style changes, and markup fix for Bug 1321.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../prog/en/css/staff-global.css              | 26 +++++++-----
 .../intranet-tmpl/prog/en/modules/auth.tmpl   |  2 +-
 .../prog/en/modules/circ/circulation.tmpl     |  2 +-
 .../prog/en/modules/members/moremember.tmpl   | 42 +++++++++----------
 4 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index e3972d3a9f..b46584be28 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -631,7 +631,7 @@ fieldset.rows label.yesno {
 	width : auto;
 }
 
-fieldset.action {
+fieldset.action, div.action {
 	clear : both;
 	float : none;
 	border : none;
@@ -652,7 +652,7 @@ width: 100%;
 div.rows span.label {  
 	float: left;  
 	font-weight : bold;
-	width: 7em;  
+	width: 9em;  
 	margin-right: 1em;  
 	text-align: left;
 }
@@ -670,7 +670,7 @@ div.rows li {
 border-bottom :  1px solid #EEE;
 float : left;
 clear : left;
-padding-bottom: .1em;
+padding-bottom: .2em;
 padding-top: .1em;
 list-style-type: none;
 width: 100%; 
@@ -1150,14 +1150,6 @@ h1#logo a {
 	font-size :  200%;
 }
 
-#libraryuse table, #libraryuse td, #libraryuse th, #patrondetails table, #patrondetails td, #patrondetails th {
-	border: 0;
-}
-
-#libraryuse th[scope=row], #patrondetails th[scope=row] {
-	background-color: transparent;
-}
-
 .email {
 font-size :  87%;
 width : 15em;
@@ -1173,3 +1165,15 @@ overflow :  hidden;
 #circ_circulation_issue .date-select label {
 	font-weight: normal;
 }
+
+.clearfix:after {
+    content: "."; 
+    display: block; 
+    height: 0; 
+    clear: both; 
+    visibility: hidden;
+}
+
+/* Hides from IE-mac \*/
+* html .clearfix {height: 1%;}
+/* End hide from IE-mac */
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
index a08c91f4b3..2e34168215 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
@@ -44,7 +44,7 @@
 </p>
 
 <!-- TMPL_IF NAME="AutoLocation" --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="IndependantBranches" --><!-- TMPL_ELSE --><p><label for="branch">Library:<br />
-    <select name="branch" id="branch" class="input">
+    <select name="branch" id="branch" class="input" tabindex="3">
     <!-- TMPL_LOOP NAME="branchloop" -->
     <option value="<!-- TMPL_VAR NAME='branchcode' -->"><!-- TMPL_VAR NAME='branchname' --></option>
     <!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 1d27216acd..647046c991 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -256,7 +256,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 	
     <!-- TMPL_IF NAME="flagged" -->
 		<!-- TMPL_IF NAME="noissues" -->
-		 <div class="hint">Checking out to <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</div>
+		 <h4>Checking out to <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h4>
         <div id="circmessages" class="circmessage warning">
 		<!-- TMPL_ELSE -->
         <div id="circmessages" class="circmessage attention">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index ad2df56a0b..296c574eb7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -64,12 +64,12 @@ Unable to delete member: insufficient privileges.
 
 <!-- /TMPL_IF -->
 
-
+<h3><!-- TMPL_UNLESS NAME="I" -->
+   <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- /TMPL_UNLESS --> <!-- TMPL_VAR NAME="surname" --></h3>
  <div class="yui-u first">
 <div id="patron-information" style="padding : .5em;">
-<h3>
-    <!-- TMPL_UNLESS NAME="I" -->
-   <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- /TMPL_UNLESS --> <!-- TMPL_VAR NAME="surname" --></h3> <!-- TMPL_UNLESS NAME="I" --><!-- TMPL_IF NAME="othernames" -->&ldquo;<!-- TMPL_VAR NAME="othernames" -->&rdquo;<!-- /TMPL_IF -->
+
+     <!-- TMPL_UNLESS NAME="I" --><!-- TMPL_IF NAME="othernames" -->&ldquo;<!-- TMPL_VAR NAME="othernames" -->&rdquo;<!-- /TMPL_IF -->
 
 <p class="address"><!-- TMPL_VAR NAME="streetnumber" -->
         <!--TMPL_IF NAME="roaddetails"-->
@@ -119,17 +119,17 @@ Unable to delete member: insufficient privileges.
      <!-- /TMPL_IF  -->
 </ol>
 </div>
-    
-            <!-- TMPL_IF name="guarantorborrowernumber" -->
-			<a class="member-edit" href="memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;step=1&amp;guarantorid=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->">Edit</a>
+</div>    
+          <div class="action">  <!-- TMPL_IF name="guarantorborrowernumber" -->
+			<a href="memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;step=1&amp;guarantorid=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->">Edit</a>
 			<!-- TMPL_ELSE -->
-            <a class="member-edit" href="memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;step=1">Edit</a>
-			<!-- /TMPL_IF -->
-</div>
+            <a href="memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;step=1">Edit</a>
+			<!-- /TMPL_IF --></div>
+
 
 </div>
  <div class="yui-u"> 
- <div id="patron-library-details" style="padding : .5em;">
+ <div id="patron-library-details">
  <h3>Library use</h3>
 <div class="rows"> 
 <ol>
@@ -159,10 +159,10 @@ Unable to delete member: insufficient privileges.
     <!-- TMPL_IF NAME="opacnote" --><li><span class="label">Message to Patron:</span><!-- TMPL_VAR NAME="opacnote" --></li><!-- /TMPL_IF -->
 	</ol>
 	</div>
-            <a class="member-edit" href="memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;step=3">Edit</a>
  </div>
+            <div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;step=3">Edit</a></div>
  
- <div id="patron-alternate-address" style="padding : .5em;">
+ <div id="patron-alternate-address" style="padding-top: 1em;">
     <h3>Alternate Address</h3>
     <!-- TMPL_UNLESS NAME="I"-->
       <!-- TMPL_UNLESS NAME="C"-->
@@ -171,17 +171,15 @@ Unable to delete member: insufficient privileges.
       <!-- TMPL_VAR NAME="B_zipcode" --></p>
   <!-- /TMPL_UNLESS -->
     <!-- /TMPL_UNLESS -->
- 
+ <!-- TMPL_IF NAME="C" -->C!<!-- TMPL_ELSE -->Not C.<!-- /TMPL_IF -->
      <!-- TMPL_IF NAME="C" -->
-    <p><strong>Name: </strong><!-- TMPL_VAR NAME="contactname" --></p>
-    <p><strong>Firstname: </strong><!-- TMPL_VAR NAME="firstname" --></p>    
-    <p><strong>Phone: </strong><!-- TMPL_VAR NAME="phone" --></p>
-    <p><strong>Email: </strong><!-- TMPL_VAR NAME="email" --></p>
-    <p><strong>Relationship: </strong><!-- TMPL_VAR NAME="relationship" --></p>
+   <div class="rows"> <ol><li><span class="label">Name: </span><!-- TMPL_VAR NAME="contactname" --></li>
+    <li><span class="label">Firstname: </span><!-- TMPL_VAR NAME="firstname" --></li>    
+    <li><span class="label">Phone: </span><!-- TMPL_VAR NAME="phone" --></li>
+    <li><span class="label">Email: </span><!-- TMPL_VAR NAME="email" --></li>
+    <li><span class="label">Relationship: </span><!-- TMPL_VAR NAME="relationship" --></li></ol></div>
    <!-- /TMPL_IF -->
-       
-    <a class="member-edit" href="memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;step=2">Edit</a>
-</div>
+</div><div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;step=2">Edit</a></div>
  
 </div>
 </div>
-- 
2.39.2