From: Tomas Sedovic <[email protected]>
Move the "view images" page under Templates menu.
Move user links under new Users menu.
Make "add provider/pool" pictures instead of text links.
---
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/public/images/icon_add.png | Bin 0 -> 621 bytes
src/public/stylesheets/components.css | 14 +++++++++---
src/public/stylesheets/dcloud.css | 32 ++++++++++++++++++++++-------
src/public/stylesheets/layout.css | 11 ++++++++++
8 files changed, 56 insertions(+), 22 deletions(-)
delete mode 100644 src/app/views/templates/index.haml
create mode 100644 src/public/images/icon_add.png
diff --git a/src/app/views/layouts/_header.haml
b/src/app/views/layouts/_header.haml
index 5b38b81..9591905 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
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..563e05d 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 image_tag("/images/icon_add.png"), {:controller => "provider",
:action => "new"}, :class => "actionbutton" %>
<h3>Pools</h3>
<ul id="pools">
<% if [email protected]? %>
@@ -37,3 +33,4 @@
<% } %>
<% end %>
</ul>
+<%=link_to image_tag("/images/icon_add.png"), {:controller => "pool", :action
=> "new"}, :class => "actionbutton" %>
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/public/images/icon_add.png b/src/public/images/icon_add.png
new file mode 100644
index
0000000000000000000000000000000000000000..f9eaa70da4c964f8ebf73f6aba7e854dd245093b
GIT binary patch
literal 621
zcmV-z0+RiSP)<h;3K|lk000e1njltq001bw001b...@s6b9#f80006snkl<Zc-rli
z%TE(g6o<izAjJqfW1?YiSRqJc!#`nS+*?Y;_tu3mENUbO%0uf|jA5vtf=a<e...@oz3
z0<^7B+fH9RBBHn#jmgh*W~QW)0YVF7Oy(rtZtncPd+xb2d3i<|Wz_#xm6rbfM^E=a
z3*7{2ZLXE6=yzmNW9`*npnEJSV+i;o|4QIZ5>CPw{-%$>5nF#rjn!3t+}itlk_0&1
z=}ltdqaskzAeODimcz8JS+zy{S!EG_ahN~6EQdS2DU5$m1di2<KeWi|it-{3(Zcs>
zS#CRr3&hy_uNVz3;Z<M>o_AklhTks2J+p|R>CebofLkkg6H2QIVKf29>jb(y...@u
z<Mv1#ZSELaUP!nxD8W7;q3LlH*ZLy3`Y3`cVwl#XvKM$dwSdbH0t(#$Tp}(ygSc=%
zi1UmP#5v;Zy$~9SGY;zz2swbo...@w`amq%0p<zO=bwkmH;0~yIXoPnrR$ek4d;$@
zP)BYJ$I$AQ(dfqrx2ms4_fm!ulz...@0`oodwyhl1j(873eQ5LLuotjT-Tow3v_wn
zayXy&O&UVI1oA6Rb(XO}`$$X~HiFMv70BO-&|SoCVh>SNUS~VN0&O&G94=4#;Hto0
zqL3&cOxq!3QeRd?n2CJ{D^DC|fz}}j&CetX|7+4q`5b^et~nzla...@1&U>Xs*{H{
znDn%OIYYpd^SNhqqEKx!%ap9ayk_U7otlZXlom!AwdMK)xS>m...@a6b;r00000NkvXX
Hu0mjfA50sg
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..16943b2 100644
--- a/src/public/stylesheets/dcloud.css
+++ b/src/public/stylesheets/dcloud.css
@@ -156,17 +156,36 @@ input, select {
}
.actionlink {
- color: blue;
+ color: #0075c0;
line-height: 36px;
font-size: 14px;
padding-left: 18px;
}
+ul#providers + a.actionbutton {
+ border-bottom: 1px solid #ccc;
+}
+
+a.actionbutton {
+ display: block;
+ padding: 0;
+}
+
+a.actionbutton:hover {
+ background: #efefef;
+}
+
+a.actionbutton img {
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+}
+
.submit_link {
background: none;
border:0;
text-decoration: underline;
- color: blue;
+ color: #0075c0;
line-height: 36px;
font-size: 14px;
padding-left: 10px;
@@ -183,7 +202,7 @@ input, select {
}
#side a.actionlink {
- color: blue;
+ color: #0075c0;
line-height: 36px;
font-size: 14px;
padding-left: 10px;
@@ -195,10 +214,6 @@ ul#providers {
padding: 0;
}
-ul#providers li {
- border-bottom: 1px solid #ccc;
-}
-
ul#providers li a {
display: block;
line-height: 36px;
@@ -230,6 +245,7 @@ ul#pools li a {
ul#pools li a:hover {
background: #efefef url(../images/icon_vmpool.png) no-repeat 2px 50%;
+ color: #000;
}
@@ -247,7 +263,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
