View | Details | Raw Unified | Return to bug 17942
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/css/installer.css (-1 / +1 lines)
Lines 131-137 fieldset.rows span.label { Link Here
131
131
132
fieldset.rows fieldset {
132
fieldset.rows fieldset {
133
    background-color: transparent;
133
    background-color: transparent;
134
    border-width: 1px;
134
    font-size: 100%;
135
    margin: 1em;
135
    margin: 1em;
136
    padding: .3em;
136
    padding: .3em;
137
}
137
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt (-4 / +4 lines)
Lines 18-36 Link Here
18
                <h1 id="logo"><a href="#">Koha</a></h1>
18
                <h1 id="logo"><a href="#">Koha</a></h1>
19
19
20
                [% IF ( nopermission ) %]
20
                [% IF ( nopermission ) %]
21
                    <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>
21
                    <div id="login_error" class="alert alert-danger"><strong>Error: </strong>Unauthorized user <a href="/cgi-bin/koha/mainpage.pl?logout.x=1">click to log out</a></div>
22
                [% END %]
22
                [% END %]
23
23
24
                [% IF ( timed_out ) %]
24
                [% IF ( timed_out ) %]
25
                <div id="login_error"><strong>Error: </strong>Session timed out, please log in again</div>
25
                <div id="login_error" class="alert alert-danger"><strong>Error: </strong>Session timed out, please log in again</div>
26
                [% END %]
26
                [% END %]
27
27
28
                [% IF ( different_ip ) %]
28
                [% IF ( different_ip ) %]
29
                <div id="login_error"><strong>Error: </strong>IP address has changed, please log in again </div>
29
                <div id="login_error" class="alert alert-danger"><strong>Error: </strong>IP address has changed, please log in again </div>
30
                [% END %]
30
                [% END %]
31
31
32
                [% IF ( invalid_username_or_password ) %]
32
                [% IF ( invalid_username_or_password ) %]
33
                <div id="login_error"><strong>Error: </strong>Invalid username or password</div>
33
                <div id="login_error" class="alert alert-danger"><strong>Error: </strong>Invalid username or password</div>
34
                [% END %]
34
                [% END %]
35
35
36
                [% IF ( loginprompt ) %]
36
                [% IF ( loginprompt ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt (-4 / +4 lines)
Lines 92-99 Link Here
92
                                <div class="checkboxes">
92
                                <div class="checkboxes">
93
93
94
                                    <p>
94
                                    <p>
95
                                        <a class="selectall [% frameworksloo.label FILTER lower %]" href="#">Select all [% frameworksloo.label FILTER lower %] data</a>
95
                                        <a class="selectall [% frameworksloo.label FILTER lower %]" href="#">Select all</a>
96
                                        <a class="deselectall [% frameworksloo.label FILTER lower %]" href="#">Select no [% frameworksloo.label FILTER lower %] data</a>
96
                                        <a class="deselectall [% frameworksloo.label FILTER lower %]" href="#">Select none</a>
97
                                    </p>
97
                                    </p>
98
98
99
                                    [% FOREACH framework IN frameworksloo.frameworks %]
99
                                    [% FOREACH framework IN frameworksloo.frameworks %]
Lines 127-134 Link Here
127
                            <div class="checkboxes">
127
                            <div class="checkboxes">
128
128
129
                                <p>
129
                                <p>
130
                                    <a class="selectall [% levelloo.label FILTER lower %]" href="#">Select all [% levelloo.label FILTER lower %] data</a>
130
                                    <a class="selectall [% levelloo.label FILTER lower %]" href="#">Select all</a>
131
                                    <a class="deselectall [% levelloo.label FILTER lower %]" href="#">Select no [% levelloo.label FILTER lower %] data</a>
131
                                    <a class="deselectall [% levelloo.label FILTER lower %]" href="#">Select none</a>
132
                                </p>
132
                                </p>
133
133
134
                                [% FOREACH framework IN levelloo.frameworks %]
134
                                [% FOREACH framework IN levelloo.frameworks %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt (-8 / +9 lines)
Lines 89-95 Link Here
89
                                    [% END %]
89
                                    [% END %]
90
                                </select>
90
                                </select>
91
                                <div class="hint">
91
                                <div class="hint">
92
                                        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.
92
                                    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.
93
                                </div>
93
                                </div>
94
                            </li>
94
                            </li>
95
                            <li>
95
                            <li>
Lines 97-119 Link Here
97
                                <fieldset class="rows">
97
                                <fieldset class="rows">
98
                                    <ol>
98
                                    <ol>
99
                                        <li>
99
                                        <li>
100
                                                <span class="label"> </span><strong>Choose one</strong>
100
                                            <span class="label"></span><strong>Choose one</strong>
101
                                            </li>
101
                                        </li>
102
                                            <li>
102
                                        <li>
103
                                            <label for="enrolmentperiod">In months: </label>
103
                                            <label for="enrolmentperiod">In months: </label>
104
                                            <input type="number" class="enrolmentperiod" name="enrolmentperiod" id="enrolmentperiod" min="0" size="3" value="[% IF category.enrolmentperiod %][% category.enrolmentperiod %][% END %]" />
104
                                            <input type="number" class="enrolmentperiod" name="enrolmentperiod" id="enrolmentperiod" min="0" size="3" value="[% IF category.enrolmentperiod %][% category.enrolmentperiod %][% END %]" />
105
                                        </li>
105
                                        </li>
106
                                        <li>
106
                                        <li>
107
                                             <label for="enrolmentperioddate">Until date: </label>
107
                                            <label for="enrolmentperioddate">Until date: </label>
108
                                              <input type="text" class="enrolmentperioddate datepicker" name="enrolmentperioddate" id="enrolmentperioddate" value="[% category.enrolmentperioddate | $KohaDates %]" />
108
                                            <input type="text" class="enrolmentperioddate datepicker" name="enrolmentperioddate" id="enrolmentperioddate" value="[% category.enrolmentperioddate | $KohaDates %]" />
109
                                             <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
109
                                             <div class="hint">[% INCLUDE 'date-format.inc' dateformat = Koha.Preference('dateformat') %]</div>
110
                                        </li>
110
                                        </li>
111
                                    </ol>
111
                                    </ol>
112
                                </fieldset>
112
                                </fieldset>
113
                            </li>
113
                            </li>
114
                        </ol>
114
                        </ol>
115
115
116
                        <p> To add another patron category and for more settings go to:
116
                        <p>
117
                            To add another patron category and for more settings go to:
117
                            <span class="breadcrumbs"> Administration <b>&rsaquo;</b> Patron categories</span>
118
                            <span class="breadcrumbs"> Administration <b>&rsaquo;</b> Patron categories</span>
118
                        </p>
119
                        </p>
119
120
(-)a/koha-tmpl/intranet-tmpl/prog/js/onboarding.js (-42 / +21 lines)
Lines 1-23 Link Here
1
function _(s) { return s; } // dummy function for gettext
1
function _(s) { return s; } // dummy function for gettext
2
2
3
jQuery.validator.addMethod( "category_code_check", function(value,element){
3
jQuery.validator.addMethod( "category_code_check", function(value,element){
4
    var patt = /^[A-Za-z]{0,10}$/g;
4
    var patt = /^[A-Za-z0-9]{0,10}$/g;
5
    if (patt.test(element.value)) {
5
    if (patt.test(element.value)) {
6
        return true;
6
        return true;
7
    } else {
7
    } else {
8
        return false;
8
        return false;
9
    }
9
    }
10
    }, MSG_LETTERS_ONLY
10
    }, MSG_LETTERS_NUMBERS_ONLY
11
);
12
13
jQuery.validator.addMethod( "letters_only", function(value,element){
14
        var patt =/^[A-Za-z ]{0,30}$/g;
15
        if (patt.test(element.value)){
16
            return true;
17
        } else {
18
            return false;
19
        }
20
    }, MSG_LETTERS_ONLY
21
);
11
);
22
12
23
jQuery.validator.addMethod( "enrollment_period", function(){
13
jQuery.validator.addMethod( "enrollment_period", function(){
Lines 45-60 jQuery.validator.addMethod( "password_match", function(value,element){ Link Here
45
    },  MSG_PASSWORD_MISMATCH
35
    },  MSG_PASSWORD_MISMATCH
46
);
36
);
47
37
48
jQuery.validator.addMethod( "cardnumber_check", function(value,element){
49
          var patt =/[A-Za-z1-9 ]+$/g;
50
          if (patt.test(element.value)){
51
              return true;
52
          } else {
53
              return false;
54
          }
55
     }, MSG_LETTERS_NUMBERS_ONLY
56
);
57
58
function toUC(f) {
38
function toUC(f) {
59
    var x=f.value.toUpperCase();
39
    var x=f.value.toUpperCase();
60
    f.value=x;
40
    f.value=x;
Lines 76-123 $(document).ready(function() { Link Here
76
    $("#category_form").validate({
56
    $("#category_form").validate({
77
        rules: {
57
        rules: {
78
            categorycode: {
58
            categorycode: {
79
                    required: true,
59
                required: true,
80
                    category_code_check: true
60
                category_code_check: true
81
            },
61
            },
82
            description: {
62
            description: {
83
                    required:true
63
                    required:true
84
            },
64
            },
85
            enrolmentperiod: {
65
            enrolmentperiod: {
86
                   required: function(element){
66
               required: function(element){
87
                         return $("#enrolmentperioddate").val() === "";
67
                     return $("#enrolmentperioddate").val() === "";
88
                   },
68
               },
89
                   digits: true,
69
               digits: true,
90
                   enrollment_period: true,
70
               enrollment_period: true,
91
            },
71
            },
92
            enrolmentperioddate: {
72
            enrolmentperioddate: {
93
                    required: function(element){
73
                required: function(element){
94
                        return $("#enrolmentperiod").val() === "";
74
                    return $("#enrolmentperiod").val() === "";
95
                    },
75
                },
96
                    enrollment_period: true,
76
                enrollment_period: true,
97
                    // is_valid_date ($(#"enrolementperioddate").val());
77
                // is_valid_date ($(#"enrolementperioddate").val());
98
            },
78
            },
99
            dateofbirthrequired: {
79
            dateofbirthrequired: {
100
                    digits: true
80
                digits: true
101
            },
81
            },
102
            upperagelimit: {
82
            upperagelimit: {
103
                    digits: true
83
                digits: true
104
            },
84
            },
105
            enrolmentfee: {
85
            enrolmentfee: {
106
                    number: true
86
                number: true
107
            },
87
            },
108
            reservefee: {
88
            reservefee: {
109
                    number: true
89
                number: true
110
            },
90
            },
111
            category_type: {
91
            category_type: {
112
                    required: true
92
                required: true
113
            }
93
            }
114
        },
94
        },
115
        messages: {
95
        messages: {
116
            enrolmentperiod: {
96
            enrolmentperiod: {
117
                    required: MSG_ONE_ENROLLMENTPERIOD
97
                required: MSG_ONE_ENROLLMENTPERIOD
118
            },
98
            },
119
            enrolmentperioddate: {
99
            enrolmentperioddate: {
120
                    required: MSG_ONE_ENROLLMENTPERIOD
100
                required: MSG_ONE_ENROLLMENTPERIOD
121
            }
101
            }
122
        }
102
        }
123
    });
103
    });
124
- 

Return to bug 17942