upgrate contact-us to 2.1

maxicecilia · Apr 29, 2015 · 13fa9de · 13fa9de
1 parent 40b17d2
commit 13fa9de
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 9 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 -e git://github.com/maxicecilia/django_site_news.git@7d320097cedec159e396ad3d223b3919d6449c3e#egg=django_site_news-0.1.1
--e git://github.com/maxicecilia/django_contact_us.git@ac1af583bd790f323af27a0e42b27a55e8a04398#egg=django_contact_us
+-e git://github.com/maxicecilia/django_contact_us.git@2.1#egg=django_contact_us
 argparse==1.2.1
 django-bootstrap3==5.1.1
 django-dropbox==0.0.2

diff --git a/simple_classroom/settings/base.py b/simple_classroom/settings/base.py
@@ -156,6 +156,6 @@
 TINYMCE_SPELLCHECKER = False
 TINYMCE_COMPRESSOR = True
 
-CONTACT_US_FORM = {
-    'recipient_list': ['[email protected]', ]
-}
+# Contact-us settings
+CONTACT_US_RECIPIENTS_LIST = ['[email protected]', ]
+CONTACT_US_FORM_STYLE = 'simple'
diff --git a/simple_classroom/static/js/main.js b/simple_classroom/static/js/main.js
@@ -3,3 +3,17 @@
 $('.scroll-top').click(function(){
   $('body,html').animate({scrollTop:0},1000);
 })
+
+function getUrlParameter(sParam)
+{
+    var sPageURL = window.location.search.substring(1);
+    var sURLVariables = sPageURL.split('&');
+    for (var i = 0; i < sURLVariables.length; i++) 
+    {
+        var sParameterName = sURLVariables[i].split('=');
+        if (sParameterName[0] == sParam) 
+        {
+            return sParameterName[1];
+        }
+    }
+}     
diff --git a/simple_classroom/templates/contact_us/contact_form.html b/simple_classroom/templates/contact_us/contact_form.html
@@ -10,9 +10,10 @@ <h2>Opiniones</h2>
         <p>Los campos de email y nombre son opcionales.</p>
     </div>
     <div class="col-md-6 col-md-offset-2">
-        <form action="{% url "contact_us" %}" method="POST">
+        <form id="contact-us-form" action="{% url "contact_us" site %}" method="POST">
             {% csrf_token %}
             {% bootstrap_form form %}
+            <input type="hidden" id="next" name="next" value="" />
             {% buttons %}
                 <button type="submit" class="btn btn-default">
                     {% bootstrap_icon "send" %} Enviar
@@ -28,3 +29,11 @@ <h4>Muchas gracias por su comentario.</h4>
     {% endif %}
 </div>
 {% endblock %}
+
+{% block extra_js %}
+<script type="text/javascript">
+    $(document).ready(function() {
+        $('#next').val(getUrlParameter('next'));
+    });
+</script>
+{% endblock %}
diff --git a/simple_classroom/templates/core/base.html b/simple_classroom/templates/core/base.html
@@ -53,8 +53,8 @@
   <div id="footer">
     <div class="container">
       <p>
-        <a target="_blank" href="https://www.facebook.com/groups/539109899467734/"><img src="{% static "img/fb_social_32.png" %}" alt="facebook"></a>  
-        <a target="_blank" href="https://twitter.com/arqcomUNT"><img src="{% static "img/twitter_social_32.png" %}" alt="twitter"></a>            
+        <a target="_blank" href="https://www.facebook.com/groups/539109899467734/"><img src="{% static "img/fb_social_32.png" %}" alt="facebook"></a>
+        <a target="_blank" href="https://twitter.com/arqcomUNT"><img src="{% static "img/twitter_social_32.png" %}" alt="twitter"></a>
       </p>
       <p class="text-muted">Cátedra de Arquitectura de Computadoras - Facultad de Ciencias Exactas y Tecnología - Universidad Nacional de Tucumán - {% now "Y" %}</p>
     </div>

diff --git a/simple_classroom/urls.py b/simple_classroom/urls.py
@@ -5,7 +5,7 @@
 from django.contrib import admin
 from django.contrib.auth import views as auth_views
 from django.views.generic import TemplateView
-from contact_us.views import contact_us
+from contact_us.views import ContactUsFormView
 from registration.backends.simple.views import RegistrationView
 
 from simple_classroom.apps.classroom.views import HomeView, ProfileView
@@ -35,8 +35,9 @@
     (r'^tinymce/', include('tinymce.urls')),
 
     # Site URLs
+    url(r'^(?P<site>[A-Za-z]*)/contact_us/',
+        ContactUsFormView.as_view(), name='contact_us'),
     url(r'^(?P<site>[A-Za-z]*)/$', HomeView.as_view(), name='home'),
-    url(r'^contact_us/', contact_us, name='contact_us'),
 ) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 urlpatterns += patterns('django.contrib.flatpages.views',