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

(-)a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss (+4 lines)
Lines 266-271 th { Link Here
266
    }
266
    }
267
}
267
}
268
268
269
#wrap {
270
    padding: 0;
271
}
272
269
#advsearches,
273
#advsearches,
270
#booleansearch {
274
#booleansearch {
271
    label {
275
    label {
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt (-75 / +89 lines)
Lines 25-31 Link Here
25
        </li>
25
        </li>
26
    </ul>
26
    </ul>
27
27
28
    [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
28
    [% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) %]
29
        [% IF ( loggedinusername ) %]
29
        [% IF ( loggedinusername ) %]
30
            <div id="loggedin" class="container-fluid">
30
            <div id="loggedin" class="container-fluid">
31
        [% ELSE %]
31
        [% ELSE %]
Lines 36-59 Link Here
36
    [% END %]
36
    [% END %]
37
37
38
    <div class="row-fluid">
38
    <div class="row-fluid">
39
    [% IF ( OpacNav ||  OpacNavBottom ) %]
39
    [% IF ( OpacNav || OpacNavBottom || Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %]
40
        <div class="span2">
40
        <div class="span8">
41
            <div id="navigation">
42
                [% INCLUDE 'navigation.inc' %]
43
            </div>
44
        </div>
45
    [% END %]
46
47
    [% IF ( OpacNav ||  OpacNavBottom  ) && (Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %]
48
        <div class="span7">
49
    [% ELSIF (Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %]
50
        <div class="span9">
51
    [% ELSIF ( OpacNav ||  OpacNavBottom  ) %]
52
        <div class="span10">
53
    [% ELSE %]
41
    [% ELSE %]
54
        <div class="span12">
42
        <div class="span12">
55
    [% END %]
43
    [% END %]
56
44
        <h1>Welcome</h1>
45
        <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
46
        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
47
        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
48
        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
49
        cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
50
        proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
51
        <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
52
        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
53
        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
54
        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
55
        cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
56
        proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
57
        <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
58
        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
59
        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
60
        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
61
        cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
62
        proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
63
        <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
64
        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
65
        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
66
        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
67
        cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
68
        proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
57
        [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
69
        [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
58
            [% UNLESS news_item %]
70
            [% UNLESS news_item %]
59
                <form id="news-branch-select" class="form-inline" name="news-branch-select" method="get" action="/cgi-bin/koha/opac-main.pl">
71
                <form id="news-branch-select" class="form-inline" name="news-branch-select" method="get" action="/cgi-bin/koha/opac-main.pl">
Lines 158-227 Link Here
158
            [% END %]
170
            [% END %]
159
        [% END %]
171
        [% END %]
160
172
161
        </div> <!-- / .span 7/9 -->
173
        </div> <!-- / .span 8/12 -->
162
174
163
        [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) || OpacNavRight ) %]
175
    [% IF ( OpacNav ||  OpacNavBottom || Koha.Preference( 'opacuserlogin' ) == 1  || OpacNavRight ) %]
164
            <div class="span3">
176
        <div class="span4">
165
                [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
177
            [% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) %]
166
                    [% UNLESS ( loggedinusername ) %]
178
                [% UNLESS ( aloggedinusername ) %] 
167
                        [% UNLESS ( casAuthentication || shibbolethAuthentication ) %]
179
                    [% UNLESS ( bcasAuthentication || fshibbolethAuthentication ) %] 
168
                            <div id="login">
180
                        <div id="login">
169
                                <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth" autocomplete="off">
181
                            <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth" autocomplete="off">
170
                                    <input type="hidden" name="koha_login_context" value="opac" />
182
                                <input type="hidden" name="koha_login_context" value="opac" />
171
                                    <fieldset class="brief">
183
                                <fieldset class="brief">
172
                                        <legend>Log in to your account:</legend>
184
                                    <legend>Log in to your account:</legend>
173
                                        <label for="userid">Login:</label><input type="text" id="userid" name="userid" />
185
                                    <label for="userid">Login:</label><input type="text" id="userid" name="userid" />
174
                                        <label for="password">Password:</label><input type="password" id="password" name="password" />
186
                                    <label for="password">Password:</label><input type="password" id="password" name="password" />
175
                                        <fieldset class="action">
187
                                    <fieldset class="action">
176
                                            <input type="submit" value="Log in" class="btn" />
188
                                        <input type="submit" value="Log in" class="btn" />
177
                                        </fieldset>
178
                                        [% IF Koha.Preference( 'OpacLoginInstructions' ) %]
179
                                            <div id="nologininstructions-main" class="nologininstructions">
180
                                                [% Koha.Preference( 'OpacLoginInstructions' ) | $raw %]
181
                                            </div>
182
                                        [% END %]
183
                                        [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
184
                                            <div id="forgotpassword-main" class="forgotpassword">
185
                                                <p><a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a></p>
186
                                            </div>
187
                                        [% END %]
188
                                        [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
189
                                            <div id="patronregistration-main" class="patronregistration">
190
                                                <p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p>
191
                                            </div>
192
                                        [% END %]
193
                                    </fieldset>
189
                                    </fieldset>
194
                                </form>
190
                                    [% IF Koha.Preference( 'OpacLoginInstructions' ) %]
195
                            </div> <!-- /#login -->
191
                                        <div id="nologininstructions-main" class="nologininstructions">
196
                        [% END # /casAuthentication %]
192
                                            [% Koha.Preference( 'OpacLoginInstructions' ) | $raw %]
197
                    [% ELSE %]
193
                                        </div>
198
                        [% IF Koha.Preference('OPACUserSummary') && dashboard_info %]
199
                            <div id="user_summary">
200
                                <h3>Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</span></a></h3>
201
                                <ul id="user_summary_shortcuts">
202
                                    [% IF checkouts && checkouts > 0 %]
203
                                        <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-checkouts"><span class="user_checkouts_count count_label">[% checkouts | html %]</span> checkout(s)</a></li>
204
                                    [% END %]
194
                                    [% END %]
205
                                    [% IF overdues && overdues > 0 %]
195
                                    [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
206
                                        <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-overdues"><span class="user_overdues_count count_label">[% overdues | html %]</span> overdue(s)</a></li>
196
                                        <div id="forgotpassword-main" class="forgotpassword">
197
                                            <p><a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a></p>
198
                                        </div>
207
                                    [% END %]
199
                                    [% END %]
208
                                    [% IF holds_pending && holds_pending > 0 %]
200
                                    [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
209
                                        <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds"><span class="user_holds_pending_count count_label">[% holds_pending | html %]</span> hold(s) pending</a></li>
201
                                        <div id="patronregistration-main" class="patronregistration">
202
                                            <p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p>
203
                                        </div>
210
                                    [% END %]
204
                                    [% END %]
211
                                    [% IF holds_waiting && holds_waiting > 0 %]
205
                                </fieldset>
212
                                        <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds"><span class="user_holds_waiting_count count_label">[% holds_waiting | html %]</span> hold(s) waiting</a></li>
206
                            </form>
213
                                    [% END %]
207
                        </div> <!-- /#login -->
214
                                    [% IF total_owing && total_owing > 0 %]
208
                    [% END # /casAuthentication %]
215
                                        <li><a href="/cgi-bin/koha/opac-account.pl"><span class="user_fines_count count_label">[% total_owing | $Price with_symbol => 1 %]</span> due in fines and charges</a></li>
209
                [% ELSIF ( OpacNavRight ) %]
216
                                    [% END %]
210
                    [% IF Koha.Preference('OPACUserSummary') && dashboard_info %]
217
                                </ul>
211
                        <div id="user_summary">
218
                            </div>
212
                            <h3>Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</span></a></h3>
219
                        [% END %]
213
                            <ul id="user_summary_shortcuts">
220
                    [% END # /loggedinusername %]
214
                                [% IF checkouts && checkouts > 0 %]
215
                                    <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-checkouts"><span class="user_checkouts_count count_label">[% checkouts | html %]</span> checkout(s)</a></li>
216
                                [% END %]
217
                                [% IF overdues && overdues > 0 %]
218
                                    <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-overdues"><span class="user_overdues_count count_label">[% overdues | html %]</span> overdue(s)</a></li>
219
                                [% END %]
220
                                [% IF holds_pending && holds_pending > 0 %]
221
                                    <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds"><span class="user_holds_pending_count count_label">[% holds_pending | html %]</span> hold(s) pending</a></li>
222
                                [% END %]
223
                                [% IF holds_waiting && holds_waiting > 0 %]
224
                                    <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds"><span class="user_holds_waiting_count count_label">[% holds_waiting | html %]</span> hold(s) waiting</a></li>
225
                                [% END %]
226
                                [% IF total_owing && total_owing > 0 %]
227
                                    <li><a href="/cgi-bin/koha/opac-account.pl"><span class="user_fines_count count_label">[% total_owing | $Price with_symbol => 1 %]</span> due in fines and charges</a></li>
228
                                [% END %]
229
                            </ul>
230
                        </div>
231
                    [% END %]
221
                [% END # /opacuserlogin %]
232
                [% END # /opacuserlogin %]
222
                [% PROCESS koha_news_block news => OpacNavRight %]
233
                [% PROCESS koha_news_block news => OpacNavRight %]
223
            </div> <!-- / .span3 -->
234
            [% END # /opacuserlogin || OpacNavRight %]
224
        [% END # /opacuserlogin || OpacNavRight %]
235
            <div id="navigation">
236
                [% INCLUDE 'navigation.inc' %]
237
            </div>
238
        </div> <!-- /.span4 -->
239
    [% END %]
225
240
226
        </div> <!-- /.container-fluid -->
241
        </div> <!-- /.container-fluid -->
227
    </div> <!-- /.row-fluid -->
242
    </div> <!-- /.row-fluid -->
228
- 

Return to bug 25477