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 / +64 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
57
        [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
44
        [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
58
            [% UNLESS news_item %]
45
            [% 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">
46
                <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 %]
145
            [% END %]
159
        [% END %]
146
        [% END %]
160
147
161
        </div> <!-- / .span 7/9 -->
148
        </div> <!-- / .span 8/12 -->
162
149
163
        [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) || OpacNavRight ) %]
150
    [% IF ( OpacNav ||  OpacNavBottom || Koha.Preference( 'opacuserlogin' ) == 1  || OpacNavRight ) %]
164
            <div class="span3">
151
        <div class="span4">
165
                [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
152
            [% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) %]
166
                    [% UNLESS ( loggedinusername ) %]
153
                [% UNLESS ( aloggedinusername ) %]
167
                        [% UNLESS ( casAuthentication || shibbolethAuthentication ) %]
154
                    [% UNLESS ( bcasAuthentication || fshibbolethAuthentication ) %]
168
                            <div id="login">
155
                        <div id="login">
169
                                <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth" autocomplete="off">
156
                            <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" />
157
                                <input type="hidden" name="koha_login_context" value="opac" />
171
                                    <fieldset class="brief">
158
                                <fieldset class="brief">
172
                                        <legend>Log in to your account:</legend>
159
                                    <legend>Log in to your account:</legend>
173
                                        <label for="userid">Login:</label><input type="text" id="userid" name="userid" />
160
                                    <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" />
161
                                    <label for="password">Password:</label><input type="password" id="password" name="password" />
175
                                        <fieldset class="action">
162
                                    <fieldset class="action">
176
                                            <input type="submit" value="Log in" class="btn" />
163
                                        <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>
164
                                    </fieldset>
194
                                </form>
165
                                    [% IF Koha.Preference( 'OpacLoginInstructions' ) %]
195
                            </div> <!-- /#login -->
166
                                        <div id="nologininstructions-main" class="nologininstructions">
196
                        [% END # /casAuthentication %]
167
                                            [% Koha.Preference( 'OpacLoginInstructions' ) | $raw %]
197
                    [% ELSE %]
168
                                        </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 %]
169
                                    [% END %]
205
                                    [% IF overdues && overdues > 0 %]
170
                                    [% 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>
171
                                        <div id="forgotpassword-main" class="forgotpassword">
172
                                            <p><a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a></p>
173
                                        </div>
207
                                    [% END %]
174
                                    [% END %]
208
                                    [% IF holds_pending && holds_pending > 0 %]
175
                                    [% 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>
176
                                        <div id="patronregistration-main" class="patronregistration">
177
                                            <p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p>
178
                                        </div>
210
                                    [% END %]
179
                                    [% END %]
211
                                    [% IF holds_waiting && holds_waiting > 0 %]
180
                                </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>
181
                            </form>
213
                                    [% END %]
182
                        </div> <!-- /#login -->
214
                                    [% IF total_owing && total_owing > 0 %]
183
                    [% 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>
184
                [% ELSIF ( OpacNavRight ) %]
216
                                    [% END %]
185
                    [% IF Koha.Preference('OPACUserSummary') && dashboard_info %]
217
                                </ul>
186
                        <div id="user_summary">
218
                            </div>
187
                            <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 %]
188
                            <ul id="user_summary_shortcuts">
220
                    [% END # /loggedinusername %]
189
                                [% IF checkouts && checkouts > 0 %]
190
                                    <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>
191
                                [% END %]
192
                                [% IF overdues && overdues > 0 %]
193
                                    <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>
194
                                [% END %]
195
                                [% IF holds_pending && holds_pending > 0 %]
196
                                    <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>
197
                                [% END %]
198
                                [% IF holds_waiting && holds_waiting > 0 %]
199
                                    <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>
200
                                [% END %]
201
                                [% IF total_owing && total_owing > 0 %]
202
                                    <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>
203
                                [% END %]
204
                            </ul>
205
                        </div>
206
                    [% END %]
221
                [% END # /opacuserlogin %]
207
                [% END # /opacuserlogin %]
222
                [% PROCESS koha_news_block news => OpacNavRight %]
208
                [% PROCESS koha_news_block news => OpacNavRight %]
223
            </div> <!-- / .span3 -->
209
            [% END # /opacuserlogin || OpacNavRight %]
224
        [% END # /opacuserlogin || OpacNavRight %]
210
            <div id="navigation">
211
                [% INCLUDE 'navigation.inc' %]
212
            </div>
213
        </div> <!-- /.span4 -->
214
    [% END %]
225
215
226
        </div> <!-- /.container-fluid -->
216
        </div> <!-- /.container-fluid -->
227
    </div> <!-- /.row-fluid -->
217
    </div> <!-- /.row-fluid -->
228
- 

Return to bug 25477