final addition of real links

README.md

@@ -43,9 +43,9 @@ Note-- this should also be on the wiki
 * Logo in navbar
 * Set up the documents with ability to download pdfs and latex files
 * Logo image download permalinks
-* Use real links, not the direct file locations (yes, I know that's going to be really annoying to fix-- sorry)
 * add piwik opt out link
 * set some stuff up, e.g. with the people page, so adding new individuals doesn't involve touching the template
+* higher quality photo for the front page, carosel through pictures
 
 Further Requirements
 * Figure out intellectual property with GMU

srctweb/website/templates/layouts/footer.html

@@ -4,15 +4,15 @@
     <div class="col-lg-12 text-center">
       A <a href="http://srct.gmu.edu/projects">project</a> of
       <a href="https://www.gmu.edu">Mason</a>
-      <a href="http://srct.gmu.edu">SRCT</a>. Read
+      <a href="/">SRCT</a>. Read
       <a href="http://wiki.srct.gmu.edu/wiki/index.php/SRCTweb">documentation</a>
       and <a href="https://www.gnu.org/licenses/gpl-3.0.html">contribute</a>
       to <a href="http://git.gmu.edu/srct/srctweb">our code</a>.
-      Our <a href="/documents/usage_policy">Usage Policy</a>,
-      <a href="/documents/terms_of_service">Terms of Service</a>,
-      <a href="/documents/privacy_policy">Privacy Policy</a>, and
-      <a href="/documents/constitution">Constitution</a>.
-      <a href="/contact">Contact</a> Us.
+      Our <a href="{{ url_for('usagePolicy')}}">Usage Policy</a>,
+      <a href="{{ url_for('termsOfService')}}">Terms of Service</a>,
+      <a href="{{ url_for('privacyPolicy')}}">Privacy Policy</a>, and
+      <a href="{{ url_for('constitution')}}">Constitution</a>.
+      <a href="{{ url_for('contact')}}">Contact</a> Us.
       <a href="https://creativecommons.org/licenses/by-sa/4.0/legalcode">
       CC-BY-SA</a> 2014 Mason SRCT.
     </div>

srctweb/website/templates/layouts/navbar.html

@@ -12,24 +12,24 @@
 
     <div class="collapse navbar-collapse navbar-ex1-collapse">
       <ul class="nav navbar-nav">
-        <li><a href="/projects">Projects</a></li>
-        <li><a href="/people">People</a></li>
-	<li><a href="/events">Events</a></li>
-        <li><a href="/meetings">Meetings</a></li>
-	<li><a href="/calendar">Calendar</a>
+        <li><a href="{{ url_for('projects')}}">Projects</a></li>
+        <li><a href="{{ url_for('people')}}">People</a></li>
+	<li><a href="{{ url_for('events')}}">Events</a></li>
+        <li><a href="{{ url_for('meetings')}}">Meetings</a></li>
+	<li><a href="{{ url_for('calendar')}}">Calendar</a>
         <li class="dropdown">
         <a id="drop1" href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">Documents <b class="caret"></b></a>
           <ul class="dropdown-menu" role="menu" aria-labelledby="drop1">
-            <li role="presentation"><a role="menuitem" tabindex="-1" href="/documents/constitution">Constitution</a></li>
-            <li role="presentation"><a role="menuitem" tabindex="-1" href="/documents/usage_policy">Usage Policy</a></li>
-            <li role="presentation"><a role="menuitem" tabindex="-1" href="/documents/terms_of_service">Terms of Service</a></li>
-            <li role="presentation"><a role="menuitem" tabindex="-1" href="/documents/privacy_policy">Privacy Policy</a></li>
-            <li role="presentation"><a role="menuitem" tabindex="-1" href="/documents/intellectual_property">Intellectual Property</a></li>
-            <li role="presentation"><a role="menuitem" tabindex="-1" href="/documents/software_freedom">Software Freedom</a></li>
-            <li role="presentation"><a role="menuitem" tabindex="-1" href="/documents/logos">Logos</a></li>
+            <li role="presentation"><a role="menuitem" tabindex="-1" href="{{ url_for('constitution')}}">Constitution</a></li>
+            <li role="presentation"><a role="menuitem" tabindex="-1" href="{{ url_for('usagePolicy')}}">Usage Policy</a></li>
+            <li role="presentation"><a role="menuitem" tabindex="-1" href="{{ url_for('termsOfService')}}">Terms of Service</a></li>
+            <li role="presentation"><a role="menuitem" tabindex="-1" href="{{ url_for('privacyPolicy')}}">Privacy Policy</a></li>
+            <li role="presentation"><a role="menuitem" tabindex="-1" href="{{ url_for('intellectualProperty')}}">Intellectual Property</a></li>
+            <li role="presentation"><a role="menuitem" tabindex="-1" href="{{ url_for('softwareFreedom')}}">Software Freedom</a></li>
+            <li role="presentation"><a role="menuitem" tabindex="-1" href="{{ url_for('logos')}}">Logos</a></li>
           </ul>
         </li>
-	<li><a href="/contact">Contact</a>
+	<li><a href="{{ url_for('contact')}}">Contact</a>
       </ul>
     </div><!--/.nav-collapse -->
   </div>