Using YUI plugin to do "Loading" mask on addbiblio.pl and authorities.pl. Previous...

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/addbiblio.css b/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css
index 19f5679..40dc797 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css
@@ -1,52 +1,34 @@
-       #addbibliotabs { margin-top : 1em; }
-       a.buttonPlus {
-               font-weight : bold;
-               text-decoration : none;
-       }
-       a.expandfield {
-               color : #000;
-               text-decoration : none;
-       }
-#loading {
-       height: 100%;
-       width: 100%;
-       background-color: #000;
-       position: fixed;
-       left: 0pt;
-       top: 0pt;
-       z-index: 2999;
-       opacity: 0.5;
+#addbibliotabs {
+       margin-top : 1em;
 }
 
-*html #loading {
-       position : absolute;
-       top : 971px;
-       filter : alpha(opactity=50);
+a.buttonPlus {
+       font-weight : bold;
+       text-decoration : none;
 }
 
-.loading {
-               background : #EEE url("../../img/loading.gif") no-repeat 17px center;
-               border : 2px outset #CCC;
-               color : #000;
-               font-size : 174%;
-               height : 70px;
-               line-height : 70px;
-               left:50%;
-               margin-left:-100px;
-               opacity : 1;
-               padding:12px;
-               padding-left : 20;
-               position:fixed;
-               text-align : center;
-               top:17%;
-               width:200px;
-               z-index: 3000;
-       }
-       * html .loading {
-     position: absolute;
-     top: expression((document.documentElement.scrollTop || document.body.scrollTop) + Math.round(17 * (document.documentElement.offsetHeight || document.body.clientHeight) / 100) + 'px');
+a.expandfield {
+       color : #000;
+       text-decoration : none;
+}
+
+#yui-cms-loading {
+       background : #FFFFFF;
+       color : #333333;
+       display : none;
+}
+
+#yui-cms-loading #yui-cms-float {
+       text-align : center;
+       font-size : 175%;
+       background-image : url(../../img/loading.gif);
+       background-repeat : no-repeat;
+       background-position : top;
+       padding-top : 50px;
+}
+
+        
+#authoritytabs {
+       margin-top : 1em;
+       margin-bottom : 1em;
 }
-       #authoritytabs {
-               margin-top : 1em;
-               margin-bottom : 1em;
-       }
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/plugins/bubbling-min.js b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/plugins/bubbling-min.js
new file mode 100644 (file)
index 0000000..33662f5
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/plugins/bubbling-min.js
@@ -0,0 +1 @@
+/*

diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/plugins/loading-min.js b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/plugins/loading-min.js
new file mode 100644 (file)
index 0000000..33662f5
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/plugins/loading-min.js
@@ -0,0 +1 @@
+/*

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
index e0c3c9f..805a025 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
@@ -1,13 +1,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Authorities &rsaquo; <!-- TMPL_IF name="authid" -->Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)<!-- TMPL_ELSE -->Adding authority (<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/yui/plugins/bubbling-min.js"></script>
 
 <script type="text/javascript">
 //<![CDATA[
 
         $(document).ready(function() {
                $('#authoritytabs').tabs();
-               $("#loading,.loading").hide();
                $("#f").submit(function(){
                        return $(this).Check();
                });
@@ -367,11 +367,12 @@ function searchauthority() {
 <link rel="stylesheet" href="<!-- TMPL_VAR NAME="themelang" -->/css/addbiblio.css" />
 </head>
 <body>
-<script type="text/javascript">
-//<![CDATA[
-          document.write("<div id=\"loading\"></div><div class=\"loading\">Loading...</div>");
-//]]>
-</script>
+<div id="yui-cms-loading">
+      <div id="yui-cms-float">
+          Loading, please wait...
+      </div>
+  </div>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/yui/plugins/loading-min.js"></script> 
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> &rsaquo; <!-- TMPL_IF name="authid" -->Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)<!-- TMPL_ELSE -->Adding authority <!-- TMPL_VAR name="authtypetext" --><!-- /TMPL_IF -->  </div>

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 f916873..02f628e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
@@ -1,12 +1,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Cataloging &rsaquo; <!-- TMPL_IF NAME="biblionumber" -->Edit MARC Record Number <!-- TMPL_VAR name="biblionumber" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/yui/plugins/bubbling-min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 
         $(document).ready(function() {
                $('#addbibliotabs').tabs();
-               $("#loading,.loading").hide();
         });
 
 function confirmnotdup(){
@@ -420,12 +420,12 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
 <link rel="stylesheet" href="<!-- TMPL_VAR NAME="themelang" -->/css/addbiblio.css" />
 </head>
 <body>
-<script type="text/javascript">
-//<![CDATA[
-          document.write("<div id=\"loading\"></div><div class=\"loading\">Loading...</div>");
-//]]>
-</script>
-
+<div id="yui-cms-loading">
+      <div id="yui-cms-float">
+          Loading, please wait...
+      </div>
+  </div>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/yui/plugins/loading-min.js"></script> 
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a>  &rsaquo; <!-- TMPL_IF NAME="biblionumber" -->Edit MARC Record Number <!-- TMPL_VAR name="biblionumber" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --></div>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/img/loading.gif b/koha-tmpl/intranet-tmpl/prog/img/loading.gif
index 41708ca..3c2f7c0 100644 (file)
Binary files a/koha-tmpl/intranet-tmpl/prog/img/loading.gif and b/koha-tmpl/intranet-tmpl/prog/img/loading.gif differ