From ddfe9f2c26463263c6ef96392828c9e5049a6feb Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 5 Oct 2007 02:32:05 -0500 Subject: [PATCH] More work on global resident search, toolbars, and menus. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- .../prog/en/css/staff-global.css | 22 ++- .../prog/en/includes/acquisitions-menu.inc | 4 +- .../prog/en/includes/acquisitions-search.inc | 21 +++ .../prog/en/includes/acquisitions-toolbar.inc | 12 ++ .../prog/en/includes/authorities-search.inc | 4 + .../prog/en/includes/authorities-toolbar.inc | 16 ++ .../prog/en/includes/cataloging-search.inc | 4 +- .../prog/en/modules/acqui/acqui-home.tmpl | 6 +- .../prog/en/modules/acqui/basket.tmpl | 2 +- .../prog/en/modules/acqui/bookfund.tmpl | 2 +- .../prog/en/modules/acqui/booksellers.tmpl | 4 +- .../prog/en/modules/acqui/histsearch.tmpl | 2 +- .../prog/en/modules/acqui/lateorders.tmpl | 2 +- .../prog/en/modules/acqui/neworderbiblio.tmpl | 4 +- .../prog/en/modules/acqui/neworderempty.tmpl | 166 ++++++++--------- .../prog/en/modules/acqui/orderreceive.tmpl | 2 +- .../prog/en/modules/acqui/parcel.tmpl | 2 +- .../prog/en/modules/acqui/parcels.tmpl | 2 +- .../prog/en/modules/acqui/spent.tmpl | 2 +- .../prog/en/modules/acqui/supplier.tmpl | 175 +++++++++--------- .../modules/authorities/authorities-home.tmpl | 36 +--- .../en/modules/authorities/authorities.tmpl | 24 +-- .../prog/en/modules/catalogue/detail.tmpl | 7 +- .../prog/en/modules/cataloguing/addbooks.tmpl | 6 +- 24 files changed, 283 insertions(+), 244 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.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 3660726f33..bd7b23fed1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -245,6 +245,7 @@ div#header_search { float: left; padding-left : 14.2em; margin: .3em 0 .5em 0; + min-height : 52px; } div#header_search input { @@ -268,6 +269,12 @@ div#circ_search,div#catalog_search,div#patron_search,div#subscription_search,div padding : 0 0 .2em 0; } +div#header_search div.residentsearch { + border : 0; + border-bottom : 1px solid #FF9900; + padding : 0 0 .2em 0; +} + div#reserves,div#checkouts { border : 1px solid #E8E8E8; padding : 1em; @@ -520,6 +527,8 @@ padding: 0; width: 100%; } + + fieldset.rows legend { margin-left: 1em; font-weight: bold; @@ -529,7 +538,7 @@ fieldset.rows legend { fieldset.rows label, fieldset.rows span.label { float: left; font-weight : bold; - width: 12em; + width: 9em; margin-right: 1em; text-align: right; } @@ -556,6 +565,17 @@ fieldset.rows.left li { padding-bottom : .4em; } +fieldset.rows li.radio { + padding-left: 9em; + width : auto; +} + +fieldset.rows li.radio label { + float : none; + width : auto; + margin : 0 0 0 1em; +} + fieldset.rows ol.radio label { width : auto; float : none; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc index 5668ee9f59..86a7f70d35 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc @@ -1,7 +1,5 @@ \ 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 new file mode 100644 index 0000000000..e2723deeed --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc @@ -0,0 +1,21 @@ + + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc new file mode 100644 index 0000000000..8be2bd4c5a --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc new file mode 100644 index 0000000000..ffb5d806e8 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc new file mode 100644 index 0000000000..03d0d37155 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc @@ -0,0 +1,16 @@ +
+ +
+ + + +
+
\ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc index 40e65278a4..58651109cc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc @@ -1,7 +1,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl index 8c07b3abda..23fae053ca 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl @@ -4,7 +4,7 @@ - + @@ -14,12 +14,14 @@
+ +

Acquisitions

Start, receive, or modify any order - You must define a budget in parameters + You must define a budget in Administration

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 eb418b8ee0..194a67793e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl @@ -15,7 +15,7 @@ - +

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl index 404c1b582f..3d0601cded 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl @@ -4,7 +4,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl index d688029789..8a708aa444 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl @@ -4,7 +4,7 @@ - + @@ -14,6 +14,8 @@
+ +

You searched on supplier , results found

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 f412d57361..b801f55485 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl @@ -6,7 +6,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl index 15f8d4486c..bef259d1cb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl @@ -4,7 +4,7 @@ - + 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 27eecc7423..e5697deebe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl @@ -4,7 +4,7 @@ - + @@ -39,7 +39,7 @@
- + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl index 6accf54c2f..674f123f8a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl @@ -69,7 +69,7 @@ if (quantity ==0) { - + @@ -79,7 +79,6 @@ if (quantity ==0) {
-

Modify order details (line #) @@ -101,7 +100,7 @@ if (quantity ==0) { -
+
Catalogue details @@ -120,65 +119,65 @@ if (quantity ==0) { " value="" /> -

+

  1. - Title - " /> + Title + " /> " /> -

    -

    +

    2. +
  2. - Author - " /> + Author + " /> - " /> + " /> -

    -

    +

    3. +
  3. - Publisher - " /> + Publisher + " /> - " /> + " /> -

    -

    +

    4. +
  4. - Copyright Date - " /> + Copyright Date + " /> - " /> + " /> -

    -

    +

    5. +
  5. -

    -

    +

    6. +
  6. - ISBN - " /> + ISBN + " /> - " /> + " /> -

    -

    +

    7. +
  7. - Series - " /> + Series + " /> - " /> + " /> -

    -

    +

    8. +
  8. -

    +
-
+
Accounting details -

+

  • - Quantity - " /> + Quantity + " /> - " onchange="update(this.form);" /> + " onchange="update(this.form);" /> -

    -

    +

    • +
  • - Bookfund - " /> + Bookfund + " /> -

    -

    +

    • +
  • - Supplier price - " /> + Supplier price + " /> - " onchange="update(this.form)" /> + " onchange="update(this.form)" /> -

    -

    +

    • +
  • - Replacement Cost - " /> + Replacement Cost + " /> - " /> + " /> -

    -

    +

    • +
  • - Budgeted Cost - " readonly="readonly" /> + + " readonly="readonly" /> - " /> + " /> -

    +
    • -

    +

  • - Budgeted GST - + + - + -

    +
    • -

    +

  • - Total - " readonly="readonly" /> + + " readonly="readonly" /> - + " /> -

    -

    +

    • +
  • - Actual Cost - " readonly="readonly" /> + + " readonly="readonly" /> " /> -

    -

    +

    • +
  • " />(usually empty) -

    -

    +

    • +
  • " /> -

    -

    The 2 following fields are available for your own usage. They can be useful for stat purposes

    -

    +

    • +
  • The 2 following fields are available for your own usage. They can be useful for statistical purposes " /> -

    -

    +

    • +
  • " /> -

    +

    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl index 8c483f4d3d..db9eba99bc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl @@ -4,7 +4,7 @@ - +

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl index a2af92ebd5..6c705913f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl @@ -5,7 +5,7 @@ - +
    -

    - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl index b76b757c0c..a6be6b700a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl @@ -160,9 +160,10 @@ function confirm_deletion(count) { -
    -/ref=sib_dp_pt/002-7879865-0184864#reader-link">.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Book Cover Image" /> -
    + +
    /ref=sib_dp_pt/002-7879865-0184864#reader-link">.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Book Cover Image" /> +
    +
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl index 7bef6899fb..8a5b770579 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl @@ -13,12 +13,10 @@ -
      +
      -
      - No items found @@ -160,8 +158,6 @@
      - -
      \ No newline at end of file -- 2.39.2
    SummarySummary