From 86e458a3ce4ef327a96e051ee2c608b737aa6a74 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 11 Dec 2007 09:41:30 -0600 Subject: [PATCH] Standardizing format for error/message dialogs.
for high-priority warnings/confirmations.
for lower priority/informational messages. Signed-off-by: Joshua Ferraro --- .../prog/en/css/staff-global.css | 77 +++++++++--------- .../en/modules/admin/biblio_framework.tmpl | 10 +-- .../prog/en/modules/admin/categorie.tmpl | 5 +- .../prog/en/modules/admin/itemtypes.tmpl | 33 +++++--- .../en/modules/cataloguing/addbiblio.tmpl | 6 +- .../prog/en/modules/circ/circulation.tmpl | 7 +- .../prog/en/modules/circ/returns.tmpl | 2 +- .../prog/en/modules/sms/sms-home.tmpl | 10 +-- .../prog/en/modules/tools/inventory.tmpl | 8 +- .../prog/en/modules/tools/overduerules.tmpl | 4 +- .../prog/en/modules/tools/picture-upload.tmpl | 8 -- .../en/modules/virtualshelves/shelves.tmpl | 12 +-- koha-tmpl/intranet-tmpl/prog/img/alert-bg.gif | Bin 0 -> 2255 bytes .../intranet-tmpl/prog/img/message-bg.gif | Bin 0 -> 966 bytes 14 files changed, 89 insertions(+), 93 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/img/alert-bg.gif create mode 100644 koha-tmpl/intranet-tmpl/prog/img/message-bg.gif 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 3c292b7f1b..2faefefb88 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -457,13 +457,6 @@ ul.toolbar li { list-style : none; } -div.message { - border : 1px solid #6699CC; - width : 75%; - margin : 1em auto; - padding : .5em; -} - div.patroninfo { margin-top : -.5em; } @@ -810,35 +803,35 @@ fieldset.rows .inputnote { } #addbiblio a, #addchild a, #newentry a { padding-left : 34px; - background-image: url("/intranet-tmpl/prog/img/toolbar-new.gif"); + background-image: url("../../img/toolbar-new.gif"); background-position : center left; background-repeat : no-repeat; } #deletebiblio button, #deletebiblio a, #deletepatron a { padding-left : 34px; - background-image: url("/intranet-tmpl/prog/img/toolbar-delete.gif"); + background-image: url("../../img/toolbar-delete.gif"); background-position : center left; background-repeat : no-repeat; } #printbiblio button, #printbiblio a { padding-left : 34px; - background-image: url("/intranet-tmpl/prog/img/toolbar-print.gif"); + background-image: url("../../img/toolbar-print.gif"); background-position : center left; background-repeat : no-repeat; } #addtoshelf button, #addtoshelf a { padding-left : 34px; - background-image: url("/intranet-tmpl/prog/img/toolbar-add-to-shelf.gif"); + background-image: url("../../img/toolbar-add-to-shelf.gif"); background-position : center left; background-repeat : no-repeat; } #placehold a { padding-left : 34px; - background-image: url("/intranet-tmpl/prog/img/toolbar-hold.gif"); + background-image: url("../../img/toolbar-hold.gif"); background-position : center left; background-repeat : no-repeat; } @@ -951,7 +944,6 @@ div.circmessage:first-child { } div.circmessage { - border: 1px solid #CCC; padding: .4em; margin-bottom : .3em; } @@ -965,56 +957,61 @@ div.first fieldset { margin-right : 0; } -.dialog { - width: 50%; - float:left; - background: url(../../img/dropshadow-alpha.png) no-repeat bottom right !important; - background: url(../../img/dropshadow.gif) no-repeat bottom right; - margin: 10px 0 0 10px !important; - margin: 10px 0 0 5px; - } - -.dialog div { - background: none !important; - background: url(../../img/dropshadow-mask.gif) no-repeat left top; - padding: 0 !important; - padding: 0 6px 6px 0; - } +#circ_needsconfirmation { + margin : auto; +} -.dialog div.confirm { - background-color: #ffc; - // background : url(../../img/dialog-bg.gif) repeat-x left 0 !important; - font: 1em sans-serif; +.dialog { border: 1px solid #bcbcbc; - padding: 4px !important; - margin: -6px 6px 6px -6px !important; - margin: 0; + padding : .5em; + margin : 1em auto; + width: 65%; } - .dialog div.confirm h2, .dialog div.confirm h3, .dialog div.confirm h4 { +.dialog h2, .dialog h3, .dialog h4 { margin : auto; text-align : center; } - div.confirm input { +.dialog input { background-color : #FFF; border : 1px solid #bcbcbc; margin : .4em; padding : .4em .4em .4em 25px; } - div.confirm input.approve { +.dialog input.approve { background : #FFF url(../../img/approve.gif) no-repeat 4px center; } - div.confirm input.deny { +.dialog input.deny { background : #FFF url(../../img/deny.gif) no-repeat 4px center; } - div.confirm input:hover { +.dialog input:hover { background-color : #ffc; } +div.alert { + background : #FFC url(../../img/alert-bg.gif) repeat-x left 0; + text-align : center; +} + +div.alert strong { + color : #900; +} + +div.message { + background : white url("../../img/message-bg.gif") repeat-x left 0; + border : 1px solid #bcbcbc; + width : 55%; +} + +div.message input.approve { + display : block; + margin: auto; +} + div.results { padding : .7em 0; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl index d1cf3d69bb..06456209fc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl @@ -108,14 +108,14 @@ function Check(f) { - -

Delete ramework for ()?

+
+

Delete framework for ()?

-
This framework is used times
+ This framework is used times. -
" method="post">" /> + " method="post">" />
-
" method="post">
+
" method="post">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl index 40f2d5a373..cdfb684e14 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl @@ -149,9 +149,10 @@
" method="post">
- Cagegory is in use. Deletion not possible! + Category is in use. Deletion not possible! Confirm Deletion of Category -
This category is used times. Deletion not possible
+ +
This category is used times. Deletion not possible
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl index f8ee05b352..00cfcc418d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl @@ -220,32 +220,39 @@ Item Types Administration -

+

-

+ Cancel +
-
This record is used times. Deletion is not possible. -
Category code:
Description:
- +
+

Cannot Delete Item Type

+

This record is used times. Deletion is not possible.

+
+

Delete Item Type ''?

+ +
Cannot Delete Item TypeDelete Item Type ''?
- + - - - -
Item typeItem type
Description
Loan length
RenewalsAllowedNot allowed
Rental charge
+ Description + Loan length + RenewalsAllowedNot allowed +Rental charge
" method="post"> " /> -
" method="post">
+ + +
" method="post">
-
" method="post">
+
" method="post">
- +
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 f04d01f124..6e9557271b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl @@ -442,15 +442,15 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ? -
+ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl index 647046c991..cfc6f207bf 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl @@ -45,8 +45,9 @@ -
-
+
+ +

Please Confirm Checkout

    @@ -106,7 +107,7 @@ -
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl index 7fef659253..31b34d191c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl @@ -38,7 +38,7 @@ -
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/sms/sms-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/sms/sms-home.tmpl index db83c3abe1..e9e80f49a3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/sms/sms-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/sms/sms-home.tmpl @@ -1,12 +1,12 @@  -Koha › SMS Administration +Koha › Tools › Send SMS Message - +
@@ -14,7 +14,7 @@
-
+
SMS Messaging @@ -23,11 +23,9 @@
  • "/> (e.g., 5338644143)
  • -
    +
    Cancel
    -
    Enter a message. The message will be sent to the user.
    -
    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 07dfebf73a..59d9613f9a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl @@ -98,16 +98,16 @@
    -

    items modified : datelastseen set to

    -

    can't be opened

    +
    items modified : datelastseen set to
    +
    can't be opened
    -

    +

    : barcode not found : item withdrawn : item was on loan. It was returned before marked as seen : item was on loan. couldn't be returned. -

    +
    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 4c270ed780..aaeb4a2cd1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl @@ -35,7 +35,7 @@
    -
    +

    Data error

    The following fields have a forbidden value. Correct them and press OK again :

      @@ -69,7 +69,7 @@ - + " size="5" value="" /> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl index 7fdc7b645c..143483c515 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl @@ -31,11 +31,7 @@ -<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
        -======= -
          ->>>>>>> Cleaning up and styling picture upload page. Second try for this patch.:koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
        • The patronimages/ directory isn't present on your server, please ask your systems administrator to create it
        • @@ -53,11 +49,7 @@
        • The upload file appears to be empty.
        • -<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
      -======= -
    ->>>>>>> Cleaning up and styling picture upload page. Second try for this patch.:koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
    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 b52dd6deed..742e03f4f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl @@ -164,13 +164,13 @@ function confirmDelete(s,n){
    -

    A virtual shelf with that name already exists!

    +
    A virtual shelf with that name already exists!
    -

    +
    -

    +
    @@ -185,7 +185,7 @@ function confirmDelete(s,n){ -

    +
    Cancel
    @@ -203,7 +203,7 @@ function confirmDelete(s,n){
    -

    A virtual shelf with that name already exists!

    +
    A virtual shelf with that name already exists!
    " /> @@ -228,7 +228,7 @@ function confirmDelete(s,n){ -

    +
    Cancel
    diff --git a/koha-tmpl/intranet-tmpl/prog/img/alert-bg.gif b/koha-tmpl/intranet-tmpl/prog/img/alert-bg.gif new file mode 100644 index 0000000000000000000000000000000000000000..44625a2ec273b20a2708ba2c8f3489b92113a480 GIT binary patch literal 2255 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 literal 0 HcmV?d00001 -- 2.39.5