From: Tomas Sedovic <[email protected]>
Move the "view images" page under Templates menu.
Move user links under new Users menu.
Move "add provider/pool" links to under the list of providers/pools.
Add a provider icon.
Make Dashboard the root of the app.
---
src/app/views/layouts/_header.haml | 8 ++++--
src/app/views/layouts/_main_nav.html.erb | 7 +----
src/app/views/permissions/list.html.erb | 4 +++
src/app/views/templates/index.haml | 2 -
src/config/routes.rb | 2 +-
src/public/images/icon_provider.png | Bin 0 -> 957 bytes
src/public/stylesheets/components.css | 14 ++++++++---
src/public/stylesheets/dcloud.css | 35 +++++++++++++++++++----------
src/public/stylesheets/layout.css | 11 +++++++++
9 files changed, 56 insertions(+), 27 deletions(-)
delete mode 100644 src/app/views/templates/index.haml
create mode 100644 src/public/images/icon_provider.png
diff --git a/src/app/views/layouts/_header.haml
b/src/app/views/layouts/_header.haml
index 5b38b81..f87652f 100644
--- a/src/app/views/layouts/_header.haml
+++ b/src/app/views/layouts/_header.haml
@@ -1,13 +1,15 @@
- menu = [ { :text => "Dashboard", :controller => "dashboard" }, |
{ :text => "Instances", :controller => "instance" }, |
- { :text => "Templates", :controller => "templates" }, |
- { :text => "Settings", :controller => "settings" } ] |
+ { :text => "Templates", :controller => "image", :action => "show" }, |
+ ({ :text => "Users", :controller => "permissions", :action => "list" } if
(not @current_user.nil? and
has_view_perms?(BasePermissionObject.general_permission_scope))), |
+ { :text => "Settings", :controller => "settings" }, |
+ ].find_all {|item| item != nil} |
.header_logo
%span Deltacloud Aggregator
%ul.nav
- menu.each do |item|
%li{ :class => ("selected" if item[:controller] ==
controller.controller_name) }
- = link_to item[:text], { :controller => item[:controller] }
+ = link_to item[:text], { :controller => item[:controller], :action =>
item[:action] }
.header_info
#hi-username
diff --git a/src/app/views/layouts/_main_nav.html.erb
b/src/app/views/layouts/_main_nav.html.erb
index d18ac48..6a970f6 100644
--- a/src/app/views/layouts/_main_nav.html.erb
+++ b/src/app/views/layouts/_main_nav.html.erb
@@ -1,10 +1,5 @@
-<%=link_to "View images", {:controller => "image", :action => "show"}, :class
=> "actionlink" %>
-<%=link_to "Add a provider", {:controller => "provider", :action => "new"},
:class => "actionlink" %>
-<%=link_to "Add a pool", {:controller => "pool", :action => "new"}, :class
=> "actionlink" %>
-<%= link_to "Add a user", {:controller => "users", :action => "new"},
:class=>"actionlink" if
has_user_modify?(BasePermissionObject.general_permission_scope) %>
-<%= link_to "User access", {:controller => "permissions", :action => "list"},
:class=>"actionlink" if
has_view_perms?(BasePermissionObject.general_permission_scope) %>
<h3>Providers</h3>
<ul id="providers">
<% cur_id = params[:id].to_i %>
@@ -23,6 +18,7 @@
<% } %>
<% end %>
</ul>
+<%=link_to "Add a provider", {:controller => "provider", :action => "new"},
:class => "actionlink" %>
<h3>Pools</h3>
<ul id="pools">
<% if [email protected]? %>
@@ -37,3 +33,4 @@
<% } %>
<% end %>
</ul>
+<%=link_to "Add a pool", {:controller => "pool", :action => "new"}, :class =>
"actionlink" %>
diff --git a/src/app/views/permissions/list.html.erb
b/src/app/views/permissions/list.html.erb
index 585e6d3..e935411 100644
--- a/src/app/views/permissions/list.html.erb
+++ b/src/app/views/permissions/list.html.erb
@@ -27,6 +27,10 @@
</tbody>
</table>
<% end %>
+<%= link_to "Add a user",
+ {:controller => "users",
+ :action => "new"},
+ :class=>"actionlink" if
has_user_modify?(BasePermissionObject.general_permission_scope) %>
<%= link_to "Add a new permission record",
{:action => "new",
:permission_object_type => @permission_object.class,
diff --git a/src/app/views/templates/index.haml
b/src/app/views/templates/index.haml
deleted file mode 100644
index 4ce55ab..0000000
--- a/src/app/views/templates/index.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-%h1 Templates/index
-%p located in app/view/templates/index.haml
diff --git a/src/config/routes.rb b/src/config/routes.rb
index ea5bcc2..acb2b3f 100644
--- a/src/config/routes.rb
+++ b/src/config/routes.rb
@@ -35,7 +35,7 @@ ActionController::Routing::Routes.draw do |map|
map.resources :pool
- map.connect '', :controller => 'provider'
+ map.connect '', :controller => 'dashboard'
map.login 'login', :controller => "user_sessions", :action => "new"
map.logout 'logout', :controller => "user_sessions", :action => "destroy"
diff --git a/src/public/images/icon_provider.png
b/src/public/images/icon_provider.png
new file mode 100644
index
0000000000000000000000000000000000000000..b73633abfaceda3db4a9242c9aee88556e9868eb
GIT binary patch
literal 957
zcmV;u148_XP)<h;3K|Lk000e1NJLTq000;O000&u...@s6+i?jz0000pbvxqnq*un;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#Ur9tkRCwB~RZVCUK@|RGceB};q$Vb*
zZES79wANPqgNj9^7OEmD3Zkgs4~TdX=|NHOAgEVwf?fm_K~Ketf`STODtc36#otPy
zX{&A0CbrpZcE;J=WRo_j7UGZxGjDgk?|tvReIfNHZ-Orwj9mi3ae#zT$zm+V^vu1)
z>xWlU(HAKx=e!(@EIS`+iol^L72#{?bnVa2U(V5t>gEI&gyc|^2aOY<NCc9D3(;vs
zW?&dtqT)Hk`TUjwkf0!npt_F#u?#E-f}d}_Qr<ZiIL&4;`souUVlne<q_DcV8J<vR
zK3vj234XqRhy9yYqI1no^E?_);_j1I82T{<UtQhb;fWwf#gWcl$&nG9-PeiENC0k!
z<*Rpj(QtSxZanHkba)u<K%fjTDWogE(K*3vYw;`Cwmg7(53tB-Sz{H@;sZ|a>Oifi
zVSI2937)=8I*ly9W0<aKMrRrVNQnX?RdIevS5=%j(v5...@dncmj<n...@~f8isxt
zp}#*0&(cQ73l_{Qf~`Qa2-2f59O!68$mhktG{ybs7<M=L;E_eE2ER2t8<<3vGOP=G
zu{{!mEQyGv+HvL1V`NwmqAcfYP^w^0dkc<qMBw62WPu`)*5DKgSIjV!($M>H99=w5
zZNZt+!n{bAj_tt3+mAv0)#m%WUx{6V%=8q7`#)fFYdspgjHiad=Ok!cD1+mh7i!!R
zPOS~0HK3U1V)M%kZ2<?4cCW|u<b*lexbyww2...@vnscl97iev1wixhw84ioajxef
zg<@mVV$>Qf$E+0D3N|z^!RnxdYK6`TFdqv!DLR_MmIBdIkeh-)kc0F1D<bg86kAp;
zgG=Fs79=4*O);8mp...@ls=kv$hv(kn0!#$...@*ihhsb!mnwfnxdxn8ujj<vnezR
zxMYX%MHdLBrqj6gurGIySw9oe+~oE-mfW7rA|W95s7S}-W*15ME;2...@g{ebl(7?jz-
z%npLFawCWUq~uFxzi3tu+R|+RW=G75i2qKIL!tTvmtYYvO}(e9jviwCQ4o|86sssA
zm{AH+a8sQRy~&a1JVm-mF!A>3Wp8Vjm&mTY+!;V|?q}pZA2mZs_;z;ngq|FGnRwHC
fizx2je*_o+S+hIciLW~`00000NkvXXu0mjf;~coE
literal 0
HcmV?d00001
diff --git a/src/public/stylesheets/components.css
b/src/public/stylesheets/components.css
index 1391fc5..dc2d415 100644
--- a/src/public/stylesheets/components.css
+++ b/src/public/stylesheets/components.css
@@ -22,12 +22,18 @@ ul.nav {
ul.nav li {
display: inline;
- font-size: 120%;
- padding: 5px;
+ font-size: 110%;
+ padding: 4px 12px 6px 12px;
}
ul.nav li.selected {
- background: #cacaca;
+ background: #cbd6db !important;
+ -moz-border-radius: 16px;
+}
+
+ul.nav li:hover {
+ background: #dedede;
+ -moz-border-radius: 16px;
}
.header_menu_wrapper {
@@ -148,7 +154,7 @@ ul.nav li.selected {
display: block;
float: left;
margin: 0px 15px 5px 0px;
- color: blue;
+ color: #0075c0;
text-decoration: underline;
}
diff --git a/src/public/stylesheets/dcloud.css
b/src/public/stylesheets/dcloud.css
index 1621778..18b8dff 100644
--- a/src/public/stylesheets/dcloud.css
+++ b/src/public/stylesheets/dcloud.css
@@ -156,17 +156,22 @@ input, select {
}
.actionlink {
- color: blue;
+ color: #0075c0;
line-height: 36px;
font-size: 14px;
padding-left: 18px;
}
+ul#providers + a.actionlink {
+ display: block;
+ border-bottom: 1px solid #ccc;
+}
+
.submit_link {
background: none;
border:0;
text-decoration: underline;
- color: blue;
+ color: #0075c0;
line-height: 36px;
font-size: 14px;
padding-left: 10px;
@@ -183,7 +188,7 @@ input, select {
}
#side a.actionlink {
- color: blue;
+ color: #0075c0;
line-height: 36px;
font-size: 14px;
padding-left: 10px;
@@ -192,22 +197,18 @@ input, select {
ul#providers {
list-style-type: none;
margin: 0;
- padding: 0;
-}
-
-ul#providers li {
- border-bottom: 1px solid #ccc;
+ padding: 0 0 0 10px;
}
ul#providers li a {
display: block;
line-height: 36px;
- padding-left: 10px;
+ padding-left: 32px;
}
ul#providers li a:hover {
- color: #333;
- background: #efefef;
+ background: #efefef url(../images/icon_provider.png) no-repeat 2px 50%;
+ color: #000;
}
ul#pools {
@@ -230,6 +231,7 @@ ul#pools li a {
ul#pools li a:hover {
background: #efefef url(../images/icon_vmpool.png) no-repeat 2px 50%;
+ color: #000;
}
@@ -237,6 +239,15 @@ ul#pools li a:hover {
font-size: 14px;
}
+.providername {
+ background: url(../images/icon_provider.png) no-repeat 2px 50%;
+}
+
+.providername.selected {
+ background: #5599B8 url(../images/icon_provider.png) no-repeat 2px 50%;
+ color: #FFF;
+}
+
.poolname {
background: url(../images/icon_vmpool.png) no-repeat 2px 50%;
}
@@ -247,7 +258,7 @@ ul#pools li a:hover {
}
.poolname.selected {
- background: #f2a922 url(../images/icon_vmpool.png) no-repeat 2px 50%;
+ background: #5599B8 url(../images/icon_vmpool.png) no-repeat 2px 50%;
color: #FFF;
}
diff --git a/src/public/stylesheets/layout.css
b/src/public/stylesheets/layout.css
index 1ccee4c..3ab4d6e 100644
--- a/src/public/stylesheets/layout.css
+++ b/src/public/stylesheets/layout.css
@@ -30,6 +30,10 @@ img
a { color:#000000; text-decoration: none;}
+h2, h3 {
+ font-weight: normal;
+}
+
/**************************
oVirt layout components
**/
@@ -65,6 +69,13 @@ a { color:#000000; text-decoration: none;}
border-right: 1px #CCCCCC solid;
}
+#side h3 {
+ color: #999999;
+ font-size: 1em;
+ margin: 1em 1em .5em 1em;
+ text-transform: uppercase;
+}
+
#side-toolbar{
float:none;
--
1.6.6.1
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
