##// END OF EJS Templates
file details view summary box changes, not yet finnished
Liviu -
r3653:db7a4a6a new-ui
parent child Browse files
Show More
@@ -183,11 +183,16 b''
183 }
183 }
184
184
185 .summary .sidebar-right-content {
185 .summary .sidebar-right-content {
186 margin-bottom: @space;
186 margin-bottom: 0;
187
187
188 .rc-user {
188 .rc-user {
189 min-width: 0;
189 min-width: 0;
190 }
190 }
191
192 li {
193 list-style: none;
194 line-height: normal;
195 }
191 }
196 }
192
197
193 .summary {
198 .summary {
@@ -5,11 +5,10 b''
5 % for email, user, commits in sorted(c.authors, key=lambda e: c.file_last_commit.author_email!=e[0]):
5 % for email, user, commits in sorted(c.authors, key=lambda e: c.file_last_commit.author_email!=e[0]):
6 <li class="file_author">
6 <li class="file_author">
7 <div class="tooltip" title="${h.tooltip(h.author_string(email))}">
7 <div class="tooltip" title="${h.tooltip(h.author_string(email))}">
8 ${base.gravatar(email, 16)}
8 <span class="user commit-author">${h.link_to_user(user)}</span>
9 <div class="user">${h.link_to_user(user)}</div>
10
9
11 % if c.file_author:
10 % if c.file_author:
12 <span>- ${h.age_component(c.file_last_commit.date)}</span>
11 <span class="commit-date">- ${h.age_component(c.file_last_commit.date)}</span>
13 % elif c.file_last_commit.author_email==email:
12 % elif c.file_last_commit.author_email==email:
14 <span> (${_('last author')})</span>
13 <span> (${_('last author')})</span>
15 % endif
14 % endif
@@ -23,9 +22,9 b''
23 % endif
22 % endif
24 </span>
23 </span>
25 % endif
24 % endif
26
27 </div>
25 </div>
28 </li>
26 </li>
29 % endfor
27 % endfor
30 </ul>
28 </ul>
31 % endif
29 % endif
30 <a href="#" id="show_authors" class="action_link">${_('Show All')}</a>
@@ -1,85 +1,82 b''
1 <%namespace name="base" file="/base/base.mako"/>
1 <%namespace name="base" file="/base/base.mako"/>
2 <%namespace name="file_base" file="/files/base.mako"/>
2 <%namespace name="file_base" file="/files/base.mako"/>
3
3
4 <div class="fieldset collapsable-content no-hide" data-toggle="summary-details">
4 <div class="summary">
5 <div class="left-label">
5 <div class="fieldset">
6 ${_('Commit Description')}:
6 <div class="left-content">
7 </div>
7
8 <div class="commit right-content truncate-wrap">${h.urlify_commit_message(h.chop_at_smart(c.commit.message, '\n', suffix_if_chopped='...'), c.repo_name)}</div>
8 <div class="left-content-avatar">
9 </div>
9 ${base.gravatar(c.file_last_commit.author_email, 30)}
10 </div>
11
12 <div class="left-content-message">
13 <div class="fieldset collapsable-content no-hide" data-toggle="summary-details">
14 <div class="commit truncate-wrap">${h.urlify_commit_message(h.chop_at_smart(c.commit.message, '\n', suffix_if_chopped='...'), c.repo_name)}</div>
15 </div>
16
17 <div class="fieldset collapsable-content" data-toggle="summary-details">
18 <div class="commit">${h.urlify_commit_message(c.commit.message,c.repo_name)}</div>
19 </div>
10
20
11 <div class="fieldset collapsable-content" data-toggle="summary-details">
21 <div class="fieldset" data-toggle="summary-details">
12 <div class="left-label">
22 <div class="" id="file_authors">
13 ${_('Commit Description')}:
23 ## loads single author, or ALL
14 </div>
24 <%include file='file_authors_box.mako'/>
15 <div class="commit right-content">${h.urlify_commit_message(c.commit.message,c.repo_name)}</div>
25 </div>
16 </div>
26 </div>
27 </div>
28
29 <div class="fieldset collapsable-content" data-toggle="summary-details">
30 <div class="">
31 <div class="tags">
32 ${_('File last commit')}
33 <code><a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.file_last_commit.raw_id)}">${h.show_id(c.file_last_commit)}</a></code>
34
35 ${file_base.refs(c.file_last_commit)}
36 </div>
37 </div>
38 </div>
17
39
18
40
19 <div class="fieldset " data-toggle="summary-details">
41 <div class="fieldset collapsable-content" data-toggle="summary-details">
20 <div class="left-label">
42 <div class="">
21 ${_('References')}:
43 ${_('Show/Diff file')}
22 </div>
44 ${h.hidden('diff1')}
23 <div class="right-content">
45 ${h.hidden('diff2',c.commit.raw_id)}
24 <div class="tags tags-main">
46 ${h.hidden('annotate', c.annotate)}
25 <code><a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.commit.raw_id)}">${h.show_id(c.commit)}</a></code>
47 </div>
26 ${file_base.refs(c.commit)}
48 </div>
49
50
51 <div class="fieldset collapsable-content" data-toggle="summary-details">
52 <div class="">
53 ${_('Action')}:
54 </div>
55 <div class="">
56 ${h.submit('diff_to_commit',_('Diff to Commit'),class_="btn disabled",disabled="true")}
57 ${h.submit('show_at_commit',_('Show at Commit'),class_="btn disabled",disabled="true")}
58 </div>
59 </div>
27 </div>
60 </div>
28 </div>
29 </div>
30
61
31 <div class="fieldset collapsable-content" data-toggle="summary-details">
62 <div class="right-content">
32 <div class="left-label">
63 <div data-toggle="summary-details">
33 ${_('File last commit')}:
64 <div class="tags commit-info tags-main">
34 </div>
65 <code><a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.commit.raw_id)}">${h.show_id(c.commit)}</a></code>
35 <div class="right-content">
66 ${file_base.refs(c.commit)}
36 <div class="tags">
67 </div>
37 <code><a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.file_last_commit.raw_id)}">${h.show_id(c.file_last_commit)}</a></code>
68 </div>
69 </div>
38
70
39 ${file_base.refs(c.file_last_commit)}
71 <div class="clear-fix"></div>
72
73 <div class="btn-collapse" data-toggle="summary-details">
74 ${_('Show More')}
40 </div>
75 </div>
76
41 </div>
77 </div>
42 </div>
78 </div>
43
79
44
45 <div class="fieldset collapsable-content" data-toggle="summary-details">
46 <div class="left-label">
47 ${_('Show/Diff file')}:
48 </div>
49 <div class="right-content">
50 ${h.hidden('diff1')}
51 ${h.hidden('diff2',c.commit.raw_id)}
52 ${h.hidden('annotate', c.annotate)}
53 </div>
54 </div>
55
56
57 <div class="fieldset collapsable-content" data-toggle="summary-details">
58 <div class="left-label">
59 ${_('Action')}:
60 </div>
61 <div class="right-content">
62 ${h.submit('diff_to_commit',_('Diff to Commit'),class_="btn disabled",disabled="true")}
63 ${h.submit('show_at_commit',_('Show at Commit'),class_="btn disabled",disabled="true")}
64 </div>
65 </div>
66
67 <div class="fieldset collapsable-content" data-toggle="summary-details">
68 <div class="left-label" id="file_authors_title">
69 % if c.file_author:
70 ${_('Last Author')}
71 % else:
72 ${h.literal(_ungettext(u'File Author (%s)',u'File Authors (%s)',len(c.authors)) % ('<b>%s</b>' % len(c.authors))) }
73 % endif
74 <a href="#" id="show_authors" class="action_link">${_('Show All')}</a>
75 </div>
76 <div class="right-content" id="file_authors">
77 ## loads single author, or ALL
78 <%include file='file_authors_box.mako'/>
79 </div>
80 </div>
81
82
83 <script>
80 <script>
84 collapsableContent();
81 collapsableContent();
85 </script>
82 </script>
@@ -19,7 +19,7 b''
19 </div>
19 </div>
20
20
21 <div class="clear-fix">
21 <div class="clear-fix">
22 <span class="commit-author">${h.link_to_user(c.commit.author)}</span><span class="commit-date">-${h.age_component(c.commit.date)}</span>
22 <span class="commit-author">${h.link_to_user(c.commit.author)}</span><span class="commit-date"> - ${h.age_component(c.commit.date)}</span>
23 </div>
23 </div>
24 </div>
24 </div>
25 </div>
25 </div>
@@ -33,12 +33,12 b''
33 ${file_base.refs(c.commit)}
33 ${file_base.refs(c.commit)}
34 </div>
34 </div>
35 </div>
35 </div>
36 <div class="clear-fix">
36
37 </div>
37 <div class="clear-fix"></div>
38
38
39
39 <div class="btn-collapse" data-toggle="summary-details">
40 <div class="btn-collapse" data-toggle="summary-details">
40 ${_('Show More')}
41 ${_('Show More')}
41 </div>
42 </div>
42 </div>
43 </div>
43 </div>
44 <script>
44 <script>
General Comments 0
You need to be logged in to leave comments. Login now