Author: gjm
Date: Fri Jun 1 12:18:35 2012
New Revision: 1345105
URL: http://svn.apache.org/viewvc?rev=1345105&view=rev
Log:
theme: changing milestone view to continuous layout - #93 (from olemis)
Modified:
incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css
incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_milestone_view.html
Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css?rev=1345105&r1=1345104&r2=1345105&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css Fri Jun 1 12:18:35
2012
@@ -413,6 +413,9 @@ input[type="submit"].btn.btn-micro {
z-index: -10;
}
+.stickyEndMark {
+ clear: both;
+}
/* @end */
Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_milestone_view.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_milestone_view.html?rev=1345105&r1=1345104&r2=1345105&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_milestone_view.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_milestone_view.html Fri
Jun 1 12:18:35 2012
@@ -14,6 +14,42 @@
title="Edit this milestone" href="${href.milestone(milestone.name, action='edit')}"
/>
</head>
+ <py:def function="milestone_date">
+ <py:choose test="">
+ <py:when test="milestone.completed">
+ <i18n:msg params="duration, date">
+ Completed ${dateinfo(milestone.completed)} ago (${format_datetime(milestone.completed)})
+ </i18n:msg>
+ </py:when>
+ <py:when test="milestone.is_late">
+ <i18n:msg params="duration, date">
+ dateinfo(milestone.due)} late
+ </i18n:msg>
+ </py:when>
+ <py:when test="milestone.due">
+ <i18n:msg params="duration, date">
+ Due in ${dateinfo(milestone.due)}
+ </i18n:msg>
+ </py:when>
+ <py:otherwise>
+ <span class="label">Unscheduled</span>
+ </py:otherwise>
+ </py:choose>
+ </py:def>
+
+ <py:def function="milestone_owner()">
+ <py:choose>
+ <py:when test="milestone.owner">
+ Assigned to
+ <a href="${href.query(owner=milestone.owner, status='!closed',
+ milestone=milestone.name, order='priority')}">${milestone.name}</a>
+ </py:when>
+ <py:otherwise>
+ <span class="label">Unassigned</span>
+ </py:otherwise>
+ </py:choose>
+ </py:def>
+
<body>
<div class="row">
<div class="${'span8' if bhdb else 'span12'}">
@@ -21,39 +57,19 @@
<div id="overview" class="stickyStatus">
<div class="whitebox"></div>
<h1 style="display: inline;">Milestone ${milestone.name}</h1>
- <br/><br/>
- <py:def function="milestone_caption">
- <py:choose test="">
- <py:when test="milestone.completed">
- <i18n:msg params="duration, date">
- Completed ${dateinfo(milestone.completed)} ago (${format_datetime(milestone.completed)})
- </i18n:msg>
- </py:when>
- <py:when test="milestone.is_late">
- <i18n:msg params="duration, date">
- dateinfo(milestone.due)} late (${format_datetime(milestone.due)})
- </i18n:msg>
- </py:when>
- <py:when test="milestone.due">
- <i18n:msg params="duration, date">
- Due in ${dateinfo(milestone.due)} (${format_datetime(milestone.due)})
- </i18n:msg>
- </py:when>
- <py:otherwise>
- No date set
- </py:otherwise>
- </py:choose>
- <form style="display: inline;"
- py:if="'MILESTONE_MODIFY' in perm(milestone.resource)">
-
- <input type="hidden" name="action" value="edit" />
- <input type="submit" class="btn btn-micro btn-info"
- value="${_('Change')}" />
- </form>
- </py:def>
+ <h6>${milestone_date()}, ${milestone_owner()}</h6>
+ <br/>
<xi:include href="widget_progress.html"
- py:with="caption = milestone_caption(); legend = True;
- desc = wiki_to_html(context, milestone.description);"/>
+ py:with="view = 'compact'; legend = True;" />
+ <div class="stickyEndMark"></div>
+ </div>
+ </div>
+ <script type="text/javascript">
+ setup_sticky_panel('#overview');
+ </script>
+ <div class="${'span7' if bhdb else 'span11'}" >
+ <div class="well">
+ ${wiki_to_html(context, milestone.description)}
<div py:if="'MILESTONE_MODIFY' in perm(milestone.resource) or
'MILESTONE_DELETE' in perm(milestone.resource) or
attachments.can_create">
@@ -79,9 +95,6 @@
</div>
</div>
</div>
- <script type="text/javascript">
- setup_sticky_panel('#overview');
- </script>
<div>
<bh:layout urn="bootstrap_btnbar">
<bh:schema>
|