display fax and website

src/collective/contact/core/browser/contact.py

@@ -36,7 +36,7 @@ class Contact(BaseView):
         self.person = person
         self.fullname = person.Title()
         self.title = held_position.Title()
-        
+
         if IBirthday.providedBy(person):
             birthday = person.birthday
             if birthday is not None:
@@ -57,7 +57,9 @@ class Contact(BaseView):
         self.email = contact_details['email']
         self.phone = contact_details['phone']
         self.cell_phone = contact_details['cell_phone']
+        self.fax = contact_details['fax']
         self.im_handle = contact_details['im_handle']
+        self.website = contact_details['website']
         self.address = contact_details['address']
 
         # also show fields that were added TTW

src/collective/contact/core/browser/organization.py

@@ -63,7 +63,9 @@ class Organization(BaseView):
         self.email = contact_details['email']
         self.phone = contact_details['phone']
         self.cell_phone = contact_details['cell_phone']
+        self.fax = contact_details['fax']
         self.im_handle = contact_details['im_handle']
+        self.website = contact_details['website']
         self.address = contact_details['address']
 
         # also show fields that were added TTW

src/collective/contact/core/browser/person.py

@@ -43,8 +43,10 @@ class Person(BaseView):
         contact_details = contactable.get_contact_details()
         self.email = contact_details['email']
         self.phone = contact_details['phone']
+        self.fax = contact_details['fax']
         self.cell_phone = contact_details['cell_phone']
         self.im_handle = contact_details['im_handle']
+        self.website = contact_details['website']
         self.address = contact_details['address']
 
         # also show fields that were added TTW

src/collective/contact/core/browser/position.py

@@ -28,8 +28,10 @@ class Position(BaseView):
         self.email = contact_details['email']
         self.phone = contact_details['phone']
         self.cell_phone = contact_details['cell_phone']
+        self.fax = contact_details['fax']
         self.im_handle = contact_details['im_handle']
         self.address = contact_details['address']
+        self.website = contact_details['website']
 
         # also show fields that were added TTW
         self.ttw_fields = get_ttw_fields(position)

src/collective/contact/core/browser/templates/contact.pt

@@ -69,12 +69,24 @@
               i18n:translate="" />
     </div>
 
+    <div class="field" tal:condition="view/fax">
+        <label><tal:block i18n:translate="">Fax number</tal:block>:</label>
+        <span tal:content="view/fax"
+              i18n:translate="" />
+    </div>
+
     <div class="field" tal:condition="view/im_handle">
         <label><tal:block i18n:translate="">IM handle</tal:block>:</label>
         <span tal:content="view/im_handle"
               i18n:translate="" />
     </div>
 
+    <div class="field" tal:condition="view/website">
+        <label><tal:block i18n:translate="">Website</tal:block>:</label>
+        <a tal:content="view/website"
+           tal:attributes="href view/website" />
+    </div>
+
 	<div id="address"
          tal:replace="structure view/render_address" />
 

src/collective/contact/core/browser/templates/organization.pt

@@ -43,12 +43,24 @@
               i18n:translate="" />
     </div>
 
+    <div class="field" tal:condition="view/fax">
+        <label><tal:block i18n:translate="">Fax number</tal:block>:</label>
+        <span tal:content="view/fax"
+              i18n:translate="" />
+    </div>
+
     <div class="field" tal:condition="view/im_handle">
         <label><tal:block i18n:translate="">IM handle</tal:block>:</label>
         <span tal:content="view/im_handle"
               i18n:translate="" />
     </div>
 
+    <div class="field" tal:condition="view/website">
+        <label><tal:block i18n:translate="">Website</tal:block>:</label>
+        <a tal:content="view/website"
+           tal:attributes="href view/website" />
+    </div>
+
     <div id="address"
          tal:replace="structure view/render_address" />
 

src/collective/contact/core/browser/templates/person.pt

@@ -35,12 +35,24 @@
               i18n:translate="" />
     </div>
 
+    <div class="field" tal:condition="view/fax">
+        <label><tal:block i18n:translate="">Fax number</tal:block>:</label>
+        <span tal:content="view/fax"
+              i18n:translate="" />
+    </div>
+
     <div class="field" tal:condition="view/im_handle">
         <label><tal:block i18n:translate="">IM handle</tal:block>:</label>
         <span tal:content="view/im_handle"
               i18n:translate="" />
     </div>
 
+    <div class="field" tal:condition="view/website">
+        <label><tal:block i18n:translate="">Website</tal:block>:</label>
+        <a tal:content="view/website"
+           tal:attributes="href view/website" />
+    </div>
+
     <div id="address"
          tal:replace="structure view/render_address" />
 

src/collective/contact/core/browser/templates/position.pt

@@ -43,12 +43,24 @@
               i18n:translate="" />
     </div>
 
+    <div class="field" tal:condition="view/fax">
+        <label><tal:block i18n:translate="">Fax number</tal:block>:</label>
+        <span tal:content="view/fax"
+              i18n:translate="" />
+    </div>
+
     <div class="field" tal:condition="view/im_handle">
         <label><tal:block i18n:translate="">IM handle</tal:block>:</label>
         <span tal:content="view/im_handle"
               i18n:translate="" />
     </div>
 
+    <div class="field" tal:condition="view/website">
+        <label><tal:block i18n:translate="">Website</tal:block>:</label>
+        <a tal:content="view/website"
+           tal:attributes="href view/website" />
+    </div>
+
     <div id="address"
          tal:replace="structure view/render_address" />