Attachment 66649 Details for Bug 18629 – Bug 18629: (followup) Plain text "Continue..." instead of BLOCK

[patch] Bug 18629: (followup) Plain text "Continue..." instead of BLOCK

Bug-18629-followup-Plain-text-Continue-instead-of-.patch (text/plain), 6.26 KB, created by Jonathan Druart on 2017-08-30 19:42:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2017-08-30 19:42:06 UTC

Size: 6.26 KB

patch

obsolete

>From 9f8c3cd84407e0ae69e3271ff70d5e8158a4b3f7 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
>Date: Wed, 14 Jun 2017 09:02:59 +0200
>Subject: [PATCH] Bug 18629: (followup) Plain text "Continue..." instead of
> BLOCK
>
>Remove
>[% BLOCK txt_continue %]Continue to the next step[% END %]
>...and restore original text
>
>See comment #19 and comment #20
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt | 5 ++---
> koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt | 5 ++---
> koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt | 9 ++++-----
> 3 files changed, 8 insertions(+), 11 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt
>index d17f323b59..806f28eb79 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt
>@@ -1,4 +1,3 @@
>-[% BLOCK txt_continue %]Continue to the next step[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Web installer &rsaquo;
>     [% UNLESS ( language ) %] Choose your language [% END %]
>@@ -47,7 +46,7 @@
>                             [% END %]
>                         </select>
>                     </div>
>-                    <p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /></p>
>+                    <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
>                 </form>
>             [% END %]
> 
>@@ -88,7 +87,7 @@
> 
>                     <form name="checkmodules" role="form" action="install.pl">
>                         <input type="hidden" name="step" value="2" />
>-                        <p> <input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /> </p>
>+                        <p> <input value="Continue to the next step" class="btn btn-primary" type="submit" /> </p>
>                     </form>
>                 [% END # IF checkmodule%]
>             [% END # IF language %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
>index b379a1b603..22936a6d76 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
>@@ -1,5 +1,4 @@
> [% USE HtmlTags %]
>-[% BLOCK txt_continue %]Continue to the next step[% END %]
> [% INCLUDE 'doc-head-open.inc' %]<title>Koha &rsaquo; Web installer &rsaquo; Database settings</title>
> [% INCLUDE 'installer-doc-head-close.inc' %]
> </head>
>@@ -58,14 +57,14 @@
>                         [% END %]
>                         [% UNLESS ( error ) %]
>                             <input type="hidden" name="step" value="3" />
>-                            <p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /></p>
>+                            <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
>                         [% END %]
>                     </form>
>                 [% ELSE %]
>                     <form name="checkinformation" method="post" action="install.pl">
>                         <input type="hidden" name="step" value="2" />
>                         <input type="hidden" name="checkdb" value="1" />
>-                        <p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /> </p>
>+                        <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /> </p>
>                     </form>
>                 [% END # / IF dbconnection %]
>             </div> 
>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 a19147fdbd..42f129594b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
>@@ -1,4 +1,3 @@
>-[% BLOCK txt_continue %]Continue to the next step[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> 
> <title>Koha &rsaquo; Web installer &rsaquo;
>@@ -71,7 +70,7 @@
>                                  </p>
>                             [% END %]
>                         [% END %]
>-                        <p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /></p>
>+                        <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
>                     </form>
>                 [% END # / IF choosemarc %]
> 
>@@ -208,7 +207,7 @@
>                         <div class="alert alert-success"><p>Database tables created</p></div>
>                         <form action="install.pl" method="post">
>                             <input type="hidden" name="step" value="3" />
>-                            <p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /></p>
>+                            <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
>                         </form>
>                     [% END %]
>                 [% END # / IF importdatastructure %]
>@@ -219,7 +218,7 @@
>                     <form action="install.pl" method="post">
>                         <input type="hidden" name="step" value="3" />
>                         <input type="hidden" name="op" value="importdatastructure" />
>-                        <p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /></p>
>+                        <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
>                     </form>
>                 [% END # / proposeimport %]
> 
>@@ -231,7 +230,7 @@
>                     [% ELSE %]
>                         <h2>Web installer &rsaquo; Install basic configuration settings</h2>
>                         <p>We are ready to do some basic configuration.</p>
>-                        <p><a href="install.pl?step=3&amp;op=choosemarc" class="btn btn-primary">[% INCLUDE txt_continue %]</a></p>
>+                        <p><a href="install.pl?step=3&amp;op=choosemarc" class="btn btn-primary">Continue to the next step</a></p>
>                     [% END %]
>                 [% END # / IF default %]
> 
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 18629: 63573 | 63679 | 63741 | 63742 | 63759 | 63768 | 64274 | 66648 | 66649