kallithea Changeset - efc00d363d1e

Changeset - efc00d363d1e

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 13 years ago 2013-03-01 15:25:36
marcin@python-works.com

collapsable diff container in changeset, makes quick review easier

4 files changed with 47 insertions and 3 deletions:

rhodecode/public/css/style.css

rhodecode/public/js/rhodecode.js

rhodecode/templates/base/root.html

rhodecode/templates/changeset/diff_block.html

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -151,193 +151,192 @@ div.options { @@
 div.options a {
     height: 1%;
     display: block;
     text-decoration: none;
     margin: 0;
     padding: 3px 8px;
+}
 .top-left-rounded-corner {
     -webkit-border-top-left-radius: 8px;
     -khtml-border-radius-topleft: 8px;
     -moz-border-radius-topleft: 8px;
     border-top-left-radius: 8px;
+}
 .top-right-rounded-corner {
     -webkit-border-top-right-radius: 8px;
     -khtml-border-radius-topright: 8px;
     -moz-border-radius-topright: 8px;
     border-top-right-radius: 8px;
+}
 .bottom-left-rounded-corner {
     -webkit-border-bottom-left-radius: 8px;
     -khtml-border-radius-bottomleft: 8px;
     -moz-border-radius-bottomleft: 8px;
     border-bottom-left-radius: 8px;
+}
 .bottom-right-rounded-corner {
     -webkit-border-bottom-right-radius: 8px;
     -khtml-border-radius-bottomright: 8px;
     -moz-border-radius-bottomright: 8px;
     border-bottom-right-radius: 8px;
+}
 .top-left-rounded-corner-mid {
     -webkit-border-top-left-radius: 4px;
     -khtml-border-radius-topleft: 4px;
     -moz-border-radius-topleft: 4px;
     border-top-left-radius: 4px;
+}
 .top-right-rounded-corner-mid {
     -webkit-border-top-right-radius: 4px;
     -khtml-border-radius-topright: 4px;
     -moz-border-radius-topright: 4px;
     border-top-right-radius: 4px;
+}
 .bottom-left-rounded-corner-mid {
     -webkit-border-bottom-left-radius: 4px;
     -khtml-border-radius-bottomleft: 4px;
     -moz-border-radius-bottomleft: 4px;
     border-bottom-left-radius: 4px;
+}
 .bottom-right-rounded-corner-mid {
     -webkit-border-bottom-right-radius: 4px;
     -khtml-border-radius-bottomright: 4px;
     -moz-border-radius-bottomright: 4px;
     border-bottom-right-radius: 4px;
+}
 .help-block {
     color: #999999;
     display: block;
     margin-bottom: 0;
     margin-top: 5px;
+}
 .empty_data {
     color:#B9B9B9;
+}
 a.permalink {
     visibility: hidden;
+}
 a.permalink:hover {
     text-decoration: none;
+}
 h1:hover > a.permalink,
 h2:hover > a.permalink,
 h3:hover > a.permalink,
 h4:hover > a.permalink,
 h5:hover > a.permalink,
 h6:hover > a.permalink,
 div:hover > a.permalink {
     visibility: visible;
+}
 #header {
+}
 #header ul#logged-user {
     margin-bottom: 5px !important;
     -webkit-border-radius: 0px 0px 8px 8px;
     -khtml-border-radius: 0px 0px 8px 8px;
     -moz-border-radius: 0px 0px 8px 8px;
     border-radius: 0px 0px 8px 8px;
     height: 37px;
     background-color: #003B76;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#003B76), to(#00376E) );
     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 );
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
+}
 #header ul#logged-user li {
     list-style: none;
     float: left;
     margin: 8px 0 0;
     padding: 4px 12px;
     border-left: 1px solid #316293;
+}
 #header ul#logged-user li.first {
     border-left: none;
     margin: 4px;
+}
 #header ul#logged-user li.first div.gravatar {
     margin-top: -2px;
+}
 #header ul#logged-user li.first div.account {
     padding-top: 4px;
     float: left;
+}
 #header ul#logged-user li.last {
     border-right: none;
+}
 #header ul#logged-user li a {
     color: #fff;
     font-weight: 700;
     text-decoration: none;
+}
 #header ul#logged-user li a:hover {
     text-decoration: underline;
+}
 #header ul#logged-user li.highlight a {
     color: #fff;
+}
 #header ul#logged-user li.highlight a:hover {
     color: #FFF;
+}
 #header-dd {
     clear: both;
     position: fixed !important;
     background-color: #003B76;
     opacity: 0.01;
     cursor: pointer;
     min-height: 10px;
     width: 100% !important;
     -webkit-border-radius: 0px 0px 4px 4px;
     -khtml-border-radius: 0px 0px 4px 4px;
     -moz-border-radius: 0px 0px 4px 4px;
     border-radius: 0px 0px 4px 4px;
+}
 #header-dd:hover{
 	opacity: 0.2;
     -webkit-transition: opacity 0.5s ease-in-out;
     -moz-transition: opacity 0.5s ease-in-out;
     transition: opacity 0.5s ease-in-out;
+}
 #header #header-inner {
     min-height: 44px;
     clear: both;
     position: relative;
     background-color: #003B76;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#003B76), to(#00376E) );
     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);
@@ @@ -4546,192 +4545,209 @@ form.comment-inline-form { @@
 .notification-list .container .notification-header .desc {
     font-weight: bold;
     font-size: 17px;
+}
 .notification-table {
     border: 1px solid #ccc;
     -webkit-border-radius: 6px 6px 6px 6px;
     -moz-border-radius: 6px 6px 6px 6px;
     border-radius: 6px 6px 6px 6px;
     clear: both;
     margin: 0px 20px 0px 20px;
+}
 .notification-header .delete-notifications {
     float: right;
     padding-top: 8px;
     cursor: pointer;
+}
 .notification-header .read-notifications {
     float: right;
     padding-top: 8px;
     cursor: pointer;
+}
 .notification-subject {
     clear:both;
     border-bottom: 1px solid #eee;
     padding:5px 0px 5px 38px;
+}
 .notification-body {
     clear:both;
     margin: 34px 2px 2px 8px
+}
 /****
 PULL REQUESTS
 *****/
 .pullrequests_section_head {
     padding:10px 10px 10px 0px;
     font-size:16px;
     font-weight: bold;
+}
 /****
   PERMS
 *****/
 #perms .perms_section_head {
     padding:10px 10px 10px 0px;
     font-size:16px;
     font-weight: bold;
+}
 #perms .perm_tag {
     padding: 1px 3px 1px 3px;
     font-size: 10px;
     font-weight: bold;
     text-transform: uppercase;
     white-space: nowrap;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;
+}
 #perms .perm_tag.admin {
     background-color: #B94A48;
     color: #ffffff;
+}
 #perms .perm_tag.write {
     background-color: #DB7525;
     color: #ffffff;
+}
 #perms .perm_tag.read {
     background-color: #468847;
     color: #ffffff;
+}
 #perms .perm_tag.none {
     background-color: #bfbfbf;
     color: #ffffff;
+}
 .perm-gravatar {
     vertical-align:middle;
     padding:2px;
+}
 .perm-gravatar-ac {
     vertical-align:middle;
     padding:2px;
     width: 14px;
     height: 14px;
+}
 /*****************************************************************************
                                   DIFFS CSS
 ******************************************************************************/
 .diff-collapse{
 	text-align: center;
+}
 .diff-collapse-button{
 	cursor: pointer;
 	color: #666;
 	font-size: 16px;
+}
 .diff-container {
 	margin-bottom: -15px;
+}
 .diff-container.hidden{
 	display: none;
 	overflow: hidden;
+}
 div.diffblock {
     overflow: auto;
     padding: 0px;
     border: 1px solid #ccc;
     background: #f8f8f8;
     font-size: 100%;
     line-height: 100%;
     /* new */
     line-height: 125%;
     -webkit-border-radius: 6px 6px 0px 0px;
     -moz-border-radius: 6px 6px 0px 0px;
     border-radius: 6px 6px 0px 0px;
+}
 div.diffblock.margined {
     margin: 0px 20px 0px 20px;
+}
 div.diffblock .code-header {
     border-bottom: 1px solid #CCCCCC;
     background: #EEEEEE;
     padding:10px 0 10px 0;
     height: 14px;
+}
 div.diffblock .code-header.banner {
     border-bottom: 1px solid #CCCCCC;
     background: #EEEEEE;
     height: 14px;
     margin: 0px 95px 0px 95px;
     padding: 3px 3px 11px 3px;
+}
 div.diffblock .code-header.cv {
     height: 34px;
+}
 div.diffblock .code-header-title {
     padding: 0px 0px 10px 5px !important;
     margin: 0 !important;
+}
 div.diffblock .code-header .hash {
     float: left;
     padding: 2px 0 0 2px;
+}
 div.diffblock .code-header .date {
     float:left;
     text-transform: uppercase;
     padding: 2px 0px 0px 2px;
+}
 div.diffblock .code-header div {
     margin-left:4px;
     font-weight: bold;
     font-size: 14px;
+}
 div.diffblock .parents {
     float: left;
     height: 26px;
     width:100px;
     font-size: 10px;
     font-weight: 400;
     vertical-align: middle;
     padding: 0px 2px 2px 2px;
     background-color:#eeeeee;
     border-bottom: 1px solid #CCCCCC;
+}
 div.diffblock .children {
     float: right;
     height: 26px;
     width:100px;
     font-size: 10px;
     font-weight: 400;
     vertical-align: middle;
     text-align: right;
     padding: 0px 2px 2px 2px;
     background-color:#eeeeee;
     border-bottom: 1px solid #CCCCCC;
+}
 div.diffblock .code-body {
     background: #FFFFFF;
+}
 div.diffblock pre.raw {
     background: #FFFFFF;
     color:#000000;
+}
 table.code-difftable {
     border-collapse: collapse;
     width: 99%;
+}
 table.code-difftable td {
     padding: 0 !important;
     background: none !important;
     border:0 !important;
     vertical-align: none !important;
+}

rhodecode/public/js/rhodecode.js

➞

Show inline comments

@@ @@ -2068,96 +2068,119 @@ var MultiSelectWidget = function(selecte @@
+	        }
+	    }
 	    if(add){
 	        tmp_cache.push(new Option(node.text, node.value, false, false));
+	    }
+	}
 	for(var i = 0;node = tmp_cache[i];i++){
 	    ac.options[i] = node;
+	}
 	function prompts_action_callback(e){
 	    var choosen = YUD.get(selected_container);
 	    var available = YUD.get(available_container);
 	    //get checked and unchecked options from field
 	    function get_checked(from_field){
 	        //temp container for storage.
 	        var sel_cache = new Array();
 	        var oth_cache = new Array();
 	        for(var i = 0;node = from_field.options[i];i++){
 	            if(node.selected){
 	                //push selected fields :)
 	                sel_cache.push(node);
+	            }
 	            else{
 	                oth_cache.push(node)
+	            }
+	        }
 	        return [sel_cache,oth_cache]
+	    }
 	    //fill the field with given options
 	    function fill_with(field,options){
 	        //clear firtst
 	        field.options.length=0;
 	        for(var i = 0;node = options[i];i++){
 	                field.options[i]=new Option(node.text, node.value,
 	                        false, false);
+	        }
+	    }
 	    //adds to current field
 	    function add_to(field,options){
 	        for(var i = 0;node = options[i];i++){
 	                field.appendChild(new Option(node.text, node.value,
 	                        false, false));
+	        }
+	    }
 	    // add action
 	    if (this.id=='add_element'){
 	        var c = get_checked(available);
 	        add_to(choosen,c[0]);
 	        fill_with(available,c[1]);
+	    }
 	    // remove action
 	    if (this.id=='remove_element'){
 	        var c = get_checked(choosen);
 	        add_to(available,c[0]);
 	        fill_with(choosen,c[1]);
+	    }
 	    // add all elements
 	    if(this.id=='add_all_elements'){
 	        for(var i=0; node = available.options[i];i++){
 	                choosen.appendChild(new Option(node.text,
 	                        node.value, false, false));
+	        }
 	        available.options.length = 0;
+	    }
 	    //remove all elements
 	    if(this.id=='remove_all_elements'){
 	        for(var i=0; node = choosen.options[i];i++){
 	            available.appendChild(new Option(node.text,
 	                    node.value, false, false));
+	        }
 	        choosen.options.length = 0;
+	    }
+	}
 	YUE.addListener(['add_element','remove_element',
 	               'add_all_elements','remove_all_elements'],'click',
 	               prompts_action_callback)
 	if (form_id !== undefined) {
 		YUE.addListener(form_id,'submit',function(){
 		    var choosen = YUD.get(selected_container);
 		    for (var i = 0; i < choosen.options.length; i++) {
 		        choosen.options[i].selected = 'selected';
+		    }
 		});
+	}
+}
 // global hooks after DOM is loaded
 YUE.onDOMReady(function(){
 	YUE.on(YUQ('.diff-collapse-button'), 'click', function(e){
 		var button = e.currentTarget;
 		var t = YUD.get(button).getAttribute('target');
 	    console.log(t);
 		if(YUD.hasClass(t, 'hidden')){
 			YUD.removeClass(t, 'hidden');
 			YUD.get(button).innerHTML = "&uarr; {0} &uarr;".format(_TM['collapse diff']);
+		}
 		else if(!YUD.hasClass(t, 'hidden')){
 			YUD.addClass(t, 'hidden');
 			YUD.get(button).innerHTML = "&darr; {0} &darr;".format(_TM['expand diff']);
+		}
 	});
 });

rhodecode/templates/base/root.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>${self.title()}</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
         <meta name="robots" content="index, nofollow"/>
         <link rel="icon" href="${h.url('/images/icons/database_gear.png')}" type="image/png" />
         ## CSS ###
         <%def name="css()">
             <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css', ver=c.rhodecode_version)}" media="screen"/>
             <link rel="stylesheet" type="text/css" href="${h.url('/css/pygments.css', ver=c.rhodecode_version)}"/>
             ## EXTRA FOR CSS
             ${self.css_extra()}
         </%def>
         <%def name="css_extra()">
         </%def>
         ${self.css()}
         %if c.ga_code:
         <!-- Analytics -->
         <script type="text/javascript">
             var _gaq = _gaq || [];
             _gaq.push(['_setAccount', '${c.ga_code}']);
             _gaq.push(['_trackPageview']);
             (function() {
                 var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
                 ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
                 var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
                 })();
         </script>
         %endif
         ## JAVASCRIPT ##
         <%def name="js()">
             <script type="text/javascript">
             //JS translations map
             var TRANSLATION_MAP = {
                 'add another comment':'${_("add another comment")}',
                 'Stop following this repository':"${_('Stop following this repository')}",
                 'Start following this repository':"${_('Start following this repository')}",
                 'Group':"${_('Group')}",
                 'members':"${_('members')}",
                 'loading...':"${_('loading...')}",
                 'search truncated': "${_('search truncated')}",
                 'no matching files': "${_('no matching files')}",
                 'Open new pull request': "${_('Open new pull request')}",
                 'Open new pull request for selected changesets':  "${_('Open new pull request for selected changesets')}",
                 'Show selected changes __S -> __E': "${_('Show selected changes __S -> __E')}",
                 'Selection link': "${_('Selection link')}",
                 'collapse diff': "${_('collapse diff')}",
                 'expand diff': "${_('expand diff')}",
             };
             var _TM = TRANSLATION_MAP;
             var TOGGLE_FOLLOW_URL  = "${h.url('toggle_following')}";
             </script>
             <script type="text/javascript" src="${h.url('/js/yui.2.9.js', ver=c.rhodecode_version)}"></script>
             <!--[if lt IE 9]>
                <script language="javascript" type="text/javascript" src="${h.url('/js/excanvas.min.js')}"></script>
             <![endif]-->
             <script type="text/javascript" src="${h.url('/js/yui.flot.js', ver=c.rhodecode_version)}"></script>
             <script type="text/javascript" src="${h.url('/js/native.history.js', ver=c.rhodecode_version)}"></script>
             <script type="text/javascript" src="${h.url('/js/pyroutes_map.js', ver=c.rhodecode_version)}"></script>
             <script type="text/javascript" src="${h.url('/js/rhodecode.js', ver=c.rhodecode_version)}"></script>
            ## EXTRA FOR JS
            ${self.js_extra()}
             <script type="text/javascript">
             (function(window,undefined){
                 // Prepare
                 var History = window.History; // Note: We are using a capital H instead of a lower h
                 if ( !History.enabled ) {
                      // History.js is disabled for this browser.
                      // This is because we can optionally choose to support HTML4 browsers or not.
                     return false;
+                }
             })(window);
             YUE.onDOMReady(function(){
               tooltip_activate();
               show_more_event();
               show_changeset_tooltip();
               // routes registration
               pyroutes.register('toggle_following', "${h.url('toggle_following')}");
               pyroutes.register('changeset_info', "${h.url('changeset_info', repo_name='%(repo_name)s', revision='%(revision)s')}", ['repo_name', 'revision']);
               pyroutes.register('repo_size', "${h.url('repo_size', repo_name='%(repo_name)s')}", ['repo_name']);
            })
             </script>
         </%def>
         <%def name="js_extra()"></%def>
         ${self.js()}
         <%def name="head_extra()"></%def>
         ${self.head_extra()}
     </head>
     <body id="body">
      ## IE hacks
       <!--[if IE 7]>
       <script>YUD.addClass(document.body,'ie7')</script>
       <![endif]-->
       <!--[if IE 8]>
       <script>YUD.addClass(document.body,'ie8')</script>
       <![endif]-->
       <!--[if IE 9]>
       <script>YUD.addClass(document.body,'ie9')</script>
       <![endif]-->
       ${next.body()}
     </body>
 </html>

rhodecode/templates/changeset/diff_block.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 ##usage:
 ## <%namespace name="diff_block" file="/changeset/diff_block.html"/>
 ## ${diff_block.diff_block(change)}
 ##
 <%def name="diff_block(change)">
 <div class="diff-collapse">
     <span target="${'diff-container-%s' % (id(change))}" class="diff-collapse-button">&uarr; ${_('collapse diff')} &uarr;</span>
 </div>
 <div class="diff-container" id="${'diff-container-%s' % (id(change))}">
 %for FID,(cs1, cs2, change, path, diff, stats) in change.iteritems():
     ##%if op !='removed':
     <div id="${FID}_target" style="clear:both;margin-top:25px"></div>
     <div id="${FID}" class="diffblock  margined comm">
         <div class="code-header">
             <div class="changeset_header">
                 <div class="changeset_file">
                     ${h.link_to_if(change!='removed',h.safe_unicode(path),h.url('files_home',repo_name=c.repo_name,
                     revision=cs2,f_path=h.safe_unicode(path)))}
                 </div>
                 <div class="diff-actions">
                   <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('show full diff for this file'))}"><img class="icon" src="${h.url('/images/icons/page_white_go.png')}"/></a>
                   <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='raw')}" class="tooltip" title="${h.tooltip(_('raw diff'))}"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>
                   <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='download')}" class="tooltip" title="${h.tooltip(_('download diff'))}"><img class="icon" src="${h.url('/images/icons/page_save.png')}"/></a>
                   ${c.ignorews_url(request.GET, h.FID(cs2,path))}
                   ${c.context_url(request.GET, h.FID(cs2,path))}
                 </div>
                 <span style="float:right;margin-top:-3px">
                   <label>
                   ${_('show inline comments')}
                   ${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=h.FID(cs2,path))}
                   </label>
                 </span>
             </div>
         </div>
         <div class="code-body">
             <div class="full_f_path" path="${h.safe_unicode(path)}"></div>
             ${diff|n}
         </div>
     </div>
     ##%endif
 %endfor
+</div>
 </%def>
 <%def name="diff_block_simple(change)">
   %for op,filenode_path,diff in change:
     <div id="${h.FID('',filenode_path)}_target" style="clear:both;margin-top:25px"></div>
     <div id="${h.FID('',filenode_path)}" class="diffblock  margined comm">
       <div class="code-header">
           <div class="changeset_header">
               <div class="changeset_file">
                   ${h.safe_unicode(filenode_path)} |
                   <a class="spantag" href="${h.url('files_home', repo_name=c.repo_name, f_path=filenode_path, revision=c.org_ref)}" title="${_('show file at latest version in this repo')}">${c.org_ref_type}@${h.short_id(c.org_ref) if c.org_ref_type=='rev' else c.org_ref}</a> -&gt;
                   <a class="spantag" href="${h.url('files_home', repo_name=c.repo_name, f_path=filenode_path, revision=c.other_ref)}" title="${_('show file at initial version in this repo')}">${c.other_ref_type}@${h.short_id(c.other_ref) if c.other_ref_type=='rev' else c.other_ref}</a>
               </div>
           </div>
       </div>
         <div class="code-body">
             <div class="full_f_path" path="${h.safe_unicode(filenode_path)}"></div>
             ${diff|n}
         </div>
     </div>
   %endfor
 </%def>

0 comments (0 inline, 0 general)