From f69e913c8be248472675fc6a86fec144a7d5f8ff Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 6 Nov 2007 15:05:16 -0600 Subject: [PATCH] Some random changes, including search box and toolbar for bookfunds, formatting of change language block in the footer, fix for delete shelf bug. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- .../prog/en/css/staff-global.css | 37 +++++- .../en/includes/bookfund-admin-search.inc | 110 ++++++++++++++++++ .../en/includes/bookfund-admin-toolbar.inc | 21 ++++ .../prog/en/includes/intranet-bottom.inc | 2 +- .../prog/en/modules/acqui/neworderempty.tmpl | 86 +++++++------- .../prog/en/modules/admin/aqbookfund.tmpl | 58 ++------- .../prog/en/modules/admin/aqbudget.tmpl | 85 +++++++------- .../prog/en/modules/catalogue/detail.tmpl | 16 +-- .../prog/en/modules/catalogue/results.tmpl | 14 ++- .../en/modules/virtualshelves/shelves.tmpl | 12 +- 10 files changed, 288 insertions(+), 153 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-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 76e48daf68..d77a1eebf7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -524,9 +524,9 @@ fieldset.brief ol, fieldset.brief li { list-style-type : none; } -fieldset.brief div.hint { +fieldset.brief div.hint, fieldset.rows div.hint { color : #999999; - font-size : 90%; + font-size : 95%; margin-bottom : .4em; } @@ -555,14 +555,23 @@ fieldset.rows label, fieldset.rows span.label { text-align: right; } + .yui-b fieldset.rows label, .yui-b fieldset.rows span.label { width: 9em; } +.yui-b fieldset.rows div.hint { + margin-left : 10.5em; +} + .yui-u fieldset.rows label, .yui-u fieldset.rows span.label { width: 6em; } +.yui-u fieldset.rows div.hint { + margin-left : 7.5em; +} + fieldset.rows.left label, fieldset.rows.left span.label { width : 8em; text-align : left; @@ -951,4 +960,28 @@ div.first fieldset { .accesskey { text-decoration : underline; + } + + #changelanguage { + background-color : #F3F3F3; + border-top : 1px solid #E8E8E8; + font-size : 93%; + margin-top : 2em; + padding : .3em .5em .5em .5em; + } + + #changelanguage ul { + margin : 0; + padding : 0; + } + + #changelanguage li { + border-left : 1px solid #CCC; + display : inline; + list-style : none; + padding : 0 .5em; + } + + #changelanguage li:first-child { + border-left : 0; } \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc new file mode 100644 index 0000000000..c6ea1c6092 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc @@ -0,0 +1,110 @@ + + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-toolbar.inc new file mode 100644 index 0000000000..f075bbf8b8 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-toolbar.inc @@ -0,0 +1,21 @@ +
+ +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc index eb45f8aaa8..2ca4fe03ff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc @@ -1,7 +1,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 c205c561e0..7ab32b37ff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl @@ -90,12 +90,12 @@ if (quantity ==0) {
    Basket Details -

    Basket Number:

    -

    Managed By:

    -

    Open On:

    -

    ForSupplier Id:

    -

    Invoice Number:

    -

    Closed On:

    +
    • Basket number:
      • +
    • Managed by:
      • +
    • Open on:
      • +
    • For supplier id:
      • +
    • Invoice number:
      • +
    • Closed on:
    @@ -124,61 +124,61 @@ if (quantity ==0) { Title " /> - + " />
  • - Author + Author: " /> - + " />
  • - Publisher + Publisher: " /> - + " />
  • - Copyright Date + Copyright date: " /> - + " />
  • - +
  • - ISBN + ISBN: " /> - + " />
  • - Series + Series: " /> - + " />
  • - +
    • +
    Accounting details +
    1. - Quantity + Quantity: " /> - + " onchange="update(this.form);" />
    2. - Bookfund + Bookfund: " /> - +
    3. - Supplier price + Supplier price: " /> - + " onchange="update(this.form)" />
    4. - Replacement Cost + Replacement cost: " /> - + " />
    5. - + " readonly="readonly" /> - + " />
    6. - + - +
    7. - + " readonly="readonly" /> - + " />
    8. - + " readonly="readonly" /> - + " />
    9. - - " />(usually empty) + + " /> (usually empty)
    10. - - " /> + +
      11. -
    11. The 2 following fields are available for your own usage. They can be useful for statistical purposes
      +
    12. The 2 following fields are available for your own usage. They can be useful for statistical purposes
      - + " />
      13. @@ -285,7 +287,7 @@ if (quantity ==0) { - + " />
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl index 908c5ea69d..cf3fbb17be 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl @@ -61,63 +61,30 @@ - + - +
    + +

    Funds and budgets administration

    +
    - - - -" method="post"> - - - - - + - - @@ -137,8 +104,8 @@
    Code Name BranchActions
    - - - " /> - - - - - Actions
    - ?op=add_form&bookfundid=&branchcode=">Edit - ?op=delete_confirm&bookfundid=&branchcode=">Delete + ?op=add_form&bookfundid=&branchcode=">Edit + ?op=delete_confirm&bookfundid=&branchcode=">Delete &branchcode=">Add budget ">Show budgets @@ -148,16 +115,15 @@
    +

    - ?op=add_form">Add fund Show all budgets

    - @@ -213,9 +179,9 @@
    -

    - -

    +
    + Cancel +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl index e42010c64d..230e816772 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl @@ -84,21 +84,10 @@

    Budgets

    -
    - - - - - - - - - - - - - - - - - + + +
    + + +
    Book fundBranchStart dateEnd dateBudget amountActions
    - @@ -108,9 +97,9 @@ - - @@ -120,9 +109,9 @@ - - @@ -154,9 +143,9 @@ ); //]]> - - @@ -175,7 +164,7 @@ - " /> + " /> /lib/calendar/cal.gif" id="filter_enddate_button" alt="Show Calendar" /> - - @@ -210,12 +199,21 @@ " size="8" /> - - -
    + + + + + + + - + @@ -228,13 +226,12 @@
    Book fundBranchStart dateEnd dateBudget amountActions
    - ">Edit + ">Edit ">Delete
    -
    @@ -323,14 +320,13 @@ -

    - -

    +
    + Cancel +
    -
    " method="post">
    Delete Book Budget? @@ -351,15 +347,18 @@ +
    +
    +" method="post"> " /> - -

    +

    +
    -

    -
    - + + +
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 f148f86646..4ee7757654 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl @@ -44,23 +44,23 @@
  • "> -  
    • + -
  • Illustrator:  
    • +
  • Illustrator:
  • Publisher: "> -   +
    • -
  • in: 
    • +
  • in:
  • Description: @@ -78,10 +78,10 @@
      -
    • ISBN:  
      • +
    • ISBN:
      • -
    • ISSN: 
      • +
    • ISSN:
    • Collection: @@ -93,7 +93,7 @@
      • "> -  
        • +
      • @@ -126,7 +126,7 @@
    • URL: - ">  + ">
      • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl index d3b3bb25ce..f57d5d8869 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl @@ -6,6 +6,8 @@ + +
      @@ -26,7 +28,6 @@

      results found for '' - Perform a new search

      @@ -34,13 +35,11 @@

      No results match your search for “” in Catalog.

      - Perform a new search

      No result found !

      You did not specify any search criteria.

      - Perform a new search @@ -94,7 +93,11 @@ Count - class="highlight"> + + + + + """> @@ -312,7 +315,7 @@
      - +
      @@ -334,7 +337,6 @@
      -
    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 975a320bfb..3e760b2f78 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl @@ -22,10 +22,11 @@ $(document).ready(function(){ }); }); -function confirmDelete(s){ - if (window.confirm(s)) - return true; +function confirmDelete(s,n){ + if (window.confirm(s)) { + location.href="/cgi-bin/koha/virtualshelves/shelves.pl?shelves=1&DEL-=1"; } else { return false; + } } /** * this function checks all checkbox @@ -129,8 +130,9 @@ function confirmDelete(s){ - - + +
    + -- 2.39.5