[silvatheme.renaissance][Emiliano D'Alterio] Removed contact for...

author:    Emiliano D'Alterio
date:      Wed Oct 09 14:39:17 2013 +0200
revision:  359:b1fc805133e3 in silvatheme.renaissance
branch:    2.4
details:   https://hg.infrae.com/silvatheme.renaissance?cmd=changeset;node=b1fc805133e3
modified:  setup.py src/silvatheme/renaissance/renaissance.py src/silvatheme/renaissance/renaissance_templates/layout.cpt src/silvatheme/renaissance/renaissance_templates/sidebar.cpt
added:     
removed:   
log:       Removed contact form (it's now in a standalone package). Added call
	to contact form provider in the sidebar template.


diffstat:

 setup.py                                                     |   1 +
 src/silvatheme/renaissance/renaissance.py                    |  70 +-----------
 src/silvatheme/renaissance/renaissance_templates/layout.cpt  |   3 -
 src/silvatheme/renaissance/renaissance_templates/sidebar.cpt |   3 +
 4 files changed, 5 insertions(+), 72 deletions(-)

diffs (138 lines):

diff -r ccdb76ebe37e -r b1fc805133e3 setup.py
--- a/setup.py	Wed Oct 02 09:48:16 2013 +0200
+++ b/setup.py	Wed Oct 09 14:39:17 2013 +0200
@@ -35,6 +35,7 @@
         'silva.core.conf',
         'silva.app.news',
         'silvatheme.infraecommon',
+        'silva.infrae.contact',
         'zope.interface',
         'zope.component',
         'zope.cachedescriptors',
diff -r ccdb76ebe37e -r b1fc805133e3 src/silvatheme/renaissance/renaissance.py
--- a/src/silvatheme/renaissance/renaissance.py	Wed Oct 02 09:48:16 2013 +0200
+++ b/src/silvatheme/renaissance/renaissance.py	Wed Oct 09 14:39:17 2013 +0200
@@ -2,11 +2,6 @@
 # Copyright (c) 2002-2010 Infrae. All rights reserved.
 # $Id$
 
-from zeam.form import silva as silvaforms
-
-from zope import interface, schema
-from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
-from z3c.schema.email import RFC822MailAddress
 
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
@@ -14,8 +9,6 @@
 
 from AccessControl import getSecurityManager
 
-from Products.Silva.mail import sendmail
-
 from zope.cachedescriptors.property import Lazy
 from zope.component import getUtility, queryMultiAdapter
 from zope.interface import Interface, alsoProvides
@@ -23,7 +16,7 @@
 
 from silva.core import conf as silvaconf
 from silva.core.interfaces import IContainer, IRoot, IFeedEntryProvider
-from silva.core.interfaces import IGhost, IViewableObject
+from silva.core.interfaces import IGhost
 from silva.core.layout.interfaces import ISilvaSkin
 from silva.core.layout.porto import porto
 from silva.core.layout.porto.interfaces import IPorto
@@ -51,8 +44,6 @@
     silvaconf.resource(jquery)
     silvaconf.resource('renaissance.css')
     silvaconf.resource('content.css')
-    silvaconf.resource('contact.css')
-    silvaconf.resource('js/contact.js')
 
 
 class IRenaissanceSkin(IRenaissance, ISilvaSkin):
@@ -311,62 +302,3 @@
 
 class Favicon(porto.Favicon):
     grok.template('favicon')
-
-
-## Choices available for the subject in the contact form
-subjects = SimpleVocabulary([
-    SimpleTerm(value='Support Request', token='support',
-               title=u'Professional Support'),
-    SimpleTerm(value='Training Request', token='training',
-               title=u'Technical Training'),
-    SimpleTerm(value='Question', token='question',
-               title=u'Ask us a question'),
-    SimpleTerm(value='Feedback', token='feedback',
-               title=u'Give us your feedback'), ])
-
-
-class IContactFormFields(interface.Interface):
-    """Fields present in the contact form.
-    """
-    name = schema.TextLine(
-        title=u'Full Name', required=True)
-    company = schema.TextLine(
-        title=u'Company', required=False)
-    email = RFC822MailAddress(
-        title=u'Email', required=True)
-    phone = schema.TextLine(
-        title=u'Phone', required=False)
-    subject = schema.Choice(
-        title=u'Message subject', source=subjects, required=False)
-    message = schema.Text(
-        title=u'Message', required=True)
-
-
-class ContactForm(silvaforms.PublicContentProviderForm):
-    """The contact form.
-    """
-    grok.name('contactform')
-    grok.context(IViewableObject)
-
-    label = u'Contact us'
-    description = u"""You can contact us using this form.
-                      Click outside this box to exit."""
-    fields = silvaforms.Fields(IContactFormFields)
-
-    @silvaforms.action(u"Send", identifier='contact', accesskey='c')
-    def contact(self):
-        data, errors = self.extractData()
-        if errors:
-            self.status = u'There are errors, please check again.'
-            return silvaforms.FAILURE
-
-        msg = u'%s\n\n %s\n %s\n %s\n' % (data['message'], data['name'],
-                                          data['phone'], data['company'])
-
-        sub = u'%s from %s' % (data['subject'], data['name'])
-
-        sendmail(self.context, msg, mto='[email protected]',
-                 mfrom=data['email'], subject=sub)
-
-        self.status = u'Thank you for interest.'
-        return silvaforms.SUCCESS
diff -r ccdb76ebe37e -r b1fc805133e3 src/silvatheme/renaissance/renaissance_templates/layout.cpt
--- a/src/silvatheme/renaissance/renaissance_templates/layout.cpt	Wed Oct 02 09:48:16 2013 +0200
+++ b/src/silvatheme/renaissance/renaissance_templates/layout.cpt	Wed Oct 09 14:39:17 2013 +0200
@@ -5,6 +5,3 @@
 <tal:forcenewline>
 </tal:forcenewline>
 <tal:footer tal:replace="structure provider:footer" />
-<tal:contactform>
-  <div id="contact-popup" tal:content="structure provider:contactform" style="display:none"></div>
-</tal:contactform>
\ No newline at end of file
diff -r ccdb76ebe37e -r b1fc805133e3 src/silvatheme/renaissance/renaissance_templates/sidebar.cpt
--- a/src/silvatheme/renaissance/renaissance_templates/sidebar.cpt	Wed Oct 02 09:48:16 2013 +0200
+++ b/src/silvatheme/renaissance/renaissance_templates/sidebar.cpt	Wed Oct 09 14:39:17 2013 +0200
@@ -51,4 +51,7 @@
       embed supplementary info
     </tal:facet>
   </section>
+  <section>
+      <tal:contactform tal:replace="structure provider:contactform" />
+  </section>
 </aside>