files: moved source path to lower position according to the design

rhodecode/public/css/summary.less

@@ -1,478 +1,481 b''
 // summary.less
 // For use in RhodeCode applications;
 // Used for headers and file detail summary screens.
 
 .summary {
     clear: both;
     float: none;
     position: relative;
     width: 100%;
     margin: 0;
     padding: 0;
     background: #FCFCFC;
     border: 1px solid #EAEAEA;
     border-radius: @border-radius;
     margin-bottom: 20px;
 
     .summary-detail-header {
         display: block;
         width: 100%;
         margin-bottom: 10px;
         padding: 0 0 .5em 0;
         border-bottom: @border-thickness solid @border-default-color;
 
         .breadcrumbs {
             display: inline;
             margin: 0;
             padding: 0;
         }
 
         h4 {
             margin: 0 1em 0 0;
             padding: 10px 0 5px 20px;
             line-height: 1.2em;
             font-size: @basefontsize;
         }
 
         .action_link {
             float: right;
         }
 
         .new-file {
             float: right;
             margin-top: -1.5em;
         }
     }
 
     .summary-detail {
         float: none;
         position: relative;
         width: 100%;
         margin: 0;
         padding: 0 0 20px 0;
 
         .file_diff_buttons {
             margin-top: @space;
         }
 
         // commit message
         .commit {
           white-space: pre-wrap;
         }
 
         .left-clone {
             float: left;
             height: 30px;
             margin: 0;
             padding: 0;
             width: 130px;
             font-weight: @text-semibold-weight;
             font-family: @text-semibold;
         }
         .left-clone select {
             width: 130px;
             margin-right: 0;
             background-color: @grey7;
             border-color: @grey4;
             color: #5C5C5C;
             border-top-right-radius: 0;
             border-bottom-right-radius: 0;
         }
 
         .right-clone {
             float: left;
             width: ~"calc(100% - 170px)";
 
             .clipboard-action {
                 margin-left: -30px;
             }
         }
 
         .clone_url_input {
             width: ~"calc(100% - 90px)";
             padding: 6px 30px 6px 10px;
             height: 14px;
             box-shadow: 0 1px 1px 0 rgba(0,0,0,0.07);
             border-top-left-radius: 0;
             border-bottom-left-radius: 0;
             margin-left: -1px;
         }
 
         &.directory {
             margin-bottom: 0;
         }
 
         .desc {
             white-space: pre-wrap;
         }
         .disabled {
             opacity: .5;
             cursor: inherit;
         }
         .help-block {
             color: inherit;
             margin: 0;
         }
     }
 
     .sidebar-right {
         float: left;
         width: 24%;
         margin: 0;
         padding: 0;
 
         ul {
             margin-left: 0;
             padding-left: 0;
 
             li {
                 list-style-type: none;
             }
         }
     }
 
     #clone_by_name, #clone_by_id{
         display: inline-block;
         margin-left: 0px;
     }
 
     .codeblock {
         border: none;
         background-color: transparent;
     }
 
     .code-body {
         border: @border-thickness solid @border-default-color;
         .border-radius(@border-radius);
     }
 
     .btn-collapse {
         clear: both;
         float: none;
         background: #F7F7F7;
         text-align: center;
         color: #949494;
         font-size: 11px;
 
         &:hover {
             background: #f1f1f1;
             color: #2B2B2D;
         }
     }
 }
 
 // this is used outside of just the summary
 .fieldset, // similar to form fieldset
 .summary .sidebar-right-content { // these have to match
     clear: both;
     float: none;
     position: relative;
     display:block;
     width: 100%;
     min-height: 1em;
     margin-bottom: 10px;
     padding: 0;
     line-height: 1.2em;
 
     &:after { // clearfix
         content: "";
         clear: both;
         width: 100%;
         height: 1em;
     }
 }
 
 .summary .sidebar-right-content {
     margin-bottom: 0;
 
     .rc-user {
         min-width: 0;
     }
 
     li {
         list-style: none;
         line-height: normal;
     }
 }
 
 .summary {
     .fieldset {
         margin-bottom: 0;
     }
 }
 
 .fieldset {
 
     .left-label { // similar to form legend
         display: block;
         margin: 0;
         padding: 0;
         font-weight: @text-semibold-weight;
         font-family: @text-semibold;
     }
 
     .left-label-summary {
         padding-left: 20px;
         margin-bottom: 5px;
 
         p {
             margin-bottom: 5px;
             color: @grey1;
             float: left;
             width: 130px;
 
             &.spacing {
                 margin-top: 10px;
             }
         }
 
         .right-label-summary {
             float: left;
             margin-top: 7px;
             width: ~"calc(100% - 160px)";
         }
     }
 
     .left-label-summary-files {
         padding-left: 45px;
         margin-top: 5px;
 
         p {
             margin-bottom: 5px;
             color: @grey1;
             float: left;
             width: 130px;
 
             &.spacing {
                 margin-top: 10px;
             }
         }
 
         .right-label-summary {
             float: left;
             margin-top: 7px;
         }
     }
 
     .left-content {
         width: ~"calc(60% - 20px)";
         float: left;
         margin: 15px 0 15px 20px;
 
         .rc-user {
             min-width: auto;
             max-width: none;
             min-height: auto;
             padding-right: 5px;
         }
 
         .left-content-avatar {
             width: 45px;
             float: left;
             margin-top: 8px;
         }
 
         .left-content-message {
             float: left;
             width: ~"calc(100% - 45px)";
         }
     }
 
     .right-content { // similar to form fields
         float: left;
         display: block;
         width: ~"calc(40% - 20px)";
         text-align: right;
         margin: 15px 20px 15px 0;
 
         .truncate-wrap,
         .truncate {
             max-width: 100%;
             width: 100%;
         }
 
         .commit-long {
             overflow-x: auto;
         }
 
         .commit-info {
             margin-top: 7px;
         }
 
         .tag, .tagtag, .branchtag, .booktag, .metatag, .perm_tag {
             background:transparent;
             border: none;
             box-shadow: none;
             margin-left: 10px;
             font-size: 13px;
         }
 
         .tag span, .tag i {
             color: @grey1;
         }
     }
     .commit {
         color: @grey1;
         margin-bottom: 5px;
         white-space: pre;
     }
     .commit.truncate-wrap {
         overflow:hidden;
         text-overflow: ellipsis;
     }
     .commit-author {
         color: @grey1;
     }
     .commit-date {
         color: @grey4;
     }
 }
 
 // expand commit message
 #message_expand {
     clear: both;
     display: block;
     color: @rcblue;
     cursor: pointer;
 }
 
 #trimmed_message_box {
     max-height: floor(2 * @basefontsize * 1.2);  // 2 lines * line-height
     overflow: hidden;
 }
 
 // show/hide comments button
 .show-inline-comments {
     display: inline;
     cursor: pointer;
 
     .comments-show { display: inline; }
     .comments-hide { display: none; }
 
     &.comments-visible {
         .comments-show { display: none; }
         .comments-hide { display: inline; }
     }
 }
 
 // Quick Start section
 
 .empty-repo {
     border: 1px solid #EAEAEA;
     border-bottom: 0;
     border-radius: @border-radius;
     padding: 0 20px;
 }
 
 .empty-repo h3, .quick_start p {
     margin-bottom: 10px;
 }
 
 .quick_start pre {
     background: #FCFEFF;
     border: 1px solid #CBDBEB;
     box-shadow: @button-shadow;
     padding: 10px 15px;
     border-radius: 4px;
     color: @grey2;
 }
 
 .clear-fix {
     clear: both;
 }
 
 .quick_start {
     display: block;
     position: relative;
     border: 1px solid #EAEAEA;
     border-top: 0;
     border-radius: @border-radius;
     padding: 0 20px;
 
     // adds some space to make copy and paste easier
     .left-label,
     .right-content {
         line-height: 1.6em;
     }
 }
 
 
 .submodule {
     .summary-detail {
         width: 100%;
 
         .btn-collapse {
             display: none;
         }
     }
 }
 
 .codeblock-header {
     float: left;
     display: block;
     width: 100%;
     margin: 0;
 
-    .stats {
+    .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;
     }
 
     .buttons {
         float: right;
         text-align: right;
         color: @grey4;
         padding: 10px;
     }
 
     .file-container {
         display: inline-block;
         width: 100%;
     }
 
 }
 
 #summary-menu-stats {
 
     .stats-bullet {
         color: @grey3;
         min-width: 3em;
     }
 
     .repo-size {
         margin-bottom: .5em;
     }
 
 }
 
 .rctable.repo_summary {
     border: 1px solid #eaeaea;
     border-radius: 2px;
     border-collapse: inherit;
     border-bottom: 0;
 
     th {
         background: @grey7;
         border-bottom: 0;
     }
 
     td {
         border-color: #eaeaea;
     }
 
     td.td-status {
         padding: 0 0 0 10px;
     }
 }

rhodecode/templates/files/files_source.mako

@@ -1,148 +1,160 b''
 <%namespace name="sourceblock" file="/codeblocks/source.mako"/>
 
 <div id="codeblock" class="browserblock">
     <div class="browser-header">
         <div class="browser-nav">
             <div class="pull-left">
                 ## loads the history for a file
                 ${h.hidden('file_refs_filter')}
             </div>
 
             <div class="pull-right">
 
             ## Download
             % if c.lf_node:
               <a class="btn btn-default" href="${h.route_path('repo_file_download',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path, _query=dict(lf=1))}">
               ${_('Download largefile')}
               </a>
             % else:
               <a  class="btn btn-default" href="${h.route_path('repo_file_download',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}">
               ${_('Download file')}
               </a>
             % endif
 
             %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
               ## on branch head, can edit files
               %if c.on_branch_head and c.branch_or_raw_id and not c.file.is_binary:
                   ## binary files are delete only
                   % if c.file.is_binary:
                     ${h.link_to(_('Edit'), '#Edit', class_="btn btn-default disabled tooltip", title=_('Editing binary files not allowed'))}
                     ${h.link_to(_('Delete'), h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path, _anchor='edit'),class_="btn btn-danger")}
                   % else:
                     <a  class="btn btn-default" href="${h.route_path('repo_files_edit_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path, _anchor='edit')}">
                         ${_('Edit on branch: ')}<code>${c.branch_name}</code>
                     </a>
 
                     <a class="btn btn-danger" href="${h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path, _anchor='edit')}">
                         ${_('Delete')}
                     </a>
                   % endif
               ## not on head, forbid all
               % else:
                ${h.link_to(_('Edit'), '#Edit', class_="btn btn-default disabled tooltip", title=_('Editing files allowed only when on branch head commit'))}
                ${h.link_to(_('Delete'), '#Delete', class_="btn btn-default btn-danger disabled tooltip", title=_('Deleting files allowed only when on branch head commit'))}
               % endif
             %endif
 
           </div>
         </div>
         <div id="file_history_container"></div>
 
         </div>
     </div>
 
     <div class="codeblock codeblock-header">
-      <div class="stats">
-      <div>
-        ${h.files_breadcrumbs(c.repo_name,c.commit.raw_id,c.file.path, request.GET.get('at'))}
+
+        <div class="file-filename">
+            <i class="icon-file"></i> ${c.file}
       </div>
 
+        <div class="file-stats">
+
+        <div class="stats-info">
+          <span class="stats-first-item">${c.file.lines()[0]} ${_ungettext('line', 'lines', c.file.lines()[0])}</span>
+
+          <span> | ${h.format_byte_size_binary(c.file.size)}</span>
         % if c.lf_node:
         <span title="${_('This file is a pointer to large binary file')}"> | ${_('LargeFile')} ${h.format_byte_size_binary(c.lf_node.size)} </span>
         % endif
-
-        <div class="stats-info">
-          <span class="stats-first-item">${c.file.lines()[0]} ${_ungettext('line', 'lines', c.file.lines()[0])}</span>
-          <span> | ${h.format_byte_size_binary(c.file.size)}</span>
           <span> | ${c.file.mimetype} </span>
           <span> | ${h.get_lexer_for_filenode(c.file).__class__.__name__}</span>
         </div>
 
       </div>
+
+        <div class="code-body">
+
+          <div>
+              <div class="pull-left">
+                ${h.files_breadcrumbs(c.repo_name,c.commit.raw_id,c.file.path, request.GET.get('at'))}
+              </div>
+
       <div class="pull-right stats">
             <a id="file_history_overview" href="#loadHistory">
                 ${_('History')}
             </a>
              |
             %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))}
 
       </div>
+          </div>
 
-    <div class="code-body">
+
      %if c.file.is_binary:
            <% rendered_binary = h.render_binary(c.repo_name, c.file)%>
            % if rendered_binary:
                ${rendered_binary}
            % else:
                <div>
                 ${_('Binary file (%s)') % c.file.mimetype}
                </div>
            % endif
      %else:
         % if c.file.size < c.visual.cut_off_limit_file:
             %if c.renderer and not c.annotate:
                 ## pick relative url based on renderer
                 <%
                     relative_urls = {
                         'raw': h.route_path('repo_file_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path),
                         'standard': h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path),
                     }
                 %>
                 ${h.render(c.file.content, renderer=c.renderer, relative_urls=relative_urls)}
             %else:
                 <table class="cb codehilite">
                 %if c.annotate:
                   <% color_hasher = h.color_hasher() %>
                   %for annotation, lines in c.annotated_lines:
                     ${sourceblock.render_annotation_lines(annotation, lines, color_hasher)}
                   %endfor
                 %else:
                   %for line_num, tokens in enumerate(c.lines, 1):
                     ${sourceblock.render_line(line_num, tokens)}
                   %endfor
                 %endif
                 </table>
             %endif
         %else:
             ${_('File size {} is bigger then allowed limit {}. ').format(h.format_byte_size_binary(c.file.size), h.format_byte_size_binary(c.visual.cut_off_limit_file))} ${h.link_to(_('Show as raw'),
             h.route_path('repo_file_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))}
         %endif
      %endif
     </div>
+
 </div>
 
 <script type="text/javascript">
 % if request.GET.get('mark'):
 
 $(function(){
   $(".codehilite").mark(
       "${request.GET.get('mark')}",
           {
               "className": 'match',
               "accuracy": "complementary",
               "ignorePunctuation": ":._(){}[]!'+=".split(""),
               "each": function(el) {
                   // and also highlight lines !
                   $($(el).closest('tr')).find('td.cb-lineno').addClass('cb-line-selected');
               }
           }
   );
 
 });
 % endif
 </script>