WIP: Further clean up

git-svn-id: svn://cherokee-project.com/wizards2@6801 5dc97367-97f1-0310-9951-d761b3857238

Wizard2_GUI.py

@@ -539,3 +539,28 @@ def __build_GUI__ (self):
 
 URL_STAGE_FINISHED_APPLY = "/wizard2/stages/finished/apply"
 CTK.publish ('^%s'%(URL_STAGE_FINISHED_APPLY), Stage_Finished.Apply, method="POST")
+
+
+
+#
+# Helpers
+#
+
+def Register_Standard_VServer_GUI (wizard_name, Install_Class):
+    wizard_url_name = wizard_name.lower().replace(' ', '_')
+    url_srv         = '/wizard/vserver/%s' %(wizard_url_name)
+
+    CTK.publish ('^%s$'  %(url_srv), lambda: Phase_Welcome (wizard_name, 'vserver').Render().toStr())
+    CTK.publish ('^%s/2$'%(url_srv), Stage_Install_Type)
+    CTK.publish ('^%s/3$'%(url_srv), Stage_Install_Directory)
+    CTK.publish ('^%s/4$'%(url_srv), Stage_Enter_VServer)
+    CTK.publish ('^%s/5$'%(url_srv), Stage_VServer_Logging)
+    CTK.publish ('^%s/6$'%(url_srv), lambda: Stage_Do_Install (Install_Class, "%s/7"%(url_srv)).Render().toStr())
+    CTK.publish ('^%s/7$'%(url_srv), Stage_Finished)
+
+def Register_Standard_Directory_GUI (wizard_name, Install_Class):
+    None
+
+def Register_Standard_GUI (*args, **kw):
+    Register_Standard_VServer_GUI   (*args, **kw)
+    Register_Standard_Directory_GUI (*args, **kw)

wizards/02-Content Management Systems/wordpress.py

@@ -132,12 +132,5 @@ def Configure_Cherokee_PostApply (self):
 #
 # GUI
 #
-URL_SRV = '/wizard/vserver/wordpress'
-
-CTK.publish ('^%s$'  %(URL_SRV), lambda: GUI.Phase_Welcome ('Wordpress', 'vserver').Render().toStr())
-CTK.publish ('^%s/2$'%(URL_SRV), GUI.Stage_Install_Type)
-CTK.publish ('^%s/3$'%(URL_SRV), GUI.Stage_Install_Directory)
-CTK.publish ('^%s/4$'%(URL_SRV), GUI.Stage_Enter_VServer)
-CTK.publish ('^%s/5$'%(URL_SRV), GUI.Stage_VServer_Logging)
-CTK.publish ('^%s/6$'%(URL_SRV), lambda: GUI.Stage_Do_Install (Install, "%s/7"%(URL_SRV)).Render().toStr())
-CTK.publish ('^%s/7$'%(URL_SRV), GUI.Stage_Finished)
+
+GUI.Register_Standard_GUI ('Wordpress', Install)