ref: refs/heads/master
commit 456b7bd916a7c377a72baead4ed1411b465902a8
Author: Robert Lihm
Date: Wed Jul 22 15:57:50 2009 +0200
Changed icons in status information and changed floating
---
.../views/patch_updates/_patch_summary.html.erb | 13 +++++--------
.../app/views/patch_updates/_patches.html.erb | 2 +-
.../app/views/status/_status_summary.html.erb | 4 ++--
webclient/public/stylesheets/style.css | 7 +++++++
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/plugins/patch_updates/app/views/patch_updates/_patch_summary.html.erb b/plugins/patch_updates/app/views/patch_updates/_patch_summary.html.erb
index 0d67f4d..2067a9f 100644
--- a/plugins/patch_updates/app/views/patch_updates/_patch_summary.html.erb
+++ b/plugins/patch_updates/app/views/patch_updates/_patch_summary.html.erb
@@ -1,36 +1,33 @@
<div class="status_patches">
<% unless patch %>
- <img src="/images/button_warning.png" alt="warning icon" />
+ <div class="status-icon warning"></div>
<%= _("Error occur during loading patch information.") %>
<% else %>
<% link_to "patch_updates" do %>
<% if patch[:security]+patch[:important] > 0 %>
- <img src="/images/button_critical.png" alt="System need update"/>
<div class="status-icon error"></div>
<% elsif patch[:optional] %>
- <img src="/images/button_warning.png" alt="System contains any update" />
<div class="status-icon warning"></div>
<% else %>
- <img src="/images/button_ok.png" alt="No updates available"/>
<div class="status-icon ok"></div>
<% end %>
<% any_update = false %>
<% if patch[:security] > 0 %>
- <%= _("Security Updates: #{patch[:security]} ") %>
+ <span><%= _("Security Updates: #{patch[:security]} ") %></span>
<% any_update = true %>
<% end %>
<% if patch[:important] > 0 %>
- <%= _("Important Updates: #{patch[:important]} ") %>
+ <span><%= _("Important Updates: #{patch[:important]} ") %></span>
<% any_update = true %>
<% end %>
<% if patch[:optional] > 0 %>
- <%= _("Optional Updates: #{patch[:optional]} ") %>
+ <span><%= _("Optional Updates: #{patch[:optional]} ") %></span>
<% any_update = true %>
<% end %>
<% unless any_update %>
- <%= _("Your system is up to date.") %>
+ <span><%= _("Your system is up to date.") %></span>
<% end %>
<% end %>
<% end %>
diff --git a/plugins/patch_updates/app/views/patch_updates/_patches.html.erb b/plugins/patch_updates/app/views/patch_updates/_patches.html.erb
index bb73170..ba18447 100644
--- a/plugins/patch_updates/app/views/patch_updates/_patches.html.erb
+++ b/plugins/patch_updates/app/views/patch_updates/_patches.html.erb
@@ -23,7 +23,7 @@
<td> name=<%="patch_#{patch_update.resolvable_id}" %> value=<%=patch_update.resolvable_id%> ></td>
<% if kinds.has_key?(patch_update.kind) %>
- <td class="icon" > <%= image_tag(kinds[patch_update.kind]) %> </td>
+ <td class="icon" ><%= image_tag(kinds[patch_update.kind]) %> </td>
<% else %>
<td><%=h patch_update.kind %></td>
<% end %>
diff --git a/plugins/status/app/views/status/_status_summary.html.erb b/plugins/status/app/views/status/_status_summary.html.erb
index 78d2b6c..3f70230 100644
--- a/plugins/status/app/views/status/_status_summary.html.erb
+++ b/plugins/status/app/views/status/_status_summary.html.erb
@@ -1,7 +1,7 @@
<div class="status_status">
<% unless status %>
- <img src="/images/button_warning.png" alt="warning icon" />
- <%= _("Error occur during loading status information.") %>
+ <div class="status-icon warning"></div>
+ <span><%= _("Error occur during loading status information.") %></span>
<% else %>
<% link_to "status" do %>
<% if !status.blank? %>
diff --git a/webclient/public/stylesheets/style.css b/webclient/public/stylesheets/style.css
index 5a41dad..ccd541a 100644
--- a/webclient/public/stylesheets/style.css
+++ b/webclient/public/stylesheets/style.css
@@ -367,7 +367,14 @@ input.button {
width: 23px;
height: 23px;
background: transparent url(images/status-imagemap.png) no-repeat scroll 0 0;
+ float: left;
+}
+
+.status-icon + span {
+ margin-left: 1em;
+ line-height: 2em;
}
+
.status-icon.ok {
background-position: 0 0;
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
