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

(-)a/koha-tmpl/intranet-tmpl/prog/css/preferences.css (-1 / +7 lines)
Lines 62-70 h3.collapsed { Link Here
62
	padding-left : 12px;
62
	padding-left : 12px;
63
}
63
}
64
64
65
.humanMsg {
66
    font-size: 20px;
67
    line-height: 30px;
68
}
69
65
.humanMsg strong {
70
.humanMsg strong {
66
	display: block;
71
	display: block;
67
	font-weight: normal;
72
	font-weight: normal;
73
    margin-bottom: 1em;
68
}
74
}
69
75
70
#yui-main {
76
#yui-main {
Lines 134-137 span.overridden { Link Here
134
    border: 1px solid #EEE;
140
    border: 1px solid #EEE;
135
    margin: 1em 1em 1em 0;
141
    margin: 1em 1em 1em 0;
136
    resize:  vertical;
142
    resize:  vertical;
137
}
143
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt (-3 / +3 lines)
Lines 5-14 Link Here
5
[% INCLUDE 'doc-head-open.inc' %]
5
[% INCLUDE 'doc-head-open.inc' %]
6
<title>Koha &rsaquo; Administration &rsaquo; System preferences</title>
6
<title>Koha &rsaquo; Administration &rsaquo; System preferences</title>
7
[% INCLUDE 'doc-head-close.inc' %]
7
[% INCLUDE 'doc-head-close.inc' %]
8
[% Asset.css("css/preferences.css") | $raw %]
9
[% Asset.css("lib/jquery/plugins/multiple-select/multiple-select.css") | $raw %]
10
[% Asset.css("css/humanmsg.css") | $raw %]
8
[% Asset.css("css/humanmsg.css") | $raw %]
11
[% Asset.css("lib/codemirror/codemirror.css") | $raw %]
9
[% Asset.css("lib/codemirror/codemirror.css") | $raw %]
10
[% Asset.css("lib/jquery/plugins/multiple-select/multiple-select.css") | $raw %]
11
[% Asset.css("css/preferences.css") | $raw %]
12
</head>
12
</head>
13
<body id="admin_preferences" class="admin">
13
<body id="admin_preferences" class="admin">
14
[% INCLUDE 'header.inc' %]
14
[% INCLUDE 'header.inc' %]
Lines 207-213 Link Here
207
        var MSG_CLICK_TO_COLLAPSE = _("Click to collapse this section");
207
        var MSG_CLICK_TO_COLLAPSE = _("Click to collapse this section");
208
        var MSG_INTERNAL_SERVER_ERROR = _( "Internal Server Error, please reload the page" );
208
        var MSG_INTERNAL_SERVER_ERROR = _( "Internal Server Error, please reload the page" );
209
        var MSG_SESSION_TIMED_OUT = _( "You need to log in again, your session has timed out" );
209
        var MSG_SESSION_TIMED_OUT = _( "You need to log in again, your session has timed out" );
210
        var MSG_DATA_NOT_SAVED = _( "Error; your data might not have been saved" );
210
        var MSG_DATA_NOT_SAVED = _( "Error: your data might not have been saved" );
211
        var MSG_LOADING = _( "Loading..." );
211
        var MSG_LOADING = _( "Loading..." );
212
        var MSG_ALL_VALUE_WARN = _("Note: _ALL_ value will override all other values");
212
        var MSG_ALL_VALUE_WARN = _("Note: _ALL_ value will override all other values");
213
        var MSG_UPD_LOC_FORMAT_WARN = _("The following values are not formatted correctly:");
213
        var MSG_UPD_LOC_FORMAT_WARN = _("The following values are not formatted correctly:");
(-)a/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js (-3 / +3 lines)
Lines 55-65 KOHA.Preferences = { Link Here
55
            modified_pref = modified_pref.replace("pref_","");
55
            modified_pref = modified_pref.replace("pref_","");
56
            if (modified_pref in form.sysprefs) {
56
            if (modified_pref in form.sysprefs) {
57
                if (form.sysprefs[modified_pref].error === 'Koha::Exceptions::Config::InvalidSyntax') {
57
                if (form.sysprefs[modified_pref].error === 'Koha::Exceptions::Config::InvalidSyntax') {
58
                    msg += "<strong>"+ MSG_INVALID_SYNTAX.format(modified_pref) + "</strong>\n";
58
                    msg += "<strong>"+ MSG_INVALID_SYNTAX.format(modified_pref) + ". ";
59
                    var location = form.sysprefs[modified_pref].message.match(/line (\d+), column (\d+)/);
59
                    var location = form.sysprefs[modified_pref].message.match(/line (\d+), column (\d+)/);
60
                    if (typeof location !== 'undefined' && Array.isArray(location) && location.length===3) {
60
                    if (typeof location !== 'undefined' && Array.isArray(location) && location.length===3) {
61
                        msg += "<strong>"+ MSG_INVALID_SYNTAX_LOCATION.format(location[1], location[2]) + "</strong>\n";
61
                        msg += MSG_INVALID_SYNTAX_LOCATION.format(location[1], location[2]);
62
                    }
62
                    }
63
                    msg += "</strong>\n";
63
                } else {
64
                } else {
64
                    msg += "<strong>"+ form.type + "</strong>\n";
65
                    msg += "<strong>"+ form.type + "</strong>\n";
65
                }
66
                }
66
- 

Return to bug 20930