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 - [email protected] + +- notifier takes the correct models (bnc#697360) +- 0.2.13 + +------------------------------------------------------------------- +Thu May 19 09:59:25 UTC 2011 - [email protected] + +- 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 <[email protected]>\n" -"Language-Team: Novell Language <[email protected]>\n" +"Last-Translator: Novell Lang <[email protected]>\n" +"Language-Team: Novell Lang <[email protected]>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app/controllers/status_controller.rb:149 ./app/controllers/status_controller.rb:149 +#: app/controllers/status_controller.rb:149 +#: app/controllers/status_controller.rb:149 msgid "No data found for showing system status." msgstr "Für die Anzeige des Systemstatus wurden keine Daten gefunden." -#: app/controllers/status_controller.rb:157 ./app/controllers/status_controller.rb:157 +#: app/controllers/status_controller.rb:157 +#: app/controllers/status_controller.rb:157 msgid "Status not available." msgstr "Status nicht verfügbar." -#: app/controllers/status_controller.rb:176 ./app/controllers/status_controller.rb:176 +#: app/controllers/status_controller.rb:176 +#: app/controllers/status_controller.rb:176 msgid "Can't connect to host" msgstr "Keine Verbindung zum Host möglich" -#: app/controllers/status_controller.rb:178 ./app/controllers/status_controller.rb:178 +#: app/controllers/status_controller.rb:178 +#: app/controllers/status_controller.rb:178 msgid "Can't connect to host %s." msgstr "Keine Verbindung zum Host %s möglich" -#: app/controllers/status_controller.rb:217 ./app/controllers/status_controller.rb:217 +#: app/controllers/status_controller.rb:217 +#: app/controllers/status_controller.rb:217 msgid "Limits exceeded for " msgstr "Grenzwerte überschritten für " -#: app/controllers/status_controller.rb:242 ./app/controllers/status_controller.rb:242 +#: app/controllers/status_controller.rb:242 +#: app/controllers/status_controller.rb:242 msgid "Status not available" msgstr "Status nicht verfügbar" -#: app/controllers/status_controller.rb:266 ./app/controllers/status_controller.rb:266 +#: app/controllers/status_controller.rb:266 +#: app/controllers/status_controller.rb:266 msgid "Status not available (no permissions)" msgstr "Status nicht verfügbar (keine Berechtigungen)" -#: app/controllers/status_controller.rb:328 ./app/controllers/status_controller.rb:328 +#: app/controllers/status_controller.rb:328 +#: app/controllers/status_controller.rb:328 msgid "exceeded" msgstr "überschritten" -#: app/controllers/status_controller.rb:342 ./app/controllers/status_controller.rb:342 +#: app/controllers/status_controller.rb:342 +#: app/controllers/status_controller.rb:342 msgid "undercut" msgstr "unter" -#: app/controllers/status_controller.rb:444 ./app/controllers/status_controller.rb:444 +#: app/controllers/status_controller.rb:445 +#: app/controllers/status_controller.rb:445 msgid "Limits have been written." msgstr "Die Grenzwerte wurden geschrieben." -#: app/views/status/edit.html.erb:48 ./app/views/status/edit.html.erb:48 -msgid "Only numbers are valid !" -msgstr "Es sind nur Zahlen gültig!" - -#: app/views/status/edit.html.erb:75 app/views/status/index.html.erb:52 -#: ./app/views/status/edit.html.erb:75 ./app/views/status/index.html.erb:52 ./shortcuts.yml:6 -msgid "Status" -msgstr "Status" - -#: app/views/status/edit.html.erb:75 ./app/views/status/edit.html.erb:75 -msgid "Settings" -msgstr "Einstellungen" - -#: app/views/status/edit.html.erb:89 ./app/views/status/edit.html.erb:89 -msgid "undercuts" -msgstr "Unterschreitungen" - -#: app/views/status/edit.html.erb:89 ./app/views/status/edit.html.erb:89 -msgid "exceeds" -msgstr "Überschreitungen" +#: app/views/status/_status_summary.html.erb:5 +#: app/views/status/_status_summary.html.erb:5 +msgid "An problem occured when loading status information." +msgstr "Beim Laden von Status-Informationen ist ein Fehler aufgetreten." -#: app/views/status/index.html.erb:103 ./app/views/status/index.html.erb:103 -msgid "details" -msgstr "Details" +#: app/views/status/_status_summary.html.erb:27 +#: app/views/status/_status_summary.html.erb:27 +msgid "Cannot read system status - you have been logged out." +msgstr "Systemstatus kann nicht gelesen werden - Sie wurden abgemeldet." -#: app/views/status/index.html.erb:119 ./app/views/status/index.html.erb:119 -msgid "Details" -msgstr "Details" +#: app/views/status/_status_summary.html.erb:38 +#: app/views/status/_status_summary.html.erb:38 +msgid "Your system is healthy." +msgstr "Ihr System ist in einem einwandfreien Zustand." -#: app/views/status/index.html.erb:187 ./app/views/status/index.html.erb:187 -msgid "Edit Limits" -msgstr "Grenzwerte bearbeiten" +#: app/views/status/_status_summary.html.erb:49 +#: app/views/status/_status_summary.html.erb:49 +msgid "Loading system information" +msgstr "Laden von Systeminformationen" -#: app/views/status/_status_graph.html.erb:2 ./app/views/status/_status_graph.html.erb:2 +#: app/views/status/_status_graph.html.erb:2 +#: app/views/status/_status_graph.html.erb:2 msgid "A problem occured when loading status information." msgstr "Beim Laden von Statusinformationen ist ein Fehler aufgetreten." -#: app/views/status/_status_graph.html.erb:90 ./app/views/status/_status_graph.html.erb:90 +#: app/views/status/_status_graph.html.erb:90 +#: app/views/status/_status_graph.html.erb:90 msgid "Show last" msgstr "Letzten Zeitraum anzeigen" -#: app/views/status/_status_graph.html.erb:91 ./app/views/status/_status_graph.html.erb:91 +#: app/views/status/_status_graph.html.erb:91 +#: app/views/status/_status_graph.html.erb:91 msgid "5 Minutes" msgstr "5 Minuten" -#: app/views/status/_status_graph.html.erb:92 ./app/views/status/_status_graph.html.erb:92 +#: app/views/status/_status_graph.html.erb:92 +#: app/views/status/_status_graph.html.erb:92 msgid "15 Minutes" msgstr "15 Minuten" -#: app/views/status/_status_graph.html.erb:93 ./app/views/status/_status_graph.html.erb:93 +#: app/views/status/_status_graph.html.erb:93 +#: app/views/status/_status_graph.html.erb:93 msgid "30 Minutes" msgstr "30 Minuten" -#: app/views/status/_status_graph.html.erb:94 ./app/views/status/_status_graph.html.erb:94 +#: app/views/status/_status_graph.html.erb:94 +#: app/views/status/_status_graph.html.erb:94 msgid "1 Hour" msgstr "1 Stunde" -#: app/views/status/_status_graph.html.erb:95 ./app/views/status/_status_graph.html.erb:95 +#: app/views/status/_status_graph.html.erb:95 +#: app/views/status/_status_graph.html.erb:95 msgid "6 Hours" msgstr "6 Stunden" -#: app/views/status/_status_graph.html.erb:96 ./app/views/status/_status_graph.html.erb:96 +#: app/views/status/_status_graph.html.erb:96 +#: app/views/status/_status_graph.html.erb:96 msgid "12 Hours" msgstr "12 Stunden" -#: app/views/status/_status_summary.html.erb:6 ./app/views/status/_status_summary.html.erb:6 -msgid "An problem occured when loading status information." -msgstr "Beim Laden von Status-Informationen ist ein Fehler aufgetreten." +#: app/views/status/edit.html.erb:49 app/views/status/edit.html.erb:49 +msgid "Only numbers are valid !" +msgstr "Es sind nur Zahlen gültig!" -#: app/views/status/_status_summary.html.erb:13 ./app/views/status/_status_summary.html.erb:13 -msgid "Cannot read system status - you have been logged out." -msgstr "Systemstatus kann nicht gelesen werden - Sie wurden abgemeldet." +#: app/views/status/edit.html.erb:76 app/views/status/edit.html.erb:85 +#: app/views/status/index.html.erb:59 app/views/status/index.html.erb:68 +#: app/views/status/edit.html.erb:76 app/views/status/edit.html.erb:85 +#: app/views/status/index.html.erb:59 app/views/status/index.html.erb:68 +#: shortcuts.yml:7 +msgid "Status" +msgstr "Status" -#: app/views/status/_status_summary.html.erb:16 ./app/views/status/_status_summary.html.erb:16 -msgid "Your system is healthy." -msgstr "Ihr System ist in einem einwandfreien Zustand." +#: app/views/status/edit.html.erb:76 app/views/status/edit.html.erb:85 +#: app/views/status/edit.html.erb:76 app/views/status/edit.html.erb:85 +msgid "Settings" +msgstr "Einstellungen" -#: app/views/status/_status_summary.html.erb:26 ./app/views/status/_status_summary.html.erb:26 -msgid "Loading system information" -msgstr "Laden von Systeminformationen" +#: app/views/status/edit.html.erb:106 app/views/status/edit.html.erb:106 +msgid "undercuts" +msgstr "Unterschreitungen" + +#: app/views/status/edit.html.erb:106 app/views/status/edit.html.erb:106 +msgid "exceeds" +msgstr "Überschreitungen" -#: app/views/status/_status_progress.html.erb:8 ./app/views/status/_status_progress.html.erb:8 +#: app/views/status/_status_progress.html.erb:8 +#: app/views/status/_status_progress.html.erb:8 msgid "Checking system status" msgstr "Systemstatus wird überprüft" -#: ./shortcuts.yml:7 +#: app/views/status/index.html.erb:125 app/views/status/index.html.erb:125 +msgid "details" +msgstr "Details" + +#: app/views/status/index.html.erb:141 app/views/status/index.html.erb:141 +msgid "Details" +msgstr "Details" + +#: app/views/status/index.html.erb:213 app/views/status/index.html.erb:213 +msgid "Edit Limits" +msgstr "Grenzwerte bearbeiten" + +#: shortcuts.yml:8 msgid "Show system status" msgstr "Systemstatus anzeigen" - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
