projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8350c0b)
Corrections and tweaks to recent lists fixes.
authorOwen Leonard <oleonard@myacpl.org>
Mon, 24 Nov 2008 20:34:18 +0000 (14:34 -0600)
committerGalen Charlton <galen.charlton@liblime.com>
Mon, 1 Dec 2008 17:24:25 +0000 (11:24 -0600)
Corrected an instance where <!-- TMPL_IF --> was embedded inside an HTML tag (conflicts with translation script). Modified styling of confirm button to match existing interface convention.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl patch | blob | history

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 fe946eb..a4661a5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1045,10 +1045,14 @@ div.first fieldset {
        padding : .4em .4em .4em 25px;
  }
  
-.dialog input.approve {
+.dialog input.approve, td input.approve {
        background : #FFF url(../../img/approve.gif) no-repeat 4px center;
        padding : .4em .4em .4em 25px;  
  }
+ 
+td input.approve {
+       background-color : #FFC;
+}
 
 .dialog input.deny {
        background : #FFF url(../../img/deny.gif) no-repeat 4px center;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
index 6910770..5ad8bb9 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
@@ -30,7 +30,7 @@
        <li><a id="newshelf" href="/cgi-bin/koha/virtualshelves/shelves.pl?shelves=1">New List</a></li>
        <!-- TMPL_IF NAME="viewshelf" --><!-- TMPL_IF name="manageshelf" -->
        <li><a id="editshelf" href="/cgi-bin/koha/virtualshelves/shelves.pl?shelfnumber=<!-- TMPL_VAR NAME="shelfnumber" -->&amp;op=modif">Edit List</a></li>
-       <li id="deleteshelfc"><a id="deleteshelf" href="/cgi-bin/koha/virtualshelves/shelves.pl?<!-- TMPL_IF NAME="showprivateshelves" -->display=privateshelves&<!-- /TMPL_IF -->shelves=1&amp;DEL-<!-- TMPL_VAR NAME="shelfnumber" -->=1">Delete List</a></li>
+       <li id="deleteshelfc"><!-- TMPL_IF NAME="showprivateshelves" --><a id="deleteshelf" href="/cgi-bin/koha/virtualshelves/shelves.pl?display=privateshelves&amp;shelves=1&amp;DEL-<!-- TMPL_VAR NAME="shelfnumber" -->=1">Delete List</a><!-- TMPL_ELSE --><a id="deleteshelf" href="/cgi-bin/koha/virtualshelves/shelves.pl?shelves=1&amp;DEL-<!-- TMPL_VAR NAME="shelfnumber" -->=1">Delete List</a><!-- /TMPL_IF --></li>
        <!-- /TMPL_IF --><!-- /TMPL_IF -->
 </ul>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
index 86b812d..c7c8c03 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -57,12 +57,6 @@ $(document).ready(function(){
     }
     //]]>
 </script>
-<style type="text/css">
-       input.confirm {
-               background:lightblue repeat-x scroll left top;
-               border-width:2pt;
-       }
-</style>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
@@ -319,7 +313,7 @@ $(document).ready(function(){
                                        <input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelf" -->" value="1" />
                                        <!-- TMPL_IF NAME="confirm" -->
                                        <input type="hidden" name="CONFIRM-<!-- TMPL_VAR NAME="confirm" -->" value="1" />
-                                       <input type="submit" class="confirm" value="Confirm" />
+                                       <input type="submit" class="approve" value="Confirm" />
                                        <!-- TMPL_ELSE -->
                                        <input type="submit" class="deleteshelf" onclick="return confirmDelete(_('Are you sure you want to remove this List?'));" value="Delete" />
                                        <!-- /TMPL_IF -->
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git