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:45:06 UTC
svn commit: r1308033 - in
/incubator/bloodhound/trunk/bloodhound_theme/bhtheme: htdocs/bloodhound.css
htdocs/icon_add.png htdocs/icon_search.png htdocs/left.png
htdocs/mainnavactivebg.png htdocs/right.png htdocs/user.png
templates/bloodhound_theme.html
Author: gjm
Date: Sun Apr 1 08:45:05 2012
New Revision: 1308033
URL: http://svn.apache.org/viewvc?rev=1308033&view=rev
Log:
Theme code import: Actions box at top-right corner
Added:
incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/icon_add.png (with props)
incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/icon_search.png (with props)
incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/left.png (with props)
incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/mainnavactivebg.png (with props)
incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/right.png (with props)
incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/user.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=1308033&r1=1308032&r2=1308033&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:45:05 2012
@@ -1,4 +1,15 @@
+/* Generic styles */
+
+.icon {
+ margin: 0px 2px;
+ padding: 0px 8px;
+}
+
+.icon_add {
+ background-image: url("icon_add.png");
+}
+
/* Layout */
.bh_body {
@@ -111,12 +122,16 @@
/* Trac generics */
-:link:hover, :visited:hover, .nav li:hover,
-.nav li:hover>:link, .nav li:hover>:visited,
+:link:hover, :visited:hover,
a.prev:hover, a.next:hover {
background-color: #3366ff;
color: #FFFFFF;
}
+.nav li:hover,
+.nav li:hover>:link, .nav li:hover>:visited {
+ background: none;
+ border: none;
+}
:visited, :link {
color: #0000CC;
@@ -130,6 +145,86 @@ a.prev:hover, a.next:hover {
border: none;
}
+/* Navigation */
+
+#mainnav {
+ border: none;
+ background: none;
+}
+
+#mainnav ul {
+ 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;
+}
+
+#mainnav li.active {
+ background-image: url("mainnavactivebg.png");
+}
+
+#mainnav .first {
+ -moz-border-radius-topleft: 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;
+}
+
+#mainnav :link:hover, #mainnav :visited:hover {
+ background: none;
+ border: none;
+}
+
+#mainnav .active :link:hover, #mainnav .active :visited:hover,
+#mainnav .active :link, #mainnav .active :visited {
+ background: none;
+ border: none;
+}
+
+#shortcuts {
+ background-image: url("mainnavbg.png");
+ height: 33px;
+ float: right;
+ padding-right: 5px;
+ padding-top: 5px;
+ position: relative;
+ right: 3px;
+ top: -33px;
+ width: 320px;
+}
+
+#shortcuts>div {
+ border-right: 1px solid #999999;
+ float: right;
+ height: 26px;
+ padding-left: 2px;
+}
+
+#shortcuts .first ,
+#shortcuts .last {
+ border: none;
+}
+
+#search input {
+ background-image: url("icon_search.png");
+ background-position: right center;
+ background-repeat: no-repeat;
+ border: 2px solid #3a70b8;
+ padding-right: 16px;
+}
+
/* Forms & inputs */
#input[type="button"], input[type="submit"], input[type="reset"] {
Added: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/icon_add.png
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/icon_add.png?rev=1308033&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/icon_add.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/icon_search.png
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/icon_search.png?rev=1308033&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/icon_search.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/left.png
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/left.png?rev=1308033&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/left.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/mainnavactivebg.png
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/mainnavactivebg.png?rev=1308033&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/mainnavactivebg.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/right.png
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/right.png?rev=1308033&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/right.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/user.png
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/user.png?rev=1308033&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/user.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=1308033&r1=1308032&r2=1308033&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:45:05 2012
@@ -6,14 +6,12 @@
xmlns:py="http://genshi.edgewall.org/"
py:strip="">
- <ul py:def="navigation(category, skip)" class="menu">
- <li id="${category}" class="nav">
- <ul py:if="chrome.nav[category]">
- <li py:for="idx, item in enumerate(i for i in chrome.nav[category] if i.name not in skip)"
- class="${classes(first_last(idx, chrome.nav[category]), active=item.active)} id_${item.name}">${item.label}</li>
- </ul>
- </li>
- </ul>
+ <div py:def="navigation(category, skip)" id="${category}" class="nav">
+ <ul py:if="chrome.nav[category]">
+ <li py:for="idx, item in enumerate(i for i in chrome.nav[category] if i.name not in skip)"
+ class="${classes(first_last(idx, chrome.nav[category]), active=item.active)} id_${item.name}">${item.label}</li>
+ </ul>
+ </div>
<py:match path="body" once="true" buffer="false"><body class="bh_body">
<div class="fixed-wrapper"
@@ -39,8 +37,31 @@
</h1>
</div>
</div>
- <div id="mainpanel" style="top:${max(60, int(logo_size[1]))}px">
+ <div id="mainpanel" style="top:${max(60, int(logo_size[1]))}px"
+ 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 py:if="'SEARCH_VIEW' in perm">
+ <form id="search" action="${href.search()}" method="get">
+ <label for="proj-search">Search:</label>
+ <input type="text" id="proj-search" name="q" size="10" accesskey="f" value="" />
+ <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>
<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">