@@ -, +, @@ --- .../intranet-tmpl/prog/en/css/staff-global.css | 7 ------- .../prog/en/modules/acqui/lateorders.tt | 13 ++++++------- .../prog/en/modules/acqui/neworderempty.tt | 2 -- .../prog/en/modules/acqui/orderreceive.tt | 1 - .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 2 +- .../prog/en/modules/admin/aqbudgets.tt | 2 +- .../en/modules/admin/searchengine/solr/indexes.tt | 2 +- .../prog/en/modules/installer/step2.tt | 2 +- .../prog/en/modules/members/memberentrygen.tt | 4 ++-- .../prog/en/modules/plugins/plugins-home.tt | 10 +++++----- .../prog/en/modules/tools/batchMod-edit.tt | 2 +- 11 files changed, 18 insertions(+), 29 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -877,13 +877,6 @@ fieldset.rows .inputnote { color: #cc0000; } -div.error { - border : 2px dashed #990000; - background-color : #FFFF99; - padding : .5em; - margin : 1em; -} - input.alert { background-color : #FFFF99; border-color: #900; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -53,9 +53,9 @@ $(document).ready(function() { [% IF error_claim %] [% IF ( error_claim == "no_email" ) %] -
This vendor has no email
+
This vendor has no email
[% ELSE %] -
[% error_claim %]
+
[% error_claim %]
[% END %] [% END %] [% IF info_claim %] @@ -138,7 +138,6 @@ $(document).ready(function() { [% END %] - [% END %] @@ -153,7 +152,7 @@ $(document).ready(function() {     - + @@ -167,7 +166,7 @@ $(document).ready(function() {
-

Filter Results:

+

Filter results:

[% FOREACH ERROR_LOO IN ERROR_LOOP %] [% IF ( ERROR_LOO.delay_digits ) %]

The number of days ([% ERROR_LOO.bad_delay %]) must be a number between 0 and 999.

[% END %] [% END %] @@ -183,8 +182,8 @@ $(document).ready(function() {
  • - + [% FOREACH SUPPLIER_LOO IN SUPPLIER_LOOP %] [% IF ( SUPPLIER_LOO.selected ) %] [% ELSE %][% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -171,8 +171,6 @@ $(document).ready(function() [% END %] - - [% IF ( basketno ) %]
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -142,7 +142,6 @@
    -
    Catalog details --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -144,7 +144,7 @@ [% END %] [% IF (error_cancelling_receipt) %] -
    +
    Cannot cancel receipt. Possible reasons :
    • --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -219,7 +219,7 @@ [% UNLESS ( delete_confirm ) %][% INCLUDE 'budgets-admin-toolbar.inc' %][% END %] [% IF (error_not_authorised_to_modify) %] -
      +

      You are not authorized to modify this fund

      [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/solr/indexes.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/solr/indexes.tt @@ -76,7 +76,7 @@ Warning: Any modification in these configurations will need a total reindexation to be fully taken into account !
      [% IF ( errors ) %] -
      +
      Errors occurred, Modifications does not apply. Please check following values:
        [% FOREACH e IN errors %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt @@ -28,7 +28,7 @@

        Please create the database before continuing.

        [% END %] [% ELSE %] -
        [% error %] : [% message %] +
        [% error %] : [% message %]
          --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -105,9 +105,9 @@ [% IF error_alert %] [% IF ( error_alert == "no_email" ) %] -
          This member has no email
          +
          This patron has no email
          [% ELSE %] -
          [% error_alert %]
          +
          [% error_alert %]
          [% END %] [% END %] [% IF info_alert %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt @@ -53,13 +53,13 @@ [% IF ( CAN_user_plugins_report ) %] [% IF plugin.can('report') %] -

          Run report

          +

          Run report

          [% END %] [% END %] [% IF ( CAN_user_plugins_tool ) %] [% IF plugin.can('tool') %] -

          Run tool

          +

          Run tool

          [% END %] [% END %] @@ -67,11 +67,11 @@ [% plugin.metadata.description %] [% IF ( plugin.metadata.minimum_version && koha_version < plugin.metadata.minimum_version ) %] -
          Warning: This report was written for a newer version of Koha. Run at your own risk.
          + Warning: This report was written for a newer version of Koha. Run at your own risk. [% END %] [% IF ( plugin.metadata.maximum_version && koha_version > plugin.metadata.maximum_version ) %] -
          Warning: This report was written for an older version of Koha. Run at your own risk.
          + Warning: This report was written for an older version of Koha. Run at your own risk. [% END %] [% plugin.metadata.author %] @@ -82,7 +82,7 @@ [% IF ( CAN_user_plugins_configure ) %] [% IF plugin.can('configure') %] - Configure + Configure [% END %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt @@ -116,7 +116,7 @@ $(document).ready(function(){ - [% FOREACH item_loo IN item_loop %] [% IF ( show ) %][% IF ( item_loo.nomod ) %] Cannot Edit[% ELSE %][% END %][% ELSE %] [% END %] + [% FOREACH item_loo IN item_loop %] [% IF ( show ) %][% IF ( item_loo.nomod ) %] Cannot edit[% ELSE %][% END %][% ELSE %] [% END %] [% FOREACH item_valu IN item_loo.item_value %] [% item_valu.field |html %] [% END %] --