Skip to content

GitLab

Commit 47944fc5 authored by Daniel W Bond's avatar Daniel W Bond
Browse files

reworking of templates, added page ordering in views

parent f8b20c83
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 16 deletions
roomlist/accounts/templates/welcome_major.html
View file @ 47944fc5
......@@ -10,17 +10,23 @@
<div class="page-header" id="banner">
<div class="row">
<div class="col-md-12 text-center">
<h1><strong>SRCT</strong>ROOMLIST</a></strong> Student Major</h1>
<h1>Welcome to <strong>SRCT</strong>ROOMLIST! <small>Step 3 of 4</small></h1>
</div>
</div>
</div>
<div class="row">
<div class="col-md-8 col-md-offset-2">
<p class="text-center">Now let's verify your major. This lets others find you and others with their same major to, for example, make it easier to form study groups.</p>
</div>
</div>
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
<div class="panel-heading">
<h1 class="panel-title text-center"><strong>Now, let's verify your major.</strong></h1>
<h1 class="panel-title text-center"><strong>Major</strong></h1>
</div>
<div class="panel-body">
......
roomlist/accounts/templates/welcome_name.html
View file @ 47944fc5
......@@ -10,17 +10,24 @@
<div class="page-header" id="banner">
<div class="row">
<div class="col-md-12 text-center">
<h1><strong>SRCT</strong>ROOMLIST</a></strong> Welcome</h1>
<h1>Welcome to <strong>SRCT</strong>ROOMLIST! <small>Step 1 of 4</small></h1>
</div>
</div>
</div>
<div class="row">
<div class="col-md-8 col-md-offset-2">
<p class="text-center">Welcome to Roomlist, and thank you for signing in! Let's get started by verifying your name and then optionally selecting a gender identity.<p>
<p class="text-center"></p>
</div>
</div>
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
<div class="panel-heading">
<h1 class="panel-title text-center">Welcome to Roomlist! Let's get started by verifying your name and then optionally selecting a gender!</h1>
<h1 class="panel-title text-center">Name & Gender</h1>
</div>
<div class="panel-body">
......
roomlist/accounts/templates/welcome_privacy.html
View file @ 47944fc5
......@@ -10,17 +10,25 @@
<div class="page-header" id="banner">
<div class="row">
<div class="col-md-12 text-center">
<h1><strong>SRCT</strong>ROOMLIST</a></strong> Student Major</h1>
<h1>Welcome to <strong>SRCT</strong>ROOMLIST! <small>Step 2 of 4</small></h1>
</div>
</div>
</div>
<div class="row">
<div class="col-md-8 col-md-offset-2">
<p class="text-center">Great! Now to your housing information and settings. Here, you'll select which room you live in, and then choose who you want to be able to see that information.</p>
<p class="text-center"><strong>By default, your privacy is set to 'Floor'.</strong> That means only other students living on your floor can see your room.</p>
<p class="text-center">You can choose to set your privacy to 'Building', which will make your room visible to everyone living in your building, or to 'Campus', where it will be visible to anyone with a current Mason username and password.</p>
</div>
</div>
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
<div class="panel-heading">
<h1 class="panel-title text-center"><strong>Great! Now the reason you're here. Select which room you live in, and then choose who you want to be able to see where you live!</strong></h1>
<h1 class="panel-title text-center"><strong>Room & Privacy</strong></h1>
</div>
<div class="panel-body">
......
roomlist/accounts/templates/welcome_social.html
View file @ 47944fc5
......@@ -10,24 +10,52 @@
<div class="page-header" id="banner">
<div class="row">
<div class="col-md-12 text-center">
<h1><strong>SRCT</strong>ROOMLIST</a></strong> Student Major</h1>
<h1>Welcome to <strong>SRCT</strong>ROOMLIST! <small>Step 4 of 4</small></h1>
</div>
</div>
</div>
<div class="row">
<div class="col-md-8 col-md-offset-2">
<p class="text-center">We're not trying to recreate Facebook here. On this final step, you can choose point people to a variety of your social media accounts from your user page.</p>
<p class="text-center">You'll be asked to sign in, but that's just to verify the account actually belongs to you. With the exception of your choice to use your Facebook profile picture as your profile picture here, we don't see or use any information on these third-party sites.</p>
</div>
</div>
{% load socialaccount %} {% providers_media_js %}
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
<div class="panel-heading">
<h1 class="panel-title text-center"><strong>Now, finally, you can optionally point people to your various social media accounts. (We're not trying to replicate Facebook here. Note we can't see anything from them; the signin is just to verify it's actually your account.)</strong></h1>
<h1 class="panel-title text-center"><strong>Social Media Accounts</strong></h1>
</div>
<div class="panel-body">
<form action="" method="post">{% csrf_token %}
{{ form.as_p }}
<input type="submit" value="Save" class="btn btn-primary"/>
</form>
<div class="row text-center">
<div class="col-md-3">
<a href="{% provider_login_url 'facebook' method=js_sdk' process='connect' next='/welcome/{{ user.username }}/welcome/4/' %}">
<h4><i class="fa fa-facebook fa-3x"></i></h4>
</a>
</div>
<div class="col-md-3">
<a href="{% provider_login_url 'google' method=js_sdk' process='connect' next='/welcome/{{ user.username }}/welcome/4/' %}">
<h4><i class="fa fa-google fa-3x"></i></h4>
</a>
</div>
<div class="col-md-3">
<a href="{% provider_login_url 'twitter' method=js_sdk' process='connect' next='/welcome/{{ user.username }}/welcome/4/' %}">
<h4><i class="fa fa-twitter fa-3x"></i></h4>
</a>
</div>
<div class="col-md-3">
<a href="{% provider_login_url 'instagram' method=js_sdk' process='connect' next='/welcome/{{ user.username }}/welcome/4/' %}">
<h4><i class="fa fa-instagram fa-3x"></i></h4>
</a>
</div>
</div>
<input type="submit" value="Finish" class="btn btn-primary"/>
</div>
</div>
......
roomlist/accounts/views.py
View file @ 47944fc5
......@@ -2,6 +2,7 @@
from django.shortcuts import get_object_or_404
from django.http import HttpResponseForbidden
from django.views.generic import ListView, DetailView, UpdateView, FormView
from django.core.urlresolvers import reverse
# third party imports
from braces.views import LoginRequiredMixin
# imports from your apps
......@@ -113,36 +114,54 @@ class UpdateStudent(LoginRequiredMixin, UpdateView):
# welcome pages
class WelcomeName(LoginRequiredMixin, FormView):
template_name = 'welcomeName.html'
template_name = 'welcome_name.html'
form_class = WelcomeNameForm
login_url = 'login'
def get_success_url(self):
return reverse('welcomePrivacy',
kwargs={'slug':self.request.user.username})
class WelcomePrivacy(LoginRequiredMixin, UpdateView):
model = Student
fields = ['room', 'privacy', ]
context_object_name = 'student'
template_name = 'welcomePrivacy.html'
template_name = 'welcome_privacy.html'
login_url = 'login'
def get_success_url(self):
return reverse('welcomeMajor',
kwargs={'slug':self.request.user.username})
class WelcomeMajor(LoginRequiredMixin, UpdateView):
model = Student
fields = ['major', ]
context_object_name = 'student'
template_name = 'welcomeMajor.html'
template_name = 'welcome_major.html'
login_url = 'login'
def get_success_url(self):
return reverse('welcomeSocial',
kwargs={'slug':self.request.user.username})
class WelcomeSocial(LoginRequiredMixin, DetailView):
model = Student
context_object_name = 'student'
template_name = 'welcomeSocial.html'
template_name = 'welcome_social.html'
login_url = 'login'
# push to the message queue
def get_success_url(self):
return reverse('detail_student',
kwargs={'slug':self.request.user.username})
# majors pages
class ListMajors(LoginRequiredMixin, ListView):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment