##// END OF EJS Templates
html + css changes, added icons and etc.
marcink -
r219:64e1125f default
parent child Browse files
Show More
@@ -19,7 +19,7 b' div.diffblock .code-header div{'
19 font-weight: bold;
19 font-weight: bold;
20 }
20 }
21 div.diffblock .code-body{
21 div.diffblock .code-body{
22 background: #EEEEEE;
22 background: #FFFFFF;
23 }
23 }
24 div.diffblock pre.raw{
24 div.diffblock pre.raw{
25 background: #FFFFFF;
25 background: #FFFFFF;
@@ -6,15 +6,99 b''
6 }
6 }
7
7
8 a {
8 a {
9 color: #0000cc;
9 color: #556CB5;
10 text-decoration: none;
10 text-decoration: none;
11 }
11 }
12 a:HOVER{
12 a:HOVER{
13 text-decoration: underline;
13 text-decoration: underline;
14 }
14 }
15
15 /*** end of Initial Settings ***/
16 /*** end of Initial Settings ***/
16
17
18 /*** ***/
19 .table_disp {
20 border-left: 0px solid #666666;
21 border-bottom: 1px solid #666666;
22 border-right: 1px solid #666666;
23 padding: 0px;
24 margin: 0px;
25 border-spacing: 0px;
26 }
27
28 .table_disp .header {
29 border-top: 1px solid #666666;
30 background-color: #556CB5;
31 font-weight: bold;
32 color: white;
33 vertical-align: middle;
34 padding: 3px 5px;
35 text-align: left;
36 font-size: 0.9em;
37 }
38
39 .table_disp .header td {
40 padding: 4px;
41 vertical-align: middle;
42 border-top: 1px solid #AAAAAA;
43 border-bottom: 2px solid #666666;
44 }
45 .table_disp td {
46 border-left: 1px solid #AAAAAA;
47 padding-left: 2px;
48 padding-right: 0px;
49 }
50
51 table tr.parity0:hover,table tr.parity1:hover {
52 background: #D5E1E6;
53 }
54
55 table tr.parity0 {
56 background: #EAEAE9;
57 }
58
59 table tr.parity1 {
60 background: #FFFFFF;
61 }
62
63
64 /*** ***/
65
17 /** common settings **/
66 /** common settings **/
67 .add_icon{
68 background: url("/images/icons/add.png") no-repeat scroll 3px;
69 height: 16px;
70 padding-left: 20px;
71 padding-top: 0px;
72 text-align: left;
73
74 }
75 .edit_icon{
76 background: url("/images/icons/folder_edit.png") no-repeat scroll 3px;
77 height: 16px;
78 padding-left: 20px;
79 padding-top: 0px;
80 text-align: left;
81 }
82
83 .delete_icon{
84 background: url("/images/icons/delete.png") no-repeat scroll 3px;
85 height: 16px;
86 padding-left: 20px;
87 padding-top: 0px;
88 text-align: left;
89
90 }
91
92 .action_button{
93 border:0px;
94 display: block;
95 }
96 .action_button:hover{
97 border:0px;
98 font-style:italic;
99 cursor: pointer;
100 }
101
18 div#main {
102 div#main {
19 padding: 5px;
103 padding: 5px;
20 }
104 }
@@ -121,15 +205,42 b' ul.page-nav li a:hover {'
121 }
205 }
122
206
123 ul.submenu {
207 ul.submenu {
124 margin: 10px 0 -10px 20px;
208 margin: 5px 0px -20px 0px;
125 list-style-type: none;
209 list-style-type: none;
126 }
210 }
127
211
128 ul.submenu li {
212 ul.submenu li {
129 margin: 0 10px 0 0;
213 margin: 0 10px 0 0;
130 font-size: 1.2em;
214 font-size: 0.9em;
215 font-weight:bold;
131 display: inline;
216 display: inline;
132 }
217 }
218 ul.submenu .repos {
219 background: url("/images/icons/folder_edit.png") no-repeat scroll 3px;
220 height: 16px;
221 padding-left: 20px;
222 padding-top: 0px;
223 text-align: left;
224
225 }
226 ul.submenu .users {
227 background: url("/images/icons/user_edit.png") no-repeat scroll 3px;
228 height: 16px;
229 padding-left: 20px;
230 padding-top: 0px;
231 text-align: left;
232 }
233 ul.submenu .permissions {
234 background: url("/images/icons/folder_key.png") no-repeat scroll 3px;
235 height: 16px;
236 padding-left: 20px;
237 padding-top: 0px;
238 text-align: left;
239 }
240
241 ul.submenu .current_submenu {
242 border-bottom: 2px solid #556CB5;
243 }
133
244
134 h2 {
245 h2 {
135 margin: 20px 0 10px;
246 margin: 20px 0 10px;
@@ -140,6 +251,7 b' h2 {'
140 font-size: 1.2em;
251 font-size: 1.2em;
141 border-top: dotted 1px #D5E1E6;
252 border-top: dotted 1px #D5E1E6;
142 font-weight: bold;
253 font-weight: bold;
254 color:#556CB5;
143 }
255 }
144
256
145 h2.no-link {
257 h2.no-link {
@@ -215,18 +327,6 b' p.normal {'
215 font-size: 1.2em;
327 font-size: 1.2em;
216 }
328 }
217
329
218 table tr.parity0:hover,table tr.parity1:hover {
219 background: #D5E1E6;
220 }
221
222 table tr.parity0 {
223 background: #EAEAE9;
224 }
225
226 table tr.parity1 {
227 background: #FFFFFF;
228 }
229
230 span.logtags span {
330 span.logtags span {
231 background-repeat: no-repeat;
331 background-repeat: no-repeat;
232 height: 16px;
332 height: 16px;
@@ -336,6 +436,9 b' dl.overview dt {'
336 width: 150px;
436 width: 150px;
337 }
437 }
338
438
439 #clone_url{
440 border: 0px;
441 }
339 /** end of summary **/
442 /** end of summary **/
340
443
341 /** chagelog **/
444 /** chagelog **/
@@ -651,10 +754,6 b' table.code-browser tbody td {'
651 text-align: left;
754 text-align: left;
652 }
755 }
653
756
654 .current_submenu {
655 border-bottom: 2px solid;
656 }
657
658 #repos_list {
757 #repos_list {
659 border: 1px solid #556CB5;
758 border: 1px solid #556CB5;
660 background: #FFFFFF;
759 background: #FFFFFF;
@@ -16,7 +16,6 b''
16 %if c.admin_user:
16 %if c.admin_user:
17 <div>
17 <div>
18 <h2>Welcome ${c.admin_username}</h2>
18 <h2>Welcome ${c.admin_username}</h2>
19 ${_('Last actions')}
20 <div id="user_log">
19 <div id="user_log">
21 ${c.log_data}
20 ${c.log_data}
22 </div>
21 </div>
@@ -1,7 +1,7 b''
1 ## -*- coding: utf-8 -*-
1 ## -*- coding: utf-8 -*-
2 %if c.users_log:
2 %if c.users_log:
3 <table>
3 <table class="table_disp">
4 <tr>
4 <tr class="header">
5 <td>${_('Username')}</td>
5 <td>${_('Username')}</td>
6 <td>${_('Repository')}</td>
6 <td>${_('Repository')}</td>
7 <td>${_('Action')}</td>
7 <td>${_('Action')}</td>
@@ -15,18 +15,24 b''
15 <%def name="main()">
15 <%def name="main()">
16 <div>
16 <div>
17 <h2>${_('Repositories administration')}</h2>
17 <h2>${_('Repositories administration')}</h2>
18 <table>
18 <table class="table_disp">
19 <tr class="header">
20 <td>${_('name')}</td>
21 <td>${_('last revision')}</td>
22 <td>${_('action')}</td>
23 </tr>
19 %for cnt,repo in enumerate(c.repos_list):
24 %for cnt,repo in enumerate(c.repos_list):
20 <tr class="parity${cnt%2}">
25 <tr class="parity${cnt%2}">
21 <td>${h.link_to(repo['name'],h.url('summary_home',repo_name=repo['name']))}</td>
26 <td>${h.link_to(repo['name'],h.url('summary_home',repo_name=repo['name']))}</td>
22 <td>r${repo['rev']}:${repo['tip']}</td>
27 <td>r${repo['rev']}:${repo['tip']}</td>
23 <td>
28 <td>
24 ${h.form(url('repo', id=repo['name']),method='delete')}
29 ${h.form(url('repo', id=repo['name']),method='delete')}
25 ${h.submit('remove','remove',class_="submit",onclick="return confirm('Confirm to delete this repository');")}
30 ${h.submit('remove','delete',class_="delete_icon action_button",onclick="return confirm('Confirm to delete this repository');")}
26 ${h.end_form()}
31 ${h.end_form()}
27 </td>
32 </td>
28 </tr>
33 </tr>
29 %endfor
34 %endfor
30 </table>
35 </table>
36 <span class="add_icon">${h.link_to(u'add repo',h.url('new_repo'))}</span>
31 </div>
37 </div>
32 </%def>
38 </%def>
@@ -15,13 +15,13 b''
15 <%def name="main()">
15 <%def name="main()">
16 <div>
16 <div>
17 <h2>${_('Mercurial users')}</h2>
17 <h2>${_('Mercurial users')}</h2>
18 <table>
18 <table class="table_disp">
19 <tr>
19 <tr class="header">
20 <th>Id</th>
20 <td>ID</td>
21 <th>Username</th>
21 <td>Username</td>
22 <th>Active</th>
22 <td>Active</td>
23 <th>Admin</th>
23 <td>Admin</td>
24 <th>Action</th>
24 <td>Action</td>
25 </tr>
25 </tr>
26 %for user in c.users_list:
26 %for user in c.users_list:
27 <tr>
27 <tr>
@@ -31,12 +31,12 b''
31 <td>${user.admin}</td>
31 <td>${user.admin}</td>
32 <td>
32 <td>
33 ${h.form(url('user', id=user.user_id),method='delete')}
33 ${h.form(url('user', id=user.user_id),method='delete')}
34 ${h.submit('remove','remove',class_="submit")}
34 ${h.submit('remove','delete',class_="delete_icon action_button")}
35 ${h.end_form()}
35 ${h.end_form()}
36 </td>
36 </td>
37 </tr>
37 </tr>
38 %endfor
38 %endfor
39 </table>
39 </table>
40 <h3>${h.link_to(u'Add user',h.url('new_user'))}</h3>
40 <span class="add_icon">${h.link_to(u'add user',h.url('new_user'))}</span>
41 </div>
41 </div>
42 </%def>
42 </%def>
@@ -113,10 +113,10 b' def is_current(selected):'
113 %if current != None:
113 %if current != None:
114 <div>
114 <div>
115 <ul class="submenu">
115 <ul class="submenu">
116 <li ${is_current('repos')}>${h.link_to(u'repos',h.url('repos'))}</li>
116 <li ${is_current('repos')}>${h.link_to(u'repos',h.url('repos'),class_='repos')}</li>
117 <li ${is_current('users')}>${h.link_to(u'users',h.url('users'))}</li>
117 <li ${is_current('users')}>${h.link_to(u'users',h.url('users'),class_='users')}</li>
118 <li ${is_current('permissions')}>${h.link_to(u'permissions',h.url('permissions'),class_='permissions')}</li>
118 </ul>
119 </ul>
119 <br/>
120 </div>
120 </div>
121 %endif
121 %endif
122 </%def>
122 </%def>
@@ -15,6 +15,22 b' from pylons_app.lib import filters'
15 <%def name="page_nav()">
15 <%def name="page_nav()">
16 ${self.menu('summary')}
16 ${self.menu('summary')}
17 </%def>
17 </%def>
18
19 <%def name="js()">
20 <script type="text/javascript" src="/js/yui/utilities/utilities.js"></script>
21 <script type="text/javascript">
22 var E = YAHOO.util.Event;
23 var D = YAHOO.util.Dom;
24
25 E.onDOMReady(function(e){
26 id = 'clone_url';
27 E.addListener(id,'click',function(e){
28 D.get('clone_url').select();
29 })
30 })
31 </script>
32 </%def>
33
18 <%def name="main()">
34 <%def name="main()">
19 <h2 class="no-link no-border">${_('Mercurial Repository Overview')}</h2>
35 <h2 class="no-link no-border">${_('Mercurial Repository Overview')}</h2>
20 <dl class="overview">
36 <dl class="overview">
@@ -26,8 +42,8 b' from pylons_app.lib import filters'
26 <dd>${c.repo_info.contact}</dd>
42 <dd>${c.repo_info.contact}</dd>
27 <dt>${_('last change')}</dt>
43 <dt>${_('last change')}</dt>
28 <dd>${c.repo_info.last_change|n,filters.rfc822date} - ${c.repo_info.last_change|n,filters.age}</dd>
44 <dd>${c.repo_info.last_change|n,filters.rfc822date} - ${c.repo_info.last_change|n,filters.age}</dd>
29 <dt>${_('url')}</dt>
45 <dt>${_('clone url')}</dt>
30 <dd><pre style="margin:0">hg clone <a href="${c.clone_repo_url}">${c.clone_repo_url}</a></pre></dd>
46 <dd><input type="text" id="clone_url" readonly="readonly" value="hg clone ${c.clone_repo_url}" size="40"/></dd>
31 <dt>${_('download')}</dt>
47 <dt>${_('download')}</dt>
32 <dd>
48 <dd>
33 %for cnt,archive in enumerate(c.repo_info._get_archives()):
49 %for cnt,archive in enumerate(c.repo_info._get_archives()):
General Comments 0
You need to be logged in to leave comments. Login now