##// END OF EJS Templates
rhodecode-enterprise-ce
RSS
Changeset view summary box changes and fixed my profile view
Liviu -
r3685:a7c67104 new-ui
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -408,8 +408,8 b' div.codeblock {'
408 408
409 409 overflow: auto;
410 410 padding: 0px;
411 border: @border-thickness solid #EAEAEA;
412 background: #f5f5f5;
411 border: @border-thickness solid @grey6;
412 background: @grey7;
413 413 .border-radius(@border-radius);
414 414
415 415 #remove_gist {
Show file before | Show file after | Hide comments
@@ -1817,7 +1817,6 b' BIN_FILENODE = 7'
1817 1817 }
1818 1818
1819 1819 #changeset_compare_view_content {
1820 margin-bottom: @space;
1821 1820 clear: both;
1822 1821 width: 100%;
1823 1822 box-sizing: border-box;
Show file before | Show file after | Hide comments
@@ -47,7 +47,7 b''
47 47 min-height: 150px
48 48 }
49 49 }
50
50
51 51 .panel-footer {
52 52 background-color: white;
53 53 padding: .65em @panel-padding .5em;
@@ -63,10 +63,6 b''
63 63 &.user-profile {
64 64 float: left;
65 65
66 .panel-heading {
67 margin-bottom: @padding;
68 }
69
70 66 .panel-body {
71 67 &:extend(.clearfix);
72 68 }
Show file before | Show file after | Hide comments
@@ -225,6 +225,7 b''
225 225 .right-label-summary {
226 226 float: left;
227 227 margin-top: 7px;
228 width: ~"calc(100% - 160px)";
228 229 }
229 230 }
230 231
Show file before | Show file after | Hide comments
@@ -5,50 +5,60 b''
5 5 <a href="${h.route_path('my_account_edit')}" class="panel-edit">${_('Edit')}</a>
6 6 </div>
7 7
8 <div class="panel-body">
9 <div class="fieldset">
10 <div class="left-label">
8 <div class="panel-body fields">
9 <div class="field">
10 <div class="label">
11 11 ${_('Photo')}:
12 12 </div>
13 <div class="right-content">
14 %if c.visual.use_gravatar:
15 ${base.gravatar(c.user.email, 100)}
16 %else:
17 ${base.gravatar(c.user.email, 20)}
18 ${_('Avatars are disabled')}
19 %endif
13 <div class="input">
14 <div class="text-as-placeholder">
15 %if c.visual.use_gravatar:
16 ${base.gravatar(c.user.email, 100)}
17 %else:
18 ${base.gravatar(c.user.email, 20)}
19 ${_('Avatars are disabled')}
20 %endif
21 </div>
20 22 </div>
21 23 </div>
22 <div class="fieldset">
23 <div class="left-label">
24 <div class="field">
25 <div class="label">
24 26 ${_('Username')}:
25 27 </div>
26 <div class="right-content">
27 ${c.user.username}
28 <div class="input">
29 <div class="text-as-placeholder">
30 ${c.user.username}
31 </div>
28 32 </div>
29 33 </div>
30 <div class="fieldset">
31 <div class="left-label">
34 <div class="field">
35 <div class="label">
32 36 ${_('First Name')}:
33 37 </div>
34 <div class="right-content">
35 ${c.user.first_name}
38 <div class="input">
39 <div class="text-as-placeholder">
40 ${c.user.first_name}
41 </div>
36 42 </div>
37 43 </div>
38 <div class="fieldset">
39 <div class="left-label">
44 <div class="field">
45 <div class="label">
40 46 ${_('Last Name')}:
41 47 </div>
42 <div class="right-content">
43 ${c.user.last_name}
48 <div class="input">
49 <div class="text-as-placeholder">
50 ${c.user.last_name}
51 </div>
44 52 </div>
45 53 </div>
46 <div class="fieldset">
47 <div class="left-label">
54 <div class="field">
55 <div class="label">
48 56 ${_('Email')}:
49 57 </div>
50 <div class="right-content">
51 ${c.user.email or _('Missing email, please update your user email address.')}
58 <div class="input">
59 <div class="text-as-placeholder">
60 ${c.user.email or _('Missing email, please update your user email address.')}
61 </div>
52 62 </div>
53 63 </div>
54 64 </div>
Show file before | Show file after | Hide comments
@@ -28,113 +28,114 b''
28 28
29 29 <div id="changeset_compare_view_content" class="summary changeset">
30 30 <div class="summary-detail">
31 <div class="summary-detail-header">
32 <div class="breadcrumbs files_location">
33 <h4>
34 ${_('Commit')}
31 <div class="fieldset">
32 <div class="left-label-summary">
33 <p>${_('Commit')}</p>
34 <div class="right-label-summary">
35 <code>
36 ${h.show_id(c.commit)}
37 </code>
38 <i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${c.commit.raw_id}" title="${_('Copy the full commit id')}"></i>
39 % if hasattr(c.commit, 'phase'):
40 <span class="tag phase-${c.commit.phase} tooltip" title="${_('Commit phase')}">${c.commit.phase}</span>
41 % endif
35 42
36 <code>
37 ${h.show_id(c.commit)}
38 </code>
39 <i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${c.commit.raw_id}" title="${_('Copy the full commit id')}"></i>
40 % if hasattr(c.commit, 'phase'):
41 <span class="tag phase-${c.commit.phase} tooltip" title="${_('Commit phase')}">${c.commit.phase}</span>
42 % endif
43
44 ## obsolete commits
45 % if hasattr(c.commit, 'obsolete'):
46 % if c.commit.obsolete:
47 <span class="tag obsolete-${c.commit.obsolete} tooltip" title="${_('Evolve State')}">${_('obsolete')}</span>
43 ## obsolete commits
44 % if hasattr(c.commit, 'obsolete'):
45 % if c.commit.obsolete:
46 <span class="tag obsolete-${c.commit.obsolete} tooltip" title="${_('Evolve State')}">${_('obsolete')}</span>
47 % endif
48 48 % endif
49 % endif
50 49
51 ## hidden commits
52 % if hasattr(c.commit, 'hidden'):
53 % if c.commit.hidden:
54 <span class="tag hidden-${c.commit.hidden} tooltip" title="${_('Evolve State')}">${_('hidden')}</span>
50 ## hidden commits
51 % if hasattr(c.commit, 'hidden'):
52 % if c.commit.hidden:
53 <span class="tag hidden-${c.commit.hidden} tooltip" title="${_('Evolve State')}">${_('hidden')}</span>
54 % endif
55 55 % endif
56 % endif
57 </h4>
56
58 57
58 <div class="pull-right">
59 <span id="parent_link">
60 <a href="#parentCommit" title="${_('Parent Commit')}"><i class="icon-left icon-no-margin"></i>${_('parent')}</a>
61 </span>
62 |
63 <span id="child_link">
64 <a href="#childCommit" title="${_('Child Commit')}">${_('child')}<i class="icon-right icon-no-margin"></i></a>
65 </span>
66 </div>
67
68 </div>
69 </div>
59 70 </div>
60 <div class="pull-right">
61 <span id="parent_link">
62 <a href="#parentCommit" title="${_('Parent Commit')}"><i class="icon-left icon-no-margin"></i>${_('parent')}</a>
63 </span>
64 |
65 <span id="child_link">
66 <a href="#childCommit" title="${_('Child Commit')}">${_('child')}<i class="icon-right icon-no-margin"></i></a>
67 </span>
68 </div>
69 </div>
71
72
70 73
71 74 <div class="fieldset">
72 <div class="left-label">
73 ${_('Description')}:
74 </div>
75 <div class="right-content">
76 <div id="trimmed_message_box" class="commit">${h.urlify_commit_message(c.commit.message,c.repo_name)}</div>
77 <div id="message_expand" style="display:none;">
78 ${_('Expand')}
75 <div class="left-label-summary">
76 <p>${_('Description')}:</p>
77 <div class="right-label-summary">
78 <div id="trimmed_message_box" class="commit">${h.urlify_commit_message(c.commit.message,c.repo_name)}</div>
79 <div id="message_expand" style="display:none;">
80 ${_('Expand')}
81 </div>
79 82 </div>
80 83 </div>
81 84 </div>
82 85
83 86 %if c.statuses:
84 87 <div class="fieldset">
85 <div class="left-label">
86 ${_('Commit status')}:
87 </div>
88 <div class="right-content">
89 <div class="changeset-status-ico">
90 <div class="${'flag_status %s' % c.statuses[0]} pull-left"></div>
88 <div class="left-label-summary">
89 <p>${_('Commit status')}:</p>
90 <div class="right-label-summary">
91 <div class="changeset-status-ico">
92 <div class="${'flag_status %s' % c.statuses[0]} pull-left"></div>
93 </div>
94 <div title="${_('Commit status')}" class="changeset-status-lbl">[${h.commit_status_lbl(c.statuses[0])}]</div>
91 95 </div>
92 <div title="${_('Commit status')}" class="changeset-status-lbl">[${h.commit_status_lbl(c.statuses[0])}]</div>
93 96 </div>
94 97 </div>
95 98 %endif
96 99
97 100 <div class="fieldset">
98 <div class="left-label">
99 ${_('References')}:
100 </div>
101 <div class="right-content">
102 <div class="tags">
103
104 %if c.commit.merge:
105 <span class="mergetag tag">
106 <i class="icon-merge"></i>${_('merge')}
107 </span>
108 %endif
101 <div class="left-label-summary">
102 <p>${_('References')}:</p>
103 <div class="right-label-summary">
104 <div class="tags">
105 %if c.commit.merge:
106 <span class="mergetag tag">
107 <i class="icon-merge"></i>${_('merge')}
108 </span>
109 %endif
109 110
110 %if h.is_hg(c.rhodecode_repo):
111 %for book in c.commit.bookmarks:
112 <span class="booktag tag" title="${h.tooltip(_('Bookmark %s') % book)}">
113 <a href="${h.route_path('repo_files:default_path',repo_name=c.repo_name,commit_id=c.commit.raw_id,_query=dict(at=book))}"><i class="icon-bookmark"></i>${h.shorter(book)}</a>
114 </span>
115 %endfor
116 %endif
111 %if h.is_hg(c.rhodecode_repo):
112 %for book in c.commit.bookmarks:
113 <span class="booktag tag" title="${h.tooltip(_('Bookmark %s') % book)}">
114 <a href="${h.route_path('repo_files:default_path',repo_name=c.repo_name,commit_id=c.commit.raw_id,_query=dict(at=book))}"><i class="icon-bookmark"></i>${h.shorter(book)}</a>
115 </span>
116 %endfor
117 %endif
117 118
118 %for tag in c.commit.tags:
119 <span class="tagtag tag" title="${h.tooltip(_('Tag %s') % tag)}">
120 <a href="${h.route_path('repo_files:default_path',repo_name=c.repo_name,commit_id=c.commit.raw_id,_query=dict(at=tag))}"><i class="icon-tag"></i>${tag}</a>
121 </span>
122 %endfor
119 %for tag in c.commit.tags:
120 <span class="tagtag tag" title="${h.tooltip(_('Tag %s') % tag)}">
121 <a href="${h.route_path('repo_files:default_path',repo_name=c.repo_name,commit_id=c.commit.raw_id,_query=dict(at=tag))}"><i class="icon-tag"></i>${tag}</a>
122 </span>
123 %endfor
123 124
124 %if c.commit.branch:
125 <span class="branchtag tag" title="${h.tooltip(_('Branch %s') % c.commit.branch)}">
126 <a href="${h.route_path('repo_files:default_path',repo_name=c.repo_name,commit_id=c.commit.raw_id,_query=dict(at=c.commit.branch))}"><i class="icon-code-fork"></i>${h.shorter(c.commit.branch)}</a>
127 </span>
128 %endif
125 %if c.commit.branch:
126 <span class="branchtag tag" title="${h.tooltip(_('Branch %s') % c.commit.branch)}">
127 <a href="${h.route_path('repo_files:default_path',repo_name=c.repo_name,commit_id=c.commit.raw_id,_query=dict(at=c.commit.branch))}"><i class="icon-code-fork"></i>${h.shorter(c.commit.branch)}</a>
128 </span>
129 %endif
130 </div>
129 131 </div>
130 </div>
131 132 </div>
133 </div>
132 134
133 135 <div class="fieldset">
134 <div class="left-label">
135 ${_('Diff options')}:
136 </div>
137 <div class="right-content">
136 <div class="left-label-summary">
137 <p>${_('Diff options')}:</p>
138 <div class="right-label-summary">
138 139 <div class="diff-actions">
139 140 <a href="${h.route_path('repo_commit_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id)}" class="tooltip" title="${h.tooltip(_('Raw diff'))}">
140 141 ${_('Raw Diff')}
@@ -148,14 +149,14 b''
148 149 ${_('Download Diff')}
149 150 </a>
150 151 </div>
152 </div>
151 153 </div>
152 154 </div>
153 155
154 156 <div class="fieldset">
155 <div class="left-label">
156 ${_('Comments')}:
157 </div>
158 <div class="right-content">
157 <div class="left-label-summary">
158 <p>${_('Comments')}:</p>
159 <div class="right-label-summary">
159 160 <div class="comments-number">
160 161 %if c.comments:
161 162 <a href="#comments">${_ungettext("%d Commit comment", "%d Commit comments", len(c.comments)) % len(c.comments)}</a>,
@@ -168,40 +169,42 b''
168 169 ${_ungettext("%d Inline Comment", "%d Inline Comments", c.inline_cnt) % c.inline_cnt}
169 170 %endif
170 171 </div>
172 </div>
171 173 </div>
172 174 </div>
173 175
174 176 <div class="fieldset">
175 <div class="left-label">
176 ${_('Unresolved TODOs')}:
177 </div>
178 <div class="right-content">
179 <div class="comments-number">
180 % if c.unresolved_comments:
181 % for co in c.unresolved_comments:
182 <a class="permalink" href="#comment-${co.comment_id}" onclick="Rhodecode.comments.scrollToComment($('#comment-${co.comment_id}'))"> #${co.comment_id}</a>${'' if loop.last else ','}
183 % endfor
184 % else:
185 ${_('There are no unresolved TODOs')}
186 % endif
187 </div>
177 <div class="left-label-summary">
178 <p>${_('Unresolved TODOs')}:</p>
179 <div class="right-label-summary">
180 <div class="comments-number">
181 % if c.unresolved_comments:
182 % for co in c.unresolved_comments:
183 <a class="permalink" href="#comment-${co.comment_id}" onclick="Rhodecode.comments.scrollToComment($('#comment-${co.comment_id}'))"> #${co.comment_id}</a>${'' if loop.last else ','}
184 % endfor
185 % else:
186 ${_('There are no unresolved TODOs')}
187 % endif
188 </div>
189 </div>
188 190 </div>
189 191 </div>
190 192
191 </div> <!-- end summary-detail -->
193 <div class="fieldset">
194 <div class="left-label-summary">
195 <p>${_('Author')}</p>
192 196
193 <div id="commit-stats" class="sidebar-right">
194 <div class="summary-detail-header">
195 <h4 class="item">
196 ${_('Author')}
197 </h4>
198 </div>
199 <div class="sidebar-right-content">
197 <div class="right-label-summary">
200 198 ${self.gravatar_with_user(c.commit.author)}
201 199 <div class="user-inline-data">- ${h.age_component(c.commit.date)}</div>
200 </div>
202 201 </div>
203 </div><!-- end sidebar -->
202
203 <div class="clear-fix"></div>
204
205 </div> <!-- end summary-detail -->
204 206 </div> <!-- end summary -->
207 </div>
205 208 <div class="cs_files">
206 209 <%namespace name="cbdiffs" file="/codeblocks/diffs.mako"/>
207 210 ${cbdiffs.render_diffset_menu(c.changes[c.commit.raw_id])}
General Comments 0
You need to be logged in to leave comments. Login now