From sidnei at x3ng.com.br  Fri Jan  3 10:32:39 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: NZO_SiteLayout - zproduct_targets.mk:1.13
Message-ID: <200301031532.h03FWde00577@cvs.baymountain.com>

Update of /cvs-zopeorg/NZO_SiteLayout
In directory cvs.zope.org:/tmp/cvs-serv563

Modified Files:
	zproduct_targets.mk 
Log Message:
Add CMFPackage to the mix

=== NZO_SiteLayout/zproduct_targets.mk 1.12 => 1.13 ===
 src/ExternalEditor-head: CVS_MODULE=Products/ExternalEditor
 src/ExternalEditor-head: CVS_TAG=
 
+src/CMFPackage-head: CVS_REPOSITORY=${COLLECTIVE_CVS_REPOSITORY}
+src/CMFPackage-head: CVS_MODULE=CMFPackage
+src/CMFPackage-head: CVS_TAG=
+
 PRODUCT_CHECKOUTS=\
 src/ZopeOrg-NV \
 src/BTreeFolder2-0.5 \
@@ -64,6 +68,7 @@
 src/CMFPlone-1.0 \
 src/Formulator-head \
 src/ExternalEditor-head \
+src/CMFPackage-head \
 
 opt/ZopeOrg: src/ZopeOrg-NV
 opt/BTreeFolder2: src/BTreeFolder2-0.5
@@ -76,6 +81,7 @@
 opt/CMFPlone: src/CMFPlone-1.0
 opt/Formulator: src/Formulator-head
 opt/ExternalEditor: src/ExternalEditor-head
+opt/CMFPackage: src/CMFPackage-head
 
 PRODUCT_OPT_TARGETS=\
 opt/ZopeOrg \
@@ -89,6 +95,7 @@
 opt/CMFPlone \
 opt/Formulator \
 opt/ExternalEditor \
+opt/CMFPackage \
 
 ${PRODUCTS_DIRECTORY}/ZopeOrg: opt/ZopeOrg
 ${PRODUCTS_DIRECTORY}/BTreeFolder2: opt/BTreeFolder2
@@ -101,6 +108,7 @@
 ${PRODUCTS_DIRECTORY}/CMFPlone: opt/CMFPlone
 ${PRODUCTS_DIRECTORY}/Formulator: opt/Formulator
 ${PRODUCTS_DIRECTORY}/ExternalEditor: opt/ExternalEditor
+${PRODUCTS_DIRECTORY}/CMFPackage: opt/CMFPackage
 
 PRODUCT_VAR_TARGETS=\
 ${PRODUCTS_DIRECTORY}/ZopeOrg \
@@ -114,6 +122,7 @@
 ${PRODUCTS_DIRECTORY}/CMFPlone \
 ${PRODUCTS_DIRECTORY}/Formulator \
 ${PRODUCTS_DIRECTORY}/ExternalEditor \
+${PRODUCTS_DIRECTORY}/CMFPackage \
 
 CMF_INSTANCE_TARGETS=\
 ${PRODUCTS_DIRECTORY}/CMFCore \



From sidnei at x3ng.com.br  Sat Jan  4 12:34:25 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/nzo - index_html.html:1.3
Message-ID: <200301041734.h04HYP528141@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/nzo
In directory cvs.zope.org:/tmp/cvs-serv28080/skins/nzo

Modified Files:
	index_html.html 
Log Message:
improved migration of properties

=== Products/ZopeOrg-NV/skins/nzo/index_html.html 1.2 => 1.3 ===
 </body>
 </html>
 
-/span>
-                </td>
-            </tr>
-	</table>
-</div>
-</body>
-</html>
 



From sidnei at x3ng.com.br  Sat Jan  4 12:34:51 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.5
Message-ID: <200301041734.h04HYp228178@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions
In directory cvs.zope.org:/tmp/cvs-serv28080/Extensions

Modified Files:
	NZOMigrate.py 
Log Message:
improved migration of properties

=== Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.4 => 1.5 ===
 from ZODB.POSException import POSKeyError
 from Acquisition import aq_base
 from Products.CMFCore.utils import getToolByName
+from DateTime import DateTime
 import zLOG
 
 def migrate(source, dest, ignore_path=None, type_map=None):
@@ -37,7 +38,10 @@
                     }
         
     tmut = Transmutator(source, dest, ignore_path, type_map)
-    return tmut.run()
+    tmut.log('Migration script started at %s\n.' % DateTime().ISO())
+    result = tmut.run()
+    tmut.log('Migration script finished at %s\n.' % DateTime().ISO())
+    return result
 
 def normalizeMetaType(meta_type):
     return meta_type.replace(' ', '')
@@ -127,14 +131,23 @@
             try: wf_tool.doActionFor(subob, 'publish')
             except: pass
             massPublish(subob)
+
+def filterList(alist):
+    dict = {}
+    for item in alist:
+        dict[item] = 1
+    alist = dict.keys()
+    alist.sort()
+    return alist
             
 class Transmutator:
 
-    def __init__(self, source, dest, ignore_path, type_map):
+    def __init__(self, source, dest, ignore_path, type_map, level=0):
         self._source = source
         self._dest = dest
         self._ignore_path = ignore_path
         self._type_map = type_map
+        self._level = level
         self._out = StringIO()
 
     def log(self, message, summary='', severity=0, dup=1):
@@ -142,6 +155,9 @@
         if dup:
             zLOG.LOG('NZOMigration: ',severity,summary,message)
 
+    def getResult(self):
+        return self._out.getvalue()
+
     def getMigrationMethod(self, obj):
         if hasattr(obj, 'meta_type'):
             mt = getattr(obj, 'meta_type')
@@ -197,6 +213,7 @@
         title = obj.title or ''
         description = obj.description or ''
         subject = obj.Software_topics or []
+        subject = filterList(subject)
         contact_email = obj.contact_email
         f.setTitle(title)
         f.setDescription(description)
@@ -205,9 +222,6 @@
         return f
 
     def ProductRelease2CMFSoftwareRelease(self, obj, source, dest):
-        if obj.getId() == 'Zope-2.5.x-to-2.5.1-linux2-x86.tgz':
-            import pdb
-            pdb.set_trace()
         dest.invokeFactory(id=obj.getId(), type_name='Software Release')
         f = getattr(dest, obj.getId())
         title = obj.title or ''
@@ -224,7 +238,8 @@
         changes_url = obj.changes_url
         installation_url = obj.installation_url
         license = obj.license
-        data, size = obj._read_data(obj.data)
+        data = str(obj.data)
+        size = len(data)
         content_type = obj._get_content_type(obj.data, data, obj.__name__,
                                             'application/octet-stream')
 
@@ -281,7 +296,8 @@
         f = getattr(dest, obj.getId())
         title = obj.title or ''
         content_type = obj.content_type
-        data, size = f._read_data(obj.data)
+        data = str(obj.data)
+        size = len(data)
         f.update_data(data, content_type, size)
         f.setTitle(title)
         f.setFormat(content_type)
@@ -292,7 +308,8 @@
         f = getattr(dest, obj.getId())
         title = obj.title or ''
         content_type = obj.content_type
-        data, size = f._read_data(obj.data)
+        data = str(obj.data)
+        size = len(data)
         f.update_data(data, content_type, size)
         f.setTitle(title)
         f.setFormat(content_type)
@@ -307,6 +324,7 @@
         subject = (type(obj.subject) in [type(''), type([])]) and \
                   obj.subject or []
         subject.extend(obj.NewsItem_topics)
+        subject = filterList(subject)
         news.setTitle(title)
         news.edit(text_format=format, text=text)
         news.setSubject(subject)
@@ -321,6 +339,7 @@
         subject = (type(obj.subject) in [type(''), type([])]) and \
                   obj.subject or []
         subject.extend(obj.Link_topics)
+        subject = filterList(subject)
         remote_url = obj.remote_url
         zope_powered = obj.zope_powered or 0
         link.setTitle(title)
@@ -338,9 +357,9 @@
                       obj.description or ''
         text = obj.content
         format = hasattr(obj, 'format') and obj.format or 'structured-text'
-        import pdb; pdb.set_trace()
         subject = (type(obj.subject) in [type(''), type([])]) and \
                   obj.subject or []
+        subject = filterList(subject)
         doc.setTitle(title)
         doc.setDescription(description)
         doc.edit(text_format=format, text=text)
@@ -354,14 +373,13 @@
         dest.invokeFactory(id=obj.getId(), type_name='Tip')
         tip = getattr(dest, obj.getId())
         title = obj.tip or ''
-        description = obj.details or ''
-        text = obj.content
-        format = obj.format
+        text = obj.details or ''
+        format = 'html'
         subject = (type(obj.subject) in [type(''), type([])]) and \
                   obj.subject or []
         subject.extend(obj.tip_topics)
+        subject = filterList(subject)
         tip.setTitle(title)
-        tip.setDescription(description)
         tip.edit(text_format=format, text=text)
         tip.setSubject(subject)
         return tip
@@ -375,6 +393,7 @@
         subject = (type(obj.subject) in [type(''), type([])]) and \
                   obj.subject or []
         subject.extend(obj.HowTo_topics)
+        subject = filterList(subject)
         howto.setTitle(title)
         howto.edit(text_format=format, text=text)
         howto.setSubject(subject)
@@ -463,12 +482,26 @@
         return new
 
     def copyProperties(self, orig, new):
+        if not hasattr(aq_base(orig), 'propertyIds'):
+            return new
         for prop in orig.propertyIds():
-            if not new.hasProperty(prop):
-                new._setProperty(prop, orig.getProperty(prop), \
-                                 orig.getPropertyType(prop))
-            else: new._setPropValue(prop, orig.getProperty(prop))
-        return new
+            if not new.hasProperty(prop) and not hasattr(aq_base(new), prop):
+                type = orig.getPropertyType(prop)
+                if type in ('selection', 'multiple selection'):
+                    for p in orig._properties:
+                        if p['id'] == prop:
+                            value = p['select_variable']
+                        if not hasattr(new, value):
+                            setattr(new, value, [])
+                else: value = orig.getProperty(prop)
+                try: new._setProperty(prop, value, type)
+                except Exception, msg:
+                    self.log('Could not set property ' + \
+                             '%s of type %s to %s.\n %s\n' % \
+                             (prop, type, value, msg))
+            else:
+                new._setPropValue(prop, orig.getProperty(prop))
+            return new
         
     def run(self):
         source = self._source
@@ -513,13 +546,15 @@
                 if hasattr(obj, 'objectIds') and new_obj is not None:
                     ignore = self.WikiMethodsCleanup(obj, ignore)
                     ignore = self.DefaultDTMLCleanup(obj, ignore)
-                    get_transaction().commit(1)
                     self.log(Transmutator(obj, new_obj, \
-                                          ignore, self._type_map).run(), dup=0)
+                                          ignore, self._type_map, \
+                                          self._level + 1).run(), dup=0)
+                    if self._level <= 2:
+                        get_transaction().commit()
+                    else:
+                        get_transaction().commit(1)
 
-            get_transaction().commit()
-            
-        return 'Ok.\n' or self._out.getvalue()
+        return 'Ok.\n'
 
 
 if __name__ == '__main__':



From sidnei at x3ng.com.br  Sat Jan  4 12:47:34 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - setupZopeOrg.py:1.61
Message-ID: <200301041747.h04HlYV30550@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions
In directory cvs.zope.org:/tmp/cvs-serv30530/Extensions

Modified Files:
	setupZopeOrg.py 
Log Message:
make software release addable again

=== Products/ZopeOrg-NV/Extensions/setupZopeOrg.py 1.60 => 1.61 ===
 ########################################################
 
 INVISIBLE_TYPES = ( 'Wiki Page'
-                  , 'Software Release'
                   , 'Software Release File'
                   , 'BackTalk Document'
                   )



From sidnei at x3ng.com.br  Thu Jan  9 15:16:23 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/nzo - processAction.py:1.1 top_logo.png:1.1
Message-ID: <200301092016.h09KGN411761@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/nzo
In directory cvs.zope.org:/tmp/cvs-serv11743/nzo

Added Files:
	processAction.py top_logo.png 
Log Message:
major ui fixes

=== Added File Products/ZopeOrg-NV/skins/nzo/processAction.py ===
## Script (Python) "processAction"
##bind container=container
##bind context=context
##bind namespace=
##bind script=script
##bind subpath=traverse_subpath
##parameters=action_url
##title=processAction
##

return context.REQUEST.RESPONSE.redirect(action_url)


=== Added File Products/ZopeOrg-NV/skins/nzo/top_logo.png ===
�PNG


IHDR�6Z�M�sBIT��O�
PLTE�����������������������������������������������������������������ͽ����������˷�ܴ�������Ȳ�ٯ�׹�ƪ�֦�԰�ã�Ѫ����Φ����˕�̜����������ȍ�Ɠ����ņ�ĉ��������z����v��z��t��q��u��m��i��k��d��a��b��Z��Z��Y��V��X�V~�R~�Q}�Ny�Ky�Ky�Lw�Hv�Dt�Bp�?n�;l�9l�1g�3f�2e�2e�0d�/d�.d�.b��k7�	pHYs
��~�tEXtCreation Time01/07/03�t�� tEXtSoftwareMacromedia Fireworks MX��*$=IDATx�՚}s�F��J�fj��դ���5)i��bh�������]a�������WXaݏ��]6�79�e��ﲚ������ӣ�I�fEK�RZ�t�������R�;H�][��޷c(-�Þ%�u��T�n�&�^�(�+c~�5�)'�K���
1j���u�ʷaK��dS����z5��G�k�m7� ������HR@oW��Q�}��6kݡ�/�H�g�.�Z���Q:�T)䩼�j�մL�J�@���O}U�b��Ù�H�'��(�BLR�+)
<v�kF)�����
��uEHb�u<��]+�B��L�T�5��`0�m���0�v��]@Rv��"W��4��_^%��>^2��1�B�\��E$:8�����(�H���>^���eY����s�4;P�`a�MB�Qp��-1�(kf�o��|%��/rQ+Ј�W5	(վ=�tJ�����Ա��䷘�ILR��$%p͌�ͱ�c�$� ���~
��U~�5���֋L$�C���j40����$�rd�d	ROԀ_�84�8�$	#��\/�zp�:!v
�v��6��2pސ����c]`�3IT��9m����*�'��
�3�.�P`n��mΒlF�&a�y�B�L$�`�H�������>Jp��/�q0ūO,�Z�a�b��d�(�7�� čOr�w/ű�
�V.L$�&
@�5$g<I��E����{�_u(Hb�+h�Q@F	FI_y�M�[y�N8�8E�4��V�̳A&2t5��a�%IPx�_@�E$�q$����Y������	��Gx)�
�@�q�:�d�L9)�<T54��7C��m $��aBbU�o@���wq�쭛����?>UEDӏ�	�OZ0L�~!��˜wE.���R�D�ʪ{�ع�$�&d/�r�����S�`@	�'t�&��5�+%lV-PFك���'�I�)��^&NP�B70�=%>u6��W�*l,�Q亇yaA���E�Æ`�͆�]ȕ�t0��EtS��$a�߁�"H�Ɍ$�C���8�lJ>�k�2��dJ���5~��I<��j�Z��*�-��	>[	u'��qYO>���.tX�q���nf��!z%�I����^؈���3[V�Š�y
D݊'���+I(��x���-hC�@���I��77��|
�{�=I�L�D�g�v�JU׋���ͪH�t6wR�+��u�?:�Sn�����p�����'�� �$�}�~����R��4�9�*�s9ʆ� �i������^ �I�ط|��j�8�;M���P�-�f �Զv'�l+�z�x�B;�0&�,%Pl�{�^�?�&�lf�C�Q�l7��Q*��^p �Z���-iX�0���A��'p�F�
�lO�	���G]W�>'	 .��$���P�o}��ԸP5��i�pe�yC��|��W�\�p�+M�����L&(�uX�g4Hxĝt.�I>b� i�
�I"��T*ߠ[�5;s��,�@&��J�]�?�zH��k�ŀD���ߟ��	��x7ֳ�y�XUԒ�*��N˻a8�{�gT�Y�US�;�g�-� ������8�=MN%2����,G�{��x��@���z��#��˷x�ɓ��?%�$DǗ��1�	���V=#��o�0�ý���,$Lr�Wg_A�}W�Q.���K���\����ɱ�*�����g�v޻\w�L���&�M�w�@藿πg�h�n�;�yӴ��=��Ç�����@�kY�RG3���[�W�8���?�	�$a�Z����8���y�3���VB\s��קO��	�K�1�C��t��;t�-z�������?��?8g�r�fIEND�B`�


From sidnei at x3ng.com.br  Thu Jan  9 15:15:19 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/nzo - folder_factories.html:1.2 macros_repository.html:1.5
Message-ID: <200301092015.h09KFJw11573@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/nzo
In directory cvs.zope.org:/tmp/cvs-serv11531/nzo

Modified Files:
	folder_factories.html macros_repository.html 
Log Message:
major ui fixes

=== Products/ZopeOrg-NV/skins/nzo/folder_factories.html 1.1 => 1.2 ===
   </td>
   <td align="left"><strong><label for=""
     tal:attributes="for string:cb_${repeat/item/number}"
-    tal:content="item/Type"></label></strong>
+    tal:content="item/Title"></label></strong>
   </td>
   <td align="left" tal:content="item/Description"></td>
 </tr>


=== Products/ZopeOrg-NV/skins/nzo/macros_repository.html 1.4 => 1.5 ===
 <!-- start byline - new action_box -->
 
 <span id="ACTIONS_BAR" metal:define-macro="byline"
-     tal:condition="python:not isAnon"
-     tal:define="getIcon python:hasattr(here, 'getIcon') and here.getIcon();
-                     icon python:getIcon or getattr(here, 'icon', '');
-                     typ python:getattr(here, 'Type', '');
-                     objID python:here.truncID( here.getId(), size=25 )">
-  <div id="BYLINE_TITLE"><img tal:condition="icon" src=""
-                             tal:attributes="src icon; alt typ">&nbsp;<span tal:content="here/Title" tal:omit-tag="">Job Jar For Future Projects</span></div>
-
-    <div>By <a href=""
-          tal:attributes="href python:mtool.getHomeUrl(here.Creator())"
-          tal:content="here/Creator">Some Author</a>
-        (updated <span tal:replace="here/ModificationDate">2001-09-17 14:29:59</span> )
-    </div>
-
-    <div id="objectactions"
-         tal:condition="python:not isAnon and (len( object_actions ) &gt; 1 or len( folder_actions ) &gt; 1 or len( workflow_actions ) &gt; 1)">
-
-      <div tal:condition="python:len(object_actions) &gt; 1"><span tal:repeat="action object_actions"
-            tal:omit-tag=""><a href=""
-    tal:attributes="href action/url"
-    tal:content="action/name">View</a><span
-    tal:condition="not:repeat/action/end" tal:omit-tag="">&nbsp;|&nbsp;</span></span></div>
-
-      <div tal:condition="python:len(folder_actions) &gt; 1"><span tal:repeat="action folder_actions"
-            tal:omit-tag=""><a href=""
-    tal:attributes="href action/url"
-    tal:content="action/name">Edit</a><span
-    tal:condition="not:repeat/action/end" tal:omit-tag="">&nbsp;|&nbsp;</span></span></div>
-
-      <div tal:condition="python:len(workflow_actions) &gt; 1"><span tal:condition="workflow_actions"
-            class="ObjectStatus" tal:omit-tag="">Status: <span
-    tal:replace="python: wtool.getInfoFor(here,'review_state','')">Private
-</span></span>&nbsp;<span tal:repeat="action workflow_actions"
-            tal:omit-tag=""><a href="content_submit_form"
-    tal:attributes="href action/url"
-    tal:content="action/name">Submit</a><span
-    tal:condition="not:repeat/action/end" tal:omit-tag="">&nbsp;|&nbsp;</span></span></div>
-    </div>
-    <br />
+tal:condition="python:not isAnon"
+tal:define="getIcon python:hasattr(here, 'getIcon') and here.getIcon();
+icon python:getIcon or getattr(here, 'icon', '');
+typ python:getattr(here, 'Type', '');
+objID python:here.truncID( here.getId(), size=25 )">
+
+<table width="100%">
+  <tr>
+    <td>
+      <div id="BYLINE_TITLE"><img tal:condition="icon" src=""
+      tal:attributes="src icon; alt typ">&nbsp;<span
+      tal:content="here/Title" tal:omit-tag="">
+      Job Jar For Future Projects</span></div>
+      
+      <div>By <a href=""
+      tal:attributes="href python:mtool.getHomeUrl(here.Creator())"
+      tal:content="here/Creator">Some Author</a>
+      (updated <span tal:replace="here/ModificationDate">
+      2001-09-17 14:29:59</span> )
+      </div>
+    </td>
+    <td align="right">
+      
+      <div tal:condition="workflow_actions"
+      tal:omit-tag=""><b>Status: </b><span
+      tal:replace="python: wtool.getInfoFor(here,'review_state','')">
+      Private</span></div>
+
+      <div id="objectactions"
+      tal:condition="python:not isAnon and (object_actions  or  folder_actions  or workflow_actions )">
+
+      <form action="processAction" method="POST">
+
+      <select name="action_url">
+	<optgroup label="Object Actions" tal:condition="python:len(object_actions)">
+	
+	<option tal:repeat="action object_actions"
+	  value=""
+	  tal:attributes="value action/url"
+	  tal:content="action/name">
+	  View</option>
+	</optgroup>
+
+	<optgroup label="Folder Actions" tal:condition="python:len(folder_actions)">
+	  
+	<option tal:repeat="action folder_actions"
+	  value=""
+	  tal:attributes="value action/url"
+	  tal:content="action/name">View</option>
+	</optgroup>
+
+	<optgroup label="Workflow Actions" tal:condition="python:len(workflow_actions)">
+
+	<option tal:repeat="action workflow_actions"
+	  value=""
+	  tal:attributes="value action/url"
+	  tal:content="action/name">View</option>
+	</optgroup>
+	  
+      </select>
+
+      <input type="submit" value="Go" />
+
+      </form>
+      </div>
+
+    </td>
+  </tr>
+</table>
 </span>
 
 <!-- end byline - new action_box -->



From sidnei at x3ng.com.br  Thu Jan  9 14:12:31 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/zwiki_dtml Products/ZopeOrg-NV/skins/zwiki_dtml - New directory
Message-ID: <200301091912.h09JCVt32328@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/zwiki_dtml
In directory cvs.zope.org:/tmp/cvs-serv32317/zwiki_dtml

Log Message:
Directory /cvs-zopeorg/Products/ZopeOrg-NV/skins/zwiki_dtml added to the repository

=== Added directory Products/ZopeOrg-NV/skins/zwiki_dtml ===



From sidnei at x3ng.com.br  Thu Jan  9 14:14:02 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/nzo - main_template.html:1.14 nzo.css.dtml:1.2 standard_html_header.dtml:1.2
Message-ID: <200301091914.h09JE2w32663@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/nzo
In directory cvs.zope.org:/tmp/cvs-serv32528/nzo

Modified Files:
	main_template.html nzo.css.dtml standard_html_header.dtml 
Log Message:
some dtml skins for zwiki while someone writes zpt versions

=== Products/ZopeOrg-NV/skins/nzo/main_template.html 1.13 => 1.14 ===
   <title tal:define="ob_title here/Title; portal_title container/title"
          tal:content="string:${portal_title}: ${ob_title}">New Zope.org</title>
 
+
   <link href="css_default.css" rel="stylesheet" type="text/css"
         tal:attributes="href here/css_default.css/absolute_url" />
 
@@ -43,65 +44,58 @@
 <body>
 
 <span metal:define-macro='header'>
-<div id="TOP_NAVIG">
-  <table width="100%" background="top_bckgrd.jpg" border="0" cellspacing="0" cellpadding="0">
-    <tr>
-      <td width="201" valign="top">
-      <div align="left">
- <a href="#" tal:attributes="href portal_url"><img src="top_logo.gif"
-           width="201" height="54" border="0" /></a></div></td>
-
-      <td background="top_bckgrd.jpg" width="100%">
-
-	<a href="#"
-         tal:attributes="href portal_url">Home</a> |
-         <a href="#" tal:attributes="href string:${portal_url}/sitemap.html">Site map</a> |
-         <a href="#" tal:attributes="href string:${portal_url}/help.html">Help</a> |
-         <a href="#" tal:attributes="href string:${portal_url}/search_form">Search</a>
-      </td>
-      <td background="top_bckgrd.jpg" nowrap="nowrap">
-      <form action="search" method="get"
+
+<div class="top">
+
+ <div class="searchBox">
+
+   <form action="search" method="get"
             tal:attributes="action string:${portal_url}/search">
-	<input type="text" name="SearchableText" value="Type your search here"
-        size="20" onfocus="this.value='';" />
-        <input type="submit" name="Submit" value="Go" />&nbsp;
-      </form>
-
-      </td>
-    </tr>
-  </table>
+
+   <a href="#"
+      tal:attributes="href portal_url">Home</a> |
+   <a href="#" tal:attributes="href string:${portal_url}/sitemap.html">Site map</a> |
+   <a href="#" tal:attributes="href string:${portal_url}/help.html">Help</a> |
+   <a href="#" tal:attributes="href string:${portal_url}/search_form">Search</a>
+
+   <input type="text" name="SearchableText" value="Type your search here"
+               size="20" onfocus="this.value='';" />
+   <input type="submit" name="Submit" value="Go" />
+   </form>
+
+ </div>
+
+<a href="#" tal:attributes="href portal_url">
+    <img src="top_logo.png" class="logo"
+         width="201" height="54" border="0" />
+ </a>
+
+
 </div>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
-  <tr>
-    <td bgcolor="#CCCCCC" class="SLOGAN">&nbsp;The website for the Zope Community</td>
-    <td bgcolor="#CCCCCC">
+<div class="top_bar">
+  <div class="slogan">
+  The Website for the Zope Community
+  </div>
 
-      <div id="USER_BAR">
+  <div class="user_bar">
            Username:&nbsp;&nbsp;<span tal:content="uname">Guest</span>&nbsp;&nbsp;
         <span tal:repeat="action user_actions">
         <a href="" tal:attributes="href action/url"
            tal:content="action/name">Login</a><span tal:condition="not: repeat/action/end">&nbsp;|&nbsp;</span>
         </span>
         <span tal:condition="nothing"><a href="join_form">Join</a></span>&nbsp;
-      </div>
-
-    </td>
-  </tr>
-  <tr>
-    <td bgcolor="#BBBBBB" height="1"></td>
-    <td bgcolor="#BBBBBB" height="1"></td>
-  </tr>
-
-
+  </div>
+&nbsp;
+</div>
 
-</table>
 </span>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="7">
+<table class="columns">
   <tr>
-    <td valign="top" nowrap width="120">
-        <div metal:define-macro="side_menu" id="SIDE_MENU">
+    <td class="left">
+
+      <span metal:define-macro="side_menu" id="side_menu" class="side_menu">
 
           <h1><a href="#">About Zope</a></h1>
           <div><a href="#">What is Zope?</a></div>
@@ -151,174 +145,34 @@
           <div><a href="#">Marketing Zope</a></div>
 
 
-        </div>
+      </span>
     </td>
+    <td class="right">
 
-    <td background="point_bckgrd2.jpg" width="1">&nbsp;</td>
-    <td valign="top">
-      <span metal:define-macro='bread_byline'>
+      <div metal:define-macro='bread_byline'>
       <div id="Breadcrumbs" tal:condition="python: not here.getId() == utool.getPortalObject().getId()">
-        Location: 
-          <span tal:replace="structure python:here.shortBread(include_root=1)">
-			    <a href="#">Bread</a> > <a href="#">Crumbs</a></span>
-      </div>
-      <div metal:use-macro="container/macros_repository/macros/byline">Byline</div>
-    
+      Location: 
+      <span tal:replace="structure python:here.shortBread(include_root=1)">
+      <a href="#">Bread</a> > <a href="#">Crumbs</a>
       </span>
-
-      <div metal:define-slot="main">
-
-
-<TABLE width="100%" border=0 cellspacing="0" cellpadding="0">
-  <TBODY>
-  <TR>
-    <TD  id="contentarea" valign="top">
-      <H1>Spotlight on...<br /></H1>
-
-      <h2>Using Zope With Amaya<br />
-      <span style="font-size: small">By Michel Pelletier 21 August, 2001</span></h2>
-      <p>Zope is an object-oriented web application server that
-      is managed through a web interface. This interface allows
-      you to add and manipulate Zope objects. Zope's managment
-      interface is one of its most powerful features, but there
-      is one area where using Zope's managment interface is
-      difficult: editing templates.  <img src="more.gif"
-      width="115" height="33" align="absbottom" /></p>
-
-      <H1>What is Zope?</H1>
-
-      <p>Zope is an open source application server for building
-      content management solutions such as publishing sites,
-      intranet, portals, and custom applications. The Zope
-      community consists of hundreds of companies and thousands
-      of developers all over the world, working on building
-      the platform and Zope applications. <br />
-      <img src="more.gif" width="115" height="33" align="absbottom" />
-      </p>
-
-      <h1>Info for...</h1>
-
-      <div><a href="#">New Users</a>: New to Zope but familiar with
-      website programming.
-
-        <div class="subitems"><a href="">Intro</a>, 
-            <a href="">About Python</a>, 
-     <a href="">Web Programming</a> 
-            <img src="more.gif" width="115" height="33" align="absbottom" />
-        </div>
-      </div>
-
-      <div><a href="#">Web Masters</a>: Using Zope to make a website.
-
-        <div class="subitems"><a href="">Using Apache</a>, 
-     <a href="">Security</a>, 
-     <a href="">Backup policies</a>, 
-     <a href="#">DTML </a>
-     <a href=""><img src="more.gif" width="115" height="33" 
-     align="absbottom" border="0" /></a>
-        </div>
-      </div>
-
-      <div><a href="#">Product Developers</a>: Using Zope to make
-             applications.
-
-        <div class="subitems"><a href="">Developers Guide</a>, 
-     <a href="#">ZClasses</a>,
-     <a href="">Unit testing</a> 
-     <a href="#"><img src="more.gif" width="115" height="33" 
-     align="absbottom" border="0" /></a>
-        </div>
       </div>
-
-      <div><a href="#">Zope Developers</a>: Doing the impossible,
-      improving Zope.
-
-        <div class="subitems"><a href="">Products</a>, 
-     <a href="">Using CVS</a>,
-     <a href="">Bug days</a> 
-     <a href="#"><img src="more.gif" width="115" height="33"
-     align="absbottom" border="0" /></a>
-        </div>
+      <div metal:use-macro="container/macros_repository/macros/byline">
+      Byline
       </div>
-
-    </TD>
-
-    <TD valign="top"><img src="space.gif" width="7" height="32" alt="" /></TD>
-    <TD background="point_bckgrd2.jpg"><img src="space.gif" width="24" height="32" alt="" /></TD>
-    <TD id="NEWS_MENU" vAlign=top width=200> 
-
-        <H1>Announcements</H1>
-
-        <p>14 March - <a href="#">O'Reilly Call For Papers
-        Deadline</a></p>
-
-        <p>13 March - <a href="#">Migration to new.zope.org
-        Scheduled</a></p>
-
-        <p>13 March - <a href="#">Lennart is Learning
-        dreamweaver, Olivier prefers plain old ZMI</a></p>
-  
-        <p style="text-align: center"><img style="text-align: center"
-           src="more.gif" width="115" height="33" align="absbottom" /></p>
- 
-        <H1>News</H1>
-
-        <p>13 Apr - <a href="#">ZPT introduction</a></p>
-
-        <p>13 Apr - <a href="#">Lambda Tricks</a></p>
-
-        <p>13 Apr - <a href="#">Zope on Slashdot</a></p>
-
-        <p style="text-align: center"><img style="text-align: center"
-           src="more.gif" width="115" height="33" align="absbottom" /></p>
- 
-        <h1>Top Resources</h1>
-
-        <div class="topresources">
-        <p> - <a href="#">Content Index 1.5.0</a> (haqa)</p>
-
-        <p> - <a href="#">Ratings 0.3.0</a> (k_vertigo)</p>
-
-        <p> - <a href="#">LDAP Directory Manager 0.1</a> (k_vertigo)</p>
-
-        <p> - <a href="#">Photo Extension 0.0.2</a> (mngibso)</p>
-
-	<p> - <a href="#">ZExternal News 1.0.2</a> (odeckmyn)</p>
-        </div>
-
-        <p style="text-align: center"><img style="text-align: center"
-           src="more.gif" width="115" height="33" align="absbottom" /></p>
- 
-    </TD>
-  </TR>
-  </TBODY>
-</TABLE>
-
       </div>
+      <div>
+      <span metal:define-slot="main">
+      main
+      </span>
+    </div>
     </td>
   </tr>
 </table>
 <span metal:define-macro="footer">
-<table align="center" border="0" cellspacing="0" cellpadding="0" width="100%" style="margin-top: 2em;margin-bottom: 2em">
-<tr>
-<td align="center" id="FOOTER_MENU">
-  <a href="#">Privacy policy</a> | <a href="#">Feedback
-              to this page's author</a> | <a href="#">Feedback about Zope.org</a>
-              | <a href="#">Page Source</a>
-</td>
-</tr>
-</table>
-
-<!-- Disabled
-
-<div align="center" metal:use-macro="container/macros_repository/macros/bugbox">
-Here goes the Bug Box
-</div>
-
--->
 <div align="center" metal:use-macro="container/macros_repository/macros/copyright">
-  Here goes the Copyright
+Here goes the Copyright
 </div>
 </span>
+
 </body>
 </html>


=== Products/ZopeOrg-NV/skins/nzo/nzo.css.dtml 1.1 => 1.2 ===
 **
 */
 
-
-/*
-**  Instructions to set caching headers. Inside comments area to play nicer with CSS editors.
-**
-** **   
-**   
-**   
-**   
-** */
-/*  */
-
-
- 
 body {
     font: 0.8em Verdana, Helvetica, Arial, sans-serif;
     background: White;
@@ -241,11 +228,12 @@
     background: transparent;
     margin: 0;
     padding: 0;
+    background-color: #336699;
 }
 
 .logo {
     /* Logo properties */
-    margin: 1em 0em 1em 2em;
+    margin: 0em 2em 0em 0em;
     padding: 0;
 }
 
@@ -254,11 +242,55 @@
     background-color: transparent;
     color: Black;
     float: right;
-    margin: 3em 0em 0em 0em;
+    margin: 2em 0em 0em 0em;
     padding: 0em 2em 0em 0em;
     text-align: right;
     text-transform: lowercase;
-    width: 30%;
+    width: 50%;
+}
+
+div.searchBox a {
+    color: White;
+}
+
+div.top_bar {
+    background: transparent;
+    margin: 0;
+    padding: 0;
+    background-color: #CCCCCC;
+}
+
+div.slogan {
+    float: left;
+    background: transparent;
+}
+
+div.user_bar {
+    float: right;
+    background: transparent;
+}
+
+span.side_menu {
+    border: dotted black 1px;
+    float: left;
+    width: 150px; 
+    padding: 6px;
+    margin: 4px;
+}
+
+table.columns {
+   width: 100%;
+   border: 4px;
+}
+
+table.columns td.left {
+    vertical-align: top;
+    width: 150px;
+}
+
+table.columns td.right {
+    vertical-align: top;
+    padding: 4px;
 }
 
 input.searchButton {
@@ -346,29 +378,6 @@
 
 .addFavorite {
     vertical-align: bottom;
-}
-
-table.columns {
-	width: 100%;
-}
-
-table.columns td.left {
-    vertical-align: top;
-    width: 15%;
-    padding: 2em 1em 1em 2em;
-}
-
-table.columns td.main {
-    vertical-align: top;
-    padding: 0em 1em 1em 1em;
-    margin: 0;
-    width: 70%;
-}
-
-table.columns td.right {
-    vertical-align: top;
-    width: 15%;
-    padding: 2em 2em 1em 1em;
 }
 
 #contentTabs {


=== Products/ZopeOrg-NV/skins/nzo/standard_html_header.dtml 1.1 => 1.2 ===
 
 <dtml-var "macro_renderer(template='here/main_template', macro='header')" >
 
-<table width="100%" border="0" cellspacing="0" cellpadding="7">
+<table class="columns">
   <tr>
-    <td valign="top" nowrap width="120">
+    <td class="left">
      
     <dtml-var "macro_renderer(template='here/main_template', macro='side_menu')" >
-
     </td>
-
-    <td background="point_bckgrd2.jpg" width="1">&nbsp;</td>
-    <td valign="top">
-
+    <td class="right">
     <dtml-var "macro_renderer(template='here/main_template', macro='bread_byline')" >
 
 



From sidnei at x3ng.com.br  Thu Jan  9 14:20:44 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/nzo - macros_repository.html:1.4
Message-ID: <200301091920.h09JKib01658@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/nzo
In directory cvs.zope.org:/tmp/cvs-serv1642/nzo

Modified Files:
	macros_repository.html 
Log Message:
minor ui fixes

=== Products/ZopeOrg-NV/skins/nzo/macros_repository.html 1.3 => 1.4 ===
                      typ python:getattr(here, 'Type', '');
                      objID python:here.truncID( here.getId(), size=25 )">
   <div id="BYLINE_TITLE"><img tal:condition="icon" src=""
-                             tal:attributes="src icon; alt typ">&nbsp;<span
-    tal:content="here/Title" tal:omit-tag="">Job Jar For Future Projects</span></div>
+                             tal:attributes="src icon; alt typ">&nbsp;<span tal:content="here/Title" tal:omit-tag="">Job Jar For Future Projects</span></div>
 
-    <div>
-    By <a href=""
+    <div>By <a href=""
           tal:attributes="href python:mtool.getHomeUrl(here.Creator())"
           tal:content="here/Creator">Some Author</a>
         (updated <span tal:replace="here/ModificationDate">2001-09-17 14:29:59</span> )
@@ -27,7 +25,6 @@
     <div id="objectactions"
          tal:condition="python:not isAnon and (len( object_actions ) &gt; 1 or len( folder_actions ) &gt; 1 or len( workflow_actions ) &gt; 1)">
 
-
       <div tal:condition="python:len(object_actions) &gt; 1"><span tal:repeat="action object_actions"
             tal:omit-tag=""><a href=""
     tal:attributes="href action/url"
@@ -49,6 +46,7 @@
     tal:content="action/name">Submit</a><span
     tal:condition="not:repeat/action/end" tal:omit-tag="">&nbsp;|&nbsp;</span></span></div>
     </div>
+    <br />
 </span>
 
 <!-- end byline - new action_box -->



From sidnei at x3ng.com.br  Thu Jan  9 14:13:33 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/zwiki_dtml - backlinks.dtml:1.1 editform.dtml:1.1 subscribeform.dtml:1.1
Message-ID: <200301091913.h09JDXi32582@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/zwiki_dtml
In directory cvs.zope.org:/tmp/cvs-serv32528/zwiki_dtml

Added Files:
	backlinks.dtml editform.dtml subscribeform.dtml 
Log Message:
some dtml skins for zwiki while someone writes zpt versions

=== Added File Products/ZopeOrg-NV/skins/zwiki_dtml/backlinks.dtml ===
<dtml-var standard_html_header>
<table width="100%" border="0" cellspacing="0" cellpadding="3" 
<dtml-if "_.has_key('zwiki_displaymode') and zwiki_displaymode != 'minimal'">
bgcolor="#f0f0f0"
</dtml-if>
>
<tr>
<td valign="bottom">
<h1>
<dtml-if "REQUEST.get('zwiki_showlogo',1)">
<a href="&dtml-wiki_url;/" title="go to home page" accesskey="1"><img src="/misc_/ZWiki/ZWikiPage_icon.gif" height=32 width=32 border=0 valign="bottom" alt="to FrontPage"></a>
</dtml-if>
Backlinks for &dtml-title_or_id;
</h1>
</td>
</tr>
</table>
<p>
<!-- end of header -->


<dtml-try>
<!-- using catalog search -->

<dtml-if bruteforce>
<dtml-raise type="dontusecatalog">dontusecatalog</dtml-raise>
</dtml-if>

<dtml-let 
thisfolder=folder
thispage=title_or_id
thisparents=parents
thisid=id
thiscid=canonicalId
backlinks="
(thiscid == thisid and Catalog(canonicalLinks=thiscid)) 
or Catalog(canonicalLinks=thiscid) + Catalog(links=thisid)
">
<p>
Here are the pages which link to <a href="&dtml-page_url;" title="&dtml-linkTitle;"><dtml-var thispage></a>:
<dtml-if zwiki_showhierarchy>
<p>
<form action="reparent">
You can also set this page's <em>parent(s)</em>, to locate it within the
contents hierarchy.  Check the boxes or enter a new page name and click
Reparent.  A single parent is usually sufficient.
</dtml-if>
<p>
<ol>
<dtml-in backlinks sort=title_or_id>
<dtml-let 
blpage=title_or_id
blid=id
bllinktitle="thisfolder[blid].linkTitle()"
blisparent="REQUEST.get('zwiki_showhierarchy',0) and blpage in thisparents"
>
<li>
<dtml-if zwiki_showhierarchy>
<input type=checkbox name="parents" value="<dtml-var blpage>"
<dtml-if "blpage in thisparents">CHECKED</dtml-if>>
&nbsp;
</dtml-if>
<dtml-if blisparent><b></dtml-if>
<a href="&dtml-wiki_url;/&dtml.url_quote-blid;" title="&dtml-bllinktitle;">
<dtml-var blpage></a>
<dtml-if blisparent></b></dtml-if>
<br>
</dtml-let>
</dtml-in>
</ol>
</dtml-let>
<dtml-if zwiki_showhierarchy>
<br>
Other parent: <input type="text" name="parents">
<br><br>
<b><input type="submit" value="Reparent" style="font-weight:bold"></b>
</form>
</dtml-if>


<dtml-except>
<!-- using brute-force search -->

<dtml-let 
thisfolder=folder
thispage=title_or_id
thisparents=parents
thisid=id
>
<p>
Here are the pages which link to <a href="&dtml-page_url;" title="&dtml-linkTitle;"><dtml-var thispage></a>:
<dtml-if zwiki_showhierarchy>
<p>
<form action="reparent">
You can also set this page's <em>parent(s)</em>, to locate it within the
contents hierarchy.  Check the boxes or enter a new page name and click
Reparent.  A single parent is usually sufficient.
</dtml-if>
<p>
<ol>
<dtml-in "aq_parent.objectValues(spec='ZWiki Page')" sort=title_or_id prefix=x>
<dtml-unless "_.string.find(x_sequence_item.raw,thispage) == -1 and
              _.string.find(x_sequence_item.raw,thisid) == -1">
<dtml-let 
blpage=title_or_id
blid=id
bllinktitle="thisfolder[blid].linkTitle()"
blisparent="REQUEST.get('zwiki_showhierarchy',0) and blpage in thisparents"
>
<li>
<dtml-if zwiki_showhierarchy>
<input type=checkbox name="parents" value="<dtml-var blpage>"
<dtml-if "blpage in thisparents">CHECKED</dtml-if>>
&nbsp;
</dtml-if>
<dtml-if blisparent><b></dtml-if>
<a href="&dtml-wiki_url;/&dtml.url_quote-blid;" title="&dtml-bllinktitle;">
<dtml-var blpage></a>
<dtml-if blisparent></b></dtml-if>
<br>
</dtml-let>
</dtml-unless>
</dtml-in>
</ol>
</dtml-let>
<dtml-if zwiki_showhierarchy>
<br>
Other parent: <input type="text" name="parents">
<br><br>
<b><input type="submit" value="Reparent" style="font-weight:bold"></b>
</form>
</dtml-if>

</dtml-try>

<dtml-var standard_html_footer>

=== Added File Products/ZopeOrg-NV/skins/zwiki_dtml/editform.dtml ===
<dtml-var standard_html_header>
<table width="100%" border="0" cellspacing="0" cellpadding="3"
<dtml-if "_.has_key('zwiki_displaymode') and zwiki_displaymode != 'minimal'">
bgcolor="#f0f0f0"
</dtml-if>
>
<tr>
<td valign="bottom">
<h1>
<dtml-if "REQUEST.get('zwiki_showlogo',1)">
<a href="&dtml-wiki_url;/" title="go to home page" accesskey="1"><img src="/misc_/ZWiki/ZWikiPage_icon.gif" height=32 width=32 border=0 valign="bottom" alt=" "></a>
</dtml-if>
<dtml-if "action == 'Create'">
Creating<dtml-else>
Editing</dtml-if> &dtml-id;
</h1>
</td>
</tr>
</table>
<p>
<!-- end of header -->

<form method="POST" action="&dtml-wiki_url;/&dtml.url_quote-oldid;/" enctype="multipart/form-data">
<input name=timeStamp type=hidden value="&dtml-editTimestamp;">
<input name=page type=hidden value="&dtml.url_quote-id;">

<!-- text area -->
<div align="center">
<table width="100%" border="0" cellspacing="0" cellpadding="3">
<tr><td colspan=2 align="center" bgcolor="#dddddd">
<textarea wrap="virtual" name="text" rows=<dtml-var "REQUEST.get('zwiki_height','') or 25"> cols=<dtml-var "REQUEST.get('zwiki_width','') or 60"> style="width:100%; background-color:#f0f0f0" tabindex="1">
<dtml-var text html_quote></textarea>
</td></tr>

<tr>
<td valign="middle" align="left" bgcolor="#dddddd">
&nbsp;
</td>
<td valign="top" align="right" bgcolor="#dddddd">
<b><INPUT TYPE="submit" NAME="edit:method" VALUE=" <dtml-var action> <dtml-var id> " tabindex="2" style="font-weight:bold" accesskey="s"></b>
</td>
</tr>

<tr>
<td valign="middle" align="left" bgcolor="#dddddd">
Optional note: 
<input name="log" size="50" maxlength="100" value="" tabindex="3">
</td>
<td bgcolor="#dddddd">
&nbsp;
</td>
</tr>

<dtml-let uploaddir="_.getattr(this(),'uploads',this())">
<dtml-if "AUTHENTICATED_USER.has_permission('Add Documents, Images, and Files',
                                            uploaddir)">
<tr>
<td valign="middle" align="left" colspan=2 bgcolor="#dddddd">
Upload a file or image: 
<INPUT TYPE="file" NAME="file" SIZE="30" VALUE="" tabindex="4"><dtml-comment> style="background-color:#f0f0f0"></dtml-comment>
</td>
</tr>
</dtml-if>
</dtml-let>

<dtml-if "AUTHENTICATED_USER.has_permission('Zwiki: Change page types',this())">
<tr>
<td valign="middle" align="left" colspan=2 bgcolor="#dddddd">
Render this page as:
<SELECT NAME="type" tabindex="5">
<dtml-if "page_type == 'issuedtml'">
<OPTION value="issuedtml" SELECTED>tracker issue</OPTION>
<dtml-else>
<dtml-let page_types="[
('stxprelinkdtmlhtml', 'Structured text + links + DTML + HTML'),
('stxprelinkhtml',     'Structured text + links + HTML'),
('stxprelink',         'Structured text + links'),
('wwmlprelink',        'WikiWikiWeb formatting + links'),
('prelinkdtmlhtml',    'links + DTML + HTML'),
('prelinkhtml',        'links + HTML'),
('dtmlhtml',           'DTML + HTML'),
('html',               'HTML'),
('textlink',           'text + links'),
('plaintext',          'plain text'),
('dtmlfithtml',        'DTML + fit tests + HTML'),
('stxdtmlfithtml',     'Structured text + DTML + fit tests + HTML'),
]
#all builtin page types:
#('stxprelinkdtmlhtml','Structured text + links + DTML + HTML (quicker)'),
#('stxdtmllinkhtml',   'Structured text + DTML + links + HTML (quick)'),
#('dtmlstxlinkhtml',   'DTML + Structured text + links + HTML'),
#('stxprelinkhtml',    'Structured text + links + HTML (quick)'),
#('stxlinkhtml',       'Structured text + links + HTML'),
#('stxprelink',	       'Structured text + links (quick)'),
#('stxlink',	       'Structured text + links'),
#('wwmlprelink',       'WikiWikiWeb formatting + links (quick)'),
#('wwmllink',	       'WikiWikiWeb formatting + links'),
#('prelinkdtmlhtml',   'links + DTML + HTML (quick)'),
#('dtmllinkhtml',      'DTML + links + HTML'),
#('prelinkhtml',       'links + HTML (quick)'),
#('linkhtml',	       'links + HTML'),
#('dtmlhtml',	       'DTML + HTML'),
#('html',	       'HTML'),
#('plaintext',	       'plain text'),
">
<dtml-in page_types prefix=x>
<OPTION value="&dtml-x_sequence_key;"
<dtml-if "page_type == x_sequence_key">SELECTED</dtml-if>>
&dtml-x_sequence_item;
</OPTION>
</dtml-in>
</dtml-let>
</dtml-if>
</SELECT>
</td>
</tr>
</dtml-if>

<dtml-if usingRegulations>
<dtml-let creating="_.has_key('action') and action == 'Create'"
          regulator="isRegSetter(REQUEST, new=creating)"
          whichwho="{'nonanon': 'You must be logged-in to',
                     'owners': 'Only the owners may',
                     'nobody': 'Nobody may'}">
<dtml-if "regulator"> 
  <input type="hidden" name="regulate" value="1">
</dtml-if>
<tr>
<td colspan=2 bgcolor="#dddddd">
<dtml-comment>
<table border=0>
  <tr>
    <th align="left" bgcolor="ffffcc">
      <em> <dtml-var id size=40> </em> Attributes
    </th>
  </tr>
  <tr>
    <td colspan=2>
      <table width="100%">
        <tr>
          <th> Name: </th>
          <td> <dtml-var id size=45> </td>
         <dtml-let owners="this().page_owners()"
                   plural="((_.len(owners) > 1) and 's' or '')"
               niceowners="((owners and _.string.join(owners, ', '))
                            or 'Anonymous User')">
           <th> Local Owner&dtml-plural;: </th>
           <td> &dtml-niceowners; </td>
         </dtml-let>
        </tr>
        <tr>
          <th> Type: </th>
          <td> &dtml-page_type; </td>
        </tr>
      </table>
    </td>
  </tr>
  <tr>
    <th align="left" bgcolor="ffffcc">
      <em> <dtml-var id size=40> </em> Rename and Delete
    </th>
  </tr>
  <tr>
    <td>
     <dtml-if "(id == 'FrontPage')">
       <font color="gray"> No Delete or Rename forms for FrontPage - it
                           can not be removed.
       </font>
     <dtml-elif "not isAllowed('move', REQUEST=REQUEST)">
        You can not rename or delete this page.
        <dtml-var "whichwho[opCategory('move')]"> do so.
     <dtml-else>
      <table width="100%" cellspacing=7>
        <tr>
          <td width="50%" nowrap bgcolor="eeeeee">
            Rename <strong><dtml-var id></strong> to:
            <br>
              <INPUT TYPE="TEXT" NAME="new_id" SIZE="25" value="<dtml-var id>">
              &nbsp; <input type="SUBMIT" NAME="Rename" VALUE="Rename">
          </td>
          <td align="center" width="50%" nowrap bgcolor="eeeeee">
            <input type="hidden" name="confirm-delete:default" value="off">
            <input type="checkbox" name="confirm-delete" value="ON">
              Confirm delete &nbsp;
            <input type="SUBMIT" name="Delete" VALUE="Delete">
          </td>
        </tr>
      </table>
     </dtml-if>
    </td>
  </tr>

  <tr>
    <th align="left" bgcolor="ffffcc">
      <em> <dtml-var id size=40> </em> Regulations
    </th>
  </tr>

  <tr>
    <td>
  This is where wiki page and folder owners choose who can do which of
  the common wiki operations on the page.  The operations include
  editing the page, creating new pages from it, commenting on it, and
  resituating it (renaming it, deleting, or changing its designated
  parents).   You can <dtml-if regulator> set <dtml-else> see </dtml-if>
  the page regulations below.

  <p>
  <strong> See <a href="&dtml-wiki_base_url;/RegulatingYourPages">
  RegulatingYourPages</a> for more info.</strong.>
  </p>
</dtml-comment>

    <table width="100%" border="0" cellspacing="0" cellpadding="1" >
      <tr>
        <td colspan=5><hr>
        </td>
      </tr>
      <tr>
        <td> Regulations: </td>
       <dtml-in regOps>
        <td align="center"> <dtml-var sequence-item capitalize> </td>
       </dtml-in>
      </tr>

      <tr>
        <td rowspan=2 align="right" valign="bottom">
            Role categories:
        </td>
       <dtml-in regOps>
        <td align="center" valign="top">
         <dtml-if "_['sequence-item'] == 'create'">
           <font size="-1"> ... new pages from this one. </font>
         <dtml-elif "_['sequence-item'] == 'edit'">
           <font size="-1"> Change the text. </font>
         <dtml-elif "_['sequence-item'] == 'comment'">
           <font size="-1"> Append text to end. </font>
         <dtml-elif "_['sequence-item'] == 'move'">
           <font size="-1"> Rename, delete, reparent. </font>
         </dtml-if>
        </td>
       </dtml-in>
      </tr>
      <tr>
       <dtml-in regOps>
        <dtml-let op="_['sequence-item']"
               opcat="opCategory(op)">
        <td align="center" valign="middle">
          <select name="&dtml-op;-category:string" size="1"
             <dtml-if "not creating and not regulator"> DISABLED </dtml-if> >
          <dtml-in regCategories>
           <dtml-let cat="_['sequence-item']"
                     cur="opcat == cat">
            <option value="&dtml-cat;"
                    <dtml-if cur>SELECTED</dtml-if>>
              <dtml-if "cat == 'nonanon'"> Non-Anon
              <dtml-else>&dtml.capitalize-cat;</dtml-if></option>
           </dtml-let>
          </dtml-in>
          </select>
        </td>
        </dtml-let>
       </dtml-in>
      </tr>

      <tr>
        <td align="right" valign="middle">
          Additional allowed users:
        </td>
       <dtml-in regOps>
        <dtml-let op="_['sequence-item']"
           usernames="_.string.join(opUsernames(op), '\n')">
        <td align="center">
          <textarea rows=2 cols=8
                    name="&dtml-op;-usernames:lines"
               <dtml-if "not regulator">
                 readonly
                 onkeydown="this.blur(); return false;"
               </dtml-if>
            >&dtml-usernames;</textarea>
        </td>
        </dtml-let>
       </dtml-in>
      </tr>
      <tr>
        <td align="right" valign="middle">
          Propagate to offspring:
        </td>
       <dtml-in regOps>
        <dtml-let propop="'propagate-' + _['sequence-item']">
        <td align="center">
            <input type="hidden" name="&dtml-propop;:default" value="off">
            <input type="checkbox" name="&dtml-propop;" value="ON"
               <dtml-if "not regulator">
                 readonly
                 onkeydown="this.blur(); return false;"
               </dtml-if> >
        </td>
        </dtml-let>
       </dtml-in>
      </tr>
      <tr>
        <td align="right" valign="middle">
          Who owns pages created <br>
          from this one:
        </td>
        <td colspan=4>
          <input type="radio" name="who_owns_subs" value="creator"
                 <dtml-if "not regulator"> DISABLED </dtml-if>
                 <dtml-if "subOwner()=='creator'"> CHECKED </dtml-if>>
              Only creator of new page
          <br>
          <input type="radio" name="who_owns_subs" value="original_owner"
                 <dtml-if "not regulator"> DISABLED </dtml-if>
                 <dtml-if "subOwner()=='original_owner'">CHECKED</dtml-if>>
              Only original page owner(s)
          <br>
          <input type="radio" name="who_owns_subs" value="both"
                 <dtml-if "not regulator"> DISABLED </dtml-if>
                 <dtml-if "subOwner()=='both'">CHECKED</dtml-if>>
              Both original page owner(s) and sub-page creators
        </td>
      </tr>
    </table>

<dtml-comment>
  </td></tr>
  </table>
</dtml-comment>
</td>
</tr>
</dtml-let>
</dtml-if>

</table>

<!-- help links -->
<br>
<small><em><span style="color:gray">
See <a href="&dtml-wiki_base_url;/HelpPage#editing">HelpPage</a> for help
</span></em></small>
</div>

</form>

<dtml-var standard_html_footer>

=== Added File Products/ZopeOrg-NV/skins/zwiki_dtml/subscribeform.dtml ===
<dtml-var standard_html_header>
<table width="100%" border="0" cellspacing="0" cellpadding="3"
<dtml-if "_.has_key('zwiki_displaymode') and zwiki_displaymode != 'minimal'">
bgcolor="#f0f0f0"
</dtml-if>
>
<tr>
<td valign="bottom">
<h1>
<dtml-if "REQUEST.get('zwiki_showlogo',1)">
<a href="&dtml-wiki_url;/" title="go to home page" accesskey="1"><img src="/misc_/ZWiki/ZWikiPage_icon.gif" height=32 width=32 border=0 valign="bottom" alt="home"></a>
</dtml-if>
Mail subscription
</h1>
</td>
</tr>
</table>
<p>
<!-- end of header -->

<!-- remember email address like on UserOptions -->
<dtml-if emailchanged>
<dtml-call "RESPONSE.setCookie('email',REQUEST.email,path='/',expires=(ZopeTime() + 365).rfc822())">
</dtml-if>

<FORM METHOD="POST" ACTION="&dtml-page_url;/subscribeform" ENCTYPE="multipart/form-data">

You can subscribe to this page or to the whole wiki.
Subscribers receive a copy of comments via email
(but not general edits, unless enabled by the site admin).
Or return to <a href="&dtml-page_url;">&dtml-id;</a>.

<br><br>

Your email address:
<input name="email" type="text" value="<dtml-var email missing>" size=30>
<input name="emailchanged" type="hidden" value="1">
<INPUT TYPE="submit" NAME="../subscribeform:method" VALUE=" Change ">
<br><br>

<table width="100%" cellpadding="2" cellspacing="1" border="0">
<dtml-if email>
<tr valign="top">
<td valign="top" width="50%"
<dtml-if "isSubscriber(email)">
bgcolor="#88ff88"
<dtml-else>
bgcolor="#ff7777"
</dtml-if>
>
You are currently
<dtml-if "isSubscriber(email)">
<b>subscribed</b><br>
<dtml-else>
not subscribed<br>
</dtml-if>
to this page.
<br>
<dtml-if "isSubscriber(email)">
<INPUT TYPE="submit" NAME="../unsubscribe:method" VALUE=" Unsubscribe from &dtml-id; " style="font-weight:bold">
<dtml-else>
<INPUT TYPE="submit" NAME="../subscribe:method" VALUE=" Subscribe to &dtml-id; " style="font-weight:bold">
</dtml-if>
<br>
</td>
<td valign="top" width="50%"
<dtml-if "isWikiSubscriber(email)">
bgcolor="#88ff88"
<dtml-else>
bgcolor="#ff7777"
</dtml-if>
>
You are currently
<dtml-if "isWikiSubscriber(email)">
<b>subscribed</b><br>
<dtml-else>
not subscribed<br>
</dtml-if>
to the whole wiki.
<br>
<dtml-if "isWikiSubscriber(email)">
<INPUT TYPE="submit" NAME="../wikiUnsubscribe:method" VALUE=" Unsubscribe from the whole wiki " style="font-weight:bold">
<dtml-else>
<INPUT TYPE="submit" NAME="../wikiSubscribe:method" VALUE=" Subscribe to the whole wiki " style="font-weight:bold">
</dtml-if>
<br>
</td>
</tr>

<tr>
<td>
<dtml-in "otherPageSubscriptionsFor(email)" prefix=x>
<dtml-if sequence-start>
You are subscribed to these other pages: <br>
</dtml-if>
<a href="../&dtml.url_quote-x_sequence_item;/subscribeform?email=&dtml.url_quote-email;"
><dtml-var x_sequence_item></a>
<dtml-else>
<dtml-comment>
You have no other page subscriptions.
</dtml-comment>
</dtml-in>
</td>
<td>
</td>
</tr>
</dtml-if>

<tr>
<td valign="top" width="50%"
<br>
<dtml-var id> subscribers:
<br>
<dtml-comment>
<dtml-let n="subscriberCount()">
<dtml-if n>
<dtml-in "_.string.split(subscriberList(),' ')">
<dtml-var "_.string.split(_['sequence-item'],'@')[0]"><br>
</dtml-in>
</dtml-if>
</dtml-let>
</dtml-comment>
<dtml-in subscriberList prefix=x>
<dtml-var "_.string.split(x_sequence_item,'@')[0]"><br>
</dtml-in>
</td>
<td valign="top" width="50%"
<br>
wiki subscribers:
<br>
<dtml-comment>
<dtml-let n="wikiSubscriberCount()">
<dtml-if n>
<dtml-in "_.string.split(wikiSubscriberList(),' ')">
<dtml-var "_.string.split(_['sequence-item'],'@')[0]"><br>
</dtml-in>
</dtml-if>
</dtml-let>
</dtml-comment>
<dtml-in wikiSubscriberList prefix=x>
<dtml-var "_.string.split(x_sequence_item,'@')[0]"><br>
</dtml-in>
</td>
</tr>

</table>

<br>
<dtml-comment>
<INPUT TYPE="submit" NAME="..:method" VALUE=" Return to &dtml-id; ">
</dtml-comment>

</FORM>

<dtml-var standard_html_footer>
  


From sidnei at x3ng.com.br  Sat Jan 11 11:15:30 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/nzo - macros_repository.html:1.6 main_template.html:1.15
Message-ID: <200301111615.h0BGFUc24020@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/nzo
In directory cvs.zope.org:/tmp/cvs-serv24004/skins/nzo

Modified Files:
	macros_repository.html main_template.html 
Log Message:
minor fix

=== Products/ZopeOrg-NV/skins/nzo/macros_repository.html 1.5 => 1.6 ===
 
 <table width="100%">
   <tr>
-    <td>
+    <td align="left">
       <div id="BYLINE_TITLE"><img tal:condition="icon" src=""
       tal:attributes="src icon; alt typ">&nbsp;<span
       tal:content="here/Title" tal:omit-tag="">


=== Products/ZopeOrg-NV/skins/nzo/main_template.html 1.14 => 1.15 ===
   <title tal:define="ob_title here/Title; portal_title container/title"
          tal:content="string:${portal_title}: ${ob_title}">New Zope.org</title>
 
-
   <link href="css_default.css" rel="stylesheet" type="text/css"
         tal:attributes="href here/css_default.css/absolute_url" />
 
@@ -33,11 +32,6 @@
          @import "nzo.css";
          @import "css_default.css";
   </style>
-
-  <script language="javascript"
-             type="text/javascript"
-             tal:content="structure here/plone_javascripts.js">
-  </script>
 
 </head>
 



From sidnei at x3ng.com.br  Sat Jan 11 12:21:40 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/nzo - css_default.css.dtml:1.3 nzo.css.dtml:1.3
Message-ID: <200301111721.h0BHLed00971@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/nzo
In directory cvs.zope.org:/tmp/cvs-serv950/skins/nzo

Modified Files:
	css_default.css.dtml nzo.css.dtml 
Log Message:
css improvements

=== Products/ZopeOrg-NV/skins/nzo/css_default.css.dtml 1.2 => 1.3 ===
   color: #336699;
   text-align: left;
   font-weight: bold;
+  padding: 0px 0px 0px 4px;
 }
 
 /* ----------------------------------------- */


=== Products/ZopeOrg-NV/skins/nzo/nzo.css.dtml 1.2 => 1.3 ===
 div.top_bar {
     background: transparent;
     margin: 0;
-    padding: 0;
+    padding: 2px;
     background-color: #CCCCCC;
+    border-bottom: #BBBBBB 1px solid;
 }
 
 div.slogan {
@@ -271,7 +272,7 @@
 }
 
 span.side_menu {
-    border: dotted black 1px;
+    border: black dotted 1px;
     float: left;
     width: 150px; 
     padding: 6px;



From sidnei at x3ng.com.br  Sun Jan 12 08:40:49 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: NZO_SiteLayout - zproduct_recipes.mk:1.4 zproduct_targets.mk:1.14
Message-ID: <200301121340.h0CDen207420@cvs.baymountain.com>

Update of /cvs-zopeorg/NZO_SiteLayout
In directory cvs.zope.org:/tmp/cvs-serv7404

Modified Files:
	zproduct_recipes.mk zproduct_targets.mk 
Log Message:
iirc! we were checking out CMFPlone from HEAD!

=== NZO_SiteLayout/zproduct_recipes.mk 1.3 => 1.4 ===
 
 ${PRODUCT_CHECKOUTS}:
 	${CD} ${BASE_DIR}/src \
-      && ${CVS} -d ${CVS_REPOSITORY} checkout -d ${@F} ${CVS_MODULE}
+      && ${CVS} -d ${CVS_REPOSITORY} checkout ${CVS_TAG} -d ${@F} ${CVS_MODULE}
 
 ${PRODUCT_OPT_TARGETS}:
 	${CD} ${BASE_DIR} && ${CPR} $< ${<:src/%=opt/%} && \


=== NZO_SiteLayout/zproduct_targets.mk 1.13 => 1.14 ===
 
 src/CMFPlone-1.0: CVS_REPOSITORY=${PLONE_CVS_REPOSITORY}
 src/CMFPlone-1.0: CVS_MODULE=CMFPlone
-src/CMFPlone-1.0: CVS_TAG=Plone-1_0
+src/CMFPlone-1.0: CVS_TAG=-rPlone-1_0
 
 src/Formulator-head: CVS_REPOSITORY=${FORMULATOR_CVS_REPOSITORY}
 src/Formulator-head: CVS_MODULE=Formulator



From sidnei at x3ng.com.br  Sun Jan 12 12:09:03 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/nzo - personalize_form.html:NONE
Message-ID: <200301121709.h0CH93v00863@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/nzo
In directory cvs.zope.org:/tmp/cvs-serv826/nzo

Removed Files:
	personalize_form.html 
Log Message:
removing broken personalize_form
=== Removed File Products/ZopeOrg-NV/skins/nzo/personalize_form.html ===



From sidnei at x3ng.com.br  Sun Jan 12 12:09:59 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.6 setupZopeOrg.py:1.62
Message-ID: <200301121709.h0CH9xU00989@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions
In directory cvs.zope.org:/tmp/cvs-serv973/Extensions

Modified Files:
	NZOMigrate.py setupZopeOrg.py 
Log Message:
Improved ownership migration. Few mods to make setupZopeOrg cooperate with latest Plone.

=== Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.5 => 1.6 ===
 def normalizeMetaType(meta_type):
     return meta_type.replace(' ', '')
 
-def fixZWikiPortalType(self):
-    ct = self.portal_catalog
-    result = ct(meta_type='ZWiki Page')
-    counter = 0
-    for r in result:
-        obj = ct.getobject(r.data_record_id_)
-        obj.portal_type = 'ZWiki Page'
-        ct.reindexObject(obj, idxs=['portal_type'])
-        counter += 1
-        if not (counter % 100):
-            get_transaction().commit(1)
-    return 'ok'
+
+# this method came from PTK -> CMF migration script
 
 def _cleanupOwnership(ob, res, cleanup_children):
     '''
@@ -513,6 +503,9 @@
             oids = [o for o in source.objectIds() \
                        if (path + (o, )) not in ignore]
             oids.sort()
+            if 'acl_users' in oids:
+                oids.remove('acl_users')
+                oids.insert(0, 'acl_users')
             for oid in oids:
                 obj = getattr(source, oid)
                 try:
@@ -534,8 +527,12 @@
                               ' %s: Failed.\n' % obj.absolute_url(relative=1))
                 else:
                     new_obj = self.fixOwnership(obj, new_obj)
-                    new_obj = self.fixModificationDate(obj, new_obj)
                     new_obj = self.copyProperties(obj, new_obj)
+                    res = []
+                    new_obj = _cleanupOwnership(obj, res, 0)
+                    self.log('\n'.join(res))
+                    new_obj = self.fixModificationDate(obj, new_obj)
+
                     ct = getToolByName(new_obj, 'portal_catalog', None)
                     if ct is not None:
                         try: ct.reindexObject(obj)


=== Products/ZopeOrg-NV/Extensions/setupZopeOrg.py 1.61 => 1.62 ===
                   , 'Formulator'
                   , 'ExternalEditor'
                   )
-SKINPATHS = ( 'Basic', )
 
-SKINS = ( 'software_product'
-        , 'zpt_membership'
-        , 'zopeorg'
-        , 'nzo'
+SKINPATHS = ( 'Basic',
+              'Plone Default',
+              'Plone Autumn',
+              'Plone Core',
+              'Plone Corporate',
+              'Plone Core Inverted',
+              'Plone Kitty',
+              'Plone Greensleeves',
+              'Plone Mozilla',
+              'Plone Mozilla New',
+              'Plone Prime',
+              'Plone Zed'
+              )
+
+SKINS = ( 'nzo',
         )
 
 ADD_INDEXES = ()
@@ -267,6 +277,8 @@
 
     # Run the CMFCalendar install script
     log.append('\n * Executing CMFCalendar install script')
+    if 'portal_calendar' in portal.objectIds():
+        portal.manage_delObjects(ids = ['portal_catalog'])
     log_str = portal.installCMFCalendar()
     log_list = string.split(log_str, '\n')
     for i in range(len(log_list)):
@@ -345,9 +357,20 @@
             ', '.join(delete_skins))
 
     skins = skins_tool.getSkinSelections()
+    if not 'NZO' in skins:
+        skins_tool.addSkinSelection('NZO', 'custom, zpt_topic, \
+        zpt_calendar, zpt_content, zpt_generic, zpt_control, topic, \
+        calendar, content, generic, control, Images')
+        skins_tool.default_skin = 'NZO'
+        skins = skins_tool.getSkinSelections()
+        log.append('   - Set default skin to newly added NZO.')
+                
     if skins_tool.getDefaultSkin() not in skins:
-        skins_tool.default_skin = SKINPATHS[0]
-        log.append('   - Set default skin to: %s' % SKINPATHS[0])
+        for skin in SKINPATHS:
+            if skin in skins:
+                skins_tool.default_skin = skin
+                log.append('   - Set default skin to: %s' % skin)
+                break
 
 def registerSkins( portal_obj ):
     """ Register skins as Filesystem Directory Views"""
@@ -355,6 +378,7 @@
     installed_skins = skins_tool.objectIds()
     prod_path = zopeorg_globals['__path__'][0]
     skin_path = os.path.join( prod_path,  'skins' )
+    default_skin = skins_tool.getDefaultSkin()
 
     for skin_name in SKINS:
         msg = '   - Filesystem Directory View "%s" added' % skin_name
@@ -367,6 +391,8 @@
     skins = skins_tool.getSkinPaths()
 
     for skin_name, skin_path in skins:
+        if skin_name != default_skin:
+            continue
         path_elems = map(string.strip, string.split(skin_path, ','))
         for zo_skin in SKINS:
             if zo_skin not in path_elems:



From sidnei at x3ng.com.br  Sun Jan 12 12:59:58 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.7
Message-ID: <200301121759.h0CHxw307681@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions
In directory cvs.zope.org:/tmp/cvs-serv7666/Extensions

Modified Files:
	NZOMigrate.py 
Log Message:
fix string.join. added creation_date to migration. cleanup a bit the log. a typo.

=== Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.6 => 1.7 ===
 from StringIO import StringIO
 from ZODB.POSException import POSKeyError
-from Acquisition import aq_base
+from Acquisition import aq_base, aq_parent, aq_inner
 from Products.CMFCore.utils import getToolByName
 from DateTime import DateTime
 import zLOG
@@ -95,14 +95,14 @@
             if udb is not None:
                 ob._owner = udb, uid
                 res.append('Changed ownership of %s from %s!%s to %s!%s' %
-                           (join(ob.getPhysicalPath(), '/'),
-                            join(old_udb, '/'), uid,
-                            join(udb, '/'), uid,))
+                           ('/'.join(ob.getPhysicalPath()),
+                            '/'.join(old_udb), uid,
+                            '/'.join(udb), uid,))
             else:
                 res.append('Could not fix the ownership of %s, '
                            'which is set to %s!%s' %
-                           (join(ob.getPhysicalPath(), '/'),
-                            join(old_udb, '/'), uid,))
+                           ('/'.join(ob.getPhysicalPath()),
+                            '/'.join(old_udb), uid,))
                 
     if cleanup_children:
         if hasattr(ob, 'objectValues'):
@@ -469,6 +469,7 @@
         mod_date = orig.bobobase_modification_time().ISO()
         if hasattr(aq_base(new), 'setModificationDate'):
             new.setModificationDate(mod_date)
+            new.creation_date = DateTime(mod_date)
         return new
 
     def copyProperties(self, orig, new):
@@ -529,8 +530,9 @@
                     new_obj = self.fixOwnership(obj, new_obj)
                     new_obj = self.copyProperties(obj, new_obj)
                     res = []
-                    new_obj = _cleanupOwnership(obj, res, 0)
-                    self.log('\n'.join(res))
+                    res = _cleanupOwnership(new_obj, res, 0)
+                    if res != []:
+                        self.log('\n'.join(res))
                     new_obj = self.fixModificationDate(obj, new_obj)
 
                     ct = getToolByName(new_obj, 'portal_catalog', None)



From sidnei at x3ng.com.br  Tue Jan 14 15:16:27 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/plone_nzo Products/ZopeOrg-NV/skins/plone_nzo - New directory
Message-ID: <200301142016.h0EKGR626585@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/plone_nzo
In directory cvs.zope.org:/tmp/cvs-serv26574/plone_nzo

Log Message:
Directory /cvs-zopeorg/Products/ZopeOrg-NV/skins/plone_nzo added to the repository

=== Added directory Products/ZopeOrg-NV/skins/plone_nzo ===



From sidnei at x3ng.com.br  Tue Jan 14 15:18:58 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/plone_nzo - bullet.gif:1.1 header.pt:1.1 linkOpaque.gif:1.1 logo.jpg:1.1 ploneCustom.css.dtml:1.1 stylesheet_properties.props:1.1 user.gif:1.1
Message-ID: <200301142018.h0EKIww26906@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/plone_nzo
In directory cvs.zope.org:/tmp/cvs-serv26878/plone_nzo

Added Files:
	bullet.gif header.pt linkOpaque.gif logo.jpg 
	ploneCustom.css.dtml stylesheet_properties.props user.gif 
Log Message:
Plone style for nzo

=== Added File Products/ZopeOrg-NV/skins/plone_nzo/bullet.gif ===
  <Binary-ish file>

=== Added File Products/ZopeOrg-NV/skins/plone_nzo/header.pt ===
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

<head metal:define-macro="html_header" 
      tal:define="global portal_url here/portal_url">
    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"
          tal:define="charset here/portal_properties/site_properties/default_charset|string:iso-8859-1"
          tal:attributes="content string:text/html;;charset=${charset}" />

    <title tal:define="portal_title here/portal_properties/title;
                       here_title python:test( portal_title != here.title_or_id()
                                             , here.title_or_id()
                                             , template.title_or_id());"
           tal:content="string:$portal_title - $here_title">Title of page</title>

    <metal:block metal:define-slot="base" />

    <meta tal:condition="here/listMetaTags|nothing"
          tal:repeat="keyval here/listMetaTags" 
          tal:attributes="name python:keyval[0];
                           content python:keyval[1];" />

    <!-- Basic crude style for Netscape4.x - Removed until we have the time to update it. 
    <link rel="Stylesheet" type="text/css" href="" tal:attributes="href string:$portal_url/ploneNS4.css" />
    -->

    <!-- Main style sheets for CSS2 capable browsers -->
    <style type="text/css" media="all" tal:content="string: @import url(${here/portal_url}/plone.css?${current_skin});"></style>

    <!-- Custom style sheet if available -->
    <style type="text/css" media="all" tal:condition="exists: here/ploneCustom.css" tal:content="string:@import url(${here/portal_url}/ploneCustom.css);"></style>
    
    <!-- Style sheet used for printing -->
    <link rel="stylesheet" type="text/css" media="print" href="" tal:attributes="href string:$portal_url/plonePrint.css" />

    <!-- Style sheet used for presentations (Opera is the only browser supporting this at the moment) -->
    <link rel="stylesheet" type="text/css" media="projection" href="" tal:attributes="href string:$portal_url/plonePresentation.css" />

    <link rel="shortcut icon" href="" type="image/x-icon" tal:attributes="href string:$portal_url/favicon.ico" />

    <link rel="home" href="" title="Front Page" tal:attributes="href string:$portal_url" />
    <link rel="search" href="" title="Search this site" tal:attributes="href string:$portal_url/search_form" />

    <!-- Disable IE6 image toolbar -->
    <meta http-equiv="imagetoolbar" content="no" />

    <metal:block metal:define-slot="css_slot" tal:replace="nothing">
    Inserts CSS specified from a page.
    </metal:block>
    
    <metal:block metal:define-slot="head_slot" tal:replace="nothing">
    Flexibility for published templates to inject stuff into the head tag.
    </metal:block>
    
    <metal:block metal:define-slot="javascript_head_slot" tal:replace="nothing">
    Inserts javascript specified from a page.
    </metal:block>

    <!-- Common Plone ECMAScripts -->
    <script type="text/javascript" tal:attributes="src here/plone_javascripts.js/absolute_url"></script>

    <tal:block tal:define="defaulttips python:here.portal_memberdata.getProperty('formtooltips');
                           showdefault python:test(defaulttips, 'true', 0);
                           formtooltips python:getattr(here.portal_membership.getAuthenticatedMember(), 'formtooltips', showdefault)" 
               tal:omit-tag="">
      <script type="text/javascript"
              tal:condition="formtooltips"
              tal:attributes="src here/plone_formtooltip.js/absolute_url"></script>
      <metal:block tal:condition="not:formtooltips">
        <tal:block tal:replace="structure string:&lt;script language='javascript' type='text/javascript' &gt;" />
          <metal:block >function formtooltip(el,flag){}</metal:block>
        <tal:block tal:replace="structure python:'&lt;/script&gt;'" />
      </metal:block>
      
    </tal:block>
</head>

<div metal:define-macro="portal_header"
     i18n:domain="plone"
     tal:define="portal_url here/portal_url" >

     <tal:block tal:condition="not: actions|nothing">     
         <span tal:define="global actions here/portal_actions/listFilteredActionsFor"
                  tal:replace="nothing" >
             This is here just in case actions is not defined.  This would happen if you were calling from a DTML Document   
         </span>
     </tal:block>

<!--
     <div id="statusMessage" style="position: absolute; top: -1.8em; left: 1em; font-size: 100%;" class="message">
     Testing
     </div>
-->      
        <div class="top">

            <div class="searchBox">
                <form name="searchform" 
                      action="search"
                      tal:attributes="action string:${portal_url}/search" >
    

            <div id="pipe"
                  metal:define-macro="portal_tabs"
                  tal:define="portal_tabs actions/portal_tabs|nothing;
                  global selected_tabs python:here.selectedTabs(template.getId(), here);
                  selected_portal_tab selected_tabs/portal;" >

              <ul tal:repeat="tab portal_tabs">
		<li tal:attributes="class python:test(path('repeat/tab/start'), 'first', '')">
                  <a href="" class=""
                     tal:attributes="href tab/url">
                  <span tal:omit-tag="" i18n:translate=""><span tal:replace="tab/name">dummy</span></span>
                  </a>
		</li>
              </ul>

                    <input id="searchGadget" 
                           name="SearchableText" 
                           type="text" 
                           size="20" 
                           value=""
                           tal:attributes="value request/SearchableText|nothing;" />
    
                    <input class="context searchButton" 
                           type="submit" 
                           value="Search"
                           i18n:attributes="value" />
                  </div>
                </form>
            </div>

            <a href="/"
               tal:attributes="href portal_url" 
               tal:define="logo here/logo.jpg;
                           uri logo/absolute_url" >
                <img src="logo.jpg"
                     class="logo"
                     tal:attributes="width logo/width;
                                     height logo/height;
                                     src string:${logo/absolute_url}?skin=$current_skin" />
            </a>
        </div>

        <hr size="" class="netscape4" />
     

        <div class="personalBar"
             metal:define-macro="personalBar"
             tal:define="portal_url here/portal_url;
                         user_actions actions/user;
                         global_actions actions/global;
                         display_actions python:user_actions[:-1]+global_actions+user_actions[-1:];">&nbsp;

            <a href=""
               tal:omit-tag="not: here/portal_membership/getHomeFolder"
               tal:condition="not:here/portal_membership/isAnonymousUser"
               tal:attributes="href string:${here/portal_membership/getHomeUrl}">
                <img tal:replace="structure here/user.gif" />
            
                <span tal:replace="user/getUserName">john</span>
            </a>

            <span tal:condition="here/portal_membership/isAnonymousUser" i18n:translate="you_are_not_logged_in">You are not logged in</span>

            <metal:block tal:repeat="action python:display_actions">
            <a href=""
               tal:attributes="href action/url">
                <img tal:replace="structure here/linkOpaque.gif" />
                
                <span tal:omit-tag="" i18n:translate=""><span tal:replace="action/name">dummy</span></span>
            </a>
            </metal:block>
        </div>

        <div class="pathBar"
             metal:define-macro="pathBar"
             tal:define="breadcrumbs python:here.breadcrumbs(here);
                         portal_url here/portal_url;">

            <a href="#"
               tal:condition="here/portal_membership/getHomeFolder"
               tal:attributes="href string:${here/absolute_url}/addtoFavorites"
               tal:define="addFavorite here/addFavorite.gif">

                <img tal:replace="structure python:addFavorite.tag(css_class='addFavorite', title='Add this location to My Favorites')" />
            </a>
	    <span tal:omit-tag="" i18n:translate="you_are_here">You are here:</span>
	        <span tal:condition="breadcrumbs" tal:omit-tag="">
                <a i18n:translate="tabs_home" tal:attributes="href portal_url">Home</a> 
                <strong>&raquo;</strong>
            </span>

            <span tal:condition="not: breadcrumbs" i18n:translate="tabs_home" tal:omit-tag="">
                Home
            </span>
            
            <span tal:repeat="crumb breadcrumbs">

                <metal:block tal:define="global is_last repeat/crumb/end" />

                <a href="#" 
                   tal:condition="python:not is_last" 
                   tal:attributes="href python:crumb[1]"
                   tal:content="structure python:crumb[0]">crumb</a>
                <strong tal:condition="python:not is_last"> &raquo; </strong>
                <span tal:condition="python: is_last" 
                      tal:content="structure python:crumb[0]">crumb</span>

            </span>

        </div>

        <hr size="" class="netscape4" />

    </div>

    <div class="message"
         metal:define-macro="portal_message" 
         tal:define="portal_message request/portal_status_message | nothing"
         tal:condition="portal_message"> 

        <img tal:replace="structure here/info.gif" />

        <strong tal:content="portal_message" i18n:translate=""></strong> 
    </div>



=== Added File Products/ZopeOrg-NV/skins/plone_nzo/linkOpaque.gif ===
  <Binary-ish file>

=== Added File Products/ZopeOrg-NV/skins/plone_nzo/logo.jpg ===
�PNG


IHDR�6Z�M�sBIT��O�
PLTE�����������������������������������������������������������������ͽ����������˷�ܴ�������Ȳ�ٯ�׹�ƪ�֦�԰�ã�Ѫ����Φ����˕�̜����������ȍ�Ɠ����ņ�ĉ��������z����v��z��t��q��u��m��i��k��d��a��b��Z��Z��Y��V��X�V~�R~�Q}�Ny�Ky�Ky�Lw�Hv�Dt�Bp�?n�;l�9l�1g�3f�2e�2e�0d�/d�.d�.b��k7�	pHYs
��~�tEXtCreation Time01/07/03�t�� tEXtSoftwareMacromedia Fireworks MX��*$=IDATx�՚}s�F��J�fj��դ���5)i��bh�������]a�������WXaݏ��]6�79�e��ﲚ������ӣ�I�fEK�RZ�t�������R�;H�][��޷c(-�Þ%�u��T�n�&�^�(�+c~�5�)'�K���
1j���u�ʷaK��dS����z5��G�k�m7� ������HR@oW��Q�}��6kݡ�/�H�g�.�Z���Q:�T)䩼�j�մL�J�@���O}U�b��Ù�H�'��(�BLR�+)
<v�kF)�����
��uEHb�u<��]+�B��L�T�5��`0�m���0�v��]@Rv��"W��4��_^%��>^2��1�B�\��E$:8�����(�H���>^���eY����s�4;P�`a�MB�Qp��-1�(kf�o��|%��/rQ+Ј�W5	(վ=�tJ�����Ա��䷘�ILR��$%p͌�ͱ�c�$� ���~
��U~�5���֋L$�C���j40����$�rd�d	ROԀ_�84�8�$	#��\/�zp�:!v
�v��6��2pސ����c]`�3IT��9m����*�'��
�3�.�P`n��mΒlF�&a�y�B�L$�`�H�������>Jp��/�q0ūO,�Z�a�b��d�(�7�� čOr�w/ű�
�V.L$�&
@�5$g<I��E����{�_u(Hb�+h�Q@F	FI_y�M�[y�N8�8E�4��V�̳A&2t5��a�%IPx�_@�E$�q$����Y������	��Gx)�
�@�q�:�d�L9)�<T54��7C��m $��aBbU�o@���wq�쭛����?>UEDӏ�	�OZ0L�~!��˜wE.���R�D�ʪ{�ع�$�&d/�r�����S�`@	�'t�&��5�+%lV-PFك���'�I�)��^&NP�B70�=%>u6��W�*l,�Q亇yaA���E�Æ`�͆�]ȕ�t0��EtS��$a�߁�"H�Ɍ$�C���8�lJ>�k�2��dJ���5~��I<��j�Z��*�-��	>[	u'��qYO>���.tX�q���nf��!z%�I����^؈���3[V�Š�y
D݊'���+I(��x���-hC�@���I��77��|
�{�=I�L�D�g�v�JU׋���ͪH�t6wR�+��u�?:�Sn�����p�����'�� �$�}�~����R��4�9�*�s9ʆ� �i������^ �I�ط|��j�8�;M���P�-�f �Զv'�l+�z�x�B;�0&�,%Pl�{�^�?�&�lf�C�Q�l7��Q*��^p �Z���-iX�0���A��'p�F�
�lO�	���G]W�>'	 .��$���P�o}��ԸP5��i�pe�yC��|��W�\�p�+M�����L&(�uX�g4Hxĝt.�I>b� i�
�I"��T*ߠ[�5;s��,�@&��J�]�?�zH��k�ŀD���ߟ��	��x7ֳ�y�XUԒ�*��N˻a8�{�gT�Y�US�;�g�-� ������8�=MN%2����,G�{��x��@���z��#��˷x�ɓ��?%�$DǗ��1�	���V=#��o�0�ý���,$Lr�Wg_A�}W�Q.���K���\����ɱ�*�����g�v޻\w�L���&�M�w�@藿πg�h�n�;�yӴ��=��Ç�����@�kY�RG3���[�W�8���?�	�$a�Z����8���y�3���VB\s��קO��	�K�1�C��t��;t�-z�������?��?8g�r�fIEND�B`�

=== Added File Products/ZopeOrg-NV/skins/plone_nzo/ploneCustom.css.dtml ===
#pipe ul {
margin-left: 0;
padding-left: 0;
display: inline;
}

#pipe ul li {
margin-left: 0;
padding: 1px 10px;
border-left: 1px solid #000;
list-style: none;
display: inline;
}


#pipe ul li.first {
margin-left: 0;
border-left: none;
list-style: none;
display: inline;
}



=== Added File Products/ZopeOrg-NV/skins/plone_nzo/stylesheet_properties.props ===
plone_skin:string=NZO

mainFont:string=65% Verdana, Helvetica, Arial, sans-serif
mainBackground:string=#E0E0E0
mainFontColor:string=#808080
mainLinkColor:string=Black
mainTabBorderColor:string=#A0A0A0
mainTabBorderColorSelected:string=#A0A0A0
mainTabBackground:string=#CCCCCC
mainTabBackgroundNotSelected:string=White
mainTabBackdrop:string=#BEBEBE
mainTabFontWeight:string=normal
mainTabFontColor:string=#808080
mainTabFontColorSelected:string=#808080

headingFont:string=100% Verdana, Helvetica, Arial, sans-serif
headingFontColor:string=#808080
headingSize1:string=160%
headingSize2:string=150%
headingSize3:string=140%
headingSize4:string=120%
headingSize5:string=100%
headingSize6:string=80%

descriptionFont:string=bold 100% Verdana, Helvetica, Arial, sans-serif

contentFont:string=120% Verdana, Helvetica, Arial, sans-serif
contentBackground:string=White
contentImageBorder:string=0
contentLinkActiveColor:string=Red
contentLinkVisitedColor:string=Purple
contentTabBorder:string=1px solid #A0A0A0
contentTabBackground:string=#CCCCCC
contentTabBackgroundNotSelected:string=White
contentTabBackdrop:string=transparent
contentTabFontWeight:string=normal
contentTabFontColor:string=#808080
contentTabFontColorSelected:string=#808080

preBorder:string=1px solid #A0A0A0
preBackground:string=#CCCCCC

messageFont:string=bold 80% Verdana, Helvetica, Arial, sans-serif
messageBackground:string=#CCCCCC
messageBorder:string=1px solid #A0A0A0

textTransform:string=lowercase
noBorder:string=none
evenRowBackground:string=#F8F8F8
oddRowBackground:string=White
groupBorder:string=1px solid #A0A0A0
requiredField:string=url(required.gif) right no-repeat

inputFont:string=bold 10px Verdana, Helvetica, Arial, sans-serif
inputBorder:string=1px solid #A0A0A0

contextButtonBackground:string=White url(linkTransparent.gif) 9px 1px no-repeat
contextButtonPadding:string=1px 1px 1px 15px
contextButtonFontColor:string=Black

standaloneButtonBackground:string=#CCCCCC url(linkOpaque.gif) 9px 1px no-repeat
standaloneButtonPadding:string=1px 1px 1px 15px
standaloneButtonFontColor:string=Black

destructiveButtonBackground:string=#FFCE7B url(linkTransparent.gif) 9px 1px no-repeat
destructiveButtonPadding:string=1px 1px 1px 15px
destructiveButtonBorder:string=1px solid #FFA500
destructiveButtonFontColor:string=Black

buttonWeight:string=normal

boxBorder:string=1px solid #A0A0A0
boxHeaderBackground:string=#CCCCCC
boxHeaderFontColor:string=#808080
boxLinkBackground:string=url(linkTransparent.gif) -0.5em 0px no-repeat
boxLinkColor:string=Black
boxEvenBackground:string=#F8F8F8
boxOddBackground:string=White
boxHighlight:string=2px solid #FFCF7F

listingBorder:string=1px solid #A0A0A0
listingHeaderBackground:string=#CCCCCC
listingHeaderFontColor:string=#808080
listingLinkHover:string=underline
listingEvenBackground:string=#F8F8F8
listingOddBackground:string=White

topBackground:string=#336699
topMargin:string=0
topPadding:string=0

logoMargin:string=0em 0em 0em 0em
logoPadding:string=0

searchMargin:string=1em 0em 0em 0em
searchPadding:string=0em 2em 0em 0em
searchFontColor:string=#808080

footerBackground:string=#CCCCCC
footerBorder:string=1px solid #A0A0A0


=== Added File Products/ZopeOrg-NV/skins/plone_nzo/user.gif ===
  <Binary-ish file>


From guido at python.org  Thu Jan 16 12:51:56 2003
From: guido at python.org (Guido van Rossum)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV - ZopeOrgPermissions.py:1.3
Message-ID: <200301161751.h0GHpup27040@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV
In directory cvs.zope.org:/tmp/cvs-serv27024

Modified Files:
	ZopeOrgPermissions.py 
Log Message:
Whitespace normalization (to see if I have commit access now).


=== Products/ZopeOrg-NV/ZopeOrgPermissions.py 1.2 => 1.3 ===
 # Note that we can only use the default Zope roles in calls to
 # setDefaultRoles().  The default Zope roles are:
 # Anonymous, Manager, and Owner.
- 
+
 #
 # Zope.org Permissions
 #
@@ -14,4 +14,3 @@
 
 DemoteMaintainer = 'Demote maintainer'
 setDefaultRoles(DemoteMaintainer, ('Manager',))
-



From sidnei at x3ng.com.br  Sat Jan 18 12:58:18 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.8
Message-ID: <200301181758.h0IHwIm17304@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions
In directory cvs.zope.org:/tmp/cvs-serv17290/Extensions

Modified Files:
	NZOMigrate.py 
Log Message:
fix a buglet on folder creation and harmful use of acquisition

=== Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.7 => 1.8 ===
 
         r.update_data(data, content_type, size)
         r.setPlatform(platform)
-        r.setMaturity(maturity)
-        r.setInfoURL(info_url)
-        r.setLicenseURL(license_url)
-        r.setChangesURL(changes_url)
-        r.setInstallationURL(installation_url)
-        r.setLicense(license)
+        f.setMaturity(maturity)
+        f.setInfoURL(info_url)
+        f.setLicenseURL(license_url)
+        f.setChangesURL(changes_url)
+        f.setInstallationURL(installation_url)
+        f.setLicense(license)
 
         return f
 
@@ -392,12 +392,12 @@
     def Folder2CMFPortalFolder(self, obj, source, dest):
         if dest is None or obj is None: return None
         try:
-            dest.manage_addFolder(obj.getId(), obj.title)
+            dest.invokeFactory(id=obj.getId(), type_name="Folder")
+            dest.setTitle(obj.title)
         except: pass
-        new = getattr(dest, obj.getId(), None)
-        if new is not None and hasattr(new, 'portal_type') and\
-               new.portal_type == "Folder":
-            return new
+        new = getattr(aq_base(dest), obj.getId(), None)
+        if new is not None and hasattr(aq_base(new), 'objectValues'):
+            return new.__of__(dest)
         return None
 
     def BTreeFolder2CMFBTreeFolder(self, obj, source, dest):
@@ -406,10 +406,9 @@
             bt2 = dest.manage_addProduct['BTreeFolder2']
             bt2.manage_addCMFBTreeFolder(obj.getId(), obj.title)
         except: pass
-        new = getattr(dest, obj.getId(), None)
-        if new is not None and hasattr(new, 'portal_type') and\
-               new.portal_type == "Folder":
-            return new
+        new = getattr(aq_base(dest), obj.getId(), None)
+        if new is not None and hasattr(aq_base(new), 'objectValues'):
+            return new.__of__(dest)
         return None
 
     def WikiMethodsCleanup(self, obj, ignore_path):



From sidnei at x3ng.com.br  Mon Jan 20 09:12:30 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/zopeorg_products Products/ZopeOrg-NV/skins/zopeorg_products - New directory
Message-ID: <200301201412.h0KECUe07854@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/zopeorg_products
In directory cvs.zope.org:/tmp/cvs-serv7843/zopeorg_products

Log Message:
Directory /cvs-zopeorg/Products/ZopeOrg-NV/skins/zopeorg_products added to the repository

=== Added directory Products/ZopeOrg-NV/skins/zopeorg_products ===



From sidnei at x3ng.com.br  Mon Jan 20 09:17:24 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV - CaseStudy.py:1.1 ZopeServiceProvider.py:1.1
Message-ID: <200301201417.h0KEHOv08504@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV
In directory cvs.zope.org:/tmp/cvs-serv8482

Added Files:
	CaseStudy.py ZopeServiceProvider.py 
Log Message:
Two new types: CaseStudy and ZopeServiceProvider. Management skins to come later. Reorganizing FS layout.


=== Added File Products/ZopeOrg-NV/CaseStudy.py ===
from Globals import InitializeClass
from Products.CMFCore.CMFCorePermissions import View, \
     ManageProperties, ListFolderContents, \
     ModifyPortalContent, AddPortalContent
from Products.CMFCore.utils import format_stx
from Products.CMFDefault.Document import Document
from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
from AccessControl import ClassSecurityInfo

class CaseStudy(Document):

    portal_type = meta_type = "Case Study"

    security = ClassSecurityInfo()

    _external_url = ''
    _problem = ''
    _solution = ''
    _logo = ''

    def __init__(self, id, title='', description='', text_format='', text=''):
        DefaultDublinCoreImpl.__init__(self)
        Document.__init__(self, id, title, description, text_format, text)

    security.declareProtected(View, 'Summary')
    Summary = Description

    security.declareProtected(ModifyPortalContent, 'setSummary')
    setSummary = setDescription

    security.declareProtected(View, 'CaseFacts')
    CaseFacts = CookedBody
    
    security.declareProtected(ModifyPortalContent, 'setCaseFacts')
    setCaseFacts = edit

    security.declareProtected(View, 'ExternalURL')
    def ExternalURL(self):
        return self._external_url

    security.declareProtected(ModifyPortalContent, 'setExternalURL')
    def setExternalURL(self, external_url):
        self._external_url = external_url

    security.declareProtected(View, 'getLogo')
    def getLogo(self):
        logo = self._logo
        if logo:
            return getattr(self, logo, None)
        return None

    security.declareProtected(ModifyPortalContent, 'setLogo')
    def setLogo(self, logo):
        self._logo = logo

    security.declareProtected(View, 'Problem')
    def Problem(self):
        return getCookedText(self, self._problem)

    security.declareProtected(ModifyPortalContent, 'setProblem')
    def setProblem(self, problem):
        self._problem = problem

    security.declareProtected(View, 'Solution')
    def Solution(self):
        return getCookedText(self, self._solution)

    security.declareProtected(ModifyPortalContent, 'setSolution')
    def setSolution(self, solution):
        self._solution = solution

InitializeClass(CaseStudy)

def getCookedText(self, text, stx_level=None):
    if (self.text_format == 'html' or self.text_format == 'plain'):
        return text
    else:
        cooked = format_stx(text, stx_level)
        return cooked
    


=== Added File Products/ZopeOrg-NV/ZopeServiceProvider.py ===
from Globals import InitializeClass
from Products.CMFCore.CMFCorePermissions import View, \
     ManageProperties, ListFolderContents, \
     ModifyPortalContent, AddPortalContent
from Products.CMFDefault.Document import Document
from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
from AccessControl import ClassSecurityInfo

class ZopeServiceProvider(Document):

    portal_type = meta_type = "Zope Service Provider"

    security = ClassSecurityInfo()

    _location = ''
    _logo = ''
    _company_url = ''
    _contact_name = ''
    _contact_email = ''

    def __init__(self, id, title='', description='', text_format='', text=''):
        DefaultDublinCoreImpl.__init__(self)
        Document.__init__(self, id, title, description, text_format, text)

    security.declareProtected(View, 'Company')
    Company = Title

    security.declareProtected(ModifyPortalContent, 'setCompany')
    setCompany = setTitle

    security.declareProtected(View, 'Summary')
    Summary = Description

    security.declareProtected(ModifyPortalContent, 'setSummary')
    setSummary = setDescription

    security.declareProtected(View, 'ServiceInfo')
    ServiceInfo = CookedBody
    
    security.declareProtected(ModifyPortalContent, 'setServiceInfo')
    setServiceInfo = edit

    security.declareProtected(View, 'Location')
    def Location(self):
        return self._location

    security.declareProtected(ModifyPortalContent, 'setLocation')
    def setLocation(self, location):
        self._location = location

    security.declareProtected(View, 'getLogo')
    def getLogo(self):
        logo = self._logo
        if logo:
            return getattr(self, logo, None)
        return None

    security.declareProtected(ModifyPortalContent, 'setLogo')
    def setLogo(self, logo):
        self._logo = logo

    security.declareProtected(View, 'ContactName')
    def ContactName(self):
        return self._contact_name

    security.declareProtected(ModifyPortalContent, 'setContactName')
    def setContactName(self, contact_name):
        self._contact_name = contact_name

    security.declareProtected(View, 'ContactEmail')
    def ContactEmail(self):
        return self._contact_email

    security.declareProtected(ModifyPortalContent, 'setContactEmail')
    def setContactEmail(self, contact_email):
        self._contact_email = contact_email

InitializeClass(ZopeServiceProvider)



From sidnei at x3ng.com.br  Mon Jan 20 09:17:26 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/zopeorg - howto_edit.py:NONE howto_edit_form.pt:NONE howto_view.pt:NONE tip_edit.py:NONE tip_edit_form.pt:NONE tip_view.pt:NONE
Message-ID: <200301201417.h0KEHQR08520@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/zopeorg
In directory cvs.zope.org:/tmp/cvs-serv8482/skins/zopeorg

Removed Files:
	howto_edit.py howto_edit_form.pt howto_view.pt tip_edit.py 
	tip_edit_form.pt tip_view.pt 
Log Message:
Two new types: CaseStudy and ZopeServiceProvider. Management skins to come later. Reorganizing FS layout.

=== Removed File Products/ZopeOrg-NV/skins/zopeorg/howto_edit.py ===

=== Removed File Products/ZopeOrg-NV/skins/zopeorg/howto_edit_form.pt ===

=== Removed File Products/ZopeOrg-NV/skins/zopeorg/howto_view.pt ===

=== Removed File Products/ZopeOrg-NV/skins/zopeorg/tip_edit.py ===

=== Removed File Products/ZopeOrg-NV/skins/zopeorg/tip_edit_form.pt ===

=== Removed File Products/ZopeOrg-NV/skins/zopeorg/tip_view.pt ===



From sidnei at x3ng.com.br  Mon Jan 20 09:17:29 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/zopeorg_products - howto_edit.py:1.1 howto_edit_form.pt:1.1 howto_view.pt:1.1 tip_edit.py:1.1 tip_edit_form.pt:1.1 tip_view.pt:1.1
Message-ID: <200301201417.h0KEHTn08538@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/zopeorg_products
In directory cvs.zope.org:/tmp/cvs-serv8482/skins/zopeorg_products

Added Files:
	howto_edit.py howto_edit_form.pt howto_view.pt tip_edit.py 
	tip_edit_form.pt tip_view.pt 
Log Message:
Two new types: CaseStudy and ZopeServiceProvider. Management skins to come later. Reorganizing FS layout.


=== Added File Products/ZopeOrg-NV/skins/zopeorg_products/howto_edit.py ===
## Script (Python) "howto_edit"
##bind container=container
##bind context=context
##bind namespace=
##bind script=script
##bind subpath=traverse_subpath
##parameters=text_format, text, file, SafetyBelt
##title=
##
context.edit(text_format, text, file, SafetyBelt)
context.REQUEST.RESPONSE.redirect(context.REQUEST.URL1 +
 '/howto_edit_form?portal_status_message=Document%20changed.')

=== Added File Products/ZopeOrg-NV/skins/zopeorg_products/howto_edit_form.pt ===
<html metal:use-macro="here/main_template/macros/master">

<head>
<title tal:content="here/Title">Howto Edit Form</title>
<link rel="stylesheet" type="text/css" href="/portal/Global.css" />
</head>
<body>

<div metal:fill-slot="main">

   <h2>Edit <span tal:replace="here/id">This</span></h2>
   
   <form action="howto_edit" method="post" enctype="multipart/form-data">
    <input type="hidden" name="SafetyBelt"
           tal:attributes="value here/SafetyBelt">
    <table>
      <tr><th>Title</th><td tal:content="here/Title">Howto Title</td></tr>
      <tr><th>Description</th><td
    tal:content="here/description">This is a good HowTo.</td></tr>
      <tr><th>Format</th>
          <td><input type="radio" name="text_format"
                     value="structured-text"
                     tal:attributes="checked python: path('here/text_format') == 'structured-text'" />
	      <label for="cb_structuredtext">structured-text</label>
	      <input type="radio" name="text_format" value="html"
              tal:attributes="checked python: path('here/text_format') == 'html'" />
	      <label for="cb_html">html</label>
          </td>
      </tr>
      <tr><th> Upload </th><td><input type="file" name="file" size="25"></td></tr>
      <tr><th class="TextField"> Edit </th>
          <td class="TextField">
          <textarea name="text:text" rows="20" cols="80"
                    tal:content="here/EditableBody">edit me!</textarea>
          </td>
      </tr>
      <tr><td> <br /> </td>
          <td><input type="submit" value=" Change "></td>
      </tr>
    </table>
   </form>

  </div>
</body>
</html>


=== Added File Products/ZopeOrg-NV/skins/zopeorg_products/howto_view.pt ===
<html xmlns:tal="http://xml.zope.org/namespaces/tal"
      xmlns:metal="http://xml.zope.org/namespaces/metal"
      metal:use-macro="here/main_template/macros/master">
<body>
<div metal:fill-slot="main">

<div class="Desktop">
 <table>
 <tr>
          <td height="20">
<div class="aTitle" tal:content="structure here/Title">Document Title</div></td></tr>
  <tr valign="top">
          <td height="1" bgcolor="#000000"><img src="../zpt_images/c.gif" width="360" height="1" border="0" alt=""
                                                          tal:attributes="src string:c.gif"></td>
        </tr>
		<tr><td>&nbsp;</td></tr>
  <tr>
    <td><div metal:use-macro="here/content_byline/macros/byline">By Me</div></td>
  </tr>
  <tr>
    <td><div class="Description" tal:content="here/Description"></div></td>
  </tr>
  <tr>
    <td><div tal:replace="structure here/CookedBody">Cooked Body</div></td>
  </tr>
  <tr>
  <td><div class="Discussion">
   <span tal:replace="structure here/viewThreadsAtBottom"
         tal:condition="here/viewThreadsAtBottom|nothing"></span>
  </div>
  </td>
  </tr>
  </table>
</div>
</div>
</body>
</html>


=== Added File Products/ZopeOrg-NV/skins/zopeorg_products/tip_edit.py ===
## Script (Python) "tip_edit"
##bind container=container
##bind context=context
##bind namespace=
##bind script=script
##bind subpath=traverse_subpath
##parameters=text_format, text, file, SafetyBelt
##title=
##
context.edit(text_format, text, file, SafetyBelt)
context.REQUEST.RESPONSE.redirect(context.REQUEST.URL1 +
 '/tip_edit_form?portal_status_message=Document%20changed.')

=== Added File Products/ZopeOrg-NV/skins/zopeorg_products/tip_edit_form.pt ===
<html metal:use-macro="here/main_template/macros/master">

<head>
<title tal:content="here/Title">Howto Edit Form</title>
<link rel="stylesheet" type="text/css" href="/portal/Global.css" />
</head>
<body>

<div metal:fill-slot="main">

   <h2>Edit <span tal:replace="here/id">This</span></h2>
   
   <form action="howto_edit" method="post" enctype="multipart/form-data">
    <input type="hidden" name="SafetyBelt"
           tal:attributes="value here/SafetyBelt">
    <table>
      <tr><th>Title</th><td tal:content="here/Title">Howto Title</td></tr>
      <tr><th>Description</th>
          <td tal:content="here/description">This is a good Tip.</td>
      </tr>
      <tr><th>Format</th>
          <td><input type="radio" name="text_format"
                     value="structured-text"
                     tal:attributes="checked python: path('here/text_format') == 'structured-text'" />
	      <label for="cb_structuredtext">structured-text</label>
	      <input type="radio" name="text_format" value="html"
              tal:attributes="checked python: path('here/text_format') == 'html'" />
	      <label for="cb_html">html</label>
          </td>
      </tr>
      <tr><th> Upload </th><td><input type="file" name="file" size="25"></td></tr>
      <tr><th class="TextField"> Edit </th>
          <td class="TextField">
          <textarea name="text:text" rows="10" cols="80"
                    tal:content="here/EditableBody">edit me!</textarea>
          </td>
      </tr>
      <tr><td> <br /> </td>
          <td><input type="submit" value=" Change "></td>
      </tr>
    </table>
   </form>

  </div>
</body>
</html>


=== Added File Products/ZopeOrg-NV/skins/zopeorg_products/tip_view.pt ===
<html metal:use-macro="here/main_template/macros/master">

<head>
<title tal:content="here/Title">Master Template</title>
<link rel="stylesheet" type="text/css" href="/portal/Global.css" />
</head>
<body>
<table>
   <tr><td>this will be a navbar, some day</td></tr>
</table>
<div metal:fill-slot="main">
    <div tal:replace="structure here/content_byline">by bob</div>
    <div tal:replace="structure here/CookedBody">bob's news</div>
    <div tal:replace="structure here/viewThreadsAtBottom">bob sucks.</div>
  </div>
 <p>powered by that z thing</p>
</body>
</html>



From sidnei at x3ng.com.br  Mon Jan 20 14:02:36 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/zopeorg_products - casestudy_edit.py:1.1 casestudy_edit_form.pt:1.1 casestudy_view.pt:1.1
Message-ID: <200301201902.h0KJ2a232709@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/zopeorg_products
In directory cvs.zope.org:/tmp/cvs-serv32678/skins/zopeorg_products

Added Files:
	casestudy_edit.py casestudy_edit_form.pt casestudy_view.pt 
Log Message:
Initialize content types and add a few management views.

=== Added File Products/ZopeOrg-NV/skins/zopeorg_products/casestudy_edit.py ===
## Script (Python) "tip_edit"
##bind container=container
##bind context=context
##bind namespace=
##bind script=script
##bind subpath=traverse_subpath
##parameters=title, summary, logo, external_url, text_format, case_facts, case_facts_file, problem, problem_file, solution, solution_file, SafetyBelt
##title=
##
context.setTitle(title)
context.setSummary(summary)
context.setLogo(logo)
context.setExternalURL(external_url)
context.setCaseFacts(text_format, case_facts, case_facts_file, SafetyBelt)
context.setProblem(text_format, problem, problem_file, SafetyBelt)
context.setSolution(text_format, solution, solution_file, SafetyBelt)

context.REQUEST.RESPONSE.redirect(context.REQUEST.URL1 +
 '/casestudy_edit_form?portal_status_message=Case%20Study%20changed.')


=== Added File Products/ZopeOrg-NV/skins/zopeorg_products/casestudy_edit_form.pt ===
<html metal:use-macro="here/main_template/macros/master">

<head>
<title tal:content="here/Title">Case Study Edit Form</title>
<link rel="stylesheet" type="text/css" href="/portal/Global.css" />
</head>
<body>

<div metal:fill-slot="main">

   <h2>Edit <span tal:replace="here/id">This</span></h2>
   
   <form action="casestudy_edit" method="post" enctype="multipart/form-data">
    <input type="hidden" name="SafetyBelt"
           tal:attributes="value here/SafetyBelt">
    <table>
      <tr><th>Title</th><td>
	<input type="text" name="title:text" size="50" value=""
	       tal:attributes="value here/Title"></td></tr>
      <tr><th>Summary</th>
          <td><textarea name="summary:text" rows="5" cols="80"
                    tal:content="here/Summary">edit me!</textarea>
         </td>
      </tr>
      <tr><th>Logo</th><td>
	<input type="text" name="logo:text" size="50" value=""
	       tal:attributes="value here/Logo"></td></tr>
      <tr><th>External URL</th><td>
	<input type="text" name="external_url:text" size="50" value=""
	       tal:attributes="value here/ExternalURL"></td></tr>
      <tr><th>Format</th>
          <td><input type="radio" name="text_format"
                     value="structured-text"
                     tal:attributes="checked python: path('here/text_format') == 'structured-text'" />
	      <label for="cb_structuredtext">structured-text</label>
	      <input type="radio" name="text_format" value="html"
              tal:attributes="checked python: path('here/text_format') == 'html'" />
	      <label for="cb_html">html</label>
          </td>
      </tr>
      <tr><th class="TextField"> Case Facts </th>
          <td class="TextField">
          <textarea name="case_facts:text" rows="10" cols="80"
                    tal:content="here/editableCaseFacts">edit me!</textarea>
          </td>
      </tr>
      <tr><th> Upload Case Facts </th><td><input type="file" name="case_facts_file" size="25"></td></tr>
      <tr><th class="TextField"> Problem </th>
          <td class="TextField">
          <textarea name="problem:text" rows="10" cols="80"
                    tal:content="here/editableProblem">edit me!</textarea>
          </td>
      </tr>
      <tr><th> Upload Problem</th><td><input type="file" name="problem_file" size="25"></td></tr>
      <tr><th class="TextField"> Solution </th>
          <td class="TextField">
          <textarea name="solution:text" rows="10" cols="80"
                    tal:content="here/editableSolution">edit me!</textarea>
          </td>
      </tr>
      <tr><th> Upload Solution</th><td><input type="file" name="solution_file" size="25"></td></tr>
      <tr><td> <br /> </td>
          <td><input type="submit" value=" Change "></td>
      </tr>
    </table>
   </form>

  </div>
</body>
</html>


=== Added File Products/ZopeOrg-NV/skins/zopeorg_products/casestudy_view.pt ===
<html metal:use-macro="here/main_template/macros/master">

<head>
<title tal:content="here/Title">Master Template</title>
<link rel="stylesheet" type="text/css" href="/portal/Global.css" />
</head>
<body>
<div metal:fill-slot="main">

    <img src="logo.jpg"
         tal:condition="here/getLogo"
         tal:attributes="src python:here.getLogo().absolute_url()" />

    <p tal:condition='here/ExternalURL'>
       <a href="#" tal:attributes="href here/ExternalURL"
          tal:content="here/ExternalURL">
          External URL
      </a>
   </p>

    <h1 tal:condition="here/Summary">Summary</h1>
 
    <p tal:condition="here/Summary"
       tal:content="here/Summary">Summary</p>

    <h1 tal:condition="here/CaseFacts">Case Facts</h1>
 
    <span tal:condition="here/CaseFacts"
          tal:replace="structure here/CaseFacts" />

    <h1 tal:condition="here/Problem">Problem</h1>
 
    <span tal:condition="here/Problem"
          tal:replace="structure here/Problem" />

    <h1 tal:condition="here/Solution">Solution</h1>
 
    <span tal:condition="here/Solution"
          tal:replace="structure here/Solution" />

</div>
</body>
</html>



From sidnei at x3ng.com.br  Mon Jan 20 14:03:05 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV - CaseStudy.py:1.2 ZopeServiceProvider.py:1.2 __init__.py:1.18
Message-ID: <200301201903.h0KJ35n32763@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV
In directory cvs.zope.org:/tmp/cvs-serv32678

Modified Files:
	CaseStudy.py ZopeServiceProvider.py __init__.py 
Log Message:
Initialize content types and add a few management views.

=== Products/ZopeOrg-NV/CaseStudy.py 1.1 => 1.2 ===
 from Products.CMFDefault.Document import Document
 from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
 from AccessControl import ClassSecurityInfo
+from Acquisition import aq_base
+
+factory_type_information = ( { 'id'             : 'Case Study'
+                             , 'meta_type'      : 'Case Study'
+                             , 'description'    : """\
+A Case Study holds details about sucessful implementations of
+Zope by Community Members or Zope Service Providers."""
+                             , 'icon'           : 'document_icon.gif'
+                             , 'product'        : 'ZopeOrg'
+                             , 'factory'        : 'addCaseStudy'
+                             , 'immediate_view' : 'casestudy_edit_form'
+                             , 'actions'        :
+                                ( { 'id'            : 'view' 
+                                  , 'name'          : 'View'
+                                  , 'action'        : 'casestudy_view'
+                                  , 'permissions'   : (View,)
+                                  }
+                                , { 'id'            : 'edit'
+                                  , 'name'          : 'Edit'
+                                  , 'action'        : 'casestudy_edit_form'
+                                  , 'permissions'   : (ModifyPortalContent,)
+                                  }
+                                , { 'id'            : 'metadata'
+                                  , 'name'          : 'Metadata'
+                                  , 'action'        : 'metadata_edit_form'
+                                  , 'permissions'   : (ModifyPortalContent,)
+                                  }
+                                )
+                             }
+                           ,
+                           )
 
 class CaseStudy(Document):
 
@@ -17,22 +48,26 @@
     _problem = ''
     _solution = ''
     _logo = ''
+    _stx_level = 2
 
     def __init__(self, id, title='', description='', text_format='', text=''):
         DefaultDublinCoreImpl.__init__(self)
         Document.__init__(self, id, title, description, text_format, text)
 
     security.declareProtected(View, 'Summary')
-    Summary = Description
+    Summary = Document.Description
 
     security.declareProtected(ModifyPortalContent, 'setSummary')
-    setSummary = setDescription
+    setSummary = Document.setDescription
+
+    security.declareProtected(View, 'editableCaseFacts')
+    editableCaseFacts = Document.EditableBody
 
     security.declareProtected(View, 'CaseFacts')
-    CaseFacts = CookedBody
+    CaseFacts = Document.CookedBody
     
     security.declareProtected(ModifyPortalContent, 'setCaseFacts')
-    setCaseFacts = edit
+    setCaseFacts = Document.edit
 
     security.declareProtected(View, 'ExternalURL')
     def ExternalURL(self):
@@ -42,6 +77,10 @@
     def setExternalURL(self, external_url):
         self._external_url = external_url
 
+    security.declareProtected(View, 'Logo')
+    def Logo(self):
+        return self._logo
+
     security.declareProtected(View, 'getLogo')
     def getLogo(self):
         logo = self._logo
@@ -53,28 +92,76 @@
     def setLogo(self, logo):
         self._logo = logo
 
+    security.declareProtected(View, 'editableProblem')
+    def editableProblem(self):
+        return self._problem
+
     security.declareProtected(View, 'Problem')
     def Problem(self):
-        return getCookedText(self, self._problem)
+        return self._getCookedText('_problem')
 
     security.declareProtected(ModifyPortalContent, 'setProblem')
-    def setProblem(self, problem):
-        self._problem = problem
+    def setProblem(self, text_format, problem, file, safety_belt):
+        self._editText(text_format, problem, file, safety_belt, '_problem')
+
+    security.declareProtected(View, 'editableSolution')
+    def editableSolution(self):
+        return self._solution
 
     security.declareProtected(View, 'Solution')
     def Solution(self):
-        return getCookedText(self, self._solution)
+        return self._getCookedText('_solution')
 
     security.declareProtected(ModifyPortalContent, 'setSolution')
-    def setSolution(self, solution):
-        self._solution = solution
+    def setSolution(self, text_format, solution, file, safety_belt):
+        self._editText(text_format, solution, file, safety_belt, '_solution')
+
+    def _getCookedText(self, property, stx_level=None, set_level=0):
+        text_format = getattr(aq_base(self), '%s_text_format' %property, \
+                              'structured-text')
+        text = getattr(aq_base(self), property, '')
+        cooked = getattr(aq_base(self), 'cooked%s' %property, '')
+        if (text_format == 'html' or text_format == 'plain'
+            or (stx_level is None)
+            or (stx_level == self._stx_level)):
+            return cooked
+        else:
+            cooked = format_stx(text, stx_level)
+            if set_level:
+                self._stx_level = stx_level
+                setattr(self, 'cooked%s' %property, cooked)
+            return cooked
+
+    def _editText(self, text_format='structured-text', text='', \
+                  file=None, safety_belt='', property='text'):
+        level = self._stx_level
+        if not text_format:
+            text_format = getattr(aq_base(self), '%s_text_format' %property, \
+                                  'structured-text')
+        if not safety_belt:
+            safety_belt = ''
+        if not self._safety_belt_update(safety_belt=safety_belt):
+            msg = ("Intervening changes from elsewhere detected."
+                   " Please refetch the document and reapply your changes."
+                   " (You may be able to recover your version using the"
+                   " browser 'back' button, but will have to apply them"
+                   " to a freshly fetched copy.)")
+            raise 'EditingConflict', msg
+        if text_format == 'html':
+            setattr(self, property, text)
+            setattr(self, 'cooked%s' %property, text)
+        elif text_format == 'plain':
+            setattr(self, property, text)
+            setattr(self, 'cooked%s' %property, \
+                    html_quote(text).replace('\n','<br>'))
+        else:
+            setattr(self, property, text)
+            setattr(self, 'cooked%s' %property, \
+                    format_stx(text=text, level=level))
 
 InitializeClass(CaseStudy)
 
-def getCookedText(self, text, stx_level=None):
-    if (self.text_format == 'html' or self.text_format == 'plain'):
-        return text
-    else:
-        cooked = format_stx(text, stx_level)
-        return cooked
     
+def addCaseStudy( self , id, title=''):
+    cs = CaseStudy(id, title)
+    obj = self._setObject(id, cs) 


=== Products/ZopeOrg-NV/ZopeServiceProvider.py 1.1 => 1.2 ===
 from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
 from AccessControl import ClassSecurityInfo
 
+factory_type_information = ( { 'id'             : 'Zope Service Provider'
+                             , 'meta_type'      : 'Zope Service Provider'
+                             , 'description'    : """\
+A Zope Service Provider holds contact info for companies that provide
+any kind of service related to Zope (Hosting, Consulting, Development)."""
+                             , 'icon'           : 'document_icon.gif'
+                             , 'product'        : 'ZopeOrg'
+                             , 'factory'        : 'addZSP'
+                             , 'immediate_view' : 'zsp_edit_form'
+                             , 'actions'        :
+                                ( { 'id'            : 'view' 
+                                  , 'name'          : 'View'
+                                  , 'action'        : 'document_view'
+                                  , 'permissions'   : (View,)
+                                  }
+                                , { 'id'            : 'edit'
+                                  , 'name'          : 'Edit'
+                                  , 'action'        : 'zsp_edit_form'
+                                  , 'permissions'   : (ModifyPortalContent,)
+                                  }
+                                , { 'id'            : 'metadata'
+                                  , 'name'          : 'Metadata'
+                                  , 'action'        : 'metadata_edit_form'
+                                  , 'permissions'   : (ModifyPortalContent,)
+                                  }
+                                )
+                             }
+                           ,
+                           )
+
 class ZopeServiceProvider(Document):
 
     portal_type = meta_type = "Zope Service Provider"
@@ -23,22 +53,22 @@
         Document.__init__(self, id, title, description, text_format, text)
 
     security.declareProtected(View, 'Company')
-    Company = Title
+    Company = Document.Title
 
     security.declareProtected(ModifyPortalContent, 'setCompany')
-    setCompany = setTitle
+    setCompany = Document.setTitle
 
     security.declareProtected(View, 'Summary')
-    Summary = Description
+    Summary = Document.Description
 
     security.declareProtected(ModifyPortalContent, 'setSummary')
-    setSummary = setDescription
+    setSummary = Document.setDescription
 
     security.declareProtected(View, 'ServiceInfo')
-    ServiceInfo = CookedBody
+    ServiceInfo = Document.CookedBody
     
     security.declareProtected(ModifyPortalContent, 'setServiceInfo')
-    setServiceInfo = edit
+    setServiceInfo = Document.edit
 
     security.declareProtected(View, 'Location')
     def Location(self):
@@ -76,3 +106,7 @@
         self._contact_email = contact_email
 
 InitializeClass(ZopeServiceProvider)
+
+def addZSP( self , id, title=''):
+    zsp = ZopeServiceProvider(id, title)
+    obj = self._setObject(id, zsp) 


=== Products/ZopeOrg-NV/__init__.py 1.17 => 1.18 ===
 #import ZopeOrgMembershipTool
 import ContentList
 import Acquisition
+import CaseStudy
+import ZopeServiceProvider
 
 #Hackish workaround to allow accesing the broken ZODB on ZopeOrg
 class ImplicitAcquirerWrapper:
@@ -21,10 +23,14 @@
 # Make the skins available as DirectoryViews
 registerDirectory('skins', globals())
 registerDirectory('skins/zopeorg', globals())
+registerDirectory('skins/zopeorg_products', globals())
 registerDirectory('skins/zopeorg_membership', globals())
 
 #ftis = SoftwareProduct.factory_type_information
 
+ftis = ( CaseStudy.factory_type_information + \
+         ZopeServiceProvider.factory_type_information )
+
 CL_CTORS = ( ( 'manage_addContentListForm', ContentList.addContentListForm )
            , ContentList.addContentList
            )
@@ -66,3 +72,15 @@
     #                         ),
     #    fti = ftis ,
     #    ).initialize(context)
+
+    ContentInit(
+       'Zope.org Content',
+       content_types = ( CaseStudy.CaseStudy
+                       , ZopeServiceProvider.ZopeServiceProvider
+                       ),
+       permission = AddPortalContent,
+       extra_constructors = ( CaseStudy.addCaseStudy
+                            , ZopeServiceProvider.addZSP
+                            ),
+       fti = ftis ,
+       ).initialize(context)



From sidnei at x3ng.com.br  Mon Jan 20 14:51:16 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV - .cvsignore:1.1
Message-ID: <200301201951.h0KJpGX06822@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV
In directory cvs.zope.org:/tmp/cvs-serv6792

Added Files:
	.cvsignore 
Log Message:
adding .cvsignore

=== Added File Products/ZopeOrg-NV/.cvsignore ===
*~
*.pyc



From sidnei at x3ng.com.br  Mon Jan 20 14:52:36 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/zopeorg_products - zsp_edit.py:1.1 zsp_edit_form.pt:1.1 zsp_view.pt:1.1 casestudy_edit.py:1.2
Message-ID: <200301201952.h0KJqaV06999@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/zopeorg_products
In directory cvs.zope.org:/tmp/cvs-serv6968/skins/zopeorg_products

Modified Files:
	casestudy_edit.py 
Added Files:
	zsp_edit.py zsp_edit_form.pt zsp_view.pt 
Log Message:
ZSP management views

=== Added File Products/ZopeOrg-NV/skins/zopeorg_products/zsp_edit.py ===
## Script (Python) "zsp_edit"
##bind container=container
##bind context=context
##bind namespace=
##bind script=script
##bind subpath=traverse_subpath
##parameters=company, summary, location, text_format, logo, external_url, contact_name, contact_email, voice, fax, service_info, service_info_file, SafetyBelt
##title=
##
context.setCompany(company)
context.setSummary(summary)
context.setLocation(location)
context.setLogo(logo)
context.setExternalURL(external_url)
context.setContactName(contact_name)
context.setContactEmail(contact_email)
context.setVoice(voice)
context.setFax(fax)
context.setServiceInfo(text_format, service_info, service_info_file, SafetyBelt)

context.REQUEST.RESPONSE.redirect(context.REQUEST.URL1 +
 '/zsp_edit_form?portal_status_message=ZSP%20changed.')


=== Added File Products/ZopeOrg-NV/skins/zopeorg_products/zsp_edit_form.pt ===
<html metal:use-macro="here/main_template/macros/master">

<head>
<title tal:content="here/Title">ZSP Edit Form</title>
<link rel="stylesheet" type="text/css" href="/portal/Global.css" />
</head>
<body>

<div metal:fill-slot="main">

   <h2>Edit <span tal:replace="here/id">This</span></h2>
   
   <form action="zsp_edit" method="post" enctype="multipart/form-data">
    <input type="hidden" name="SafetyBelt"
           tal:attributes="value here/SafetyBelt">
    <table>
      <tr><th>Company</th><td>
	<input type="text" name="company:text" size="50" value=""
	       tal:attributes="value here/Company"></td></tr>
      <tr><th>Summary</th>
          <td><textarea name="summary:text" rows="5" cols="80"
                    tal:content="here/Summary">edit me!</textarea>
         </td>
      </tr>
      <tr><th>Logo</th><td>
	<input type="text" name="logo:text" size="50" value=""
	       tal:attributes="value here/Logo"></td></tr>
      <tr><th>External URL</th><td>
	<input type="text" name="external_url:text" size="50" value=""
	       tal:attributes="value here/ExternalURL"></td></tr>
      <tr><th>Location</th><td>
	<input type="text" name="location:text" size="50" value=""
	       tal:attributes="value here/Location"></td></tr>
      <tr><th>Contact Name</th><td>
	<input type="text" name="contact_name:text" size="50" value=""
	       tal:attributes="value here/ContactName"></td></tr>
      <tr><th>Contact Email</th><td>
	<input type="text" name="contact_email:text" size="50" value=""
	       tal:attributes="value here/ContactEmail"></td></tr>
      <tr><th>Voice</th><td>
	<input type="text" name="voice:text" size="50" value=""
	       tal:attributes="value here/Voice"></td></tr>
      <tr><th>Fax</th><td>
	<input type="text" name="fax:text" size="50" value=""
	       tal:attributes="value here/Fax"></td></tr>
      <tr><th>Format</th>
          <td><input type="radio" name="text_format"
                     value="structured-text"
                     tal:attributes="checked python: path('here/text_format') == 'structured-text'" />
	      <label for="cb_structuredtext">structured-text</label>
	      <input type="radio" name="text_format" value="html"
              tal:attributes="checked python: path('here/text_format') == 'html'" />
	      <label for="cb_html">html</label>
          </td>
      </tr>
      <tr><th class="TextField"> Service Info </th>
          <td class="TextField">
          <textarea name="service_info:text" rows="10" cols="80"
                    tal:content="here/editableServiceInfo">edit me!</textarea>
          </td>
      </tr>
      <tr><th> Upload Service Info </th><td><input type="file" name="service_info_file" size="25"></td></tr>
      <tr><td> <br /> </td>
          <td><input type="submit" value=" Change "></td>
      </tr>
    </table>
   </form>

  </div>
</body>
</html>


=== Added File Products/ZopeOrg-NV/skins/zopeorg_products/zsp_view.pt ===
<html metal:use-macro="here/main_template/macros/master">

<head>
<title tal:content="here/Title">Master Template</title>
<link rel="stylesheet" type="text/css" href="/portal/Global.css" />
</head>
<body>
<div metal:fill-slot="main">

    <h1 tal:condition="here/Company">Company</h1>

    <img src="logo.jpg"
         tal:condition="here/getLogo"
         tal:attributes="src python:here.getLogo().absolute_url()" />

    <p tal:condition='here/ExternalURL'>
       <a href="#" tal:attributes="href here/ExternalURL"
          tal:content="here/ExternalURL">
          External URL
      </a>
   </p>

    <h1 tal:condition="here/Summary">Summary</h1>
 
    <p tal:condition="here/Summary"
       tal:content="here/Summary">Summary</p>

    <ul tal:condition="here/ContactName|here/ContactEmail|here/Voice|here/Fax">
      <li tal:condition="here/ContactName">
        <b> Contact Name: </b><span tal:replace="here/ContactName"/>
      </li>
      <li tal:condition="here/ContactEmail">
        <b> Contact Email: </b><span tal:replace="here/ContactEmail"/>
      </li>
      <li tal:condition="here/Voice">
         <b> Voice: </b><span tal:replace="here/Voice"/>
      </li>
      <li tal:condition="here/Fax">
         <b> Fax: </b><span tal:replace="here/Fax"/>
      </li>
    </ul>
      
    <h1 tal:condition="here/ServiceInfo">Service Info</h1>
 
    <span tal:condition="here/ServiceInfo"
          tal:replace="structure here/ServiceInfo" />


</div>
</body>
</html>


=== Products/ZopeOrg-NV/skins/zopeorg_products/casestudy_edit.py 1.1 => 1.2 ===
-## Script (Python) "tip_edit"
+## Script (Python) "casestudy_edit"
 ##bind container=container
 ##bind context=context
 ##bind namespace=



From sidnei at x3ng.com.br  Mon Jan 20 14:53:05 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV - ZopeServiceProvider.py:1.3
Message-ID: <200301201953.h0KJr5I07047@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV
In directory cvs.zope.org:/tmp/cvs-serv6968

Modified Files:
	ZopeServiceProvider.py 
Log Message:
ZSP management views

=== Products/ZopeOrg-NV/ZopeServiceProvider.py 1.2 => 1.3 ===
                              , 'actions'        :
                                 ( { 'id'            : 'view' 
                                   , 'name'          : 'View'
-                                  , 'action'        : 'document_view'
+                                  , 'action'        : 'zsp_view'
                                   , 'permissions'   : (View,)
                                   }
                                 , { 'id'            : 'edit'
@@ -47,6 +47,10 @@
     _company_url = ''
     _contact_name = ''
     _contact_email = ''
+    _external_url = ''
+    _fax = ''
+    _voice = ''
+    _stx_level = 2
 
     def __init__(self, id, title='', description='', text_format='', text=''):
         DefaultDublinCoreImpl.__init__(self)
@@ -67,9 +71,20 @@
     security.declareProtected(View, 'ServiceInfo')
     ServiceInfo = Document.CookedBody
     
+    security.declareProtected(View, 'editableServiceInfo')
+    editableServiceInfo = Document.EditableBody
+
     security.declareProtected(ModifyPortalContent, 'setServiceInfo')
     setServiceInfo = Document.edit
 
+    security.declareProtected(View, 'ExternalURL')
+    def ExternalURL(self):
+        return self._external_url
+
+    security.declareProtected(ModifyPortalContent, 'setExternalURL')
+    def setExternalURL(self, external_url):
+        self._external_url = external_url
+
     security.declareProtected(View, 'Location')
     def Location(self):
         return self._location
@@ -85,6 +100,10 @@
             return getattr(self, logo, None)
         return None
 
+    security.declareProtected(View, 'Logo')
+    def Logo(self):
+        return self._logo
+
     security.declareProtected(ModifyPortalContent, 'setLogo')
     def setLogo(self, logo):
         self._logo = logo
@@ -104,6 +123,22 @@
     security.declareProtected(ModifyPortalContent, 'setContactEmail')
     def setContactEmail(self, contact_email):
         self._contact_email = contact_email
+
+    security.declareProtected(View, 'Voice')
+    def Voice(self):
+        return self._voice
+
+    security.declareProtected(ModifyPortalContent, 'setVoice')
+    def setVoice(self, voice):
+        self._voice = voice
+
+    security.declareProtected(View, 'Fax')
+    def Fax(self):
+        return self._fax
+
+    security.declareProtected(ModifyPortalContent, 'setFax')
+    def setFax(self, fax):
+        self._fax = fax
 
 InitializeClass(ZopeServiceProvider)
 



From sidnei at x3ng.com.br  Fri Jan 24 22:43:01 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:09 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/nzo - nzo.css.dtml:1.4
Message-ID: <200301250343.h0P3h1m15668@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/nzo
In directory cvs.zope.org:/tmp/cvs-serv15562/skins/nzo

Modified Files:
	nzo.css.dtml 
Log Message:
css fix

=== Products/ZopeOrg-NV/skins/nzo/nzo.css.dtml 1.3 => 1.4 ===
 
 table {
     font-size: 100%;
+    width: 100%;
 }
 
-a {
-	text-decoration: none;
-    color: #436976;
-    background-color: transparent;
+table td {
+    vertical-align: top;
 }
 
-table {
+table.detail {
+  border: black dotted 1px;
+  width: 200px;
+  background: #8cacbb;
+}
 
+a {
+    text-decoration: underline;
+    color: #436976;
+    background-color: transparent;
 }
 
 
@@ -142,7 +149,6 @@
 
 
 fieldset {
-    border: 1px solid #8cacbb;
     margin: 2em 0em 1em 0em;
     padding: 1em 0em;
 }
@@ -159,7 +165,6 @@
 }
 
 textarea {
-    border: 1px solid #8cacbb;  
     color: Black;
     background-color: white;
     width: 93%;
@@ -168,7 +173,6 @@
 
 input {
     font: 100% Verdana, Helvetica, Arial, sans-serif;
-    border: 1px solid #8cacbb;  
     color: Black;
     background-color: white;
     vertical-align: middle;
@@ -178,7 +182,6 @@
 
 select {
     font: 100% Verdana, Helvetica, Arial, sans-serif;
-    border: 1px solid #8cacbb;  
     vertical-align: top;
 }
 
@@ -552,6 +555,11 @@
     font-weight: bold;
     display: inline;
     padding-right: 0.5em;
+}
+
+td.label {
+    font-weight: bold;
+    text-align: right;
 }
 
 div.field {



From sidnei at x3ng.com.br  Fri Jan 24 23:17:42 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:10 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/zwiki_dtml - wikipage_view.pt:1.1
Message-ID: <200301250417.h0P4HgK01359@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/zwiki_dtml
In directory cvs.zope.org:/tmp/cvs-serv1304

Added Files:
	wikipage_view.pt 
Log Message:
wikipage_view. needs cleanup

=== Added File Products/ZopeOrg-NV/skins/zwiki_dtml/wikipage_view.pt ===
<html xmlns:tal="http://xml.zope.org/namespaces/tal"
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       metal:use-macro="here/main_template/macros/master">
<head>
<title>
<span tal:replace="container/title">wiki name </span><span tal:replace="here/title_or_id">page name</span>
</title>
</head>
<body bgcolor="#ffffff">
<div metal:fill-slot="main" tal:define="container here/aq_parent">
<form method="POST" action="wiki_url/SearchPage" 
tal:attributes="action python:here.wiki_url()+'/SearchPage'">

<table 
tal:condition="python:request.get('zwiki_displaymode',0)=='full'" 
width="100%" cellpadding="2" cellspacing=0 border=0>
<tr bgcolor="#dddddd">
<td align="left" valign="middle" width="20%"><em><small><span style="color:gray" tal:content="python:str(here.subscriberCount() + here.wikiSubscriberCount()) + ' subscribers'">
N subscribers
</span></small></em></td>

<td align="center" valign="middle" width="60%">
<small><em><span style="color:gray" tal:content="structure python:here.linkTitle(prettyprint=1)">
last edited n days ago by by so-and-so
</span></em></small></td>

<td align="right" valign="middle" width="20%"
tal:condition="python:request.get('zwiki_showsearch',1)" 
><em><small><span style="color:gray">
<input name="expr" type="text" size="20" maxlength="100" value="" style="width:100%; background-color:#f0f0f0" title="search all pages.. spaces are significant" accesskey="s"><br>
</span></small></em></td>

</tr>
</table>

<table 
tal:condition="python:request.get('zwiki_displaymode',0) != 'minimal'"
width="100%" border="0" cellspacing="0" cellpadding="3" bgcolor="#f0f0f0"
tal:attributes="bgcolor 
python:['#f0f0f0',nothing][request.get('zwiki_displaymode',0)=='minimal']">
<tr>

<td width="1%" valign="middle">
<a 
tal:condition="python:request.get('zwiki_showlogo',1)"
tal:attributes="href here/wiki_url"
href="wiki_url" title="go to home page" accesskey="1">
<img 
tal:replace="structure container/site_logo|default"
src="/misc_/ZWiki/ZWikiPage_icon.gif" height=48 width=48 border=0 alt="home">
</a>
</td>

<td
tal:condition="python:request.get('zwiki_showhierarchy',0)"
align="left" valign="top">
<ul tal:replace="structure 
  python:here.context(request,enlarge_current=1)">
<li>context
<ul><li><big><big><big>page name</big></big></big></ul>
</ul>
</td>
<td
tal:condition="not:python:request.get('zwiki_showhierarchy',0)"
align="left" valign="bottom">
<span tal:replace="nothing"><em>or</em></span>
<big><big><big><strong>
<a 
tal:attributes="
 href python:here.page_url() + '/backlinks';
 title python:'show backlinks for this page ('+here.linkTitle()+')'"
tal:content="here/title_or_id"
href="page_url/backlinks" 
title="show backlinks for this page (last edited n days ago by so-and-so)" 
accesskey="b"
>page name</a>
</strong></big></big></big>
</td>

<td width="20%" align="right" valign="middle" >

<span
tal:condition="not:python:request.get('zwiki_displaymode','simple')=='simple'">
<span
tal:condition="python:request.get('zwiki_showquote',1) and not
                      request.get('zwiki_displaymode',0) == 'minimal'"
tal:define="split python:modules['string'].split;
            maxquotesize python:200;
            quotes python:split(container.AnnoyingQuote.text(),'\n');
            lastquote python:quotes[-1];
            quote python:(len(lastquote)>maxquotesize and lastquote[:maxquotesize]+'... <a href=AnnoyingQuote#bottom>more</a>') or lastquote"
tal:on-error="string:"
style="color:gray">
<!--quote-->
<small><em>
<span 
tal:replace="structure python:here.wikilink(quote)"
tal:on-error="string:annoying quote">
annoying quote<br>or<br>
</span>
</em></small>
</span>
<span
tal:condition="not:python:request.get('zwiki_showquote',1) and not
                          request.get('zwiki_displaymode',0) == 'minimal'">
&nbsp;
</span>
</span>

<span
tal:condition="python:request.get('zwiki_displaymode','simple')=='simple'">
<!-- search box -->
<input 
tal:condition="python:request.get('zwiki_showsearch',1)"
name="expr" type="text" size="20" maxlength="100" value="" 
style="width:100%; background-color:#ffffff" 
title="search all pages.. spaces are significant" accesskey="s"><br 
tal:condition="python:request.get('zwiki_showsearch',1)">
<!-- last editor -->
<small><em><span style="color:gray" tal:content="structure python:here.linkTitle(prettyprint=1)">
last edited n days ago by by so-and-so
</span></em></small>
</span>

</td>

</tr>
</table>

<table 
tal:condition="not:python:request.get('zwiki_displaymode',0)=='minimal'"
width="100%" cellpadding="0" cellspacing=0 border=0>
<tr>
<td bgcolor="#dddddd" align="right"><a href="AnnoyingQuote#bottom"><img src="/p_/sp" height=2 width=2 border=0 alt=" "></a></td>
</tr>
</table>

<span
tal:condition="python:request.get('zwiki_displaymode',0) == 'minimal' and not
                      request.get('zwiki_showhierarchy',0)">
<span tal:replace="nothing"><em>or:</em><br></span>
<a 
tal:condition="python:request.get('zwiki_showlogo',1)"
tal:attributes="href here/wiki_url"
href="wiki_url" title="go to home page" accesskey="1">
<img 
tal:replace="structure container/site_logo|default"
src="/misc_/ZWiki/ZWikiPage_icon.gif" height=48 width=48 border=0 alt="home"
></a>
<big><big><big><strong>
<a 
tal:attributes="
 href python:here.page_url() + '/backlinks';
 title python:'show backlinks for this page ('+here.linkTitle()+')'"
tal:content="here/title_or_id"
href="page_url/backlinks" 
title="show backlinks for this page (last edited n days ago by so-and-so)" 
accesskey="b"
>page name</a>
</strong></big></big></big>
</span>
<span
tal:condition="python:request.get('zwiki_displaymode',0) == 'minimal' and
                      request.get('zwiki_showhierarchy',0)">
<span tal:replace="nothing"><br><em>or:</em><br></span>
<a 
tal:condition="python:request.get('zwiki_showlogo',1)"
tal:attributes="href here/wiki_url"
href="wiki_url" title="go to home page" accesskey="1">
<img 
tal:replace="structure container/site_logo|default"
align="left" valign="top"
src="/misc_/ZWiki/ZWikiPage_icon.gif" height=48 width=48 border=0 alt="home"
></a>
<ul tal:replace="structure 
  python:here.context(request,enlarge_current=1)">
<li>context
<ul><li><big><big><big>page name</big></big></big></ul>
</ul>
</span>

</form>
<!-- end of header -->

<div tal:replace="structure python:here.render(here,request)">
page body goes here
</div>


<!-- start of footer -->
<a name="bottom"></a>
<p></p>

<form method="POST" action="page_url" enctype="multipart/form-data"
tal:attributes="action here/page_url">
<input name=timeStamp type=hidden value="editTimestamp"
tal:attributes="value here/editTimestamp">
<input name=page type=hidden value="id"
tal:attributes="value here/id">

<!-- link panel -->
<br>
<table width="100%" border="0" cellspacing="0" cellpadding="0" 
bgcolor="#dddddd"
tal:attributes="bgcolor 
python:['#dddddd',nothing][request.get('zwiki_displaymode',0)=='minimal']">
<tr>

<td align="left" valign="middle" nowrap
tal:condition="python:hasattr(container,'UserOptions')">
<span style="color:gray"><small><em>
<a 
tal:define="current python:request.get('zwiki_displaymode',0)=='full';
            page_url python:here.page_url();
            url python:'UserOptions?setcookies=1&zwiki_displaymode=full&zwiki_showhierarchy=1&redirectURL=' + page_url"
tal:attributes="style python:[nothing,'font-weight:bold'][current];
                href url"
href="UserOptions?setcookies=1&zwiki_displaymode=full&zwiki_showhierarchy=1&redirectURL=page_url" 
title="show all features" accesskey="f"><b><u>f</u></b>ull</a>
<a 
tal:define="current python:request.get('zwiki_displaymode','simple')=='simple';
            page_url python:here.page_url();
            url python:'UserOptions?setcookies=1&zwiki_displaymode=simple&zwiki_showhierarchy=&redirectURL=' + page_url"
tal:attributes="style python:[nothing,'font-weight:bold'][current];
                href url"
href="UserOptions?setcookies=1&zwiki_displaymode=simple&zwiki_showhierarchy=&redirectURL=page_url" 
title="show basic features (no page hierarchy)" accesskey="i">s<b><u>i</u></b>mple</a>
<a 
tal:define="current python:request.get('zwiki_displaymode',0)=='minimal';
            page_url python:here.page_url();
            url python:'UserOptions?setcookies=1&zwiki_displaymode=minimal&zwiki_showhierarchy=&redirectURL=' + page_url"
tal:attributes="style python:[nothing,'font-weight:bold'][current];
                href url"
href="UserOptions?setcookies=1&zwiki_displaymode=minimal&zwiki_showhierarchy=&redirectURL=page_url" 
title="hide all non-essential features" accesskey="m"><b><u>m</u></b>inimal</a>
</em></small></span>
</td>

<td align="left" valign="middle"
tal:condition="not:python:hasattr(container,'UserOptions')">
&nbsp;
</td>

<td align="center" valign="middle"
tal:define="bmarks request/zwiki_bookmarks|string:UserOptions RecentChanges">
<small><em>
&nbsp;
<span style="color:gray"
tal:content="structure python:here.wikilink(bmarks)"
tal:on-error="string:user's bookmarks">
user's bookmarks or UserOptions RecentChanges
</span>
&nbsp;
</em></small>
</td>

<td align="right" valign="middle" nowrap>
<small><em><span style="color:gray">
<a 
tal:condition="python:hasattr(container,'HelpPage')"
href="HelpPage" title="go to HelpPage" accesskey="h"
><b><u>h</u></b>elp</a>
<a 
tal:condition="python:here.isMailoutEnabled()"
tal:attributes="href python:here.page_url() + '/subscribeform'"
href="page_url/subscribeform" 
title="configure email subscription to this page or site" accesskey="u"
>s<b><u>u</u></b>bscribe</a>
<span
tal:condition="python:user.has_permission('Zwiki: Edit pages',here)"
>
<a 
tal:attributes="
  href python:here.page_url() + '/editform';
  title python:'edit this page (' + here.linkTitle() + ')'"
href="page_url/editform" 
title="edit this page (last edited n days ago by so-and-so)" 
accesskey="e"
><b><u>e</u></b>dit</a>
<a 
tal:condition="python:
  hasattr(root.misc_,'ExternalEditor') and
  user.has_permission('Use external editor',here)"
tal:attributes="href python:
  here.wiki_url() + '/externalEdit_/' +
  modules['Products.PythonScripts.standard'].url_quote(here.id())"
href="wiki_url/externalEdit_/id" title="edit using external editor" 
accesskey="x"
><img src="/misc_/ExternalEditor/edit_icon" hspace="2" align="middle" 
border="0" alt="(external edit)"/></a>
</span>
</span></em></small>
</td>

</tr>
</table>

<table width="100%" border="0" cellspacing="0" cellpadding="0"
tal:condition="not:python:request.get('zwiki_displaymode',0) == 'minimal'">

<tr tal:condition="python:
user.has_permission('Zwiki: Add comments to pages',here)">
<td align="right" colspan="2">
<!-- comment form -->
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td align="center" bgcolor="#dddddd">
<textarea 
tal:attributes="cols python:request.get('zwiki_width','') or 60"
wrap="virtual" name="text" rows=3 cols=60 
style="width:100%; background-color:#f0f0f0" 
title="enter comments here & click add; or, click edit" accesskey="c">
</textarea>
</td>
</tr>
</table>
</td>
</tr>

<tr
tal:condition="python:
user.has_permission('Zwiki: Add comments to pages',here)">
<td align="left" valign="top" width="20%" nowrap>
&nbsp;
</td>
<td align="right" valign="top" width="80%">
<small><span style="color:gray">
with heading 
<input 
tal:attributes="checked python:
  [nothing,1][here.getId()[-10:]=='Discussion' or 
              here.getId()[:7]=='IssueNo']"
type=checkbox name="use_heading" value="1" style="background-color:#f0f0f0"
title="post with a comment heading ?"
></span></small>
<input type="submit" name="comment:method" value=" add a comment " 
style="font-weight:bold">
</td>
</tr>

</table>

<!-- page management panel -->
<table width="100%" border="0" cellspacing="0" cellpadding="0"
tal:condition="python:
  request.get('zwiki_displaymode',0) == 'full'
  and (user.has_permission('Zwiki: Rename pages',here) or
       user.has_permission('Zwiki: Delete pages',here))
  and (user.has_role('Authenticated') or request.get('zwiki_username',''))
">
<tr>
<td align="left" valign="top" nowrap>
<small><span style="color:gray">
manage this page:
</span></small>
<br>
<input 
tal:attributes="value python:here.title_or_id()"
name="pagename" type="text" size="30" maxlength="100" value="" 
style="background-color:#f0f0f0"
title="enter a new name or new parent for the current page"
><INPUT TYPE="submit" NAME="rename:method" VALUE="rename" 
style="font-weight:normal" 
title="rename the current page to the name you have entered"
tal:condition="python:
  user.has_permission('Zwiki: Rename pages',here)">
<INPUT TYPE="submit" NAME="reparent:method" VALUE="reparent" 
style="font-weight:normal"
title="reparent the current page under the page you have entered"
tal:condition="python:
  user.has_permission('Zwiki: Reparent pages',here)">
<INPUT TYPE="submit" NAME="delete:method" VALUE="delete page" 
style="font-weight:normal"
title="delete the current page"
tal:condition="python:
  user.has_permission('Zwiki: Delete pages',here)">
<br>
<span style="color:gray"
tal:condition="python:
  user.has_permission('Zwiki: Rename pages',here)">
<small>
change all links 
<input type="checkbox" name="updatebacklinks" value="1" 
style="background-color:#f0f0f0" 
title="when renaming: replace OldName with NewName throughout the wiki. Caution!">
<br>
leave placeholder 
<input type="checkbox" name="leaveplaceholder" value="1" 
style="background-color:#f0f0f0"
title="when renaming: leave behind a page which links to the new one">
</small>
</span>
</td>
</tr>
</table>

</form>
</div>
</body>
</html>



From sidnei at x3ng.com.br  Mon Jan 27 13:24:38 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:10 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/zopeorg_products - zsp_edit.py:1.2 zsp_edit_form.pt:1.2 zsp_view.pt:1.2
Message-ID: <200301271824.h0RIOcc12440@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/zopeorg_products
In directory cvs.zope.org:/tmp/cvs-serv12380/skins/zopeorg_products

Modified Files:
	zsp_edit.py zsp_edit_form.pt zsp_view.pt 
Log Message:
Improving ZSP. Adding Migration. Small CSS Cleanup

=== Products/ZopeOrg-NV/skins/zopeorg_products/zsp_edit.py 1.1 => 1.2 ===
 ##bind namespace=
 ##bind script=script
 ##bind subpath=traverse_subpath
-##parameters=company, summary, location, text_format, logo, external_url, contact_name, contact_email, voice, fax, service_info, service_info_file, SafetyBelt
+##parameters=company, summary, location, text_format, logo, external_url, contact_info=None, phone_info=None, service_info, service_info_file, SafetyBelt
 ##title=
 ##
 context.setCompany(company)
@@ -12,10 +12,8 @@
 context.setLocation(location)
 context.setLogo(logo)
 context.setExternalURL(external_url)
-context.setContactName(contact_name)
-context.setContactEmail(contact_email)
-context.setVoice(voice)
-context.setFax(fax)
+context.setContactInfo(contact_info)
+context.setPhoneInfo(phone_info)
 context.setServiceInfo(text_format, service_info, service_info_file, SafetyBelt)
 
 context.REQUEST.RESPONSE.redirect(context.REQUEST.URL1 +


=== Products/ZopeOrg-NV/skins/zopeorg_products/zsp_edit_form.pt 1.1 => 1.2 ===
     <input type="hidden" name="SafetyBelt"
            tal:attributes="value here/SafetyBelt">
     <table>
-      <tr><th>Company</th><td>
-	<input type="text" name="company:text" size="50" value=""
-	       tal:attributes="value here/Company"></td></tr>
-      <tr><th>Summary</th>
-          <td><textarea name="summary:text" rows="5" cols="80"
-                    tal:content="here/Summary">edit me!</textarea>
-         </td>
+      <tr>
+	<th>
+	  Company
+	</th>
+	<td>
+	  <input type="text" name="company:text" size="50" value=""
+	  tal:attributes="value here/Company">
+	</td>
       </tr>
-      <tr><th>Logo</th><td>
-	<input type="text" name="logo:text" size="50" value=""
-	       tal:attributes="value here/Logo"></td></tr>
-      <tr><th>External URL</th><td>
-	<input type="text" name="external_url:text" size="50" value=""
-	       tal:attributes="value here/ExternalURL"></td></tr>
-      <tr><th>Location</th><td>
-	<input type="text" name="location:text" size="50" value=""
-	       tal:attributes="value here/Location"></td></tr>
-      <tr><th>Contact Name</th><td>
-	<input type="text" name="contact_name:text" size="50" value=""
-	       tal:attributes="value here/ContactName"></td></tr>
-      <tr><th>Contact Email</th><td>
-	<input type="text" name="contact_email:text" size="50" value=""
-	       tal:attributes="value here/ContactEmail"></td></tr>
-      <tr><th>Voice</th><td>
-	<input type="text" name="voice:text" size="50" value=""
-	       tal:attributes="value here/Voice"></td></tr>
-      <tr><th>Fax</th><td>
-	<input type="text" name="fax:text" size="50" value=""
-	       tal:attributes="value here/Fax"></td></tr>
-      <tr><th>Format</th>
-          <td><input type="radio" name="text_format"
+      <tr>
+	<th>
+	  Summary
+	</th>
+	<td>
+	  <textarea name="summary:text" rows="5" cols="80"
+	  tal:content="here/Summary">edit me!</textarea>
+	</td>
+      </tr>
+      <tr>
+	<th>
+	  Logo
+	</th>
+	<td>
+	  <input type="text" name="logo:text" size="50" value=""
+	  tal:attributes="value here/Logo">
+	</td>
+      </tr>
+      <tr>
+	<th>
+	  External URL
+	</th>
+	<td>
+	  <input type="text" name="external_url:text" size="50" value=""
+	  tal:attributes="value here/ExternalURL">
+	</td>
+      </tr>
+      <tr>
+	<th>
+	  Location
+	</th>
+	<td>
+	  <input type="text" name="location:text" size="50" value=""
+	  tal:attributes="value here/Location">
+	</td>
+      </tr>
+      <tr>
+	<th>
+	  Contact Info
+	</th>
+	<td>
+	  <table>
+	  <tal:block repeat="info here/ContactInfo">
+	    <tr>
+	      <td class="label">Name</td>
+	      <td>
+		<input type="text" name="contact_info.name:text:records"
+		size="30" value=""
+		tal:attributes="value info/name">
+	      </td>
+	    </tr>
+	    <tr>
+	      <td class="label">
+		Email
+	      </td>
+	      <td>
+		<input type="text" name="contact_info.email:text:records"
+		size="30" value=""
+		tal:attributes="value info/email">
+	      </td>
+	    </tr>
+	    <tr>
+	      <td class="label">
+		Info
+	      </td>
+	      <td>
+		<input type="text" name="contact_info.info:text:records"
+		size="30" value=""
+		tal:attributes="value info/info">
+	      </td>
+	    </tr>
+	    <tr><td></td><td><hr width="200px" /></td></tr>
+	</tal:block>
+	    <tr>
+	      <td class="label">
+		Name
+		</td>
+		<td>
+		  <input type="text" name="contact_info.name:text:records"
+		  size="30" value="">
+		</td>
+	      </tr>
+	      <tr>
+		<td class="label">
+		  Email
+		</td>
+		<td>
+		  <input type="text" name="contact_info.email:text:records"
+		  size="30" value="">
+		</td>
+	      </tr>
+	      <tr>
+		<td class="label">
+		  Info
+		</td>
+		<td>
+		  <input type="text" name="contact_info.info:text:records"
+		  size="30" value="">
+		</td>
+	      </tr>
+	    </table>
+
+	  </td>
+	</tr>
+	<tr>
+	  <th>
+	    Phone Info
+	  </th>
+	  <td>
+	    <table>
+	      <tal:block repeat="info here/PhoneInfo">
+	      <tr>
+		<td class="label">Phone</td>
+		<td>
+		  <input type="text" name="phone_info.phone:text:records"
+		  size="15" value=""
+		  tal:attributes="value info/phone">
+		</td>
+		<td class="label">
+		  Info
+		</td>
+		<td>
+		  <input type="text" name="phone_info.info:text:records"
+		  size="15" value=""
+		  tal:attributes="value info/info">
+		</td>
+	      </tr>
+	      </tal:block>
+	      <tr>
+		<td class="label">
+		  Phone
+		</td>
+		<td>
+		  <input type="text" name="phone_info.phone:text:records"
+		  size="15" value="">
+		</td>
+		<td class="label">
+		  Info
+		</td>
+		<td>
+		  <input type="text" name="phone_info.info:text:records"
+		  size="15" value="">
+		</td>
+	      </tr>
+	    </table>
+
+	</td>
+    </tr>
+
+    <tr>
+      <th>Format</th>
+      <td><input type="radio" name="text_format"
                      value="structured-text"
                      tal:attributes="checked python: path('here/text_format') == 'structured-text'" />
 	      <label for="cb_structuredtext">structured-text</label>


=== Products/ZopeOrg-NV/skins/zopeorg_products/zsp_view.pt 1.1 => 1.2 ===
     <p tal:condition="here/Summary"
        tal:content="here/Summary">Summary</p>
 
-    <ul tal:condition="here/ContactName|here/ContactEmail|here/Voice|here/Fax">
-      <li tal:condition="here/ContactName">
-        <b> Contact Name: </b><span tal:replace="here/ContactName"/>
+    <h1 tal:condition="here/ContactInfo|here/PhoneInfo|nothing">Contact</h1>
+
+    <ul tal:condition="here/ContactInfo|here/PhoneInfo|nothing">
+      <li tal:condition="here/ContactInfo" tal:repeat="info here/ContactInfo">
+        <a href="#" tal:attributes="href string:mailto:${info/email}"
+           tal:omit-tag="not:info/email">
+          <span tal:replace="info/name"/>
+          <span tal:condition="info/email"
+                tal:replace="string:<${info/email}>"/>
+        </a>
+        <span tal:condition="info/info"
+              tal:replace="info/info" />
+
       </li>
-      <li tal:condition="here/ContactEmail">
-        <b> Contact Email: </b><span tal:replace="here/ContactEmail"/>
-      </li>
-      <li tal:condition="here/Voice">
-         <b> Voice: </b><span tal:replace="here/Voice"/>
-      </li>
-      <li tal:condition="here/Fax">
-         <b> Fax: </b><span tal:replace="here/Fax"/>
+
+      <li tal:condition="here/PhoneInfo" tal:repeat="info here/PhoneInfo">
+          <span tal:replace="info/phone"/>
+          <span tal:condition="info/info"
+                tal:replace="string: - ${info/info}"/>
       </li>
+
     </ul>
       
     <h1 tal:condition="here/ServiceInfo">Service Info</h1>



From sidnei at x3ng.com.br  Mon Jan 27 13:25:05 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:10 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/nzo - nzo.css.dtml:1.5
Message-ID: <200301271825.h0RIP5912506@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/nzo
In directory cvs.zope.org:/tmp/cvs-serv12380/skins/nzo

Modified Files:
	nzo.css.dtml 
Log Message:
Improving ZSP. Adding Migration. Small CSS Cleanup

=== Products/ZopeOrg-NV/skins/nzo/nzo.css.dtml 1.4 => 1.5 ===
 table.detail {
   border: black dotted 1px;
   width: 200px;
-  background: #8cacbb;
+  background: #aabbcc;
 }
 
 a {
@@ -174,7 +174,6 @@
 input {
     font: 100% Verdana, Helvetica, Arial, sans-serif;
     color: Black;
-    background-color: white;
     vertical-align: middle;
     margin-bottom: 1px; /* IE bug fix */
     padding: 0.1em;



From sidnei at x3ng.com.br  Mon Jan 27 13:25:03 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:10 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV - ZopeServiceProvider.py:1.4
Message-ID: <200301271825.h0RIP3a12494@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV
In directory cvs.zope.org:/tmp/cvs-serv12380

Modified Files:
	ZopeServiceProvider.py 
Log Message:
Improving ZSP. Adding Migration. Small CSS Cleanup

=== Products/ZopeOrg-NV/ZopeServiceProvider.py 1.3 => 1.4 ===
     _location = ''
     _logo = ''
     _company_url = ''
-    _contact_name = ''
-    _contact_email = ''
+    _contact_info = None
     _external_url = ''
-    _fax = ''
-    _voice = ''
+    _phone_info = None
     _stx_level = 2
 
     def __init__(self, id, title='', description='', text_format='', text=''):
@@ -108,37 +106,36 @@
     def setLogo(self, logo):
         self._logo = logo
 
-    security.declareProtected(View, 'ContactName')
-    def ContactName(self):
-        return self._contact_name
-
-    security.declareProtected(ModifyPortalContent, 'setContactName')
-    def setContactName(self, contact_name):
-        self._contact_name = contact_name
-
-    security.declareProtected(View, 'ContactEmail')
-    def ContactEmail(self):
-        return self._contact_email
-
-    security.declareProtected(ModifyPortalContent, 'setContactEmail')
-    def setContactEmail(self, contact_email):
-        self._contact_email = contact_email
-
-    security.declareProtected(View, 'Voice')
-    def Voice(self):
-        return self._voice
-
-    security.declareProtected(ModifyPortalContent, 'setVoice')
-    def setVoice(self, voice):
-        self._voice = voice
-
-    security.declareProtected(View, 'Fax')
-    def Fax(self):
-        return self._fax
-
-    security.declareProtected(ModifyPortalContent, 'setFax')
-    def setFax(self, fax):
-        self._fax = fax
+    security.declareProtected(View, 'ContactInfo')
+    def ContactInfo(self):
+        return self._contact_info or ()
+
+    security.declareProtected(ModifyPortalContent, 'setContactInfo')
+    def setContactInfo(self, contact_info):
+        contacts = []
+        if contact_info is not None:
+            for cinfo in contact_info:
+                email = cinfo['email']
+                name = cinfo['name']
+                info = cinfo['info']
+                if name and email:
+                    contacts.append({'name':name, 'email':email, 'info':info})
+        self._contact_info = contacts
+
+    security.declareProtected(View, 'PhoneInfo')
+    def PhoneInfo(self):
+        return self._phone_info or ()
+
+    security.declareProtected(ModifyPortalContent, 'setPhoneInfo')
+    def setPhoneInfo(self, phone_info):
+        phones = []
+        if phone_info is not None:
+            for pinfo in phone_info:
+                phone = pinfo['phone']
+                info = pinfo['info']
+                if phone:
+                    phones.append({'phone':phone, 'info':info})
+        self._phone_info = phones
 
 InitializeClass(ZopeServiceProvider)
 



From sidnei at x3ng.com.br  Mon Jan 27 13:25:04 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:10 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.9
Message-ID: <200301271825.h0RIP4F12500@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions
In directory cvs.zope.org:/tmp/cvs-serv12380/Extensions

Modified Files:
	NZOMigrate.py 
Log Message:
Improving ZSP. Adding Migration. Small CSS Cleanup

=== Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.8 => 1.9 ===
     alist = dict.keys()
     alist.sort()
     return alist
-            
+
+def migrateZSP(root, obj):
+    entries = obj[0].objectValues('ENTRY')
+    for entry in entries:
+        id = getattr(entry, 'LOGO', entry.getId())
+        if hasattr(aq_base(root), id):
+            logo_id = '%s_logo' % id
+            root.manage_renameObject(id=id, new_id=logo_id)
+        root.invokeFactory(id=id, type_name='Zope Service Provider')
+        new_obj = getattr(root, id, None)
+        if new_obj is None:
+            return
+        new_obj.setCompany(getattr(entry, 'COMPANY', ''))
+        new_obj.setSummary('')
+        new_obj.setExternalURL(getattr(entry, 'URL', ''))
+        new_obj.setLocation(getattr(entry, 'LOCATION', ''))
+        new_obj.setLogo(logo_id)
+        text = [s.INFO for s in entry.objectValues('SERVICE')]
+        text = '\n'.join(text)
+        new_obj.setServiceInfo(text=text, text_format='plain')
+        new_contacts = []
+        contacts = entry.objectValues('CONTACT')
+        for ct in contacts:
+            contact = {}
+            contact['name'] = getattr(ct, 'NAME', '')
+            contact['email'] = getattr(ct, 'EMAIL', '')
+            contact['info'] = getattr(ct, 'INFO', '')            
+            new_contacts.append(contact.copy())
+        new_obj.setContactInfo(new_contacts)
+        new_phones = []
+        phones = entry.objectValues('PHONE')
+        for p in phones:
+            phone = {}
+            phone['phone'] = getattr(p, 'NUMBER', '')
+            phone['info'] = getattr(p, 'INFO', '')            
+            new_phones.append(phone.copy())
+        new_obj.setPhoneInfo(new_phones)
+    return new_obj
+    
 class Transmutator:
 
     def __init__(self, source, dest, ignore_path, type_map, level=0):
@@ -249,7 +287,9 @@
         return None
 
     def XMLDocument2XMLDocument(self, obj, source, dest):
-        self.log('Ignoring XML Document for now.\n')
+        id = obj.getId()
+        if id == 'zsp.xml':
+            return migrateZSP(dest, obj)
         return None
 
     def BackTalkBook2CMFBackTalkBook(self, obj, source, dest):
@@ -395,9 +435,11 @@
             dest.invokeFactory(id=obj.getId(), type_name="Folder")
             dest.setTitle(obj.title)
         except: pass
-        new = getattr(aq_base(dest), obj.getId(), None)
-        if new is not None and hasattr(aq_base(new), 'objectValues'):
-            return new.__of__(dest)
+        if not hasattr(aq_base(dest), obj.getId()):
+            return None
+        new = getattr(dest, obj.getId())
+        if hasattr(aq_base(new), 'objectValues'):
+            return new
         return None
 
     def BTreeFolder2CMFBTreeFolder(self, obj, source, dest):
@@ -507,7 +549,11 @@
                 oids.remove('acl_users')
                 oids.insert(0, 'acl_users')
             for oid in oids:
-                obj = getattr(source, oid)
+                obj = getattr(source, oid, None)
+                if obj is None:
+                    self.log('Oid %s in objectIds but object ' % oid +\
+                              ' not found in %s.\n' % '/'.join(path))
+                    continue
                 try:
                     # We may want to catch POSKeyErrors early,
                     # so lets prod the object and see what happens
@@ -531,7 +577,7 @@
                     res = []
                     res = _cleanupOwnership(new_obj, res, 0)
                     if res != []:
-                        self.log('\n'.join(res))
+                        self.log('\n'.join(res) + '\n')
                     new_obj = self.fixModificationDate(obj, new_obj)
 
                     ct = getToolByName(new_obj, 'portal_catalog', None)



From sidnei at x3ng.com.br  Tue Jan 28 20:54:05 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:10 2008
Subject: [zopeorg-checkins] CVS: NZO_SiteLayout - Makefile.zinstance:1.8 Makefile.zope:1.7 cvs.mk:1.11
Message-ID: <200301290154.h0T1s5U17162@cvs.baymountain.com>

Update of /cvs-zopeorg/NZO_SiteLayout
In directory cvs.zope.org:/tmp/cvs-serv17113

Modified Files:
	Makefile.zinstance Makefile.zope cvs.mk 
Log Message:
cleaning up branch/dirname mess
�

=== NZO_SiteLayout/Makefile.zinstance 1.7 => 1.8 ===
 #   cvs.mk for other known checkouts).
 #-----------------------------------------------------------------------
 PYTHON_CHECKOUT=src/Python-2.1.3
-ZOPE_CHECKOUT=src/Zope-2.6-head
-ZEO_CHECKOUT=src/ZEO-2.0-head
-CMF_CHECKOUT=src/CMF-1.3-head
+ZOPE_CHECKOUT=src/Zope-2.6-branch
+ZEO_CHECKOUT=src/ZEO-2.0-ZODB3-3_1-branch
+CMF_CHECKOUT=src/CMF-1.3-branch
 
 include python_targets.mk
 include zope_targets.mk


=== NZO_SiteLayout/Makefile.zope 1.6 => 1.7 ===
 #   cvs.mk for other known checkouts).
 #-----------------------------------------------------------------------
 PYTHON_CHECKOUT=src/Python-2.1.3
-ZOPE_CHECKOUT=src/Zope-2.6-head
-ZEO_CHECKOUT=src/ZEO-2.0-head
-CMF_CHECKOUT=src/CMF-1.3-head
+ZOPE_CHECKOUT=src/Zope-2.6-branch
+ZEO_CHECKOUT=src/ZEO-2.0-ZODB3-3_1-branch
+CMF_CHECKOUT=src/CMF-1.3-branch
 
 include python_targets.mk
 include zope_targets.mk


=== NZO_SiteLayout/cvs.mk 1.10 => 1.11 ===
     CUSTOM_CVS_REPOSITORY=:ext:${CVS_USER}@${CUSTOM_REPO_TAIL}
 endif
 
-PYTHON_CVS_REPOSITORY=:pserver:anonymous@cvs.python.sourceforge.net:/cvsroot/python
+PYTHON_CVS_REPOSITORY=:pserver:anonymous@cvs.sf.net:/cvsroot/python
 ZOPE_CVS_REPOSITORY=:pserver:anonymous@cvs.zope.org:/cvs-repository
 SQUID_CVS_REPOSITORY=:pserver:anoncvs@cvs.squid-cache.org:/squid
 ZOPEORG_CVS_REPOSITORY=:pserver:anonymous@cvs.zope.org:/cvs-zopeorg
@@ -53,17 +53,17 @@
 src/Zope-2.5.0: CVS_MODULE=Zope
 src/Zope-2.5.0: CVS_TAG=-r Zope-2_5_0-src
 
-src/Zope-2.5-head: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
-src/Zope-2.5-head: CVS_MODULE=Zope
-src/Zope-2.5-head: CVS_TAG=-r Zope-2_5-branch
+src/Zope-2.5-branch: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
+src/Zope-2.5-branch: CVS_MODULE=Zope
+src/Zope-2.5-branch: CVS_TAG=-r Zope-2_5-branch
 
 src/Zope-2.6.0: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
 src/Zope-2.6.0: CVS_MODULE=Zope
 src/Zope-2.6.0: CVS_TAG=-r Zope-2_6_0-src
 
-src/Zope-2.6-head: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
-src/Zope-2.6-head: CVS_MODULE=Zope
-src/Zope-2.6-head: CVS_TAG=-r Zope-2_6-branch
+src/Zope-2.6-branch: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
+src/Zope-2.6-branch: CVS_MODULE=Zope
+src/Zope-2.6-branch: CVS_TAG=-r Zope-2_6-branch
 
 
 
@@ -77,9 +77,9 @@
 src/ZEO-1.0-head: CVS_MODULE=ZEO
 src/ZEO-1.0-head: CVS_TAG=-r zeo-1_0-branch
 
-src/ZEO-2.0-head: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
-src/ZEO-2.0-head: CVS_MODULE=ZEO
-src/ZEO-2.0-head: CVS_TAG=-r ZODB3-3_1-branch
+src/ZEO-2.0-ZODB3-3_1-branch: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
+src/ZEO-2.0-ZODB3-3_1-branch: CVS_MODULE=ZEO
+src/ZEO-2.0-ZODB3-3_1-branch: CVS_TAG=-r ZODB3-3_1-branch
 
 src/StandaloneZODB-1.0: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
 src/StandaloneZODB-1.0: CVS_MODULE=StandaloneZODB
@@ -87,13 +87,13 @@
 
 #   CMF versions
 
-src/CMF-1.3: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
-src/CMF-1.3: CVS_MODULE=CMF
-src/CMF-1.3: CVS_TAG=-r CMF-1_3-release
-
-src/CMF-1.3-head: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
-src/CMF-1.3-head: CVS_MODULE=CMF
-src/CMF-1.3-head: CVS_TAG=-r CMF-1_3-branch
+src/CMF-1.3-release: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
+src/CMF-1.3-release: CVS_MODULE=CMF
+src/CMF-1.3-release: CVS_TAG=-r CMF-1_3-release
+
+src/CMF-1.3-branch: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
+src/CMF-1.3-branch: CVS_MODULE=CMF
+src/CMF-1.3-branch: CVS_TAG=-r CMF-1_3-branch
 
 src/CMF-head: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
 src/CMF-head: CVS_MODULE=CMF



From sidnei at x3ng.com.br  Tue Jan 28 21:11:25 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:10 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - setupZopeOrg.py:1.63
Message-ID: <200301290211.h0T2BP819932@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions
In directory cvs.zope.org:/tmp/cvs-serv19765/Extensions

Modified Files:
	setupZopeOrg.py 
Log Message:
Use ZCTextIndex Yay! Reindex after replacing index. Use DCWorkflow -based workflows. Migrate ZSP (Still need to register it on Install)

=== Products/ZopeOrg-NV/Extensions/setupZopeOrg.py 1.62 => 1.63 ===
 from Products.ZopeOrg import zopeorg_globals
 from Products.CMFCore.DirectoryView import addDirectoryViews
 from Products.CMFCore.utils import getToolByName
-from Products.ZopeOrg.NewsItemWorkflow import NewsItemWorkflowDefinition
-from Products.ZopeOrg.ZopeOrgWorkflow import ZopeOrgWorkflowDefinition
 from Products.ZopeOrg.ZopeOrgTypes import ftis
 from Products.CMFCore.PortalFolder import manage_addPortalFolder
 from Products.CMFCore.TypesTool import FactoryTypeInformation
@@ -20,6 +18,7 @@
 from Products.PluginIndexes.DateIndex.DateIndex import DateIndex
 from Products.PluginIndexes.DateRangeIndex.DateRangeIndex import DateRangeIndex
 
+from Products.ZCTextIndex import ZCTextIndex
 from Products.CMFDateIndexes.RSCatalogTool import RSCatalogTool
 from Products.BTreeFolder2.CMFBTreeFolder import manage_addCMFBTreeFolder
 
@@ -66,6 +65,7 @@
               )
 
 SKINS = ( 'nzo',
+          'zopeorg_products'
         )
 
 ADD_INDEXES = ()
@@ -77,8 +77,10 @@
                   , ( 'modified', DateIndex )
                   )
 
-WORKFLOWS = ( ('News Item', NewsItemWorkflowDefinition) 
-            , ('default', ZopeOrgWorkflowDefinition)
+ZCTEXTINDEXES = ( 'Description', 'SearchableText', 'Title' )
+
+WORKFLOWS = (('default', 'zopeorg_default_workflow',
+              'Default Zope.org Workflow'), 
             )
 
 EXT_METHODS = ( { 'id' : 'ZO_setupMembership'
@@ -207,6 +209,7 @@
     catalogAddIndexes(portal, ADD_INDEXES, 'portal_catalog')
     catalogReplaceIndexes(portal, REPLACE_INDEXES, 'portal_catalog')
     catalogAddColumns(portal, ADD_COLUMNS, 'portal_catalog')
+    catalogAddZCTextIndexes(portal, ZCTEXTINDEXES, 'portal_catalog')
         
     # Setting up roles and permissions
     log.append('\n * Setting up roles and permissions')
@@ -278,7 +281,7 @@
     # Run the CMFCalendar install script
     log.append('\n * Executing CMFCalendar install script')
     if 'portal_calendar' in portal.objectIds():
-        portal.manage_delObjects(ids = ['portal_catalog'])
+        portal.manage_delObjects(ids = ['portal_calendar'])
     log_str = portal.installCMFCalendar()
     log_list = string.split(log_str, '\n')
     for i in range(len(log_list)):
@@ -405,16 +408,16 @@
 def registerWorkflow( portal_obj, wf_tuple ):
     """ Insert new zope.org workflows into the workflow tool """
     wf_portaltype = wf_tuple[0]
-    wf_class = wf_tuple[1]
-
+    wf_id = wf_tuple[1]
+    wf_title = wf_tuple[2]
+    
     wf_tool = getToolByName(portal_obj, 'portal_workflow')
-    wf_id = wf_class.id
-    wf_obj = apply(wf_class, (wf_id,))
 
     if wf_id in wf_tool.objectIds():
         wf_tool._delObject(wf_id)
 
-    wf_tool._setObject(wf_id, wf_obj)
+    wf_tool.manage_addWorkflow(id=wf_id,
+                               workflow_type='%s (%s)' % (wf_id, wf_title))
 
     if wf_portaltype == 'default':
         wf_tool.setDefaultChain(wf_id)
@@ -479,8 +482,9 @@
         index_class = index_tuple[1]
  
         try:
-            index_obj = apply( index_class, ( index_name, ) )
-            cat_core.addIndex( index_name, index_obj )
+            index_obj = apply(index_class, (index_name,))
+            cat_core.addIndex(index_name, index_obj)
+            p_cat.reindexIndex(index_name, None)
 
             added.append(index_name)
         except:
@@ -492,6 +496,58 @@
     log.append('   - Retained catalog indexes in %s: %s' %
                             (which_cat, string.join(retained, ', ')))
 
+class Record:
+    pass
+
+def catalogAddZCTextIndexes(portal_obj, index_list, which_cat):
+    """ Add ZCTextIndexes to the portal catalog """
+    p_cat = getattr(portal_obj, which_cat)
+    cat_core = p_cat._catalog
+    replaced = []
+    added = []
+ 
+    existing_indexes = cat_core.indexes
+    elements = []
+
+    el1 = Record()
+    el1.group = "Case Normalizer"
+    el1.name = "Case Normalizer"
+    elements.append(el1)
+
+    el2 = Record()
+    el2.group = "Stop Words"
+    el2.name = " Don't remove stop words"
+    elements.append(el2)
+
+    el3 = Record()
+    el3.group = "Word Splitter"
+    el3.name = "HTML aware splitter"
+    elements.append(el3)
+
+    ZCTextIndex.manage_addLexicon(p_cat, 'lexicon', 'Lexicon', elements)
+    
+    for index_name in index_list:
+        if (existing_indexes.has_key(index_name)):
+            cat_core.delIndex(index_name)
+            replaced.append(index_name)
+        else:
+            added.append(index_name)
+
+        extra = Record()
+        extra.doc_attr = index_name
+        extra.index_type = "Okapi BM25 Rank"
+        extra.lexicon_id = "lexicon"
+
+        p_cat.addIndex(index_name, 'ZCTextIndex', extra)
+        p_cat.reindexIndex(index_name, None)
+            
+    log.append('   - Added new catalog indexes to %s: %s' %
+                            (which_cat, string.join(added, ', ')))
+ 
+    log.append('   - Replaced catalog indexes in %s: %s' %
+                            (which_cat, string.join(replaced, ', ')))
+
+
 
 def catalogReplaceIndexes(portal_obj, index_list, which_cat):
     """ Replace indexes in the portal catalog """
@@ -512,6 +568,7 @@
                 cat_core.delIndex(index_name)
             index_obj = apply( index_class, ( index_name, ) )
             cat_core.addIndex( index_name, index_obj )
+            p_cat.reindexIndex(index_name, None)
             replaced.append(index_name)
  
     log.append('   - Replaced %s indexes' %
@@ -554,6 +611,7 @@
         index_obj = DateRangeIndex('effectiveRange')
         index_obj._edit(since_field='effective', until_field='expires')
         cat_core.addIndex('effectiveRange', index_obj)
+        p_cat.reindexIndex('effectiveRange', None)
 
         log.append('   - Added effectiveRange DateRangeIndex index')
 
@@ -752,7 +810,9 @@
      """
      tt = getToolByName(portal, 'portal_types')
      typesList = tt.listTypeInfo()
-     pdTypes = ['Document', 'Favorite', 'Link', 'News Item', 'File', 'Tip', 'HowTo', 'Software Package', 'Software Release', 'Software Release File']
+     pdTypes = ['Document', 'Favorite', 'Link', 'News Item',
+                'File', 'Tip', 'HowTo', 'Software Package',
+                'Software Release', 'Software Release File']
      for i in typesList:
         new_actions = []
         for dict in i._actions:



From sidnei at x3ng.com.br  Tue Jan 28 23:36:31 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:10 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/plone_nzo - header.pt:1.2
Message-ID: <200301290436.h0T4aVU05784@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/plone_nzo
In directory cvs.zope.org:/tmp/cvs-serv5770/skins/plone_nzo

Modified Files:
	header.pt 
Log Message:
forgot to commit this file

=== Products/ZopeOrg-NV/skins/plone_nzo/header.pt 1.1 => 1.2 ===
     -->
 
     <!-- Main style sheets for CSS2 capable browsers -->
-    <style type="text/css" media="all" tal:content="string: @import url(${here/portal_url}/plone.css?${current_skin});"></style>
+    <style type="text/css" media="all" tal:content="string: @import url(${here/portal_url}/plone.css);"></style>
 
     <!-- Custom style sheet if available -->
     <style type="text/css" media="all" tal:condition="exists: here/ploneCustom.css" tal:content="string:@import url(${here/portal_url}/ploneCustom.css);"></style>
@@ -137,7 +137,7 @@
                      class="logo"
                      tal:attributes="width logo/width;
                                      height logo/height;
-                                     src string:${logo/absolute_url}?skin=$current_skin" />
+                                     src string:${logo/absolute_url}" />
             </a>
         </div>
 



From sidnei at x3ng.com.br  Wed Jan 29 14:17:01 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:10 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - setupZopeOrg.py:1.64
Message-ID: <200301291917.h0TJH1M12014@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions
In directory cvs.zope.org:/tmp/cvs-serv11995/Extensions

Modified Files:
	setupZopeOrg.py 
Log Message:
Ooops. I broke ZSP & Case Studies when added new workflow. Also, a few fixes to allowed_content_types and a bug were objects already created werent getting the right workflow permissions

=== Products/ZopeOrg-NV/Extensions/setupZopeOrg.py 1.63 => 1.64 ===
     log.append('\n * Creating a Members BTreeFolder')
     
     if ( 'Members' in portal.objectIds() and 
-         getattr( portal, 'Members' ).meta_type in ( 'Folder', 'Portal Folder' ) ):
+         getattr( portal, 'Members' ).meta_type in ( 'Folder',
+                                                     'Portal Folder',
+                                                     'Plone Folder') ):
         portal._delObject( 'Members' )
         manage_addCMFBTreeFolder( portal, 'Members', 'Member Folder' )
 
@@ -296,10 +298,9 @@
         log_list[1] = '  - %s' % log_list[i]
     log.extend(log_list)
 
-    log.append('\n * Modifying allowed/filtered types for folderish types')
-    folderish_types=['Wiki Folder', 'Software Package',
-                     'Software Release', 'Member Folder']
-    setupAllowedTypes(portal, folderish_types)
+    #log.append('\n * Modifying allowed/filtered types for folderish types')
+    #folderish_types=[]
+    #setupAllowedTypes(portal, folderish_types)
 
     # Prune the addable types visible in CMF Folders
     log.append( '\n * Pruning addable types in folder add list' )
@@ -428,6 +429,7 @@
                                       )
         log.append('   - Inserted workflow "%s" for type "%s"' % (wf_id, 
                                                                   wf_portaltype))
+    wf_tool.updateRoleMappings()
 
 
 def setupRolesAndPermissions(portal_obj):