From 64ab50bb06eb01b4364bfcdaf45ae926b6670612 Mon Sep 17 00:00:00 2001 From: Sashi20 Date: Fri, 14 Sep 2018 15:17:21 +0530 Subject: Enabled registration and login interface, activation emails, paper submission interface --- static/website/templates/activation.html | 48 +++++++ static/website/templates/cfp.html | 65 +++++++++- static/website/templates/comment-abstract.html | 11 +- static/website/templates/login.html | 32 +++++ static/website/templates/navbar.html | 19 ++- static/website/templates/proposal.html | 122 ++++-------------- static/website/templates/submit-cfp.html | 29 ++--- static/website/templates/user-register.html | 167 ++++++++++++++++++++----- static/website/templates/view-profile.html | 59 +++++++++ static/website/templates/view-proposals.html | 1 + 10 files changed, 396 insertions(+), 157 deletions(-) create mode 100644 static/website/templates/activation.html create mode 100644 static/website/templates/login.html create mode 100644 static/website/templates/view-profile.html (limited to 'static/website/templates') diff --git a/static/website/templates/activation.html b/static/website/templates/activation.html new file mode 100644 index 0000000..b5d8052 --- /dev/null +++ b/static/website/templates/activation.html @@ -0,0 +1,48 @@ +{% extends "base.html" %} +{% load static %} +{% load widget_tweaks %} + +{% csrf_token %} +{% block content %} + {% if status == '2' %} +
+
+

Your email is already verified, Please view your profile here

+ +
+
+ {% elif status == '1' %} + +
+
+

Your activation has expired please register again

+
+
+ {% elif status == '0' %} +
+
+

Your account has been activated. Please view your profile here

+ +
+
+ {% else %} + + +
+
+

Activation Awaiting

+

The Activation Link has been sent to your email. The link expires in 24hours from the date of registration. You will be logged out automatically.

+
+
+ {% endif %} +{% endblock %} diff --git a/static/website/templates/cfp.html b/static/website/templates/cfp.html index 52bf3a5..33535be 100755 --- a/static/website/templates/cfp.html +++ b/static/website/templates/cfp.html @@ -1,3 +1,4 @@ +{% extends "base.html" %} {% load static %} @@ -164,8 +165,66 @@ {% endif %} +{% block content %} +
+
+
+

Call for Papers

+
+
+
+

We invite papers on Chemical Process Modelling, Simulation and Optimization. Time duration for oral presentation will be 15 minutes. Accepted papers will be published in conference proceedings. Award will be given to best paper and best poster.

+

Paper submission starts on September 15 2018.

+
+
+
+
+

+ General guidelines for paper submission: +

+
    +
  • Papers are invited on chemical process, modelling, simulation, and optimization.
    • +
  • Use of open source software such as DWSIM and OpenModelica will be preferred.
    • +
  • Authors must submit the manuscript up to 6 pages of length including tables, figures and references in the required 2-column format as described in the template below.
    • +
  • Multiple submissions from one author is allowed.
    • +
  • Maximum 3 authors for one paper are allowed, in that case only one author should submit a paper on behalf of everyone. All authors should register and book a ticket for the conference. +
    • +
  • Submissions will be judged on originality, significance, interest, clarity, relevance, and presentation.
    • +
  • Authors should ensure that their work doesn’t contain plagiarized content and not under copyright elsewhere.
    • +
  • Please download the appropriate file for structure of the paper. We encourage use of LaTeX for creating paper.
    • +
  • Click the following links for templates + +
    • +
+
+
+

+ Suggested Contents of a paper +

+ +
    +
  • Selection of a topic
    • +
  • Importance of a topic
    • +
  • Any difficulties while solving with open source software.
    • +
  • The methodology followed to overcome these difficulties(any assumptions, data regression, custom modelling, etc.)
    • +
  • Validation of the results with published papers/experimentation/commercial simulators like CHEMCAD, Aspen Plus, UniSim etc.
    • +
  • Sensitivity studies, adjust, some tricks used for faster calculation etc done to optimize results and reduce simulation time.
    • +
+
+ +
+
+
+
+
{% endblock %} - {% include 'footer.html' %} - - diff --git a/static/website/templates/comment-abstract.html b/static/website/templates/comment-abstract.html index b6dd3a2..f77eb3f 100755 --- a/static/website/templates/comment-abstract.html +++ b/static/website/templates/comment-abstract.html @@ -15,10 +15,11 @@

{{ proposal.user.first_name }} {{ proposal.user.last_name }}

-

Title:  {{ proposal.title }}

-

About Me:  {{ proposal.about_me |linebreaks }}

- {% if proposal.proposal_type == "ABSTRACT"%} -

Abstract:  +

Title of the paper:  {{ proposal.title }}

+

Name of the author(s):  {{proposal.name_of_authors}}

+

About the Author(s):  {{ proposal.about_the_authors |linebreaks }}

+

Duration:  {{ proposal.duration }} {% if proposal.proposal_type == "ABSTRACT"%} Mins {% else %}Hours {%endif%}

{% if proposal.proposal_type == "ABSTRACT"%}

Tags:  {{ proposal.tags }}

diff --git a/static/website/templates/login.html b/static/website/templates/login.html new file mode 100644 index 0000000..65da512 --- /dev/null +++ b/static/website/templates/login.html @@ -0,0 +1,32 @@ +{% extends "base.html" %} +{% load static %} +{% block content %} +
+
+
+
+
+

Login

+

Login/Register to Submit a paper

+ {% if invalid %} +

* Invalid Username/Password

+ {% endif %} +
+ {% csrf_token %} + {{ form.as_p }} + +
+
+ Create an Account + +
+ Forgot Password? +
+

+
+
+
+
+
+{% endblock %} + diff --git a/static/website/templates/navbar.html b/static/website/templates/navbar.html index ce70dcc..001fce8 100644 --- a/static/website/templates/navbar.html +++ b/static/website/templates/navbar.html @@ -39,12 +39,23 @@
  • Venue
  • Organiser
  • Contact Us
    • +
  • cfp
    • {% if user.is_authenticated %} -
  • - {{ user.username }}!
    • -
  • logout
    • +
  • + + + {{ user.username }}! + + +
    • + {% else %} -
  • cfp
    • + +
  • Login
    • {% endif %} diff --git a/static/website/templates/proposal.html b/static/website/templates/proposal.html index c6b51c3..1f7d4a0 100644 --- a/static/website/templates/proposal.html +++ b/static/website/templates/proposal.html @@ -6,7 +6,7 @@
    {% if user and not user.is_anonymous %} -

    Submit Proposal

    +

    Submit paper

    {% else %}

    Login

    {% endif %} @@ -32,113 +32,33 @@

    {% endif %} {% if user and not user.is_anonymous and not login_required %} -

    We invite you to submit proposals for talks or workshops to be presented at SciPy 2018 The time duration for talks is 15 or 30 minutes and for workshops is 2 to 4 hours. There will be two parallel tracks for the workshops this year. One track - is meant for beginners and the other is for advanced users. -

    +

    We invite papers on Chemical Process Modelling, Simulation and Optimization. Time duration for oral presentation will be 15 minutes. Accepted papers will be published in conference proceedings. Award will be given to best paper and best poster.

    Important Dates

    -
    {% if user.is_superuser %} -
    - View Proposals - Submit Proposal - Submit Workshop -
    - {% else %} -
    - View Proposals -
    - {% endif %} {% else %} - -
    -
    -
    - -

    - Login -

    -     -

    Login/Register to Submit a Proposal

    - {% if invalid %} -

    * Invalid Username/Password

    - {% endif %} - -
    - {{ form.as_p }} - -

    - Create an Account -
    - Forgot Password? {% csrf_token %} -
    - -

    Or Sign in with: 
    - - -   - - - -

    -
    -

    -

    - Important Dates -

    - - -
    - -
    -
    -

    - Guidelines for a Proposal -

    - -
    -
    -
    -

    - Guidelines for a Workshop -

    - - -
    - -
    +
    + {% if user.is_superuser %} +
    + View Proposals + Submit paper + +
    + {% else %} +
    + View Proposals + Submit paper + +
    + {% endif %} + {% else %} + diff --git a/static/website/templates/submit-cfp.html b/static/website/templates/submit-cfp.html index b3aa2ee..b31658d 100755 --- a/static/website/templates/submit-cfp.html +++ b/static/website/templates/submit-cfp.html @@ -6,23 +6,24 @@
    {% if proposals_a >= 1 %} You have exceeded the abstract submission limit. You may view your submitted proposals by clicking here - {% else %}
    + {% else %}
    -

    Submit Proposal

    +

    Submit paper

    -

    Proposal Guidelines

    - +

    + General guidelines for paper submission: +

    +
    -
    {% for field in proposal_form %}

    {{ field.label}} {% if field.field.required %} * {% endif %} {{ field }} @@ -32,7 +33,7 @@ {% csrf_token %}

    - Back + Back
    {% endif %} diff --git a/static/website/templates/user-register.html b/static/website/templates/user-register.html index c5ea301..3d8d38f 100755 --- a/static/website/templates/user-register.html +++ b/static/website/templates/user-register.html @@ -1,43 +1,150 @@ {% extends "base.html" %} {% load static %} +{% load widget_tweaks %}
    {% block content %}
    -

    Register

    +

    Sign Up

    - {% if email_registered %} -
    -
    - × -

    Email ID is already registered !

    -
    -

    Have you already logged in using social logins ?

    -

    or

    -

    Click Here if you forgot your username or password

    -
    - {% endif %} - {% if registration_complete %} -

    Your Account is Created Successfully !

    - {% endif %} - -
    - +{% if form.errors %} + {% for field in form %} + {% for error in field.errors %} +
    + {{ error|escape }} +
    + {% endfor %} + {% endfor %} +{% endif %} + {% csrf_token %} - {% for field in form %} -

    {{ field.label}} - {% if field.field.required %} * {% endif %} - {{ field }} -

    - {{ field.errors }} - {% endfor %} -
    - - I have an account + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + + * +
    +     		+
    + {% render_field form.username %} +
    +
    +
    + + * +
    +     		+
    + {% render_field form.email %} +
    +
    +
    + * +
    +     		+
    + {% render_field form.password %} +
    +
    +
    + * +
    +     		+
    + {% render_field form.confirm_password %} +
    +
    +
    + * +
    +     		+
    + {% render_field form.title %}{% render_field form.first_name %} {% render_field form.last_name %} +
    +
    +
    + * +
    +     		+
    + {% render_field form.phone_number %} +
    +
    +
    + * +
    +     		+
    + {% render_field form.institute %}
    Enter your institute/ organisation/ company +
    +
    +
    + * +
    +     		+
    + {% render_field form.how_did_you_hear_about_us %} +
    +
    +
    + * marked fields are mandatory. Please enter the correct information. It will help us to solve your issues in short timespan. +
    +
    +
    +
    +
    +
    +
    I have an account
    +
    +
    +
    +
    +
    -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/static/website/templates/view-profile.html b/static/website/templates/view-profile.html new file mode 100644 index 0000000..844a2ba --- /dev/null +++ b/static/website/templates/view-profile.html @@ -0,0 +1,59 @@ +{% extends "base.html" %} +{% load static %} + {% block content %} +
    +
    + {% if user and not user.is_anonymous %} +

    Welcome {{ user.username }}

    + {% endif %} +
    +
    + {% if user.is_superuser %} +
    +
    + View Proposals +
    +
    +
    +
    +
    + Submit paper +
    +
    + + {% else %} +
    +
    + Submit your Paper +
    +
    +
    +

    +
    + + + {% endif %} + + +
    +
    + +

    + Important Dates +

    +     +
      +
    • Last date for paper submission: 28/09/2018
      • +
    • Notification of acceptance: 22/10/2018
      • +
    • Last date for final paper submission: 02/11/2018
      • +
    +
    + +
    +
    +
    +{% endblock %} diff --git a/static/website/templates/view-proposals.html b/static/website/templates/view-proposals.html index bdb39f7..89be03d 100755 --- a/static/website/templates/view-proposals.html +++ b/static/website/templates/view-proposals.html @@ -122,6 +122,7 @@ {% endfor %}

    + Back

    -- cgit From c532b037aa6bbbe82ae42f3fb0d4f9c1855120d9 Mon Sep 17 00:00:00 2001 From: Sashi20 Date: Sat, 15 Sep 2018 11:44:54 +0530 Subject: Made minor changes --- static/website/templates/abstract-details.html | 4 +- static/website/templates/cfp.html | 172 +------------------------ 2 files changed, 5 insertions(+), 171 deletions(-) (limited to 'static/website/templates') diff --git a/static/website/templates/abstract-details.html b/static/website/templates/abstract-details.html index 07dcfc3..a1b2c2f 100755 --- a/static/website/templates/abstract-details.html +++ b/static/website/templates/abstract-details.html @@ -11,8 +11,8 @@

    {{ proposal.user.first_name }} {{ proposal.user.last_name }}

    Title:  {{ proposal.title }}

    -

    About Me:  {{ proposal.about_me | linebreaks }}

    -

    Abstract:  {{ proposal.abstract |linebreaks }}

    +

    About the Author(s):  {{ proposal.about_the_authors | linebreaks }}

    + {% if proposal.prerequisite %}

    Prerequisite:  {{ proposal.prerequisite |linebreaks }}

    {% endif%} diff --git a/static/website/templates/cfp.html b/static/website/templates/cfp.html index 33535be..fc05c3a 100755 --- a/static/website/templates/cfp.html +++ b/static/website/templates/cfp.html @@ -10,113 +10,7 @@ {% block content %}
    - +

    Call for Papers

    @@ -138,6 +32,8 @@
  • Papers are invited on chemical process, modelling, simulation, and optimization.
  • Use of open source software such as DWSIM and OpenModelica will be preferred.
  • Authors must submit the manuscript up to 6 pages of length including tables, figures and references in the required 2-column format as described in the template below.
    • +
  • Multiple submissions from one author is allowed.
    • +
  • Maximum 3 authors for one paper are allowed, in that case only one author should submit a paper on behalf of everyone. All authors should register and book a ticket for the conference.
  • Submissions will be judged on originality, significance, interest, clarity, relevance, and presentation.
  • Authors should ensure that their work doesn’t contain plagiarized content and not under copyright elsewhere.
  • Please download the appropriate file for structure of the paper. We encourage use of LaTeX for creating paper.(Click for LaTeX/ Word template)
    • @@ -163,68 +59,6 @@
    - {% endif %}
    -{% block content %} -
    -
    -
    -

    Call for Papers

    -
    -
    -
    -

    We invite papers on Chemical Process Modelling, Simulation and Optimization. Time duration for oral presentation will be 15 minutes. Accepted papers will be published in conference proceedings. Award will be given to best paper and best poster.

    -

    Paper submission starts on September 15 2018.

    -
    -
    -
    -
    -

    - General guidelines for paper submission: -

    -
      -
    • Papers are invited on chemical process, modelling, simulation, and optimization.
      • -
    • Use of open source software such as DWSIM and OpenModelica will be preferred.
      • -
    • Authors must submit the manuscript up to 6 pages of length including tables, figures and references in the required 2-column format as described in the template below.
      • -
    • Multiple submissions from one author is allowed.
      • -
    • Maximum 3 authors for one paper are allowed, in that case only one author should submit a paper on behalf of everyone. All authors should register and book a ticket for the conference. -
      • -
    • Submissions will be judged on originality, significance, interest, clarity, relevance, and presentation.
      • -
    • Authors should ensure that their work doesn’t contain plagiarized content and not under copyright elsewhere.
      • -
    • Please download the appropriate file for structure of the paper. We encourage use of LaTeX for creating paper.
      • -
    • Click the following links for templates - -
      • -
    -
    -
    -

    - Suggested Contents of a paper -

    - -
      -
    • Selection of a topic
      • -
    • Importance of a topic
      • -
    • Any difficulties while solving with open source software.
      • -
    • The methodology followed to overcome these difficulties(any assumptions, data regression, custom modelling, etc.)
      • -
    • Validation of the results with published papers/experimentation/commercial simulators like CHEMCAD, Aspen Plus, UniSim etc.
      • -
    • Sensitivity studies, adjust, some tricks used for faster calculation etc done to optimize results and reduce simulation time.
      • -
    -
    - -
    -
    -
    -
    -
    {% endblock %} -- cgit From f56ff48a3732e5256a77aec316d45e1a260e53af Mon Sep 17 00:00:00 2001 From: Sashi20 Date: Mon, 17 Sep 2018 15:02:47 +0530 Subject: Changed namespace in navbar template --- static/website/templates/navbar.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'static/website/templates') diff --git a/static/website/templates/navbar.html b/static/website/templates/navbar.html index 001fce8..1f2ac32 100644 --- a/static/website/templates/navbar.html +++ b/static/website/templates/navbar.html @@ -42,20 +42,20 @@
  • cfp
    • {% if user.is_authenticated %}
  • - + {{ user.username }}!
    • {% else %} -
  • Login
    • +
  • Login
    • {% endif %}
    -- cgit From 8c6c66af7b4b628a2063261ffd240ee4c715f62f Mon Sep 17 00:00:00 2001 From: Sashi20 Date: Mon, 17 Sep 2018 15:28:21 +0530 Subject: Changed namespace from auth_views to auth --- static/website/templates/navbar.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'static/website/templates') diff --git a/static/website/templates/navbar.html b/static/website/templates/navbar.html index 1f2ac32..001fce8 100644 --- a/static/website/templates/navbar.html +++ b/static/website/templates/navbar.html @@ -42,20 +42,20 @@
  • cfp
    • {% if user.is_authenticated %}
  • - + {{ user.username }}!
    • {% else %} -
  • Login
    • +
  • Login
    • {% endif %} -- cgit From cb6b8b3112363c8717575ee09f4447404ab99c59 Mon Sep 17 00:00:00 2001 From: Sashi20 Date: Mon, 17 Sep 2018 16:32:56 +0530 Subject: Added nccps-2018 prefix to the urls --- static/website/templates/navbar.html | 2 +- static/website/templates/registration/login.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'static/website/templates') diff --git a/static/website/templates/navbar.html b/static/website/templates/navbar.html index 001fce8..7786466 100644 --- a/static/website/templates/navbar.html +++ b/static/website/templates/navbar.html @@ -49,7 +49,7 @@ diff --git a/static/website/templates/registration/login.html b/static/website/templates/registration/login.html index 86a90c6..319897c 100644 --- a/static/website/templates/registration/login.html +++ b/static/website/templates/registration/login.html @@ -14,7 +14,7 @@ Hi {{ user.username }}! {% else %}

    You are not logged in

    - login + login {% endif %}

    Login

    -- cgit