Attachment 62186 Details for Bug 17855 – Bug 17855 - Followup patch following requests in comments 176 and 177

[patch] Bug 17855 - Followup patch following requests in comments 176 and 177

Bug-17855---Followup-patch-following-requests-in-c.patch (text/plain), 6.98 KB, created by Alex Buckley on 2017-04-15 01:08:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Buckley

Created: 2017-04-15 01:08:34 UTC

Size: 6.98 KB

patch

obsolete

>From 196c6c4f1ddae8f897de9ace7815f03f4dc1c880 Mon Sep 17 00:00:00 2001
>From: Alex Buckley <alexbuckley@catalyst.net.nz>
>Date: Sun, 9 Apr 2017 05:30:05 +0000
>Subject: [PATCH] Bug 17855 - Followup patch following requests in comments 176
> and 177
>
>---
> installer/onboarding.pl                                           | 4 ++--
> koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt        | 6 +++---
> .../intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt   | 2 +-
> .../intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt   | 8 ++++----
> 4 files changed, 10 insertions(+), 10 deletions(-)
>
>diff --git a/installer/onboarding.pl b/installer/onboarding.pl
>index 49f4e84..d8de8ef 100755
>--- a/installer/onboarding.pl
>+++ b/installer/onboarding.pl
>@@ -189,7 +189,7 @@ elsif ( $step && $step == 2 ) {
>             $enrolmentperioddate = output_pref(
>                 {
>                     dt         => dt_from_string($enrolmentperioddate),
>-                    dateformat => 'iso',
>+                    dateformat => 'DateTime',
>                     dateonly   => 1,
>                 }
>             );
>@@ -204,7 +204,7 @@ elsif ( $step && $step == 2 ) {
>                 category_type         => $category_type,
>                 default_privacy       => $default_privacy,
>                 enrolmentperiod       => $enrolmentperiod,
>-                enrolmentperioddate   => $enrolmentperioddate,
>+                enrolmentperioddate   => $enrolmentperioddate
>             }
>         );
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
>index 5d205df..2f8f46a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
>@@ -224,13 +224,13 @@ function Hide(link)
>         <p>
>             We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must update your database.
>         <br>
>-        <a href="install.pl?step=3&amp;op=updatestructure" class="button"><button>Update Database</button></a>
>+        <a href="install.pl?step=3&amp;op=updatestructure" class="button">Update your database</a>
>         </p>
>     [% ELSE %]
>         <p>We are ready to do some basic configuration. Please install some basic configuration settings to continue the installation:
>         <br>
>         <br>
>-            <a href="install.pl?step=3&amp;op=choosemarc" class="button"><button>Install Basic Configuration Settings</button></a>
>+            <a href="install.pl?step=3&amp;op=choosemarc" class="button">Install basic configuration settings</a>
> 
>     [% END %]
> [% END %]
>@@ -256,7 +256,7 @@ function Hide(link)
>  [% UNLESS ( has_update_errors ) %]
>     <p>Everything went OK, update done.</p>
>   [% END %]
>-<a href="install.pl?step=3&amp;op=choosemarc" class="button"><button>Back to Installation</button></a>
>+<a href="install.pl?step=3&amp;op=finished" class="button">Continue to log in to Koha</a>
>   </div>
> [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
>index f0e90aa..2b82d44 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
>@@ -147,7 +147,7 @@ jQuery.validator.addMethod( "enrollment_period", function(){
>                             <ol>
>                                 <li>
>                                     <label for="enrolmentperiod" style="width:6em;">In months: </label>
>-                                    <input type="number" class="enrolmentperiod" name="enrolmentperiod" id="enrolmentperiod" size="3" maxlength="3" value="[% IF category.enrolmentperiod %][% category.enrolmentperiod %][% END %]" /> months
>+                                    <input type="number" class="enrolmentperiod" name="enrolmentperiod" id="enrolmentperiod" min="0" size="3" maxlength="3" value="[% IF category.enrolmentperiod %][% category.enrolmentperiod %][% END %]" /> months
>                                 </li>
>                                 <li>
>                                     <label for="enrolmentperioddate" style="width:6em;">Until date: </label>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt
>index 81ba89c..bad9a2a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt
>@@ -71,13 +71,13 @@
>                     </li>
>                     <li>
>                         <label for="maxissueqty" class="required">Current checkouts allowed: </label>
>-                        <input type="number" min="0" name="maxissueqty" title="Please only enter numbers" id="maxissueqty" size="10" max="10" value="" class="required" required="required" />
>+                        <input type="number" min="0" name="maxissueqty" title="Please only enter numbers" id="maxissueqty" size="10" value="50" class="required" required="required" />
>                         <span class="required">Required</span>
>                     </li>
> 
>                     <li>
>                         <label for="issuelength" class="required">Loan period: </label>
>-                        <input type="number" min="0" name="issuelength" title="Please only enter numbers" id="issuelength" size="10" max="10" value="" class="required" required="required" />
>+                        <input type="number" min="0" name="issuelength" title="Please only enter numbers" id="issuelength" size="10" value="14" class="required" required="required" />
>                         <span class="required">Required</span>
>                    </li>
>                    <li>
>@@ -101,13 +101,13 @@
>                      </li>
>                      <li>
>                         <label for="renewalsallowed" class="required">Renewals allowed: </label>
>-                        <input type="number" min="0" name="renewalsallowed" title="Please only enter numbers" id="renewalsallowed" size="10" max="10" value="" class="required" required="required" />
>+                        <input type="number" min="0" name="renewalsallowed" title="Please only enter numbers" id="renewalsallowed" size="10" max="10" value="10" class="required" required="required" />
>                         <span class="required">Required</span>
>                      </li>
> 
>                      <li>
>                         <label for="renewalperiod" class="required">Renewals period: </label>
>-                        <input type="number" min="0" name="renewalperiod" title="Please only enter numbers" id="renewalperiod" size="10" max="10" value="" class="required" required="required" />
>+                        <input type="number" min="0" name="renewalperiod" title="Please only enter numbers" id="renewalperiod" size="10" value="14" class="required" required="required" />
>                         <span class="required">Required</span>
>                      </li>
> 
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 17855: 58657 | 58658 | 58659 | 58660 | 58661 | 58662 | 58663 | 58664 | 58665 | 58666 | 58667 | 58668 | 58669 | 58781 | 58782 | 58783 | 58784 | 58785 | 58792 | 58793 | 58794 | 58846 | 58860 | 58861 | 58862 | 58886 | 58892 | 58893 | 58894 | 58895 | 58896 | 58897 | 58898 | 58899 | 58900 | 58901 | 58902 | 58903 | 58904 | 58905 | 58906 | 58907 | 59037 | 59051 | 59140 | 59141 | 59174 | 59188 | 59277 | 59279 | 59280 | 59281 | 59628 | 59703 | 59705 | 59706 | 59707 | 59708 | 59709 | 59710 | 59711 | 59712 | 59742 | 59826 | 59830 | 59840 | 59841 | 59842 | 59856 | 59857 | 60092 | 61667 | 61668 | 61986 | 62186 | 62191 | 62192 | 62193 | 62220 | 62221 | 62222 | 62223 | 62231 | 62233 | 62234 | 62235 | 62236 | 62237 | 62238 | 62239 | 62240 | 62241 | 62242 | 62243 | 62251 | 62252 | 62253 | 62254 | 62255 | 62256 | 62257 | 62258 | 62259 | 62260 | 62261 | 62262 | 62263 | 62281 | 62282 | 62283 | 62284 | 62285 | 62286 | 62287 | 62288 | 62668 | 62669 | 62670 | 62671 | 62672 | 62673 | 62674 | 62675