Mercurial > kallithea

changeset 1706:07c8838ebfd3 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui fixes
author Marcin Kuzminski <marcin@python-works.com>
date Mon, 21 Nov 2011 00:56:59 +0200
parents 5e4827a8e942
children 54fda6ce9e98
files rhodecode/public/css/style.css rhodecode/templates/admin/settings/settings.html rhodecode/templates/base/base.html rhodecode/templates/branches/branches_data.html rhodecode/templates/shortlog/shortlog_data.html rhodecode/templates/tags/tags_data.html
diffstat 6 files changed, 19 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/public/css/style.css	Mon Nov 21 00:29:14 2011 +0200
+++ b/rhodecode/public/css/style.css	Mon Nov 21 00:56:59 2011 +0200
@@ -2658,6 +2658,10 @@
 	padding: 3px 3px 3px 3px;
 }
 
+input.ui-button-small.xsmall,.ui-button-small.xsmall{
+    padding: 1px 2px 1px 1px;
+}
+
 input.ui-button-small:hover,.ui-button-small:hover {
 	background: #b4b4b4 url("../images/button_selected.png") repeat-x
 		!important;
@@ -3467,7 +3471,7 @@
     -moz-border-radius: 4px;
     border-radius: 4px;
     text-align: center;
-    margin: -1px -10px 0px 5px;
+    margin: 0px -10px 0px 5px;
     background-color: #DEDEDE;
 }
 .notifications a{
--- a/rhodecode/templates/admin/settings/settings.html	Mon Nov 21 00:29:14 2011 +0200
+++ b/rhodecode/templates/admin/settings/settings.html	Mon Nov 21 00:56:59 2011 +0200
@@ -138,9 +138,6 @@
                 <div class="label label-checkbox">
                     <label>${_('Hooks')}:</label>
                 </div>
-                <div class="input">
-                    ${h.link_to(_('advanced setup'),url('admin_edit_setting',setting_id='hooks'))}
-                </div>                
                 <div class="checkboxes">
 					<div class="checkbox">
 						${h.checkbox('hooks_changegroup_update','True')}
@@ -159,8 +156,10 @@
                         <label for="hooks_preoutgoing_pull_logger">${_('Log user pull commands')}</label>
                     </div>                    										
 				</div>
+                <div class="input" style="margin-top:10px">
+                    ${h.link_to(_('advanced setup'),url('admin_edit_setting',setting_id='hooks'),class_="ui-button-small")}
+                </div>         
              </div>	
-							                          
             <div class="field">
                 <div class="label">
                     <label for="paths_root_path">${_('Repositories location')}:</label>
--- a/rhodecode/templates/base/base.html	Mon Nov 21 00:29:14 2011 +0200
+++ b/rhodecode/templates/base/base.html	Mon Nov 21 00:56:59 2011 +0200
@@ -49,7 +49,9 @@
           %if c.rhodecode_user.username == 'default':
               <a href="${h.url('public_journal')}">${_('Public journal')}</a>   
           %else:                        		            
-          	${h.link_to(c.rhodecode_user.username,h.url('admin_settings_my_account'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))}
+          	<div style="float: left">
+            ${h.link_to(c.rhodecode_user.username,h.url('admin_settings_my_account'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))}
+            </div>
             <div class="notifications">
             <a href="${h.url('admin_settings_notifications')}">${c.unread_notifications}</a>
             </div>
--- a/rhodecode/templates/branches/branches_data.html	Mon Nov 21 00:29:14 2011 +0200
+++ b/rhodecode/templates/branches/branches_data.html	Mon Nov 21 00:56:59 2011 +0200
@@ -20,9 +20,9 @@
             <td title="${branch[1].author}">${h.person(branch[1].author)}</td>
             <td>r${branch[1].revision}:${h.short_id(branch[1].raw_id)}</td>
             <td class="nowrap">
-            ${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id),class_="ui-button-small")}
+            ${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id),class_="ui-button-small xsmall")}
             <span style="color:#515151">|</span>
-            ${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id),class_="ui-button-small")}
+            ${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id),class_="ui-button-small xsmall")}
             </td>
 		</tr>	
 		%endfor
@@ -40,9 +40,9 @@
               <td title="${branch[1].author}">${h.person(branch[1].author)}</td>
               <td>r${branch[1].revision}:${h.short_id(branch[1].raw_id)}</td>
               <td class="nowrap">
-              ${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id),class_="ui-button-small")}
+              ${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id),class_="ui-button-small xsmall")}
               <span style="color:#515151">|</span>
-              ${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id),class_="ui-button-small")}
+              ${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id),class_="ui-button-small xsmall")}
               </td>
           </tr>   
           %endfor
--- a/rhodecode/templates/shortlog/shortlog_data.html	Mon Nov 21 00:29:14 2011 +0200
+++ b/rhodecode/templates/shortlog/shortlog_data.html	Mon Nov 21 00:56:59 2011 +0200
@@ -36,9 +36,9 @@
 			</span>
 		</td>
 		<td class="nowrap">
-		${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id),class_="ui-button-small")}
+		${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id),class_="ui-button-small xsmall")}
 		<span style="color:#515151">|</span>
-		${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id),class_="ui-button-small")}
+		${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id),class_="ui-button-small xsmall")}
 		</td>
 	</tr>
 %endfor
--- a/rhodecode/templates/tags/tags_data.html	Mon Nov 21 00:29:14 2011 +0200
+++ b/rhodecode/templates/tags/tags_data.html	Mon Nov 21 00:56:59 2011 +0200
@@ -21,9 +21,9 @@
 	        <td title="${tag[1].author}">${h.person(tag[1].author)}</td>
 	        <td>r${tag[1].revision}:${h.short_id(tag[1].raw_id)}</td>
 			<td class="nowrap">
-			${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=tag[1].raw_id),class_="ui-button-small")}
+			${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=tag[1].raw_id),class_="ui-button-small xsmall")}
 			<span style="color:#515151">|</span>
-			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=tag[1].raw_id),class_="ui-button-small")}
+			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=tag[1].raw_id),class_="ui-button-small xsmall")}
 			</td>
 		</tr>	
 		%endfor