Changeset 941

Timestamp:

08/23/07 17:42:43

Author:

mylan

Message:

Prepare new skin skeleton for install new skin with portal_setup. Need for testin yet.

Files:

• qPloneSkinDump/branches/plone_3.0/skin_template/Extensions/Install.py.old (modified) (2 diffs)
• qPloneSkinDump/branches/plone_3.0/skin_template/Extensions/utils.py (modified) (2 diffs)
• qPloneSkinDump/branches/plone_3.0/skin_template/profiles/default/import_steps.xml (modified) (2 diffs)
• qPloneSkinDump/branches/plone_3.0/skin_template/profiles/default/skins.xml (added)
• qPloneSkinDump/branches/plone_3.0/skin_template/profiles/default/skins_1.xml (deleted)
• qPloneSkinDump/branches/plone_3.0/skin_template/setuphandlers.py (modified) (3 diffs)
• qPloneSkinDump/branches/plone_3.0/utils.py (modified) (5 diffs)

qPloneSkinDump/branches/plone_3.0/skin_template/Extensions/Install.py.old

@@ -103 +103 @@
-    portal_js = getToolByName(portal, 'portal_javascripts', None)
-    # Get all properies, saving during installation, for uninstalling
-
+
+
+
-    initial_skin = getProperty(pp, 'uninstall_properties', 'q_default_skin',default="")
-    original_css_list = getProperty(pp, 'uninstall_properties', 'q_registered_css')
@@ -113 +115 @@
-        pp.manage_delObjects(ids=['uninstall_properties',])
-    # Uninstall skin
+    
+    # [XXX-1] -> uninstallSkin(skinsTool, SKIN_NAME, initial_skin)
-    uninstallSkin(skinsTool, actual_skin_name, initial_skin)
-    # Unregister skin's CSS-es from portal_css. Only for Plone 2.1+

qPloneSkinDump/branches/plone_3.0/skin_template/Extensions/utils.py

@@ -425 +425 @@
-        pp.addPropertySheet(id='uninstall_properties', title= 'uninstall_properties')
-        print >> out, "Created 'portal_properties.uninstall_properties' PropertySheet (UP) for backup purpose"
-
+
-CHECKED_MESSAGE = "The base installation checkings completed."
-
@@ -447 +447 @@
-        qi.uninstallProducts(products=installed_skin_products)
-
+###################################
+## Prepare UNINSTALL
+
+def prepareUninstallSkin(portal, pp_up, out): # ??
+    # Checking for presense SKIN_NAME in portal_skins directory view or among Skin Names
+    skinsTool = getToolByName(portal, 'portal_skins')
+    # Get unique product_skin_name and remember it in case of differ from SKIN_NAME.
+    default_skin = skinsTool.getDefaultSkin()
+    addProperty(pp_up, 'q_default_skin', default_skin, 'string', out)

qPloneSkinDump/branches/plone_3.0/skin_template/profiles/default/import_steps.xml

@@ -12 +12 @@
-              title="Perform old installation steps (temporary)">
-  <dependency step="toolset"/>
-  <dependency step="skins"/>
-  <dependency step="cssregistry"/>
-  <dependency step="jsregistry"/>
@@ -18 +17 @@
-   Perform old installation steps (temporary)
- </import-step>
+
+ <import-step id="skins" version="20040630-01"
+              handler="Products.CMFCore.exportimport.skins.importSkinsTool"
+              title="Skins Tool">
+     <dependency step="toolset"/>
+     <dependency step="%(skin_name)s_old_install"/>
+     Import skins tool's filesystem directory views and skin path definitions.
+ </import-step>
+
+
-</import-steps>

qPloneSkinDump/branches/plone_3.0/skin_template/setuphandlers.py

@@ -73 +73 @@
-    # Checking base condition for installation
-    skinsTool = getToolByName(self, 'portal_skins')
+    # Checking for absence of SKIN_NAME skin in site
+    skin_names = skinsTool.getSkinSelections()
+    if SKIN_NAME in skin_names:
+        raise AttributeError("Installation aborted due to '%%s' skin already present in your site." %% SKIN_NAME)
-    # Checking for BASE_SKIN_NAME presenting in portal
-    skin_names = skinsTool.getSkinSelections()
@@ -79 +83 @@
-    # Checking for presenting lower_SKIN_NAME directory in portal skins
-    lower_SKIN_NAME = string.lower(SKIN_NAME)
-
-
+#
+#
-    
-    #return CHECKED_MESSAGE
@@ -92 +96 @@
-    portal_js = getToolByName(portal, 'portal_javascripts', None)
-    # Make main prepare procedures
-
-
+
-    # Install skin
-
+
+
+
-    # Register css resources
-    if portal_css and DOES_COSTOMIZE_CSS:

qPloneSkinDump/branches/plone_3.0/utils.py

@@ -131 +131 @@
-
-    return slot_structure
+
+def buildSkinLayers(context, zmi_base_skin_name):
+    pskins = getToolByName(context,'portal_skins')
+    layers = (pskins.getSkinPath(zmi_base_skin_name) or '').split(',')
+    return "\n".join(['   <layer name="%s"/>'%l for l in layers])
-
-def dumpSkin(context, \
@@ -278 +283 @@
-        left_slots = right_slots = None
-        slot_forming = main_column = None
+
+    # Prepare XML strings for add to skins.xml
+    skin_layers = buildSkinLayers(context, zmi_base_skin_name)
+
-    # Copy skin_template to SKIN_PRODUCT directory
-    templatePath = ospJoin(products_path, PROJECTNAME, TEMPLATE_PATH)
@@ -299 +308 @@
-                ,"product_name" : productName \
-                ,"skin_name" : productSkinName \
+                ,"skin_name_lowercase" : productSkinName.lower() \
-                ,"skin_name_capital" : '%s%s' % (productSkinName[0].upper(), productSkinName[1:]) \
-                ,"product_name_lowercase" : productName.lower() \
@@ -304 +314 @@
-                ,"version1" : time.strftime('%Y%m%d') + '-1' \
-                ,"version2" : time.strftime('%Y%m%d') + '-2' \
-
-
+ \
+,"skin_layers" : skin_layers 
-    sp_updated_files = ['config.py' \
-                       ,'README.txt' \
@@ -316 +326 @@
-                       ,ospJoin('browser', 'configure.zcml')\
-                       ,ospJoin('profiles', 'default', 'import_steps.xml')\
+                       ,ospJoin('profiles', 'default', 'skins.xml')\
-                       ,ospJoin('browser', 'configure.zcml')
-                       ]