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

(-)a/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css (-34 / +11 lines)
Lines 11-19 Link Here
11
 *
11
 *
12
 */
12
 */
13
13
14
#area-content {
14
#doc3 {
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
    float: left;
17
    background-image:url('/intranet-tmpl/prog/img/background_koha_logo.png');
16
    background-image:url('/intranet-tmpl/prog/img/background_koha_logo.png');
18
    background-repeat:no-repeat;
17
    background-repeat:no-repeat;
19
    background-position:left top;
18
    background-position:left top;
Lines 22-34 Link Here
22
21
23
22
24
/* ==== NEWS - Start ==== */
23
/* ==== NEWS - Start ==== */
24
25
#area-news {
25
#area-news {
26
    /* Displayed if news are available */
27
    width: 300px;
28
    float: left;
29
    border: 1px solid #EEEEEE;
26
    border: 1px solid #EEEEEE;
30
    margin: .2em;
27
    border-radius: 6px 6px 6px 6px;
31
    border-radius: 6px;
28
    margin: 0.2em;
32
}
29
}
33
30
34
#area-news h3 {
31
#area-news h3 {
Lines 55-86 Link Here
55
    color: #808080;
52
    color: #808080;
56
}
53
}
57
54
58
#area-nonews {
59
    /* Displayed if no news are available, to keep the structure intact */
60
    width: 300px;
61
    float: left;
62
}
63
/* ==== NEWS - End ==== */
55
/* ==== NEWS - End ==== */
64
56
65
57
66
/* ==== MODULE LINKS - Start ==== */
58
/* ==== MODULE LINKS - Start ==== */
67
#area-lists {
68
    /* Contains the two links columns */
69
    margin-left: 20px;
70
    float: left;
71
}
72
73
#area-list-left {
74
    /* Left column for links */
75
    width: 352px;
76
    float: left;
77
}
78
#area-list-right {
79
    /* Right column for links */
80
    margin-left: 20px;
81
    float: left;
82
    width: 352px;
83
}
84
59
85
ul.biglinks-list {
60
ul.biglinks-list {
86
    /* List containing the module links */
61
    /* List containing the module links */
Lines 97-106 ul.biglinks-list li a.icon_general { Link Here
97
    display: block;
72
    display: block;
98
    float: left;
73
    float: left;
99
74
100
    width:295px;
75
    width: 83%;
76
    max-width : 320px;
101
    height: 46px;
77
    height: 46px;
102
    margin-bottom: 14px;
78
    margin: 0 1em 14px 0;
103
    padding-left:53px;
79
    padding-left:57px;
104
    padding-top:5px;
80
    padding-top:5px;
105
81
106
    border: solid 2px #b9d8d9;
82
    border: solid 2px #b9d8d9;
Lines 113-124 ul.biglinks-list li a.icon_general { Link Here
113
    color: #000000;
89
    color: #000000;
114
90
115
    background-color:#f4f8f9;
91
    background-color:#f4f8f9;
92
    background-position: 5px 3px;
116
    background-repeat:no-repeat;
93
    background-repeat:no-repeat;
117
}
94
}
118
95
119
ul.biglinks-list li a:hover.icon_general {
96
ul.biglinks-list li a:hover.icon_general {
120
    /* Class used for each module link hover state */
97
    /* Class used for each module link hover state */
121
    background-position:0 -46px;
98
    background-position:5px -43px;
122
    color: #538200;
99
    color: #538200;
123
    border-color: #538200;
100
    border-color: #538200;
124
}
101
}
Lines 188-194 ul.biglinks-list li a.icon_koha {background-image:url('/intranet-tmpl/prog/img/i Link Here
188
    width: 100%;
165
    width: 100%;
189
    border: solid 1px #b9d8d9;
166
    border: solid 1px #b9d8d9;
190
    border-radius: 6px;
167
    border-radius: 6px;
191
    clear: left;
168
192
}
169
}
193
170
194
.user-info {
171
.user-info {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (-36 / +42 lines)
Lines 10-37 Link Here
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
<div style="clear: both"></div>
13
14
<div id="area-content">
14
15
    [% IF ( koha_news_count ) %]
15
<div id="doc3" class="yui-t3">
16
        <div id="area-news">
16
   <div id="bd" role="main">
17
            <h3><span="news_title">News</span></h3>
17
    <div id="yui-main">
18
            [% FOREACH koha_new IN koha_news %]
18
    <div class="yui-b"><div class="yui-g">
19
                <div class="newsitem" id="news[% koha_new.idnew %]"><h4>[% koha_new.title %]</h4>
19
    <div class="yui-u first">
20
                    <p>[% koha_new.new %]</p>
21
                    <p class="newsfooter"> Posted on [% koha_new.newdate %]
22
                        [% IF ( CAN_user_tools ) %]
23
                            <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% koha_new.idnew %]">Edit</a>
24
                             | <a href="/cgi-bin/koha/tools/koha-news.pl?op=del&amp;ids=[% koha_new.idnew %]">Delete</a>
25
                             | <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">New</a>
26
                        [% END %]
27
                    </p>
28
                </div>
29
            [% END %]
30
        </div><!-- /koha-news -->
31
    [% ELSE %]
32
        <div id="area-nonews">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
33
    [% END %]
34
        <div id="area-lists">
35
            <div id="area-list-left">
20
            <div id="area-list-left">
36
                <ul class="biglinks-list">
21
                <ul class="biglinks-list">
37
                    [% IF ( CAN_user_circulate ) %]
22
                    [% IF ( CAN_user_circulate ) %]
Lines 69-75 Link Here
69
                    [% END %]
54
                    [% END %]
70
                </ul>
55
                </ul>
71
            </div><!-- /area-list-left -->
56
            </div><!-- /area-list-left -->
72
57
        </div><!-- /yui-u first -->
58
    <div class="yui-u">
73
            <div id="area-list-right">
59
            <div id="area-list-right">
74
                <ul class="biglinks-list">
60
                <ul class="biglinks-list">
75
                    [% IF ( CAN_user_serials ) %]
61
                    [% IF ( CAN_user_serials ) %]
Lines 109-116 Link Here
109
                    </li>
95
                    </li>
110
                </ul>
96
                </ul>
111
            </div><!-- /area-list-right -->
97
            </div><!-- /area-list-right -->
112
98
        </div><!-- /yui-u -->
113
            [% IF ( CAN_user_tools_moderate_comments ) && ( pendingsuggestions || pendingcomments || pendingtags ) %]
99
</div><!-- /yui-g -->
100
<div class="yui-g">
101
                [% IF ( CAN_user_tools_moderate_comments ) && ( pendingsuggestions || pendingcomments || pendingtags ) %]
114
                <div id="area-pending">
102
                <div id="area-pending">
115
                    [% IF ( pendingsuggestions ) %]
103
                    [% IF ( pendingsuggestions ) %]
116
                    <div class="pending-info">
104
                    <div class="pending-info">
Lines 135-153 Link Here
135
                </div>
123
                </div>
136
            [% END %]
124
            [% END %]
137
125
126
127
</div>
138
            [% IF ( IntranetmainUserblock ) %]
128
            [% IF ( IntranetmainUserblock ) %]
139
            <div id="area-userblock">
129
                <div class="yui-g" id="area-userblock">
140
                <div class="user-info">
130
                    <div class="user-info">
141
                    [% IntranetmainUserblock %]
131
                        [% IntranetmainUserblock %]
132
                    </div>
142
                </div>
133
                </div>
143
            </div>
144
            [% END %]
134
            [% END %]
145
135
</div>
146
            <div style="height: 30px">
136
    </div>
147
                <!-- Without this white space the end of the page can be hidden by the language selector -->
137
    <div class="yui-b"><!-- YOUR NAVIGATION GOES HERE -->
148
                &nbsp;
138
    [% IF ( koha_news_count ) %]
149
            </div>
139
        <div id="area-news">
150
        </div><!-- /area-lists -->
140
            <h3><span="news_title">News</span></h3>
141
            [% FOREACH koha_new IN koha_news %]
142
                <div class="newsitem" id="news[% koha_new.idnew %]"><h4>[% koha_new.title %]</h4>
143
                    <p>[% koha_new.new %]</p>
144
                    <p class="newsfooter"> Posted on [% koha_new.newdate %]
145
                        [% IF ( CAN_user_tools ) %]
146
                            <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% koha_new.idnew %]">Edit</a>
147
                             | <a href="/cgi-bin/koha/tools/koha-news.pl?op=del&amp;ids=[% koha_new.idnew %]">Delete</a>
148
                             | <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">New</a>
149
                        [% END %]
150
                    </p>
151
                </div>
152
            [% END %]
153
        </div><!-- /koha-news -->
154
    [% END %]
155
    </div>
156
    </div>
157
</div>
151
158
152
<!-- the main div is closed in intranet-bottom.inc -->
159
<!-- the main div is closed in intranet-bottom.inc -->
153
[% INCLUDE 'intranet-bottom.inc' %]
160
[% INCLUDE 'intranet-bottom.inc' %]
154
- 

Return to bug 7979