file details view summary box changes, not yet finnished

rhodecode/public/css/summary.less

@@ -1,441 +1,446 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: @textmargin;
         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: 0;
             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;
 
         .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: @space;
+    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;
         }
 
         .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;
     padding: @space 0 10px 0;
     border-top: @border-thickness solid @border-default-color;
 
     .stats {
         float: left;
     }
     .stats-filename {
         font-size: 120%;
     }
     .stats-first-item {
         padding: 0px 0px 0px 3px;
     }
 
     .buttons {
         float: right;
         text-align: right;
         color: @grey4;
     }
 
     .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/file_authors_box.mako

@@ -1,31 +1,30 b''
 <%namespace name="base" file="/base/base.mako"/>
 
 % if c.authors:
 <ul class="sidebar-right-content">
     % for email, user, commits in sorted(c.authors, key=lambda e: c.file_last_commit.author_email!=e[0]):
     <li class="file_author">
         <div class="tooltip" title="${h.tooltip(h.author_string(email))}">
-          ${base.gravatar(email, 16)}
-          <div class="user">${h.link_to_user(user)}</div>
+          <span class="user commit-author">${h.link_to_user(user)}</span>
 
             % if c.file_author:
-                <span>- ${h.age_component(c.file_last_commit.date)}</span>
+                <span class="commit-date">- ${h.age_component(c.file_last_commit.date)}</span>
             % elif c.file_last_commit.author_email==email:
                 <span> (${_('last author')})</span>
             % endif
 
             % if not c.file_author:
                 <span>
                   % if commits == 1:
                     ${commits} ${_('Commit')}
                   % else:
                     ${commits} ${_('Commits')}
                   % endif
                 </span>
             % endif
-
         </div>
     </li>
     % endfor
 </ul>
 % endif
+<a href="#" id="show_authors" class="action_link">${_('Show All')}</a>

rhodecode/templates/files/files_source_header.mako

@@ -1,85 +1,82 b''
 <%namespace name="base" file="/base/base.mako"/>
 <%namespace name="file_base" file="/files/base.mako"/>
 
-<div class="fieldset collapsable-content no-hide" data-toggle="summary-details">
-  <div class="left-label">
-    ${_('Commit Description')}:
-  </div>
-  <div class="commit right-content truncate-wrap">${h.urlify_commit_message(h.chop_at_smart(c.commit.message, '\n', suffix_if_chopped='...'), c.repo_name)}</div>
-</div>
+<div class="summary">
+  <div class="fieldset">
+    <div class="left-content">
+
+      <div class="left-content-avatar">
+        ${base.gravatar(c.file_last_commit.author_email, 30)}
+      </div>
+
+      <div class="left-content-message">
+      <div class="fieldset collapsable-content no-hide" data-toggle="summary-details">
+        <div class="commit truncate-wrap">${h.urlify_commit_message(h.chop_at_smart(c.commit.message, '\n', suffix_if_chopped='...'), c.repo_name)}</div>
+      </div>
+
+      <div class="fieldset collapsable-content" data-toggle="summary-details">
+        <div class="commit">${h.urlify_commit_message(c.commit.message,c.repo_name)}</div>
+      </div>
 
-<div class="fieldset collapsable-content" data-toggle="summary-details">
-  <div class="left-label">
-    ${_('Commit Description')}:
-  </div>
-  <div class="commit right-content">${h.urlify_commit_message(c.commit.message,c.repo_name)}</div>
-</div>
+      <div class="fieldset" data-toggle="summary-details">
+        <div class="" id="file_authors">
+          ## loads single author, or ALL
+          <%include file='file_authors_box.mako'/>
+        </div>
+      </div>
+      </div>
+
+      <div class="fieldset collapsable-content" data-toggle="summary-details">
+        <div class="">
+          <div class="tags">
+            ${_('File last commit')}
+            <code><a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.file_last_commit.raw_id)}">${h.show_id(c.file_last_commit)}</a></code>
+
+            ${file_base.refs(c.file_last_commit)}
+          </div>
+        </div>
+      </div>
 
 
-<div class="fieldset " data-toggle="summary-details">
-  <div class="left-label">
-    ${_('References')}:
-  </div>
-  <div class="right-content">
-    <div class="tags tags-main">
-      <code><a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.commit.raw_id)}">${h.show_id(c.commit)}</a></code>
-      ${file_base.refs(c.commit)}
+      <div class="fieldset collapsable-content" data-toggle="summary-details">
+        <div class="">
+        ${_('Show/Diff file')}
+        ${h.hidden('diff1')}
+        ${h.hidden('diff2',c.commit.raw_id)}
+        ${h.hidden('annotate', c.annotate)}
+        </div>
+      </div>
+
+
+      <div class="fieldset collapsable-content" data-toggle="summary-details">
+        <div class="">
+          ${_('Action')}:
+        </div>
+        <div class="">
+        ${h.submit('diff_to_commit',_('Diff to Commit'),class_="btn disabled",disabled="true")}
+        ${h.submit('show_at_commit',_('Show at Commit'),class_="btn disabled",disabled="true")}
+        </div>
+      </div>
     </div>
-  </div>
-</div>
 
-<div class="fieldset collapsable-content" data-toggle="summary-details">
-  <div class="left-label">
-    ${_('File last commit')}:
-  </div>
-  <div class="right-content">
-    <div class="tags">
-      <code><a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.file_last_commit.raw_id)}">${h.show_id(c.file_last_commit)}</a></code>
+    <div class="right-content">
+      <div data-toggle="summary-details">
+          <div class="tags commit-info tags-main">
+            <code><a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.commit.raw_id)}">${h.show_id(c.commit)}</a></code>
+            ${file_base.refs(c.commit)}
+          </div>
+      </div>
+    </div>
 
-      ${file_base.refs(c.file_last_commit)}
+    <div class="clear-fix"></div>
+
+    <div  class="btn-collapse" data-toggle="summary-details">
+        ${_('Show More')}
     </div>
+
   </div>
 </div>
 
-
-<div class="fieldset collapsable-content" data-toggle="summary-details">
-  <div class="left-label">
-    ${_('Show/Diff file')}:
-  </div>
-  <div class="right-content">
-  ${h.hidden('diff1')}
-  ${h.hidden('diff2',c.commit.raw_id)}
-  ${h.hidden('annotate', c.annotate)}
-  </div>
-</div>
-
-
-<div class="fieldset collapsable-content" data-toggle="summary-details">
-  <div class="left-label">
-    ${_('Action')}:
-  </div>
-  <div class="right-content">
-  ${h.submit('diff_to_commit',_('Diff to Commit'),class_="btn disabled",disabled="true")}
-  ${h.submit('show_at_commit',_('Show at Commit'),class_="btn disabled",disabled="true")}
-  </div>
-</div>
-
-<div class="fieldset collapsable-content" data-toggle="summary-details">
-  <div class="left-label" id="file_authors_title">
-    % if c.file_author:
-        ${_('Last Author')}
-    % else:
-        ${h.literal(_ungettext(u'File Author (%s)',u'File Authors (%s)',len(c.authors)) % ('<b>%s</b>' % len(c.authors))) }
-    % endif
-    <a href="#" id="show_authors" class="action_link">${_('Show All')}</a>
-  </div>
-  <div class="right-content" id="file_authors">
-    ## loads single author, or ALL
-    <%include file='file_authors_box.mako'/>
-  </div>
-</div>
-
-
 <script>
   collapsableContent();
 </script>

rhodecode/templates/files/files_tree_header.mako

@@ -1,46 +1,46 b''
 <%namespace name="base" file="/base/base.mako"/>
 <%namespace name="file_base" file="/files/base.mako"/>
 
 <div class="summary">
   <div class="fieldset">
     <div class="left-content">
 
       <div class="left-content-avatar">
         ${base.gravatar(c.commit.author, 30)}
       </div>
 
       <div class="left-content-message">
         <div class="fieldset collapsable-content no-hide" data-toggle="summary-details">
           <div class="commit truncate-wrap">${h.urlify_commit_message(h.chop_at_smart(c.commit.message, '\n', suffix_if_chopped='...'), c.repo_name)}</div>
         </div>
 
         <div class="fieldset collapsable-content" data-toggle="summary-details">
           <div class="commit">${h.urlify_commit_message(c.commit.message,c.repo_name)}</div>
         </div>
 
         <div class="clear-fix">
-          <span class="commit-author">${h.link_to_user(c.commit.author)}</span><span class="commit-date">-${h.age_component(c.commit.date)}</span>
+          <span class="commit-author">${h.link_to_user(c.commit.author)}</span><span class="commit-date"> - ${h.age_component(c.commit.date)}</span>
         </div>
       </div>
     </div>
 
     <div class="right-content">
       <div class="tags commit-info">
         <code>
             <a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.commit.raw_id)}">${h.show_id(c.commit)}</a>
         </code>
 
         ${file_base.refs(c.commit)}
       </div>
     </div>
-    <div class="clear-fix">
-  </div>
+
+    <div class="clear-fix"></div>
 
-
-  <div  class="btn-collapse" data-toggle="summary-details">
-      ${_('Show More')}
+    <div  class="btn-collapse" data-toggle="summary-details">
+        ${_('Show More')}
+    </div>
   </div>
 </div>
 <script>
   collapsableContent();
 </script>