rhodecode-enterprise-ce Commit - r3685:a7c67104

Changeset view summary box changes and fixed my profile view

Liviu -

r3685:a7c67104 new-ui

parent child

rhodecode/public/css/code-block.less

0 +2 -2

                 overflow: auto;
                 padding: 0px;
-                border: @border-thickness solid #EAEAEA;
+                border: @border-thickness solid @grey6;
-                background: #f5f5f5;
+                background: @grey7;
                 .border-radius(@border-radius);
                 #remove_gist {

rhodecode/public/css/main.less

0 0 -1

             }
             #changeset_compare_view_content {
-                margin-bottom: @space;
                 clear: both;
                 width: 100%;
                 box-sizing: border-box;

rhodecode/public/css/panels.less

0 +1 -5

                         min-height: 150px
                     }
                 }
                 .panel-footer {
                     background-color: white;
                     padding: .65em @panel-padding .5em;
                 &.user-profile {
                     float: left;
-                    .panel-heading {
-                        margin-bottom: @padding;
                     .panel-body {
                         &:extend(.clearfix);
                     }

rhodecode/public/css/summary.less

0 +1 0

                     .right-label-summary {
                         float: left;
                         margin-top: 7px;
+                        width: ~"calc(100% - 160px)";
                     }
                 }

rhodecode/templates/admin/my_account/my_account_profile.mako

0 +36 -26

@@ -5,50 +5,60 b''
5	<a href="${h.route_path('my_account_edit')}" class="panel-edit">${_('Edit')}</a>	5	<a href="${h.route_path('my_account_edit')}" class="panel-edit">${_('Edit')}</a>
6	</div>	6	</div>
7		7
8	<div class="panel-body">	8	<div class="panel-body fields">
9	<div class="field~~set~~">	9	<div class="field">
10	<div class="l~~eft-l~~abel">	10	<div class="label">
11	${_('Photo')}:	11	${_('Photo')}:
12	</div>	12	</div>
13	<div class="~~right-conten~~t">	13	<div class="input">
14	%if c.visual.use_gravatar:	14	<div class="text-as-placeholder">
15	${~~base~~.~~gravatar~~(c.~~user~~.~~email~~, ~~100~~)}	15	%if c.visual.use_gravatar:
16	%else:	16	${base.gravatar(c.user.email, 100)}
17	${base.gravatar(c.user.email, 20)}	17	%else:
18	${_('Avatars are disabled')}	18	${base.gravatar(c.user.email, 20)}
19	%endif	19	${_('Avatars are disabled')}
		20	%endif
		21	</div>
20	</div>	22	</div>
21	</div>	23	</div>
22	<div class="field~~set~~">	24	<div class="field">
23	<div class="l~~eft-l~~abel">	25	<div class="label">
24	${_('Username')}:	26	${_('Username')}:
25	</div>	27	</div>
26	<div class="~~right-conten~~t">	28	<div class="input">
27	${c.user.username}	29	<div class="text-as-placeholder">
		30	${c.user.username}
		31	</div>
28	</div>	32	</div>
29	</div>	33	</div>
30	<div class="field~~set~~">	34	<div class="field">
31	<div class="l~~eft-l~~abel">	35	<div class="label">
32	${_('First Name')}:	36	${_('First Name')}:
33	</div>	37	</div>
34	<div class="~~right-conten~~t">	38	<div class="input">
35	${c.user.first_name}	39	<div class="text-as-placeholder">
		40	${c.user.first_name}
		41	</div>
36	</div>	42	</div>
37	</div>	43	</div>
38	<div class="field~~set~~">	44	<div class="field">
39	<div class="l~~eft-l~~abel">	45	<div class="label">
40	${_('Last Name')}:	46	${_('Last Name')}:
41	</div>	47	</div>
42	<div class="~~right-conten~~t">	48	<div class="input">
43	${c.user.last_name}	49	<div class="text-as-placeholder">
		50	${c.user.last_name}
		51	</div>
44	</div>	52	</div>
45	</div>	53	</div>
46	<div class="field~~set~~">	54	<div class="field">
47	<div class="l~~eft-l~~abel">	55	<div class="label">
48	${_('Email')}:	56	${_('Email')}:
49	</div>	57	</div>
50	<div class="~~right-conten~~t">	58	<div class="input">
51	${c.user.email or _('Missing email, please update your user email address.')}	59	<div class="text-as-placeholder">
		60	${c.user.email or _('Missing email, please update your user email address.')}
		61	</div>
52	</div>	62	</div>
53	</div>	63	</div>
54	</div>	64	</div>

rhodecode/templates/changeset/changeset.mako

0 +109 -106

@@ -28,113 +28,114 b''
28		28
29	<div id="changeset_compare_view_content" class="summary changeset">	29	<div id="changeset_compare_view_content" class="summary changeset">
30	<div class="summary-detail">	30	<div class="summary-detail">
31	<div class="~~summary-detail-header~~">	31	<div class="fieldset">
32	<div class="~~breadcrumbs files_location~~">	32	<div class="left-label-summary">
33	<h4>	33	<p>${_('Commit')}</p>
34	${_('Commit')}	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>	43	## obsolete commits
37	${h.~~show_id~~(c.commit)}	44	% if hasattr(c.commit, 'obsolete'):
38	</code>	45	% if c.commit.obsolete:
39	<i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${c.commit.raw_id}" title="${_('Copy the full commit id')}"></i>	46	<span class="tag obsolete-${c.commit.obsolete} tooltip" title="${_('Evolve State')}">${_('obsolete')}</span>
40	% if hasattr(c.commit, 'phase'):	47	% endif
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>
48	% endif	48	% endif
49	% endif
50		49
51	## hidden commits	50	## hidden commits
52	% if hasattr(c.commit, 'hidden'):	51	% if hasattr(c.commit, 'hidden'):
53	% if c.commit.hidden:	52	% if c.commit.hidden:
54	<span class="tag hidden-${c.commit.hidden} tooltip" title="${_('Evolve State')}">${_('hidden')}</span>	53	<span class="tag hidden-${c.commit.hidden} tooltip" title="${_('Evolve State')}">${_('hidden')}</span>
		54	% endif
55	% endif	55	% endif
56	% endif	56
57	</h4>
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	</div>	70	</div>
60	<div class="pull-right">	71
61	<span id="parent_link">	72
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>
70		73
71	<div class="fieldset">	74	<div class="fieldset">
72	<div class="left-label">	75	<div class="left-label-summary">
73	${_('Description')}:	76	<p>${_('Description')}:</p>
74	</div>	77	<div class="right-label-summary">
75	<div class="right-content">	78	<div id="trimmed_message_box" class="commit">${h.urlify_commit_message(c.commit.message,c.repo_name)}</div>
76	<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;">
77	<div id="message_expand" style="display:none;">	80	${_('Expand')}
78	${_('Expand')}	81	</div>
79	</div>	82	</div>
80	</div>	83	</div>
81	</div>	84	</div>
82		85
83	%if c.statuses:	86	%if c.statuses:
84	<div class="fieldset">	87	<div class="fieldset">
85	<div class="left-label">	88	<div class="left-label-summary">
86	${_('Commit status')}:	89	<p>${_('Commit status')}:</p>
87	</div>	90	<div class="right-label-summary">
88	<div class="~~right-content~~">	91	<div class="changeset-status-ico">
89	<div class="changeset-status-ico">	92	<div class="${'flag_status %s' % c.statuses[0]} pull-left"></div>
90	<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	</div>	95	</div>
92	<div title="${_('Commit status')}" class="changeset-status-lbl">[${h.commit_status_lbl(c.statuses[0])}]</div>
93	</div>	96	</div>
94	</div>	97	</div>
95	%endif	98	%endif
96		99
97	<div class="fieldset">	100	<div class="fieldset">
98	<div class="left-label">	101	<div class="left-label-summary">
99	${_('References')}:	102	<p>${_('References')}:</p>
100	</div>	103	<div class="right-label-summary">
101	<div class="~~right-content~~">	104	<div class="tags">
102	<div class="tags">	105	%if c.commit.merge:
103		106	<span class="mergetag tag">
104	%if c.commit.merge:	107	<i class="icon-merge"></i>${_('merge')}
105	<span ~~class~~=~~"mergetag tag"~~>	108	</span>
106	<i class="icon-merge"></i>${_('merge')}	109	%endif
107	</span>
108	%endif
109		110
110	%if h.is_hg(c.rhodecode_repo):	111	%if h.is_hg(c.rhodecode_repo):
111	%for book in c.commit.bookmarks:	112	%for book in c.commit.bookmarks:
112	<span class="booktag tag" title="${h.tooltip(_('Bookmark %s') % book)}">	113	<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	<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	</span>
115	%endfor	116	%endfor
116	%endif	117	%endif
117		118
118	%for tag in c.commit.tags:	119	%for tag in c.commit.tags:
119	<span class="tagtag tag" title="${h.tooltip(_('Tag %s') % tag)}">	120	<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	<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	</span>
122	%endfor	123	%endfor
123		124
124	%if c.commit.branch:	125	%if c.commit.branch:
125	<span class="branchtag tag" title="${h.tooltip(_('Branch %s') % c.commit.branch)}">	126	<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	<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	</span>
128	%endif	129	%endif
		130	</div>
129	</div>	131	</div>
130	</div>
131	</div>	132	</div>
		133	</div>
132		134
133	<div class="fieldset">	135	<div class="fieldset">
134	<div class="left-label">	136	<div class="left-label-summary">
135	${_('Diff options')}:	137	<p>${_('Diff options')}:</p>
136	</div>	138	<div class="right-label-summary">
137	<div class="right-content">
138	<div class="diff-actions">	139	<div class="diff-actions">
139	<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	<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	${_('Raw Diff')}	141	${_('Raw Diff')}
@@ -148,14 +149,14 b''
148	${_('Download Diff')}	149	${_('Download Diff')}
149	</a>	150	</a>
150	</div>	151	</div>
		152	</div>
151	</div>	153	</div>
152	</div>	154	</div>
153		155
154	<div class="fieldset">	156	<div class="fieldset">
155	<div class="left-label">	157	<div class="left-label-summary">
156	${_('Comments')}:	158	<p>${_('Comments')}:</p>
157	</div>	159	<div class="right-label-summary">
158	<div class="right-content">
159	<div class="comments-number">	160	<div class="comments-number">
160	%if c.comments:	161	%if c.comments:
161	<a href="#comments">${_ungettext("%d Commit comment", "%d Commit comments", len(c.comments)) % len(c.comments)}</a>,	162	<a href="#comments">${_ungettext("%d Commit comment", "%d Commit comments", len(c.comments)) % len(c.comments)}</a>,
@@ -168,40 +169,42 b''
168	${_ungettext("%d Inline Comment", "%d Inline Comments", c.inline_cnt) % c.inline_cnt}	169	${_ungettext("%d Inline Comment", "%d Inline Comments", c.inline_cnt) % c.inline_cnt}
169	%endif	170	%endif
170	</div>	171	</div>
		172	</div>
171	</div>	173	</div>
172	</div>	174	</div>
173		175
174	<div class="fieldset">	176	<div class="fieldset">
175	<div class="left-label">	177	<div class="left-label-summary">
176	${_('Unresolved TODOs')}:	178	<p>${_('Unresolved TODOs')}:</p>
177	</div>	179	<div class="right-label-summary">
178	<div class="~~right-content~~">	180	<div class="comments-number">
179	<div class="comments-number">	181	% if c.unresolved_comments:
180	% if c.unresolved_comments:	182	% for co in c.unresolved_comments:
181	% 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 ','}
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 ','}	184	% endfor
183	% e~~ndfor~~	185	% else:
184	% else:	186	${_('There are no unresolved TODOs')}
185	${_('There are no unresolved TODOs')}	187	% endif
186	% ~~endif~~	188	</div>
187	</div>	189	</div>
188	</div>	190	</div>
189	</div>	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">	197	<div class="right-label-summary">
194	<div class="summary-detail-header">
195	<h4 class="item">
196	${_('Author')}
197	</h4>
198	</div>
199	<div class="sidebar-right-content">
200	${self.gravatar_with_user(c.commit.author)}	198	${self.gravatar_with_user(c.commit.author)}
201	<div class="user-inline-data">- ${h.age_component(c.commit.date)}</div>	199	<div class="user-inline-data">- ${h.age_component(c.commit.date)}</div>
		200	</div>
202	</div>	201	</div>
203	</div><!-- end sidebar -->	202
		203	<div class="clear-fix"></div>
		204
		205	</div> <!-- end summary-detail -->
204	</div> <!-- end summary -->	206	</div> <!-- end summary -->
		207	</div>
205	<div class="cs_files">	208	<div class="cs_files">
206	<%namespace name="cbdiffs" file="/codeblocks/diffs.mako"/>	209	<%namespace name="cbdiffs" file="/codeblocks/diffs.mako"/>
207	${cbdiffs.render_diffset_menu(c.changes[c.commit.raw_id])}	210	${cbdiffs.render_diffset_menu(c.changes[c.commit.raw_id])}

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages