diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css --- a/rhodecode/public/css/style.css +++ b/rhodecode/public/css/style.css @@ -1945,7 +1945,7 @@ padding:2px 2px 0; } #header,#content,#footer { -min-width:1224px; +min-width:1024px; } #content { diff --git a/rhodecode/templates/admin/repos/repos.html b/rhodecode/templates/admin/repos/repos.html --- a/rhodecode/templates/admin/repos/repos.html +++ b/rhodecode/templates/admin/repos/repos.html @@ -37,6 +37,16 @@ %for cnt,repo in enumerate(c.repos_list): + ## TYPE OF REPO + %if repo['repo'].dbrepo.repo_type =='hg': + ${_('Mercurial repository')} + %elif repo['repo'].dbrepo.repo_type =='git': + ${_('Git repository')} + %else: + + %endif + + ## PRIVATE/PUBLIC REPO %if repo['repo'].dbrepo.private: ${_('private')} %else: @@ -55,7 +65,7 @@ ${h.age(repo['last_change'])} %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']))} diff --git a/rhodecode/templates/admin/users/user_edit_my_account.html b/rhodecode/templates/admin/users/user_edit_my_account.html --- a/rhodecode/templates/admin/users/user_edit_my_account.html +++ b/rhodecode/templates/admin/users/user_edit_my_account.html @@ -89,6 +89,12 @@
+ + + + + + %if c.user_repos: %for repo in c.user_repos: @@ -115,12 +121,11 @@ src="/images/icons/arrow_divide.png"/> %endif - - - + + diff --git a/rhodecode/templates/files/files_annotate.html b/rhodecode/templates/files/files_annotate.html --- a/rhodecode/templates/files/files_annotate.html +++ b/rhodecode/templates/files/files_annotate.html @@ -9,7 +9,7 @@ » ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} » - ${_('annotate')} @ R${c.rev_nr}:${c.cur_rev} + ${_('annotate')} @ R${c.cs.revision}:${h.short_id(c.cs.raw_id)} <%def name="page_nav()"> @@ -20,13 +20,18 @@
${self.breadcrumbs()} +
-

${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cur_rev,c.file.path)}

+

${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cs.revision,c.file.path)}

${_('Last revision')}
-
${h.link_to("r%s:%s" % (c.file.last_changeset.revision,c.file.last_changeset.raw_id), +
${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))}
${_('Size')}
${h.format_byte_size(c.file.size,binary=True)}
@@ -34,24 +39,35 @@
${c.file.mimetype}
${_('Options')}
${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))} -
+ h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.revision,f_path=c.f_path))} + +
${_('History')}
+
+
+ ${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()} +
+
-
${c.file.name}@r${c.file.last_changeset.revision}:${c.file.last_changeset.raw_id}
-
"${c.file_msg}"
+
${c.file.name}@r${c.file.last_changeset.revision}:${h.short_id(c.file.last_changeset.raw_id)}
+
"${c.file.message}"
% 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
diff --git a/rhodecode/templates/summary/summary.html b/rhodecode/templates/summary/summary.html --- a/rhodecode/templates/summary/summary.html +++ b/rhodecode/templates/summary/summary.html @@ -204,9 +204,9 @@ E.onDOMReady(function(e){
-
+
-
+
${_('Name')}${_('revision')}${_('action')}
${_('revision')}: ${h.get_changeset_safe(repo,'tip').revision}${_('last changed')}: ${h.age(repo.last_change)}${_('private')} ${h.link_to(_('edit'),h.url('repo_settings_home',repo_name=repo.name))}${("r%s:%s") % (h.get_changeset_safe(repo,'tip').revision,h.short_id(h.get_changeset_safe(repo,'tip').raw_id))}${_('private')} ${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()}