You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bloodhound.apache.org by gj...@apache.org on 2012/04/01 11:14:14 UTC
svn commit: r1308048 - in
/incubator/bloodhound/trunk/bloodhound_theme/bhtheme: htdocs/bloodhound.css
htdocs/images/glyphicons-halflings.png templates/bloodhound_theme.html
Author: gjm
Date: Sun Apr 1 09:14:14 2012
New Revision: 1308048
URL: http://svn.apache.org/viewvc?rev=1308048&view=rev
Log:
Theme code import: Main navigation implemented using Bootstrap (tabs + dropdown)
Added:
incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/images/glyphicons-halflings.png (with props)
Modified:
incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css
incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.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=1308048&r1=1308047&r2=1308048&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css Sun Apr 1 09:14:14 2012
@@ -1117,7 +1117,7 @@ table .span12 {
width: 14px;
height: 14px;
vertical-align: text-top;
- background-image: url(../img/glyphicons-halflings.png);
+ background-image: url(images/glyphicons-halflings.png);
background-position: 14px 14px;
background-repeat: no-repeat;
*margin-right: .3em;
@@ -1126,7 +1126,7 @@ table .span12 {
*margin-left: 0;
}
.icon-white {
- background-image: url(../img/glyphicons-halflings-white.png);
+ background-image: url(images/glyphicons-halflings-white.png);
}
.icon-glass {
background-position: 0 0;
Added: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/images/glyphicons-halflings.png
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/images/glyphicons-halflings.png?rev=1308048&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/images/glyphicons-halflings.png
------------------------------------------------------------------------------
svn:mime-type = image/png
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=1308048&r1=1308047&r2=1308048&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bloodhound_theme.html Sun Apr 1 09:14:14 2012
@@ -53,25 +53,23 @@
</div>
<div class="row" style="position:relative;">
<div class="span4">
- <form class="form-inline">
+ <form class="form-inline" action="${href.search()}" method="get">
<input type="text" class="span3" placeholder="Search anything. Try #EF-492."/>
- <input type="button" value="Search" href="#" class="btn btn-warning"/>
+ <input type="submit" value="Search" class="btn btn-warning"/>
</form>
</div>
<div class="span4"><a href="#" class="btn">Create Ticket</a></div>
<div class="4">
- <ul class="nav nav-tabs pull-right">
- <li class="active"><a href="#">Tickets</a></li>
- <li><a href="#">Wiki</a></li>
- <li><a href="#">Source</a></li>
+ <ul py:if="chrome.nav.mainnav" class="nav nav-tabs pull-right"
+ py:with="mainnav_show = ('wiki', 'tickets', 'browser')">
+ <!-- TODO: Parameterize visible mainnav items in trac.ini -->
+ <li py:for="idx, item in enumerate(i for i in chrome.nav.mainnav if i.name in mainnav_show or i.active)"
+ class="${classes(first_last(idx, chrome.nav.mainnav), active=item.active)}">${item.label}</li>
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Apps<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="#">SuperAdmin</a></li>
- <li><a href="#">Tag Cloud</a></li>
- <li><a href="#">Blog</a></li>
- <li class="divider"></li>
- <li><a href="#">View more</a></li>
+ <li py:for="idx, item in enumerate(i for i in chrome.nav.mainnav if i.name not in mainnav_show and not i.active)"
+ class="${classes(first_last(idx, chrome.nav.mainnav), active=item.active)}">${item.label}</li>
</ul>
</li>
</ul>