Merge pull request #14 from Sashi20/developmentHEADmaster

Alter reference field in proposal form to textarea

7 files changed, 42 insertions, 13 deletions

diff --git a/arduino_blog/decorators.py b/arduino_blog/decorators.py
index c1985d2..3e47b93 100644
--- a/arduino_blog/decorators.py
+++ b/arduino_blog/decorators.py
@@ -48,7 +48,7 @@ def is_proposal_submitted(func):
                         is_sub = _q.get(Q(user_id=user.id)&Q(proposal_status='0'))
                         if is_sub.proposal_status == 0:
                             context['success'] = True
-                            context['msg'] = "You have alredy submited a \
+                            context['msg'] = "You have already submitted a \
                                           proposal. Your proposal is under \
                                           review"
                             return render(
diff --git a/arduino_blog/forms.py b/arduino_blog/forms.py
index e12f36e..afd3958 100644
--- a/arduino_blog/forms.py
+++ b/arduino_blog/forms.py
@@ -247,7 +247,7 @@ class AbstractProposalForm(forms.ModelForm):
                                error_messages={
                                    'required': 'Abstract field required.'},
                                )
-    references = forms.CharField(widget=forms.TextInput(attrs={'class': 'form-control', 'placeholder': 'References(if any)'}),
+    references = forms.CharField(widget=forms.Textarea(attrs={'class': 'form-control', 'placeholder': 'References(if any)'}),
                                 required = False
                             )
     completion_date = forms.DateTimeField(
diff --git a/arduino_blog/migrations/0008_auto_20200307_0529.py b/arduino_blog/migrations/0008_auto_20200307_0529.py
new file mode 100644
index 0000000..6ab50a0
--- /dev/null
+++ b/arduino_blog/migrations/0008_auto_20200307_0529.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.3 on 2020-03-07 05:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('arduino_blog', '0007_auto_20200305_1009'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='proposal',
+            name='references',
+            field=models.TextField(default='None'),
+        ),
+    ]
diff --git a/arduino_blog/models.py b/arduino_blog/models.py
index 97e60de..84fbd38 100644
--- a/arduino_blog/models.py
+++ b/arduino_blog/models.py
@@ -129,7 +129,7 @@ class Proposal(BaseClass):
     email = models.CharField(max_length=128)
     title_of_the_project = models.CharField(max_length=250)
     abstract = models.TextField(max_length=700)
-    references = models.CharField(max_length = 200, default = 'None')
+    references = models.TextField(default = 'None')
     #attachment = models.FileField(upload_to=get_document_dir)
     status = models.CharField(max_length=100, default='Pending', editable=True)
     completion_date = models.DateTimeField(null=True, blank=True)
diff --git a/arduino_blog/static/arduino_blog/templates/dashboard.html b/arduino_blog/static/arduino_blog/templates/dashboard.html
index 5a5fab6..877a264 100644
--- a/arduino_blog/static/arduino_blog/templates/dashboard.html
+++ b/arduino_blog/static/arduino_blog/templates/dashboard.html
@@ -11,7 +11,7 @@
 
     </div>
 
-    <a href="{% url 'arduino_blog:view_abstracts' %}"> View Abstracts </a> 
+   <!--  <a href="{% url 'arduino_blog:view_abstracts' %}"> View Abstracts </a>  -->
     </center>
 {% else %}
     {% if msg %}
diff --git a/arduino_blog/static/arduino_blog/templates/home.html b/arduino_blog/static/arduino_blog/templates/home.html
index 7660f18..7464144 100644
--- a/arduino_blog/static/arduino_blog/templates/home.html
+++ b/arduino_blog/static/arduino_blog/templates/home.html
@@ -11,15 +11,15 @@
   }
 </style> 
 <main role="main">
-  <section>
+  <!-- <section>
     <div id="front-image" class="carousel slide" data-ride="carousel">
       <!-- Indicators -->
-      <ul class="carousel-indicators">
+<!--       <ul class="carousel-indicators">
         <li data-target="#front-image" data-slide-to="0" class="active"></li>
         <li data-target="#front-image" data-slide-to="1"></li>
       </ul>
       <!-- The slideshow -->
-      <div class="carousel-inner">
+      <!-- <div class="carousel-inner">
         <div class="carousel-item active text-center">
           <img src="{% static 'images/MainBoard.jpg' %}" alt="Main Board" class="img-fluid">
         </div>
@@ -28,22 +28,22 @@
         </div>
       </div>
       <!-- Left and right controls -->
-      <a class="carousel-control-prev" href="#front-image" data-slide="prev">
+     <!--  <a class="carousel-control-prev" href="#front-image" data-slide="prev">
         <span class="carousel-control-prev-icon"></span>
       </a>
       <a class="carousel-control-next" href="#front-image" data-slide="next">
         <span class="carousel-control-next-icon"></span>
       </a>
     </div>
-  </section>
+  </section> --> 
   <section class="text-center">
     <div class="container">
       <h1>Open Source Hardware Project</h1>
       <p class="lead text-muted text-justify">
-      Back in 2005, a group of students envisaged a world where they have affordable access to digital devices, that they can interact with the environment using sensors and microcontrollers. Fast forward 15 years and Arduino has become a household name amongst not just students, but also novices, professionals and DIY makers. The formidable headway that was brought about has shown the way to many opensource hardware projects henceforth. We at FOSSEE also became a part by adopting the platform, and using it to teach Electronics across India. The learning resources, both hardware and lectures, put together by the Opensource-hardware team of FOSSEE and Spoken Tutorial has already demonstrated effective learning.
+      Back in 2005, a group of students envisaged a world where there is affordable access to digital devices, so that people can interact with the environment using sensors and microcontrollers. Fast forward 15 years and Arduino has become a household name amongst not just students, but also novices, professionals and DIY makers. The formidable headway that was brought about, has paved the way for many open-source hardware projects henceforth. We at FOSSEE also became a part of this movement by adopting the platform and using it to teach Electronics across India. The learning resources, both hardware and audio-video lectures, put together by the Opensource-hardware team of FOSSEE and Spoken Tutorial projects, have already demonstrated effective learning.
       </p>
       <p class="lead text-muted text-justify">
-        Here, we are providing you a platform for showcasing your ambitious projects, forming a community around the users and becoming part of our open-source hardware activities. We are inviting proposals from you, those who have implemented projects using Arduino or are in the process, to contribute the documentation/DIY instructions of their projects. We promise to put together a well presented, shareable documentation of your project on our website. Every contributor can thus build an online portfolio, which they can take pride in and which might also land them a job one day!
+        Here, we wish to provide you a platform for showcasing your ambitious projects, forming a community around the users and becoming a part of our open-source hardware activities and initiatives. We are inviting proposals from those who have implemented projects using Arduino or are in the process of doing so, to contribute the documentation/DIY instructions of their projects. We promise to put together a well presented, shareable documentation of your project on our website. Every contributor can thus build an online portfolio, which they can take pride in and which might also land them a lucrative job one day!
       </p>
       <p class="lead text-muted text-justify">
         Please sign up and make a profile for proposal submission right away and become one of the first contributors!
diff --git a/arduino_blog/static/arduino_blog/templates/submit-cfp.html b/arduino_blog/static/arduino_blog/templates/submit-cfp.html
index 4da6237..09154ea 100644
--- a/arduino_blog/static/arduino_blog/templates/submit-cfp.html
+++ b/arduino_blog/static/arduino_blog/templates/submit-cfp.html
@@ -59,10 +59,21 @@
                         </label>
                     {% render_field proposal_form.completion_date %}
                     </div>
+                    <p><b><u>Terms and Conditions</u></b></p>
+                    <ul>
+                        <li>The decision of the FOSSEE and Spoken Tutorial projects, will be final.</li>
+                        <li>Copyright details will be as per the agreed Terms and Conditions. </li>
+                        <li>The FOSSEE and Spoken Tutorial projects, reserve the rights to release this content under Creative Commons Attribution-ShareAlike 4.0 International License in any format.
+                        </li>
+                        <li><a href="#" target="_blank">Read More</a></li>
+                    </ul>
                     <div class="form-inline">
                         <div class="form-check">
+
                         {% render_field proposal_form.terms_and_conditions %}
-                            <label for="terms_and_conditions"> &nbsp; I agree to the terms and conditions
+                            <label for="terms_and_conditions"> 
+                            
+                             I agree to the terms and conditions
                                 <span style="color:red;">*</span>
                             </label>
                             
@@ -72,7 +83,7 @@
               {% csrf_token %}
                     <center>
                         <button id="subbtn" class="btn btn-info" type="submit" >Submit</button>
-                        <a href="#" class="btn btn-info" role="button">Back</a>
+                        <a href="{% url 'arduino_blog:index' %}" class="btn btn-info" role="button">Back</a>
                     </center>
                 </form>
                 </div>