From 11f9a80447a985bab19b823796d1eb4aad1b8789 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Sat, 1 Jun 2019 10:46:42 +0200 Subject: [PATCH] files: moved source path to lower position according to the design --- rhodecode/public/css/summary.less | 13 +++-- rhodecode/templates/files/files_source.mako | 54 +++++++++++++-------- 2 files changed, 41 insertions(+), 26 deletions(-) diff --git a/rhodecode/public/css/summary.less b/rhodecode/public/css/summary.less index 71fbda18..dfc84d22 100644 --- a/rhodecode/public/css/summary.less +++ b/rhodecode/public/css/summary.less @@ -413,19 +413,22 @@ width: 100%; margin: 0; - .stats { - float: left; + .file-filename { + float:left; padding: 10px; } - .stats-filename { - font-size: 120%; + + .file-stats { + padding: 10px; + float:right; } + + .stats-first-item { padding: 0px 0px 0px 3px; } .stats-info { - margin-top: 5px; font-size: 11px; color: @grey4; } diff --git a/rhodecode/templates/files/files_source.mako b/rhodecode/templates/files/files_source.mako index 109ff43b..811b82ef 100644 --- a/rhodecode/templates/files/files_source.mako +++ b/rhodecode/templates/files/files_source.mako @@ -52,38 +52,49 @@
-
-
- ${h.files_breadcrumbs(c.repo_name,c.commit.raw_id,c.file.path, request.GET.get('at'))} -
- % if c.lf_node: - | ${_('LargeFile')} ${h.format_byte_size_binary(c.lf_node.size)} - % endif +
+ ${c.file} +
+ +
${c.file.lines()[0]} ${_ungettext('line', 'lines', c.file.lines()[0])} + | ${h.format_byte_size_binary(c.file.size)} + % if c.lf_node: + | ${_('LargeFile')} ${h.format_byte_size_binary(c.lf_node.size)} + % endif | ${c.file.mimetype} | ${h.get_lexer_for_filenode(c.file).__class__.__name__}
-
- - ${_('History')} - - | - %if c.annotate: - ${h.link_to(_('Source'), h.route_path('repo_files', repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))} - %else: - ${h.link_to(_('Annotation'), h.route_path('repo_files:annotated',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))} - %endif - | ${h.link_to(_('Raw'), h.route_path('repo_file_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))} -
+
+ +
+
+ ${h.files_breadcrumbs(c.repo_name,c.commit.raw_id,c.file.path, request.GET.get('at'))} +
+ +
+ + ${_('History')} + + | + %if c.annotate: + ${h.link_to(_('Source'), h.route_path('repo_files', repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))} + %else: + ${h.link_to(_('Annotation'), h.route_path('repo_files:annotated',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))} + %endif + | ${h.link_to(_('Raw'), h.route_path('repo_file_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))} + +
+
+ -
%if c.file.is_binary: <% rendered_binary = h.render_binary(c.repo_name, c.file)%> % if rendered_binary: @@ -124,7 +135,8 @@ %endif %endif
-
+ +