Mercurial > kallithea

changeset 663:6199b34d349b beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed html templates, fixed overal rhodecode width to 1024pixels various additional to templates. History for annotation, width for my page, repo types for admin panel repositories
author Marcin Kuzminski <marcin@python-works.com>
date Sat, 06 Nov 2010 16:16:44 +0100
parents 373ee7031003
children 50d9b1afaca7
files rhodecode/public/css/style.css rhodecode/templates/admin/repos/repos.html rhodecode/templates/admin/users/user_edit_my_account.html rhodecode/templates/files/files_annotate.html rhodecode/templates/summary/summary.html
diffstat 5 files changed, 49 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/public/css/style.css	Sat Nov 06 16:14:49 2010 +0100
+++ b/rhodecode/public/css/style.css	Sat Nov 06 16:16:44 2010 +0100
@@ -1945,7 +1945,7 @@
 }
 
 #header,#content,#footer {
-min-width:1224px;
+min-width:1024px;
 }
 
 #content {
--- a/rhodecode/templates/admin/repos/repos.html	Sat Nov 06 16:14:49 2010 +0100
+++ b/rhodecode/templates/admin/repos/repos.html	Sat Nov 06 16:16:44 2010 +0100
@@ -37,6 +37,16 @@
             %for cnt,repo in enumerate(c.repos_list):
             <tr class="parity${cnt%2}">
                  <td>
+                 ## TYPE OF REPO
+                 %if repo['repo'].dbrepo.repo_type =='hg':
+                   <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="/images/icons/hgicon.png"/>
+                 %elif repo['repo'].dbrepo.repo_type =='git':
+                   <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="/images/icons/giticon.png"/>
+                 %else:
+                   
+                 %endif
+                 
+                 ## PRIVATE/PUBLIC REPO                  
                  %if repo['repo'].dbrepo.private:
                     <img alt="${_('private')}" src="/images/icons/lock.png"/>
                  %else:
@@ -55,7 +65,7 @@
 	            <td>${h.age(repo['last_change'])}</td>
 	            <td>
 	            	%if repo['rev']>=0:
-	            	${h.link_to('r%s:%s' % (repo['rev'],repo['tip']),
+	            	${h.link_to('r%s:%s' % (repo['rev'],h.short_id(repo['tip'])),
 	                h.url('changeset_home',repo_name=repo['name'],revision=repo['tip']),
 	                class_="tooltip",
 	                tooltip_title=h.tooltip(repo['last_msg']))}
--- a/rhodecode/templates/admin/users/user_edit_my_account.html	Sat Nov 06 16:14:49 2010 +0100
+++ b/rhodecode/templates/admin/users/user_edit_my_account.html	Sat Nov 06 16:16:44 2010 +0100
@@ -89,6 +89,12 @@
     <!-- end box / title -->
     <div class="table">
 	    <table>
+	    <thead>
+            <tr>
+            <th class="left">${_('Name')}</th>
+            <th class="left">${_('revision')}</th>
+            <th colspan="2" class="left">${_('action')}</th>            
+	    </thead>
 	     <tbody>
 	     %if c.user_repos:
 		     %for repo in c.user_repos:
@@ -115,12 +121,11 @@
 		            	src="/images/icons/arrow_divide.png"/></a>
 		            %endif		            
 		            </td> 
-		            <td>${_('revision')}: ${h.get_changeset_safe(repo,'tip').revision}</td>
-		            <td><span class="tooltip" tooltip_title="${repo.last_change}">${_('last changed')}: ${h.age(repo.last_change)}</span></td>
-		            <td><img class="icon" alt="${_('private')}" src="/images/icons/application_form_edit.png"/> ${h.link_to(_('edit'),h.url('repo_settings_home',repo_name=repo.name))}</td>
+		            <td><span class="tooltip" tooltip_title="${repo.last_change}">${("r%s:%s") % (h.get_changeset_safe(repo,'tip').revision,h.short_id(h.get_changeset_safe(repo,'tip').raw_id))}</span></td>
+		            <td><a href="${h.url('repo_settings_home',repo_name=repo.name)}" title="${_('edit')}"><img class="icon" alt="${_('private')}" src="/images/icons/application_form_edit.png"/></a></td>
 		            <td>
 	                  ${h.form(url('repo_settings_delete', repo_name=repo.name),method='delete')}
-	                    ${h.submit('remove_%s' % repo.name,'delete',class_="delete_icon action_button",onclick="return confirm('Confirm to delete this repository');")}
+	                    ${h.submit('remove_%s' % repo.name,'',class_="delete_icon action_button",onclick="return confirm('Confirm to delete this repository');")}
 	                  ${h.end_form()}	            
 		            </td>
 		        </tr>
--- a/rhodecode/templates/files/files_annotate.html	Sat Nov 06 16:14:49 2010 +0100
+++ b/rhodecode/templates/files/files_annotate.html	Sat Nov 06 16:16:44 2010 +0100
@@ -9,7 +9,7 @@
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
-    ${_('annotate')} @ R${c.rev_nr}:${c.cur_rev}
+    ${_('annotate')} @ R${c.cs.revision}:${h.short_id(c.cs.raw_id)}
 </%def>
 
 <%def name="page_nav()">
@@ -20,13 +20,18 @@
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
+        <ul class="links">
+            <li>
+              <span style="text-transform: uppercase;"><a href="#">${_('branch')}: ${c.cs.branch}</a></span>
+            </li>          
+        </ul>          
     </div>
     <div class="table">
 		<div id="files_data">
-			<h3 class="files_location">${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cur_rev,c.file.path)}</h3>
+			<h3 class="files_location">${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cs.revision,c.file.path)}</h3>
 			<dl class="overview">
 				<dt>${_('Last revision')}</dt>
-				<dd>${h.link_to("r%s:%s" % (c.file.last_changeset.revision,c.file.last_changeset.raw_id),
+				<dd>${h.link_to("r%s:%s" % (c.file.last_changeset.revision,h.short_id(c.file.last_changeset.raw_id)),
 						h.url('files_annotate_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id,f_path=c.f_path))} </dd>
 				<dt>${_('Size')}</dt>
 				<dd>${h.format_byte_size(c.file.size,binary=True)}</dd>
@@ -34,24 +39,35 @@
 				<dd>${c.file.mimetype}</dd>				
 				<dt>${_('Options')}</dt>
 				<dd>${h.link_to(_('show source'),
-						h.url('files_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.f_path))}  
+						h.url('files_home',repo_name=c.repo_name,revision=c.cs.revision,f_path=c.f_path))}  
 					/ ${h.link_to(_('show as raw'),
-						h.url('files_raw_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.f_path))}
+						h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.revision,f_path=c.f_path))}
 					/ ${h.link_to(_('download as raw'),
-						h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.f_path))}
-				</dd>				
+						h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.revision,f_path=c.f_path))}
+				</dd>
+			    <dt>${_('History')}</dt>
+			    <dd>
+			        <div>
+			        ${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}
+			        ${h.hidden('diff2',c.file.last_changeset.raw_id)}
+			        ${h.select('diff1',c.file.last_changeset.raw_id,c.file_history)}
+			        ${h.submit('diff','diff to revision',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+			        ${h.submit('show_rev','show at revision',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+			        ${h.end_form()}
+			        </div>
+			    </dd>					
 			</dl>
 			<div id="body" class="codeblock">
 				<div class="code-header">
-					<div class="revision">${c.file.name}@r${c.file.last_changeset.revision}:${c.file.last_changeset.raw_id}</div>
-					<div class="commit">"${c.file_msg}"</div>
+					<div class="revision">${c.file.name}@r${c.file.last_changeset.revision}:${h.short_id(c.file.last_changeset.raw_id)}</div>
+					<div class="commit">"${c.file.message}"</div>
 				</div>
 				<div class="code-body">
 					% if c.file.size < c.file_size_limit:
 						${h.pygmentize_annotation(c.file,linenos=True,anchorlinenos=True,lineanchors='S',cssclass="code-highlight")}
 					%else:
 						${_('File is to big to display')} ${h.link_to(_('show as raw'),
-						h.url('files_raw_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.f_path))}
+						h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.revision,f_path=c.f_path))}
 					%endif				
 				</div>
 			</div>
--- a/rhodecode/templates/summary/summary.html	Sat Nov 06 16:14:49 2010 +0100
+++ b/rhodecode/templates/summary/summary.html	Sat Nov 06 16:16:44 2010 +0100
@@ -204,9 +204,9 @@
     </div>
     
     <div class="table">
-        <div id="commit_history" style="width:560px;height:300px;float:left"></div>
+        <div id="commit_history" style="width:460px;height:300px;float:left"></div>
         <div style="clear: both;height: 10px"></div>
-        <div id="overview" style="width:560px;height:100px;float:left"></div>
+        <div id="overview" style="width:460px;height:100px;float:left"></div>
         
     	<div id="legend_data" style="clear:both;margin-top:10px;">
 	    	<div id="legend_container"></div>