diff options
| -rwxr-xr-x | scipy2017/urls.py | 15 | ||||
| -rw-r--r-- | website/templates/navbar.html | 125 | ||||
| -rw-r--r-- | website/urls_password_reset.py | 21 |
3 files changed, 85 insertions, 76 deletions
diff --git a/scipy2017/urls.py b/scipy2017/urls.py index 057f6e5..2f4adc9 100755 --- a/scipy2017/urls.py +++ b/scipy2017/urls.py @@ -11,18 +11,7 @@ urlpatterns = patterns('', url(r'^admin/', include(admin.site.urls)), url(r'^', include('website.urls', namespace='website')), url(r'^2017/', include('website.urls', namespace='website')), + url(r'^2017/', include('website.urls_password_reset')), url(r'^', include('social.apps.django_app.urls', namespace='social')), - url(r'^', include('django.contrib.auth.urls', namespace='auth')), - - url(r'^forgotpassword/$', password_reset, {'template_name': 'register/password_reset_form.html'}, name="password_reset"), - url(r'^password_reset/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$', - password_reset_confirm, {'template_name': 'register/password_reset_confirm.html'}, name='password_reset_confirm'), - url(r'^password_reset/mail_sent/$', password_reset_done, {'template_name': 'register/password_reset_done.html'}, - name='password_reset_done'), - url(r'^password_reset/complete/$', password_reset_complete, {'template_name': 'register/password_reset_complete.html'}, - name='password_reset_complete'), - url(r'^changepassword/$', password_change, {'template_name': 'register/password_change_form.html'}, - name='password_change'), - url(r'^password_change/done/$', password_change_done, {'template_name': 'register/password_change_done.html'}, - name='password_change_done'), + url(r'^', include('django.contrib.auth.urls', namespace='auth')) ) diff --git a/website/templates/navbar.html b/website/templates/navbar.html index ba19708..03d4f36 100644 --- a/website/templates/navbar.html +++ b/website/templates/navbar.html @@ -5,69 +5,68 @@ {% block nav %} <section id="home"> <nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top"> - <div class="container"> - <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation"> - <span class="navbar-toggler-icon"></span> - </button> - <div class="collapse navbar-collapse" id="navbarResponsive"> - <ul class="navbar-nav"> - <li class="nav-item"> - <a class="nav-link" href="/#home" class="nav-link js-scroll-trigger" > - Home - <span class="sr-only">(current)</span> - </a> - </li> - <!-- <li class="nav-item"> - <a class="nav-link" href="#about" class="nav-link js-scroll-trigger" >About</a> - </li> --> - <li class="nav-item"> - <a class="nav-link" href="/#speakers" class="nav-link js-scroll-trigger" >Speakers</a> - </li> - <!-- - <li class="nav-item"> - <a class="nav-link" href="#register" class="nav-link js-scroll-trigger" >Register</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="#coc" class="nav-link js-scroll-trigger" >COC</a> - </li>--> - <li class="nav-item"> - <a class="nav-link" href="{% url 'website:cfp' %}">Submit</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="/#schedule" class="nav-link js-scroll-trigger" >Schedule</a> - </li> - <!-- <li class="nav-item"> - <a class="nav-link" href="#instructions" class="nav-link js-scroll-trigger" >Instructions</a> - </li> --> - <li class="nav-item"> - <a class="nav-link" href="/#venue" class="nav-link js-scroll-trigger" >Venue</a> - </li> - <!--<li class="nav-item"> - <a class="nav-link" href="/#sponsors" class="nav-link js-scroll-trigger" >Sponsor</a> - </li>--> - <!-- <li class="nav-item"> - <a class="nav-link" href="#" class="nav-link js-scroll-trigger" >Satellite Conference</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="#gallery" class="nav-link js-scroll-trigger" >Gallery</a> - </li> --> - <!-- <li class="nav-item"> - <a class="nav-link" href="/#contact" class="nav-link js-scroll-trigger" >Contact</a> - </li>--> - </ul> - <ul class="navbar-nav" style="margin-left: auto;"> - {% if user and not user.is_anonymous %} - <li class="nav-item" > - <a href="{% url 'website:cfp' %}" class="nav-link js-scroll-trigger btn btn-info btn-sm" > <span class="glyphicon glyphicon-user"></span>{{ user.get_full_name|default:user.username }}</a> - </li> - <li class="nav-item" > - <a href="{% url 'auth:logout' %}?next=/2017/cfp" class="nav-link js-scroll-trigger" >Logout</a> - </li> - {% endif %} - </ul> - </div> - </div> + <div class="container"> + <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation"> + <span class="navbar-toggler-icon"></span> + </button> + <div class="collapse navbar-collapse" id="navbarResponsive"> + <ul class="navbar-nav"> + <li class="nav-item"> + <a class="nav-link" href="/#home" class="nav-link js-scroll-trigger" > + Home + <span class="sr-only">(current)</span> + </a> + </li> + <!-- <li class="nav-item"> + <a class="nav-link" href="#about" class="nav-link js-scroll-trigger" >About</a> + </li> --> + <li class="nav-item"> + <a class="nav-link" href="/#speakers" class="nav-link js-scroll-trigger" >Speakers</a> + </li> + <!-- + <li class="nav-item"> + <a class="nav-link" href="#register" class="nav-link js-scroll-trigger" >Register</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="#coc" class="nav-link js-scroll-trigger" >COC</a> + </li>--> + <li class="nav-item"> + <a class="nav-link" href="{% url 'website:cfp' %}">Submit</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="/#schedule" class="nav-link js-scroll-trigger" >Schedule</a> + </li> + <!-- <li class="nav-item"> + <a class="nav-link" href="#instructions" class="nav-link js-scroll-trigger" >Instructions</a> + </li> --> + <li class="nav-item"> + <a class="nav-link" href="/#venue" class="nav-link js-scroll-trigger" >Venue</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="/#sponsors" class="nav-link js-scroll-trigger" >Sponsor</a> + </li> + <!-- <li class="nav-item"> + <a class="nav-link" href="#" class="nav-link js-scroll-trigger" >Satellite Conference</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="#gallery" class="nav-link js-scroll-trigger" >Gallery</a> + </li> --> + <!-- <li class="nav-item"> + <a class="nav-link" href="/#contact" class="nav-link js-scroll-trigger" >Contact</a> + </li>--> + </ul> + <ul class="navbar-nav" style="margin-left: auto;"> + {% if user and not user.is_anonymous %} + <li class="nav-item" > + <a href="{% url 'website:cfp' %}" class="nav-link js-scroll-trigger btn btn-info btn-sm" > <span class="glyphicon glyphicon-user"></span>{{ user.get_full_name|default:user.username }}</a> + </li> + <li class="nav-item" > + <a href="{% url 'auth:logout' %}?next=/2017/cfp" class="nav-link js-scroll-trigger" >Logout</a> + </li> + {% endif %} + </ul> + </div> + </div> </nav> {% endblock %} - diff --git a/website/urls_password_reset.py b/website/urls_password_reset.py new file mode 100644 index 0000000..a2fc134 --- /dev/null +++ b/website/urls_password_reset.py @@ -0,0 +1,21 @@ +from django.conf.urls import patterns, url +from django.contrib.auth.views import password_reset, password_reset_confirm,\ + password_reset_done, password_reset_complete, password_change,\ + password_change_done + +urlpatterns = [ + url(r'^forgotpassword/$', password_reset, + name="password_reset"), + url(r'^password_reset/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$', + password_reset_confirm, + name='password_reset_confirm'), + url(r'^password_reset/mail_sent/$', password_reset_done, + name='password_reset_done'), + url(r'^password_reset/complete/$', password_reset_complete, + name='password_reset_complete'), + url(r'^changepassword/$', password_change, + name='password_change'), + url(r'^password_change/done/$', password_change_done, + name='password_change_done'), +] + |