Changes made to improve the interface.

6 files changed, 15 insertions, 16 deletions

diff --git a/certificate/templates/base.html b/certificate/templates/base.html
index 86309cf..f87018d 100644
--- a/certificate/templates/base.html
+++ b/certificate/templates/base.html
@@ -26,7 +26,6 @@
                   
                       <!--<h1>Scilab India Conference 2014</h1>-->
                       {% endblock %}
-                  <hr>
                   {% block content %}
                   {% endblock %}
                 </div>
diff --git a/certificate/templates/drupal_download.html b/certificate/templates/drupal_download.html
index a93528c..fa40952 100644
--- a/certificate/templates/drupal_download.html
+++ b/certificate/templates/drupal_download.html
@@ -8,13 +8,13 @@
                 <div class="modal-content">
                   <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-                    <h4 class="modal-title" id="invalidModalLabel">Invalid Category</h4>
+                    <h4 class="modal-title" id="invalidModalLabel">Invalid User/Email</h4>
                   </div>
                   <div class="modal-body">
                       {% if notregistered == 1 %}
-                        The requested certificate is unavailable for your email address. Please select the appropriate category and retry.
+                        Please enter a proper email address.
                       {% else %}
-                        The user has not attended the Drupal Camp Mumbai 2015.
+                        You have not attended the Drupal Camp Mumbai 2015.
                       {% endif %}
                   </div>
                 </div>
diff --git a/certificate/templates/drupal_feedback.html b/certificate/templates/drupal_feedback.html
index 1d9d9c8..ca4a5c7 100644
--- a/certificate/templates/drupal_feedback.html
+++ b/certificate/templates/drupal_feedback.html
@@ -8,7 +8,7 @@
 
         <div style="padding-left:100px;width:940px;text-align:center;margin:0 auto;">
             <div align=center style="padding-left:200px">    <h1> Feedback </h1>
-                <p>Please fill the feedback form. This will greatly enable us to do better.</p>
+                <p>Your feedback will help us improve our services. Thank you for your time.<</p>
             </div>
 
         {{ detail }}
@@ -22,7 +22,7 @@
                     <textarea cols="80" class="form-control" id="{{ question.id }}" name="{{ question.id }}"></textarea><br>
                     {% endfor %}
               <span><button class="btn btn-primary" type="submit">Submit</button></span>
-              <span style="float:right"><a href="{% url 'certificate:drupal_download' %}" >I have already submitted</a></span>
+              <span style="float:right"><a href="{% url 'certificate:drupal_download' %}" >Skip feedback and download</a></span>
           </div>
     </div>      
      </form>
diff --git a/certificate/templates/feedback.html b/certificate/templates/feedback.html
index 76c5abd..3964503 100644
--- a/certificate/templates/feedback.html
+++ b/certificate/templates/feedback.html
@@ -8,7 +8,7 @@
 
         <div style="padding-left:100px;width:940px;text-align:center;margin:0 auto;">
             <div align=center style="padding-left:200px">    <h1> Feedback </h1>
-                <p>Please fill the feedback form. This will greatly enable us to do better.</p>
+                <p>Your feedback will help us improve our services. Thank you for your time.</p>
             </div>
 
         {{ detail }}
@@ -22,7 +22,7 @@
                     <textarea cols="80" class="form-control" id="{{ question.id }}" name="{{ question.id }}"></textarea><br>
                     {% endfor %}
               <span><button class="btn btn-primary" type="submit">Submit</button></span>
-              <span style="float:right"><a href="{% url 'certificate:download' %}" >I have already submitted</a></span>
+              <span style="float:right"><a href="{% url 'certificate:download' %}" >Skip feedback and download</a></span>
           </div>
     </div>      
      </form>
diff --git a/certificate/templates/scipy_feedback.html b/certificate/templates/scipy_feedback.html
index 1ec3f2c..12f2c4d 100644
--- a/certificate/templates/scipy_feedback.html
+++ b/certificate/templates/scipy_feedback.html
@@ -8,7 +8,7 @@
 
         <div style="padding-left:100px;width:940px;text-align:center;margin:0 auto;">
             <div align=center style="padding-left:200px">    <h1> Feedback </h1>
-                <p>Please fill the feedback form. This will greatly enable us to do better.</p>
+                <p>Your feedback will help us improve our services. Thank you for your time.</p>
             </div>
 
         {{ detail }}
@@ -22,7 +22,7 @@
                     <textarea cols="80" class="form-control" id="{{ question.id }}" name="{{ question.id }}"></textarea><br>
                     {% endfor %}
               <span><button class="btn btn-primary" type="submit">Submit</button></span>
-              <span style="float:right"><a href="{% url 'certificate:scipy_download' %}" >I have already submitted</a></span>
+              <span style="float:right"><a href="{% url 'certificate:scipy_download' %}" >Skip feedback and download</a></span>
           </div>
     </div>      
      </form>
diff --git a/certificate/views.py b/certificate/views.py
index a8fa759..22119c3 100644
--- a/certificate/views.py
+++ b/certificate/views.py
@@ -94,7 +94,7 @@ def download(request):
             _clean_certificate_certificate(certificate_path, file_name)
             context['error'] = True
             return render_to_response('download.html', context, ci)
-    context['message'] = 'You can download the certificate'
+    context['message'] = ''
     return render_to_response('download.html', context, ci)
 
 def verification(serial, _type):
@@ -110,7 +110,7 @@ def verification(serial, _type):
             certificate.save()
             purpose, year, type = _get_detail(serial_no)
             if type == 'P':
-                if purpose == 'Drupal Mumbai Camp':
+                if purpose == 'DrupalCamp Mumbai':
                     drupal_user = Drupal_camp.objects.get(email=certificate.email)
                     DAY = drupal_user.attendance
                     if DAY == 1:
@@ -145,7 +145,7 @@ def verification(serial, _type):
             certificate.save()
             purpose, year, type = _get_detail(serial)
             if type == 'P':
-                if purpose == 'Drupal Mumbai Camp':
+                if purpose == 'DrupalCamp Mumbai':
                     drupal_user = Drupal_camp.objects.get(email=certificate.email)
                     DAY = drupal_user.attendance
                     if DAY == 1:
@@ -193,7 +193,7 @@ def _get_detail(serial_no):
     elif serial_no[0:3] == 'SPC':
         purpose = 'SciPy India'
     elif serial_no[0:3] == 'DCM':
-        purpose = 'Drupal Mumbai Camp'
+        purpose = 'DrupalCamp Mumbai'
 
     if serial_no[3:5] == '14':
         year = '2014'
@@ -489,7 +489,7 @@ def drupal_feedback(request):
                     answer.save()
                     feedback.answer.add(answer)
                     feedback.save()
-                context['message'] = 'Thank you for the feedback. You can download your certificate.'
+                context['message'] = ''
                 return render_to_response('drupal_download.html', context, ci)
 
     context['form'] = form
@@ -574,7 +574,7 @@ def drupal_download(request):
             _clean_certificate_certificate(certificate_path, file_name)
             context['error'] = True
             return render_to_response('drupal_download.html', context, ci)
-    context['message'] = 'You can download the certificate'
+    context['message'] = ''
     return render_to_response('drupal_download.html', context, ci)