> I'm no CSS expert either, but it looked fine to me. I have just one > suggestion below: > > On 13/01/12 12:03, Mattias Backman wrote: > > === modified file 'templates/roadmap_card.html' > > --- templates/roadmap_card.html 2011-12-21 14:05:45 +0000 > > +++ templates/roadmap_card.html 2012-01-13 15:02:25 +0000 > > @@ -35,7 +35,16 @@ > > </ul> > > > > <div style="clear:both; text-align: center">Overall blueprint > completion</div> > > -${util.progress_bar(blueprint_status_count) if card_has_blueprints else > '<center><i>Progress graph pending linked blueprints.</i></center>'} > > +% if card_has_blueprints: > > +<div class="roadmap_wrap" title="${bp_status_totals['Completed']} > blueprints complete of ${bp_status_totals['Total']}"> > > + <div class="roadmap_value" > style="width:${bp_status_totals['Percentage']}%"> > > + <div class="Completed"> </div> > > + </div> > > + <div class="roadmap_progress_text">${bp_status_totals['Percentage']} % > complete of ${bp_status_totals['Total']}</div> > > +</div> > > Would it be possible to move this into a function like > util.progress_bar() to avoid duplicating it in roadmap_lane.html?
Absolutely. Thanks. I've done that and merged the branch to staging, let's see what it looks like in half an hour.
> > > +% else: > > +<center><i>Progress graph pending linked blueprints.</i></center> > > +% endif > > > > <h3>Description</h3> ${card.description if card.description is not None > else '<i>No description could be found.</i>'} > > <p><a href="${card.url}">Read the full description</a>. > > > > === modified file 'templates/roadmap_lane.html' > > --- templates/roadmap_lane.html 2011-12-22 11:57:53 +0000 > > +++ templates/roadmap_lane.html 2012-01-13 15:02:25 +0000 > > @@ -17,6 +17,12 @@ > > % endfor > > </select> > > <h1>${title()}</h1> > > +<div class="roadmap_wrap" title="${bp_status_totals['Completed']} > blueprints complete of ${bp_status_totals['Total']}"> > > + <div class="roadmap_value" > style="width:${bp_status_totals['Percentage']}%"> > > + <div class="Completed"> </div> > > + </div> > > + <div class="roadmap_progress_text">${bp_status_totals['Percentage']} % > complete of ${bp_status_totals['Total']}</div> > > +</div> > > <p> > > <table width="100%"> > > <thead><tr><th>Card</th><th>Status</th><th>Team</th><th>Priority</th><th>Bl > ueprints</th><th>Health</th></tr></thead> > >
« Back to merge proposal
> I'm no CSS expert either, but it looked fine to me. I have just one roadmap_ card.html' roadmap_ card.html 2011-12-21 14:05:45 +0000 roadmap_ card.html 2012-01-13 15:02:25 +0000 progress_ bar(blueprint_ status_ count) if card_has_blueprints else <i>Progress graph pending linked blueprints. </i></center> '} blueprints: roadmap_ wrap" title=" ${bp_status_ totals[ 'Completed' ]} totals[ 'Total' ]}"> roadmap_ value" width:$ {bp_status_ totals[ 'Percentage' ]}%"> Completed" > </div> roadmap_ progress_ text">$ {bp_status_ totals[ 'Percentage' ]} % totals[ 'Total' ]}</div>
> suggestion below:
>
> On 13/01/12 12:03, Mattias Backman wrote:
> > === modified file 'templates/
> > --- templates/
> > +++ templates/
> > @@ -35,7 +35,16 @@
> > </ul>
> >
> > <div style="clear:both; text-align: center">Overall blueprint
> completion</div>
> > -${util.
> '<center>
> > +% if card_has_
> > +<div class="
> blueprints complete of ${bp_status_
> > + <div class="
> style="
> > + <div class="
> > + </div>
> > + <div class="
> complete of ${bp_status_
> > +</div>
>
> Would it be possible to move this into a function like
> util.progress_bar() to avoid duplicating it in roadmap_lane.html?
Absolutely. Thanks. I've done that and merged the branch to staging, let's see what it looks like in half an hour.
> <i>Progress graph pending linked blueprints. </i></center> </h3> ${card.description if card.description is not None {card.url} ">Read the full description</a>. roadmap_ lane.html' roadmap_ lane.html 2011-12-22 11:57:53 +0000 roadmap_ lane.html 2012-01-13 15:02:25 +0000 roadmap_ wrap" title=" ${bp_status_ totals[ 'Completed' ]} totals[ 'Total' ]}"> roadmap_ value" width:$ {bp_status_ totals[ 'Percentage' ]}%"> Completed" > </div> roadmap_ progress_ text">$ {bp_status_ totals[ 'Percentage' ]} % totals[ 'Total' ]}</div> <tr><th> Card</th> <th>Status< /th><th> Team</th> <th>Priority< /th><th> Bl /th><th> Health< /th></tr> </thead>
> > +% else:
> > +<center>
> > +% endif
> >
> > <h3>Description
> else '<i>No description could be found.</i>'}
> > <p><a href="$
> >
> > === modified file 'templates/
> > --- templates/
> > +++ templates/
> > @@ -17,6 +17,12 @@
> > % endfor
> > </select>
> > <h1>${title()}</h1>
> > +<div class="
> blueprints complete of ${bp_status_
> > + <div class="
> style="
> > + <div class="
> > + </div>
> > + <div class="
> complete of ${bp_status_
> > +</div>
> > <p>
> > <table width="100%">
> > <thead>
> ueprints<
> >