Mailinglist Archive: yast-commit (190 mails)

[mzugec@xxxxxxxxxxxxxxxx]

Author: mzugec
Date: Tue May 29 09:08:50 2007
New Revision: 38165

URL: http://svn.opensuse.org/viewcvs/yast?rev=38165&view=rev
Log:
improved workflow dialogs (host/hosts)

Modified:
    trunk/http-server/VERSION
    trunk/http-server/package/yast2-http-server.changes
    trunk/http-server/src/HttpServerWidgets.ycp
    trunk/http-server/src/dialogs.ycp
    trunk/http-server/src/wizards.ycp

Modified: trunk/http-server/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/VERSION?rev=38165&r1=38164&r2=38165&view=diff
==============================================================================
--- trunk/http-server/VERSION (original)
+++ trunk/http-server/VERSION Tue May 29 09:08:50 2007
@@ -1 +1 @@
-2.15.3
+2.15.4

Modified: trunk/http-server/package/yast2-http-server.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/package/yast2-http-server.changes?rev=38165&r1=38164&r2=38165&view=diff
==============================================================================
--- trunk/http-server/package/yast2-http-server.changes (original)
+++ trunk/http-server/package/yast2-http-server.changes Tue May 29 09:08:50 2007
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Tue May 29 09:08:05 CEST 2007 - mzugec@xxxxxxx
+
+- improved workflow dialogs (host/hosts)
+- 2.15.4 
+
+-------------------------------------------------------------------
 Fri May 11 14:26:47 CEST 2007 - mzugec@xxxxxxx
 
 - validation for VhostID when create new virtual host (#245155)

Modified: trunk/http-server/src/HttpServerWidgets.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/HttpServerWidgets.ycp?rev=38165&r1=38164&r2=38165&view=diff
==============================================================================
--- trunk/http-server/src/HttpServerWidgets.ycp (original)
+++ trunk/http-server/src/HttpServerWidgets.ycp Tue May 29 09:08:50 2007
@@ -202,7 +202,6 @@
            // skip ourself also when this is main server
        if (( host == hostid ) || (hostid == "main")) continue;
        if (host == "main") continue;
-//     list< map<string,any> > desc = YaST::HTTPDData::GetHost (host);
        // find out the server name
        string value = (string)get_host_value ( "ServerName", YaST::HTTPDData::GetHost (host), nil );
        if (value == servername)
@@ -214,7 +213,6 @@
            break;
        }
 
-//     value = (string)get_host_value ("HostIP", desc, nil);
        map<string, any> vhost = YaST::HTTPDData::GetVhostType(host);
 
                if (! FileUtils::CheckAndCreatePath( documentroot )){
@@ -319,12 +317,6 @@
        ]);
        return nil;
     }
-//symbol showAccessLogPopup (any key, map event);
-//symbol showErrorLogPopup (any key, map event);
-
-//list <string> host_ids = nil;
-
-//void OverviewInit (string widget) { }
 
   /**
    * Handle overview (listen) widget
@@ -636,8 +628,6 @@
 global void storeServiceStatus (string key, map event);
 global void initAdaptFirewall (string key);
 global void storeAdaptFirewall (string opt_id, map event);
-//global void DirectoryOptionInit (any key, string id);
-//global void DirectoryOptionStore (any key, string id);
 
        // wizard widget functions
 global void initOpenPort (string key);
@@ -647,10 +637,9 @@
 global boolean validateListenInterfaces(string key, map event);
 global void initFwOpen (string key);
 global void storeFwOpen (string opt_id, map event);
-//void initExpertConf (string key);
 global symbol handleExpertConf (string key, map event);
 void initScriptModules(string key);
-void initSummaryText(string key); 
+void initSummaryText(string key);
 global symbol handleBooting (string key, map event);
 global map getHostOptions(boolean is_main_server);
 boolean getServiceAutoStart();
@@ -677,8 +666,6 @@
                    // table cell description
                    "label"  : _("Server Name"),
                    "widget" : `textentry,
-//                 "validate_type" : `function,
-//                 "validate_function" : validate_servername,
                ],
            ],
            "DocumentRoot" : $[

Modified: trunk/http-server/src/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/dialogs.ycp?rev=38165&r1=38164&r2=38165&view=diff
==============================================================================
--- trunk/http-server/src/dialogs.ycp (original)
+++ trunk/http-server/src/dialogs.ycp Tue May 29 09:08:50 2007
@@ -257,7 +257,7 @@
        // translators: dialog caption, %1 is the host name
        string caption = sformat( _("SSL Configuration for '%1'"),
            // translators: human-readable "default host"
-           HttpServerWidgets::currenthost == "defaulthost" ? _("Default Host") 
+           HttpServerWidgets::currenthost == "main" ? _("Default Host") 
                : HttpServerWidgets::get_host_value ( "ServerName"
                , YaST::HTTPDData::GetHost(HttpServerWidgets::currenthost), HttpServerWidgets::currenthost ) );
 

Modified: trunk/http-server/src/wizards.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/wizards.ycp?rev=38165&r1=38164&r2=38165&view=diff
==============================================================================
--- trunk/http-server/src/wizards.ycp (original)
+++ trunk/http-server/src/wizards.ycp Tue May 29 09:08:50 2007
@@ -20,45 +20,24 @@
 include "http-server/dialogs.ycp";
 include "http-server/wizard-dialog.ycp";
 
+define symbol MainSequence();
 
-/**
- * Main workflow of the http-server configuration
- * @return sequence result
- */
-symbol MainSequence() {
+symbol VirtualHostSequence(string action){
 
     map aliases = $[
-       "overview"    :   ``( OverviewDialog() ),
        "host"                :   ``( HostDialog() ),
-       "main-host"   :   ``( HostDialog() ),                 // different workflow
        "addhost"     :   ``( AddHost() ),
        "setvhost"    :   ``( SetVHostOptions() ),
        "ssl"         :   ``( SSLDialog () ),
        "dir"         :   ``( DirDialog () ),
-       "ssl-default" :   ``( SSLDialog () ),
     ];
 
+    string def = (action=="add")?"addhost":"host";
     map sequence = $[
-       "ws_start" : "overview",
-       "overview" : $[
-           `abort      : `abort,
-           `next       : `next,
-           `default    : "main-host",
-//         `hosts      : "hosts",
-           `dir        : "dir",
-           `ssl        : "ssl-default",
-           `edit       : "host",
-           `add        : "addhost",
-       ],
-       "ssl-default" : $[
-           `abort      : `abort,
-           `next       : "main-host",
-           `back       : "main-host",
-       ],
+       "ws_start" : def,
        "host" : $[
            `abort      : `abort,
-           `next       : "overview",
-//         `back       : "hosts",
+           `next       : `next, //"overview",
            `ssl        : "ssl",
            `dir        : "dir"
        ],
@@ -66,11 +45,10 @@
        "addhost": $[
            `abort      : `abort,
            `next       : "setvhost",
-//         `back       : "hosts",
        ],
        "setvhost": $[
            `abort      : `abort,
-           `next       : "overview",
+           `next       : `next, //"overview",
            `back       : "addhost"
        ],
        "ssl": $[
@@ -85,6 +63,51 @@
        ]
     ];
 
+    return Sequencer::Run(aliases, sequence);
+}
+
+/**
+ * Main workflow of the http-server configuration
+ * @return sequence result
+ */
+symbol MainSequence() {
+
+    map aliases = $[
+       "overview"    :   ``( OverviewDialog() ),
+       "addhost"     :   ``( AddHost() ),
+       "setvhost"    :   ``( SetVHostOptions() ),
+       "dir"         :   ``( DirDialog () ),
+       "add-vh"      :   [ ``( VirtualHostSequence("add")), true ],
+       "edit-vh"     :   [ ``( VirtualHostSequence("edit")), true ]
+    ];
+
+    map sequence = $[
+       "ws_start" : "overview",
+       "overview" : $[
+           `abort      : `abort,
+           `next       : `next,
+           `dir        : "dir",
+           `edit       : "edit-vh",
+           `add        : "add-vh",
+       ],
+       "add-vh" : $[
+           `next       : "overview" //`next
+       ],
+       "edit-vh" : $[
+           `next       : "overview" //`next
+       ],
+       "setvhost": $[
+           `abort      : `abort,
+           `next       : "overview",
+           `back       : "addhost"
+       ],
+       "dir": $[
+           `abort      : `abort,
+           `next       : "overview",
+           `back       : "overview"
+       ]
+    ];
+
     symbol ret = Sequencer::Run(aliases, sequence);
 
     return ret;

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx