Some CSS and JS changes to improve compatibility with Internet Explorer 6

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

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 7c6c4e6..129732e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -267,6 +267,7 @@ legend {
        clear : both;
        font-size : 90%;
        padding :.2em .5em .4em 10px;
+       margin : 0;
 }
 
 #header+#breadcrumbs {
@@ -359,6 +360,10 @@ div.patroninfo {
        margin-top : -.5em;
 }
 
+*html div.patroninfo {
+       margin-right : .5em;
+}
+
 div.patroninfo h5 {
        border-right :  1px solid #000;
        margin-bottom : 0;
@@ -368,10 +373,16 @@ div.patroninfo h5 {
 }
 
 div.patroninfo ul {
+       border : 0;
        border-right : 1px solid #000;
        border-bottom : 0;
        border-top : 0;
-       padding : 0 0 .5em 0;
+       padding : 0;
+       margin : 0;
+}
+
+div.patroninfo ul li {
+       margin : 0;
 }
 
 div.patroninfo ul li, div.patronviews ul li {
@@ -872,7 +883,7 @@ tr.highlight th[scope=row] {
        background-color : #DDDDDD;
 }
 
-tr.confirm td, tr.confirm.highlight td {
+tr.confirm td, tr.highlight.confirm td {
        background-color : #ffbfbf;
 }
 
@@ -1056,6 +1067,10 @@ div#menu {
        padding-bottom: 2em;
 }
 
+*html #menu li {
+       display : inline;
+}
+
 div#menu li a {
        text-decoration: none;
        display: block;
@@ -1109,6 +1124,10 @@ h1#logo {
        padding:0;
 }
 
+*html h1#logo {
+       margin : 0.75em .3em 0.75em .3em;
+}
+
 h1#logo a {
        border:0;
        cursor:pointer;
@@ -1268,7 +1287,7 @@ div#header_search input.submit {
        font-size : 1em;
 }
 
-input[type=submit], input[type=button], input.submit {
+input[type=submit], input[type=button] {
        border: 1px outset #999999;
        border-top-color: #666;
        border-left-color: #666;
@@ -1277,7 +1296,24 @@ input[type=submit], input[type=button], input.submit {
        color: #333333;
 }
 
-input[type=submit]:active, input[type=button]:active, input.submit:active {
+input.submit {
+       border: 1px solid #999999;
+       border-top-color: #666;
+       border-left-color: #666;
+       padding: 0.25em;
+       background : #E8E8E8 url(../../img/button-bg.gif) top left repeat-x;
+       color: #333333;
+}
+
+*html input.submit {
+       padding : .1em;
+}
+
+input[type=submit]:active, input[type=button]:active {
+       border : 1px inset #999999;
+}
+
+input.submit:active {
        border : 1px inset #999999;
 }
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
index ef53fd6..2574cf2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
@@ -41,12 +41,12 @@ function confirm_reregistration() {
        
                var moremenu = [
                        { text: "Renew Patron",  onclick: { fn: confirm_reregistration } },
-            { text: "Set Permissions", url: "/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->",
+            { text: "Set Permissions", url: "/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->"
                 <!-- TMPL_IF NAME="CAN_user_permission" --><!-- TMPL_IF NAME="StaffMember" -->
-                    <!-- TMPL_UNLESS NAME="CAN_user_staffaccess" -->disabled: true, <!-- /TMPL_UNLESS-->
+                    <!-- TMPL_UNLESS NAME="CAN_user_staffaccess" -->, disabled: true<!-- /TMPL_UNLESS-->
                     <!-- TMPL_ELSE --><!-- /TMPL_IF -->
-                <!-- TMPL_ELSE --> disabled: true, <!-- /TMPL_IF-->},
-            { text: "Delete", <!-- TMPL_IF NAME="StaffMember" --><!-- TMPL_UNLESS NAME="CAN_user_staffaccess" -->disabled: true, <!-- /TMPL_UNLESS --><!-- /TMPL_IF --> onclick: { fn: confirm_deletion } },
+                <!-- TMPL_ELSE -->, disabled: true<!-- /TMPL_IF-->},
+            { text: "Delete", <!-- TMPL_IF NAME="StaffMember" --><!-- TMPL_UNLESS NAME="CAN_user_staffaccess" -->disabled: true, <!-- /TMPL_UNLESS --><!-- /TMPL_IF --> onclick: { fn: confirm_deletion } }
                ]
 
            new YAHOO.widget.Button({

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index fc978f9..af1a58e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -1,4 +1,4 @@
-<div id="header">
+<div id="header" class="clearfix">
 
 <div id="toplevelnav">
 <ul id="toplevelmenu">

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc
index 7cd34e8..1413e1d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc
@@ -1,20 +1,19 @@
 <div id="menu">
 <ul>
-    
-    <li <!-- TMPL_IF NAME="Admin" -->class="active" <!-- /TMPL_IF -->><a title="Administration" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin</a></li>
-    <li <!-- TMPL_IF NAME="Acquisitions" -->class="active" <!-- /TMPL_IF -->><a title="Acquisitions" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Acquisitions</a></li>
-    <li <!-- TMPL_IF NAME="Authorities" -->class="active" <!-- /TMPL_IF -->><a title="Authority Control" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities</a></li>
-    <li <!-- TMPL_IF NAME="Cataloguing" -->class="active" <!-- /TMPL_IF -->><a title="Cataloging" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Cataloguing">Cataloguing</a></li>
-    <li <!-- TMPL_IF NAME="Circulation" -->class="active" <!-- /TMPL_IF -->><a title="Circulation" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation</a></li>
-    <li <!-- TMPL_IF NAME="FRBR" -->class="active" <!-- /TMPL_IF -->><a title="Functional Requiremnets for Bibliographic Records" href="/cgi-bin/koha/admin/systempreferences.pl?tab=FRBR">FRBR</a></li>
-    <li <!-- TMPL_IF NAME="I18N/L10N" -->class="active" <!-- /TMPL_IF -->><a title="Internationalization and Localization" href="/cgi-bin/koha/admin/systempreferences.pl?tab=I18N/L10N">I18N/L10N</a></li>
-    <li <!-- TMPL_IF NAME="LOGFeatures" -->class="active" <!-- /TMPL_IF -->><a title="Transaction Logs" href="/cgi-bin/koha/admin/systempreferences.pl?tab=LOGFeatures">Logs</a></li>
-    <li <!-- TMPL_IF NAME="OPAC" -->class="active" <!-- /TMPL_IF -->><a title="Online Public Access Catalog" href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC</a></li>
-    <li <!-- TMPL_IF NAME="OPACFeatures" -->class="active" <!-- /TMPL_IF -->><a title="OPAC Features" href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPACFeatures">OPAC Features</a></li>
-    <li <!-- TMPL_IF NAME="Patrons" -->class="active" <!-- /TMPL_IF -->><a title="Patrons" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Patrons">Patrons</a></li>
-    <li <!-- TMPL_IF NAME="Searching" -->class="active" <!-- /TMPL_IF -->><a title="Searching" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Searching">Searching</a></li>
-    <li <!-- TMPL_IF NAME="StaffClient" -->class="active" <!-- /TMPL_IF -->><a title="Staff Client" href="/cgi-bin/koha/admin/systempreferences.pl?tab=StaffClient">Staff Client</a></li>
-    <li <!-- TMPL_IF NAME="OAI-PMH" -->class="active" <!-- /TMPL_IF -->><a title="OAI-PMH" href="/cgi-bin/koha/admin/systempreferences.pl?tab=OAI-PMH">OAI-PMH</a></li>
-    <li <!-- TMPL_IF NAME="" -->class="active" <!-- /TMPL_IF -->><a href="/cgi-bin/koha/admin/systempreferences.pl">Local Use</a></li>
+<!-- TMPL_IF NAME="Admin" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Administration" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin</a></li>
+<!-- TMPL_IF NAME="Acquisitions" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Acquisitions" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Acquisitions</a></li>
+<!-- TMPL_IF NAME="Authorities" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Authority Control" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities</a></li>
+<!-- TMPL_IF NAME="Cataloguing" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Cataloging" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Cataloguing">Cataloguing</a></li>
+<!-- TMPL_IF NAME="Circulation" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Circulation" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation</a></li>
+<!-- TMPL_IF NAME="FRBR" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Functional Requiremnets for Bibliographic Records" href="/cgi-bin/koha/admin/systempreferences.pl?tab=FRBR">FRBR</a></li>
+<!-- TMPL_IF NAME="I18N/L10N" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Internationalization and Localization" href="/cgi-bin/koha/admin/systempreferences.pl?tab=I18N/L10N">I18N/L10N</a></li>
+<!-- TMPL_IF NAME="LOGFeatures" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Transaction Logs" href="/cgi-bin/koha/admin/systempreferences.pl?tab=LOGFeatures">Logs</a></li>
+<!-- TMPL_IF NAME="OPAC" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Online Public Access Catalog" href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC</a></li>
+<!-- TMPL_IF NAME="OPACFeatures" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="OPAC Features" href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPACFeatures">OPAC Features</a></li>
+<!-- TMPL_IF NAME="Patrons" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Patrons" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Patrons">Patrons</a></li>
+<!-- TMPL_IF NAME="Searching" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Searching" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Searching">Searching</a></li>
+<!-- TMPL_IF NAME="StaffClient" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Staff Client" href="/cgi-bin/koha/admin/systempreferences.pl?tab=StaffClient">Staff Client</a></li>
+<!-- TMPL_IF NAME="OAI-PMH" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="OAI-PMH" href="/cgi-bin/koha/admin/systempreferences.pl?tab=OAI-PMH">OAI-PMH</a></li>
+<!-- TMPL_IF NAME="" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/admin/systempreferences.pl">Local Use</a></li>
 </ul>
 </div>