From 1c43df1fe895564e2300534dea5bd900a788491f Mon Sep 17 00:00:00 2001 From: Akshen Date: Mon, 7 May 2018 17:49:42 +0530 Subject: change UI - Changes UI - Changes landing page - change in testcases-> test_models.py | 312 - staticstics template change - removes commented chatbot code - modifies .gitignore --- .gitignore | 4 + static/workshop_app/css/new_index.css | 0 .../templates/statistics_app/profile_stats.html | 2 +- .../statistics_app/workshop_public_stats.html | 9 +- .../templates/statistics_app/workshop_stats.html | 34 +-- workshop_app/static/workshop_app/css/index.css | 325 +++++++++++++-------- workshop_app/static/workshop_app/css/new_index.css | 274 +++++++++++++++++ .../static/workshop_app/css/sticky-footer.css | 6 +- workshop_app/static/workshop_app/font/Aaargh.ttf | Bin 0 -> 25232 bytes workshop_app/static/workshop_app/js/index.js | 8 + workshop_app/templates/workshop_app/booking.html | 2 +- .../templates/workshop_app/edit_profile.html | 2 +- .../templates/workshop_app/how_to_participate.html | 2 +- workshop_app/templates/workshop_app/index.html | 271 +++++++++-------- .../templates/workshop_app/my_workshops.html | 3 +- workshop_app/templates/workshop_app/new_index.html | 167 +++++++++++ .../templates/workshop_app/profile_updated.html | 2 +- .../templates/workshop_app/propose_workshop.html | 2 +- .../templates/workshop_app/self_workshop.html | 7 +- .../templates/workshop_app/view_benefits.html | 2 +- workshop_app/templates/workshop_app/view_faq.html | 2 +- .../templates/workshop_app/view_profile.html | 2 +- .../workshop_app/view_workshoptype_details.html | 182 +----------- .../workshop_app/view_workshoptype_list.html | 160 +++++++--- .../templates/workshop_app/workshop_stats.html | 2 +- workshop_app/tests/test_views.py | 4 +- workshop_app/urls.py | 2 +- workshop_app/views.py | 38 +-- 28 files changed, 975 insertions(+), 539 deletions(-) create mode 100644 static/workshop_app/css/new_index.css create mode 100644 workshop_app/static/workshop_app/css/new_index.css create mode 100755 workshop_app/static/workshop_app/font/Aaargh.ttf create mode 100644 workshop_app/static/workshop_app/js/index.js create mode 100644 workshop_app/templates/workshop_app/new_index.html diff --git a/.gitignore b/.gitignore index e828331..e16318f 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,7 @@ migrations/ \#*# #Vim *.swp + +#images/gif +*.png +*.gif diff --git a/static/workshop_app/css/new_index.css b/static/workshop_app/css/new_index.css new file mode 100644 index 0000000..e69de29 diff --git a/statistics_app/templates/statistics_app/profile_stats.html b/statistics_app/templates/statistics_app/profile_stats.html index 2653d9d..c342898 100644 --- a/statistics_app/templates/statistics_app/profile_stats.html +++ b/statistics_app/templates/statistics_app/profile_stats.html @@ -14,7 +14,7 @@
  • Create Workshop
  • Workshop List
  • My Workshops
    • -
  • Workshop Stats
    • +
  • Workshop Stats
  • Profile Stats
    • {% endif %} @@ -415,3 +415,4 @@ {% endif %} {% endblock %} + diff --git a/workshop_app/templates/workshop_app/new_index.html b/workshop_app/templates/workshop_app/new_index.html new file mode 100644 index 0000000..f44b82f --- /dev/null +++ b/workshop_app/templates/workshop_app/new_index.html @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + Welcome + + + + + + + +
    +
    + FOSSEE Python Workshop +
    +
    + +
    +
    + +
    +
    + + + + + + + +
    + +
    + +
    +
    + +
    +

    6000+
    Students Trained
    +

    100+
    Colleges +
    +

    27 hours of
    Workshop Material
    +
    + + +
    +
    +
    + +
    +
    +
    + +
    +
    +
    + +
    +
    + +
    +
    FOSSEE Python Workshop Advantage +
    + +


    +
    Learn Python for Free,
    +
    Many exercises/practice problems

    +
    Instructor support for your queries during workshop(s)

    +
    Get e-certificate
    + +
    + +
    +
    + +
    + +
    +
  • {{ testimonials.0.message }}

    + ~ {{testimonials.0.name}} ~
    + {{testimonials.0.institute}}
    • +
  • {{testimonials.4.message}}

    + ~ {{testimonials.4.name}} ~
    + {{testimonials.4.institute}}
    • +
  • {{testimonials.3.message}}

    + ~ {{testimonials.3.name}} ~
    + {{testimonials.3.institute}}
    • +
    + +
    + +
    + +
    + +
    + +
    +

    + +
    + +
    +

    + FOSSEE, + IIT-Bombay
    Mumbai, India
    + Phone: (+91) 22 2576 4133
    + Email: workshops[at]fossee[dot]in +
    + +
    +
    +

    +   +   + +
    +
    + +
    +
    + The FOSSEE project is funded by the National Mission on Education through ICT, MHRD, Government of India.
    + This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License + +
    +
    + + + \ No newline at end of file diff --git a/workshop_app/templates/workshop_app/profile_updated.html b/workshop_app/templates/workshop_app/profile_updated.html index 8553471..569e3fb 100644 --- a/workshop_app/templates/workshop_app/profile_updated.html +++ b/workshop_app/templates/workshop_app/profile_updated.html @@ -27,7 +27,7 @@
  • My Workshops
  • FAQ's
  • Benefits
    • -
  • Workshop List
    • +
  • Workshop List
  • How to Participate
    • {% endif %} diff --git a/workshop_app/templates/workshop_app/propose_workshop.html b/workshop_app/templates/workshop_app/propose_workshop.html index e483851..a237f46 100644 --- a/workshop_app/templates/workshop_app/propose_workshop.html +++ b/workshop_app/templates/workshop_app/propose_workshop.html @@ -42,7 +42,7 @@
  • Propose a Workshop
  • FAQ's
  • Benefits
    • -
  • Workshop List
    • +
  • Workshop List
  • How to Participate
    • - +

    - {% endblock %} \ No newline at end of file diff --git a/workshop_app/templates/workshop_app/view_benefits.html b/workshop_app/templates/workshop_app/view_benefits.html index cc46e6d..9b2594d 100644 --- a/workshop_app/templates/workshop_app/view_benefits.html +++ b/workshop_app/templates/workshop_app/view_benefits.html @@ -25,7 +25,7 @@
  • Propose a Workshop
  • FAQ
  • Benefits -
  • Workshop List
    • +
  • Workshop List
  • How to Participate
    • diff --git a/workshop_app/templates/workshop_app/view_faq.html b/workshop_app/templates/workshop_app/view_faq.html index f07a3e6..6efe66b 100644 --- a/workshop_app/templates/workshop_app/view_faq.html +++ b/workshop_app/templates/workshop_app/view_faq.html @@ -26,7 +26,7 @@
  • Propose a Workshop
  • FAQ's
  • Benefits
    • -
  • Workshop List
    • +
  • Workshop List
  • How to Participate
    • {% endif %} diff --git a/workshop_app/templates/workshop_app/view_workshoptype_details.html b/workshop_app/templates/workshop_app/view_workshoptype_details.html index fd94647..5ca454a 100644 --- a/workshop_app/templates/workshop_app/view_workshoptype_details.html +++ b/workshop_app/templates/workshop_app/view_workshoptype_details.html @@ -1,191 +1,39 @@ + {% extends 'workshop_app/base.html' %} {% block title %} - View Details About Workshops + View Workshops Type List {% endblock %} -{% block extra %} - - - - - - - {% endblock %} {% block header %} - - + + {% endblock %} diff --git a/workshop_app/templates/workshop_app/workshop_stats.html b/workshop_app/templates/workshop_app/workshop_stats.html index 78832ec..18f5f6e 100644 --- a/workshop_app/templates/workshop_app/workshop_stats.html +++ b/workshop_app/templates/workshop_app/workshop_stats.html @@ -325,7 +325,7 @@ {{ india_map | safe }} ); - var opts = { + var opts = { region: 'IN', domain: 'IN', displayMode: 'regions', diff --git a/workshop_app/tests/test_views.py b/workshop_app/tests/test_views.py index 2577b91..e70a531 100644 --- a/workshop_app/tests/test_views.py +++ b/workshop_app/tests/test_views.py @@ -307,8 +307,8 @@ class TestStaticPages(TestCase): response = self.client.get('/file_view/flowchart') self.assertEqual(response.status_code, 200) - def test_view_workshoptype_details(self): - response = self.client.get('/view_workshoptype_details/') + def test_view_workshoptype_list(self): + response = self.client.get('/view_workshoptype_list/') self.assertEqual(response.status_code, 200) diff --git a/workshop_app/urls.py b/workshop_app/urls.py index ec97f00..8123dea 100644 --- a/workshop_app/urls.py +++ b/workshop_app/urls.py @@ -40,7 +40,7 @@ urlpatterns = [ url(r'^faq/$', views.faq), url(r'^manage/$', views.manage), url(r'^view_workshoptype_list/$', views.view_workshoptype_list), - url(r'^view_workshoptype_details/$', views.view_workshoptype_details), + url(r'^view_workshoptype_details/([1-9][0-9]*)$', views.view_workshoptype_details), url(r'^create_workshop/$', views.create_workshop), url(r'^propose_workshop/$', views.propose_workshop), url(r'^workshop_stats/$', views.workshop_stats), diff --git a/workshop_app/views.py b/workshop_app/views.py index 2e6a8fd..051f447 100644 --- a/workshop_app/views.py +++ b/workshop_app/views.py @@ -62,6 +62,7 @@ def index(request): user = request.user form = UserLoginForm() + testimonials = Testimonial.objects.all() if user.is_authenticated() and is_email_checked(user): if user.groups.filter(name='instructor').count() > 0: return redirect('/manage/') @@ -77,7 +78,8 @@ def index(request): return redirect('/manage/') return redirect('/book/') - return render(request, "workshop_app/index.html", {"form": form}) + return render(request, "workshop_app/index.html", {"form": form, + "testimonials": testimonials }) def is_instructor(user): @@ -867,36 +869,20 @@ def create_workshop(request): return redirect('/book/') -@login_required -def view_workshoptype_list(request): +def view_workshoptype_details(request, workshoptype_id): '''Gives the types of workshop details ''' user = request.user if is_superuser(user): return redirect("/admin") - if is_email_checked(user): - workshoptype_list = WorkshopType.objects.all() - paginator = Paginator(workshoptype_list, 12) #Show upto 12 workshops per page - - page = request.GET.get('page') - try: - workshoptype = paginator.page(page) - except PageNotAnInteger: - #If page is not an integer, deliver first page. - workshoptype = paginator.page(1) - except EmptyPage: - #If page is out of range(e.g 999999), deliver last page. - workshoptype = paginator.page(paginator.num_pages) - - return render( - request, 'workshop_app/view_workshoptype_list.html', \ - {'workshoptype': workshoptype} - ) - else: - return redirect('/activate_user/') + view_workshoptype_details = WorkshopType.objects.get(id=workshoptype_id) + return render( + request, 'workshop_app/view_workshoptype_details.html', \ + {'workshoptype': view_workshoptype_details} + ) -def view_workshoptype_details(request): +def view_workshoptype_list(request): '''Gives the details for types of workshops.''' user = request.user if is_superuser(user): @@ -917,7 +903,7 @@ def view_workshoptype_details(request): workshoptype = paginator.page(paginator.num_pages) return render( - request, 'workshop_app/view_workshoptype_details.html', \ + request, 'workshop_app/view_workshoptype_list.html', \ {'workshoptype': workshoptype} ) @@ -1225,7 +1211,7 @@ def share_details(request): if request.method == 'POST': email_list = (request.POST.get('email').split(',')) send_email(request, call_on='ShareMail', other_email=email_list) - return redirect('/view_workshoptype_details/') + return redirect('/view_workshoptype_list/') def self_workshop(request): -- cgit