Changeset - b702d0d4b030
[Not reviewed]
beta
0 7 0
Marcin Kuzminski - 14 years ago 2011-11-19 20:37:54
marcin@python-works.com
fixed inline comment indicator.
- templates cleanup
7 files changed with 16 insertions and 15 deletions:
0 comments (0 inline, 0 general)
rhodecode/public/css/diff.css
Show inline comments
 
@@ -135,7 +135,8 @@ cursor: pointer;
 
	padding:0;
 
	margin:0;
 
}
 
.line:hover{
 

	
 
.diffblock.margined.comm .line:hover{
 
    background-color:#FFFFCC !important;
 
    cursor: pointer !important;
 
    background-image:url("../images/icons/comment_add.png") !important;
rhodecode/templates/admin/repos/repo_edit_perms.html
Show inline comments
 
@@ -16,7 +16,7 @@
 
                    ${_('private repository')}
 
                    </span>
 
                </td>
 
                <td class="private_repo_msg"><img style="vertical-align:bottom" src="${h.url("/images/icons/user.png")}"/>${r2p.user.username}</td>
 
                <td class="private_repo_msg"><img style="vertical-align:bottom" src="${h.url('/images/icons/user.png')}"/>${r2p.user.username}</td>
 
            </tr>
 
        %else:
 
        <tr id="id${id(r2p.user.username)}">
rhodecode/templates/admin/repos/repos.html
Show inline comments
 
@@ -58,7 +58,7 @@
 
	            	<a href="${h.url('summary_home',repo_name=repo['dbrepo_fork']['repo_name'])}">
 
	            	<img class="icon" alt="${_('public')}"
 
	            	title="${_('Fork of')} ${repo['dbrepo_fork']['repo_name']}" 
 
	            	src="${h.url("/images/icons/arrow_divide.png")}"/></a>
 
	            	src="${h.url('/images/icons/arrow_divide.png')}"/></a>
 
	            %endif                
 
                </td>
 
				<td title="${repo['description']}">${h.truncate(repo['description'],60)}</td>
rhodecode/templates/admin/users/user_edit_my_account.html
Show inline comments
 
@@ -138,16 +138,16 @@
 
		        <tr>
 
		            <td>
 
                     %if repo['dbrepo']['repo_type'] =='hg':
 
                       <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="${h.url("/images/icons/hgicon.png")}"/>
 
                       <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="${h.url('/images/icons/hgicon.png')}"/>
 
                     %elif repo['dbrepo']['repo_type'] =='git':
 
                       <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="${h.url("/images/icons/giticon.png")}"/>
 
                       <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="${h.url('/images/icons/giticon.png')}"/>
 
                     %else:
 
                       
 
                     %endif 		            
 
		             %if repo['dbrepo']['private']:
 
		                <img class="icon" alt="${_('private')}" src="${h.url("/images/icons/lock.png")}"/>
 
		                <img class="icon" alt="${_('private')}" src="${h.url('/images/icons/lock.png')}"/>
 
		             %else:
 
		                <img class="icon" alt="${_('public')}" src="${h.url("/images/icons/lock_open.png")}"/>
 
		                <img class="icon" alt="${_('public')}" src="${h.url('/images/icons/lock_open.png')}"/>
 
		             %endif
 
		                                             
 
		            ${h.link_to(repo['name'], h.url('summary_home',repo_name=repo['name']),class_="repo_name")}
rhodecode/templates/admin/users_groups/users_group_edit.html
Show inline comments
 
@@ -59,23 +59,23 @@
 
	                                            ${h.select('users_group_members',[x[0] for x in c.group_members],c.group_members,multiple=True,size=8,style="min-width:210px")}
 
	                                           <div  id="remove_all_elements" style="cursor:pointer;text-align:center">
 
	                                               ${_('Remove all elements')}
 
	                                               <img alt="remove" style="vertical-align:text-bottom" src="${h.url("/images/icons/arrow_right.png")}"/>
 
	                                               <img alt="remove" style="vertical-align:text-bottom" src="${h.url('/images/icons/arrow_right.png')}"/>
 
	                                           </div>
 
	                                        </div>
 
	                                        <div style="float:left;width:20px;padding-top:50px">
 
	                                            <img alt="add" id="add_element" 
 
	                                                style="padding:2px;cursor:pointer" 
 
	                                                src="${h.url("/images/icons/arrow_left.png")}"/>
 
	                                                src="${h.url('/images/icons/arrow_left.png')}"/>
 
	                                            <br />
 
	                                            <img alt="remove" id="remove_element" 
 
	                                                style="padding:2px;cursor:pointer" 
 
	                                                src="${h.url("/images/icons/arrow_right.png")}"/>
 
	                                                src="${h.url('/images/icons/arrow_right.png')}"/>
 
	                                        </div>
 
	                                        <div style="float:left">
 
	                                             <div class="text" style="padding: 0px 0px 6px;">${_('Available members')}</div>
 
	                                             ${h.select('available_members',[],c.available_members,multiple=True,size=8,style="min-width:210px")}
 
	                                             <div id="add_all_elements" style="cursor:pointer;text-align:center">
 
	                                                   <img alt="add" style="vertical-align:text-bottom" src="${h.url("/images/icons/arrow_left.png")}"/>
 
	                                                   <img alt="add" style="vertical-align:text-bottom" src="${h.url('/images/icons/arrow_left.png')}"/>
 
	                                                    ${_('Add all elements')}
 
	                                             </div>	                                        
 
	                                        </div>
rhodecode/templates/changeset/changeset.html
Show inline comments
 
@@ -119,7 +119,7 @@
 
	%for change,filenode,diff,cs1,cs2,stat in c.changes:
 
		%if change !='removed':
 
		<div style="clear:both;height:10px"></div>
 
		<div class="diffblock  margined" id="${self.fid(filenode.changeset.raw_id,filenode.path)}">
 
		<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">
rhodecode/templates/journal/journal.html
Show inline comments
 
@@ -38,7 +38,7 @@
 
		    %for entry in c.following:
 
		        <div class="currently_following">
 
		            %if entry.follows_user_id:
 
		              <img title="${_('following user')}" alt="${_('user')}" src="${h.url("/images/icons/user.png")}"/>
 
		              <img title="${_('following user')}" alt="${_('user')}" src="${h.url('/images/icons/user.png')}"/>
 
		              ${entry.follows_user.full_contact}
 
		            %endif
 
		            
 
@@ -50,9 +50,9 @@
 
                      </span>		            
 
		              </div>
 
		              %if entry.follows_repository.private:
 
		                <img class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="${h.url("/images/icons/lock.png")}"/>
 
		                <img class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="${h.url('/images/icons/lock.png')}"/>
 
		              %else:
 
		                <img class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="${h.url("/images/icons/lock_open.png")}"/>
 
		                <img class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="${h.url('/images/icons/lock_open.png')}"/>
 
		              %endif
 
		              
 
		              ${h.link_to(entry.follows_repository.repo_name,h.url('summary_home',
0 comments (0 inline, 0 general)