Corrections to addbiblio.pl and addbiblio.tmpl for XHTML compliance; Formatting addbi...

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index cdd526d..06b81d1 100755 (executable)
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -329,8 +329,8 @@ sub create_input {
                     class=\"input_marceditor\"
                     tabindex=\"1\"
                     \/>
-                    <span class=\"buttonDot\"
-                        onclick=\"Dopop('/cgi-bin/koha/authorities/auth_finder.pl?authtypecode=".$tagslib->{$tag}->{$subfield}->{authtypecode}."&index=$subfield_data{id}','$subfield_data{id}')\">...</span>
+                    <a href=\"#\" class=\"buttonDot\"
+                        onclick=\"Dopop('/cgi-bin/koha/authorities/auth_finder.pl?authtypecode=".$tagslib->{$tag}->{$subfield}->{authtypecode}."&index=$subfield_data{id}','$subfield_data{id}'; return false;)\" title=\"Tag Editor\">...</a>
                ";
     # it's a plugin field
     }
@@ -357,7 +357,7 @@ sub create_input {
                         class=\"input_marceditor\"
                        onfocus=\"Focus$function_name($index_tag)\"
                        onblur=\"Blur$function_name($index_tag); \" \/>
-               <span class=\"buttonDot\" onclick=\"Clic$function_name('$subfield_data{id}')\">...</a>
+               <a href=\"#\" class=\"buttonDot\" onclick=\"Clic$function_name('$subfield_data{id}'; return false;)\" title=\"Tag Editor\">...</a>
                $javascript";
         # it's an hidden field
     }

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 b1de927..4ce6a94 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -747,7 +747,10 @@ fieldset.rows fieldset.action {
        background-repeat : no-repeat;
 }
 
-.labelsubfield{
-    min-width:210px;
-    display:inline;
-}
\ No newline at end of file
+div.error {
+       border : 2px dashed #990000;
+       background-color : #FFFF99;
+       padding : .5em;
+       margin : 1em;
+}
+

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
index 55bb0d4..c1a315f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
@@ -4,6 +4,10 @@
 <script type="text/javascript">
 //<![CDATA[
 
+        $(document).ready(function() {
+               $('#addbibliotabs').tabs();
+        });
+
 function confirmnotdup(){
        document.getElementById("confirm_not_duplicate").value = 1;
        alert(_("Not a duplicate confirmed. Please click on Add biblio to save the record"));
@@ -11,33 +15,6 @@ function confirmnotdup(){
        Check(checkform);
 }
 
-function active(numlayer){
-    for (i=0; i <= 10 ; i++ ) {
-       var tab;
-       try{
-               tab = document.getElementById(i+'XX');
-               tab.getAttribute('id'); // do not remove this line. It throws an execption.
-       }
-       catch(e){
-               continue;
-       }
-        if (numlayer==i) {
-            tab.setAttribute("class","content_visible");
-            var tabactive=document.getElementById('link'+i);
-            tabactive.removeAttribute("class");
-            tabactive.setAttribute("class","tab_active");
-        } else {
-            tab.setAttribute("class","content_hidden");
-            try {
-                var tabactive=document.getElementById('link'+i);
-                tabactive.removeAttribute("class");
-                tabactive.setAttribute("class","tab_inactive");
-            }
-            catch(e){};
-        }
-    }
-}
-
 /**
  * 
  * 
@@ -422,13 +399,27 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
 }
 //]]>
 </script>
+<style type="text/css">
+       #addbibliotabs { margin-top : 1em; }
+       a.buttonPlus {
+               font-weight : bold;
+               text-decoration : none;
+       }
+       a.expandfield {
+               color : #000;
+               text-decoration : none;
+       }
+</style>
 </head>
 <body>
 
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<div id="doc3">
-   <div id="bd">
+<div id="doc" class="yui-t7">
+
+<div id="bd">
+        <div id="yui-main">
+        <div class="yui-g">
 
 <!--TMPL_IF Name="done"-->
     <script type="text/javascript">
@@ -449,11 +440,9 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
         <input type="submit" value="Add Bibliographic Record" />
     <!-- /TMPL_IF -->
     <input type="button" value="z39.50 Search" onclick="PopupZ3950(); return false;" />
+       <label for="Frameworks">Change framework: </label><!--TMPL_VAR Name="framework" -->
+       <input type="hidden" name="op" value="addbiblio" />
 </div>
-<br />
- Change framework : <!--TMPL_VAR Name="framework" -->
-
-        <input type="hidden" name="op" value="addbiblio" />
 
 <!--TMPL_IF Name="popup"-->
         <input type="hidden" name="mode" value="popup" />
@@ -462,22 +451,21 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
         <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
         <input type="hidden" name="breedingid" value="<!-- TMPL_VAR NAME="breedingid" -->" />
 
-       <div id="tabs">
-        <!-- TMPL_LOOP name="BIG_LOOP" -->
-            <!-- TMPL_IF name="number" -->
-                <a href="javascript:active(<!-- TMPL_VAR name="number"-->)" class="tab_inactive" id="link<!-- TMPL_VAR name="number"-->"><!-- TMPL_VAR name="number"--></a>
+<div id="addbibliotabs" class="toptabs numbered">
+       <ul><!-- TMPL_LOOP name="BIG_LOOP" -->
+          <li>  <!-- TMPL_IF name="number" -->
+                <a href="/cgi-bin/koha/cataloguing/addbiblio.pl#tab<!-- TMPL_VAR name="number" -->XX"><!-- TMPL_VAR name="number"--></a>
             <!-- TMPL_ELSE -->
-                <a href="javascript:active(<!-- TMPL_VAR name="number"-->)" class="tab_active" id="link<!-- TMPL_VAR name="number"-->"><!-- TMPL_VAR name="number"--></a>
-            <!-- /TMPL_IF -->
-        <!--  /TMPL_LOOP -->
-       </div>
+                <a href="/cgi-bin/koha/cataloguing/addbiblio.pl#tab<!-- TMPL_VAR name="number" -->XX"><!-- TMPL_VAR name="number"--></a>
+            <!-- /TMPL_IF --></li>
+        <!--  /TMPL_LOOP --></ul>
 
 <!-- TMPL_LOOP name="BIG_LOOP" -->
 <!-- hide every tab except the 1st -->
 <!-- TMPL_IF name="number" -->
-    <div id="<!-- TMPL_VAR name="number" -->XX" class="content_hidden">
+    <div id="tab<!-- TMPL_VAR name="number" -->XX">
 <!-- TMPL_ELSE -->
-    <div id="0XX" class="content_visible">
+    <div id="tab<!-- TMPL_VAR name="number" -->XX">
 <!-- /TMPL_IF -->
 <!-- TMPL_UNLESS name="number" -->
     <!-- show duplicate warning on tab 0 only -->
@@ -513,10 +501,10 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
             <!-- /TMPL_UNLESS -->
 
             <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-                   <a onclick="ExpandField('tag_<!-- TMPL_VAR name="tag"-->_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->')"><!-- TMPL_VAR NAME="tag_lib" --></a>
+                   <a href="#" class="expandfield" onclick="ExpandField('tag_<!-- TMPL_VAR name="tag"-->_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->'); return false;" title="Click to Expand this Tag"><!-- TMPL_VAR NAME="tag_lib" --></a>
             <!-- /TMPL_UNLESS -->
             <!-- TMPL_IF name="repeatable" -->
-                <span class="buttonPlus" onclick="CloneField('tag_<!-- TMPL_VAR name="tag"-->_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->')">+</span>
+                <a href="#" class="buttonPlus" onclick="CloneField('tag_<!-- TMPL_VAR name="tag"-->_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->'); return false;" title="Repeat this Tag">+</a>
             <!-- /TMPL_IF -->
             
         </div>
@@ -526,11 +514,11 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
             <div name="line" class="subfield_line" style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' --><!-- TMPL_VAR name="random" -->">
             
                 <!--TMPL_UNLESS NAME="advancedMARCEditor" -->
-                    <label for="tag_<!-- TMPL_VAR NAME='tag'-->_subfield_<!--  TMPL_VAR NAME='subfield'-->_<!-- TMPL_VAR NAME='index'-->_<!-- TMPL_VAR NAME='index_subfield'-->" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> class="labelsubfield" >
+                    <label for="tag_<!-- TMPL_VAR NAME='tag'-->_subfield_<!--  TMPL_VAR NAME='subfield'-->_<!-- TMPL_VAR NAME='index'-->_<!-- TMPL_VAR NAME='index_subfield'-->" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> class="labelsubfield">
                 <!-- /TMPL_UNLESS --> 
                 
                 <!-- TMPL_UNLESS name="hide_marc" -->
-                    <img class="buttonUp" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/../img/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' --><!-- TMPL_VAR name="random" -->')" alt="" />
+                    <img class="buttonUp" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/../img/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' --><!-- TMPL_VAR name="random" -->')" alt="Move Up" title="Move Up" />
                         <input title="<!-- TMPL_VAR NAME='marc_lib_plain' -->" style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF -->border:0;" type="text" name="tag_<!-- TMPL_VAR NAME='tag'-->_code_<!--  TMPL_VAR NAME='subfield'-->_<!-- TMPL_VAR NAME='index'-->_<!-- TMPL_VAR NAME='index_subfield'-->" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" tabindex="-1" />
                 <!-- TMPL_ELSE -->
                     <input type="hidden" name="tag_<!-- TMPL_VAR NAME='tag'-->_code_<!--  TMPL_VAR NAME='subfield'-->_<!-- TMPL_VAR NAME='index'-->_<!-- TMPL_VAR NAME='index_subfield'-->" value="<!-- TMPL_VAR NAME="subfield" -->" />
@@ -562,5 +550,6 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
 </form>
 
 </div>
+</div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->