Hello community,
here is the log from the commit of package webyast-status-ui for openSUSE:Factory
checked in at Mon Jun 6 16:55:38 CEST 2011.
--------
--- webyast-status-ui/webyast-status-ui.changes 2011-05-18 15:01:50.000000000 +0200
+++ /mounts/work_src_done/STABLE/webyast-status-ui/webyast-status-ui.changes 2011-06-06 13:54:43.000000000 +0200
@@ -1,0 +2,12 @@
+Mon Jun 6 11:52:15 UTC 2011 - schubi@novell.com
+
+- notifier takes the correct models (bnc#697360)
+- 0.2.13
+
+-------------------------------------------------------------------
+Thu May 19 09:59:25 UTC 2011 - vlewin@novell.com
+
+- uniform style for webyast-status-ui
+- 0.2.12
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ webyast-status-ui.spec ++++++
--- /var/tmp/diff_new_pack.N3MHkP/_old 2011-06-06 16:53:41.000000000 +0200
+++ /var/tmp/diff_new_pack.N3MHkP/_new 2011-06-06 16:53:41.000000000 +0200
@@ -29,7 +29,7 @@
Group: Productivity/Networking/Web/Utilities
Url: http://en.opensuse.org/Portal:WebYaST
AutoReqProv: on
-Version: 0.2.11
+Version: 0.2.13
Release: 1
Summary: WebYaST - system status UI
Source: www.tar.bz2
++++++ www.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/status/_status_summary.html.erb new/www/app/views/status/_status_summary.html.erb
--- old/www/app/views/status/_status_summary.html.erb 2011-05-11 14:26:55.000000000 +0200
+++ new/www/app/views/status/_status_summary.html.erb 2011-06-01 14:46:00.000000000 +0200
@@ -37,8 +37,11 @@
<% end %>
<% javascript_tag do -%>
- jQuery(function($){ $('#status-eye').addClass('eye_warning'); });
- //$('#status_indicator').addClass("status_warning");
+ if($.browser.msie() && $.browser.version.number() == 8 ) {
+ $('#status-eye').css("background", "url(/images/circle-red.png)").addClass('eye_warning');
+ } else {
+ $('#status-eye').addClass('eye_warning');
+ }
<% end -%>
<% else %>
@@ -49,9 +52,13 @@
</a>
</div>
<% elsif !error %>
- <% javascript_tag do -%>jQuery(function($){
- if($('#status-eye').hasClass("eye_warning") == false) { $('#status-eye').addClass('eye_healthy'); } });
- //$('#status_indicator').addClass("status_ok");
+ <% javascript_tag do -%>
+ if($('#status-eye').hasClass("eye_warning") == false) {
+ $('#status-eye').addClass('eye_healthy');
+ if($.browser.msie() && $.browser.version.number() == 8 ) {
+ $('#status-eye').css("background", "url(/images/circle-green.png)");
+ }
+ }
<% end -%>
<div class="statusbar_row">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/status/edit.html.erb new/www/app/views/status/edit.html.erb
--- old/www/app/views/status/edit.html.erb 2011-04-14 16:18:10.000000000 +0200
+++ new/www/app/views/status/edit.html.erb 2011-05-24 16:07:38.000000000 +0200
@@ -22,6 +22,7 @@
<% write_disabled = !@permissions[:writelimits] %>
<% content_for :head do %>
+
<!--<%= javascript_include_tag :defaults %>-->
<% javascript_tag do -%>
@@ -72,14 +73,30 @@
<% end %>
<% end %>
-<div class='plugin-icon'><img alt="monitoring" src='/icons/monitoring.png'/><%=_("Status") + header_spacer + _("Settings")%><span id="questionMark">?</span></div>
-<div class="plugin-content">
-<% form_tag( {:action => :save} , { :onsubmit => "return validateLimits();"} ) do %>
- <div class="accordion">
+<!--<div class='plugin-icon'><img alt="monitoring" src='/icons/monitoring.png'/><%_("Status") + header_spacer + _("Settings")%><span id="questionMark">?</span></div>
+<div class="plugin-content"> -->
+<div class="plugin-content plugin-border">
+
+
+<% form_tag( {:action => :save} , { :class=>"webyast_form", :onsubmit => "return validateLimits();"} ) do %>
+ <div class="plugin-header">
+ <div class="left">
+ <label class="plugin-icon-container"><img class="plugin-icon" src="/icons/monitoring.png"></label>
+ <label class="plugin-name"><%=_("Status") + header_spacer + _("Settings")%></label>
+ </div>
+
+ <div class="right" >
+ <!--<span id="questionMark" style="margin:0px 5px; float:none;">?</span>-->
+ </div>
+ <div class="clearfix"></div>
+ </div>
+
+ <div class="clearfix"> </div>
+ <div class="accordion" style="padding:5px;">
<% @graphs.each do |group| %>
- <fieldset id="<%= group.id %>">
+ <fieldset id="<%= group.id %>" style="border:1px solid #d0d0d0; border-radius:2px; background-color:#f0f0f0" >
<legend id="<%= group.id %>"><%= group.id %></legend>
- <div>
+ <div style="padding:5px;">
<% group.single_graphs.each do |single_graph| %>
<% group_name = (group.single_graphs.size > 1) ? single_graph.headline : "" %>
<label>Alarm, if <%= group_name %></label>
@@ -111,11 +128,15 @@
</fieldset>
<% end %>
</div>
- <div class="nav-buttons">
- <%= form_next_button :disabled => write_disabled %>
- <%= form_str_spacer %>
- <%= form_back_button :action => :index%>
+
+ <div class="button_container">
+ <div class="hr"> </div>
+ <div class="nav-buttons">
+ <%= form_next_button :disabled => write_disabled %>
+ <%= form_str_spacer %>
+ <%= form_back_button :action => :index%> </div>
</div>
+
<% end %>
</div>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/status/index.html.erb new/www/app/views/status/index.html.erb
--- old/www/app/views/status/index.html.erb 2011-04-12 13:05:56.000000000 +0200
+++ new/www/app/views/status/index.html.erb 2011-06-06 13:53:10.000000000 +0200
@@ -22,10 +22,10 @@
<% content_for :head do %>
<!--[if IE]><%= javascript_include_tag "excanvas.js" %><![endif]-->
<%= javascript_include_tag "jrails.js" %>
-
<% if JSMIN == true %>
<%= javascript_include_tag "min/status-min" %>
<% else %>
+ <%= stylesheet_link_tag "webyast-status" %>
<%= javascript_include_tag "jquery.jqplot.js" %>
<%= javascript_include_tag "plugin/jqplot.categoryAxisRenderer.js" %>
<%= javascript_include_tag "plugin/jqplot.dateAxisRenderer.js" %>
@@ -39,7 +39,7 @@
<% content_for :before_script do %>
<% javascript_tag do %>
var AUTH_TOKEN = 'authenticity_token=' + encodeURIComponent("<%= escape_javascript form_authenticity_token %>");
- startNotifier({'module':'status', 'AUTH_TOKEN':AUTH_TOKEN}, 1000, 11000);
+ startNotifier({'module':'graphs,plugins', 'AUTH_TOKEN':AUTH_TOKEN}, 1000, 11000);
$(document).ready(function() {
$(".accordion").accordion({
@@ -56,10 +56,25 @@
<!--<%= javascript_include_tag :defaults %>-->
-<div class='plugin-icon'><img alt="monitoring" src='/icons/monitoring.png' width="48px" height="48"/><%=_("Status")%><span id="questionMark">?</span></div>
-<div class="plugin-content">
+<!-- <div class='plugin-icon'><img alt="monitoring" src='/icons/monitoring.png' width="48px" height="48"/><%=_("Status")%><span id="questionMark">?</span></div>
+<div class="plugin-content"> -->
+<div class="plugin-content plugin-border">
+<div class="webyast_form">
<div class="accordion">
+ <div class="plugin-header">
+ <div class="left">
+ <label class="plugin-icon-container"><img class="plugin-icon" src="/icons/monitoring.png"></label>
+ <label class="plugin-name"><%=_("Status")%></label>
+ </div>
+
+ <div class="right" >
+ <span id="questionMark" style="margin:0px 5px; float:none;">?</span>
+ </div>
+ <div class="clearfix"></div>
+ </div>
+
+ <div class="clearfix"> </div>
<% if @graphs %>
<% @graphs.each do |group| %>
<div class="list-fieldset"> <!-- RORSCAN_INL_12 th whole block -->
@@ -189,11 +204,16 @@
:update => log_id(log.id)) #currently due missing '=' disabled %>
<% end %>
</div>
- <div class="nav-buttons">
- <p>
- <%= link_to _("Edit Limits"), '/status/edit' %>
- </p>
- <%= form_back_button %>
+
+
+
+ <div class="button_container">
+ <div class="nav-buttons">
+ <div class="hr"> </div>
+ <p><%= link_to _("Edit Limits"), '/status/edit' %></p>
+ <%= form_back_button %>
+ </div>
</div>
</div>
+</div>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/po/de/webyast-status-ui.po new/www/po/de/webyast-status-ui.po
--- old/www/po/de/webyast-status-ui.po 2011-04-06 15:14:49.000000000 +0200
+++ new/www/po/de/webyast-status-ui.po 2011-06-01 12:41:15.000000000 +0200
@@ -4,141 +4,168 @@
msgid ""
msgstr ""
"Project-Id-Version: webyast-status-ui\n"
-"POT-Creation-Date: 2010-08-18 10:18+0200\n"
+"POT-Creation-Date: 2011-05-30 16:16+0200\n"
"PO-Revision-Date: 2010-08-26 08:58\n"
-"Last-Translator: Novell Language