Author: kmachalkova Date: Mon Jun 11 13:14:29 2007 New Revision: 38375 URL: http://svn.opensuse.org/viewcvs/yast?rev=38375&view=rev Log: Merged changes from trunk back into SP2 branch (r35612:38374) Modified: branches/SuSE-SLE-10-SP2-Branch/dhcp-server/VERSION branches/SuSE-SLE-10-SP2-Branch/dhcp-server/package/yast2-dhcp-server.changes branches/SuSE-SLE-10-SP2-Branch/dhcp-server/src/DhcpServer.pm branches/SuSE-SLE-10-SP2-Branch/dhcp-server/src/dialogs2.ycp branches/SuSE-SLE-10-SP2-Branch/dhcp-server/src/helps.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/dhcp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/dhcp-server/VERSION?rev=38375&r1=38374&r2=38375&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/dhcp-server/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/dhcp-server/VERSION Mon Jun 11 13:14:29 2007 @@ -1 +1 @@ -2.13.12 +2.13.13 Modified: branches/SuSE-SLE-10-SP2-Branch/dhcp-server/package/yast2-dhcp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/dhcp-server/package/yast2-dhcp-server.changes?rev=38375&r1=38374&r2=38375&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/dhcp-server/package/yast2-dhcp-server.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/dhcp-server/package/yast2-dhcp-server.changes Mon Jun 11 13:14:29 2007 @@ -1,5 +1,17 @@ ------------------------------------------------------------------- -Mon Jan 22 18:27:48 CET 2007 - kmachalkova@suse.cz +Mon Jun 11 10:48:16 CEST 2007 - kmachalkova@suse.cz + +- Merged changes from trunk back into SP2 branch (r35612:38374) + - Allow getting/setting 'dynamic-bootp' flag for IP range (#151806) + + related facelift of 'Dynamic DHCP' dialog + - removed outdated translations from .desktop-files (#271209) + (by jsrain) + - Dropped simple vs. expert UI mode support (ProductFeatures): + expert mode is now default +- 2.13.13 + +------------------------------------------------------------------- +Mon Jan 22 18:31:01 CET 2007 - kmachalkova@suse.cz - If gathering interface information by parsing ifconfig output fails, use NetworkDevices data. Inform user that interface has no Modified: branches/SuSE-SLE-10-SP2-Branch/dhcp-server/src/DhcpServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/dhcp-server/src/DhcpServer.pm?rev=38375&r1=38374&r2=38375&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/dhcp-server/src/DhcpServer.pm (original) +++ branches/SuSE-SLE-10-SP2-Branch/dhcp-server/src/DhcpServer.pm Mon Jun 11 13:14:29 2007 @@ -107,7 +107,7 @@ YaST::YCP::Import ("NetworkDevices"); YaST::YCP::Import ("Netmask"); YaST::YCP::Import ("PackageSystem"); -YaST::YCP::Import ("ProductFeatures"); +#YaST::YCP::Import ("ProductFeatures"); YaST::YCP::Import ("Service"); YaST::YCP::Import ("Popup"); YaST::YCP::Import ("Progress"); @@ -1842,13 +1842,12 @@ @allowed_interfaces = sort (keys (%ifaces)); @original_allowed_interfaces = @allowed_interfaces; - # Initialize LDAP if needed - if (ProductFeatures->GetFeature ("globals", "ui_mode") ne "simple") - { - $self->InitYapiConfigOptions ({"use_ldap" => $use_ldap}); - $self->LdapInit ([], 1); - $self->CleanYapiConfigOptions (); - } + # Initialize LDAP + + $self->InitYapiConfigOptions ({"use_ldap" => $use_ldap}); + $self->LdapInit ([], 1); + $self->CleanYapiConfigOptions (); + } } @@ -1911,10 +1910,6 @@ sub IsConfigurationSimple { my $self = shift; - if (ProductFeatures->GetFeature ("globals", "ui_mode") eq "simple") - { - return Boolean (1); - } y2milestone ("Checking how complex configuration is set"); if (scalar (@allowed_interfaces) > 1) @@ -2293,10 +2288,6 @@ $use_ldap = 0; my $configured_ldap = 0; - if (ProductFeatures->GetFeature ("globals", "ui_mode") eq "simple") - { - return; - } #error message my $ldap_error_msg = __("Invalid LDAP configuration. Cannot use LDAP."); @@ -2600,11 +2591,6 @@ sub LdapPrepareToWrite { my $self = shift; - if (ProductFeatures->GetFeature ("globals", "ui_mode") eq "simple") - { - return; - } - my $ldap_data_ref = Ldap->Export (); # check if the schema is properly included @@ -2849,11 +2835,6 @@ sub LdapStore { my $self = shift; - if (ProductFeatures->GetFeature ("globals", "ui_mode") eq "simple") - { - return 1; - } - my $ret = 1; if (Mode->test ()) Modified: branches/SuSE-SLE-10-SP2-Branch/dhcp-server/src/dialogs2.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/dhcp-server/src/dialogs2.ycp?rev=38375&r1=38374&r2=38375&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/dhcp-server/src/dialogs2.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/dhcp-server/src/dialogs2.ycp Mon Jun 11 13:14:29 2007 @@ -22,7 +22,7 @@ import "Progress"; import "DialogTree"; import "CWMServiceStart"; -import "ProductFeatures"; +//import "ProductFeatures"; import "NetworkDevices"; import "Report"; import "Mode"; @@ -34,7 +34,7 @@ include "dhcp-server/dns-server-wizard.ycp"; /* Using expert UI */ -define boolean expert_ui = (ProductFeatures::GetFeature ("globals", "ui_mode") == "expert"); +//define boolean expert_ui = (ProductFeatures::GetFeature ("globals", "ui_mode") == "expert"); /* Start of common configuration section */ @@ -209,20 +209,9 @@ list <string> dhcp_ifaces = DhcpServer::GetAllowedInterfaces (); - // expert UI allows to set more interfaces - if (expert_ui) { - foreach (string iface, map settings, DhcpServerUI::ifaces, { - if (contains(dhcp_ifaces, iface)) DhcpServerUI::ifaces[iface,"active"] = true; - }); - // simple UI allows to set only _ONE_ interface - // because of only one subnet in the simple UI dialogs - } else { - if ( size(dhcp_ifaces) > 1 ) { - y2warning ("More than one interface allowed, using the first one only."); - } - dhcp_ifaces = [dhcp_ifaces[0]:""]; - DhcpServerUI::ifaces[dhcp_ifaces[0]:"","active"] = true; - } + foreach (string iface, map settings, DhcpServerUI::ifaces, { + if (contains(dhcp_ifaces, iface)) DhcpServerUI::ifaces[iface,"active"] = true; + }); RedrawInterfacesTable(); } @@ -234,22 +223,10 @@ current_item_iface = item_id; - if (expert_ui) { - if (event["ID"]:nil == "add") { - DhcpServerUI::ifaces[item_id,"active"] = true; - } else if (event["ID"]:nil == "remove") { - DhcpServerUI::ifaces[item_id,"active"] = false; - } - } else { - if (event["ID"]:nil == "add") { - // only one can be selected - foreach (string iface, map settings, DhcpServerUI::ifaces, { - DhcpServerUI::ifaces[iface,"active"] = false; - }); - DhcpServerUI::ifaces[item_id,"active"] = true; - } else if (event["ID"]:nil == "remove") { - DhcpServerUI::ifaces[item_id,"active"] = false; - } + if (event["ID"]:nil == "add") { + DhcpServerUI::ifaces[item_id,"active"] = true; + } else if (event["ID"]:nil == "remove") { + DhcpServerUI::ifaces[item_id,"active"] = false; } RedrawInterfacesTable(); @@ -309,9 +286,7 @@ * @return term for Get_CommonDialog() */ term Common_GlobalSettingsDialog() { - term ldap = `Empty(); - - if (expert_ui) ldap = `VBox( + term ldap = `VBox( // configuration will be saved in ldap? `HBox ( `Left(`CheckBox(`id("ldap"), `opt( `notify), _("&LDAP Support"), true)), @@ -469,12 +444,10 @@ UI::ChangeWidget ( `id ("defaultleasetime"), `Value, tostring (value) ); UI::ChangeWidget ( `id ("defaultleasetimeunits"), `Value, unit ); - if (expert_ui) { - boolean ldap_in_use = DhcpServer::GetUseLdap(); - UI::ChangeWidget (`id ("ldap"), `Value, ldap_in_use); - UI::ChangeWidget (`id ("ldap-dhcp-server-cn"), `Value, DhcpServer::GetLdapDHCPServerCN()); - UI::ChangeWidget (`id ("ldap-dhcp-server-cn"), `Enabled, ldap_in_use); - } + boolean ldap_in_use = DhcpServer::GetUseLdap(); + UI::ChangeWidget (`id ("ldap"), `Value, ldap_in_use); + UI::ChangeWidget (`id ("ldap-dhcp-server-cn"), `Value, DhcpServer::GetLdapDHCPServerCN()); + UI::ChangeWidget (`id ("ldap-dhcp-server-cn"), `Enabled, ldap_in_use); GlobalSettingsValidChars (); } @@ -692,46 +665,57 @@ term Common_DynamicDHCPDialog() { term dialog = `VBox( - `VBox( - // frame - `Frame (_("IP Address Range") , - `VBox( - - `HBox ( - `HWeight (2, - // TRANSLATORS: informative text entry (filled up, disabled) - `TextEntry( `id("current_network"), _("Current &Network") ) - ), - `HWeight (2, - // TRANSLATORS: informative text entry (filled up, disabled) - `TextEntry( `id("current_netmask"), _("Current Net&mask") ) - ), - `HWeight (1, - // TRANSLATORS: informative text entry (filled up, disabled) - `TextEntry( `id("current_bits"), _("Netmask Bi&ts")) - ) - ), - - `VSpacing(1), - - `HBox ( - `VBox ( - // text entry - `Left( `TextEntry ( `id ("from_ip"), _("&First IP Address") ) ), - // text entry - `Left( `TextEntry ( `id ("to_ip"), _("&Last IP Address") ) ) - ), - `VBox ( - // text entry - `Left( `TextEntry ( `id ("from_ip_min"), _("Min&imum IP Address") ) ), - // text entry - `Left( `TextEntry ( `id ("to_ip_max"), _("Ma&ximum IP Address") ) ) - ) - ) - + // frame + `Frame (_("Subnet Information") , + `VBox( + `HBox ( + `HWeight (2, + // TRANSLATORS: informative text entry (filled up, disabled) + `TextEntry( `id("current_network"), _("Current &Network") ) + ), + `HWeight (2, + // TRANSLATORS: informative text entry (filled up, disabled) + `TextEntry( `id("current_netmask"), _("Current Net&mask") ) + ), + `HWeight (1, + // TRANSLATORS: informative text entry (filled up, disabled) + `TextEntry( `id("current_bits"), _("Netmask Bi&ts")) + ) + ), + `HBox( + `HWeight (2, + // text entry + `TextEntry ( `id ("from_ip_min"), _("Min&imum IP Address") ) + ), + `HWeight (2, + // text entry + `TextEntry ( `id ("to_ip_max"), _("Ma&ximum IP Address") ) + ), + `HWeight (1, + `HStretch() + ) ) - ) - ), + ) + ), + `VSpacing(1), + `Frame (_("IP Address Range") , + `VBox( + `HBox ( + `HWeight (2, + // text entry + `TextEntry ( `id ("from_ip"), _("&First IP Address") ) + ), + `HWeight (2, + // text entry + `TextEntry ( `id ("to_ip"), _("&Last IP Address") ) + ), + `HWeight (1, + `HStretch() + ) + ), + `Left(`CheckBox( `id("dyn_bootp"), _("Allow Dynamic &BOOTP"))) + ) + ), `VSpacing (1), `Frame( // frame label @@ -895,8 +879,14 @@ if ( opt["key"]:nil == "range" ) { list<string> range = splitstring ( opt["value"]:"", " " ); - UI::ChangeWidget ( `id ("from_ip"), `Value, range[0]:"" ); - UI::ChangeWidget ( `id ("to_ip"), `Value, range[1]:"" ); + integer idx = 0; + if (range[0]:"" == "dynamic-bootp") { + UI::ChangeWidget ( `id("dyn_bootp"), `Value, true); + idx = 1; + } + UI::ChangeWidget ( `id ("from_ip"), `Value, range[ idx ]:"" ); + UI::ChangeWidget ( `id ("to_ip"), `Value, range[ idx+1 ]:"" ); + } else if ( opt["key"]:nil == "default-lease-time" ) { @@ -1024,6 +1014,7 @@ string from_ip = (string) UI::QueryWidget ( `id ("from_ip"), `Value ); string to_ip = (string) UI::QueryWidget ( `id ("to_ip"), `Value ); + boolean dyn_bootp = (boolean) UI::QueryWidget( `id("dyn_bootp"), `Value ); // FIXME: validation @@ -1039,7 +1030,8 @@ if ( size(from_ip) != 0 && size(to_ip) != 0 ) { directives = add ( directives, - $[ "key" : "range" , "value" : from_ip + " " + to_ip ] + $[ "key" : "range" , + "value" : (dyn_bootp ? "dynamic-bootp " : "") + from_ip + " " + to_ip ] ); } @@ -1686,11 +1678,15 @@ "start_up" : $[ "contents" : `VBox ( "auto_start_up", - `VSpacing(), +// `VSpacing(), "use_ldap", + `VSpacing(), "start_stop", `VSpacing(), - "other_options", + `HBox ( + "other_options", + `HStretch() + ), `VStretch () ), // dialog caption @@ -1833,7 +1829,7 @@ "store" : CardSelectionStore, "validate_type" : `function, "validate_function" : CardSelectionValidate, - "help" : (expert_ui ? HELPS["card_selection_expert"]:"" : HELPS["card_selection_simple"]:""), + "help" : HELPS["card_selection_expert"]:"", ], "global_settings" : $[ "widget" : `custom, @@ -1843,8 +1839,7 @@ "validate_type" : `function, "validate_function" : GlobalSettingsValidate, "store" : GlobalSettingsStore, - "help" : (expert_ui ? (HELPS["ldap_support"]:"" + HELPS["ldap_server_name"]:"" + HELPS["global_settings"]:"") - : HELPS["global_settings"]:""), + "help" : HELPS["ldap_support"]:"" + HELPS["ldap_server_name"]:"" + HELPS["global_settings"]:"" ], "dynamic_dhcp" : $[ "widget" : `custom, @@ -1890,14 +1885,8 @@ * @return symbol for the wizard sequencer */ symbol CommonConfigDialog () { - list<string> ids_order= []; - if (expert_ui) { - ids_order = ["start_up", "card_selection", "global_settings", + list <string> ids_order = ["start_up", "card_selection", "global_settings", "dynamic_dhcp", "host_management", "expert_settings"]; - } else { - ids_order = ["start_up", "card_selection", - "global_settings", "dynamic_dhcp"]; - } return DialogTree::ShowAndRun ($[ "ids_order" : ids_order, "initial_screen" : "start_up", Modified: branches/SuSE-SLE-10-SP2-Branch/dhcp-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/dhcp-server/src/helps.ycp?rev=38375&r1=38374&r2=38375&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/dhcp-server/src/helps.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/dhcp-server/src/helps.ycp Mon Jun 11 13:14:29 2007 @@ -138,10 +138,7 @@ "card_selection_expert" : _("<p><b><big>Network Card Selection</big></b><br> Select one or more of listed network cards to use for the DHCP server.</p>"), - // Wizard Installation - Step 1 (version for simple UI) - "card_selection_simple" : _("<p><b><big>Network Card Selection</big></b><br> -Select one of listed network cards to use for the DHCP server.</p>"), - + //Optional field - used with LDAP support "ldap_server_name" : _("Optionally, you can also specify <b>DHCP server name</b> (the name of dhcpServer LDAP object), if it is different from your hostname."), @@ -180,18 +177,26 @@ _("<p><b>Default Lease Time</b> sets the time after which the leased IP expires and the client must ask for an IP again.</p>"), - // Wizard Installation - Step 3 1/3 - "dynamic_dhcp" : _("<p><b><big>IP Address Range</big></b><br> -Here, set the <b>First IP Address</b> and the <b>Last IP Address</b> + // Wizard Installation - Step 3 1/4 + "dynamic_dhcp" :_("<p><b><big>Subnet Information</big></b></br> +Here you can view the information about the current subnet, such as its address, +netmask and minimum and maximum IP addresses available for the clients. +</p>") + + + // Wizard Installation - Step 3 2/4 + _("<p><b><big>IP Address Range</big></b><br> +Set the <b>First IP Address</b> and the <b>Last IP Address</b> to lease to the clients. These addresses must have the same netmask. -For instance, <tt>192.168.1.1</tt> and <tt>192.168.1.64</tt>.</p>") + +For instance, <tt>192.168.1.1</tt> and <tt>192.168.1.64</tt>. Check <b> +Allow Dynamic BOOTP</b> flag in the specified range may be dynamically +assigned to BOOTP clients as well as DHCP clients</p>") + - // Wizard Installation - Step 3 2/3 + // Wizard Installation - Step 3 3/4 _("<p><b><big>Lease Time</big></b><br> -Here, set the <b>Default</b> lease time for the current IP address range, +Set the <b>Default</b> lease time for the current IP address range, which sets the optimal IP refreshing time for clients.<br></p>") + - // Wizard Installation - Step 3 3/3 + // Wizard Installation - Step 3 4/4 _("<p><b>Maximum</b> (optional value) sets the maximum time period for which this IP is blocked for the client on the DHCP server.</p>"), -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org