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 10:46:01 UTC
svn commit: r1308034 - in
/incubator/bloodhound/trunk/bloodhound_theme/bhtheme: htdocs/bloodhound.css
templates/bloodhound_theme.html
Author: gjm
Date: Sun Apr 1 08:46:01 2012
New Revision: 1308034
URL: http://svn.apache.org/viewvc?rev=1308034&view=rev
Log:
Theme code import: Dummy tab if no context navigation items found. Tab chars removed .. oops
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=1308034&r1=1308033&r2=1308034&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css Sun Apr 1 08:46:01 2012
@@ -3,11 +3,21 @@
.icon {
margin: 0px 2px;
- padding: 0px 8px;
+ padding: 0px 8px;
+}
+
+#ctxtnav ul>li.icon {
+ background-position: center center;
+ background-repeat: no-repeat;
+ padding: 15px 35px 16px;
}
.icon_add {
- background-image: url("icon_add.png");
+ background-image: url("icon_add.png") !important;
+}
+
+.icon_bh {
+ background-image: url("icon_bh.png") !important;
}
/* Layout */
@@ -130,7 +140,7 @@ a.prev:hover, a.next:hover {
.nav li:hover,
.nav li:hover>:link, .nav li:hover>:visited {
background: none;
- border: none;
+ border: none;
}
:visited, :link {
@@ -149,20 +159,20 @@ a.prev:hover, a.next:hover {
#mainnav {
border: none;
- background: none;
+ background: none;
}
#mainnav ul {
- font-size: 14px;
- padding-left: 0;
- padding-top: 1px;
- text-align: left;
+ font-size: 14px;
+ padding-left: 0;
+ padding-top: 1px;
+ text-align: left;
}
#mainnav li {
border-right: 1px solid #ffffff;
padding-bottom: 8px;
- padding-top: 8px;
+ padding-top: 8px;
}
#mainnav li.active {
@@ -171,45 +181,45 @@ a.prev:hover, a.next:hover {
#mainnav .first {
-moz-border-radius-topleft: 6px;
- -webkit-border-top-left-radius: 6px;
- -moz-border-radius-bottomleft: 6px;
- -webkit-border-bottom-left-radius: 6px;
+ -webkit-border-top-left-radius: 6px;
+ -moz-border-radius-bottomleft: 6px;
+ -webkit-border-bottom-left-radius: 6px;
}
#mainnav :link, #mainnav :visited {
background: none;
- border: none;
- color: #ffffff;
+ border: none;
+ color: #ffffff;
}
#mainnav :link:hover, #mainnav :visited:hover {
background: none;
- border: none;
+ border: none;
}
#mainnav .active :link:hover, #mainnav .active :visited:hover,
#mainnav .active :link, #mainnav .active :visited {
background: none;
- border: none;
+ border: none;
}
#shortcuts {
background-image: url("mainnavbg.png");
height: 33px;
- float: right;
+ float: right;
padding-right: 5px;
padding-top: 5px;
position: relative;
right: 3px;
top: -33px;
- width: 320px;
+ width: 320px;
}
#shortcuts>div {
- border-right: 1px solid #999999;
+ border-right: 1px solid #999999;
float: right;
- height: 26px;
- padding-left: 2px;
+ height: 26px;
+ padding-left: 2px;
}
#shortcuts .first ,
@@ -218,11 +228,11 @@ a.prev:hover, a.next:hover {
}
#search input {
- background-image: url("icon_search.png");
+ background-image: url("icon_search.png");
background-position: right center;
- background-repeat: no-repeat;
- border: 2px solid #3a70b8;
- padding-right: 16px;
+ background-repeat: no-repeat;
+ border: 2px solid #3a70b8;
+ padding-right: 16px;
}
/* Forms & inputs */
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=1308034&r1=1308033&r2=1308034&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 08:46:01 2012
@@ -16,34 +16,30 @@
<py:match path="body" once="true" buffer="false"><body class="bh_body">
<div class="fixed-wrapper"
py:with="logo_size = (chrome.logo.width or 170, chrome.logo.height or 48)">
- <div id="banner" py:choose="" >
+ <div id="banner">
<div id="header">
- <div py:when="chrome.logo.src"
- style="vertical-align: middle; height: ${logo_size[1]}px;">
+ <div style="vertical-align: middle; height: ${logo_size[1]}px;">
<div style="float: left;height: ${logo_size[1]}px;">
- <a id="logo" href="${chrome.logo.link or href.wiki('TracIni')+'#header_logo-section'}">
- <img
- src="${chrome.logo.src}" alt="${chrome.logo.alt}"
- height="${logo_size[1]}px" width="${logo_size[0]}px" />
+ <a id="logo"
+ href="${chrome.logo.link or href.wiki('TracIni')+'#header_logo-section'}">
+ <img
+ src="${chrome.logo.src or href.chrome('theme/bh_logo.png')}"
+ alt="${chrome.logo.alt or 'Bloodhound issue tracker'}"
+ height="${logo_size[1]}px" width="${logo_size[0]}px" />
</a>
</div>
<div id="pname"> ${project.name} </div>
<div id="psum"> ${project.descr or project.description} </div>
</div>
- <h1 py:otherwise="">
- <a href="${chrome.logo.link or href.wiki('TracIni')+'#header_logo-section'}">
- ${project.name}
- </a>
- </h1>
</div>
</div>
<div id="mainpanel" style="top:${max(60, int(logo_size[1]))}px"
- class="ui-corner-all">
+ class="ui-corner-all">
${navigation("mainnav", [])}
- <div id="shortcuts">
- <div class="last">
- <img src="${href('chrome/theme/user.png')}" width="26px" height="26px"/>
- </div>
+ <div id="shortcuts">
+ <div class="last">
+ <img src="${href('chrome/theme/user.png')}" width="26px" height="26px"/>
+ </div>
<div py:if="'SEARCH_VIEW' in perm">
<form id="search" action="${href.search()}" method="get">
<label for="proj-search">Search:</label>
@@ -51,24 +47,28 @@
<input style="display:none;" type="submit" value=" " />
</form>
</div>
- <div>
- <button id="newticket">
- Create Ticket
- <span class="icon icon_add"></span>
- </button>
- </div>
- <div class="first">
- <img src="${href('chrome/theme/left.png')}" width="20px" height="26px" />
- <img src="${href('chrome/theme/right.png')}" width="20px" height="26px" />
- </div>
- </div>
+ <div>
+ <button id="newticket">
+ Create Ticket
+ <span class="icon icon_add"></span>
+ </button>
+ </div>
+ <div class="first">
+ <img src="${href('chrome/theme/left.png')}" width="20px" height="26px" />
+ <img src="${href('chrome/theme/right.png')}" width="20px" height="26px" />
+ </div>
+ </div>
</div>
<div id="outer-wrapper" style="top:${max(60, int(logo_size[1])) + 48}px">
<div id="ctxtnav" class="ui-tabs ui-widget ui-widget-content ui-corner-all">
- <ul py:if="chrome.ctxtnav" class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
- <li py:for="i, elm in enumerate(chrome.ctxtnav)"
- py:with="is_active = str(elm.attrib.get('href')) == str(href(req.path_info + (req.query_string and '?' + req.query_string or '') ))"
- class="${classes(first_last(i, chrome.ctxtnav), active=is_active)} ui-corner-top ui-state-default ${is_active and 'ui-tabs-selected ui-state-active' or None}">${elm}</li>
+ <ul py:choose=""
+ class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
+ <li py:when="chrome.ctxtnav"
+ py:for="i, elm in enumerate(chrome.ctxtnav)"
+ py:with="is_active = str(elm.attrib.get('href')) == str(href(req.path_info + (req.query_string and '?' + req.query_string or '') ))"
+ class="${classes(first_last(i, chrome.ctxtnav), active=is_active)} ui-corner-top ui-state-default ${is_active and 'ui-tabs-selected ui-state-active' or None}">${elm}</li>
+ <li py:otherwise=""
+ class="icon icon_bh ui-corner-top ui-state-default ui-tabs-selected ui-state-active"></li>
</ul>
</div>
<div id="main-wrapper" class="ui-tabs-panel ui-widget-content ui-corner-bottom">