kallithea Changeset - 93de03499097

Changeset - 93de03499097

Parent rev.

Child rev.

[Not reviewed]

beta

0 6 0

Marcin Kuzminski - 13 years ago 2013-04-07 23:11:17
marcin@python-works.com

shortlog: show all refs (bookmarks,tags,branches) in one dedicated column
- rename confusing name bookbook to booktag (as others similar names)

6 files changed with 38 insertions and 30 deletions:

rhodecode/public/css/style.css

rhodecode/templates/bookmarks/bookmarks.html

rhodecode/templates/bookmarks/bookmarks_data.html

rhodecode/templates/changelog/changelog.html

rhodecode/templates/changeset/changeset_range.html

rhodecode/templates/shortlog/shortlog_data.html

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -2634,13 +2634,13 @@ h3.files_location { @@
     position: absolute;
     width: auto;
     right: 0;
     left: initial;
+}
-#graph_content .logtags .bookbook,
+#graph_content .logtags .booktag,
 #graph_content .logtags .tagtag {
     float: left;
     line-height: 1em;
     margin-bottom: 1px;
     margin-right: 1px;
     padding: 1px 3px;
@@ @@ -2758,15 +2758,21 @@ h3.files_location { @@
     line-height: 2.2em;
+}
 .branchtag, .logtags .tagtag, .logtags .booktag {
     margin: 0px 2px;
+}
 #shortlog_data .branchtag,
 #shortlog_data .booktag,
 #shortlog_data .tagtag {
     margin: 0px 2px;
+}
 .branchtag,
 .tagtag,
-.bookbook,
+.booktag,
 .spantag {
     padding: 1px 3px 1px 3px;
     font-size: 10px;
     color: #336699;
     white-space: nowrap;
     -webkit-border-radius: 4px;
@@ @@ -2774,33 +2780,33 @@ h3.files_location { @@
     border: 1px solid #d9e8f8;
     line-height: 1.5em;
+}
 #graph_content .branchtag,
 #graph_content .tagtag,
-#graph_content .bookbook {
+#graph_content .booktag {
     margin: 1.1em 0;
     margin-right: 0.5em;
+}
 .branchtag,
 .tagtag,
-.bookbook {
+.booktag {
     float: left;
+}
 .right .logtags .branchtag,
 .logtags .tagtag,
 .right .merge {
     float: right;
     line-height: 1em;
     margin: 1px 1px !important;
     display: block;
+}
-.bookbook {
+.booktag {
     border-color: #46A546;
     color: #46A546;
+}
 .tagtag {
     border-color: #62cffc;
@@ @@ -2828,29 +2834,29 @@ h3.files_location { @@
 .tagtag a:hover,
 .logtags .tagtag a,
 .logtags .tagtag a:hover {
     text-decoration: none;
     color: inherit;
+}
-.logbooks .bookbook, .logbooks .bookbook, .logtags .bookbook, .logtags .bookbook {
+.logbooks .booktag, .logbooks .booktag, .logtags .booktag, .logtags .booktag {
     padding: 1px 3px 1px 3px;
     background-color: #46A546;
     font-size: 10px;
     color: #ffffff;
     white-space: nowrap;
     -webkit-border-radius: 3px;
     border-radius: 3px;
+}
-.logbooks .bookbook, .logbooks .bookbook a, .right .logtags .bookbook, .logtags .bookbook a {
+.logbooks .booktag, .logbooks .booktag a, .right .logtags .booktag, .logtags .booktag a {
     color: #ffffff;
+}
 .logbooks .bookbook, .logbooks .bookbook a:hover,
 .logtags .bookbook, .logtags .bookbook a:hover,
 .bookbook a,
 .bookbook a:hover {
 .logbooks .booktag, .logbooks .booktag a:hover,
 .logtags .booktag, .logtags .booktag a:hover,
 .booktag a,
 .booktag a:hover {
     text-decoration: none;
     color: inherit;
+}
 div.browserblock {
     overflow: hidden;
     border: 1px solid #ccc;

rhodecode/templates/bookmarks/bookmarks.html

➞

Show inline comments

@@ @@ -64,13 +64,13 @@ var myDataTable = new YAHOO.widget.DataT @@
 );
 myDataTable.subscribe('postRenderEvent',function(oArgs) {
     tooltip_activate();
     var func = function(node){
         return node.parentNode.parentNode.parentNode.parentNode.parentNode;
+    }
-    q_filter('q_filter_bookmarks',YUQ('div.table tr td .logbooks .bookbook a'),func);
+    q_filter('q_filter_bookmarks',YUQ('div.table tr td .logbooks .booktag a'),func);
 });
 </script>
 </%def>

rhodecode/templates/bookmarks/bookmarks_data.html

➞

Show inline comments

@@ @@ -10,13 +10,13 @@ @@
         </tr>
     </thead>
     %for cnt,book in enumerate(c.repo_bookmarks.items()):
         <tr class="parity${cnt%2}">
             <td>
                 <span class="logbooks">
-                    <span class="bookbook">${h.link_to(book[0],
+                    <span class="booktag">${h.link_to(book[0],
                     h.url('files_home',repo_name=c.repo_name,revision=book[1].raw_id))}</span>
                 </span>
             </td>
             <td><span class="tooltip" title="${h.tooltip(h.age(book[1].date))}">${h.fmt_date(book[1].date)}</span></td>
             <td title="${book[1].author}">${h.person(book[1].author)}</td>
             <td>

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -95,13 +95,13 @@ ${self.context_bar('changelog')} @@
                                                 </a>
                                             </div>
                                         </div>
                                     %endif
                                     %if h.is_hg(c.rhodecode_repo):
                                         %for book in cs.bookmarks:
-                                            <div class="bookbook" title="${_('Bookmark %s') % book}">
+                                            <div class="booktag" title="${_('Bookmark %s') % book}">
                                                 ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
                                             </div>
                                         %endfor
                                     %endif
                                     %for tag in cs.tags:
                                         <div class="tagtag" title="${_('Tag %s') % tag}">

rhodecode/templates/changeset/changeset_range.html

➞

Show inline comments

@@ @@ -80,13 +80,13 @@ ${self.context_bar('changelog')} @@
                 <span class="branchtag" title="${_('Branch %s') % cs.branch}">
                    ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
                 </span>
                 %endif
                 %if h.is_hg(c.rhodecode_repo):
                   %for book in cs.bookmarks:
-                  <span class="bookbook" title="${_('Bookmark %s') % book}">
+                  <span class="booktag" title="${_('Bookmark %s') % book}">
                      ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
                   </span>
                   %endfor
                 %endif
                 %for tag in cs.tags:
                     <span class="tagtag" title="${_('Tag %s') % tag}">

rhodecode/templates/shortlog/shortlog_data.html

➞

Show inline comments

@@ @@ -3,14 +3,13 @@ @@
 <table class="table_disp">
     <tr>
         <th class="left">${_('Revision')}</th>
         <th class="left">${_('Commit message')}</th>
         <th class="left">${_('Age')}</th>
         <th class="left">${_('Author')}</th>
         <th class="left">${_('Branch')}</th>
         <th class="left">${_('Tags')}</th>
         <th class="left">${_('Refs')}</th>
     </tr>
 %for cnt,cs in enumerate(c.repo_changesets):
     <tr class="parity${cnt%2}">
         <td>
           <div>
             <div class="changeset-status-container">
@@ @@ -34,26 +33,29 @@ @@
         </td>
         <td><span class="tooltip" title="${h.tooltip(h.fmt_date(cs.date))}">
                       ${h.age(cs.date)}</span>
         </td>
         <td title="${cs.author}">${h.person(cs.author)}</td>
         <td>
             <span class="logtags">
                 %if cs.branch:
                 <span class="branchtag">
                     ${cs.branch}
                 </span>
                 %endif
             </span>
         </td>
         <td>
             <span class="logtags">
                 %for tag in cs.tags:
                     <span class="tagtag">${tag}</span>
             %if h.is_hg(c.rhodecode_repo):
                 %for book in cs.bookmarks:
                     <div class="booktag" title="${_('Bookmark %s') % book}">
                         ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
                     </div>
                 %endfor
             </span>
             %endif
             %for tag in cs.tags:
              <div class="tagtag" title="${_('Tag %s') % tag}">
                  ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
              </div>
             %endfor
             %if cs.branch:
              <div class="branchtag" title="${_('Branch %s' % cs.branch)}">
                  ${h.link_to(h.shorter(cs.branch),h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}
              </div>
             %endif
         </td>
     </tr>
 %endfor
 </table>

0 comments (0 inline, 0 general)