summaryrefslogtreecommitdiff
path: root/workshop_app
diff options
context:
space:
mode:
authorAkshen2017-06-15 12:04:14 +0530
committerAkshen2017-06-15 15:50:45 +0530
commit0596267467809cc9592497dca31fdc999eee70a8 (patch)
treee83e6200287fe7f28173fe1ec77240d5cadec28e /workshop_app
parentb8b4b550939bee9db9fce0c13ab2ca8f5bc5f5db (diff)
downloadworkshop_booking-0596267467809cc9592497dca31fdc999eee70a8.tar.gz
workshop_booking-0596267467809cc9592497dca31fdc999eee70a8.tar.bz2
workshop_booking-0596267467809cc9592497dca31fdc999eee70a8.zip
Adds structure pdf
Diffstat (limited to 'workshop_app')
-rw-r--r--workshop_app/data/structure.pdfbin0 -> 27485 bytes
-rw-r--r--workshop_app/models.py6
-rw-r--r--workshop_app/static/workshop_app/img/img1.pngbin19947 -> 0 bytes
-rw-r--r--workshop_app/static/workshop_app/img/img2.jpgbin43634 -> 0 bytes
-rw-r--r--workshop_app/static/workshop_app/img/structure.pngbin0 -> 42547 bytes
-rw-r--r--workshop_app/templates/workshop_app/how_to_participate.html2
-rw-r--r--workshop_app/templates/workshop_app/index.html2
-rw-r--r--workshop_app/views.py2
8 files changed, 7 insertions, 5 deletions
diff --git a/workshop_app/data/structure.pdf b/workshop_app/data/structure.pdf
new file mode 100644
index 0000000..35e6776
--- /dev/null
+++ b/workshop_app/data/structure.pdf
Binary files differ
diff --git a/workshop_app/models.py b/workshop_app/models.py
index 4c5942f..9745fd3 100644
--- a/workshop_app/models.py
+++ b/workshop_app/models.py
@@ -124,9 +124,9 @@ class ProposeWorkshopDate(models.Model):
Contains details of proposed date and workshop from coordinator
"""
- condition_one = models.BooleanField(default=False, help_text='I will give\
- minimum 50 participants for the workshop.')
- condition_two = models.BooleanField(default=False, help_text='I agree \
+ condition_one = models.BooleanField(default=False, help_text='We assure to\
+ give minimum 50 participants for the workshop.')
+ condition_two = models.BooleanField(default=False, help_text='We agree \
that this booking won\'t be cancelled without \
2days of prior notice to the instructor and fossee.')
condition_three = models.BooleanField(default=False, help_text='This \
diff --git a/workshop_app/static/workshop_app/img/img1.png b/workshop_app/static/workshop_app/img/img1.png
deleted file mode 100644
index 07dc07f..0000000
--- a/workshop_app/static/workshop_app/img/img1.png
+++ /dev/null
Binary files differ
diff --git a/workshop_app/static/workshop_app/img/img2.jpg b/workshop_app/static/workshop_app/img/img2.jpg
deleted file mode 100644
index fd18675..0000000
--- a/workshop_app/static/workshop_app/img/img2.jpg
+++ /dev/null
Binary files differ
diff --git a/workshop_app/static/workshop_app/img/structure.png b/workshop_app/static/workshop_app/img/structure.png
new file mode 100644
index 0000000..9c18785
--- /dev/null
+++ b/workshop_app/static/workshop_app/img/structure.png
Binary files differ
diff --git a/workshop_app/templates/workshop_app/how_to_participate.html b/workshop_app/templates/workshop_app/how_to_participate.html
index 23b56ba..97fb7ec 100644
--- a/workshop_app/templates/workshop_app/how_to_participate.html
+++ b/workshop_app/templates/workshop_app/how_to_participate.html
@@ -47,7 +47,7 @@
{% block content %}
<div class="container-fluid text-center" >
- <img src="{{ URL_ROOT }}/static/workshop_app/img/img2.jpg">
+ <img src="{{ URL_ROOT }}/static/workshop_app/img/structure.png">
</div>
{% endblock %} \ No newline at end of file
diff --git a/workshop_app/templates/workshop_app/index.html b/workshop_app/templates/workshop_app/index.html
index a805ed4..4b57b46 100644
--- a/workshop_app/templates/workshop_app/index.html
+++ b/workshop_app/templates/workshop_app/index.html
@@ -76,7 +76,7 @@
<br><br>
</div>
<div class="col-md-3" style="align-items: center;">
- <a href="{{ URL_ROOT }}/how_to_participate/" >
+ <a href="{{ URL_ROOT }}/pdf_view/structure" >
<img src="{{ URL_ROOT}}/static/workshop_app/img/part.png"><br><br>
How to Participate</a>
<br><br>
diff --git a/workshop_app/views.py b/workshop_app/views.py
index 5b00c87..35eb264 100644
--- a/workshop_app/views.py
+++ b/workshop_app/views.py
@@ -795,6 +795,8 @@ def how_to_participate(request):
def pdf_view(request, workshop_title):
if workshop_title == 'ISCP':
pdf_file = open(path.join(settings.MEDIA_ROOT,'ISCP schedule.pdf'), 'rb')
+ elif workshop_title == 'structure':
+ pdf_file = open(path.join(settings.MEDIA_ROOT,'structure.pdf'), 'rb')
else:
pdf_file = open(path.join(settings.MEDIA_ROOT,'Basic Python Schedule.pdf'), 'rb')