From a24d525e7f33c66182c16e00f8a54bf595762bab Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 18 Sep 2007 14:55:22 -0500 Subject: [PATCH] Cleaning up Tools pages, adding breadcrumbs and resident search form Signed-off-by: Chris Cormack --- .../prog/en/css/staff-global.css | 12 +- .../prog/en/includes/holidays-bottom.inc | 4 - .../prog/en/includes/holidays-top.inc | 166 ------------ .../prog/en/includes/letters-search.inc | 33 +++ .../prog/en/includes/menu-tools.inc | 17 -- .../prog/en/includes/tools-menu.inc | 2 +- .../prog/en/modules/tools/cleanborrowers.tmpl | 2 +- .../prog/en/modules/tools/export.tmpl | 4 +- .../prog/en/modules/tools/holidays.tmpl | 253 +++++++++++++++--- .../prog/en/modules/tools/import.tmpl | 7 +- .../prog/en/modules/tools/inventory.tmpl | 62 ++--- .../prog/en/modules/tools/itemslost.tmpl | 105 +++----- .../prog/en/modules/tools/koha-news.tmpl | 44 ++- .../prog/en/modules/tools/letter.tmpl | 177 ++++++------ .../prog/en/modules/tools/overduerules.tmpl | 2 + .../prog/en/modules/tools/tools-home.tmpl | 83 +++--- .../prog/en/modules/tools/viewlog.tmpl | 37 ++- 17 files changed, 479 insertions(+), 531 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/holidays-bottom.inc delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/holidays-top.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.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 c3775c83df..c394d9b95a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -258,7 +258,7 @@ div#header_search ul.link-tabs li.off a { padding : 0.1em .5em .2em .5em; } -div#circ_search,div#catalog_search,div#patron_search,div#subscription_search,div#addbooks_search { +div#circ_search,div#catalog_search,div#patron_search,div#subscription_search,div#addbooks_search,div#notices_search { border : 0; border-bottom : 1px solid #FF9900; padding : 0 0 .2em 0; @@ -417,4 +417,14 @@ ul.innerBox { div.yui-b h5 { font-size : 100%; margin : .5em 0; +} + +dt { + font-size : 110%; + font-weight : bold; +} + +dd { + padding : .2em; + text-indent : 1.5em; } \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-bottom.inc deleted file mode 100644 index d549cb0f8d..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-bottom.inc +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-top.inc deleted file mode 100644 index 2783caafd3..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-top.inc +++ /dev/null @@ -1,166 +0,0 @@ - -/lib/calendar/calendar-system.css" /> - - - - - - - - - - - - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc new file mode 100644 index 0000000000..6aa1be3bea --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc @@ -0,0 +1,33 @@ + + + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc deleted file mode 100644 index 3a84e037a6..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc +++ /dev/null @@ -1,17 +0,0 @@ - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc index a6a3ffbaac..77a9ca92b7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc @@ -9,7 +9,7 @@
  • Import
  • Letters
  • Reservoir
    • -
  • Labels
    • +
  • Labels
  • Overdue Rules
  • Log viewer
    • \ No newline at end of file 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 4fff318006..b76b0b0282 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl @@ -2,7 +2,7 @@ Koha › Tools › Clean Patron Records - + + - + + + + + +
    + +
    +
    +
    + @@ -11,84 +177,77 @@
    -
    +

    Hide Details - /images/signClose.gif" hspace="0" vspace="0" border="0" style="vertical-align:middle"> + /images/signClose.gif" border="0" alt="" style="vertical-align:middle" />

    - - + +

    - +

    - Day - Month - Year + + +
    -

    Add a description to holiday day.

    +

    - Generate an exception to this holiday - /images/more.gif" hspace="0" vspace="0" border="0" style="vertical-align:middle;cursor:pointer" - onclick=" additionalInformation('You can make an exception for this holiday rule. This means that you will be able to say for a repeatable holiday, that there is one of those days that is going to be an exception.')"> -
    + + /images/more.gif" border="0" alt="More information" />
    - Delete this holiday. - /images/more.gif" hspace="0" vspace="0" border="0" style="vertical-align:middle;cursor:pointer" - onclick=" additionalInformation('This will delete this holiday rule. In case it is a repeatable holiday, this option checks for posible exceptions. In case those exists, this option take care of set this exceptions to regular holidays.')"> + . + /images/more.gif" border="0" alt="More information" />

    - - + +

    -
    +

    Add new holiday

    - +

    - +

    - Day - Month - Year + + +

    - +

    - Holiday only on this day. - /images/more.gif" hspace="0" vspace="0" border="0" style="vertical-align:middle;cursor:pointer" - onclick=" additionalInformation('This will take this date to make it holiday just for this time. Through this option, you can set a single holiday. For example, suppose you are in August 1st, and only for this year you want to make it holiday.')"> + . + /images/more.gif" border="0" alt="More information" />
    - Holiday repeated every same day of the week - /images/more.gif" hspace="0" vspace="0" border="0" style="vertical-align:middle;cursor:pointer" onclick=" additionalInformation('This will take this week day and make it holiday. No matter what date it is, this option will repeat this rule for every week. For example, if this date correspond to a saturday, every saturdays will be holidays.')"> + + /images/more.gif" border="0" alt="More information" />
    - Holiday repeated yearly on the same date. - /images/more.gif" hspace="0" vspace="0" border="0" style="vertical-align:middle;cursor:pointer" onclick=" additionalInformation('This will take this day and month as a reference to make it holiday. Through this option, you can repeat this rule for every year. For example, if this date correspond to a August 1st, every August 1st will be holiday, no matter what year you are.')"> + . + /images/more.gif" border="0" alt="More information" />

    - - + +

    @@ -104,13 +263,13 @@ -
    +
    - - @@ -212,4 +371,10 @@ ); - + + +
    + +
    + + 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 0d26d43ed3..3974865aa8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl @@ -5,6 +5,9 @@ + + +
    @@ -53,9 +56,9 @@
    - + +
    - /images/info.gif" hspace="0" vspace="0" border="0" style="vertical-align:middle"> + + /images/info.gif" border="0" style="vertical-align:middle" alt="" /> +

    If ISBN is already in the reservoir: Ignore this one, keep the existing one
    - Overwrite the existing one with this
    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 30bcec5bb5..a0c19cb6be 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl @@ -1,17 +1,13 @@ -Koha › Inventory +Koha › Tools › Inventory - -/lib/calendar/calendar-system.css" /> - - - - + - + +
    @@ -20,29 +16,29 @@

    Inventory/Stocktaking

    -
    +
    Select items you want to check

    - - + - +

    - Item Location (items.itemcallnumber) between - " /> - and - " /> + + " /> + + " />

    - Item Location (items.location) is +

    -

    +

    " /> - /lib/calendar/cal.gif" id="datelastseen_button" /> -

    -

    - " maxlength="5" size="5" /> - items beginning at offset - " size="5" maxlength="5" /> +

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

    - +

    -
    +
    Use a barcode file -

    barcode filename :

    -

    Set datelastseen to : - /lib/calendar/cal.gif" id="setdate_button" /> -

    -

    +

    items modified : datelastseen set to

    @@ -109,7 +105,7 @@

    -
    + " /> " /> @@ -146,7 +142,7 @@
    -
    + " /> " /> " /> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/itemslost.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/itemslost.tmpl index 5625d8ce94..ed89ab518e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/itemslost.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/itemslost.tmpl @@ -6,23 +6,24 @@ + +
    -

    Items lost

    +

    Lost Items

    - +
    - lost item found. + lost item(s) found. - No lost item found... + No lost items found. - -
    -
    +
    + - - - - - - - + + + + + + + - - - - + + + - + - - + + + - - - - - - - + + + + + + +
    - Barcode - - Date last seen - - Price - - Branch - - Itemtype - - Holdingbranch - - Location - BarcodeDate last seenPriceBranchItemtypeHoldingbranchLocation
    - - - - - - - - - - - - - -
    - " title=""> + " title=""> - - - - - - - - - - - - - -
    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 809222db96..5f6154a021 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 @@ -1,18 +1,14 @@ -Koha › News Management +Koha › Tools › Koha News - -/lib/calendar/calendar-system.css" /> - - - - - + + +
    @@ -21,7 +17,7 @@
    -

    OPAC & KOHA News

    +

    OPAC and Koha News

    " /> @@ -31,14 +27,8 @@

    @@ -60,7 +50,7 @@

    - + @@ -82,15 +72,15 @@ - - + - +

    @@ -98,14 +88,14 @@
    - + - + @@ -124,11 +114,7 @@ - +
      Language Number Creation Date Expiration Date Title News 
    - "> - Edit - - ">Edit
    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 47932582d3..73db2b2aa4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl @@ -1,57 +1,9 @@ -Koha › Letters Administration +Koha › Tools › Letters<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF name="modify" --> › Modify letter<!-- TMPL_ELSE --> › Add letter<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="add_validate" --> › Letter added<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --> › Confirm Deletion<!-- /TMPL_IF --> - - - - - -
    - -
    -
    -
    - - - - - - -
    You Searched for


    - - - - - - - - - - - > - - - - - - - -
    ModuleCodeName  
    - &code=">Edit - - &code=">Delete -
    -

    - -
    - -
    -
    -
    - - - - + + + + + + + + +
    + +
    +
    +
    + + + + +
    You Searched for


    + + + + + + + + + + + > + + + + + + + +
    ModuleCodeName  
    + &code=">Edit + + &code=">Delete +
    +

    + +

    + +

    +
    + + + + -

    Modify letter

    +

    Modify letter

    -

    Add letter

    +

    Add letter

    - - + +

    - - @@ -185,14 +188,14 @@

    - "> + " />

    - - @@ -226,21 +229,21 @@

    - +

    - "> + " />

    - "> + " />

    - +

    - @@ -248,56 +251,50 @@

    -

    +

    Data recorded
    " method="post"> - +
    - - - - - -
    /images/background-mem.gif"> +

    Delete Letter?

    + + + - - - " method="post"> - "> - "> - - - - -
    module / Code /images/background-mem.gif"> + /
    Name
    CONFIRM DELETION
    - +
    +

    " method="post"> + " /> + " /> + -

    		+
    " method="post"> - +
    -
    +

    + Data deleted
    " method="post"> - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl index 82cc5c2cfa..7e0936dc05 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl @@ -6,6 +6,8 @@ + +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl index b70566b447..2494d25a87 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl @@ -6,6 +6,8 @@ + +
    @@ -14,53 +16,40 @@

    Koha tools

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Various tools
    Label creatorCreate printable labels and barcodes from catalog data.
    HolidaysDefine holidays (days where the library is closed)
    ExportExport data
    Reservoir ImportImport data into the reservoir.
    NewsWrite news for the OPAC and staff interfaces.
    LettersDefine letters (notifications for overdues, etc.)
    Overdue rulesRules for overdue books
    Inventory/stocktakingPerform inventory (stocktaking) of your catalogue
    Clean borrowersDelete old borrowers and anonymize circulation history (deletes borrower reading history)
    Items lostShow lost items
    Log viewerBrowse the system logs
    +
    +
    Label creator
    +
    Create printable labels and barcodes from catalog data.
    + +
    Holidays
    +
    Define holidays (days where the library is closed)
    + +
    Export
    +
    Export data
    + +
    Reservoir Import
    +
    Import data into the reservoir.
    + +
    News
    +
    Write news for the OPAC and staff interfaces.
    + +
    Letters
    +
    Define letters (notifications for overdues, etc.)
    + +
    Overdue rules
    +
    Rules for overdue books
    + +
    Inventory/stocktaking
    +
    Perform inventory (stocktaking) of your catalogue
    + +
    Clean borrowers
    +
    Delete old borrowers and anonymize circulation history (deletes borrower reading history)
    + +
    Items lost
    +
    Show lost items
    + +
    Log viewer
    +
    Browse the system logs
    +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl index 2f9e23195c..57bff5bbcc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl @@ -1,19 +1,13 @@ Koha › Tools › Logs - -/lib/calendar/calendar-system.css" /> - - - - - + - +
    @@ -28,9 +22,9 @@
    Additional infos

    - Display from " /> - /lib/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top"> - - to " /> - /lib/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0"> + " /> + /lib/calendar/cal.gif" id="openCalendarTo" alt="Show Calendar" style="cursor: pointer;" border="0" />

    -

    +

    Export into

    - - -
    +

    +

    +

    - into an application + into an application - "> + " />

    @@ -122,14 +116,14 @@ - + " />