Author: gjm
Date: Tue Mar 19 20:27:47 2013
New Revision: 1458498
URL: http://svn.apache.org/r1458498
Log:
whitespace change: indentation corrections arising from r1458496 - towards #449
Modified:
incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html
Modified:
incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html
URL:
http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html?rev=1458498&r1=1458497&r2=1458498&view=diff
==============================================================================
---
incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html
(original)
+++
incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html
Tue Mar 19 20:27:47 2013
@@ -87,219 +87,218 @@
</py:with>
</div>
<div class="sticky-header">
- <!--! search + main nav -->
- <div class="row">
- <!--! search box -->
- <div class="span6">
- <div id="searchbox" class="btn-toolbar">
- <div class="btn-group">
- <form id="mainsearch" class="form-inline"
- action="${search_handler or href.search()}"
- method="get">
- <div class="input-append">
- <input type="text" class="span3" id="q" name="q"
- placeholder="Search anything. Try #EF-492."
- value="${req.search_query}" />
- <input py:for="name, value in extra_search_fields"
- type="hidden"
- name="$name"
- value="$value" />
- <button type="submit" class="btn btn-warning">
- <span class="hidden-phone hidden-tablet">Search</span>
- <i class="icon-search icon-white"></i>
- </button>
- </div>
- </form>
- </div>
+ <!--! search + main nav -->
+ <div class="row">
+ <!--! search box -->
+ <div class="span6">
+ <div id="searchbox" class="btn-toolbar">
+ <div class="btn-group">
+ <form id="mainsearch" class="form-inline"
+ action="${search_handler or href.search()}"
+ method="get">
+ <div class="input-append">
+ <input type="text" class="span3" id="q" name="q"
+ placeholder="Search anything. Try #EF-492."
+ value="${req.search_query}" />
+ <input py:for="name, value in extra_search_fields"
+ type="hidden"
+ name="$name"
+ value="$value" />
+ <button type="submit" class="btn btn-warning">
+ <span class="hidden-phone hidden-tablet">Search</span>
+ <i class="icon-search icon-white"></i>
+ </button>
+ </div>
+ </form>
+ </div>
- <!--! create ticket button + dropdown -->
- <div class="btn-group">
- <py:def function="field_select(field, value)">
- <select id="field-${field.name}" name="field_${field.name}"
- class="input-medium" data-empty="true"
data-field="${field.name}">
- <option py:if="field.optional"></option>
- <option py:for="option in field.options"
- selected="${value == option or None}"
- value = "$option"
- py:content="option"></option>
- <optgroup py:for="optgroup in field.optgroups"
- py:if="optgroup.options"
- label="${optgroup.label}">
- <option py:for="option in optgroup.options"
+ <!--! create ticket button + dropdown -->
+ <div class="btn-group">
+ <py:def function="field_select(field, value)">
+ <select id="field-${field.name}" name="field_${field.name}"
+ class="input-medium" data-empty="true"
data-field="${field.name}">
+ <option py:if="field.optional"></option>
+ <option py:for="option in field.options"
selected="${value == option or None}"
value = "$option"
py:content="option"></option>
- </optgroup>
- </select>
- </py:def>
- <py:def function="qct_box()">
- <div>
- <label for="field-summary">Summary</label>
- <input type="text" id="field-summary"
- name="field_summary" placeholder="Ticket summary" />
- </div>
- <div>
- <label for="field-description">Description</label>
- <textarea id="field-description" name="field_description"
- rows="3" cols="28"
- placeholder="Ticket description"></textarea>
- </div>
- <div class="form-horizontal">
- <py:for each="field in qct.fields">
- <label class="control-label"
for="field-${field.name}">${field.label}</label>
- <div class="controls">
- ${field_select(field, None)}
- </div>
- </py:for>
- </div>
- </py:def>
- <py:choose test="">
- <py:when test="qct">
- <a href="#" class="btn btn-primary dropdown-toggle"
- id="qct-newticket" data-animation="true"
data-html="true"
- data-trigger="manual" data-toggle="dropdown">
- <span class="visible-phone"><i class="icon-plus-sign
icon-white"></i></span>
- <span class="hidden-phone">Create Ticket</span>
- </a>
- <div id="qct-box" class="dropdown-menu" style="width:
300px;"
- py:choose="">
- <div class="popover-title">
- <h3>
- Create Ticket
- <a style="top: -33px; right: -25px; position:
relative;"
- class="pull-right" href="${href.newticket()}">
- <small>Full dialogue »</small>
- </a>
- </h3>
+ <optgroup py:for="optgroup in field.optgroups"
+ py:if="optgroup.options"
+ label="${optgroup.label}">
+ <option py:for="option in optgroup.options"
+ selected="${value == option or None}"
+ value = "$option"
+ py:content="option"></option>
+ </optgroup>
+ </select>
+ </py:def>
+ <py:def function="qct_box()">
+ <div>
+ <label for="field-summary">Summary</label>
+ <input type="text" id="field-summary"
+ name="field_summary" placeholder="Ticket summary" />
+ </div>
+ <div>
+ <label for="field-description">Description</label>
+ <textarea id="field-description" name="field_description"
+ rows="3" cols="28"
+ placeholder="Ticket description"></textarea>
+ </div>
+ <div class="form-horizontal">
+ <py:for each="field in qct.fields">
+ <label class="control-label"
for="field-${field.name}">${field.label}</label>
+ <div class="controls">
+ ${field_select(field, None)}
</div>
- <div class="popover-content">
- <py:when test="'TICKET_CREATE' in perm">
- <form id="qct-form" name="qct" method="post">
- <div id="qct-fieldset">
- ${qct_box()}
- </div>
- </form>
- <button id="qct-create" class="btn"
data-target="${href()}">Create</button>
- <a id="qct-cancel">Cancel</a>
- </py:when>
- <div py:otherwise="" class="alert alert-info">
- <p>
- <span class="label
label-important">TICKET_CREATE</span>
- privileges are required to perform this operation.
- You don't have the required permissions
- <py:choose>
- <py:when test="req.authname == 'anonymous'">
- <br/><br/>
- <a href="${href.login()}" class="btn"
style="display: inline;">Login</a>
- </py:when>
- <py:otherwise>
- Please contact your administrator or team
leader to
- request these.
- </py:otherwise>
- </py:choose>
- </p>
+ </py:for>
+ </div>
+ </py:def>
+ <py:choose test="">
+ <py:when test="qct">
+ <a href="#" class="btn btn-primary dropdown-toggle"
+ id="qct-newticket" data-animation="true"
data-html="true"
+ data-trigger="manual" data-toggle="dropdown">
+ <span class="visible-phone"><i class="icon-plus-sign
icon-white"></i></span>
+ <span class="hidden-phone">Create Ticket</span>
+ </a>
+ <div id="qct-box" class="dropdown-menu" style="width:
300px;"
+ py:choose="">
+ <div class="popover-title">
+ <h3>
+ Create Ticket
+ <a style="top: -33px; right: -25px; position:
relative;"
+ class="pull-right" href="${href.newticket()}">
+ <small>Full dialogue »</small>
+ </a>
+ </h3>
+ </div>
+ <div class="popover-content">
+ <py:when test="'TICKET_CREATE' in perm">
+ <form id="qct-form" name="qct" method="post">
+ <div id="qct-fieldset">
+ ${qct_box()}
+ </div>
+ </form>
+ <button id="qct-create" class="btn"
data-target="${href()}">Create</button>
+ <a id="qct-cancel">Cancel</a>
+ </py:when>
+ <div py:otherwise="" class="alert alert-info">
+ <p>
+ <span class="label
label-important">TICKET_CREATE</span>
+ privileges are required to perform this
operation.
+ You don't have the required permissions
+ <py:choose>
+ <py:when test="req.authname == 'anonymous'">
+ <br/><br/>
+ <a href="${href.login()}" class="btn"
style="display: inline;">Login</a>
+ </py:when>
+ <py:otherwise>
+ Please contact your administrator or team
leader to
+ request these.
+ </py:otherwise>
+ </py:choose>
+ </p>
+ </div>
</div>
</div>
- </div>
- </py:when>
- <py:otherwise>
-
- </py:otherwise>
- </py:choose>
+ </py:when>
+ <py:otherwise>
+
+ </py:otherwise>
+ </py:choose>
+ </div>
</div>
</div>
- </div>
- <!--! main navigation tabs -->
- <div class="span6">
- <ul py:if="chrome.nav.mainnav or chrome.nav.metanav"
- class="nav nav-tabs pull-right"
- id="mainnav"
- py:with="mainnav_show = ('wiki', 'tickets', 'browser');
- metanav_hide = ('login', 'logout', 'prefs', 'help',
'about')">
- <!--! TODO: Parameterize visible mainnav items in trac.ini -->
- <li py:if="chrome.nav.mainnav"
- py:for="idx, item in enumerate(i for i in chrome.nav.mainnav
if i.name in mainnav_show)"
- class="${classes(first_last(idx, chrome.nav.mainnav),
active=item.active)}">${item.label}</li>
- <li class="dropdown ${all(not i.active for i in
chrome.nav.mainnav if i.name in mainnav_show) and 'active' or None}"
- py:if="len([i for i in chrome.nav.metanav if i.name not in
metanav_hide] +
- [i for i in chrome.nav.mainnav if i.name not in
mainnav_show])">
- <a class="dropdown-toggle" data-toggle="dropdown"
href="#">Apps<b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li py:if="chrome.nav.mainnav"
- py:for="idx, item in enumerate(i for i in
chrome.nav.mainnav if i.name not in mainnav_show)"
- class="${classes(first_last(idx, chrome.nav.mainnav),
active=item.active)}">${item.label}</li>
- <py:if test="chrome.nav.metanav">
- <li py:if="len([i for i in chrome.nav.metanav if i.name
not in metanav_hide])"
- class="divider"></li>
- <li py:for="idx, item in enumerate(chrome.nav.metanav)"
- py:if="item.name not in metanav_hide"
- class="${classes(first_last(idx, chrome.nav.metanav),
active=item.active)}">
- ${item.label}
- </li>
- </py:if>
- </ul>
- </li>
- </ul>
+ <!--! main navigation tabs -->
+ <div class="span6">
+ <ul py:if="chrome.nav.mainnav or chrome.nav.metanav"
+ class="nav nav-tabs pull-right"
+ id="mainnav"
+ py:with="mainnav_show = ('wiki', 'tickets', 'browser');
+ metanav_hide = ('login', 'logout', 'prefs', 'help',
'about')">
+ <!--! TODO: Parameterize visible mainnav items in trac.ini -->
+ <li py:if="chrome.nav.mainnav"
+ py:for="idx, item in enumerate(i for i in
chrome.nav.mainnav if i.name in mainnav_show)"
+ class="${classes(first_last(idx, chrome.nav.mainnav),
active=item.active)}">${item.label}</li>
+ <li class="dropdown ${all(not i.active for i in
chrome.nav.mainnav if i.name in mainnav_show) and 'active' or None}"
+ py:if="len([i for i in chrome.nav.metanav if i.name not in
metanav_hide] +
+ [i for i in chrome.nav.mainnav if i.name not in
mainnav_show])">
+ <a class="dropdown-toggle" data-toggle="dropdown"
href="#">Apps<b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li py:if="chrome.nav.mainnav"
+ py:for="idx, item in enumerate(i for i in
chrome.nav.mainnav if i.name not in mainnav_show)"
+ class="${classes(first_last(idx, chrome.nav.mainnav),
active=item.active)}">${item.label}</li>
+ <py:if test="chrome.nav.metanav">
+ <li py:if="len([i for i in chrome.nav.metanav if i.name
not in metanav_hide])"
+ class="divider"></li>
+ <li py:for="idx, item in enumerate(chrome.nav.metanav)"
+ py:if="item.name not in metanav_hide"
+ class="${classes(first_last(idx,
chrome.nav.metanav), active=item.active)}">
+ ${item.label}
+ </li>
+ </py:if>
+ </ul>
+ </li>
+ </ul>
+ </div>
</div>
- </div>
- <div class="row" id="breadcrumb-row">
- <!--! breadcrumb (TODO: which ones do we hide on the
phones/tablets?) -->
- <div id="stickyStatus" class="span12">
- <ul class="breadcrumb">
- <li py:choose="">
- <xi:include py:when="value_of('resourcepath_template')"
- href="${resourcepath_template}" />
- <py:otherwise> </py:otherwise>
- </li>
- <li class="pull-right hidden-phone">
- <py:for py:if="chrome.ctxtnav"
- py:with="max_idx = len(chrome.ctxtnav) - 1"
- each="idx, item in enumerate(chrome.ctxtnav)">
- $item
- <py:if test="idx <
max_idx"> </py:if>
- </py:for>
- </li>
- </ul>
+ <div class="row" id="breadcrumb-row">
+ <!--! breadcrumb (TODO: which ones do we hide on the
phones/tablets?) -->
+ <div id="stickyStatus" class="span12">
+ <ul class="breadcrumb">
+ <li py:choose="">
+ <xi:include py:when="value_of('resourcepath_template')"
+ href="${resourcepath_template}" />
+ <py:otherwise> </py:otherwise>
+ </li>
+ <li class="pull-right hidden-phone">
+ <py:for py:if="chrome.ctxtnav"
+ py:with="max_idx = len(chrome.ctxtnav) - 1"
+ each="idx, item in enumerate(chrome.ctxtnav)">
+ $item
+ <py:if test="idx <
max_idx"> </py:if>
+ </py:for>
+ </li>
+ </ul>
+ </div>
</div>
- </div>
- <!--! alerts (warnings, notices) -->
- <div class="row">
- <!-- div id="alert-log" class="dropdown-menu" style="display: none">
- <div class="popover-title">
- <button id="alert-log-close" data-dismiss="alert"
- class="close">×</button>
- <h3 id="alert-log-title"></h3>
- </div>
- <div class="popover-content">
- <div id="alert-msg"></div>
- <ul id="alert-links" class="nav"></ul>
- </div>
- </div -->
- <div class="span12" py:if="chrome.warnings or chrome.notices">
- <div id="warning" py:if="chrome.warnings" class="alert fade in">
- <button type="button" class="close"
data-dismiss="alert">×</button>
- <py:choose test="len(chrome.warnings)">
- <span class="label label-warning">Warning</span>
- <py:when test="1">${chrome.warnings[0]}</py:when>
- <py:otherwise><ul><li py:for="warning in
chrome.warnings">$warning</li></ul></py:otherwise>
- </py:choose>
- </div>
- <div id="notice" py:if="chrome.notices" class="alert alert-success
fade in">
- <button type="button" class="close"
data-dismiss="alert">×</button>
- <py:choose test="len(chrome.notices)">
- <span class="label label-success">Success</span>
- <py:when test="1">${chrome.notices[0]}</py:when>
- <py:otherwise><ul><li py:for="notice in
chrome.notices">$notice</li></ul></py:otherwise>
- </py:choose>
+ <!--! alerts (warnings, notices) -->
+ <div class="row">
+ <!-- div id="alert-log" class="dropdown-menu" style="display:
none">
+ <div class="popover-title">
+ <button id="alert-log-close" data-dismiss="alert"
+ class="close">×</button>
+ <h3 id="alert-log-title"></h3>
+ </div>
+ <div class="popover-content">
+ <div id="alert-msg"></div>
+ <ul id="alert-links" class="nav"></ul>
+ </div>
+ </div -->
+ <div class="span12" py:if="chrome.warnings or chrome.notices">
+ <div id="warning" py:if="chrome.warnings" class="alert fade in">
+ <button type="button" class="close"
data-dismiss="alert">×</button>
+ <py:choose test="len(chrome.warnings)">
+ <span class="label label-warning">Warning</span>
+ <py:when test="1">${chrome.warnings[0]}</py:when>
+ <py:otherwise><ul><li py:for="warning in
chrome.warnings">$warning</li></ul></py:otherwise>
+ </py:choose>
+ </div>
+ <div id="notice" py:if="chrome.notices" class="alert
alert-success fade in">
+ <button type="button" class="close"
data-dismiss="alert">×</button>
+ <py:choose test="len(chrome.notices)">
+ <span class="label label-success">Success</span>
+ <py:when test="1">${chrome.notices[0]}</py:when>
+ <py:otherwise><ul><li py:for="notice in
chrome.notices">$notice</li></ul></py:otherwise>
+ </py:choose>
+ </div>
</div>
</div>
</div>
- <!--! end div.sticky-header -->
- </div>
</header>
<div class="stickyOffset" style="height: 0px;"></div>
