Author: rhafer Date: Tue Aug 12 14:47:48 2008 New Revision: 49988 URL: http://svn.opensuse.org/viewcvs/yast?rev=49988&view=rev Log: move UI code for ppolicy to LdapDatabase as well. Modified: trunk/ldap-server/src/LdapDatabase.ycp trunk/ldap-server/src/tree_structure.ycp trunk/ldap-server/src/widgets.ycp Modified: trunk/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapDatabase.ycp?rev=49988&r1=49987&r2=49988&view=diff ============================================================================== --- trunk/ldap-server/src/LdapDatabase.ycp (original) +++ trunk/ldap-server/src/LdapDatabase.ycp Tue Aug 12 14:47:48 2008 @@ -1,7 +1,6 @@ { textdomain "ldap-server"; module "LdapDatabase"; - include "widgets.ycp"; import "Label"; import "LdapServer"; import "Popup"; @@ -16,6 +15,52 @@ boolean createDbDir = false; + term editPolicy = + `Top( + `VBox( + `VSpacing( 1 ), + `Heading( _("Password Policy Settings") ), + `VBox( `VSpacing(0.25), + `HBox( + `CheckBox( `id( `cb_ppolicy_overlay ),`opt(`notify ), + _("Enable Password Policies"), false + ), + `HSpacing( `opt(`hstretch)) + ), + `HBox( + `CheckBox( `id( `cb_ppolicy_hashcleartext ), + _("Hash Clear Text Passwords"), false + ), + `HSpacing( `opt(`hstretch)) + ), + `HBox( + `CheckBox( `id( `cb_ppolicy_uselockout ), + _("Disclose \"Account Locked\" Status"), false + ), + `HSpacing( `opt(`hstretch)) + ), + `VSquash( + `HBox( + `InputField( `id( `te_ppolicy_defaultpolicy ), + `opt( `hstretch ), + _("Default Policy Object DN"), "cn=Default Policy" + ), + `HSpacing( 0.5 ), + `VBox( + `Bottom( + `CheckBox( `id( `cb_pp_append_basedn ), + _("&Append Base DN"), true + ) + ), + `VSpacing( 0.3 ) + ) + ) + ), + `VSpacing(0.25) + ) + ) + ); + global define symbol AddDbBasic( boolean createDefaults ) { boolean user_changed_dbdir = false; @@ -369,6 +414,11 @@ return true; } + global term GetPpolicyWidget() + { + return editPolicy; + } + define symbol DbPpolicy() { string caption = _("ppolicy settings"); Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.ycp?rev=49988&r1=49987&r2=49988&view=diff ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Tue Aug 12 14:47:48 2008 @@ -874,7 +874,7 @@ ]; map dbPpolicy = $[ "name" : _("Password Policy Configuration"), - "widget" : editPolicy, + "widget" : LdapDatabase::GetPpolicyWidget(), "index" : index, "cb_read" : ``(cb_read_ppolicy() ), "cb_input" : ``(cb_input_ppolicy() ), Modified: trunk/ldap-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=49988&r1=49987&r2=49988&view=diff ============================================================================== --- trunk/ldap-server/src/widgets.ycp (original) +++ trunk/ldap-server/src/widgets.ycp Tue Aug 12 14:47:48 2008 @@ -299,52 +299,6 @@ ) ) ); - term editPolicy = - `Top( - `VBox( - `VSpacing( 1 ), - `Heading( _("Password Policy Settings") ), - `VBox( `VSpacing(0.25), - `HBox( - `CheckBox( `id( `cb_ppolicy_overlay ),`opt(`notify ), - _("Enable Password Policies"), false - ), - `HSpacing( `opt(`hstretch)) - ), - `HBox( - `CheckBox( `id( `cb_ppolicy_hashcleartext ), - _("Hash Clear Text Passwords"), false - ), - `HSpacing( `opt(`hstretch)) - ), - `HBox( - `CheckBox( `id( `cb_ppolicy_uselockout ), - _("Disclose \"Account Locked\" Status"), false - ), - `HSpacing( `opt(`hstretch)) - ), - `VSquash( - `HBox( - `InputField( `id( `te_ppolicy_defaultpolicy ), - `opt( `hstretch ), - _("Default Policy Object DN"), "cn=Default Policy" - ), - `HSpacing( 0.5 ), - `VBox( - `Bottom( - `CheckBox( `id( `cb_pp_append_basedn ), - _("&Append Base DN"), true - ) - ), - `VSpacing( 0.3 ) - ) - ) - ), - `VSpacing(0.25) - ) - ) - ); - define map ChangeAdminPassword() { map result = nil; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org