From 9ee41cf025a58aacfab039e89d3a1351d8e3b478 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 1 Nov 2007 20:36:02 -0500 Subject: [PATCH] Some formatting and layout chances to acquisitions pages. Taking out table filter-style search form on histsearch.pl and replacing it with standard advanced-search style form list. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- .../prog/en/css/staff-global.css | 6 +- .../includes/acquisitions-history-search.inc | 22 ++++++ .../prog/en/includes/acquisitions-search.inc | 2 +- .../prog/en/modules/acqui/histsearch.tmpl | 68 +++++++++---------- .../prog/en/modules/acqui/supplier.tmpl | 61 ++++++++++------- 5 files changed, 95 insertions(+), 64 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc 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 c35e9df8ec..0d61ebb040 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -529,7 +529,7 @@ fieldset.rows legend { fieldset.rows label, fieldset.rows span.label { float: left; font-weight : bold; - width: 9em; + width: 6em; margin-right: 1em; text-align: right; } @@ -599,6 +599,10 @@ fieldset.action { width : auto; } +a.cancel { + padding-left : 1em; +} + fieldset.rows fieldset.action { padding : 0 0 1em 1em; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc new file mode 100644 index 0000000000..03bec164c1 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc @@ -0,0 +1,22 @@ + + + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc index e2723deeed..3b24040d14 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc @@ -10,7 +10,7 @@

Search orders:

- " /> " /> + " /> " /> Advanced
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl index b1970bf4df..35e2e63faf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl @@ -1,14 +1,14 @@ -Koha › Acquisitions › Order search +Koha › Acquisitions › <!-- TMPL_IF NAME="suggestions_loop" -->Orders search › Search Results<!-- TMPL_ELSE -->Order search<!-- /TMPL_IF --> - + - +
@@ -16,29 +16,14 @@
- - -

Order search

-
-
- - - - - - - - - - - - - - - - - - - - - - + + + +
+ +

Search Results

+
+
 TitleAuthorSupplierPlaced onRecieved onQuantity orderedUnit cost 
Filter By:" />" />" /> /lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="Show Calendar" /> + +
+ Search Orders +
    +
  1. " />
  2. +
  3. " />
  4. +
  5. " />
  6. +
  7. /lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="Show Calendar" /> " /> - /lib/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" alt="Show Calendar" /> +
  8. +
  9. /lib/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" alt="Show Calendar" /> " type="text" />
   
+ + + + + + + + + + -
 TitleAuthorSupplierPlaced onReceived onQuantity orderedUnit cost
@@ -115,12 +113,10 @@  
- -
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl index 48ff52facf..5921041fff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl @@ -22,20 +22,19 @@ function confirm_deletion() {
-
- - - - -
- - " /> - - + +

Update:

Add supplier

+ + + + +
+
+ " />
Company details
  1. @@ -51,6 +50,8 @@ function confirm_deletion() {
  2. " />
+
+
Contact details
  1. @@ -68,6 +69,9 @@ function confirm_deletion() {
+
+
+
Ordering information
  1. @@ -101,7 +105,7 @@ function confirm_deletion() { -
  2. +
  3. Ordering prices @@ -110,7 +114,7 @@ function confirm_deletion() { -
  4. +
  5. Invoice prices @@ -119,19 +123,24 @@ function confirm_deletion() { -
  6. +
  7. " /> %
  8. -
+ + + + + +
-

+
">Cancel
+
-

Information for :

- -
-

Company details

+

+
+

Company Name:

Postal Address: @@ -145,7 +154,7 @@ function confirm_deletion() {

Web site: ">

-
+

Contact details

Contact name:

@@ -159,11 +168,12 @@ function confirm_deletion() {

E-mail: ">

-

Notes: -

+

Notes: +

-
+
+

Ordering information

Supplier is: @@ -183,13 +193,12 @@ function confirm_deletion() { YesNo

Discount: %

-

Notes: -

+

Notes: +

-
\ No newline at end of file -- 2.39.5