[Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 3918 - Add to order lists inconsistent
Nicole Engard
nengard at bywatersolutions.com
Tue Jan 4 20:31:46 CET 2011
From: Owen Leonard <oleonard at myacpl.org>
- Added new include to contain add to basket options
- Minor markup corrections
Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
---
.../en/includes/acquisitions-add-to-basket.inc | 14 ++++++++++++++
.../prog/en/modules/acqui/basket.tmpl | 15 +--------------
.../prog/en/modules/acqui/neworderbiblio.tmpl | 19 +++----------------
3 files changed, 18 insertions(+), 30 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc
new file mode 100644
index 0000000..7eae563
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc
@@ -0,0 +1,14 @@
+<fieldset id="acqui_basket_add">
+ <legend>Add Order To Basket</legend>
+ <form action="/cgi-bin/koha/acqui/neworderbiblio.pl" method="post">
+ <input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->" />
+ <input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
+ <ul><li><label for="q">From an existing record: </label><input id="q" type="text" size="25" name="q" />
+ <input type="submit" class="submit" value="Search" /></li>
+ <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->">From a Suggestion</a></li>
+ <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->">From a new (empty) record</a></li>
+ <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->">From an external source</a></li>
+ <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->"> From a staged file</a></li>
+ </ul>
+ </form>
+</fieldset>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
index 9079b6d..aaa7462 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
@@ -288,20 +288,7 @@
</div>
<br />
<!-- TMPL_UNLESS name="closedate" -->
- <fieldset id="acqui_basket_add">
- <legend>Add Order To Basket</legend>
- <form action="/cgi-bin/koha/acqui/neworderbiblio.pl" method="post">
- <input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->" />
- <input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
- <ul><li><label for="q">From an existing record: </label><input id="q" type="text" size="25" name="q" />
- <input type="submit" class="submit" value="Search" /></li>
- <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->">From a Suggestion</a></li>
- <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->">From a new (empty) record</a></li>
- <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->">From an external source</a></li>
- <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->"> From a staged file</a></li>
- </ul>
- </form>
- </fieldset>
+ <!-- TMPL_INCLUDE NAME="acquisitions-add-to-basket.inc" -->
<!-- /TMPL_UNLESS -->
<!-- /TMPL_UNLESS -->
<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
index 9437185..76102d1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
@@ -19,8 +19,8 @@
<!-- TMPL_IF NAME="total" -->
-<b><!-- TMPL_VAR NAME="total" --> results found </b>
-<!-- TMPL_VAR name='pagination_bar'-->
+<b><!-- TMPL_VAR NAME="total" --> results found </b>
+<div class="pages"><!-- TMPL_VAR name='pagination_bar'--></div>
<!-- TMPL_ELSE -->
<h3> No results found</h3>
<p>
@@ -77,20 +77,7 @@
</div>
<!-- /TMPL_IF -->
-<fieldset id="acqui_basket_add">
- <legend>Add To Order</legend>
- <form action="/cgi-bin/koha/acqui/neworderbiblio.pl" method="post">
- <input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->" />
- <input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
- <ul><li><label for="q">From an existing record: </label><input id="q" type="text" size="25" name="q" />
- <input type="submit" class="submit" value="Search" /></li>
- <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->">From a Suggestion</a></li>
- <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->">From a new (empty) record</a></li>
- <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->">From an external source</a></li>
- <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->"> From a staged file</a></li>
- </ul>
- </form>
- </fieldset>
+<!-- TMPL_INCLUDE NAME="acquisitions-add-to-basket.inc" -->
</div>
</div>
--
1.5.6.5
More information about the Koha-patches
mailing list