[Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 4912 - After editing private list redirect to private lists
Galen Charlton
gmcharlt at gmail.com
Sat Nov 13 04:48:41 CET 2010
From: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
.../prog/en/modules/virtualshelves/shelves.tmpl | 6 +++++-
koha-tmpl/opac-tmpl/prog/en/css/opac.css | 5 ++++-
.../opac-tmpl/prog/en/modules/opac-shelves.tmpl | 3 ++-
3 files changed, 11 insertions(+), 3 deletions(-)
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 35c022b..e6c8113 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -274,6 +274,7 @@ function placeHold () {
<!-- TMPL_IF name="edit" -->
<input type="hidden" name="op" value="modifsave" />
+ <!-- TMPL_IF NAME="showprivateshelves" --><input type="hidden" name="display" value="privateshelves" /><!-- /TMPL_IF -->
<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->" />
<legend>Edit List <i><!-- TMPL_VAR name="shelfname" --></i></legend>
<ol>
@@ -306,7 +307,9 @@ function placeHold () {
<!-- /TMPL_IF -->
</fieldset>
- <fieldset class="action"><input type="submit" onclick="Check(this.form); return false;" value="Save" class="submit" /><a href="/cgi-bin/koha/virtualshelves/shelves.pl" class="cancel">Cancel</a></fieldset>
+ <fieldset class="action"><input type="submit" onclick="Check(this.form); return false;" value="Save" class="submit" />
+ <!-- TMPL_IF NAME="showprivateshelves" --><a href="/cgi-bin/koha/virtualshelves/shelves.pl?display=privateshelves" class="cancel">Cancel</a><!-- TMPL_ELSE --><a href="/cgi-bin/koha/virtualshelves/shelves.pl" class="cancel">Cancel</a><!-- /TMPL_IF -->
+ </fieldset>
</form>
</div>
<div class="yui-u">
@@ -360,6 +363,7 @@ function placeHold () {
<form action="shelves.pl" method="get">
<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelf" -->" />
<input type="hidden" name="op" value="modif" />
+ <input type="hidden" name="display" value="privateshelves" />
<input type="submit" class="editshelf" value="Edit" />
</form>
<form action="shelves.pl" method="post">
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 21d580f..8f9b246 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -572,7 +572,10 @@ input.deleteshelf {
}
-#toolbar input.editshelf:active,input.deleteshelf:active {
+#toolbar input.editshelf:active,
+input.editshelf:active,
+#toolbar input.deleteshelf:active,
+input.deleteshelf:active {
border : 0;
}
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
index b79ddab..66f88c7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -306,6 +306,7 @@ $(function() {
<h3><a href="/cgi-bin/koha/opac-shelves.pl">Lists</a> <img src="<!-- TMPL_VAR NAME="themelang" -->/../images/caret.gif" width="16" height="16" alt=">" border="0" /> <a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelfnumber" -->"><em><!-- TMPL_VAR NAME="shelfname" ESCAPE="html" --></em></a> <img src="<!-- TMPL_VAR NAME="themelang" -->/../images/caret.gif" width="16" height="16" alt=">" border="0" /> Editing</h3>
<form method="post" action="/cgi-bin/koha/opac-shelves.pl">
<input type="hidden" name="op" value="modifsave" />
+ <!-- TMPL_IF NAME="showprivateshelves" --><input type="hidden" name="display" value="privateshelves" /><!-- /TMPL_IF -->
<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
<fieldset class="rows">
<ol>
@@ -327,7 +328,7 @@ $(function() {
</li>
</ol>
</fieldset>
- <fieldset class="action"><input type="submit" value="Save" class="submit" /> <a class="cancel" href="/cgi-bin/koha/opac-shelves.pl?shelfnumber=<!-- TMPL_VAR NAME="shelfnumber" -->">Cancel</a></fieldset>
+ <fieldset class="action"><input type="submit" value="Save" class="submit" /> <!-- TMPL_IF NAME="showprivateshelves" --><a class="cancel" href="/cgi-bin/koha/opac-shelves.pl?shelfnumber=<!-- TMPL_VAR NAME="shelfnumber" -->&display=privateshelves">Cancel</a><!-- TMPL_ELSE --><a class="cancel" href="/cgi-bin/koha/opac-shelves.pl?shelfnumber=<!-- TMPL_VAR NAME="shelfnumber" -->">Cancel</a><!-- /TMPL_IF --></fieldset>
</form>
<!-- /TMPL_IF --><!-- /edit -->
--
1.7.0
More information about the Koha-patches
mailing list