kallithea Changeset - 3555c56694b5

Changeset - 3555c56694b5

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-10-15 23:17:02
marcin@python-works.com

Changeset range shows branch/tags/bookmarks

2 files changed with 38 insertions and 12 deletions:

rhodecode/public/css/style.css

rhodecode/templates/changeset/changeset_range.html

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -16,122 +16,123 @@ body { @@
 	font-family: Lucida Grande, Verdana, Lucida Sans Regular,
 		Lucida Sans Unicode, Arial, sans-serif; font-size : 12px;
 	color: #000;
 	margin: 0;
 	padding: 0;
 	font-size: 12px;
+}
 ol,ul {
 	list-style: none;
+}
 blockquote,q {
 	quotes: none;
+}
 blockquote:before,blockquote:after,q:before,q:after {
 	content: none;
+}
 :focus {
 	outline: 0;
+}
 del {
 	text-decoration: line-through;
+}
 table {
 	border-collapse: collapse;
 	border-spacing: 0;
+}
 html {
 	height: 100%;
+}
 a {
 	color: #003367;
 	text-decoration: none;
 	cursor: pointer;
+}
 a:hover {
 	color: #316293;
 	text-decoration: underline;
+}
 h1,h2,h3,h4,h5,h6 {
 h1,h2,h3,h4,h5,h6,
 div.h1,div.h2,div.h3,div.h4,div.h5,div.h6 {
 	color: #292929;
 	font-weight: 700;
+}
 h1 {
+h1,div.h1 {
 	font-size: 22px;
+}
 h2 {
+h2,div.h2 {
 	font-size: 20px;
+}
 h3 {
+h3,div.h3 {
 	font-size: 18px;
+}
 h4 {
+h4,div.h4 {
 	font-size: 16px;
+}
 h5 {
+h5,div.h5 {
 	font-size: 14px;
+}
 h6 {
+h6,div.h6 {
 	font-size: 11px;
+}
 ul.circle {
 	list-style-type: circle;
+}
 ul.disc {
 	list-style-type: disc;
+}
 ul.square {
 	list-style-type: square;
+}
 ol.lower-roman {
 	list-style-type: lower-roman;
+}
 ol.upper-roman {
 	list-style-type: upper-roman;
+}
 ol.lower-alpha {
 	list-style-type: lower-alpha;
+}
 ol.upper-alpha {
 	list-style-type: upper-alpha;
+}
 ol.decimal {
 	list-style-type: decimal;
+}
 div.color {
 	clear: both;
 	overflow: hidden;
 	position: absolute;
 	background: #FFF;
 	margin: 7px 0 0 60px;
 	padding: 1px 1px 1px 0;
+}
 div.color a {
 	width: 15px;
 	height: 15px;
 	display: block;
@@ @@ -1098,97 +1099,99 @@ tbody .yui-dt-editable { cursor: pointer @@
 	background-image: -moz-linear-gradient(top, #003b76, #00376e);
 	background-image: -ms-linear-gradient(top, #003b76, #00376e);
 	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #003b76), color-stop(100%, #00376e) );
 	background-image: -webkit-linear-gradient(top, #003b76, #00376e);
 	background-image: -o-linear-gradient(top, #003b76, #00376e);
 	background-image: linear-gradient(top, #003b76, #00376e);
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b76', endColorstr='#00376e', GradientType=0 );
 	margin: 0 0 20px;
 	padding: 0;
+}
 #content div.box div.title h5 {
 	float: left;
 	border: none;
 	color: #fff;
 	text-transform: uppercase;
 	margin: 0;
 	padding: 11px 0 11px 10px;
+}
 #content div.box div.title .link-white{
 	color: #FFFFFF;
+}
 #content div.box div.title .link-white.current{
     color: #BFE3FF;
+}
 #content div.box div.title ul.links li {
 	list-style: none;
 	float: left;
 	margin: 0;
 	padding: 0;
+}
 #content div.box div.title ul.links li a {
 	border-left: 1px solid #316293;
 	color: #FFFFFF;
 	display: block;
 	float: left;
 	font-size: 13px;
 	font-weight: 700;
 	height: 1%;
 	margin: 0;
 	padding: 11px 22px 12px;
 	text-decoration: none;
+}
 #content div.box h1,#content div.box h2,#content div.box h3,#content div.box h4,#content div.box h5,#content div.box h6
 #content div.box h1,#content div.box h2,#content div.box h3,#content div.box h4,#content div.box h5,#content div.box h6,
 #content div.box div.h1,#content div.box div.h2,#content div.box div.h3,#content div.box div.h4,#content div.box div.h5,#content div.box div.h6
+	{
 	clear: both;
 	overflow: hidden;
 	border-bottom: 1px solid #DDD;
 	margin: 10px 20px;
 	padding: 0 0 15px;
+}
 #content div.box p {
 	color: #5f5f5f;
 	font-size: 12px;
 	line-height: 150%;
 	margin: 0 24px 10px;
 	padding: 0;
+}
 #content div.box blockquote {
 	border-left: 4px solid #DDD;
 	color: #5f5f5f;
 	font-size: 11px;
 	line-height: 150%;
 	margin: 0 34px;
 	padding: 0 0 0 14px;
+}
 #content div.box blockquote p {
 	margin: 10px 0;
 	padding: 0;
+}
 #content div.box dl {
 	margin: 10px 0px;
+}
 #content div.box dt {
 	font-size: 12px;
 	margin: 0;
+}
 #content div.box dd {
 	font-size: 12px;
 	margin: 0;
 	padding: 8px 0 8px 15px;
+}
 #content div.box li {
 	font-size: 12px;
 	padding: 4px 0;

rhodecode/templates/changeset/changeset_range.html

➞

Show inline comments

@@ @@ -23,77 +23,100 @@ @@
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div class="table">
 		<div id="body" class="diffblock">
 			<div class="code-header cv">
 		        <h3 class="code-header-title">${_('Compare View')}</h3>
                 <div>
 				${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}
 				</div>
 			</div>
 		</div>
 	    <div id="changeset_compare_view_content">
 			<div class="container">
 			<table class="compare_view_commits noborder">
             %for cnt,cs in enumerate(c.cs_ranges):
                 <tr>
                 <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td>
                 <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</td>
                 <td><div class="author">${h.person(cs.author)}</div></td>
                 <td><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
                 <td>
                   %if c.statuses:
                     <div title="${h.tooltip(_('Changeset status'))}" class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cnt])}" /></div>
                   %endif
                 </td>
                 <td><div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td>
                 </tr>
             %endfor
             </table>
 	        </div>
 	        <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>
 	        <div class="cs_files">
 	               %for cs in c.cs_ranges:
 	                   <div class="cur_cs">${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
 	                %for change,filenode,diff,cs1,cs2,st in c.changes[cs.raw_id]:
 	                    <div class="cs_${change}">${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.FID(cs.raw_id,filenode.path)))}</div>
 	                %endfor
 	               %endfor
 	        </div>
 	    </div>
     </div>
     <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
     <%namespace name="diff_block" file="/changeset/diff_block.html"/>
      %for cs in c.cs_ranges:
           ##${comment.comment_inline_form(cs)}
           ## diff block
-          <h3 style="padding-top:8px;">
+          <div class="h3">
           <a class="tooltip" title="${h.tooltip(cs.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">${'r%s:%s' % (cs.revision,h.short_id(cs.raw_id))}</a>
            <div class="gravatar">
                <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),20)}"/>
              <div class="gravatar">
                  <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),20)}"/>
              </div>
              <div class="right">
               <span class="logtags">
                 %if len(cs.parents)>1:
                 <span class="merge">${_('merge')}</span>
                 %endif
                 %if cs.branch:
                 <span class="branchtag" title="${'%s %s' % (_('branch'),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="${'%s %s' % (_('bookmark'),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="${'%s %s' % (_('tag'),tag)}">
                     ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
                 %endfor
               </span>
             </div>
            </div>
            </h3>
           ${diff_block.diff_block(c.changes[cs.raw_id])}
           ##${comment.comments(cs)}
      %endfor
      <script type="text/javascript">
       YUE.onDOMReady(function(){
           YUE.on(YUQ('.diff-menu-activate'),'click',function(e){
               var act = e.currentTarget.nextElementSibling;
               if(YUD.hasClass(act,'active')){
                   YUD.removeClass(act,'active');
                   YUD.setStyle(act,'display','none');
               }else{
                   YUD.addClass(act,'active');
                   YUD.setStyle(act,'display','');
+              }
           });
       })
     </script>
     </div>
 </%def>

0 comments (0 inline, 0 general)