Bugzilla – Attachment 62737 Details for
Bug 18462
Implemented bootstrap styling on the web installer and onboarding tool
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18462 [Follow-up] Implemented bootstrap styling on the web installer and onboarding tool
Bug-18462-Follow-up-Implemented-bootstrap-styling-.patch (text/plain), 83.05 KB, created by
Owen Leonard
on 2017-04-26 16:31:03 UTC
(
hide
)
Description:
Bug 18462 [Follow-up] Implemented bootstrap styling on the web installer and onboarding tool
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2017-04-26 16:31:03 UTC
Size:
83.05 KB
patch
obsolete
>From 4c445ed4c0d16e426446dbbf7c3283df2dd86695 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Wed, 26 Apr 2017 13:17:58 +0000 >Subject: [PATCH] Bug 18462 [Follow-up] Implemented bootstrap styling on the > web installer and onboarding tool > >This patch adds some changes which were left out of the transfer from >Bug 17942. Other general markup issues have been corrected. > >To test, apply the patch and run through the install and onboarding >process. Each step should look correct and work correctly. HTML should >validate. >--- > koha-tmpl/intranet-tmpl/prog/css/installer.css | 4 + > .../prog/en/includes/onboarding_messages.inc | 45 ++- > .../prog/en/modules/installer/auth.tt | 101 ++--- > .../prog/en/modules/installer/step1.tt | 8 +- > .../prog/en/modules/installer/step2.tt | 121 +++--- > .../prog/en/modules/installer/step3.tt | 407 +++++++++------------ > .../prog/en/modules/onboarding/onboardingstep1.tt | 71 ++-- > .../prog/en/modules/onboarding/onboardingstep2.tt | 81 ++-- > .../prog/en/modules/onboarding/onboardingstep3.tt | 60 +-- > .../prog/en/modules/onboarding/onboardingstep4.tt | 36 +- > .../prog/en/modules/onboarding/onboardingstep5.tt | 58 +-- > 11 files changed, 500 insertions(+), 492 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/css/installer.css b/koha-tmpl/intranet-tmpl/prog/css/installer.css >index 374c56d..e0de506 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/installer.css >+++ b/koha-tmpl/intranet-tmpl/prog/css/installer.css >@@ -227,3 +227,7 @@ span.required { > .ui-datepicker { > box-shadow: 1px 1px 3px 0 #666; > } >+ >+span.breadcrumbs { >+ display: block; >+} >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc >index 67eabef..d817401 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc >@@ -1,20 +1,31 @@ > [% FOR m IN messages %] >- <div class="dialog [% m.type %]"> >- [% SWITCH m.code %] >- [% CASE 'success_on_insert_library' %]<span>Library created!</span> >- [% CASE 'error_on_insert_library' %]<span>Library already exists and cannot be modified!</span> >- [% CASE 'success_on_insert_category' %]<span>Patron category created!</span> >- [% CASE 'error_on_insert_category' %]<span>Patron category already exists and cannot be modified!</span> >- [% CASE 'success_on_insert_patron' %]<span>Administrator Patron created!</span> >- [% CASE 'error_on_insert_patron' %]<span>The patron has not been created! Cardnumber or Userid may already exist.</span> >- [% CASE 'ERROR_cardnumber_already_exists' %]<span>Cardnumber already in use.</span> >- [% CASE 'ERROR_cardnumber_length' %]<span>Cardnumber length is incorrect.</span> >- [% CASE 'ERROR_password_mismatch' %]<span>Passwords do not match.</span> >- [% CASE 'success_on_insert_itemtype' %]<span>New item type created!</span> >- [% CASE 'error_on_insert_itemtype' %]<span>Item type already exists!</span> >- [% CASE 'success_on_insert_circ_rule' %]<span>Circulation rule created!</span> >- [% CASE 'error_on_insert_circ_rule' %]<span>Circulation rule not created!</span> >+ [% SWITCH m.code %] >+ [% CASE 'success_on_insert_library' %] >+ <div class="alert alert-success">Library created!</div> >+ [% CASE 'error_on_insert_library' %] >+ <div class="alert alert-danger">Library already exists and cannot be modified!</div> >+ [% CASE 'success_on_insert_category' %] >+ <div class="alert alert-success">Patron category created!</div> >+ [% CASE 'error_on_insert_category' %] >+ <div class="alert alert-danger">Patron category already exists and cannot be modified!</div> >+ [% CASE 'success_on_insert_patron' %] >+ <div class="alert alert-success">Administrator account created!</div> >+ [% CASE 'error_on_insert_patron' %] >+ <div class="alert alert-danger">The patron has not been created! Cardnumber or Userid may already exist.</div> >+ [% CASE 'ERROR_cardnumber_already_exists' %] >+ <div class="alert alert-danger">Card number already in use.</div> >+ [% CASE 'ERROR_cardnumber_length' %] >+ <div class="alert alert-danger">Card number length is incorrect.</div> >+ [% CASE 'ERROR_password_mismatch' %] >+ <div class="alert alert-danger">Passwords do not match.</div> >+ [% CASE 'success_on_insert_itemtype' %] >+ <div class="alert alert-success">New item type created!</div> >+ [% CASE 'error_on_insert_itemtype' %] >+ <div class="alert alert-danger">Item type already exists!</div> >+ [% CASE 'success_on_insert_circ_rule' %] >+ <div class="alert alert-success">Circulation rule created!</div> >+ [% CASE 'error_on_insert_circ_rule' %] >+ <div class="alert alert-danger">Circulation rule not created!</div> > [% CASE %][% message %] >- [% END %] >- </div> >+ [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt >index 28d95ea..b9e93e3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt >@@ -7,57 +7,58 @@ > [% IF ( invalid_username_or_password ) %]Invalid username or password[% END %] > [% IF ( loginprompt ) %]Log in to the Koha web installer[% END %] > </title> >- > [% INCLUDE 'installer-doc-head-close.inc' %] >+</head> >+ >+<body id="installer" class="installer"> >+ <div class="container-fluid"> >+ <div class="row"> >+ <div id="installer-login" class="installer-main col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3"> >+ >+ <h1 id="logo"><a href="#">Koha</a></h1> >+ >+ [% IF ( nopermission ) %] >+ <div id="login_error"><strong>Error: </strong>Unauthorized user <a href="/cgi-bin/koha/mainpage.pl?logout.x=1">click to log out</a></div> >+ [% END %] >+ >+ [% IF ( timed_out ) %] >+ <div id="login_error"><strong>Error: </strong>Session timed out, please log in again</div> >+ [% END %] >+ >+ [% IF ( different_ip ) %] >+ <div id="login_error"><strong>Error: </strong>IP address has changed, please log in again </div> >+ [% END %] > >-<div class="container-fluid"> >- <div class="row"> >- <div id="installer-login" class="installer-main col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3"> >- >- <h1 id="logo"><a href="#">Koha</a></h1> >- >- [% IF ( nopermission ) %] >- <div id="login_error"><strong>Error: </strong>Unauthorized user <a href="/cgi-bin/koha/mainpage.pl?logout.x=1">click to log out</a></div> >- [% END %] >- >- [% IF ( timed_out ) %] >- <div id="login_error"><strong>Error: </strong>Session timed out, please log in again</div> >- [% END %] >- >- [% IF ( different_ip ) %] >- <div id="login_error"><strong>Error: </strong>IP address has changed, please log in again </div> >- [% END %] >- >- [% IF ( invalid_username_or_password ) %] >- <div id="login_error"><strong>Error: </strong>Invalid username or password</div> >- [% END %] >- >- [% IF ( loginprompt ) %] >- <h2>Welcome to the Koha [%- Koha.Version.release -%] web installer</h2> >- >- <p>Before we begin, please verify you have the correct credentials to continue. Please log in with the username and password given to you by your systems administrator and located in your <code>koha-conf.xml</code> configuration file.</p> >- >- <form action="[% url %]" method="post" role="form" id="mainform"> >- [% FOREACH INPUT IN INPUTS %] >- <input type="hidden" name="[% INPUT.name |html %]" value="[% INPUT.value |html %]" /> >- [% END %] >- >- <fieldset> >- <legend>Please enter your username and password</legend> >- >- <div class="form-group"> >- <label>Username:</label> >- <input type="text" class="form-control" name="userid" id="userid" value="[% userid %]" size="20" tabindex="1" /> >- </div> >- <div class="form-group"> >- <label>Password:</label> >- <input type="password" class="form-control" name="password" id="password" value="" size="20" tabindex="2" /> >- </div> >- <input id="submit" type="submit" class="btn btn-primary" value="Log in" tabindex="3" /></p> >- </fieldset> >- </form> >- [% END %] >+ [% IF ( invalid_username_or_password ) %] >+ <div id="login_error"><strong>Error: </strong>Invalid username or password</div> >+ [% END %] >+ >+ [% IF ( loginprompt ) %] >+ <h2>Welcome to the Koha [%- Koha.Version.release -%] web installer</h2> >+ >+ <p>Before we begin, please verify you have the correct credentials to continue. Please log in with the username and password given to you by your systems administrator and located in your <code>koha-conf.xml</code> configuration file.</p> >+ >+ <form action="[% url %]" method="post" id="mainform"> >+ [% FOREACH INPUT IN INPUTS %] >+ <input type="hidden" name="[% INPUT.name |html %]" value="[% INPUT.value |html %]" /> >+ [% END %] >+ >+ <fieldset> >+ <legend>Please enter your username and password</legend> >+ >+ <div class="form-group"> >+ <label>Username:</label> >+ <input type="text" class="form-control" name="userid" id="userid" value="[% userid %]" size="20" tabindex="1" /> >+ </div> >+ <div class="form-group"> >+ <label>Password:</label> >+ <input type="password" class="form-control" name="password" id="password" value="" size="20" tabindex="2" /> >+ </div> >+ <input id="submit" type="submit" class="btn btn-primary" value="Log in" tabindex="3" /> >+ </fieldset> >+ </form> >+ [% END %] >+ </div> > </div> >- </div> >-</div> >+ > [% INCLUDE 'intranet-bottom.inc' %] >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 9647ae9..10e5589 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt >@@ -27,7 +27,7 @@ > > <p>Please pick your language from the following list. If your language is not listed, please inform your system administrator.</p> > >- <form name="language" role="form" method="post" action="install.pl"> >+ <form name="language" method="post" action="install.pl"> > <div class="form-group"> > <label for="language">Select a language: </label> > <select id="language" name="language"> >@@ -76,7 +76,7 @@ > </ul> > [% END %] > >- <form name="checkmodules" role="form" action="install.pl"> >+ <form name="checkmodules" action="install.pl"> > <input type="hidden" name="step" value="1" /> > <p> <input value="Recheck dependencies" class="btn btn-primary" type="submit" /></p> > </form> >@@ -92,7 +92,7 @@ > </form> > [% END # IF checkmodule%] > [% END # IF language %] >- </div> >- </div> >+ </div> <!-- / #installer-step1 --> >+ </div> <!-- / .row --> > > [% INCLUDE 'intranet-bottom.inc' %] >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 aaea508..ba44fd4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt >@@ -1,70 +1,73 @@ > [% INCLUDE 'doc-head-open.inc' %]<title>Koha › Web installer › Database settings</title> > [% INCLUDE 'installer-doc-head-close.inc' %] >+</head> > >-<div class="container-fluid"> >- <div class="row"> >- <div id="installer-step2" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> >+<body id="installer" class="installer"> >+ <div class="container-fluid"> >+ <div class="row"> >+ <div id="installer-step2" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> > >- <h1 id="logo"><a href="#">Koha</a></h1> >- <h2>Web installer › Database settings</h2> >- <h3>Database settings:</h3> >- <ul> >- <li><em>Database type : </em> <code>[% dbms %]</code></li> >- <li><em>Database name : </em> <code>[% dbname %]</code></li> >- <li><em>Database host : </em> <code>[% hostname %]</code></li> >- <li><em>Database port : </em> <code>[% port %]</code> (probably okay if blank)</li> >- <li><em>Database user : </em> <code>[% user %]</code></li> >- </ul> >+ <h1 id="logo"><a href="#">Koha</a></h1> >+ <h2>Web installer › Database settings</h2> >+ <h3>Database settings:</h3> >+ <ul> >+ <li><em>Database type : </em> <code>[% dbms %]</code></li> >+ <li><em>Database name : </em> <code>[% dbname %]</code></li> >+ <li><em>Database host : </em> <code>[% hostname %]</code></li> >+ <li><em>Database port : </em> <code>[% port %]</code> (probably okay if blank)</li> >+ <li><em>Database user : </em> <code>[% user %]</code></li> >+ </ul> > >- [% IF ( dbconnection ) %] >- <form name="checkdbparameters" role="form" type="post" action="install.pl"> >- [% IF ( checkdatabaseaccess ) %] >- <div class="alert alert-success" role="alert"><p>Connection established.</p></div> >- [% IF ( checkdatabasecreated ) %] >- <ul> >- <li>Database <code>[% dbname %]</code> exists.</li> >- [% IF ( checkgrantaccess ) %] >- <li>User <code>[% user %]</code> has all required privileges on database <code>[% dbname %]</code>.</li> >- </ul> >+ [% IF ( dbconnection ) %] >+ <form name="checkdbparameters" method="post" action="install.pl"> >+ [% IF ( checkdatabaseaccess ) %] >+ <div class="alert alert-success" role="alert"><p>Connection established.</p></div> >+ [% IF ( checkdatabasecreated ) %] >+ <ul> >+ <li>Database <code>[% dbname %]</code> exists.</li> >+ [% IF ( checkgrantaccess ) %] >+ <li>User <code>[% user %]</code> has all required privileges on database <code>[% dbname %]</code>.</li> >+ </ul> >+ [% ELSE %] >+ </ul> >+ <p class="error">user <code>[% user %]</code> doesn't have enough privilege on database <code>[% dbname %]</code> </p> >+ <p class="tip"> Ask for or make a change in the user's privileges. Need help? See [% IF ( mysql ) %] >+ <a href="http://dev.mysql.com/doc/refman/4.1/en/grant.html"> >+ [% ELSE %] >+ <a href="http://www.postgresql.org/docs/8.2/interactive/sql-createrole.html"> >+ [% END %] >+ this page</a>. User <code>[% user %]</code> must have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges on <code>[% dbname %]</code> >+ </p> >+ [% END %] > [% ELSE %] >- </ul> >- <p class="error">user <code>[% user %]</code> doesn't have enough privilege on database <code>[% dbname %]</code> </p> >- <p class="tip"> Ask for or make a change in the user's privileges. Need help? See [% IF ( mysql ) %] >- <a href="http://dev.mysql.com/doc/refman/4.1/en/grant.html"> >- [% ELSE %] >- <a href="http://www.postgresql.org/docs/8.2/interactive/sql-createrole.html"> >- [% END %] >- this page</a>. User <code>[% user %]</code> must have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges on <code>[% dbname %]</code> >- </p> >+ <div class="alert alert-danger" role="alert"><p>No database named <code>[% dbname %]</code> detected.</p></div> >+ <p>Please create the database before continuing.</p> > [% END %] > [% ELSE %] >- <div class="alert alert-danger" role="alert"><p>No database named <code>[% dbname %]</code> detected.</p></div> >- <p>Please create the database before continuing.</p> >+ <div class="alert alert-warning" role="alert">[% error %] : [% message %]</div> >+ <div class="tip"> >+ <ul> >+ <li>Check that your database is running.</li> >+ <li>Check your database settings in <code>koha-conf.xml</code>. </li> >+ <li>Check the hostname setting in <code>koha-conf.xml</code>. >+ Some database servers require <code>127.0.0.1</code> rather than <code>localhost</code>.</li> >+ </ul> >+ </div> >+ <p>Please correct these errors and <a href="/cgi-bin/koha/installer/install.pl">start the installer</a> again. > [% END %] >- [% ELSE %] >- <div class="alert alert-warning" role="alert">[% error %] : [% message %]</div> >- <div class="tip"> >- <ul> >- <li>Check that your database is running.</li> >- <li>Check your database settings in <code>koha-conf.xml</code>. </li> >- <li>Check the hostname setting in <code>koha-conf.xml</code>. >- Some database servers require <code>127.0.0.1</code> rather than <code>localhost</code>.</li> >- </ul> >- </div> >- <p>Please correct these errors and <a href="/cgi-bin/koha/installer/install.pl">start the installer</a> again. >- [% END %] >- [% UNLESS ( error ) %] >- <input type="hidden" name="step" value="3" /> >+ [% UNLESS ( error ) %] >+ <input type="hidden" name="step" value="3" /> >+ <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="Continue to the next step" class="btn btn-primary" type="submit" /> </p> >- [% END %] >- </form> >- [% ELSE %] >- <form name="checkinformation" role="form" type="post" action="install.pl"> >- <input type="hidden" name="step" value="2" /> >- <input type="hidden" name="checkdb" value="1" /> >- <p> <input value="Continue to the next step" class="btn btn-primary" type="submit" /> </p> >- </form> >- [% END %] >- </div> >- </div> >+ </form> >+ [% END # / IF dbconnection %] >+ </div> <!-- / #installer-step2 --> >+ </div> <!-- / .row --> >+ > [% INCLUDE 'intranet-bottom.inc' %] >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 eeb62c6..312be4d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt >@@ -24,245 +24,195 @@ > [% IF ( selectframeworks ) %] > Selecting default settings > [% END %] >+ [% IF ( addframeworks ) %] >+ Default data loaded >+ [% END %] >+ [% IF ( finish ) %] >+ Installation complete >+ [% END %] > </title> >+ > [% IF ( finish ) %]<meta http-equiv="refresh" content="10; url=/cgi-bin/koha/installer/onboarding.pl">[% END %] > [% INCLUDE 'installer-doc-head-close.inc' %] >+</head> >+ >+<body id="installer" class="installer"> >+ <div class="container-fluid"> >+ <div class="row"> >+ <div id="installer-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> >+ <h1 id="logo"><a href="#">Koha</a></h1> >+ [% IF ( finish ) %] >+ <h2>Web installer › Installation complete</h2> >+ <h3>Congratulations, installation complete</h3> >+ <p> >+ If this page does not redirect in 10 seconds, <a href="/cgi-bin/koha/installer/onboarding.pl">start onboarding process</a>. >+ </p> >+ [% END %] > >-[% IF ( selectframeworks ) %] >- <script type="text/javascript"> >- //<![CDATA[ >+ [% IF ( choosemarc ) %] >+ <h2>Select your MARC flavor</h2> > >- var surl = unescape(window.location.pathname); >+ <form name="frameworkselection" method="post" action="install.pl"> >+ <input type="hidden" name="step" value="3" /> >+ <input type="hidden" name="op" value="selectframeworks" /> > >- function doLoad() >-{ >- // the timeout value should be the same as in the "refresh" meta-tag >- setTimeout( "refresh()", 2*1000 ); >-} >+ <p>MARC stands for Machine Readable Cataloging, containing information about a bibliographic record. MARC21 is used globally, whereas UNIMARC tends to be used in Europe. </p> > >-function refresh(value) >-{ >- // The argument to the location.reload function determines >- // if the browser should retrieve the document from the >- // web-server. In our example all we need to do is cause >- // the JavaScript block in the document body to be >- // re-evaluated. If we needed to pull the document from >- // the web-server again (such as where the document contents >- // change dynamically) we would pass the argument as 'true'. >- // >- surl=surl+'?step=3&op=selectframeworks&fwklanguage='+value; >+ [% FOREACH flavourloo IN flavourloop %] >+ [% IF ( flavourloo.label == "Unimarc") %] >+ <p> >+ <label><input type="radio" name="marcflavour" value="[% flavourloo.code %]" /> [% flavourloo.label %]</label> >+ </p> >+ [% ELSE %] >+ <p> >+ <label><input type="radio" name="marcflavour" value="[% flavourloo.code %]" checked="checked" /> [% flavourloo.label %]</label> >+ </p> >+ [% END %] >+ [% END %] >+ <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p> >+ </form> >+ [% END # / IF choosemarc %] > >- window.location.replace( surl ); >-} >+ [% IF ( selectframeworks ) %] >+ <h2>Web installer › [% setup %] setup › Selecting default settings</h2> > >-function selectAllFrameworks() >-{ >- // A handy short link that selects all available checkboxes >- // on the page. >- // >- var checkboxes = document.getElementsByTagName("input"); >- for (var i = 0; i < checkboxes.length; i++) >- { >- if (checkboxes[i].type == 'checkbox') >- { >- checkboxes[i].checked = true; >- } >- } >+ <p id="selectall"><a href="#">Select all sample data</a></p> > >- // Prevent event propergation. >- return false; >-} >+ <form name="frameworkselection" method="post" action="install.pl"> >+ <input type="hidden" name="step" value="3" /> >+ <input type="hidden" name="op" value="addframeworks" /> >+ [% IF ( frameworksloop ) %] >+ <h3>MARC frameworks: [% marcflavour %]</h3> >+ [% IF ( en_marc_frameworks ) %] >+ <h4><span class="error">No MARC frameworks are available for your language. >+ Defaulting to the frameworks supplied for English (en)<span></h4> >+ [% END %] >+ [% FOREACH frameworksloo IN frameworksloop %] >+ <h4>[% frameworksloo.label %]</h4> >+ [% FOREACH framework IN frameworksloo.frameworks %] >+ <div class="checkbox"> >+ <label> >+ [% IF (frameworksloo.label == "Default") && (setup=="Basic") %] >+ <input type="hidden" name="framework" value="[% framework.fwkfile %]" id ="[%framework.fwkname%]" /> >+ [% ELSE %] >+ <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id ="[%framework.fwkname%]" /> >+ [% END %] >+ [% framework.fwkdescription %] >+ <em>([% framework.fwkname %])</em> >+ </label> >+ </div> >+ <hr /> >+ [% END # / FOREACH framework %] >+ [% END # / FOREACH frameworksloo %] >+ [% END # / IF frameworkdsloop %] > >-function Hide(link) >-{ >- // Toggle the display of a given element on the page. >- // >- subfield = document.getElementById('bloc'+link); >- var initstyle = subfield.style.display; >- if (initstyle == 'block') subfield.style.display = 'none' ; >- if (initstyle == 'none') subfield.style.display = 'block' ; >-} >+ <h2>Other data</h2> > >-//]]> >-</script> >-[% END %] >+ [% IF ( en_sample_data ) %] >+ <h4><span class="error">No sample data and settings are available for your language. >+ Defaulting to the samples supplied for English (en)<span></h4> >+ [% END %] > >-<div class="container-fluid"> >- <div class="row"> >- <div id="installer-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> >- <h1 id="logo"><a href="#">Koha</a></h1> >- [% IF ( finish ) %] >- <h2>Web installer › Installation complete</h2> >- <p>If this page does not redirect in 10 seconds, click <a href="/cgi-bin/koha/installer/onboarding.pl">Start onboarding process</a>.</p> >- [% END %] >+ [% FOREACH levelloo IN levelloop %] >+ <h4>[% levelloo.label %]</h4> > >- [% IF ( choosemarc ) %] >- <h2 align="center">Select your MARC flavor</h2> >- <form name="frameworkselection" method="post" action="install.pl"> >- <input type="hidden" name="step" value="3" /> >- <input type="hidden" name="op" value="selectframeworks" /> >- <p> >- [% FOREACH flavourloo IN flavourloop %] >- <div> >- [% IF ( flavourloo.checked ) %] >- <input type="radio" name="marcflavour" value="[% flavourloo.code %]" checked /> [% flavourloo.label %] <br/> >- [% ELSE %] >- <input type="radio" name="marcflavour" value="[% flavourloo.code %]" /> [% flavourloo.label %] <br/> >- [% END %] >- </div> >- [% END %] >- </p> >- <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p> >- </form> >- [% END %] >- [% IF ( selectframeworks ) %] >- <h2>Web installer › [% setup %] setup › Selecting default settings</h2> >- <script type="text/javascript"> >- var linklabel = _("Select all sample data"); >- document.write('<p><a href="#" onclick="return selectAllFrameworks();">'+linklabel+'</a></p>'); >- </script> >- <form name="frameworkselection" method="post" action="install.pl"> >- <input type="hidden" name="step" value="3" /> >- <input type="hidden" name="op" value="addframeworks" /> >- [% IF ( frameworksloop ) %] >- <h2>MARC frameworks: [% marcflavour %]</h2> >- [% IF ( en_marc_frameworks ) %] >- <h4><span class="error">No MARC frameworks are available for your language. >- Defaulting to the frameworks supplied for English (en)<span></h4> >- [% END %] >- [% FOREACH frameworksloo IN frameworksloop %] >- <div> >- <h3>[% frameworksloo.label %]</h3> >- [% FOREACH framework IN frameworksloo.frameworks %] >- <table style="border:1px;vertical-align:top;"> >- <tr> >- <td style="vertical-align:top;"> >- <label> >- [% IF ( framework.checked ) %] >- <input type="checkbox" name="framework" value="[% framework.fwkfile %]" checked="checked" id="[% framework.fwkname %]" /> >- [% ELSE %] >- <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id="[% framework.fwkname %]" /> >- [% END %] >- </label> >- </td> >- <td> >- <label for="[% framework.fwkname %]"> >- [% framework.fwkdescription %] >- <em>([% framework.fwkname %])</em> >- </label> >- </td> >- </table> >+ [% IF (setup == "Basic" && levelloo.label == "Optional") %] >+ <p id="selectall"><a href="#">Select all sample data</a></p> > [% END %] >- </div> >- [% END %] >- <h2>Other data</h2> >- [% END %] >- [% IF ( en_sample_data ) %] >- <h4><span class="error">No sample data and settings are available for your language. >- Defaulting to the samples supplied for English (en)<span></h4> >- [% END %] >- [% FOREACH levelloo IN levelloop %] >- <div> >- <h3>[% levelloo.label %]</h3> >- [% FOREACH framework IN levelloo.frameworks %] >- <table style="border:1px;vertical-align:top;"> >- <tr> >- <td style="vertical-align:top;"> >- [% IF ( framework.checked ) %] >- <input type="checkbox" name="framework" value="[% framework.fwkfile %]" checked="checked" id="[% framework.fwkname %]" /> >- [% ELSE %] >- <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id="[% framework.fwkname %]" /> >- [% END %] >- </td> >- <td> >- <label for="[% framework.fwkname %]"> >- [% framework.fwkdescription %] >- <em>([% framework.fwkname %])</em> >- </label> >- </td> >- </tr> >- </table> >- [% END %] >- </div> >- [% END %] >- <p>When you've made your selections, please click 'Import' below to begin the process. It may take a while to complete, >- please be patient.</p> >- <p><input type="submit" value="Import" class="btn btn-primary" /></p> >- </p> >- </form> >- [% END %] > >- [% IF ( addframeworks ) %] >- <h2>Web installer › Default data loaded</h2> >- [% FOREACH lis IN list %] >- <h3>[% lis.level %] data added</h3> >+ [% FOREACH framework IN levelloo.frameworks %] >+ <div class="checkbox"> >+ <label for="[% framework.fwkname %]"> >+ [% IF (levelloo.label == "Default" ) && (setup=="Basic")%] >+ <input type="hidden" name="framework" value="[% framework.fwkfile %]" id="[%framework.fwkname %]" /> >+ [% ELSE %] >+ <input type="checkbox" name="framework" value="[%framework.fwkfile %]" id="[%framework.fwkname%]"/> >+ [% END %] >+ [% framework.fwkdescription %] >+ <em>([% framework.fwkname %])</em> >+ </label> >+ </div> <!-- /div.checkbox --> >+ [% END # / FOREACH framework %] >+ [% END # / FOREACH levelloo %] >+ >+ <p>When you've made your selections, please click 'Import' below to begin the process. It may take a while to complete. Please be patient.</p> >+ >+ <p><input type="submit" value="Import" class="btn btn-primary" /></p> >+ </form> >+ [% END # / IF selectframeworks %] >+ >+ [% IF ( addframeworks ) %] >+ <h2>Web installer › Default data loaded</h2> >+ [% FOREACH lis IN list %] >+ <h3>[% lis.level FILTER ucfirst %] data added</h3> > <ul> > [% FOREACH fwklis IN lis.fwklist %] >- <li>[% fwklis.fwkname %][% IF ( fwklis.error ) %]<br /><span class="error">[% fwklis.error %]</span>[% END %] </li> >+ <li> >+ [% fwklis.fwkname %] >+ [% IF ( fwklis.error ) %]<p class="bg-danger">[% fwklis.error %]</p>[% END %] >+ </li> > [% END %] > </ul> >- [% END %] >- <h3>All done!</h3> >- <p>Installation complete.<br /> >- <p> >- You can help the Koha community by sharing your statistics with us. >- <br>If you wish to share some of your data, please enable the functionality in the "Share your usage statistics" section of the admin module. >- </p> >- <p>Click on 'Set up Koha with the onboarding tool' to complete and load the Koha onboarding tool. >- <form name="finish"> >+ [% END %] >+ >+ <h3>All done!</h3> >+ <p>Installation complete.</p> >+ <form action="/cgi-bin/koha/installer/install.pl" method="post" name="finish"> >+ <p> >+ You can help the Koha community by sharing your statistics with us. >+ </p> >+ <p> >+ If you wish to share some of your data, please enable the functionality in the "Share your usage statistics" section of the Administration module. >+ </p> >+ >+ <input type="hidden" name="step" value="3" /> >+ <input type="hidden" name="op" value="finish" /> >+ <p> >+ <input value="Set up some of Koha's basic requirements" class="btn btn-primary" type="submit" /> >+ </p> >+ </form> >+ >+ [% END # / IF addframeworks %] >+ >+ [% IF ( importdatastructure ) %] >+ [% IF ( error ) %] >+ <p>The following error occurred while importing the database structure:</p> >+ <div class="alert alert-warning"><p>[% error %] </p></div> >+ <p>Please contact your system administrator</p> >+ [% ELSE %] >+ <h2>Web installer › Success</h2> >+ <div class="alert alert-success"><p>Database tables created</p></div> >+ <form action="install.pl" method="post"> > <input type="hidden" name="step" value="3" /> >- <input type="hidden" name="op" value="finish" /> >- <p> <input value="Set up Koha with the onboarding tool" class="btn btn-primary" type="submit" /> </p> >+ <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p> > </form> >- </p> >- </p> >- [% END %] >+ [% END %] >+ [% END # / IF importdatastructure %] > >- [% IF ( importdatastructure ) %] >- [% IF ( error ) %] >- <p>The following error occurred while importing the database structure:</p> >- <p class="error">[% error %] </p> >- <p>Please contact your system administrator</p> >- [% ELSE %] >- <h2>Web installer › Success</h2> >- <ul> >- <li>Database tables created</li> >- </ul> >- <form action="install.pl"> >+ [% IF ( proposeimport ) %] >+ <h2>Web installer › Set up database</h2> >+ <p>Now we're ready to create the database tables and fill them with some default data.</p> >+ <form action="install.pl" method="post"> > <input type="hidden" name="step" value="3" /> >+ <input type="hidden" name="op" value="importdatastructure" /> > <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p> > </form> >- [% END %] >- [% END %] >- >- [% IF ( proposeimport ) %] >- <h2>Web installer › Set up database</h2> >- <p>Now we're ready to create the database tables and fill them with some default data.</p> >- <form action="install.pl"> >- <input type="hidden" name="step" value="3" /> >- <input type="hidden" name="op" value="importdatastructure" /> >- <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p> >- </form> >- [% END %] >- >- [% IF ( default ) %] >- [% IF ( upgrading ) %] >- <h2>Web installer › Update database</h2> >- <p> We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must update your database. >- <br> >- <a href="install.pl?step=3&op=updatestructure" class="button">Update your database</a> >- </p> >- [% ELSE %] >- <h2>Web installer › Install basic configuration settings</h2> >- <p>We are ready to do some basic configuration. Please install some basic configuration settings to continue the installation: >- <br> >- <br> >- <p> <a href="install.pl?step=3&op=choosemarc" class="btn btn-primary">Install basic configuration settings</a> </p> >- [% END %] >- [% END %] >+ [% END # / proposeimport %] >+ >+ [% IF ( default ) %] >+ [% IF ( upgrading ) %] >+ <h2>Web installer › Update database</h2> >+ <p>We are upgrading from Koha [% dbversion %] to [% kohaversion %]</p> >+ <p><a href="install.pl?step=3&op=updatestructure" class="btn btn-primary">Update your database</a></p> >+ [% ELSE %] >+ <h2>Web installer › Install basic configuration settings</h2> >+ <p>We are ready to do some basic configuration.</p> >+ <p> <a href="install.pl?step=3&op=choosemarc" class="btn btn-primary">Continue to the next step</a> </p> >+ [% END %] >+ [% END # / IF default %] > >- [% IF ( updatestructure ) %] >- <div><h2 align="center">Updating database structure</h2> >+ [% IF ( updatestructure ) %] >+ <h2>Updating database structure</h2> > [% IF ( has_update_succeeds ) %] > <p>Update report :</p> > <ul> >@@ -278,15 +228,24 @@ function Hide(link) > <li class="update_error">[% update_error.line |html %]</li> > [% END %] > </ul> >- [% END %] >- [% UNLESS ( has_update_errors ) %] >- <p>Everything went OK, update done.</p> >- [% END %] >- <a href="install.pl?step=3&op=finished" class="button">Continue to log in to Koha</a> >- </div> >- [% END %] >- </div> >- </div> >-</div> >-</body> >-</html> >+ [% END %] >+ [% UNLESS ( has_update_errors ) %] >+ <p>Everything went okay. Update done.</p> >+ [% END %] >+ <p><a href="install.pl?step=3&op=finished" class="btn btn-primary">Continue to log in to Koha</a></p> >+ [% END # / IF updatestructure %] >+ </div> <!-- / #installer-step3 --> >+ </div> <!-- / .row --> >+ >+[% IF ( selectframeworks ) %] >+ <script type="text/javascript"> >+ $(document).ready(function(){ >+ $("#selectall").on("click",function(e){ >+ e.preventDefault(); >+ $("input:checkbox").prop("checked", true); >+ }); >+ }); >+ </script> >+[% END %] >+ >+[% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt >index 2cd1130..824f657 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt >@@ -1,39 +1,40 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > <title>Koha › Web installer › Create a library</title> > [% INCLUDE 'installer-doc-head-close.inc' %] >-[% INCLUDE 'datatables.inc' %] >+</head> >+ > <body id="installer" class="installer"> >- <div class="container-fluid"> >- <div class="row"> >- <div id="installer-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> >- <h1 id="logo"><a href="#">Koha</a></h1> >- [% INCLUDE 'onboarding_messages.inc' %] >- <form name="LibraryCreation" method="post" action="onboarding.pl"> >- <fieldset class="rows" > >- <h2>Web installer › Create a library</h2> >- <input type="hidden" name="step" value="1"/> >- <input type="hidden" name="op" value="add_validate_library"/> >- <ol> >- <li> >- <label for="branchcode" class="required">Library code: </label> >- <input type="text" pattern="[0-9A-Za-z]{1,10}" title="Please enter up to 10 letters and/or numbers" name="branchcode" id="branchcode" size="10" maxlength="10" value="" class="required" required="required" /> >- <span class="required">Required</span> >- </li> >- <li> >- <label for="branchname" class="required">Name: </label> >- <input type="text" name="branchname" id="branchname" title="Please enter the name of your institution" size="42" value="" class="required" required="required" style="width:200px;"> >- <span class="required">Required</span> >- </li> >- </ol> >- <p> >- To add another library and for more settings, go to:<br> >- <div class="breadcrumbs"> Administration <b>›</b> Libraries and groups </div> >- </p> >- <input type="submit" class="btn btn-primary" value="Submit" /> >- </fieldset> >- </form> >- </div> >- </div> >- </div> >-</body> >+ <div class="container-fluid"> >+ <div class="row"> >+ <div id="onboarding-step1" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> >+ <h1 id="logo"><a href="#">Koha</a></h1> >+ <h2>Web installer › Create a library</h2> >+ >+ [% INCLUDE 'onboarding_messages.inc' %] >+ >+ <form name="LibraryCreation" method="post" action="onboarding.pl"> >+ <fieldset class="rows" > >+ <input type="hidden" name="step" value="1"/> >+ <input type="hidden" name="op" value="add_validate_library"/> >+ <ol> >+ <li> >+ <label for="branchcode" class="required">Library code: </label> >+ <input type="text" pattern="[0-9A-Za-z]{1,10}" name="branchcode" id="branchcode" size="10" maxlength="10" value="" class="required" required="required" /> >+ <span class="required">Required</span> >+ </li> >+ <li> >+ <label for="branchname" class="required">Name: </label> >+ <input type="text" name="branchname" id="branchname" size="42" class="required" required="required"> >+ <span class="required">Required</span> >+ </li> >+ </ol> >+ <p>To add another library and for more settings, go to: >+ <span class="breadcrumbs"> Administration <b>›</b> Libraries and groups </span> >+ </p> >+ <input type="submit" class="btn btn-primary" value="Submit" /> >+ </fieldset> >+ </form> >+ </div> <!-- / #onboarding-step1 --> >+ </div> <!-- / .row --> >+ >+[% INCLUDE 'intranet-bottom.inc' %] >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 06b393e..0455d3c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt >@@ -1,6 +1,5 @@ > [% USE Koha %] > [% USE KohaDates %] >-[% USE Price %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Web installer › Add a patron category</title> > [% IF (categories && categories.count > 1 ) >@@ -9,10 +8,9 @@ > # in it this means that the user has previously imported sample patron category > # data and so we do not need to show them the create patron category screen 1, > #instead we can display a screen with ubtton redirecting the user to step 3 %] >- <meta http-equiv="refresh" content="0; url=/cgi-bin/koha/installer/onboarding.pl?step=3"> >+ <meta http-equiv="refresh" content="0; url=/cgi-bin/koha/installer/onboarding.pl?step=3"> > [% END %] > [% INCLUDE 'installer-doc-head-close.inc' %] >-[% INCLUDE 'js_includes.inc' %] > [% INCLUDE 'validator-strings.inc' %] > [% INCLUDE 'installer-strings.inc' %] > <script type="text/javascript" src="[% interface %]/[% theme %]/js/onboarding.js"></script> >@@ -20,12 +18,16 @@ > > <body id="installer" class="installer"> > <div class="container-fluid"> >- <div class="row"> >- <div id="installer-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> >+ <div class="row"> >+ <div id="onboarding-step2" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> > <h1 id="logo"><a href="#">Koha</a></h1> >- [% INCLUDE 'onboarding_messages.inc' %] >+ > <h2>Web installer › Create a patron category</h2> >- <p> The patron category you create in this form is going to be the one which the new administrator patron account will have.</p> >+ >+ [% INCLUDE 'onboarding_messages.inc' %] >+ >+ <p> The patron category you create will be used by the <span class="bg-info">administrator account</span>.</p> >+ > <form id="category_form" method="post" action="onboarding.pl"> > <fieldset class="rows"> > <input type="hidden" name="step" value="2"/> >@@ -33,19 +35,19 @@ > <ol> > <li> > <label for="categorycode" class="required">Category code: </label> >- <input type="text" pattern="[0-9A-Za-z]{1,10}" title="Please enter up to 10 letters and/or numbers" id="categorycode" name="categorycode" value="[% category.categorycode |html %]" size="10" maxlength="10" class="required" required="required" /> >+ <input type="text" pattern="[0-9A-Za-z]{1,10}" id="categorycode" name="categorycode" value="[% category.categorycode |html %]" size="10" maxlength="10" class="required" required="required" /> > <span class="required">Required</span> > </li> > > <li> > <label for="description" class="required">Description: </label> >- <input type="text" name="description" title="Please enter a description of the category" size="40" maxlength="80" class="required" required="required" value="[% category.description |html%]" /> >+ <input type="text" id="description" name="description" size="40" maxlength="80" class="required" required="required" value="[% category.description |html%]" /> > <span class="required">Required</span> > </li> > > <li> > <label for="overduenoticerequired">Overdue notice required: </label> >- <select name="overduenoticerequired" value="overduenoticerequired"> >+ <select name="overduenoticerequired" id="overduenoticerequired"> > [% IF category.overduenoticerequired %] > <option value="0">No</option> > <option value="1" selected="selected">Yes</option> >@@ -57,13 +59,14 @@ > </li> > > <li> >- <label for="category_type" class="required">Category type: </label> >+ <span class="label">Category type: </span> >+ <input type="hidden" name="category_type" value="S" /> > Staff > </li> > > <li> > <label for="default_privacy">Default privacy: </label> >- <select value="default_privacy" name="default_privacy" required="required"> >+ <select id="default_privacy" name="default_privacy" required="required"> > [% SET default_privacy = 'default' %] > > [% IF category %] >@@ -85,33 +88,39 @@ > <option value="forever">Forever</option> > [% END %] > </select> >- <div class="hint">Controls how long a patrons checkout history is kept for new patrons of this category. "Never" anonymizes checkouts on return, and "Forever" keeps a patron's checkout history indefinitely. When set to "Default", the amount of history kept is controlled by the cronjob <i>batch_anonymise.pl</i> which should be set up by your system administrator.</div> >+ <div class="hint"> >+ Controls how long a patrons checkout history is kept for new patrons of this category. "Never" anonymizes checkouts on return, and "Forever" keeps a patron's checkout history indefinitely. When set to "Default", the amount of history kept is controlled by the cronjob <code>batch_anonymise.pl</code> which should be set up by your system administrator. >+ </div> >+ </li> >+ <li> >+ <span class="label">Enrolment period: </span> >+ <fieldset class="rows"> >+ <ol> >+ <li> >+ <span class="label"> </span><strong>Choose one</strong> >+ </li> >+ <li> >+ <label for="enrolmentperiod">In months: </label> >+ <input type="number" class="enrolmentperiod" name="enrolmentperiod" id="enrolmentperiod" min="0" size="3" value="[% IF category.enrolmentperiod %][% category.enrolmentperiod %][% END %]" /> months >+ </li> >+ <li> >+ <label for="enrolmentperioddate">Until date: </label> >+ <input type="text" class="enrolmentperioddate datepicker" name="enrolmentperioddate" id="enrolmentperioddate" value="[% category.enrolmentperioddate | $KohaDates %]" /> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ </li> >+ </ol> >+ </fieldset> > </li> > </ol> >- <span class="label">Enrolment period: </span> >- </br> >- <fieldset> >- <legend>Choose one</legend> >- <ol> >- <li> >- <label for="enrolmentperiod">In months: </label> >- <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">Until date: </label> >- <input type="text" class="enrolmentperioddate datepicker" name="enrolmentperioddate" id="enrolmentperioddate" value="[% category.enrolmentperioddate | $KohaDates %]" /> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >- </li> >- </ol> >- </fieldset> >- <p> To add another patron category and for more settings<br> >- go to:<br> >- <div class="breadcrumbs"> Administration <b>›</b> Patron categories</div> >+ >+ <p> To add another patron category and for more settings go to: >+ <span class="breadcrumbs"> Administration <b>›</b> Patron categories</span> >+ </p> >+ > <input type="submit" class="btn btn-primary" value="Submit" /> > </fieldset> > </form> >- </div> >- </div> >- </div> >-</body> >+ </div> <!-- / #onboarding-step2 --> >+ </div> <!-- / .row --> >+ > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt >index 77c47c1..685741c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt >@@ -1,35 +1,37 @@ >-<!--Includes for creating patron--> > [% INCLUDE 'doc-head-open.inc' %] >+<title>Koha › Web installer › Create Koha administrator patron</title> > [% INCLUDE 'installer-doc-head-close.inc' %] >-[% INCLUDE 'js_includes.inc' %] > [% INCLUDE 'validator-strings.inc' %] > [% INCLUDE 'installer-strings.inc' %] >-<title>Koha › Web installer › Create Koha administrator patron</title> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/onboarding.js"></script> >+</head> > > <body id="installer" class="installer"> > <div class="container-fluid"> > <div class="row"> >- <div id="installer-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> >+ <div id="onboarding-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> > <h1 id="logo"><a href="#">Koha</a></h1> >- [% INCLUDE 'onboarding_messages.inc' %] > <h2>Web installer › Create Koha administrator patron</h2> >- <p>Now we will create a patron with superlibrarian permissions. Login with this to access Koha as a staff member will all permissions. >+ >+ [% INCLUDE 'onboarding_messages.inc' %] >+ >+ <p> >+ Now we will create a patron with superlibrarian permissions. Login with this to access Koha as a staff member with all permissions. > </p> > <form name="createpatron" id="createpatron" method="post" action="onboarding.pl"> > <fieldset class="rows"> > <input type="hidden" name="step" value="3"/> > <input type="hidden" name="op" value="add_validate_patron" /> >- <legend id="library_management_lgd">Library management</legend> >+ <h3>Administrator identity</h3> > <ol> >- <h3>Patron identity</h3> > <li> > <label for="surname" class="required">Surname: </label> >- <input type="text" id="surname" name="surname" title="Please only enter letters in the surname field" value="[% surname |html %]" class="required" required="required" /> >+ <input type="text" id="surname" name="surname" value="[% surname |html %]" class="required" required="required" /> > <span class="required">Required</span> > </li> > <li> > <label for="firstname" class="required">First name: </label> >- <input type="text" name="firstname" title="Please only enter letters in the first name field" id="firstname" size="20" value="[% firstname |html %]" class="required" required="required"> >+ <input type="text" name="firstname" id="firstname" size="20" value="[% firstname |html %]" class="required" required="required"> > <span class="required">Required</span> > </li> > </ol> >@@ -38,9 +40,9 @@ > <li> > <label for="cardnumber" class="required">Card number: </label> > [% IF patrons && patrons > 1 %] >- <input type="text" id="cardnumber" title="Please enter a cardnumber" class="noEnterSubmit valid" name="cardnumber" value="[% newcardnumber | html %]" class="required" required="required"> >+ <input type="text" id="cardnumber" class="noEnterSubmit valid" name="cardnumber" value="[% newcardnumber | html %]" class="required" required="required"> > [% ELSE %] >- <input type="text" id="cardnumber" title="Please enter a cardnumber" name="cardnumber" value="[% cardnumber | html %]" class="required" required="required"> >+ <input type="text" id="cardnumber" name="cardnumber" value="[% cardnumber | html %]" class="required" required="required"> > [% END %] > <span class="required">Required</span> > </li> >@@ -50,16 +52,16 @@ > <label for="libraries" class="required"> Library: </label> > <select name="libraries" size="1" id="libraries"> > [% FOREACH library IN libraries %] >- <option name="libraries" value="[% library.branchcode %]"> [% library.branchname %] >+ <option value="[% library.branchcode %]"> [% library.branchname %] </option> > [% END %] > </select> > <span class="required"> Required</span> > </li> > <li> > <label for="categorycode_entry" class="required"> Patron category</label> >- <select id="categorycode_entry" name="categorycode_entry" onchange="update_category_code(this);"> >+ <select id="categorycode_entry" name="categorycode_entry"> > [% FOREACH category IN categories %] >- <option name="categorycode_entry" value = "[% category.categorycode %]">[%category.description %]</option> >+ <option value = "[% category.categorycode %]">[%category.description %]</option> > [% END %] > </select> > <span class="required">Required</span><br><br> >@@ -67,23 +69,24 @@ > </li> > </ol> > >+ <h3>Administrator account permissions</h3> > <ol> >- <h3> Koha administrator patron permissions</h3> > <li> > <input type="hidden" name="newflags" value="1"/> > <input type="hidden" class="flag parent" id="flag-0" name="flag" value="superlibrarian"/> > <code> superlibrarian</code> > </li> > </ol> >+ >+ <h3>Administrator login</h3> > <ol> >- <h3>OPAC/Staff Login</h3> > <li> > <label for="userid" class="required">Username: </label> >- <input type="text" name="userid" id ="userid" size="20" title="Please only enter a username of letters and numbers" value="[% userid |html %]" class="required" required="required" /> >+ <input type="text" name="userid" id ="userid" size="20" value="[% userid |html %]" class="required" required="required" /> > <span class="required">Required</span> > </li> > <li> >- <label for="passwordlabel" class="required">Password: </label> >+ <label for="password" class="required">Password: </label> > <input type="password" name="password" id="password" size="20" value="[% member.password |html %]" class="required" required="required"> > <span class="required">Required</span> > </li> >@@ -94,17 +97,18 @@ > </li> > </ol> > <p> >- To create another patron, go:</p> >- <div class="breadcrumbs">Patrons › New patron</div> >- <br> >+ To create another patron, go to: >+ <span class="breadcrumbs">Patrons › New patron</span> >+ </p> >+ <p> > To give the new patron superlibrarian permissions go to: >- <div class="breadcrumbs">More › Set Permissions</div> >+ <span class="breadcrumbs">More › Set Permissions</span> > </p> > </fieldset> >- <br> >+ > <input type="submit" class="btn btn-primary" value="Submit" /> > </form> >- </div> >- </div> >- </div> >-</body> >+ </div> <!-- / #onboarding-step3 --> >+ </div> <!-- / .row --> >+ >+[% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt >index c82c885..1ffdced 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt >@@ -1,5 +1,5 @@ >-<!-- includes for creating item type--> > [% INCLUDE 'doc-head-open.inc' %] >+<title>Koha › Web installer › Create a new item type </title> > [% INCLUDE 'installer-doc-head-close.inc' %] > [% INCLUDE 'validator-strings.inc' %] > [% INCLUDE 'installer-strings.inc' %] >@@ -9,39 +9,43 @@ > <body id="installer" class="installer"> > <div class="container-fluid"> > <div class="row"> >- <div id="installer-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> >+ <div id="onboarding-step4" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> > <h1 id="logo"><a href="#">Koha</a></h1> >- [% INCLUDE 'onboarding_messages.inc' %] > <h2>Web installer › Create a new item type </h2> >+ >+ [% INCLUDE 'onboarding_messages.inc' %] >+ > <!--Create a item type screen 1--> >- <h1 align="center"> Create a new Item type </h1> >- <p> Item types are used to group related items. Examples of item types are books, cds, and DVDs. <br><br> When adding to your institutions catalogue you will create an item of a particular item type. <br><br> Importantly item types are what you apply circulation rules to. Circulation rules govern how your institution will lend its items, for example a circulation rule applied to the DVD item type may enforce a payment of $1.00 for borrowing any DVD.</p> >- <form name="createitemform" method="post" action="onboarding.pl"> >+ >+ <p> Item types are used to group related items. Examples of item types might be books, CDs, or DVDs.</p> >+ <p> When adding to your institution's catalog you will create an item of a particular item type.</p> >+ <p> Importantly item types are what you apply circulation rules to. Circulation rules govern how your institution will lend its items: Checkout length, renewal policy, hold policy, etc. For example a circulation rule applied to the DVD item type may enforce a payment of $1.00 for checking out any DVD.</p> >+ >+ <form id="createitemform" method="post" action="onboarding.pl"> > <fieldset class="rows"> > <input type="hidden" name="step" value="4"/> > <input type="hidden" name="op" value="add_validate_itemtype" /> > <ol> > <li> > <label for="itemtype" class="required">Item type code: </label> >- <input type="text" name="itemtype" pattern="[0-9A-Za-z]{1,10}" title="Please enter up to 10 letters and/or numbers" id="itemtype" size="10" maxlength="10" class="required" required="required" value="[% itemtype.itemtype |html %]" /> >+ <input type="text" name="itemtype" pattern="[0-9A-Za-z]{1,10}" id="itemtype" size="10" maxlength="10" class="required" required="required" value="[% itemtype.itemtype |html %]" /> > <span class="required">Required</span> > </li> > > <li> > <label for="description" class="required">Description: </label> >- <input type="text" name="description" id="description" title="Please only enter letters and/or numbers into this item type description" size="42" value="[% itemtype.description |html %]" class="required" required="required"> >+ <input type="text" name="description" id="description" size="42" value="[% itemtype.description |html %]" class="required" required="required"> > <span class="required">Required</span> > </li> > </ol> >- <br> >- <p> To create another item type later and for more settings <br> >- go to: <br> >- <div class="breadcrumbs"> Administration › Item types </div> >+ >+ <p> To create another item type later and for more settings go to: >+ <span class="breadcrumbs"> Administration › Item types </span> > </p> > <input type="submit" class="btn btn-primary" value="Submit"/> > </fieldset> > </form> >- </div> >- </div> >- </div> >-</body> >+ </div> <!-- / #onboarding-step4 --> >+ </div> <!-- / .row --> >+ >+[% INCLUDE 'intranet-bottom.inc' %] >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 4ce33ef..2f62e0a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt >@@ -1,5 +1,11 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Create Circulation rule</title> >+<title>Koha › Web installer › >+ [% IF all_done %] >+ Complete >+ [% ELSE %] >+ Create circulation rule >+ [% END %] >+</title> > [% INCLUDE 'installer-doc-head-close.inc' %] > [% INCLUDE 'validator-strings.inc' %] > [% INCLUDE 'installer-strings.inc' %] >@@ -9,39 +15,44 @@ > <body id="installer" class="installer"> > <div class="container-fluid"> > <div class="row"> >- <div id="installer-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> >+ <div id="onboarding-step5" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> > <h1 id="logo"><a href="#">Koha</a></h1> >- [% INCLUDE 'onboarding_messages.inc' %] > > [% IF all_done %] >+ > <h2>Web installer › Complete</h2> > <h3>Congratulations you have finished and ready to use Koha</h3> > <a class="btn btn-success" href="/cgi-bin/koha/mainpage.pl">Start using Koha</a> >+ > [% ELSE %] >+ > <h2>Web installer › Create a new circulation rule </h2> >+ >+ [% INCLUDE 'onboarding_messages.inc' %] >+ > <form name="createcirculationrule" method="post" action="onboarding.pl"> > <fieldset class="rows"> > <input type="hidden" name="step" value="5"/> > <input type="hidden" name="op" value="add_validate_circ_rule" /> > <ol> > <li> >- <label for="branch" class="required"> Library branch</label> >+ <label for="branchname" class="required"> Library branch</label> > <select name="branch" id="branchname" required="required"> >- <option value""> Choose</option> >+ <option value=""> Choose</option> > <option value="*" selected="selected">All</option> > [% FOREACH library IN libraries %] >- <option id="branch" value="[% library.branchcode %]"> [% library.branchname %]</option> >+ <option value="[% library.branchcode %]"> [% library.branchname %]</option> > [% END %] > </select> > <span class="required">Required</span> > </li> > <li> > <label for="categorycode" class="required">Patron category: </label> >- <select name="categorycode" id="categorycodeselection" required="required" onchange = "update_categorycode(this);"> >+ <select name="categorycode" id="categorycode" required="required"> > <option value=""> Choose</option> > <option value="*" selected="selected">All</option> > [% FOREACH category IN categories %] >- <option id="categorycode" value = "[% category.categorycode %]"> [%category.description %]</option> >+ <option value = "[% category.categorycode %]"> [%category.description %]</option> > [%END%] > </select> > <span class="required">Required</span> >@@ -50,30 +61,30 @@ > <li> > <label for="itemtype"> Item type: </label> > <select id="itemtype" name="itemtype" required="required"> >- <option value""> Choose </option> >+ <option value=""> Choose </option> > <option value="*" selected="selected">All</option> > [% FOREACH item IN itemtypes %] >- <option name="itemtype" value = "[% item.itemtype %]"> [% item.itemtype %] >+ <option value = "[% item.itemtype %]"> [% item.itemtype %] > [%END%] > </select> > <span class="required"> Required</span> > </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" value="50" class="required" required="required" /> >+ <input type="number" min="0" name="maxissueqty" 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" value="14" class="required" required="required" /> >+ <input type="number" min="0" name="issuelength" id="issuelength" size="10" value="14" class="required" required="required" /> > <span class="required">Required</span> > </li> > <li> > <label for="lengthunit">Units: </label> > <select name="lengthunit" id="lengthunit" required="required"> >- <option value=""> Choose </option> >- [% SET units = 'days' %] >+ <option value=""> Choose </option> >+ [% SET units = 'days' %] > [% IF category %] > [% SET default_privacy = category.default_privacy %] > [% END %] >@@ -90,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="10" class="required" required="required" /> >+ <input type="number" min="0" name="renewalsallowed" 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" value="14" class="required" required="required" /> >+ <input type="number" min="0" name="renewalperiod" id="renewalperiod" size="10" value="14" class="required" required="required" /> > <span class="required">Required</span> > </li> > >@@ -110,16 +121,17 @@ > </select> > </li> > </ol> >- <p> To create circulation rule, go to <br> >- <div class="breadcrumbs"> More › Administration › Circulation and Fine Rules </div> >+ <p> >+ To create circulation rule, go to: >+ <span class="breadcrumbs"> More › Administration › Circulation and Fine Rules </span> > </p> > > </fieldset> >- <br> >+ > <input type="submit" class="btn btn-primary" value="Submit" /> > </form> > [% END %] >- </div> >- </div> >- </div> >-</body> >+ </div> <!-- / #onboarding-step5 --> >+ </div> <!-- / .row --> >+ >+[% INCLUDE 'intranet-bottom.inc' %] >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 18462
:
62424
|
62425
|
62426
|
62427
|
62428
|
62429
|
62430
|
62513
|
62683
|
62684
|
62685
|
62686
|
62687
|
62688
|
62711
|
62712
|
62713
|
62714
|
62715
|
62716
| 62737