Skip to content

GitLab

Commit ec2b516d authored by Daniel W Bond's avatar Daniel W Bond
Browse files

Merge branch 'extra-notes'

parents c052f929 3d036a88
Hide whitespace changes
Inline Side-by-side
Showing with 190 additions and 55 deletions
roomlist/accounts/forms.py
View file @ ec2b516d
......@@ -70,7 +70,8 @@ class StudentUpdateForm(forms.Form):
room = SelectRoomField(queryset=Room.objects.all(), label='', required=False)
privacy = forms.ChoiceField(choices=Student.PRIVACY_CHOICES)
major = forms.ModelChoiceField(queryset=Major.objects.all(), required=False)
major = forms.ModelChoiceField(queryset=Major.objects.all(), required=False,
label='Major (select one)',)
graduating_year = forms.IntegerField(label='Graduating Year')
......
roomlist/accounts/templates/updateStudent.html
View file @ ec2b516d
......@@ -141,6 +141,12 @@
</div>
<div class="panel-body">
<p class="text-center">Off-campus locations along with a select number of locations <a href="{% url 'list_buildings'%}#Unsupported">on campus</a> aren't currently supported. You are still welcome to use Roomlist as a limited directory until we add support.</p>
<p class="text-center">
If you have a <a href="https://en.gravatar.com/">Gravatar profile</a> associated
with your <a href="https://masonlive.gmu.edu/">Masonlive email</a> address, your
default profile picture on this service will that Gravatar profile picture.
</p>
<form class="form-horizontal" autocomplete="off" action="" method="post">{% csrf_token %}
{{ my_form.as_p }}
......
roomlist/accounts/templates/welcome_major.html
View file @ ec2b516d
......@@ -23,7 +23,8 @@
<div class="row">
<div class="col-md-8 col-md-offset-2">
<p class="text-center">Now let's verify your major, {{ request.user.student.get_first_name_or_uname }}. This lets others find you and others with their same major, which, for example, makes it easier to form study groups.</p>
<p class="text-center">Now let's verify your major, {{ request.user.student.get_first_name_or_uname }}. This lets others find you and others with their same major, which, for example, makes it easier to form study groups.</p>
<p class="text-center">Please note right now you can only select one major. We're working on adding support for overachievers for an upcoming release.</p>
<p class="text-center">Then, add what year you expect you'll graduate.</p>
</div>
</div>
......
roomlist/accounts/templates/welcome_privacy.html
View file @ ec2b516d
......@@ -26,8 +26,12 @@
<div class="row">
<div class="col-md-8 col-md-offset-2">
<p class="text-center">Great, {{ request.user.student.get_first_name_or_uname }}! 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>
<p class="text-center"><strong>By default, your privacy is set to 'Floor'.</strong> That means only other students <em>living on your floor</em> can see your room or links to your social media profiles.
You can choose to set your privacy to '<strong>Building</strong>', which will make your room visible to everyone living in your building, or to '<strong>Campus</strong>', where it will be visible to anyone with a current Mason username and password.</p>
<p class="text-center">To close a rather straightforward privacy loophole, you can only change your room a limited number of times a year, after which you will need to
<a href="mailto:roomlist@lists.srct.gmu.edu?Subject=I%20Don%27t%20Know%20Where%20I%20Live%3A%20Halp%20Pls">email us</a>.
</p>
<p class="text-center">Off-campus locations along with a select number of locations <a href="{% url 'list_buildings' %}#Unsupported">on campus</a> are not currently supported. You are still welcome to use roomlist as a limited interactive directory until we add support.</p>
</div>
</div>
......
roomlist/housing/templates/list_buildings.html
View file @ ec2b516d
......@@ -55,6 +55,26 @@
<legend><strong><a name="Aquia" href="#Aquia">Aquia</a></strong></legend>
<div class="row">
{% for building in aquia %}
<div class="col-sm-3 text-center">
<a href="{{ building.get_absolute_url }}" class="btn btn-primary btn-lg btn-block">{{ building.name }}</a>
</div>
{% if forloop.counter|divisibleby:4 %}
</div>
<br />
<div class="row">
{% endif %}
{% endfor %}
</div>
<br />
<legend><a name="Unsupported" href="#Unsupported">Unsupported Buildings</a></legend>
<div class="row">
<div class="col-md-12">
<p>The following Mason housing locations are not currently supported:</p>
<p>Liberty Square, Beacon Hall, Mason Global Center, Piedmont, Tidewater, Student Apartments, and the Townhouses</p>
</div>
</div>
{% endblock %}
roomlist/templates/about.html
View file @ ec2b516d
......@@ -31,7 +31,8 @@ SRCT Roomlist &bull; About
<p>
Students can choose to share their housing information with other students
on their floor, in their building, or across campus, and link to their
social media accounts.
social media accounts. They can also find other students by degree program to
aid formation of study groups.
</p>
</div>
......@@ -66,4 +67,25 @@ SRCT Roomlist &bull; About
</div>
<div class="row">
<div class="col-md-12">
<h4>Thanks</h4>
<p>
This project was made possible through the collective contributions of
Jason Yeomans, Daniel Bond, David Haynes, Briana Abraham, Sherif Sarhan,
Ananya Dhawan, Greg Aronson, and David Stein, and uses APIs developed by
Akshay Karthik and Nicholas Anderson.
</p>
<p>
Nicholas Anderson, Michael Bailey, Briana Abraham, and Daniel Bond collaborated
on deployment.
</p>
<p>
Additional thanks are due to the Student-Run Computing and Technology executive
board from 2014-present, and our academic advisor,
<a href="https://cs.gmu.edu/~kdobolyi/">Professor Kinga Dobolyi</a>.
</p>
</div>
</div>
{% endblock %}
roomlist/templates/layouts/footer.html
View file @ ec2b516d
<hr>
<div class="container">
<div class="row">
<div class="col-lg-12">
<div class="col-md-8">
<div class="col-md-12">
<div class="col-md-6">
Email the developers:
<a href="mailto:roomlist@lists.srct.gmu.edu">
roomlist@list.srct.gmu.edu
</a>
<br />
<a href="{% url 'about' %}" target="_blank">About</a> &middot;
<a href="{% url 'privacy' %}" target="_blank">Privacy</a> &middot;
<a href="http://srct.gmu.edu/documents/usage_policy" target="_blank">Terms of Service</a> &middot;
<a href="http://srct.gmu.edu/contact/" target="_blank">Contact</a>
</div>
<div class="col-md-4">
<p class="muted pull-right">A <a href="http://srct.gmu.edu/projects" target="_blank">project</a> of <a href="http://www.gmu.edu/" target="_blank">Mason</a> <a href="http://srct.gmu.edu/" target="_blank"><strong>SRCT</strong></a>. <a href="https://www.gnu.org/licenses/gpl-3.0.html"
target="_blank">Contribute</a> to <a href="http://git.gmu.edu/srct/roomlist/" target="_blank">our code</a>.</p>
<div class="col-md-6">
<span class="pull-right">
A <a href="http://srct.gmu.edu/projects" target="_blank">project</a> of
<a href="http://www.gmu.edu/" target="_blank">Mason</a>
<a href="http://srct.gmu.edu/" target="_blank"><strong>SRCT</strong></a>, a
<a href="https://getconnected.gmu.edu/organization/srct" target="_blank">registered student org</a>.
</span>
<br />
<span class="pull-right">
Read and
<a href="https://git.gmu.edu//srct/roomlist/milestones/" target="_blank">contribute</a>
to our
<a href="https://www.gnu.org/licenses/quick-guide-gplv3.html" target="_blank">freely-licensed</a>
<a href="http://git.gmu.edu/srct/roomlist/" target="_blank">source</a>.</p>
</span>
</div>
</div>
</div>
......
roomlist/templates/privacy.html
View file @ ec2b516d
......@@ -14,79 +14,141 @@ SRCT Roomlist &bull; Privacy Policy
</div>
</div>
<div class="row">
<div class="col-lg-12">
<h4>Roomlist is a service provided by the
<a href="https://getconnected.gmu.edu/organization/srct">registered student organization</a>
<a href="https://srct.gmu.edu/">Student-Run Computing and Tech</a> where students
can voluntarily sign in and browse or share their information to create a campus
housing directory. To provide this service, we collect and store user information.
We hope this privacy policy is straightforward and understandable. Please
<a href="https://srct.gmu.edu/contact">contact</a> us with any questions,
comments, or concerns.
</h4>
</div>
</div>
<div class="row">
<div class="col-lg-6">
<h2>Who can see my information?</h2>
<p>
Roomlist was designed with student privacy foremost in mind. First, all
information is accessible only to users with full GMU credentials.
When your account is created, you have the option to make your housing
information viewable to your floor (the default choice), your entire
building, or campus-wide. When you choose to make your housing information
viewable campus-wide, it is also viewable to non-resident students.
Roomlist was designed with student privacy foremost in mind. First, all information
is accessible only to users with full
<a href="https://www.gmu.edu/">George Mason University</a> (“Mason”, “the university”)
credentials. When your account is created, you have the option to make your housing
and social media information viewable to your <strong>floor</strong> (the default
choice), your entire <strong>building</strong>, or <strong>campus</strong>-wide.
When you choose to make your housing information viewable campus-wide, it is also
viewable to non-residents or those who have elected not to provide their housing
information.
</p>
<p>
Your initial profile information is as provided through the university’s
<a href="https://peoplefinder.gmu.edu/">Peoplefinder directory</a>, and while only
the university may make changes to your name, major, or email as provided by this
service, you are welcome to change your name or major as displayed on this site
through your settings page. Please visit Peoplefinder’s site for more information,
including removal of your information from Peoplefinder.
</p>
<p>
Your profile information is as provided through the university, and
we are unable to make any change to your name, major, or email except
as changed by the university.
To close a rather straightforward privacy loophole, you can only change your room
a limited number of times a year, after which you will need to
<a href="mailto:roomlist@lists.srct.gmu.edu?Subject=I%20Don%27t%20Know%20Where%20I%20Live%3A%20Halp%20Pls">email us</a>.
</p>
</div>
<div class="col-lg-6">
<h2>What data do we collect?</h2>
<p>
We permanently retain anonymzied basic log information on your use
of this website via <a href="//piwik.org/" target="_blank">Piwik</a>
analytics. Piwik is self-hosted and open source, so your information will
not be sold or otherwise transferred to any other third part, nor will
your information be otherwise divulged, except by request of the
university of by lawful court order (an "order"). <strong>Ever.</strong>
We permanently retain log information of your use of this website via
<a href="https://piwik.org/">Piwik analytics</a>, as well as through server logs.
Piwik is <a href="https://piwik.org/privacy/">open source and self-hosted</a>, so your
information will not be sold or otherwise transferred to any other third party,
except in ways outlined below.
</p>
<p>
Information includes things like where you came from, when you last signed in,
which pages you visit, how long you stay, and where you click on the page.
Because we use the university’s Central Authentication Service for authentication,
a record of your visit may be retained by Mason.
</p>
<p>
Housing information you choose to provide, along with optional social
media account information will be retained until you modify or remove
that information, or your account is deleted.
To verify your social media accounts, you will be asked to sign in, but this is
solely to ensure the linked account actually belongs to you (e.g. not
<a href="https://twitter.com/realDonaldTrump">@realDonaldTrump</a>). With the
exception of your choice to use your Facebook profile picture as your profile
picture on this service, we don’t use any information from these third-party sites.
</p>
<p>
Nothing in this privacy policy should be contrued to limit any legal
defense or object to an order to disclose your information.
Housing information you choose to provide, along with optional social media account
information will be retained until you modify your information, or your account is
deleted. (Please note deleting social media links removes them only from our services,
and may not immediately remove them from the social media site’s servers. View your
related social media account’s settings page for more details.)
</p>
</div>
<div class="col-lg-6">
<h2>Why do we collect data?</h2>
<p>
Knowing how many users a service has and how often it gets used
tells us how popular that service is.
Knowing how many users a service has and how often it gets used tells us how popular
that service is, along with helping us determine how users use that service and how
we might best improve it. There is an
<a href="https://en.wikipedia.org/wiki/Usability_testing">entire fascinating field</a>
devoted to this area, and you can
<a href="https://cs.gmu.edu/~offutt/#Research">sign up for classes</a> to learn
more! Collecting access information also allows us to prevent or halt malicious
or illegal use of our service.
</p>
<p>
If a service is getting a lot of use, we will try to provide more
support and focus our attention on that service. Our user of your
information, both anonymized log data and the information you
choose to upload to the site is limited to improving your experience.
Site administrators may occasionally view some user data in their efforts
to maintain and improve the site.
If a service is getting a lot of use, we will try to provide more support and focus
our attention on that service. Our use of your information, both log data and the
information you choose to post, is limited to improving your experience. Select
site administrators may occasionally view some user data in their efforts to
maintain and improve the site. We may note anonymized statistics publicly as part
of our promotional or educational efforts. Your information will not be otherwise
divulged, except by request of the university of by lawful court order (an "order").
<strong>Ever</strong>.
</p>
<p>
The code for this site is publicly available at
<a href="http://git.gmu.edu/srct/roomlist">our git repository</a>, and
you are encouraged to exercise your
<a href="https://www.gnu.org/philosophy/free-sw.html">
basic computing freedoms</a>.
The code for this site is publicly available at our
<a href="https://git.gmu.edu/srct/roomlist">git repository</a>, and you are
encouraged to exercise your
<a href="https://www.gnu.org/philosophy/free-sw.html">basic computing freedoms</a>.
If you have any questions about any part of the code base, you are encouraged to
attend one of <a href="https://srct.gmu.edu/calendar">our meetings</a> or email us at
<a href="mailto:roomlist@lists.srct.gmu.edu">roomlist@lists.srct.gmu.edu</a> and we
will be happy to answer your questions.
</p>
</div>
<div class="col-lg-6">
<h2>What happens to my information?</h2>
<p>
Any interaction you make with this site can be removed at your discretion.
Please see your account settings page to limit your visibility to other
students, remove social media links, or delete your account in its entirety.
Should you delete your account, existing content flags or other issues made
to administrators will not be deleted.
Any interaction you post to site can be removed at your discretion. Please see your
account settings page to limit your visibility to other students, remove social media
links. Basic information obtained from the university, such as your username and email
address, cannot be changed. The name and major associated with your username from
Peoplefinder are stored for both for analytics and should any problem arise with
your account.
</p>
<p>
Your information may be removed if it is in violation of Mason's
<a href="https://http://universitypolicy.gmu.edu/policies/responsible-use-of-computing/">responsible use of computing policy</a>,
<a href="https://srct.gmu.edu/documents/usage_policy/">SRCT terms of service</a>,
or other order, or upon graduation or other termination of relationship with the
university and the end of your full access GMU account.
</p>
<p>
If you wish to delete your account, please email us at
<a href="mailto:roomlist@lists.srct.gmu.edu">roomlist@lists.srct.gmu.edu</a> or
contact SRCT <a href="https://srct.gmu.edu/contact">directly</a>.
</p>
<p>
Your information may be removed if it is in violation of GMU's responsible
use of computing policy, SRCT terms of service, or other order, or
upon graduation or other termination of relationship with the university and
the cesseation of your full access GMU account.
To reduce the load on our servers, nearly every page is cached, and it may take
a few moments for changes to be reflected.
<p>
Because we make regular database backups, your information may be retained for a
time after you modify it.
</p>
</p>
</div>
<div class="col-lg-12">
<h2>Other information</h2>
......@@ -94,15 +156,17 @@ SRCT Roomlist &bull; Privacy Policy
Should any portion of this privacy policy be deemed invalid, illegal,
or unenforceable, all other terms of the policy will nevertheless
remain in full force and effect.
No portion of this policy or SRCT's user policy supercedes any university policy.
Because our service requires GMU user account authentication, we do
not by design allow minors under the age of 13 to use services.
Our services are housed in Fairfax, Virginia, United States an are
subject to law within its jurisdiction.
We may revice this policy; when we make, at our discretion, a
significant change, we will display a prominent link to the change on
the front page of the site. Please
<a href="//srct.gmu.edu/contact/">contact us</a> with any questions,
comments, or concerns.
the front page of the site, and provide a reasonable amount of time for
users take action accordingly.
Nothing in this privacy policy should be construed to limit any legal defense or
object to an order to disclose your information.
</p>
</div>
</div>
......
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