Mercurial > kallithea
changeset 648:74bbfdd47884 beta
Small fixes for style.
Added scm type for changeset.
Fixed raw changeset
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Wed, 03 Nov 2010 16:09:12 +0100 |
| parents | 5e209dcd3821 |
| children | 3765f0f479a2 |
| files | rhodecode/controllers/changeset.py rhodecode/public/css/style.css rhodecode/templates/changelog/changelog.html rhodecode/templates/changeset/raw_changeset.html |
| diffstat | 4 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/changeset.py Wed Nov 03 01:48:04 2010 +0100 +++ b/rhodecode/controllers/changeset.py Wed Nov 03 16:09:12 2010 +0100 @@ -135,7 +135,9 @@ hg_model = HgModel() method = request.GET.get('diff', 'show') try: - c.changeset = hg_model.get_repo(c.repo_name).get_changeset(revision) + r = hg_model.get_repo(c.repo_name) + c.scm_type = r.alias + c.changeset = r.get_changeset(revision) except RepositoryError: log.error(traceback.format_exc()) return redirect(url('home'))
--- a/rhodecode/public/css/style.css Wed Nov 03 01:48:04 2010 +0100 +++ b/rhodecode/public/css/style.css Wed Nov 03 16:09:12 2010 +0100 @@ -2312,8 +2312,10 @@ } #q_filter{ -border: 0px; +border:0 none; color:#CDCDCD; -padding-left:3px +margin-bottom:-4px; +margin-top:-4px; +padding-left:3px; }
--- a/rhodecode/templates/changelog/changelog.html Wed Nov 03 01:48:04 2010 +0100 +++ b/rhodecode/templates/changelog/changelog.html Wed Nov 03 16:09:12 2010 +0100 @@ -46,7 +46,7 @@ %for cnt,cs in enumerate(c.pagination): <div id="chg_${cnt+1}" class="container"> <div class="left"> - <div class="date">${_('commit')} ${cs.revision}: ${cs.raw_id}@${cs.date}</div> + <div class="date">${_('commit')} ${cs.revision}: ${h.short_id(cs.raw_id)}@${cs.date}</div> <div class="author"> <div class="gravatar"> <img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),20)}"/> @@ -69,7 +69,7 @@ %endif %if cs.parents: %for p_cs in reversed(cs.parents): - <div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(p_cs.raw_id, + <div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(h.short_id(p_cs.raw_id), h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)} </div> %endfor
--- a/rhodecode/templates/changeset/raw_changeset.html Wed Nov 03 01:48:04 2010 +0100 +++ b/rhodecode/templates/changeset/raw_changeset.html Wed Nov 03 16:09:12 2010 +0100 @@ -1,6 +1,6 @@ -# c.scm_type changeset patch +# ${c.scm_type} changeset patch # User ${c.changeset.author|n} -# Date ${"%d %d" % c.changeset.date} +# Date ${c.changeset.date} # Node ID ${c.changeset.raw_id} # ${c.parent_tmpl} ${c.changeset.message}