From fefe64cf55bb15ba82583bc1a6705605fabdc12e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Sat, 20 Oct 2007 16:42:04 -0500 Subject: [PATCH] More work on standardizing toolbars. Also standardizing form markup in /tools Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- .../prog/en/includes/cataloging-toolbar.inc | 59 +++++++++++++ .../prog/en/includes/serials-toolbar.inc | 41 +++++++-- .../prog/en/includes/tools-labels-toolbar.inc | 25 ++++++ .../prog/en/includes/tools-news-toolbar.inc | 21 +++++ .../en/includes/tools-notices-toolbar.inc | 21 +++++ .../en/modules/cataloguing/addbiblio.tmpl | 38 ++++++--- .../prog/en/modules/cataloguing/addbooks.tmpl | 31 ++----- .../modules/labels/label-create-layout.tmpl | 28 +++--- .../modules/labels/label-create-template.tmpl | 78 +++++++++-------- .../prog/en/modules/labels/label-home.tmpl | 5 +- .../prog/en/modules/labels/label-manager.tmpl | 18 +--- .../en/modules/labels/label-templates.tmpl | 5 +- .../prog/en/modules/serials/serials-home.tmpl | 3 +- .../modules/serials/subscription-detail.tmpl | 3 +- .../prog/en/modules/tools/breeding.tmpl | 49 +++++------ .../prog/en/modules/tools/cleanborrowers.tmpl | 18 ++-- .../prog/en/modules/tools/export.tmpl | 72 ++++++++-------- .../prog/en/modules/tools/import.tmpl | 49 +++++------ .../prog/en/modules/tools/inventory.tmpl | 49 ++++++----- .../prog/en/modules/tools/koha-news.tmpl | 65 ++++++-------- .../prog/en/modules/tools/letter.tmpl | 85 +++++++++---------- 21 files changed, 449 insertions(+), 314 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/tools-labels-toolbar.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/tools-news-toolbar.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/tools-notices-toolbar.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc new file mode 100644 index 0000000000..af323bc20f --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc @@ -0,0 +1,59 @@ + + +
+ + + + + New Record + +
+ + + +
+ +
+
\ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc index 0ab061961a..438bd5e71b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc @@ -1,10 +1,35 @@ -
+
-
\ No newline at end of file +
\ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-labels-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-labels-toolbar.inc new file mode 100644 index 0000000000..e303223de3 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-labels-toolbar.inc @@ -0,0 +1,25 @@ +
+ +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-news-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-news-toolbar.inc new file mode 100644 index 0000000000..373a036ee2 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-news-toolbar.inc @@ -0,0 +1,21 @@ +
+ +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-notices-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-notices-toolbar.inc new file mode 100644 index 0000000000..0f140b1903 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-notices-toolbar.inc @@ -0,0 +1,21 @@ +
+ +
\ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl index 33ee5e217c..d4c1a95623 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl @@ -1,6 +1,7 @@ Koha › Cataloging › <!-- TMPL_IF NAME="biblionumber" -->Edit MARC Record Number <!-- TMPL_VAR name="biblionumber" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --> + + +
    +
  • +
  • +
  • +
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 8a5b770579..93ad58dd3e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl @@ -1,13 +1,14 @@ Koha › Cataloguing + - + @@ -17,34 +18,12 @@
+ + + No items found - - - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl index a8e404613f..e705d82340 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl @@ -16,11 +16,13 @@
-

-" />

- -

+
+Create Layout +
  1. +" />
  2. +
  3. +Choose Order Of Fields to Print - -
    @@ -196,7 +198,7 @@ +
    +
  4. -

    +

  5. +
  6. -

    +

  7. -

    -

    +
  8. +
  9. +
  10. -

    +

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl index b89dccc94f..db9be7c538 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl @@ -5,7 +5,7 @@ - +
@@ -15,46 +15,54 @@
-

Create Label Template

+
+Create Label Template +
    +
  1. +
  2. -

    Template Settings

    - - -Template Code:
    -Template Description:
    - - - - - - - - - - - - - - - - - - - - - -
    Page Width:Page Height:
    Label Width:Label Height:
    Top Page Margin:Left Page Margin:
    Number of Columns:Number of Rows:
    Gap between Columns:Gap between Rows:
    - - -Units: - -Font Size: -Active: + +
  3. + +
  4. +
  5. + +
  6. +
  7. + +
  8. +
  9. + +
  10. +
  11. + +
  12. +
  13. + +
  14. +
  15. + +
  16. +
  17. + +
  18. +
  19. + +
  20. +
  21. + +
  22. + +
  23. +
  24. +
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl index b85f93b022..221359cb58 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl @@ -1,7 +1,8 @@ Koha › Labels + - + @@ -13,6 +14,7 @@
+ @@ -59,7 +61,6 @@ -

Create New Layout

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl index d3beaf7851..06ff803bff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl @@ -1,12 +1,13 @@ Koha › Labels + - + @@ -18,23 +19,11 @@ function Plugin(batch_id) {
+ -
-Create New Batch - - - - - - ---> -

Label Batches

@@ -69,7 +58,6 @@ function Plugin(batch_id) {
-
); return false;">Add item(s) to batch      Return to batch summary     diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl index 91ca3817d9..651cd8d9f0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl @@ -1,7 +1,8 @@ Koha › Labels + - + @@ -13,6 +14,7 @@
+ @@ -59,7 +61,6 @@ -Create New Label Template
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl index 62585e0b45..94850966da 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl @@ -1,8 +1,9 @@ Koha › Serials <!-- TMPL_VAR name="biblionumber" --> + - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl index 2f58c6b06e..f963d5dfce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl @@ -1,6 +1,7 @@ Koha › Serials › Details for Subscription #<!-- TMPL_VAR name="subscriptionid" --> + - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl index 7e3cd21f60..7e4cc7729b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl @@ -15,7 +15,6 @@

MARC acquisition system

-

Import into the reservoir

Import results :

@@ -35,32 +34,34 @@
  • Of course, if the ISBN already exists in the active DB, the biblio will be ignored.
  • " enctype="multipart/form-data"> -
    - - - - - - - - - - - - - - - - - -
    +
    Import into the reservoir
      +
    1. + + -
    + + +
  • + + -
  • + + +
  • + + -
  • If ISBN is already in the reservoir: Ignore this one, keep the existing one
    - Overwrite the existing one with this
    + + +
    + If ISBN is already in the reservoir: +
      +
    1. +
    2. +
    3. + +
    4. +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl index c146e8a70c..edc13b4f93 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl @@ -58,8 +58,8 @@
    What do you want to do ?

    - Delete borrower who has not borrowed since: - " type="text" />

    + + " type="text" /> +

    -

    - Anonymize issue history older than - " type="text" />

    + + " type="text" /> - -
    - +

    + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl index a48c332c6e..53a1dd1161 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl @@ -19,21 +19,19 @@

    -
    - - Select Records to Export - -

    - +

    + Select Records to Export +
    1. + -

      -

      - +

    2. +
    3. + -

      +
    4. -

      - +

    5. + -

      +
    6. -

      - +

    7. + -

      -

      - +

    8. +
    9. + -

      -

      - +

    10. +
    11. + -

      +
    -
    - - Options - -

    +

    + Options +
    1. -

      -

      +

    2. +
    3. seperate by a blank. (e.g.: 100a 200 606) -

      +
    -
    +
    Output format -

    - +

    1. + - format. -

      -

      - -

      + +
    2. +
    3. + +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl index 3974865aa8..062f3c5b90 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl @@ -15,7 +15,6 @@

    MARC acquisition system

    -

    Import into the reservoir

    Import results :

    @@ -35,32 +34,34 @@
  • Of course, if the ISBN already exists in the active DB, the biblio will be ignored.
  • " enctype="multipart/form-data"> - - - - - - - - - - - - - - - - - - -
    +
    +Import into the reservoir
      +
    1. + +
      -
    + + +
  • + + -
  • + + +
  • + + -
  • If ISBN is already in the reservoir:
    -
    + + +
    +
    + If ISBN is already in the reservoir:
    1. + +
    2. +
    3. + +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl index a0c19cb6be..3828a643dc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl @@ -17,9 +17,9 @@

    Inventory/Stocktaking

    -
    +
    Select items you want to check -

    +

    1. -

      -

      - - " /> - +

    2. +
    3. + + " /> (items.itemcallnumber)
    4. +
    5. " /> -

      +
    6. -

      +

    7. +
    8. -

      +

    9. " /> /lib/calendar/cal.gif" id="datelastseen_button" alt="Show Calendar" /> -

      -

      - " maxlength="5" size="5" /> - +

    10. +
    11. + " maxlength="5" size="5" /> items
    12. +
    13. " size="5" maxlength="5" /> -

      -

      +

    +
    - -

    -
    +
    -
    +
    Use a barcode file -

    -

    +

      +
    1. +
    2. /lib/calendar/cal.gif" id="setdate_button" alt="Show Calendar" /> -

      -

      +
    +

    items modified : datelastseen set to

    can't be opened

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl index 5f40e7e850..2569a73436 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl @@ -2,27 +2,28 @@ Koha › Tools › Koha News + - + - + -
    - +
    + + - -
    -

    OPAC and Koha News

    - +
    " /> " /> -

    +

    + OPAC and Koha News +
    1. -

      -

      +

    2. +
    3. " /> -

      -

      +

    4. +
    5. " /> -

      -

      +

    6. +
    7. -

      -

      News

      - -

      +

    8. +
    9. +
    10. +
    +
    + -

    -
    -
    -
    - - @@ -82,10 +82,8 @@
    -
    -
    -
    + @@ -121,21 +119,14 @@ -

    No news loaded

    -
    - Add news -
    - - - -
    +
    -
    +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl index 0e8c8a6d1e..3e50846cf3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl @@ -1,23 +1,24 @@ Koha › Tools › Notices<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF name="modify" --> › Modify notice<!-- TMPL_ELSE --> › Add notice<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="add_validate" --> › Notice added<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --> › Confirm Deletion<!-- /TMPL_IF --> + - + -
    +
    + -
    You Searched for


    +

    You Searched for

    -
     
    +
    @@ -133,26 +135,21 @@
    Module Code
    -
    - -

    - -

    -
    + + - -

    Modify letter

    - -

    Add letter

    - +
    +
    + Modify letterAdd letter +
      -

      +

    1. -

      -

      - " /> -

      +
    2. +
    3. + Code:" /> +
    4. -

      +

    5. -

      -

      +

    6. +
    7. -

      +
    8. -

      +

    9. " /> -

      -

      - " /> -

      -

      - -

      -

      +

    10. +
    11. + " /> +
    12. +
    13. + +
    14. +
    15. - -

      -

      + +
    16. +
    +
    +

    @@ -300,8 +299,8 @@
    -
    +
    -
    +
    -- 2.39.5