Changeset - fb423ee576e8
Parent rev.
Child rev.
[Not reviewed]
beta
0 2 0
Marcin Kuzminski - 14 years ago 2011-12-10 13:49:12
marcin@python-works.com
changed links with diff options into a pop-up menu. Saves space on long filenames and looks better
2 files changed with 59 insertions and 19 deletions:
rhodecode/public/css/style.css
35
11
rhodecode/templates/changeset/changeset.html
24
8
0 comments (0 inline, 0 general)
rhodecode/public/css/style.css
➞
Show inline comments
 
@@ -2220,61 +2220,85 @@ table.code-browser {
 
table.code-browser tr {
 
	margin: 3px;
 
}
 
 
table.code-browser thead th {
 
	background-color: #EEE;
 
	height: 20px;
 
	font-size: 1.1em;
 
	font-weight: 700;
 
	text-align: left;
 
	padding-left: 10px;
 
}
 
 
table.code-browser tbody td {
 
	padding-left: 10px;
 
	height: 20px;
 
}
 
 
table.code-browser .browser-file {
 
	background: url("../images/icons/document_16.png") no-repeat scroll 3px;
 
	height: 16px;
 
	padding-left: 20px;
 
	text-align: left;
 
}
 
 
.diffblock .changeset_header {
 
    height: 16px;
 
}
 
.diffblock .changeset_file {
 
	background: url("../images/icons/file.png") no-repeat scroll 3px;
 
	height: 16px;
 
	padding-left: 22px;
 
	text-align: left;
 
	font-size: 14px;
 
}
 
 
.diffblock .changeset_header {
 
	margin-left: 6px !important;
 
}
 
 
	float: left;
 
	padding: 2px 0px 2px 22px;
 
}
 
.diffblock .diff-menu-wrapper{
 
	float: left;
 
}
 
 
.diffblock .changeset_header .diff-menu{
 
    position: absolute;
 
    background: none repeat scroll 0 0 #FFFFFF;
 
    border-color: #003367 #666666 #666666;
 
    border-right: 1px solid #666666;
 
    border-style: solid solid solid;
 
    border-width: 1px;
 
    box-shadow: 2px 8px 4px rgba(0, 0, 0, 0.2);
 
    margin-top:5px;
 
    margin-left:1px;
 
 
}
 
 
.diffblock .changeset_header .diff-menu ul li {
 
	padding: 0px 0px 0px 0px !important;
 
}
 
.diffblock .changeset_header .diff-menu ul li a{
 
	display: block;
 
	padding: 3px 8px 3px 8px !important;
 
}
 
.diffblock .changeset_header .diff-menu ul li a:hover{
 
    text-decoration: none;
 
    background-color: #EEEEEE;
 
}
 
table.code-browser .browser-dir {
 
	background: url("../images/icons/folder_16.png") no-repeat scroll 3px;
 
	height: 16px;
 
	padding-left: 20px;
 
	text-align: left;
 
}
 
 
.box .search {
 
	clear: both;
 
	overflow: hidden;
 
	margin: 0;
 
	padding: 0 20px 10px;
 
}
 
 
.box .search div.search_path {
 
	background: none repeat scroll 0 0 #EEE;
 
	border: 1px solid #CCC;
 
	color: blue;
 
	margin-bottom: 10px;
 
	padding: 10px 0;
 
}
 
 
.box .search div.search_path div.link {
 
	font-weight: 700;
 
@@ -3646,49 +3670,49 @@ form.comment-inline-form {
 
******************************************************************************/
 
 
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;
 
}
 
div.diffblock .code-header div{
 
    margin-left:10px;
 
    margin-left:4px;
 
    font-weight: bold;
 
    font-size: 14px;
 
}
 
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;
 
}
 
table.code-difftable .context{
 
    background:none repeat scroll 0 0 #DDE7EF;
 
}
 
table.code-difftable .add{
rhodecode/templates/changeset/changeset.html
➞
Show inline comments
 
@@ -101,58 +101,62 @@
 
                            <div class="node">
 
                            %if change != 'removed':
 
                                ${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=self.fid(filenode.changeset.raw_id,filenode.path)))}
 
                            %else:
 
                                ${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=self.fid('',filenode.path)))}
 
                            %endif
 
                            </div>
 
		                    <div class="changes">${h.fancy_file_stats(stat)}</div>
 
	                    </div>
 
	                %endfor
 
	                % if c.cut_off:
 
	                  ${_('Changeset was too big and was cut off...')}
 
	                % endif
 
	        </div>
 
	    </div>
 
 
    </div>
 
 
	%for change,filenode,diff,cs1,cs2,stat in c.changes:
 
		%if change !='removed':
 
		<div style="clear:both;height:10px"></div>
 
		<div class="diffblock  margined comm" id="${self.fid(filenode.changeset.raw_id,filenode.path)}">
 
			<div class="code-header">
 
				<div class="changeset_header">
 
					<span class="changeset_file">
 
					<div class="changeset_file">
 
						${h.link_to_if(change!='removed',h.safe_unicode(filenode.path),h.url('files_home',repo_name=c.repo_name,
 
						revision=filenode.changeset.raw_id,f_path=h.safe_unicode(filenode.path)))}
 
					</span>
 
					&raquo; <span>${h.link_to(_('diff'),
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff'))}</span>
 
					&raquo; <span>${h.link_to(_('raw diff'),
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw'))}</span>
 
					&raquo; <span>${h.link_to(_('download diff'),
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download'))}</span>
 
					</div>
 
                    <div class="diff-menu-wrapper">
 
                        <img class="diff-menu-activate" style="margin-bottom:-6px;cursor: pointer" alt="diff-menu" src="${h.url('/images/icons/script_gear.png')}" />
 
                        <div class="diff-menu" style="display:none">
 
                            <ul>
 
                              <li>${h.link_to(_('diff'),h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff'))}</li>
 
                              <li>${h.link_to(_('raw diff'),h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw'))}</li>
 
                              <li>${h.link_to(_('download diff'),h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download'))}</li>
 
                            </ul>
 
                        </div>
 
                    </div>
 
                    <span style="float:right;margin-top:-3px">
 
                      <label>
 
                      ${_('show inline comments')}
 
                      ${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=self.fid(filenode.changeset.raw_id,filenode.path))}
 
                      </label>
 
                    </span>
 
				</div>
 
			</div>
 
			<div class="code-body">
 
                <div class="full_f_path" path="${filenode.path}"></div>
 
				%if diff:
 
					${diff|n}
 
				%else:
 
					${_('No changes in this file')}
 
				%endif
 
			</div>
 
		</div>
 
		%endif
 
	%endfor
 
 
    <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
 
    ## template for inline comment form
 
    ${comment.comment_inline_form()}
 
 
@@ -185,48 +189,60 @@
 
                </div>
 
                    ${h.textarea('text')}
 
            </div>
 
            <div class="comment-button">
 
            ${h.submit('save', _('Comment'), class_='ui-button')}
 
            </div>
 
            ${h.end_form()}
 
        </div>
 
        %endif
 
    </div>
 
    <script type="text/javascript">
 
      var deleteComment = function(comment_id){
 

			




	
	
	
		
 
          var url = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}".replace('__COMMENT_ID__',comment_id);

			




	
	
	
		
 
          var postData = '_method=delete';

			




	
	
	
		
 
          var success = function(o){

			




	
	
	
		
 
              var n = YUD.get('comment-'+comment_id);

			




	
	
	
		
 
              n.parentNode.removeChild(n);

			




	
	
	
		
 
          }

			




	
	
	
		
 
          ajaxPOST(url,postData,success);

			




	
	
	
		
 
      }

			




	
	
	
		
 

			




	
	
	
		
 
      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','');

			




	
	
	
		
 
              }

			




	
	
	
		
 
          });

			




	
	
	
		
 
              	  

			




	
	
	
		
 
    	  YUE.on(YUQ('.show-inline-comments'),'change',function(e){

			




	
	
	
		
 
    		  var show = 'none';

			




	
	
	
		
 
    		  var target = e.currentTarget;

			




	
	
	
		
 
    		  if(target.checked){

			




	
	
	
		
 
    			  var show = ''

			




	
	
	
		
 
    		  }

			




	
	
	
		
 
    		  var boxid = YUD.getAttribute(target,'id_for');

			




	
	
	
		
 
    		  var comments = YUQ('#{0} .inline-comments'.format(boxid));

			




	
	
	
		
 
    		  for(c in comments){ 

			




	
	
	
		
 
    		     YUD.setStyle(comments[c],'display',show);

			




	
	
	
		
 
    		  }

			




	
	
	
		
 
    		  var btns = YUQ('#{0} .inline-comments-button'.format(boxid));

			




	
	
	
		
 
              for(c in btns){ 

			




	
	
	
		
 
                  YUD.setStyle(btns[c],'display',show);

			




	
	
	
		
 
               }    		  

			




	
	
	
		
 
    	  })

			




	
	
	
		
 
          

			




	
	
	
		
 
          YUE.on(YUQ('.line'),'click',function(e){

			




	
	
	
		
 
        	  var tr = e.currentTarget;

			




	
	
	
		
 
        	  injectInlineForm(tr);

			




	
	
	
		
 
          });

			




	
	
	
		
 
          

			




	
	
	
		
 
          // inject comments into they proper positions

			




	
	
	
		
 
          var file_comments = YUQ('.inline-comment-placeholder');

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.