Commit 4bc6da1f authored by Daniel W Bond's avatar Daniel W Bond
Browse files

Merge branch 'master' of git.gmu.edu:srct/srctweb

parents db14a32b b1884212
......@@ -50,9 +50,8 @@ only review by peers
* Figure out parallaxjs (use jquery) for front page
* Figure out intellectual property with GMU
* add piwik opt out link
* Set up the documents with ability to download pdfs and latex files
* finish writing privacy policy
* affix js for documents navigation
* affix js for documents navigation-- example http://www.bootstrapzero.com/bootstrap-template/affix-sidebar
---
......
......@@ -37,7 +37,7 @@ Privacy Policy
<div class="col-md-6">
<h2>Can I opt out?</h2>
<p>You may <a href="#">opt out</a> (or back in) of all future analytics. Many sites on the internet will not give you this option, or make it very difficult, so if you'd like to opt out of tracking everywhere, you can simply <a href="https://disconnect.me/">block their trackers</a>.</p>
<p>You may <a href="{{ url_for('optOut')}}">opt out</a> (or back in) of all future analytics. Many sites on the internet will not give you this option, or make it very difficult, so if you'd like to opt out of tracking everywhere, you can simply <a href="https://disconnect.me/">block their trackers</a>.</p>
<p>Depending on the project, your interactions and information you upload will be retained for the functionality of the project, and can't be removed, except as in violation of our <a href="/documents/terms_of_service">Terms of Service</a>, even upon graduation or other conclusion of your relationship with the university and the closure of your full access GMU account.</p>
</div>
......
......@@ -31,11 +31,11 @@ Not free as in free beer, but free as in free speech.
</blockquote>
<p>SRCT creates and provides services for the benefit our school. One of those
benefits is providing opportunities for everyone to contribute on our projects.
Not only does this provide students the chance to learn from experience, from
each other, and foster a sense of community, and not only do we believe that
our collective knowledge can build and deploy better projects than anyone could
individually, but that free computing is an ideal of
benefits is providing the opportunity for everyone to contribute to our
projects, giving students the chance to learn from experience, from each other,
and to foster a sense of community. We believe our collective knowledge can
build and deploy better projects than anyone could individually, but we
believe that free computing is an ideal of
<a href="https://www.gnu.org/education/edu-why.html">particular importance</a>
within an academic environment, where students are taught the virtues of
intellectual and social freedoms and independence.</p>
......@@ -51,13 +51,14 @@ Not free as in free beer, but free as in free speech.
</blockquote>
<p>We encourages every student to learn about programming through our
services, and believes that knowledge is of utmost importance in a time of
rapid, software-based societal changes. This learning, and by extension a full
understanding of the technological and cultural shifts we are currently
experiencing, is possible only with free software.</p>
<p>We encourage every student to learn about programming through our
services, and believe that that knowledge is of utmost importance in a time
of rapid, software-based societal changes. This learning opportunity, and by
extension a full understanding of the technological and cultural shifts we
are currently experiencing, is possible only with free software.</p>
<p>For developers, additional information on SRCT and software freedom, including information on licensing, is available on
<p>Additional information on SRCT and software freedom for developers,
including information on licensing, is available on
<a href="http://wiki.srct.gmu.edu/wiki/index.php/Software_Freedom">our wiki</a>.
</div>
......
......@@ -91,7 +91,7 @@ Terms of Service
will refer copyright matters to relevant Mason copyright and honor
code offices.</p>
<p>Otherwise, all content, be it publicly or private posted, is the
sole responsibilty of the person from whom it originated. We do
sole responsibilty of the person from whom it originated. We do not
guarantee the accuracy or reliabilty of any information posted by
people such as yourself. You retain the rights to your content as long
as George Mason University allows you to log in through their
......
......@@ -43,7 +43,7 @@ Usage Policy
<a href="http://www.gmu.edu/resources/committee/srp/stopit.html">StopIt</a>
team if appropriate.</p>
<p>System maintainers are the primary point of contact for urgent issues. A maintainer on-call can be reached at (302) GMU-SRCT.</p>
<p>System maintainers are the primary point of contact for urgent issues. <!--A maintainer on-call can be reached at (302) GMU-SRCT.--></p>
<legend>Handling service interruptions</legend>
<p>SRCT will make an effort to let users know about known service interruptions
......
......@@ -69,5 +69,22 @@
<script src="/static/js/jquery-2.0.3.min.js"></script>
<script src="/static/js/bootstrap.min.js"></script>
<!-- Piwik -->
<script type="text/javascript">
var _paq = _paq || [];
_paq.push(["trackPageView"]);
_paq.push(["enableLinkTracking"]);
(function() {
var u=(("https:" == document.location.protocol) ? "https" : "http") + "://whatsopen.gmu.edu/analytics/";
_paq.push(["setTrackerUrl", u+"piwik.php"]);
_paq.push(["setSiteId", "2"]);
var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
})();
</script>
<!-- End Piwik Code -->
</body>
</html>
<iframe style="border: 0; height: 200px; width: 600px;"
src="http://whatsopen.gmu.edu/analytics/index.php?module=CoreAdminHome&action=optOut&language=en"></iframe>
......@@ -73,9 +73,9 @@ Projects created and maintained by SRCT's members.
Renfred Harper<br>
<strong class="project-role">Developer:</strong>
Renfred Harper<br>
<strong class="project-role">Developer:</strong>
<strong class="project-role"></strong>
Tyler Hallada<br>
<strong class="project-role">Developer:</strong>
<strong class="project-role"></strong>
Daniel Bond<br>
<strong class="project-role">Repository:</strong>
<a href="http://git.gmu.edu/srct/whatsopen">git.gmu.edu/srct/whatsopen</a>
......@@ -122,9 +122,9 @@ Projects created and maintained by SRCT's members.
Eric Cawi<br>
<strong class="project-role">Developer:</strong>
Michel Rouly<br>
<strong class="project-role">Developer:</strong>
<strong class="project-role"></strong>
Eric Cawi<br>
<strong class="project-role">Developer:</strong>
<strong class="project-role"></strong>
Jonathan Horton<br>
<strong class="project-role">Repository:</strong>
<a href="http://git.gmu.edu/srct/bookshare">git.gmu.edu/srct/bookshare</a><br>
......@@ -169,7 +169,7 @@ Projects created and maintained by SRCT's members.
Daniel Bond<br>
<strong class="project-role">Developer:</strong>
Daniel Bond<br>
<strong class="project-role">Developer:</strong>
<strong class="project-role"></strong>
Nicholas Anderson<br>
<strong class="project-role">Repository:</strong>
<a href="http://git.gmu.edu/srct/SRCTweb">git.gmu.edu/srct/SRCTweb</a><br>
......@@ -191,11 +191,11 @@ Projects created and maintained by SRCT's members.
<strong class="project-role">Project Manager:</strong>
Ross Bragg<br>
<strong class="project-role">Project Manager:</strong>
<strong class="project-role"></strong>
Kunal Sarkhel<br>
<strong class="project-role">Developer:</strong>
Ross Bragg<br>
<strong class="project-role">Developer:</strong>
<strong class="project-role"></strong>
Kunal Sarkhel<br>
<strong class="project-role">Repository:</strong>
Coming soon
......
......@@ -34,7 +34,13 @@ def people():
@website.route('/projects/')
def projects():
return render_template("projects.html",
renderHead = True,
renderHead = True,
)
@website.route('/opt-out/')
def optOut():
return render_template("privacy_opt_out.html",
)
### DOCUMENTS ###
......
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