kallithea Changeset - 74bbfdd47884

Changeset - 74bbfdd47884

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 15 years ago 2010-11-03 16:09:12
marcin@python-works.com

Small fixes for style.
Added scm type for changeset.
Fixed raw changeset

4 files changed with 11 insertions and 7 deletions:

rhodecode/controllers/changeset.py

rhodecode/public/css/style.css

rhodecode/templates/changelog/changelog.html

rhodecode/templates/changeset/raw_changeset.html

0 comments (0 inline, 0 general)

rhodecode/controllers/changeset.py

➞

Show inline comments

@@ @@ -126,25 +126,27 @@ class ChangesetController(BaseController @@
             # REMOVED FILES
             #===================================================================
             for node in c.changeset.removed:
                 c.changes.append(('removed', node, None, None, None))
         return render('changeset/changeset.html')
     def raw_changeset(self, revision):
         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'))
         else:
             try:
                 c.changeset_old = c.changeset.parents[0]
             except IndexError:
                 c.changeset_old = None
             c.changes = []
             for node in c.changeset.added:
                 filenode_old = FileNode(node.path, '')

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -2303,17 +2303,19 @@ padding-left:5px; @@
 font-weight:700;
 padding-top: 5px;
 padding-bottom:5px;
+}
 div#legend_container table td,div#legend_choices table td {
 border:none !important;
 height:20px !important;
 padding:0 !important;
+}
 #q_filter{
-border: 0px;
+border:0 none;
 color:#CDCDCD;
 padding-left:3px
 margin-bottom:-4px;
 margin-top:-4px;
 padding-left:3px;
+}

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -37,48 +37,48 @@ ${c.repo_name} ${_('Changelog')} - ${c.r @@
         <div class="info_box">
           <span>${_('Show')}:</span>
           ${h.text('size',size=1,value=c.size)}
           <span>${_('revisions')}</span>
           ${h.submit('set',_('set'))}
         </div>
         ${h.end_form()}
 					</div>
 				%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)}"/>
 								</div>
 								<span>${h.person(cs.author)}</span><br/>
 								<span><a href="mailto:${h.email_or_none(cs.author)}">${h.email_or_none(cs.author)}</a></span><br/>
 							</div>
 							<div class="message">${h.link_to(h.wrap_paragraphs(cs.message),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
 						</div>
 						<div class="right">
 									<div class="changes">
 										<span class="removed" title="${_('removed')}">${len(cs.removed)}</span>
 										<span class="changed" title="${_('changed')}">${len(cs.changed)}</span>
 										<span class="added" title="${_('added')}">${len(cs.added)}</span>
 									</div>
 										%if len(cs.parents)>1:
 										<div class="merge">
 											${_('merge')}<img alt="merge" src="/images/icons/arrow_join.png"/>
 										</div>
 										%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
 								   %else:
                                         <div class="parent">${_('No parents')}</div>
                                    %endif
 								<span class="logtags">
 									<span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
 									${h.link_to(cs.branch,h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
 									%for tag in cs.tags:
 										<span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">

rhodecode/templates/changeset/raw_changeset.html

➞

Show inline comments

 # 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}
 ${c.diffs|n}
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)