Attachment 61603 Details for Bug 12310 – BUG 12310: Modified the tooltips

[patch] BUG 12310: Modified the tooltips

BUG-12310-Modified-the-tooltips.patch (text/plain), 2.54 KB, created by Baptiste Wojtkowski (bwoj) on 2017-03-24 10:34:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Baptiste Wojtkowski (bwoj)

Created: 2017-03-24 10:34:28 UTC

Size: 2.54 KB

patch

obsolete

>From 8147d64cbae96ac6114e1babc2f650bf47e50138 Mon Sep 17 00:00:00 2001
>From: Baptiste Wojtkowski <baptiste.wojtkowski@biblibre.com>
>Date: Tue, 21 Mar 2017 10:13:06 +0000
>Subject: [PATCH] BUG 12310: Modified the tooltips
>
>Modified the tooltips helping the users entering monrtary information in the right format.
>
>BUG 12310: Corrected the RegExp
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/prices.inc              | 5 ++++-
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt | 7 ++++++-
> 2 files changed, 10 insertions(+), 2 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prices.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prices.inc
>index 8952845..7ef7270 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prices.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prices.inc
>@@ -16,8 +16,11 @@ function Price_from_string(string){
>     if (!isPrice(string)) {
>         return false;
>     }
>+    console.log(string);
>     string = string.replace(/[^0-9[% Koha.Preference('DigitSeparator') %]]/g, '');
>-    string = string.replace(/[% Koha.Preference('DigitSeparator') %]/g, '.');
>+    console.log(string);
>+    string = string.replace(/[[% Koha.Preference('DigitSeparator') %]]/g, '.');
>+    console.log(string);
>     return string;
> }
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>index abcb27e..15e285a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>@@ -378,7 +378,12 @@
>         <label for="budget_period_total">Total amount: </label>
>         <input type="text" id="budget_period_total" name="budget_period_total"
>         size="10" maxlength="80" value="[% budget_period_total | $Price on_editing => 1 %]" onchange="CheckTot(budget_period_total)" />
>-        Please use the "[% Koha.Preference('DigitSeparator').substr(0,1) %]" as separator : ex "XX[% Koha.Preference('DigitSeparator').substr(0,1) %]XX"
>+    [% IF Koha.Preference('DigitSeparator') %]
>+        Please use the "[% Koha.Preference('DigitSeparator').substr(0,1) %]" as separator : ex "XX[% Koha.Preference('DigitSeparator').substr(0,1) %]XX", if you want to change it, click here <a href="/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=DigitSeparator">here
>+</a>
>+    [% ELSE %]
>+        Please chose a digit separator by clicking <a href="/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=DigitSeparator">here </a>
>+    [% END %]
>     </li>
> 
>     <li>
>-- 
>2.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 12310: 28455 | 60530 | 60563 | 61357 | 61603 | 61604 | 62655 | 64671 | 64672 | 64673 | 64674 | 64675 | 64678 | 64679 | 64696 | 72104 | 72213 | 72983 | 73055 | 73215 | 73546 | 73657 | 73784 | 73785 | 73873 | 73874 | 73880 | 74524 | 74525 | 74526 | 74527 | 74528 | 74529 | 75123 | 75127 | 75128 | 75129 | 75130 | 75947 | 75948 | 75949 | 75950 | 75951 | 75952 | 75954 | 75955 | 75956 | 75957 | 75958 | 75959 | 76896 | 76933 | 77971 | 77972 | 77973 | 77995 | 78017 | 78631 | 78632 | 78633 | 78634 | 78635 | 78636 | 78637 | 78638