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

@@ @@ -241,13 +241,12 @@ 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;
@@ @@ -4636,12 +4635,29 @@ PULL REQUESTS @@
     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;

rhodecode/public/js/rhodecode.js

➞

Show inline comments

@@ @@ -2158,6 +2158,29 @@ var MultiSelectWidget = function(selecte @@
 		    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

@@ @@ -48,12 +48,14 @@ @@
                 '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>

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">
@@ @@ -34,13 +37,13 @@ @@
             <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>

0 comments (0 inline, 0 general)