Author: rjollos Date: Mon Dec 16 22:03:59 2013 New Revision: 1551372 URL: http://svn.apache.org/r1551372 Log: 0.8dev: Add some basic layout to the changeset page.
Modified: bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_changeset.html Modified: bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_changeset.html URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_changeset.html?rev=1551372&r1=1551371&r2=1551372&view=diff ============================================================================== --- bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_changeset.html (original) +++ bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_changeset.html Mon Dec 16 22:03:59 2013 @@ -20,8 +20,8 @@ </head> <body> - <div id="content" class="changeset"> - <div id="title" py:choose="" py:with=" + <div id="content" class="changeset row"> + <div id="title" class="span12" py:choose="" py:with=" cset_href = href.changeset(new_rev, reponame); old_cset_href = href.changeset(old_rev, reponame); log_href = href.log(reponame, new_path, rev=new_rev, stop_rev=old_rev); @@ -78,7 +78,7 @@ <form py:if="not xhr and (has_diffs or diff.options.ignoreblanklines or diff.options.ignorecase or diff.options.ignorewhitespace)" - id="prefs" action=""> + id="prefs" class="span12" action=""> <div> <py:if test="not changeset"> <input type="hidden" name="old_path" value="${'/' + pathjoin(reponame, old_path)}" /> @@ -131,69 +131,71 @@ </py:with> </py:def> - <dl id="overview"> - <py:if test="changeset"> - <dt class="property time">Timestamp:</dt> - <dd class="time" py:choose="datetime.now(utc) - changeset.date < timedelta(0, 3600)"> - ${format_datetime(changeset.date)} - <py:when test="True">(less than one hour ago)</py:when> - <py:otherwise><i18n:msg params="age">(${dateinfo(changeset.date)} ago)</i18n:msg></py:otherwise> - </dd> - <dt class="property author">Author:</dt> - <dd class="author">${authorinfo(changeset.author)}</dd> - <py:for each="prop in properties" py:choose=""> - <py:when test="prop.rendered"> - <dt py:attrs="prop.rendered.name_attributes" py:content="prop.rendered.name" /> - <dd py:attrs="prop.rendered.content_attributes" py:content="prop.rendered.content" /> - </py:when> - <py:otherwise> - <dt class="property">$prop.name:</dt> - <dd>$prop.value</dd> - </py:otherwise> - </py:for> - <dt class="property message">Message:</dt> - <dd class="message searchable" py:choose="" xml:space="preserve"> - <py:when test="not len(changeset.message.strip())"> - - </py:when> - <py:when test="wiki_format_messages"> - ${wiki_to_html(context, changeset.message, escape_newlines=True)} - </py:when> - <py:otherwise><pre>${changeset.message}</pre></py:otherwise> + <div class="span12"> + <dl id="overview"> + <py:if test="changeset"> + <dt class="property time">Timstamp:</dt> + <dd class="time" py:choose="datetime.now(utc) - changeset.date < timedelta(0, 3600)"> + ${format_datetime(changeset.date)} + <py:when test="True">(less than one hour ago)</py:when> + <py:otherwise><i18n:msg params="age">(${dateinfo(changeset.date)} ago)</i18n:msg></py:otherwise> + </dd> + <dt class="property author">Author:</dt> + <dd class="author">${authorinfo(changeset.author)}</dd> + <py:for each="prop in properties" py:choose=""> + <py:when test="prop.rendered"> + <dt py:attrs="prop.rendered.name_attributes" py:content="prop.rendered.name" /> + <dd py:attrs="prop.rendered.content_attributes" py:content="prop.rendered.content" /> + </py:when> + <py:otherwise> + <dt class="property">$prop.name:</dt> + <dd>$prop.value</dd> + </py:otherwise> + </py:for> + <dt class="property message">Message:</dt> + <dd class="message searchable" py:choose="" xml:space="preserve"> + <py:when test="not len(changeset.message.strip())"> + + </py:when> + <py:when test="wiki_format_messages"> + ${wiki_to_html(context, changeset.message, escape_newlines=True)} + </py:when> + <py:otherwise><pre>${changeset.message}</pre></py:otherwise> + </dd> + </py:if> + <py:if test="location"> + <dt class="property location">Location:</dt> + <dd class="searchable"><a href="${href.browser(reponame, location, rev=new_rev)}">$location</a></dd> + </py:if> + <dt class="property files"> + ${ngettext('File:', 'Files:', num=len(files)) if files else _('(No files)')} + </dt> + <dd class="files"> + <div class="legend" id="file-legend" py:if="filestats"> + <dl py:with="added, deleted, edited, copied, moved = [filestats[k] for k in ('add', 'delete', 'edit', 'copy', 'move')]"> + <py:if test="added"><dt class="add"></dt><dd>${ngettext('%(num)d added', '%(num)d added', num=added)}</dd></py:if> + <py:if test="deleted"><dt class="rem"></dt><dd>${ngettext('%(num)d deleted', '%(num)d deleted', num=deleted)}</dd></py:if> + <py:if test="edited"><dt class="mod"></dt><dd>${ngettext('%(num)d edited', '%(num)d edited', num=edited)}</dd></py:if> + <py:if test="copied"><dt class="cp"></dt><dd>${ngettext('%(num)d copied', '%(num)d copied', num=copied)}</dd></py:if> + <py:if test="moved"><dt class="mv"></dt><dd>${ngettext('%(num)d moved', '%(num)d moved', num=moved)}</dd></py:if> + </dl> + </div> + <br /> + <ul> + <li py:for="idx,item in enumerate(changes)" py:choose="item.change"> + <py:when test="'add'">${node_change(idx, item, 'add', _('added'))}</py:when> + <py:when test="'delete'">${node_change(idx, item, 'rem', _('deleted'))}</py:when> + <py:when test="'copy'">${node_change(idx, item, 'cp', _('copied'))}</py:when> + <py:when test="'move'">${node_change(idx, item, 'mv', _('moved'))}</py:when> + <py:when test="'edit'">${node_change(idx, item, 'mod', _('modified'))}</py:when> + <py:otherwise><!-- ignored change (maybe because of diff options or ignored prop.) --></py:otherwise> + </li> + </ul> </dd> - </py:if> - <py:if test="location"> - <dt class="property location">Location:</dt> - <dd class="searchable"><a href="${href.browser(reponame, location, rev=new_rev)}">$location</a></dd> - </py:if> - <dt class="property files"> - ${ngettext('File:', 'Files:', num=len(files)) if files else _('(No files)')} - </dt> - <dd class="files"> - <div class="legend" id="file-legend" py:if="filestats"> - <dl py:with="added, deleted, edited, copied, moved = [filestats[k] for k in ('add', 'delete', 'edit', 'copy', 'move')]"> - <py:if test="added"><dt class="add"></dt><dd>${ngettext('%(num)d added', '%(num)d added', num=added)}</dd></py:if> - <py:if test="deleted"><dt class="rem"></dt><dd>${ngettext('%(num)d deleted', '%(num)d deleted', num=deleted)}</dd></py:if> - <py:if test="edited"><dt class="mod"></dt><dd>${ngettext('%(num)d edited', '%(num)d edited', num=edited)}</dd></py:if> - <py:if test="copied"><dt class="cp"></dt><dd>${ngettext('%(num)d copied', '%(num)d copied', num=copied)}</dd></py:if> - <py:if test="moved"><dt class="mv"></dt><dd>${ngettext('%(num)d moved', '%(num)d moved', num=moved)}</dd></py:if> - </dl> - </div> - <br /> - <ul> - <li py:for="idx,item in enumerate(changes)" py:choose="item.change"> - <py:when test="'add'">${node_change(idx, item, 'add', _('added'))}</py:when> - <py:when test="'delete'">${node_change(idx, item, 'rem', _('deleted'))}</py:when> - <py:when test="'copy'">${node_change(idx, item, 'cp', _('copied'))}</py:when> - <py:when test="'move'">${node_change(idx, item, 'mv', _('moved'))}</py:when> - <py:when test="'edit'">${node_change(idx, item, 'mod', _('modified'))}</py:when> - <py:otherwise><!-- ignored change (maybe because of diff options or ignored prop.) --></py:otherwise> - </li> - </ul> - </dd> - </dl> + </dl> + </div> - <div class="diff"> + <div class="diff span12"> <div class="legend" id="diff-legend" py:if="has_diffs"> <h3>Legend:</h3> <dl> @@ -208,7 +210,7 @@ <xi:include href="diff_div.html" py:with="no_id = False" /> - <div id="help" i18n:msg=""> + <div id="help" class="span12" i18n:msg=""> <strong>Note:</strong> See <a href="${href.wiki('TracChangeset')}">TracChangeset</a> for help on using the changeset viewer. </div>