[zopeorg-checkins] CVS: Products/ZopeOrg-NV - ZopeServiceProvider.py:1.4

[Sidnei da Silva]

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)