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

(-)a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss (+5 lines)
Lines 41-46 body { Link Here
41
    // margin: 0 auto -60px;
41
    // margin: 0 auto -60px;
42
}
42
}
43
43
44
.fa.fa-icon-black,
45
.fa.fa-icon-white {
46
    color: #FFF;
47
}
48
44
#changelanguage {
49
#changelanguage {
45
    /* Set the fixed height of the footer here */
50
    /* Set the fixed height of the footer here */
46
    // height: 60px;
51
    // height: 60px;
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc (-3 / +3 lines)
Lines 1-7 Link Here
1
[%# Following on one line for translatability %]
1
[%# Following on one line for translatability %]
2
[% IF ( ( opaclanguagesdisplay ) && ( ! one_language_enabled ) && ( languages_loop ) && ( OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'top') ) %]
2
[% IF ( ( opaclanguagesdisplay ) && ( ! one_language_enabled ) && ( languages_loop ) && ( OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'top') ) %]
3
<li class="dropdown">
3
<li class="dropdown">
4
  <a href="#" title="Switch languages" class="dropdown-toggle" id="langmenu" data-toggle="dropdown" role="button"><i class="icon-flag icon-white"></i> <span class="langlabel">Languages</span> <b class="caret"></b></a>
4
  <a href="#" title="Switch languages" class="dropdown-toggle" id="langmenu" data-toggle="dropdown" role="button"><i class="fa fa-flag fa-icon-white"></i> <span class="langlabel">Languages</span> <b class="caret"></b></a>
5
    <ul aria-labelledby="langmenu" role="menu" class="dropdown-menu">
5
    <ul aria-labelledby="langmenu" role="menu" class="dropdown-menu">
6
    [% FOREACH languages_loo IN languages_loop %]
6
    [% FOREACH languages_loo IN languages_loop %]
7
        [% IF ( languages_loo.group_enabled ) %]
7
        [% IF ( languages_loo.group_enabled ) %]
Lines 9-15 Link Here
9
                [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
9
                [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
10
                    [% IF ( sublanguages_loo.enabled ) %]
10
                    [% IF ( sublanguages_loo.enabled ) %]
11
                        [% IF ( sublanguages_loo.sublanguage_current ) %]
11
                        [% IF ( sublanguages_loo.sublanguage_current ) %]
12
                         <li role="presentation"> <a href="#" tabindex="-1" role="menuitem">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]&nbsp;<i class="icon-ok"></i></a></li>
12
                         <li role="presentation"> <a href="#" tabindex="-1" role="menuitem">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]&nbsp;<i class="fa fa-check"></i></a></li>
13
                        [% ELSE %]
13
                        [% ELSE %]
14
                        <li role="presentation"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"  tabindex="-1" role="menuitem"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]</a></li>
14
                        <li role="presentation"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"  tabindex="-1" role="menuitem"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]</a></li>
15
                        [% END %]
15
                        [% END %]
Lines 18-24 Link Here
18
            [% ELSE %]
18
            [% ELSE %]
19
                [% IF ( languages_loo.group_enabled ) %]
19
                [% IF ( languages_loo.group_enabled ) %]
20
                    [% IF ( languages_loo.current ) %]
20
                    [% IF ( languages_loo.current ) %]
21
                    <li role="presentation"><a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]&nbsp;<i class="icon-ok"></i></a></li>
21
                    <li role="presentation"><a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]&nbsp;<i class="fa fa-check"></i></a></li>
22
                    [% ELSE %]
22
                    [% ELSE %]
23
                    <li role="presentation"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]"  tabindex="-1" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a></li>
23
                    <li role="presentation"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]"  tabindex="-1" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a></li>
24
                    [% END %]
24
                    [% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-3 / +3 lines)
Lines 22-28 Link Here
22
                        [% IF ( Koha.Preference( 'opacbookbag' ) == 1 ) %]
22
                        [% IF ( Koha.Preference( 'opacbookbag' ) == 1 ) %]
23
                            <li class="dropdown">
23
                            <li class="dropdown">
24
                                <a href="#" title="Collect items you are interested in" class="dropdown-toggle" id="cartmenulink" data-toggle="dropdown" role="button">
24
                                <a href="#" title="Collect items you are interested in" class="dropdown-toggle" id="cartmenulink" data-toggle="dropdown" role="button">
25
                                    <i id="carticon" class="icon-shopping-cart icon-white"></i> <span class="cartlabel">Cart</span> <span id="basketcount"></span> <b class="caret"></b>
25
                                    <i id="carticon" class="fa fa-shopping-cart fa-icon-white"></i> <span class="cartlabel">Cart</span> <span id="basketcount"></span> <b class="caret"></b>
26
                                </a>
26
                                </a>
27
                                <ul aria-labelledby="cartmenulink" role="menu" class="dropdown-menu">
27
                                <ul aria-labelledby="cartmenulink" role="menu" class="dropdown-menu">
28
                                    <li role="presentation">
28
                                    <li role="presentation">
Lines 36-42 Link Here
36
                        [% END %]
36
                        [% END %]
37
                        [% IF ( Koha.Preference( 'virtualshelves' ) == 1 ) %]
37
                        [% IF ( Koha.Preference( 'virtualshelves' ) == 1 ) %]
38
                            <li class="dropdown">
38
                            <li class="dropdown">
39
                                <a href="#" title="Show lists" class="dropdown-toggle" id="listsmenu" data-toggle="dropdown" role="button"><i class="icon-list icon-white"></i> <span class="listslabel">Lists</span> <b class="caret"></b></a>
39
                                <a href="#" title="Show lists" class="dropdown-toggle" id="listsmenu" data-toggle="dropdown" role="button"><i class="fa fa-list fa-icon-white"></i> <span class="listslabel">Lists</span> <b class="caret"></b></a>
40
                                <ul aria-labelledby="listsmenu" role="menu" class="dropdown-menu">
40
                                <ul aria-labelledby="listsmenu" role="menu" class="dropdown-menu">
41
                                [% IF some_public_shelves.count %]
41
                                [% IF some_public_shelves.count %]
42
                                    <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=2" tabindex="-1" role="menuitem"><strong>Public lists</strong></a></li>
42
                                    <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=2" tabindex="-1" role="menuitem"><strong>Public lists</strong></a></li>
Lines 85-91 Link Here
85
                    </ul> <!-- / .nav -->
85
                    </ul> <!-- / .nav -->
86
                    [% IF Koha.Preference( 'virtualshelves' ) == 1 %]<div id="listsDetails"></div>[% END %]
86
                    [% IF Koha.Preference( 'virtualshelves' ) == 1 %]<div id="listsDetails"></div>[% END %]
87
                    [% IF Koha.Preference( 'opacuserlogin' ) == 1 || opaclanguagesdisplay || EnableOpacSearchHistory %]
87
                    [% IF Koha.Preference( 'opacuserlogin' ) == 1 || opaclanguagesdisplay || EnableOpacSearchHistory %]
88
                        <a id="user-menu-trigger" class="pull-right" href="#"><i class="icon-user"></i> <span class="caret"></span></a>
88
                        <a id="user-menu-trigger" class="pull-right" href="#"><i class="fa fa-user fa-icon-white"></i> <span class="caret"></span></a>
89
                        <div id="members">
89
                        <div id="members">
90
                            <ul class="nav pull-right">
90
                            <ul class="nav pull-right">
91
91
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt (-2 / +2 lines)
Lines 23-29 Link Here
23
                    <td>
23
                    <td>
24
                        [% IF e.club.club_template.is_enrollable_from_opac %]
24
                        [% IF e.club.club_template.is_enrollable_from_opac %]
25
                            <button class="btn btn-xs btn-default" onclick="cancelEnrollment( [% e.id %] )">
25
                            <button class="btn btn-xs btn-default" onclick="cancelEnrollment( [% e.id %] )">
26
                                <i class="icon-remove"></i> Cancel enrollment
26
                                <i class="fa fa-remove"></i> Cancel enrollment
27
                            </button>
27
                            </button>
28
                        [% ELSE %]
28
                        [% ELSE %]
29
                            Contact your library to be disenrolled from this club.
29
                            Contact your library to be disenrolled from this club.
Lines 56-62 Link Here
56
                    <td>
56
                    <td>
57
                        [% IF !c.club_template.is_email_required || ( c.club_template.is_email_required && borrower.first_valid_email_address ) %]
57
                        [% IF !c.club_template.is_email_required || ( c.club_template.is_email_required && borrower.first_valid_email_address ) %]
58
                            <button class="btn btn-xs btn-default" onclick="loadEnrollmentForm([% c.id %])">
58
                            <button class="btn btn-xs btn-default" onclick="loadEnrollmentForm([% c.id %])">
59
                                <i class="icon-plus"></i> Enroll
59
                                <i class="fa fa-plus"></i> Enroll
60
                            </button>
60
                            </button>
61
                        [% ELSE %]
61
                        [% ELSE %]
62
                            <span class="hint">You must have an email address to enroll</span>
62
                            <span class="hint">You must have an email address to enroll</span>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt (-1 / +1 lines)
Lines 39-45 Link Here
39
                                        [% IF ( SMSSendDriver ) %]<th>SMS</th>[% END %]
39
                                        [% IF ( SMSSendDriver ) %]<th>SMS</th>[% END %]
40
                                        [% IF ( TalkingTechItivaPhone ) %]<th>Phone</th>[% END %]
40
                                        [% IF ( TalkingTechItivaPhone ) %]<th>Phone</th>[% END %]
41
                                        <th>Email</th>
41
                                        <th>Email</th>
42
                                        <th>Digests only <i id="info_digests" data-toggle="tooltip" title="You can ask for a digest to reduce the number of messages. Messages will be saved and sent as a single message." data-placement="right" class="icon icon-info-sign"></i></th>
42
                                        <th>Digests only <i id="info_digests" data-toggle="tooltip" title="You can ask for a digest to reduce the number of messages. Messages will be saved and sent as a single message." data-placement="right" class="fa fa-info-circle"></i></th>
43
                                        <!-- <th>RSS</th> --><th>Do not notify</th>
43
                                        <!-- <th>RSS</th> --><th>Do not notify</th>
44
                                    </tr>
44
                                    </tr>
45
                                </thead>
45
                                </thead>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-8 / +7 lines)
Lines 704-714 Link Here
704
                                                        [% IF RESERVE.suspend %]
704
                                                        [% IF RESERVE.suspend %]
705
                                                            <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
705
                                                            <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
706
                                                                <input type="hidden" name="reserve_id" value="[% RESERVE.reserve_id %]" />
706
                                                                <input type="hidden" name="reserve_id" value="[% RESERVE.reserve_id %]" />
707
                                                                <button class="btn btn-link" type="submit" name="submit"><i class="icon-play"></i> Resume</button>
707
                                                                <button class="btn btn-link" type="submit" name="submit"><i class="fa fa-play"></i> Resume</button>
708
                                                            </form>
708
                                                            </form>
709
                                                        [% ELSE %]
709
                                                        [% ELSE %]
710
                                                            [% IF AutoResumeSuspendedHolds %]
710
                                                            [% IF AutoResumeSuspendedHolds %]
711
                                                                <a class="btn btn-link js-show" href="#suspendModal[% RESERVE.reserve_id %]" role="button" data-toggle="modal"><i class="icon-pause"></i> Suspend</a>
711
                                                                <a class="btn btn-link js-show" href="#suspendModal[% RESERVE.reserve_id %]" role="button" data-toggle="modal"><i class="fa fa-pause"></i> Suspend</a>
712
                                                                [% # hold suspend modal form %]
712
                                                                [% # hold suspend modal form %]
713
                                                                <div id="suspendModal[% RESERVE.reserve_id %]" class="modal-nojs" tabindex="-1" role="dialog" aria-labelledby="suspendModal[% RESERVE.reserve_id %]Label" aria-hidden="true">
713
                                                                <div id="suspendModal[% RESERVE.reserve_id %]" class="modal-nojs" tabindex="-1" role="dialog" aria-labelledby="suspendModal[% RESERVE.reserve_id %]Label" aria-hidden="true">
714
                                                                    <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
714
                                                                    <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
Lines 737-743 Link Here
737
                                                            [% ELSE %]
737
                                                            [% ELSE %]
738
                                                                <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
738
                                                                <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
739
                                                                    <input type="hidden" name="reserve_id" value="[% RESERVE.reserve_id %]" />
739
                                                                    <input type="hidden" name="reserve_id" value="[% RESERVE.reserve_id %]" />
740
                                                                    <button class="btn btn-link" type="submit" name="submit"><i class="icon-pause"></i> Suspend</button>
740
                                                                    <button class="btn btn-link" type="submit" name="submit"><i class="fa fa-pause"></i> Suspend</button>
741
                                                                </form>
741
                                                                </form>
742
                                                            [% END # / IF AutoResumeSuspendedHolds %]
742
                                                            [% END # / IF AutoResumeSuspendedHolds %]
743
                                                        [% END # / IF RESERVE.suspend %]
743
                                                        [% END # / IF RESERVE.suspend %]
Lines 749-755 Link Here
749
                                                    <form action="/cgi-bin/koha/opac-modrequest.pl" method="post">
749
                                                    <form action="/cgi-bin/koha/opac-modrequest.pl" method="post">
750
                                                    <input type="hidden" name="biblionumber" value="[% RESERVE.biblionumber %]" />
750
                                                    <input type="hidden" name="biblionumber" value="[% RESERVE.biblionumber %]" />
751
                                                    <input type="hidden" name="reserve_id" value="[% RESERVE.reserve_id %]" />
751
                                                    <input type="hidden" name="reserve_id" value="[% RESERVE.reserve_id %]" />
752
                                                    <button type="submit" name="submit" class="btn btn-mini btn-danger" onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);"><i class="icon-remove icon-white"></i> Cancel</button></form>
752
                                                    <button type="submit" name="submit" class="btn btn-xs btn-danger" onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);"><i class="fa fa-remove"></i> Cancel</button></form>
753
                                                [% END %]
753
                                                [% END %]
754
                                            </td>
754
                                            </td>
755
                                        </tr>
755
                                        </tr>
Lines 760-766 Link Here
760
                            [% IF SuspendHoldsOpac %]
760
                            [% IF SuspendHoldsOpac %]
761
                                <div>
761
                                <div>
762
                                    <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
762
                                    <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
763
                                        <button type="submit" name="submit" class="btn" onclick="return confirmDelete(MSG_CONFIRM_SUSPEND_HOLDS);"><i class="icon-pause"></i> Suspend all holds</button>
763
                                        <button type="submit" name="submit" class="btn" onclick="return confirmDelete(MSG_CONFIRM_SUSPEND_HOLDS);"><i class="fa fa-pause"></i> Suspend all holds</button>
764
                                        <input type="hidden" name="suspend" value="1" />
764
                                        <input type="hidden" name="suspend" value="1" />
765
765
766
                                        [% IF AutoResumeSuspendedHolds %]
766
                                        [% IF AutoResumeSuspendedHolds %]
Lines 773-779 Link Here
773
                                <br/>
773
                                <br/>
774
                                <div>
774
                                <div>
775
                                    <form action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
775
                                    <form action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
776
                                        <button type="submit" name="submit" class="btn" onclick="return confirmDelete(MSG_CONFIRM_RESUME_HOLDS);"><i class="icon-play"></i> Resume all suspended holds</button>
776
                                        <button type="submit" name="submit" class="btn" onclick="return confirmDelete(MSG_CONFIRM_RESUME_HOLDS);"><i class="fa fa-play"></i> Resume all suspended holds</button>
777
                                        <input type="hidden" name="suspend" value="0" />
777
                                        <input type="hidden" name="suspend" value="0" />
778
                                    </form>
778
                                    </form>
779
                                </div>
779
                                </div>
Lines 869-875 Link Here
869
869
870
                                                <td class="article-request-cancel">
870
                                                <td class="article-request-cancel">
871
                                                    <span class="tdlabel">Cancel:</span>
871
                                                    <span class="tdlabel">Cancel:</span>
872
                                                    <a class="btn btn-mini btn-danger" href="opac-article-request-cancel.pl?id=[% ar.id %]" onclick="return confirmDelete(MSG_CONFIRM_DELETE_ARTREQ);"><i class="icon-remove icon-white"></i> Cancel</a>
872
                                                    <a class="btn btn-xs btn-danger" href="opac-article-request-cancel.pl?id=[% ar.id %]" onclick="return confirmDelete(MSG_CONFIRM_DELETE_ARTREQ);"><i class="fa fa-remove"></i> Cancel</a>
873
                                                </td>
873
                                                </td>
874
                                            </tr>
874
                                            </tr>
875
                                        [% END %]
875
                                        [% END %]
876
- 

Return to bug 15287