October 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] <web-client> master : use text names for languages instead of flags (bnc#541528)
by Ladislav Slezak 30 Oct '09

30 Oct '09

ref: refs/heads/master commit 7781222eea33c1659c5b9a1d423c0ac4f0a2fd5e Author: Ladislav Slezak <lslezak(a)novell.com> Date: Fri Oct 30 17:22:51 2009 +0100 use text names for languages instead of flags (bnc#541528) the strings have been read from language_<xy>_<YZ>.ycp file, the remaning left from http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes --- webclient/app/views/layouts/main.rhtml | 4 +- webclient/package/yast2-webclient.changes | 6 +++ webclient/package/yast2-webclient.spec | 2 +- .../vendor/plugins/lang_helper/lib/lang_helper.rb | 33 +++++++++++++++++-- 4 files changed, 38 insertions(+), 7 deletions(-) diff --git a/webclient/app/views/layouts/main.rhtml b/webclient/app/views/layouts/main.rhtml index 2aa54d0..694e968 100644 --- a/webclient/app/views/layouts/main.rhtml +++ b/webclient/app/views/layouts/main.rhtml @@ -47,8 +47,8 @@ if host.blank? || user.blank? -%> <% else -%> <ul> - <li><%= link_to_remote( image_tag(current_locale_image, :size => "16x11", :alt => "#{current_locale}"), - :update =>"language_selection", :url => { :controller => :controlpanel, :action => :select_language} ) %></li> + <li><%=_("Langugage:")%> <strong><%= link_to_remote(current_locale_name, + :update =>"language_selection", :url => { :controller => :controlpanel, :action => :select_language} ) %></strong></li> <li><strong><%=_("Connected Host")%></strong></li> <li><%=_("Name:")%> <strong><%= host.name -%></strong></li> <li><%=_("User:")%> <strong><%= user -%></strong></li> diff --git a/webclient/package/yast2-webclient.changes b/webclient/package/yast2-webclient.changes index a05e9c0..6c238c0 100644 --- a/webclient/package/yast2-webclient.changes +++ b/webclient/package/yast2-webclient.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 30 17:20:01 CET 2009 - lslezak(a)suse.cz + +- use text names for languages instead of flags (bnc#541528) +- 0.0.9 + +------------------------------------------------------------------- Thu Oct 29 16:10:31 CET 2009 - mvidner(a)suse.cz - Removed the avahi (zeroconf) dependency. diff --git a/webclient/package/yast2-webclient.spec b/webclient/package/yast2-webclient.spec index a4b33fc..541b285 100644 --- a/webclient/package/yast2-webclient.spec +++ b/webclient/package/yast2-webclient.spec @@ -17,7 +17,7 @@ PreReq: rubygem-gettext_rails License: LGPL v 2.1 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.8 +Version: 0.0.9 Release: 0 Summary: YaST2 - Webclient Source: www.tar.bz2 diff --git a/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb b/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb index 3dba9ff..ab13816 100644 --- a/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb +++ b/webclient/vendor/plugins/lang_helper/lib/lang_helper.rb @@ -10,6 +10,20 @@ module LangHelper bindtextdomain("lang_helper", :path => File.join(RAILS_ROOT, "vendor/plugins/lang_helper/locale")) + LANGUGAGES = { 'af' => 'Afrikaans', 'ar' => 'العربية', 'be' => 'Беларуская', 'bg' => 'Български', 'bn' => 'বাংলা', + 'bs' => 'Bosanski', 'ca' => 'Català', 'cs' => 'Čeština', 'cy' => 'Cymraeg', 'da' => 'Dansk', + 'de' => 'Deutsch', 'el' => 'Ελληνικά ', 'en' => 'English', 'en_GB' => 'English (UK)', 'en_US' => 'English (US)', + 'es' => 'Español', 'et' => 'Eesti', 'fi' => 'Suomi', 'fr' => 'Français', 'gl' => 'Galego', + 'gu' => 'ગુજરાતી', 'he' => 'עברית', 'hi' => 'हिन्दी', 'hr' => 'Hrvatski', 'hu' => 'Magyar', + 'id' => 'Bahasa Indonesia', 'it' => 'Italiano', 'ja' => '日本語', 'ka' => 'ქართული', + 'km' => 'ខ្មែរ', 'ko' => '한글 ', 'lo' => 'ພາສາລາວ', 'lt' => 'Lietuvių', 'mk' => 'Македонски', 'mr' => 'मराठी', + 'nb' => 'Norsk', 'nl' => 'Nederlands', 'pa' => 'ਪੰਜਾਬੀ', 'pl' => 'Polski', + 'pt_BR' => 'Português brasileiro', 'pt' => 'Português', 'ro' => 'Română', 'ru' => 'Русский ', + 'si' => 'සිංහල', 'sk' => 'Slovenčina', 'sl' => 'Slovenščina', 'sr' => 'Srpski', + 'sv' => 'Svenska', 'ta' => 'தமிழ்', 'tg' => 'тоҷикӣ', 'th' => 'ภาษาไทย', 'tr' => 'Türkçe', + 'uk' => 'Українська', 'vi' => 'Tiếng Việt', 'wa' => 'Walon', 'xh' => 'isiXhosa', + 'zh_CN' => '简体中文', 'zh_TW' => '繁體中文', 'zu' => 'isiZulu'} + def current_locale_image return "/images/flags/#{locale.language}.png" end @@ -18,15 +32,26 @@ module LangHelper locale.language end + def language_name(code) + language = LANGUGAGES[code] + if language.nil? + Rails.logger.warn "Missing text for language code #{current_locale}" + language = code + end + language + end + + def current_locale_name + language_name current_locale + end + def show_language langs = I18n.supported_locales.sort ret = "<h4>" + _("Select locale") + "</h4>" langs.each_with_index do |lang, i| - ret << link_to( image_tag("/images/flags/#{lang}.png", :size => "16x11", :alt => "[#{lang}]" ), + ret << link_to( language_name(lang), :action => "cookie_locale", :id => lang) - if ((i + 1) % 6 == 0) - ret << "<br/>" - end + ret << "<br/>" end ret end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59258 - /tags/branch-Linux-11_2-2_18_8/live-installer/
by jsrain＠svn.opensuse.org 30 Oct '09

30 Oct '09

Author: jsrain Date: Fri Oct 30 13:52:59 2009 New Revision: 59258 URL: http://svn.opensuse.org/viewcvs/yast?rev=59258&view=rev Log: Created tag branch-Linux-11_2-2_18_8 for live-installer Added: tags/branch-Linux-11_2-2_18_8/live-installer/ - copied from r59257, branches/SuSE-Linux-11_2-Branch/live-installer/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59257 - /tags/branch-Linux-11_2-2_18_8/
by jsrain＠svn.opensuse.org 30 Oct '09

30 Oct '09

Author: jsrain Date: Fri Oct 30 13:52:56 2009 New Revision: 59257 URL: http://svn.opensuse.org/viewcvs/yast?rev=59257&view=rev Log: Created tag branch-Linux-11_2-2_18_8 Added: tags/branch-Linux-11_2-2_18_8/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59256 - in /trunk/live-installer: VERSION package/yast2-live-installer.changes src/live_save_config_finish.ycp
by jsrain＠svn.opensuse.org 30 Oct '09

30 Oct '09

Author: jsrain Date: Fri Oct 30 13:52:55 2009 New Revision: 59256 URL: http://svn.opensuse.org/viewcvs/yast?rev=59256&view=rev Log: call correct_live_for_reboot script before reboot (bnc#550874) Modified: trunk/live-installer/VERSION trunk/live-installer/package/yast2-live-installer.changes trunk/live-installer/src/live_save_config_finish.ycp Modified: trunk/live-installer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/VERSION?rev=59256… ============================================================================== --- trunk/live-installer/VERSION (original) +++ trunk/live-installer/VERSION Fri Oct 30 13:52:55 2009 @@ -1 +1 @@ -2.18.7 +2.18.8 Modified: trunk/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/package/yast2-liv… ============================================================================== --- trunk/live-installer/package/yast2-live-installer.changes (original) +++ trunk/live-installer/package/yast2-live-installer.changes Fri Oct 30 13:52:55 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 30 13:46:38 CET 2009 - jsrain(a)suse.cz + +- call correct_live_for_reboot script before reboot (bnc#550874) +- 2.18.8 + +------------------------------------------------------------------- Wed Sep 9 14:54:15 CEST 2009 - jsrain(a)suse.cz - enhanced error reporting (bnc#533601) Modified: trunk/live-installer/src/live_save_config_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/live_save_con… ============================================================================== --- trunk/live-installer/src/live_save_config_finish.ycp (original) +++ trunk/live-installer/src/live_save_config_finish.ycp Fri Oct 30 13:52:55 2009 @@ -21,6 +21,7 @@ import "Keyboard"; import "Installation"; import "Language"; +import "FileUtils"; any ret = nil; string func = ""; @@ -60,6 +61,23 @@ Progress::Title (_("Saving time zone...")); Timezone::Save(); + // bnc#550874 + // Call a script if it exists + string scriptname = "/usr/bin/correct_live_for_reboot"; + if (FileUtils::Exists (scriptname)) { + y2milestone ("Calling %1 returned %2", + scriptname, + SCR::Execute (.target.bash_output, scriptname) + ); + y2milestone ("Removing %1 returned %2", + scriptname, + SCR::Execute (.target.bash_output, sformat ("/bin/rm %1", scriptname)) + ); + } else { + y2milestone ("Script %1 doesn't exist, skipping...", scriptname); + } + + } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59255 - in /branches/SuSE-Linux-11_2-Branch/live-installer: VERSION package/yast2-live-installer.changes src/live_save_config_finish.ycp
by jsrain＠svn.opensuse.org 30 Oct '09

30 Oct '09

Author: jsrain Date: Fri Oct 30 13:52:48 2009 New Revision: 59255 URL: http://svn.opensuse.org/viewcvs/yast?rev=59255&view=rev Log: call correct_live_for_reboot script before reboot (bnc#550874) Modified: branches/SuSE-Linux-11_2-Branch/live-installer/VERSION branches/SuSE-Linux-11_2-Branch/live-installer/package/yast2-live-installer.changes branches/SuSE-Linux-11_2-Branch/live-installer/src/live_save_config_finish.ycp Modified: branches/SuSE-Linux-11_2-Branch/live-installer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/live-i… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/live-installer/VERSION (original) +++ branches/SuSE-Linux-11_2-Branch/live-installer/VERSION Fri Oct 30 13:52:48 2009 @@ -1 +1 @@ -2.18.7 +2.18.8 Modified: branches/SuSE-Linux-11_2-Branch/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/live-i… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/live-installer/package/yast2-live-installer.changes (original) +++ branches/SuSE-Linux-11_2-Branch/live-installer/package/yast2-live-installer.changes Fri Oct 30 13:52:48 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 30 13:46:38 CET 2009 - jsrain(a)suse.cz + +- call correct_live_for_reboot script before reboot (bnc#550874) +- 2.18.8 + +------------------------------------------------------------------- Wed Sep 9 14:54:15 CEST 2009 - jsrain(a)suse.cz - enhanced error reporting (bnc#533601) Modified: branches/SuSE-Linux-11_2-Branch/live-installer/src/live_save_config_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/live-i… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/live-installer/src/live_save_config_finish.ycp (original) +++ branches/SuSE-Linux-11_2-Branch/live-installer/src/live_save_config_finish.ycp Fri Oct 30 13:52:48 2009 @@ -21,6 +21,7 @@ import "Keyboard"; import "Installation"; import "Language"; +import "FileUtils"; any ret = nil; string func = ""; @@ -60,6 +61,23 @@ Progress::Title (_("Saving time zone...")); Timezone::Save(); + // bnc#550874 + // Call a script if it exists + string scriptname = "/usr/bin/correct_live_for_reboot"; + if (FileUtils::Exists (scriptname)) { + y2milestone ("Calling %1 returned %2", + scriptname, + SCR::Execute (.target.bash_output, scriptname) + ); + y2milestone ("Removing %1 returned %2", + scriptname, + SCR::Execute (.target.bash_output, sformat ("/bin/rm %1", scriptname)) + ); + } else { + y2milestone ("Script %1 doesn't exist, skipping...", scriptname); + } + + } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59254 - /branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPartCo.cc
by mpatelcz＠svn.opensuse.org 30 Oct '09

30 Oct '09

Author: mpatelcz Date: Fri Oct 30 12:45:45 2009 New Revision: 59254 URL: http://svn.opensuse.org/viewcvs/yast?rev=59254&view=rev Log: Added support for partitionable raid without container - metadata is set properly. Modified: branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPartCo.cc Modified: branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mpatelcz/SP1-md/libstorag… ============================================================================== --- branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPartCo.cc (original) +++ branches/tmp/mpatelcz/SP1-md/libstorage/src/MdPartCo.cc Fri Oct 30 12:45:45 2009 @@ -1578,22 +1578,29 @@ } else { - // Container + // this is the Container } } else { - // No external. + // No external metadata. + // Possibly this is raid with persistent metadata and no container. } } void MdPartCo::setMetaData() { - sb_ver.clear(); if( parent_container.empty () ) { getParent(); } + if( parent_container.empty() ) + { + // No parent container. + sb_ver = md_metadata; + return; + } + string path = sysfs_path + parent_container + "/md/" + md_props[METADATA]; string val; @@ -1653,6 +1660,11 @@ list<string>::const_iterator it2; getParent(); + if( parent_container.empty() ) + { + spare.clear(); + return; + } getSlaves(parent_container,parent_devs); for( it1 = parent_devs.begin(); it1 != parent_devs.end(); it1++ ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59253 - /tags/stable-2_19_0/printer/
by jsmeix＠svn.opensuse.org 30 Oct '09

30 Oct '09

Author: jsmeix Date: Fri Oct 30 11:57:50 2009 New Revision: 59253 URL: http://svn.opensuse.org/viewcvs/yast?rev=59253&view=rev Log: Created tag stable-2_19_0 for printer Added: tags/stable-2_19_0/printer/ - copied from r59252, trunk/printer/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59252 - in /trunk/printer: VERSION package/yast2-printer.changes src/Printerlib.ycp src/printingvianetwork.ycp src/sharing.ycp
by jsmeix＠svn.opensuse.org 30 Oct '09

30 Oct '09

Author: jsmeix Date: Fri Oct 30 11:57:42 2009 New Revision: 59252 URL: http://svn.opensuse.org/viewcvs/yast?rev=59252&view=rev Log: - Added a generic test if a firewall is used to Printerlib.ycp and if yes show popup info to the user regarding CUPS+firewall for the "Print via Network" and "Share Printers" dialogs (see Novell/Suse Bugzilla bnc#549065). - 2.19.0 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/Printerlib.ycp trunk/printer/src/printingvianetwork.ycp trunk/printer/src/sharing.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=59252&r1=592… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Fri Oct 30 11:57:42 2009 @@ -1 +1 @@ -2.18.19 +2.19.0 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Fri Oct 30 11:57:42 2009 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Oct 30 11:53:06 CET 2009 - jsmeix(a)suse.de + +- Added a generic test if a firewall is used to Printerlib.ycp + and if yes show popup info to the user regarding CUPS+firewall + for the "Print via Network" and "Share Printers" dialogs + (see Novell/Suse Bugzilla bnc#549065). +- 2.19.0 + +------------------------------------------------------------------- Wed Aug 5 12:38:57 CEST 2009 - jsmeix(a)suse.de - In the Autoconfig dialog autoconfig.ycp added support for Modified: trunk/printer/src/Printerlib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printerlib.ycp?rev=5… ============================================================================== --- trunk/printer/src/Printerlib.ycp (original) +++ trunk/printer/src/Printerlib.ycp Fri Oct 30 11:57:42 2009 @@ -609,6 +609,28 @@ return true; } +// Determine if any kind of firewall seems to be active by calling +// "iptables -n -L | egrep -q 'DROP|REJECT'" +// to find out if there are currently dropping or rejecting packet filter rules. +// One might use a more specific test via +// "iptables -n -L | grep -v '^LOG' | egrep -q '^DROP|^REJECT'" +// to match only for DROP and REJECT targets and exclude LOG targets +// but it does not cause real problems when there is a false positive result here +// because all what happens it that then a needless firewall info popup would be shown. +global boolean FirewallSeemsToBeActive() +{ // Note the '-n' (only numeric output) option to avoid long reverse DNS lookups: + if( ExecuteBashCommand( "iptables -n -L | egrep -q 'DROP|REJECT'" ) ) + { y2milestone("A firewall seems to be active."); + return true; + } + // Return 'false' also as fallback value when the above command fails + // because of whatever reason because this fallback value is safe + // because it only results that no firewall info popup is shown + // the "Print via Network" and/or "Share Printers" dialogs + // but also the help text of those dialogs explains firewall stuff + // so that sufficient information is available in any case: + return false; +} global boolean WriteCupsSettings(map ay){ string cups_file="/etc/cups/cupsd.conf"; Modified: trunk/printer/src/printingvianetwork.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printingvianetwork.y… ============================================================================== --- trunk/printer/src/printingvianetwork.ycp (original) +++ trunk/printer/src/printingvianetwork.ycp Fri Oct 30 11:57:42 2009 @@ -42,6 +42,7 @@ any initial_browse_allow = nil; string initial_browse_allow_input_value = ""; string initial_server_name_input_value = ""; +boolean browsing_firewall_popup_was_shown = false; // An entry for a ComboBox from which the user can select // that printer information is accepted from // all remote CUPS servers: @@ -105,14 +106,6 @@ // from where remote printer information is accepted: _("Optional Specific IP Addresses or &Network/Netmask (separated by space)") ) - ), - `Left - ( `Label - ( `id(`firewall_label), - // A notification to make the user aware of possible Firewall restrictions - // regarding allow incomming printer information from remote CUPS servers: - _("If a firewall is used, check that incomming packages on UDP port 631 are allowed.") - ) ) ) ), @@ -326,6 +319,18 @@ return false; } +boolean ShowBrowsingFirewallPopup() +{ if( Printerlib::FirewallSeemsToBeActive() ) + { Popup::MessageDetails( // Popup::MessageDetails message: + _("Check that your firewall allows incomming printer information on UDP port 631."), + // Popup::MessageDetails information regarding details: + _("For details regarding firewall see the help text of this dialog.") + ); + return true; + } + return false; +} + boolean ApplyNetworkPrintingSettings() { printing_via_network_has_changed = false; // Get the actual settings and values from the dialog: @@ -519,7 +524,15 @@ browse_allow_value = "none"; } if( browse_allow_value != "none" ) - { // Only a not-"none" browse_allow_value requires "Browsing On" in cupsd.conf. + { // When something (except 'none') regarding "Accept Printer Information" is set + // test whether or not a firewall seems to be active and + // if yes show a popup regarding firewall if it was not yet shown: + if( ! browsing_firewall_popup_was_shown ) + { if( ShowBrowsingFirewallPopup() ) + { browsing_firewall_popup_was_shown = true; + } + } + // Only a not-"none" browse_allow_value requires "Browsing On" in cupsd.conf. // Otherwise leave the "Browsing" entry in cupsd.conf unchanged. if( ! Printerlib::ExecuteBashCommand( Printerlib::yast_bin_dir + "modify_cupsd_conf Browsing On" ) ) { Popup::ErrorDetails( // Popup::ErrorDetails message: @@ -691,7 +704,6 @@ UI::ChangeWidget( `id(`browsing_off_radio_button), `Value, false ); UI::ChangeWidget( `id(`browsing_on_radio_button), `Value, false ); UI::ChangeWidget( `id(`browse_allow_combo_box), `Enabled, false ); - UI::ChangeWidget( `id(`firewall_label), `Enabled, false ); // When by accident "all" and "@LOCAL" were set as BrowseAllow values, // the "@LOCAL" entry is preselected in browse_allow_combo_box // because this is the more secure setting: @@ -764,16 +776,31 @@ { initial_radio_button = `browsing_on_radio_button; UI::ChangeWidget( `id(`browsing_on_radio_button), `Value, true ); UI::ChangeWidget( `id(`browse_allow_combo_box), `Enabled, true ); - UI::ChangeWidget( `id(`firewall_label), `Enabled, true ); // If browsing info is accepted from all hosts, // it is useless to additionally accept it from specific IPs or networks: if( ! contains( Printerlib::cupsd_conf_browse_allow, "all" ) ) { UI::ChangeWidget( `id(`browse_allow_input), `Enabled, true ); } + // When something (except 'none') regarding "Accept Printer Information" is set + // test whether or not a firewall seems to be active and + // if yes show a popup regarding firewall if it was not yet shown: + if( ! browsing_firewall_popup_was_shown ) + { if( ShowBrowsingFirewallPopup() ) + { browsing_firewall_popup_was_shown = true; + } + } } else { initial_radio_button = `browsing_off_radio_button; UI::ChangeWidget( `id(`browsing_off_radio_button), `Value, true ); + // The value of browsing_firewall_popup_was_shown is kept as long as the + // whole yast2-printer module runs so that the user could launch this dialog + // several times in one module run and switch between "Do Not Accept Printer Information" + // and "Accept Printer Information" several times in one run of the yast2-printer module. + // When in the previous run of this dialog "Do Not Accept Printer Information" has become true + // but in the current run of this dialog it was switched back to "Accept Printer Information" + // make sure to show in the current run of this dialog the popup regarding firewall again: + browsing_firewall_popup_was_shown = false; } } y2milestone( "leaving initNetworkPrinting with\ninitial_radio_button = '%1'\ninitial_browse_allow = '%2'\ninitial_browse_allow_input_value = '%3'\ninitial_server_name_input_value = '%4'", initial_radio_button, initial_browse_allow, initial_browse_allow_input_value, initial_server_name_input_value ); @@ -785,7 +812,6 @@ { if( `browsing_off_radio_button == event["ID"]:nil ) { UI::ChangeWidget( `id(`browse_allow_combo_box), `Enabled, false ); UI::ChangeWidget( `id(`browse_allow_input), `Enabled, false ); - UI::ChangeWidget( `id(`firewall_label), `Enabled, false ); UI::ChangeWidget( `id(`client_conf_server_name_input), `Enabled, false ); UI::ChangeWidget( `id(`test_client_conf_server), `Enabled, false ); if( ! Printerlib::client_only ) @@ -798,7 +824,6 @@ if( `browsing_on_radio_button == event["ID"]:nil ) { UI::ChangeWidget( `id(`browse_allow_combo_box), `Enabled, true ); UI::ChangeWidget( `id(`browse_allow_input), `Enabled, true ); - UI::ChangeWidget( `id(`firewall_label), `Enabled, true ); UI::ChangeWidget( `id(`client_conf_server_name_input), `Enabled, false ); UI::ChangeWidget( `id(`test_client_conf_server), `Enabled, false ); if( ! Printerlib::client_only ) @@ -821,7 +846,6 @@ if( `client_only_radio_button == event["ID"]:nil ) { UI::ChangeWidget( `id(`browse_allow_combo_box), `Enabled, false ); UI::ChangeWidget( `id(`browse_allow_input), `Enabled, false ); - UI::ChangeWidget( `id(`firewall_label), `Enabled, false ); UI::ChangeWidget( `id(`client_conf_server_name_input), `Enabled, true ); UI::ChangeWidget( `id(`test_client_conf_server), `Enabled, true ); UI::ChangeWidget( `id(`connection_wizard), `Enabled, false ); Modified: trunk/printer/src/sharing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/sharing.ycp?rev=5925… ============================================================================== --- trunk/printer/src/sharing.ycp (original) +++ trunk/printer/src/sharing.ycp Fri Oct 30 11:57:42 2009 @@ -49,6 +49,7 @@ list< term > initial_interface_table_items = []; string initial_allow_input_value = ""; string initial_browse_address_input_value = ""; +boolean share_printers_firewall_popup_was_shown = false; term widgetSharing = `VBox ( `RadioButtonGroup @@ -179,14 +180,6 @@ ) ) ) - ), - `Left - ( `Label - ( `id(`firewall_label), - // A notification to make the user aware of possible Firewall restrictions - // regarding remote access to CUPS via the IPP protocol (TCP/UDP port 631): - _("If a firewall is used, check that remote access to CUPS is allowed via IPP on port 631.") - ) ) ) ) @@ -238,6 +231,18 @@ return interface_map; } +boolean ShowSharePrintersFirewallPopup() +{ if( Printerlib::FirewallSeemsToBeActive() ) + { Popup::MessageDetails( // Popup::MessageDetails message: + _("Check that your firewall allows remote access to CUPS via IPP on port 631."), + // Popup::MessageDetails information regarding details: + _("For details regarding firewall see the help text of this dialog.") + ); + return true; + } + return false; +} + boolean ApplySharingSettings() { sharing_has_changed = false; // Get the actual settings and values from the dialog. @@ -411,6 +416,16 @@ } // When allow_values is empty, it is a deny_remote_access case, see above. // Therefore allow_values is non-empty here: + if( ! issubstring( tolower( allow_values ), "none") ) + { // When something (except 'none') regarding "Allow remote access" is set + // test whether or not a firewall seems to be active and + // if yes show a popup regarding firewall if it was not yet shown: + if( ! share_printers_firewall_popup_was_shown ) + { if( ShowSharePrintersFirewallPopup() ) + { share_printers_firewall_popup_was_shown = true; + } + } + } if( ! Printerlib::ExecuteBashCommand( Printerlib::yast_bin_dir + "modify_cupsd_conf Allow '" + allow_values @@ -565,7 +580,6 @@ UI::ChangeWidget( `specific_addresses_label, `Enabled, false ); UI::ChangeWidget( `allow_input, `Enabled, false ); UI::ChangeWidget( `browse_address_input, `Enabled, false ); - UI::ChangeWidget( `firewall_label, `Enabled, false ); } // Regardless whether or not the "Share Printers" dialog is useless, // fill in the values of the current settings in the system: @@ -731,6 +745,24 @@ initial_deny_remote_access = false; UI::ChangeWidget( `allow_remote_access_radio_button, `Value, true ); initial_allow_remote_access = true; + // When something (except 'none') regarding "Allow remote access" is set + // test whether or not a firewall seems to be active and + // if yes show a popup regarding firewall if it was not yet shown: + if( ! share_printers_firewall_popup_was_shown ) + { if( ShowSharePrintersFirewallPopup() ) + { share_printers_firewall_popup_was_shown = true; + } + } + } + else + { // The value of share_printers_firewall_popup_was_shown is kept as long as the + // whole yast2-printer module runs so that the user could launch this dialog + // several times in one module run and switch between "Deny remote access" + // and "Allow remote access" several times in one run of the yast2-printer module. + // When in the previous run of this dialog "Deny remote access" has become true + // but in the current run of this dialog it was switched back to "Allow remote access" + // make sure to show in the current run of this dialog the popup regarding firewall again: + share_printers_firewall_popup_was_shown = false; } foreach( string browse_address_value, browse_address_values, @@ -954,7 +986,6 @@ UI::ChangeWidget( `specific_addresses_label, `Enabled, remote_access ); UI::ChangeWidget( `allow_input, `Enabled, remote_access ); UI::ChangeWidget( `browse_address_input, `Enabled, remote_access ); - UI::ChangeWidget( `firewall_label, `Enabled, remote_access ); if( remote_access ) { boolean interface_modify_buttons = true; if( 0 == size((list)UI::QueryWidget(`interface_table, `Items)) ) interface_modify_buttons = false; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : added missing script type
by Ladislav Slezak 30 Oct '09

30 Oct '09

ref: refs/heads/master commit c284cad3838e702174541452254b150cfe46f645 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Fri Oct 30 11:53:33 2009 +0100 added missing script type --- .../permissions/app/views/permissions/index.rhtml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugins/permissions/app/views/permissions/index.rhtml b/plugins/permissions/app/views/permissions/index.rhtml index 226dfe4..5715f7b 100644 --- a/plugins/permissions/app/views/permissions/index.rhtml +++ b/plugins/permissions/app/views/permissions/index.rhtml @@ -4,7 +4,7 @@ <script type="text/javascript" language="javascript" charset="utf-8" src="/inc/jquery.js"></script> <script type="text/javascript" language="javascript" charset="utf-8" src="/inc/jquery.checktree.js"></script> - <script> + <script type="text/javascript"> $(document).ready(function(){ $("ul.tree").checkTree({ /* -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : fixed "Trailing comma not supported by MSIE" warnings
by Ladislav Slezak 30 Oct '09

30 Oct '09

ref: refs/heads/master commit 40962924cdf99a7b925bdb1e7902a85a270d915a Author: Ladislav Slezak <lslezak(a)novell.com> Date: Fri Oct 30 09:35:37 2009 +0100 fixed "Trailing comma not supported by MSIE" warnings --- plugins/status/app/views/status/index.html.erb | 6 +++--- .../status/package/yast2-webclient-status.changes | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/plugins/status/app/views/status/index.html.erb b/plugins/status/app/views/status/index.html.erb index e961575..84301c5 100644 --- a/plugins/status/app/views/status/index.html.erb +++ b/plugins/status/app/views/status/index.html.erb @@ -98,7 +98,7 @@ function plotPieGraph (graph_id, graph_title, graph_data ) { cursor: { show: false - }, + } }); } @@ -121,7 +121,7 @@ function plotPieGraphError (graph_id, graph_title, graph_data ) { cursor: { show: false - }, + } }); } @@ -132,7 +132,7 @@ function plotLineGraph(graph_id, graph_title, graph_data ) { title: graph_title, axes: { xaxis: { - showTicks: false, + showTicks: false }, yaxis: { showTicks: true, diff --git a/plugins/status/package/yast2-webclient-status.changes b/plugins/status/package/yast2-webclient-status.changes index 891ef85..fddd31a 100644 --- a/plugins/status/package/yast2-webclient-status.changes +++ b/plugins/status/package/yast2-webclient-status.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Oct 30 09:34:30 CET 2009 - lslezak(a)suse.cz + +- removed trailig comma in JS (doesn't work in MSIE) + +------------------------------------------------------------------- Thu Oct 29 15:43:40 CET 2009 - schubi(a)suse.de - fix license -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0