From: Tomas Sedovic <[email protected]>
The links are not working yet.
---
src/app/views/layouts/_header.haml | 17 +++++++++++++++++
src/app/views/layouts/_header.rhtml | 14 --------------
src/public/images/bg_header.png | Bin 173 -> 234 bytes
src/public/stylesheets/components.css | 19 +++++++++++++++++++
src/public/stylesheets/layout.css | 7 ++++---
5 files changed, 40 insertions(+), 17 deletions(-)
create mode 100644 src/app/views/layouts/_header.haml
delete mode 100644 src/app/views/layouts/_header.rhtml
diff --git a/src/app/views/layouts/_header.haml
b/src/app/views/layouts/_header.haml
new file mode 100644
index 0000000..fef6c44
--- /dev/null
+++ b/src/app/views/layouts/_header.haml
@@ -0,0 +1,17 @@
+.header_logo
+ %span Deltacloud Aggregator
+ %ul.nav
+ %li
+ = link_to 'Dashboard'
+ %li
+ = link_to 'Instances'
+ %li
+ = link_to 'Templates'
+ %li
+ = link_to 'Settings'
+
+.header_info
+ #hi-username
+ = link_to @current_user.login, { :controller => "users", :action =>
"show"} unless @current_user.nil?
+ = link_to 'Log out', logout_url unless @current_user.nil?
+ = link_to 'Log in', login_url if @current_user.nil?
diff --git a/src/app/views/layouts/_header.rhtml
b/src/app/views/layouts/_header.rhtml
deleted file mode 100644
index 3086620..0000000
--- a/src/app/views/layouts/_header.rhtml
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="header_logo"><%= image_tag "dcloud.png" %></div>
-
-<div class="header_info">
- <div id="hi-username">
- <%= link_to "Hi, " + @current_user.login,
- { :controller => "users", :action => "show"} unless @current_user.nil?
%>
- </div>
- <form method="POST" id="search-form" action="<%= url_for :controller =>
"search", :action => 'results' %>">
- <input id="textfield_effect" name="terms" value="Search" onkeypress=""
onfocus="if( this.value == this.defaultValue ) this.value='';" type="text">
- <input id="searchbox-button" src="<%= image_path "icon_search.png"%>"
title="Search" type="image"> |
- </form>
- <%= link_to 'Log out', logout_url unless @current_user.nil? %>
- <%= link_to 'Log in', login_url if @current_user.nil? %>
-</div>
\ No newline at end of file
diff --git a/src/public/images/bg_header.png b/src/public/images/bg_header.png
index
04a36a8badffa4bcd159ea667a7d0239fabc1f24..4c4fdd4e5b04881cbff6668af32b5bf0dd2c2c67
100644
GIT binary patch
delta 206
zcmZ3>_=<6YN<Cw7kh>GZx^prw85kJYlDyqr82*Fcg1yTp14TFsJR*x37`TN&n2}-D
z90{n...@v7ebh^0k7myeuhfipk%p#87srr{dvc8aavm_?vlrhnwz+vxjxrq8ep2k_
zlCn4Jy{(Y>Zfm7KJr|C)q=)`...@aq7n;fMo-d$nNET7Y?>vev%egggg*r~1i...@z
z&AOcb?~MitfxyEj`yZ-g1s2zAeq8M5R<Tx8u#WN9<;>OXB6i9^YZ*LU{an^LB{Ts5
D1$<0N
delta 145
zcmaFGxR!B(O1)%>yey$kep*r...@rcv@iHfs)A>3VtQ&&YGO)d;mK4R1_lOyPZ!6K
zid%0kir...@gx&olUnlWxS2%d8O4B~SKhocDO<mx*...@su2-li^@t`*$D;S2<B3?
mZ!tmMx?lTO&Szj|cygX`pT33HeFg?D1_n=8KbLh*2~7YB<UIfY
diff --git a/src/public/stylesheets/components.css
b/src/public/stylesheets/components.css
index af9c85e..61b127d 100644
--- a/src/public/stylesheets/components.css
+++ b/src/public/stylesheets/components.css
@@ -6,6 +6,25 @@
position:absolute;
top:10px;
left:10px;
+ color: #B5B5B5;
+}
+
+.header_logo span {
+ text-transform: uppercase;
+}
+
+ul.nav {
+ padding: 0;
+ padding-top: 1em;
+ margin: 0;
+ white-space: nowrap;
+ list-style-type: none;
+}
+
+ul.nav li {
+ display: inline;
+ font-size: 120%;
+ padding-right: 1em;
}
.header_menu_wrapper {
diff --git a/src/public/stylesheets/layout.css
b/src/public/stylesheets/layout.css
index 41657fc..fcca903 100644
--- a/src/public/stylesheets/layout.css
+++ b/src/public/stylesheets/layout.css
@@ -139,9 +139,10 @@ a { color:#000000; text-decoration: none;}
font-size: 100%;
color: #B5B5B5;
}
-.header_info a:link { color: #B5B5B5; text-decoration: none; }
-.header_info a:active { color: #B5B5B5; text-decoration: none; }
-.header_info a:visited { color: #B5B5B5; text-decoration: none; }
+.header_info a { font-weight: bold; }
+.header_info a:link { color: #000; text-decoration: none; }
+.header_info a:active { color: #000; text-decoration: none; }
+.header_info a:visited { color: #000; text-decoration: none; }
.header_info a:hover { color: #FFFFFF; text-decoration: none; }
#help-div {
--
1.6.6.1
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
