From 78ed362426485111bf82436317cc63de28f34afd Mon Sep 17 00:00:00 2001 From: Liviu Date: Fri, 17 May 2019 16:32:11 +0000 Subject: [PATCH] Changeset view summary box changes and fixed my profile view --- rhodecode/public/css/code-block.less | 4 +- rhodecode/public/css/main.less | 1 - rhodecode/public/css/panels.less | 6 +- rhodecode/public/css/summary.less | 1 + .../admin/my_account/my_account_profile.mako | 62 ++--- rhodecode/templates/changeset/changeset.mako | 221 +++++++++--------- 6 files changed, 152 insertions(+), 143 deletions(-) diff --git a/rhodecode/public/css/code-block.less b/rhodecode/public/css/code-block.less index 903c9cee..b637713f 100644 --- a/rhodecode/public/css/code-block.less +++ b/rhodecode/public/css/code-block.less @@ -408,8 +408,8 @@ div.codeblock { overflow: auto; padding: 0px; - border: @border-thickness solid #EAEAEA; - background: #f5f5f5; + border: @border-thickness solid @grey6; + background: @grey7; .border-radius(@border-radius); #remove_gist { diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less index 667db1a2..7f50428e 100644 --- a/rhodecode/public/css/main.less +++ b/rhodecode/public/css/main.less @@ -1817,7 +1817,6 @@ BIN_FILENODE = 7 } #changeset_compare_view_content { - margin-bottom: @space; clear: both; width: 100%; box-sizing: border-box; diff --git a/rhodecode/public/css/panels.less b/rhodecode/public/css/panels.less index 2f728f51..889c04af 100644 --- a/rhodecode/public/css/panels.less +++ b/rhodecode/public/css/panels.less @@ -47,7 +47,7 @@ min-height: 150px } } - + .panel-footer { background-color: white; padding: .65em @panel-padding .5em; @@ -63,10 +63,6 @@ &.user-profile { float: left; - .panel-heading { - margin-bottom: @padding; - } - .panel-body { &:extend(.clearfix); } diff --git a/rhodecode/public/css/summary.less b/rhodecode/public/css/summary.less index 6df652c1..21e3972c 100644 --- a/rhodecode/public/css/summary.less +++ b/rhodecode/public/css/summary.less @@ -225,6 +225,7 @@ .right-label-summary { float: left; margin-top: 7px; + width: ~"calc(100% - 160px)"; } } diff --git a/rhodecode/templates/admin/my_account/my_account_profile.mako b/rhodecode/templates/admin/my_account/my_account_profile.mako index 191f16d3..065772d3 100644 --- a/rhodecode/templates/admin/my_account/my_account_profile.mako +++ b/rhodecode/templates/admin/my_account/my_account_profile.mako @@ -5,50 +5,60 @@ ${_('Edit')} -
-
-
+
+
+
${_('Photo')}:
-
- %if c.visual.use_gravatar: - ${base.gravatar(c.user.email, 100)} - %else: - ${base.gravatar(c.user.email, 20)} - ${_('Avatars are disabled')} - %endif +
+
+ %if c.visual.use_gravatar: + ${base.gravatar(c.user.email, 100)} + %else: + ${base.gravatar(c.user.email, 20)} + ${_('Avatars are disabled')} + %endif +
-
-
+
+
${_('Username')}:
-
- ${c.user.username} +
+
+ ${c.user.username} +
-
-
+
+
${_('First Name')}:
-
- ${c.user.first_name} +
+
+ ${c.user.first_name} +
-
-
+
+
${_('Last Name')}:
-
- ${c.user.last_name} +
+
+ ${c.user.last_name} +
-
-
+
+
${_('Email')}:
-
- ${c.user.email or _('Missing email, please update your user email address.')} +
+
+ ${c.user.email or _('Missing email, please update your user email address.')} +
diff --git a/rhodecode/templates/changeset/changeset.mako b/rhodecode/templates/changeset/changeset.mako index d9bf33c1..49ef4e94 100644 --- a/rhodecode/templates/changeset/changeset.mako +++ b/rhodecode/templates/changeset/changeset.mako @@ -28,113 +28,114 @@
-
-
-

- ${_('Commit')} - - - ${h.show_id(c.commit)} - - - % if hasattr(c.commit, 'phase'): - ${c.commit.phase} - % endif - - ## obsolete commits - % if hasattr(c.commit, 'obsolete'): - % if c.commit.obsolete: - ${_('obsolete')} +
+
+

${_('Commit')}

+
+ + ${h.show_id(c.commit)} + + + % if hasattr(c.commit, 'phase'): + ${c.commit.phase} % endif - % endif - ## hidden commits - % if hasattr(c.commit, 'hidden'): - % if c.commit.hidden: - ${_('hidden')} + ## obsolete commits + % if hasattr(c.commit, 'obsolete'): + % if c.commit.obsolete: + ${_('obsolete')} + % endif % endif - % endif -

+ ## hidden commits + % if hasattr(c.commit, 'hidden'): + % if c.commit.hidden: + ${_('hidden')} + % endif + % endif + + +
+ + ${_('parent')} + + | + + ${_('child')} + +
+ +
+
-
- - ${_('parent')} - - | - - ${_('child')} - -
-
+ +
-
- ${_('Description')}: -
-
-
${h.urlify_commit_message(c.commit.message,c.repo_name)}
- %if c.statuses:
-
- ${_('Commit status')}: -
-
-
-
+
+

${_('Commit status')}:

+
+
+
+
+
[${h.commit_status_lbl(c.statuses[0])}]
-
[${h.commit_status_lbl(c.statuses[0])}]
%endif
-
- ${_('References')}: -
-
-
+
+

${_('References')}:

+
+
+ %if c.commit.merge: + + ${_('merge')} + + %endif - %if c.commit.merge: - - ${_('merge')} - - %endif + %if h.is_hg(c.rhodecode_repo): + %for book in c.commit.bookmarks: + + ${h.shorter(book)} + + %endfor + %endif - %if h.is_hg(c.rhodecode_repo): - %for book in c.commit.bookmarks: - - ${h.shorter(book)} - + %for tag in c.commit.tags: + + ${tag} + %endfor - %endif - %for tag in c.commit.tags: - - ${tag} - - %endfor - - %if c.commit.branch: - - ${h.shorter(c.commit.branch)} - - %endif + %if c.commit.branch: + + ${h.shorter(c.commit.branch)} + + %endif +
-
+
-
- ${_('Diff options')}: -
-
+
+

${_('Diff options')}:

+
${_('Raw Diff')} @@ -148,14 +149,14 @@ ${_('Download Diff')}
+
-
- ${_('Comments')}: -
-
+
+

${_('Comments')}:

+
%if c.comments: ${_ungettext("%d Commit comment", "%d Commit comments", len(c.comments)) % len(c.comments)}, @@ -168,40 +169,42 @@ ${_ungettext("%d Inline Comment", "%d Inline Comments", c.inline_cnt) % c.inline_cnt} %endif
-
-
- -
-
- ${_('Unresolved TODOs')}: -
-
-
- % if c.unresolved_comments: - % for co in c.unresolved_comments: - ${'' if loop.last else ','} - % endfor - % else: - ${_('There are no unresolved TODOs')} - % endif
-
- -
<%namespace name="cbdiffs" file="/codeblocks/diffs.mako"/> ${cbdiffs.render_diffset_menu(c.changes[c.commit.raw_id])}