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

(-)a/koha-tmpl/intranet-tmpl/prog/css/mainpage.css (-5 / +7 lines)
Lines 11-22 Link Here
11
 *
11
 *
12
 */
12
 */
13
13
14
#doc3 {
14
#container-main {
15
    /* Contains the news + both columns of links + pending box + userblock box */
15
    /* Contains the news + both columns of links + pending box + userblock box */
16
    background-image:url('../img/background_koha_logo.png');
16
    background-image:url('../img/background_koha_logo.png');
17
    background-repeat:no-repeat;
17
    background-repeat:no-repeat;
18
    background-position:left top;
18
    background-position:left top;
19
    padding-top: 12px;
19
    padding: 1em 0;
20
}
20
}
21
21
22
22
Lines 75-83 ul.biglinks-list li a.icon_general { Link Here
75
    background-image:url('../img/staff-home-icons-sprite.png');
75
    background-image:url('../img/staff-home-icons-sprite.png');
76
    display: block;
76
    display: block;
77
    box-sizing: content-box;
77
    box-sizing: content-box;
78
    float: left;
79
80
    width: 83%;
81
    max-width : 320px;
78
    max-width : 320px;
82
    height: 46px;
79
    height: 46px;
83
    margin: 0 1em 14px 0;
80
    margin: 0 1em 14px 0;
Lines 182-184 ul.biglinks-list li a:hover.icon_course_reserves {background-position:5px -1146p Link Here
182
    margin: 8px;
179
    margin: 8px;
183
}
180
}
184
/* ==== USERBLOCK - End ==== */
181
/* ==== USERBLOCK - End ==== */
182
183
.main .row {
184
    margin-left: 0;
185
    margin-right: 0;
186
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (-184 / +186 lines)
Lines 9-202 Link Here
9
[% INCLUDE 'header.inc' %]
9
[% INCLUDE 'header.inc' %]
10
[% INCLUDE 'home-search.inc' %]
10
[% INCLUDE 'home-search.inc' %]
11
11
12
<div id="breadcrumbs" >Home</div>
12
<div id="breadcrumbs">Home</div>
13
13
14
14
    <div id="container-main" class="container-fluid">
15
<div id="doc3" class="yui-t3">
15
        <div class="row">
16
   <div id="bd" role="main">
16
            <div class="col-sm-3">
17
    <div id="yui-main">
17
                [% IF ( koha_news_count ) %]
18
    <div class="yui-b"><div class="yui-g">
18
                    <div id="area-news">
19
    [% IF adminWarning %]
19
                        <h3><span class="news_title">News</span></h3>
20
        <div id="adminwarning" class="dialog alert">
20
                        [% SET newsdisp = Koha.Preference('NewsAuthorDisplay') %]
21
            <p><strong>Warning:</strong> You are logged in as the database administrative user. This is not recommended because some parts of Koha will not function as expected when using this account.</p>
21
                        [% FOREACH koha_new IN koha_news %]
22
            <p>Please log in instead with a regular staff account. To create a staff account, create a library, a patron category 'Staff' and add a new patron. Then give this patron permissions from 'More' in the toolbar.</p>
22
                            <div class="newsitem" id="news[% koha_new.idnew %]"><h4>[% koha_new.title %]</h4>
23
<p><a class="btn btn-default btn-sm" href="/cgi-bin/koha/members/members-home.pl"><i class="fa fa-plus"> </i> Create patron</a></p>
23
                                <div class="newsbody">[% koha_new.content %]</div>
24
        </div>
24
                                <p class="newsfooter"> Posted on [% koha_new.newdate %][% IF( ( newsdisp == 'staff' || newsdisp == 'both' ) && koha_new.borrowernumber ) %] by <span class="newsauthor_title">[% koha_new.author_title %] </span>[% koha_new.author_firstname %] [% koha_new.author_surname %]<br />[% END %]
25
    [% END %]
25
                                    [% IF ( CAN_user_tools ) %]
26
    <div class="yui-u first">
26
                                        <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% koha_new.idnew %]">Edit</a>
27
27
                                         | <a class="news_delete" href="/cgi-bin/koha/tools/koha-news.pl?op=del&amp;ids=[% koha_new.idnew %]">Delete</a>
28
            <div id="area-list-left">
28
                                         | <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">New</a>
29
                <ul class="biglinks-list">
29
                                    [% END %]
30
                    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
30
                                </p>
31
                    <li>
31
                            </div>
32
                        <a class="icon_general icon_circulation" href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
32
                        [% END %]
33
                    </li>
33
                    </div><!-- /koha-news -->
34
                    [% END %]
34
                [% END %]
35
35
            </div> <!-- /.col-sm-2 -->
36
                    [% IF ( CAN_user_borrowers ) %]
36
            <div class="col-sm-9">
37
                    <li>
37
                [% IF adminWarning %]
38
                        <a class="icon_general icon_patrons" href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
38
                    <div id="adminwarning" class="dialog alert">
39
                    </li>
39
                        <p><strong>Warning:</strong> You are logged in as the database administrative user. This is not recommended because some parts of Koha will not function as expected when using this account.</p>
40
                    [% END %]
40
                        <p>Please log in instead with a regular staff account. To create a staff account, create a library, a patron category 'Staff' and add a new patron. Then give this patron permissions from 'More' in the toolbar.</p>
41
41
                        <p><a class="btn btn-default btn-sm" href="/cgi-bin/koha/members/members-home.pl"><i class="fa fa-plus"> </i> Create patron</a></p>
42
                    [% IF ( CAN_user_catalogue ) %]
43
                    <li>
44
                        <a class="icon_general icon_search" href="/cgi-bin/koha/catalogue/search.pl">Advanced search</a>
45
                    </li>
46
                    [% END %]
47
48
                    <li>
49
                        <a class="icon_general icon_lists" href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a>
50
                    </li>
51
52
                    [% IF ( UseCourseReserves ) %]
53
                        <li>
54
                            <a class="icon_general icon_course_reserves" href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a>
55
                        </li>
56
                    [% END %]
57
58
                    [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items ) %]
59
                    <li>
60
                        <a class="icon_general icon_cataloging" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>
61
                    </li>
62
                    [% END %]
63
                    <li>
64
                        <a class="icon_general icon_authorities" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
65
                    </li>
66
                    [% IF Koha.Preference('ILLModule') %]
67
                    <li>
68
                        <a class="icon_general icon_ill" href="/cgi-bin/koha/ill/ill-requests.pl">ILL requests</a>
69
                    </li>
70
                    [% END %]
71
                </ul>
72
            </div><!-- /area-list-left -->
73
        </div><!-- /yui-u first -->
74
    <div class="yui-u">
75
            <div id="area-list-right">
76
                <ul class="biglinks-list">
77
                    [% IF ( CAN_user_serials ) %]
78
                    <li>
79
                        <a class="icon_general icon_serials" href="/cgi-bin/koha/serials/serials-home.pl">Serials</a>
80
                        <span class="biglink"></span>
81
                    </li>
82
                    [% END %]
83
84
                    [% IF ( CAN_user_acquisition ) %]
85
                    <li>
86
                        <a class="icon_general icon_acquisitions" href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
87
                        <span class="biglink"></span>
88
                    </li>
89
                    [% END %]
90
91
                    [% IF ( CAN_user_reports ) %]
92
                    <li>
93
                        <a class="icon_general icon_reports" href="/cgi-bin/koha/reports/reports-home.pl">Reports</a>
94
                    </li>
95
                    [% END %]
96
97
98
                    [% IF ( CAN_user_tools ) %]
99
                    <li>
100
                        <a class="icon_general icon_tools" href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
101
                    </li>
102
                    [% END %]
103
104
                    [% IF ( CAN_user_parameters ) %]
105
                    <li>
106
                        <a class="icon_general icon_administration" href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a>
107
                    </li>
108
                    [% END %]
109
                    <li>
110
                        <a class="icon_general icon_koha" href="/cgi-bin/koha/about.pl">About Koha</a>
111
                    </li>
112
                </ul>
113
            </div><!-- /area-list-right -->
114
        </div><!-- /yui-u -->
115
</div><!-- /yui-g -->
116
<div class="yui-g">
117
            [%# Following statement must be in one line for translatability %]
118
            [% IF ( ( CAN_user_tools_moderate_comments  && pendingcomments ) || ( CAN_user_tools_moderate_tags && pendingtags ) || ( CAN_user_borrowers && pending_borrower_modifications ) || ( CAN_user_acquisition && pendingsuggestions ) || ( CAN_user_borrowers && pending_discharge_requests ) || pending_article_requests) %]
119
                <div id="area-pending">
120
                    [% IF pending_article_requests %]
121
                    <div class="pending-info" id="article_requests_pending">
122
123
                        <a href="/cgi-bin/koha/circ/article-requests.pl">Article requests</a>:
124
                        <span class="pending-number-link">[% pending_article_requests %]</span>
125
                    </div>
126
                    [% END %]
127
128
                    [% IF ( CAN_user_acquisition && pendingsuggestions ) %]
129
                    <div class="pending-info" id="suggestions_pending">
130
131
                        <a href="/cgi-bin/koha/suggestion/suggestion.pl#ASKED">Suggestions pending approval</a>:
132
                        <span class="pending-number-link">[% pendingsuggestions %]</span>
133
                    </div>
134
                    [% END %]
135
136
                    [% IF ( CAN_user_tools_moderate_comments  && pendingcomments ) %]
137
                    <div class="pending-info" id="comments_pending">
138
                        <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments pending approval</a>:
139
                        <span class="pending-number-link">[% pendingcomments %]</span>
140
                    </div>
141
                    [% END %]
142
143
                    [% IF ( CAN_user_tools_moderate_tags && pendingtags ) %]
144
                    <div class="pending-info" id="tags_pending">
145
                        <a href="/cgi-bin/koha/tags/review.pl">Tags pending approval</a>:
146
                        <span class="pending-number-link">[% pendingtags %]</span>
147
                    </div>
42
                    </div>
148
                    [% END %]
43
                [% END %]
44
                <div class="row">
45
                    <div class="col-xs-6">
46
                        <ul class="biglinks-list">
47
                            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
48
                            <li>
49
                                <a class="icon_general icon_circulation" href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
50
                            </li>
51
                            [% END %]
52
53
                            [% IF ( CAN_user_borrowers ) %]
54
                            <li>
55
                                <a class="icon_general icon_patrons" href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
56
                            </li>
57
                            [% END %]
58
59
                            [% IF ( CAN_user_catalogue ) %]
60
                            <li>
61
                                <a class="icon_general icon_search" href="/cgi-bin/koha/catalogue/search.pl">Advanced search</a>
62
                            </li>
63
                            [% END %]
64
65
                            <li>
66
                                <a class="icon_general icon_lists" href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a>
67
                            </li>
68
69
                            [% IF ( UseCourseReserves ) %]
70
                                <li>
71
                                    <a class="icon_general icon_course_reserves" href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a>
72
                                </li>
73
                            [% END %]
74
75
                            [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items ) %]
76
                            <li>
77
                                <a class="icon_general icon_cataloging" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>
78
                            </li>
79
                            [% END %]
80
                            <li>
81
                                <a class="icon_general icon_authorities" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
82
                            </li>
83
                            [% IF Koha.Preference('ILLModule') %]
84
                            <li>
85
                                <a class="icon_general icon_ill" href="/cgi-bin/koha/ill/ill-requests.pl">ILL requests</a>
86
                            </li>
87
                            [% END %]
88
                        </ul>
89
                    </div> <!-- /.col-xs-6 -->
90
                    <div class="col-xs-6">
91
                        <ul class="biglinks-list">
92
                            [% IF ( CAN_user_serials ) %]
93
                            <li>
94
                                <a class="icon_general icon_serials" href="/cgi-bin/koha/serials/serials-home.pl">Serials</a>
95
                                <span class="biglink"></span>
96
                            </li>
97
                            [% END %]
98
99
                            [% IF ( CAN_user_acquisition ) %]
100
                            <li>
101
                                <a class="icon_general icon_acquisitions" href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
102
                                <span class="biglink"></span>
103
                            </li>
104
                            [% END %]
105
106
                            [% IF ( CAN_user_reports ) %]
107
                            <li>
108
                                <a class="icon_general icon_reports" href="/cgi-bin/koha/reports/reports-home.pl">Reports</a>
109
                            </li>
110
                            [% END %]
111
112
113
                            [% IF ( CAN_user_tools ) %]
114
                            <li>
115
                                <a class="icon_general icon_tools" href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
116
                            </li>
117
                            [% END %]
118
119
                            [% IF ( CAN_user_parameters ) %]
120
                            <li>
121
                                <a class="icon_general icon_administration" href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a>
122
                            </li>
123
                            [% END %]
124
                            <li>
125
                                <a class="icon_general icon_koha" href="/cgi-bin/koha/about.pl">About Koha</a>
126
                            </li>
127
                        </ul>
128
                    </div> <!-- /.col-sm-6 -->
129
130
                </div> <!-- /.row -->
131
                <div class="row">
132
                    <div class="col-sm-12">
133
                        [%# Following statement must be in one line for translatability %]
134
                        [% IF ( ( CAN_user_tools_moderate_comments  && pendingcomments ) || ( CAN_user_tools_moderate_tags && pendingtags ) || ( CAN_user_borrowers && pending_borrower_modifications ) || ( CAN_user_acquisition && pendingsuggestions ) || ( CAN_user_borrowers && pending_discharge_requests ) || pending_article_requests) %]
135
                            <div id="area-pending">
136
                                [% IF pending_article_requests %]
137
                                <div class="pending-info" id="article_requests_pending">
138
139
                                    <a href="/cgi-bin/koha/circ/article-requests.pl">Article requests</a>:
140
                                    <span class="pending-number-link">[% pending_article_requests %]</span>
141
                                </div>
142
                                [% END %]
143
144
                                [% IF ( CAN_user_acquisition && pendingsuggestions ) %]
145
                                <div class="pending-info" id="suggestions_pending">
146
147
                                    <a href="/cgi-bin/koha/suggestion/suggestion.pl#ASKED">Suggestions pending approval</a>:
148
                                    <span class="pending-number-link">[% pendingsuggestions %]</span>
149
                                </div>
150
                                [% END %]
151
152
                                [% IF ( CAN_user_tools_moderate_comments  && pendingcomments ) %]
153
                                <div class="pending-info" id="comments_pending">
154
                                    <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments pending approval</a>:
155
                                    <span class="pending-number-link">[% pendingcomments %]</span>
156
                                </div>
157
                                [% END %]
158
159
                                [% IF ( CAN_user_tools_moderate_tags && pendingtags ) %]
160
                                <div class="pending-info" id="tags_pending">
161
                                    <a href="/cgi-bin/koha/tags/review.pl">Tags pending approval</a>:
162
                                    <span class="pending-number-link">[% pendingtags %]</span>
163
                                </div>
164
                                [% END %]
165
166
167
                                [% IF ( CAN_user_borrowers && pending_borrower_modifications ) %]
168
                                <div class="pending-info" id="patron_updates_pending">
169
                                    <a href="/cgi-bin/koha/members/members-update.pl">Patrons requesting modifications</a>:
170
                                    <span class="pending-number-link">[% pending_borrower_modifications %]</span>
171
                                </div>
172
                                [% END %]
173
174
                                [% IF CAN_user_borrowers && pending_discharge_requests %]
175
                                <div class="pending-info" id="patron_discharges_pending">
176
                                    <a href="/cgi-bin/koha/members/discharges.pl">Discharge requests pending</a>:
177
                                    <span class="pending-number-link">[% pending_discharge_requests %]</span>
178
                                </div>
179
                                [% END %]
180
181
                            </div>
149
182
183
                        [% END %]
150
184
151
                    [% IF ( CAN_user_borrowers && pending_borrower_modifications ) %]
185
                    </div> <!-- /.col-sm-12 -->
152
                    <div class="pending-info" id="patron_updates_pending">
186
                </div> <!-- /.row -->
153
                        <a href="/cgi-bin/koha/members/members-update.pl">Patrons requesting modifications</a>:
187
154
                        <span class="pending-number-link">[% pending_borrower_modifications %]</span>
188
                [% IF ( IntranetmainUserblock ) %]
155
                    </div>
189
                    <div class="row">
156
                    [% END %]
190
                        <div class="col-sm-12">
157
191
                            <div id="area-userblock">
158
                    [% IF CAN_user_borrowers && pending_discharge_requests %]
192
                                <div class="user-info">
159
                    <div class="pending-info" id="patron_discharges_pending">
193
                                    [% IntranetmainUserblock %]
160
                        <a href="/cgi-bin/koha/members/discharges.pl">Discharge requests pending</a>:
194
                                </div>
161
                        <span class="pending-number-link">[% pending_discharge_requests %]</span>
195
                            </div>
196
                        </div>
162
                    </div>
197
                    </div>
163
                    [% END %]
198
                [% END %]
164
199
            </div> <!-- /.col-sm-9 -->
165
                </div>
166
200
167
            [% END %]
201
        </div> <!-- /.row -->
168
202
    </div> <!-- /.container-fluid -->
169
</div>
170
            [% IF ( IntranetmainUserblock ) %]
171
                <div class="yui-g" id="area-userblock">
172
                    <div class="user-info">
173
                        [% IntranetmainUserblock %]
174
                    </div>
175
                </div>
176
            [% END %]
177
</div>
178
    </div>
179
    <div class="yui-b"><!-- YOUR NAVIGATION GOES HERE -->
180
    [% IF ( koha_news_count ) %]
181
        <div id="area-news">
182
            <h3><span class="news_title">News</span></h3>
183
            [% SET newsdisp = Koha.Preference('NewsAuthorDisplay') %]
184
            [% FOREACH koha_new IN koha_news %]
185
                <div class="newsitem" id="news[% koha_new.idnew %]"><h4>[% koha_new.title %]</h4>
186
                    <div class="newsbody">[% koha_new.content %]</div>
187
                    <p class="newsfooter"> Posted on [% koha_new.newdate %][% IF( ( newsdisp == 'staff' || newsdisp == 'both' ) && koha_new.borrowernumber ) %] by <span class="newsauthor_title">[% koha_new.author_title %] </span>[% koha_new.author_firstname %] [% koha_new.author_surname %]<br />[% END %]
188
                        [% IF ( CAN_user_tools ) %]
189
                            <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% koha_new.idnew %]">Edit</a>
190
                             | <a class="news_delete" href="/cgi-bin/koha/tools/koha-news.pl?op=del&amp;ids=[% koha_new.idnew %]">Delete</a>
191
                             | <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">New</a>
192
                        [% END %]
193
                    </p>
194
                </div>
195
            [% END %]
196
        </div><!-- /koha-news -->
197
    [% END %]
198
    </div>
199
</div>
200
203
201
[% MACRO jsinclude BLOCK %]
204
[% MACRO jsinclude BLOCK %]
202
    <script type="text/javascript">
205
    <script type="text/javascript">
203
- 

Return to bug 19860