ref: refs/heads/master
commit 36aeeb54d7366abee4729d2827b8206026882146
Author: Robert Lihm
Date: Tue Nov 3 15:43:27 2009 +0100
* added 960 grid to main view
* moved headline out of status box
---
webclient/app/views/controlpanel/index.rhtml | 13 ++++++-----
webclient/app/views/layouts/main.rhtml | 2 +-
webclient/public/stylesheets/style.css | 30 ++++++++++++++++++-------
3 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/webclient/app/views/controlpanel/index.rhtml b/webclient/app/views/controlpanel/index.rhtml
index 7d44378..55d79d9 100644
--- a/webclient/app/views/controlpanel/index.rhtml
+++ b/webclient/app/views/controlpanel/index.rhtml
@@ -20,12 +20,15 @@
});
<% end -%>
<% end %>
-<div id="status-wrapper" class="">
+
+ <h3><%= image_tag("/images/monitoring.png", :height=>"23", :width=>"23", :border=>"0") %> <%= _("Status") %></h3>
+
+<div id="status-wrapper" class="grid_12">
<% if ActionController::Routing.possible_controllers.include?("system") %>
<% host = Host.find(session[:host]) rescue nil %>
<% host_name = host.nil? ? 'the machine' : "'#{host.name}'" %>
- <div id="machine-controle">
+ <div id="machine-controle" class="grid_3 omega">
<ul>
<li><h4><%= _("System actions")%></h4></li>
<li><%= link_to _('Reboot'), {:controller => 'system', :action => 'reboot'},
@@ -36,9 +39,7 @@
</div>
<% end %>
- <h3><%= image_tag("/images/monitoring.png", :height=>"23", :width=>"23", :border=>"0") %> <%= _("Status") %></h3>
-
- <div id="status_patches">
+ <div id="status_patches" class="grid_8">
<% if ActionController::Routing.possible_controllers.include?("patch_updates") %>
<%= image_tag("/images/working.gif", :height=>"32", :width=>"32", :border=>"0") %> <%= _("Loading patch information") %>
<% else %>
@@ -46,7 +47,7 @@
<% end %>
</div>
<br/>
- <div id="status_status">
+ <div id="status_status" class="grid_8">
<% if ActionController::Routing.possible_controllers.include?("status") %>
<%= image_tag("/images/working.gif", :height=>"32", :width=>"32", :border=>"0") %> <%= _("Loading system information") %>
<% else %>
diff --git a/webclient/app/views/layouts/main.rhtml b/webclient/app/views/layouts/main.rhtml
index a285c3f..96857b4 100644
--- a/webclient/app/views/layouts/main.rhtml
+++ b/webclient/app/views/layouts/main.rhtml
@@ -65,7 +65,7 @@
<div id="content" class="container_12">
<!-- here both flash and dynamic notifications should be added -->
- <div id="flash-messages" class="grid_12">
+ <div id="flash-messages" class="grid_12 alpha">
<div id="language_selection"></div>
<!-- show the flash messages -->
diff --git a/webclient/public/stylesheets/style.css b/webclient/public/stylesheets/style.css
index 629264a..924845d 100644
--- a/webclient/public/stylesheets/style.css
+++ b/webclient/public/stylesheets/style.css
@@ -200,8 +200,8 @@ ul li {
margin: 0 0 0.2em;
text-align: left;
}
- #favorites,
- #status-wrapper {
+/* #status-wrapper, */
+ #favorites {
padding: 10px;
}
#status-wrapper {
@@ -211,29 +211,40 @@ ul li {
margin: 0 0 1em;
background: #f9f9f9;
position: relative;
+ overflow: hidden;
}
+
+
#status-wrapper h3:first-child {
margin-top: 0;
}
#status-wrapper #machine-controle {
display: block;
- position: absolute;
- top: 0;
- right: 0;
- width: 250px;
+ min-height: 110px;
height: 100%;
overflow: hidden;
border-left: 1px solid #999;
background-color: #eee;
+
+ float: right;
+ }
+ #status-wrapper #status_patches,
+ #status-wrapper #status_status {
+ margin: 10px;
}
-
#status-wrapper #machine-controle ul {
list-style: none outside;
+ margin: 10px 0;
}
#status-wrapper #machine-controle ul li {
margin: 0.5em 0;
}
+
+ #status-wrapper #machine-controle h4 {
+ margin: 0;
+ }
+
/* == Lists and Tables ==================================================== */
.list-row {
@@ -463,6 +474,7 @@ input[type="submit"] {
display: block;
width: 23px;
height: 23px;
+ margin-right: 1em;
background: transparent url(images/status-imagemap.png) no-repeat scroll 0 0;
float: left;
}
@@ -476,7 +488,7 @@ input[type="submit"] {
}
.status-icon + span {
- margin-left: 1em;
+/* margin-left: 1em;*/
line-height: 2em;
}
@@ -579,7 +591,7 @@ th.checkbox {
/* Error Messages */
#flash-messages {
- margin-bottom: 1em;
+ margin-bottom: 2em;
}
.flash-message {
margin-top: 20px;
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
Robert Lihm