##// 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
@@ -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,12 +5,13 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">
13 <div class="input">
14 <div class="text-as-placeholder">
14 15 %if c.visual.use_gravatar:
15 16 ${base.gravatar(c.user.email, 100)}
16 17 %else:
@@ -19,37 +20,46 b''
19 20 %endif
20 21 </div>
21 22 </div>
22 <div class="fieldset">
23 <div class="left-label">
23 </div>
24 <div class="field">
25 <div class="label">
24 26 ${_('Username')}:
25 27 </div>
26 <div class="right-content">
28 <div class="input">
29 <div class="text-as-placeholder">
27 30 ${c.user.username}
28 31 </div>
29 32 </div>
30 <div class="fieldset">
31 <div class="left-label">
33 </div>
34 <div class="field">
35 <div class="label">
32 36 ${_('First Name')}:
33 37 </div>
34 <div class="right-content">
38 <div class="input">
39 <div class="text-as-placeholder">
35 40 ${c.user.first_name}
36 41 </div>
37 42 </div>
38 <div class="fieldset">
39 <div class="left-label">
43 </div>
44 <div class="field">
45 <div class="label">
40 46 ${_('Last Name')}:
41 47 </div>
42 <div class="right-content">
48 <div class="input">
49 <div class="text-as-placeholder">
43 50 ${c.user.last_name}
44 51 </div>
45 52 </div>
46 <div class="fieldset">
47 <div class="left-label">
53 </div>
54 <div class="field">
55 <div class="label">
48 56 ${_('Email')}:
49 57 </div>
50 <div class="right-content">
58 <div class="input">
59 <div class="text-as-placeholder">
51 60 ${c.user.email or _('Missing email, please update your user email address.')}
52 61 </div>
53 62 </div>
54 63 </div>
64 </div>
55 65 </div> No newline at end of file
Show file before | Show file after | Hide comments
@@ -28,11 +28,10 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')}
35
31 <div class="fieldset">
32 <div class="left-label-summary">
33 <p>${_('Commit')}</p>
34 <div class="right-label-summary">
36 35 <code>
37 36 ${h.show_id(c.commit)}
38 37 </code>
@@ -54,9 +53,8 b''
54 53 <span class="tag hidden-${c.commit.hidden} tooltip" title="${_('Evolve State')}">${_('hidden')}</span>
55 54 % endif
56 55 % endif
57 </h4>
58 56
59 </div>
57
60 58 <div class="pull-right">
61 59 <span id="parent_link">
62 60 <a href="#parentCommit" title="${_('Parent Commit')}"><i class="icon-left icon-no-margin"></i>${_('parent')}</a>
@@ -66,41 +64,44 b''
66 64 <a href="#childCommit" title="${_('Child Commit')}">${_('child')}<i class="icon-right icon-no-margin"></i></a>
67 65 </span>
68 66 </div>
67
69 68 </div>
69 </div>
70 </div>
71
72
70 73
71 74 <div class="fieldset">
72 <div class="left-label">
73 ${_('Description')}:
74 </div>
75 <div class="right-content">
75 <div class="left-label-summary">
76 <p>${_('Description')}:</p>
77 <div class="right-label-summary">
76 78 <div id="trimmed_message_box" class="commit">${h.urlify_commit_message(c.commit.message,c.repo_name)}</div>
77 79 <div id="message_expand" style="display:none;">
78 80 ${_('Expand')}
79 81 </div>
80 82 </div>
81 83 </div>
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">
88 <div class="left-label-summary">
89 <p>${_('Commit status')}:</p>
90 <div class="right-label-summary">
89 91 <div class="changeset-status-ico">
90 92 <div class="${'flag_status %s' % c.statuses[0]} pull-left"></div>
91 93 </div>
92 94 <div title="${_('Commit status')}" class="changeset-status-lbl">[${h.commit_status_lbl(c.statuses[0])}]</div>
93 95 </div>
94 96 </div>
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">
101 <div class="left-label-summary">
102 <p>${_('References')}:</p>
103 <div class="right-label-summary">
102 104 <div class="tags">
103
104 105 %if c.commit.merge:
105 106 <span class="mergetag tag">
106 107 <i class="icon-merge"></i>${_('merge')}
@@ -129,12 +130,12 b''
129 130 </div>
130 131 </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')}
@@ -150,12 +151,12 b''
150 151 </div>
151 152 </div>
152 153 </div>
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>,
@@ -170,12 +171,12 b''
170 171 </div>
171 172 </div>
172 173 </div>
174 </div>
173 175
174 176 <div class="fieldset">
175 <div class="left-label">
176 ${_('Unresolved TODOs')}:
177 </div>
178 <div class="right-content">
177 <div class="left-label-summary">
178 <p>${_('Unresolved TODOs')}:</p>
179 <div class="right-label-summary">
179 180 <div class="comments-number">
180 181 % if c.unresolved_comments:
181 182 % for co in c.unresolved_comments:
@@ -187,21 +188,23 b''
187 188 </div>
188 189 </div>
189 190 </div>
190
191 </div> <!-- end summary-detail -->
191 </div>
192 192
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">
193 <div class="fieldset">
194 <div class="left-label-summary">
195 <p>${_('Author')}</p>
196
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>
202 200 </div>
203 </div><!-- end sidebar -->
201 </div>
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