merged chchchchchanges

srctweb/website/templates/contact.html

@@ -11,7 +11,7 @@ Drop us a line!
 {% endblock %}
 
 {% block content %}
-<h4><p>SRCT communicates through mailing lists, IRC on <a href="http://freenode.net/">freenode</a> (#srct), and via our
+<h4><p>SRCT communicates through mailing lists, our <a href="Slack team"></a>, IRC on <a href="http://freenode.net/">freenode</a> (#srct), and via our
 <a href="https://facebook.com/groups/gmu.srct">private Facebook group</a>--
 just request to be added.</p></h4>
 

srctweb/website/templates/documents/constitution.html

@@ -23,11 +23,11 @@ Constitution
 
     <legend><a name="ArticleI" href="#ArticleI">Article I — Name of Organization</a></legend>
     
-    <p>This student organization shall be named Student-Run Computing and Technology (SRCT). The website for SRCT shall be located at srct.gmu.edu.</p>
+    <p>This student organization shall be named Student-Run Computing and techology (SRCT). The website for SRCT shall be located at srct.gmu.edu.</p>
     
     <legend><a name="ArticleII" href="#ArticleII">Article II — Purpose of Organization</a></legend>
     
-    <p>Student-Run Computing and Technology (SRCT) will seek to enhance student computing at Mason. SRCT will focus on establishing and maintaining systems which would provide specific services to the general Mason community.</p>
+    <p>Student-Run Computing and techology (SRCT) will seek to enhance student computing at Mason. SRCT will focus on establishing and maintaining systems which would provide specific services to the general Mason community.</p>
     
     <legend><a name="ArticleIII" href="#ArticleIII">Article III — Membership</a></legend>
     

srctweb/website/templates/documents/intellectual_property.html

@@ -20,7 +20,7 @@ Intellectual Property
   
   <legend>Our intellectual property</legend>
 
-  <p>We're working on licensing with the Office of Technology Transfer, but until the details are ironed out, your contributions to SRCT projects fall under the same rules as <a href="http://catalog.gmu.edu/content.php?catoid=22&navoid=4772#STW">any other work you create</a> at GMU.</p>
+  <p>We're working on licensing with the Office of techology Transfer, but until the details are ironed out, your contributions to SRCT projects fall under the same rules as <a href="http://catalog.gmu.edu/content.php?catoid=22&navoid=4772#STW">any other work you create</a> at GMU.</p>
 
   </div>
   

srctweb/website/templates/index.html

@@ -14,7 +14,6 @@ SRCT
       <div class="container">
       <!-- <li class="layer" data-depth="0.00"> -->
         <div class="row">
-
           <div class="col-lg-offset-3 col-lg-2 col-md-offset-3 col-md-3 col-sm-offset-2 col-sm-3 col-xs-offset-2 col-xs-4">
             <img src="/static/img/SRCT_sq_white_shadow.png" class="img-responsive" alt="SRCT's logo" />
           </div>

srctweb/website/templates/layouts/base.html

@@ -79,7 +79,7 @@
       _paq.push(["enableLinkTracking"]);
     
       (function() {
-        var u=(("https:" == document.location.protocol) ? "https" : "http") + "://whatsopen.gmu.edu/analytics/";
+        var u="https://piwik.srct.gmu.edu/";
         _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";