diff options
| -rw-r--r-- | static/website/js/custom.js | 11 | ||||
| -rw-r--r-- | static/website/templates/home.html | 2 | ||||
| -rwxr-xr-x | static/website/templates/submit-cfp.html | 37 | ||||
| -rwxr-xr-x | website/forms.py | 1 | ||||
| -rw-r--r-- | website/migrations/0003_auto_20180919_1026.py | 52 | ||||
| -rw-r--r-- | website/models.py | 1 | ||||
| -rw-r--r-- | website/views.py | 12 |
7 files changed, 110 insertions, 6 deletions
diff --git a/static/website/js/custom.js b/static/website/js/custom.js index 2573428..ef59691 100644 --- a/static/website/js/custom.js +++ b/static/website/js/custom.js @@ -91,3 +91,14 @@ $(document) e.preventDefault(); // prevent the default action (scroll / move caret) }); +$(function() +{ + $('#id_terms_and_conditions').click(function() + { + if ($('#id_terms_and_conditions').is(":checked")) { + $('#modal_terms_and_conditions').modal('show'); + }else { + $('#modal_terms_and_conditions').modal('hide'); + } + }); +});
\ No newline at end of file diff --git a/static/website/templates/home.html b/static/website/templates/home.html index 53fcc4d..f554cee 100644 --- a/static/website/templates/home.html +++ b/static/website/templates/home.html @@ -576,5 +576,5 @@ </div> </div> </div> -</div> +</div> {% endblock %} diff --git a/static/website/templates/submit-cfp.html b/static/website/templates/submit-cfp.html index b31658d..5d9ec8b 100755 --- a/static/website/templates/submit-cfp.html +++ b/static/website/templates/submit-cfp.html @@ -38,5 +38,42 @@ </form> {% endif %} </div> + +<div class="modal fade" id="modal_terms_and_conditions" role="dialog"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal">×</button> + </div> + <div class="modal-body"> + <center> + <h1>Terms and conditions</h1> + </center> + <div class="row"> + <div class="col-md-12"> + <h4>Paper</h4> + <ul> + <li>The decision of the organization will be final.</li> + <li>Maximum three authors for one paper are allowed.</li> + <li>The subsidy will be given to the authors of the selected papers, to cover a part of the cost of their accommodation(for 1 night) and part of travel expenses depending on the quality of their work. This will be paid after the conference.</li> + <li>Only one author will get the above subsidy in case of a paper has multiple authors.</li> + <li>The organization reserves all rights to take a decision about this subsidy.</li> + <li>All authors must register for the conference.</li> + </ul> + <h4>Content:</h4> + <ul> + <li>The copyright for the content uploaded or shared by any means will be transferred to FOSSEE, IIT Bombay.</li> + <li>The Organization reserves the rights to release this content under Creative Commons Attribution-ShareAlike 4.0 International License in any format.</li> + </ul> + </div> + </div> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-info" data-dismiss="modal">Close</button> + </div> + </div> + </div> +</div> + </section> {% endblock %} diff --git a/website/forms.py b/website/forms.py index 67bfc9f..a08c9ee 100755 --- a/website/forms.py +++ b/website/forms.py @@ -155,6 +155,7 @@ class ProposalForm(forms.ModelForm): ) open_to_share = forms.ChoiceField(choices=CHOICES, widget=forms.RadioSelect(), required=True, label='I agree to publish my content',) + terms_and_conditions = forms.BooleanField(widget=forms.CheckboxInput(), required=True, label='I agree to the terms and conditions') class Meta: model = Proposal diff --git a/website/migrations/0003_auto_20180919_1026.py b/website/migrations/0003_auto_20180919_1026.py new file mode 100644 index 0000000..3fea926 --- /dev/null +++ b/website/migrations/0003_auto_20180919_1026.py @@ -0,0 +1,52 @@ +# Generated by Django 2.1 on 2018-09-19 10:26 + +from django.conf import settings +import django.core.validators +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('website', '0002_proposal_open_to_share'), + ] + + operations = [ + migrations.CreateModel( + name='Profile', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(blank=True, choices=[('Mr', 'Mr.'), ('Miss', 'Ms.'), ('Professor', 'Prof.'), ('Doctor', 'Dr.')], max_length=32)), + ('institute', models.CharField(max_length=150)), + ('phone_number', models.CharField(max_length=10, validators=[django.core.validators.RegexValidator(message="Phone number must be entered in the format: '9999999999'. Up to 10 digits allowed.", regex='^.{10}$')])), + ('position', models.CharField(choices=[('student', 'Student'), ('faculty', 'Faculty'), ('industry_people', 'Industry People')], default='student', help_text='Selected catagoery ID shold be required', max_length=32)), + ('how_did_you_hear_about_us', models.CharField(blank=True, choices=[('FOSSEE website', 'FOSSEE website'), ('Google', 'Google'), ('Social Media', 'Social Media'), ('From other College', 'From other College')], max_length=255)), + ('is_email_verified', models.BooleanField(default=False)), + ('activation_key', models.CharField(blank=True, max_length=255, null=True)), + ('key_expiry_time', models.DateTimeField(blank=True, null=True)), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.RenameField( + model_name='proposal', + old_name='about_me', + new_name='about_the_authors', + ), + migrations.AddField( + model_name='proposal', + name='name_of_authors', + field=models.CharField(default='None', max_length=200), + ), + migrations.AddField( + model_name='proposal', + name='terms_and_conditions', + field=models.BooleanField(default='True'), + ), + migrations.AlterField( + model_name='proposal', + name='abstract', + field=models.TextField(default='abstract', max_length=10), + ), + ] diff --git a/website/models.py b/website/models.py index f5b004a..d550548 100644 --- a/website/models.py +++ b/website/models.py @@ -51,6 +51,7 @@ class Proposal(models.Model): proposal_type = models.CharField(max_length=100) tags = models.CharField(max_length=250) open_to_share = models.CharField(max_length=2, default=1) + terms_and_conditions = models.BooleanField(default= 'True') class Ratings(models.Model): diff --git a/website/views.py b/website/views.py index 95c0808..71c8f8f 100644 --- a/website/views.py +++ b/website/views.py @@ -223,14 +223,16 @@ def submitcfp(request): context['proposal_submit'] = True sender_name = "NCCPS 2018" sender_email = TO_EMAIL - subject = "NCCPS 2018 – Talk Proposal Submission Acknowledgment" + subject = "NCCPS 2018 – Paper Submission Acknowledgement " to = (social_user.email, TO_EMAIL) message = """ Dear {0}, <br><br> - Thank you for showing interest & submitting a paper proposal at NCCPS 2018 conference for the paper titled <b>“{1}”</b>. Reviewal of the proposals will start once the CFP closes. - <br><br>You will be notified regarding comments/selection/rejection of your paper via email. - Visit this {2} link to view status of your submission. - <br>Thank You ! <br><br>Regards,<br>NCCPS 2018,<br>FOSSEE - IIT Bombay. + Thank you for showing interest & submitting a paper proposal at NCCPS-2018 + for the paper titled “test title paper”. Reviewal of the proposals will start + once the CFP closes. + You will be notified regarding comments/selection/rejection of your paper via email. + Visit this {2} link to view the status of your submission. + <br>Thank You. <br><br>Regards,<br>NCCPS 2018,<br>FOSSEE - IIT Bombay. """.format( social_user.first_name, request.POST.get('title', None), |