Commit 5dfa65db authored by Daniel W Bond's avatar Daniel W Bond
Browse files

fixed all merge conflicts except in people and projects

parents e4cda882 5c864220
......@@ -15,8 +15,6 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Also add information on how to contact you by electronic and paper mail.
srct-general@lists.srct.gmu.edu
Mason SRCT
......
......@@ -46,22 +46,14 @@ BETA DONE:: DROP MIC
only review by peers
**Also Needs to Be Done**
* fix the css so there's the nicer titles on all the pages
* set some stuff up, e.g. with the people page, so adding new individuals doesn't involve touching the template
* Fix carousel through pictures on front page
* 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
EVENTS AND MEETING NOTES
* **note: events and meeting notes might be on the wiki page... undecided**
* The meeting page needs to have forms for the secretary to take notes, and pagination
* RSS feed for the meeting notespage
* Add stuff to the events page-- same idea as meeting page, forms, pagination, and RSS
* Requires being able to log in in order for the secretary to take notes, etc
About GMU SRCT
---
**S**tudent - **R**un **C**omputing and **T**echnology (*SRCT*, pronounced "circuit") is a student organization at George Mason University which enhances student computing at Mason. SRCT establishes and maintains systems which provide specific services for Mason's community.
......@@ -3,5 +3,6 @@ Jinja2==2.7.1
MarkupSafe==0.18
Werkzeug==0.9.4
argparse==1.2.1
gunicorn==18.0
itsdangerous==0.23
wsgiref==0.1.2
......@@ -4,3 +4,6 @@ from website import website
if __name__ == 'main': ## This is for execution via gunicorn.
website.run(debug=True)
# gunicorn command
# gunicorn srctweb:website -b 127.0.0.1:8001
......@@ -5,11 +5,9 @@ html,
body {
height:100%;
}
a[name] {
padding-top: 50px;
}
/* Wrapper for page content to push down footer */
#wrap {
min-height: 100%;
......@@ -19,32 +17,27 @@ a[name] {
/* Pad bottom by footer height */
padding: 0 0 75px;
}
/* Set the fixed height of the footer here */
#footer {
height: 40px;
background-color: #f5f5f5;
}
.jumbostyle {
background: url(/static/img/renfredhaxxor.jpg) no-repeat;
background: url(/static/img/renfredhaxxor.png) no-repeat;
background-size: cover;
background-position: 20%;
box-shadow: inset 0px 0px 20px #333;
padding-top: 105px;
padding-bottom: 90px;
padding-top: 100px;
padding-bottom: 100px;
}
.transparency {
background-color: rgba(256, 256, 256, 0.6);
background-color: rgba(256,256,256,0.6);
padding: 5px 0px 5px 0px;
border-radius: 5px;
}
.srctlogo {
width: 10px;
}
.smidge {
padding-bottom: 10px;
}
......@@ -116,4 +109,4 @@ a[name] {
.page-header {
margin-top:0;
border-bottom:none;
}
\ No newline at end of file
}
//============================================================
//
// The MIT License
//
// Copyright (C) 2014 Matthew Wagerfield - @mwagerfield
//
// Permission is hereby granted, free of charge, to any
// person obtaining a copy of this software and associated
// documentation files (the "Software"), to deal in the
// Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute,
// sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do
// so, subject to the following conditions:
//
// The above copyright notice and this permission notice
// shall be included in all copies or substantial portions
// of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY
// OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
// EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
// AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
// OR OTHER DEALINGS IN THE SOFTWARE.
//
//============================================================
(function(t,i,e){"use strict";function s(t,i){this.element=t,this.layers=t.getElementsByClassName("layer");var e={calibrateX:this.data(this.element,"calibrate-x"),calibrateY:this.data(this.element,"calibrate-y"),invertX:this.data(this.element,"invert-x"),invertY:this.data(this.element,"invert-y"),limitX:this.data(this.element,"limit-x"),limitY:this.data(this.element,"limit-y"),scalarX:this.data(this.element,"scalar-x"),scalarY:this.data(this.element,"scalar-y"),frictionX:this.data(this.element,"friction-x"),frictionY:this.data(this.element,"friction-y")};for(var s in e)null===e[s]&&delete e[s];this.extend(this,a,i,e),this.calibrationTimer=null,this.calibrationFlag=!0,this.enabled=!1,this.depths=[],this.raf=null,this.ox=0,this.oy=0,this.ow=0,this.oh=0,this.cx=0,this.cy=0,this.ix=0,this.iy=0,this.mx=0,this.my=0,this.vx=0,this.vy=0,this.onMouseMove=this.onMouseMove.bind(this),this.onDeviceOrientation=this.onDeviceOrientation.bind(this),this.onOrientationTimer=this.onOrientationTimer.bind(this),this.onCalibrationTimer=this.onCalibrationTimer.bind(this),this.onAnimationFrame=this.onAnimationFrame.bind(this),this.onWindowResize=this.onWindowResize.bind(this),this.initialise()}var o="Parallax",n=30,a={calibrationThreshold:100,calibrationDelay:500,supportDelay:500,calibrateX:!1,calibrateY:!0,invertX:!0,invertY:!0,limitX:!1,limitY:!1,scalarX:10,scalarY:10,frictionX:.1,frictionY:.1};s.prototype.extend=function(){if(arguments.length>1)for(var t=arguments[0],i=1,e=arguments.length;e>i;i++){var s=arguments[i];for(var o in s)t[o]=s[o]}},s.prototype.data=function(t,i){return this.deserialize(t.getAttribute("data-"+i))},s.prototype.deserialize=function(t){return"true"===t?!0:"false"===t?!1:"null"===t?null:!isNaN(parseFloat(t))&&isFinite(t)?parseFloat(t):t},s.prototype.offset=function(t){for(var e,s,o=0,n=0;t&&!isNaN(t.offsetLeft)&&!isNaN(t.offsetTop);)t===i.body?(e=i.documentElement.scrollLeft,s=i.documentElement.scrollTop):(e=t.scrollLeft,s=t.scrollTop),o+=t.offsetLeft-e,n+=t.offsetTop-s,t=t.offsetParent;return{top:n,left:o}},s.prototype.camelCase=function(t){return t.replace(/-+(.)?/g,function(t,i){return i?i.toUpperCase():""})},s.prototype.transformSupport=function(s){for(var o=i.createElement("div"),n=!1,a=null,r=!1,h=null,l=null,p=0,m=this.vendors.length;m>p;p++)if(null!==this.vendors[p]?(h=this.vendors[p][0]+"transform",l=this.vendors[p][1]+"Transform"):(h="transform",l="transform"),o.style[l]!==e){n=!0;break}switch(s){case"2D":r=n;break;case"3D":n&&(i.body.appendChild(o),o.style[l]="translate3d(1px,1px,1px)",a=t.getComputedStyle(o).getPropertyValue(h),r=a!==e&&a.length>0&&"none"!==a,i.body.removeChild(o))}return r},s.prototype.ww=null,s.prototype.wh=null,s.prototype.hw=null,s.prototype.hh=null,s.prototype.portrait=null,s.prototype.desktop=!navigator.userAgent.match(/(iPhone|iPod|iPad|Android|BlackBerry|BB10|mobi|tablet|opera mini|nexus 7)/i),s.prototype.vendors=[null,["-webkit-","webkit"],["-moz-","Moz"],["-o-","O"],["-ms-","ms"]],s.prototype.motionSupport=!!t.DeviceMotionEvent,s.prototype.orientationSupport=!!t.DeviceOrientationEvent,s.prototype.orientationStatus=0,s.prototype.transform2DSupport=s.prototype.transformSupport("2D"),s.prototype.transform3DSupport=s.prototype.transformSupport("3D"),s.prototype.initialise=function(){this.transform3DSupport&&this.accelerate(this.element);var i=t.getComputedStyle(this.element);"static"===i.getPropertyValue("position")&&(this.element.style.position="relative");for(var e=0,s=this.layers.length;s>e;e++){var o=this.layers[e];this.transform3DSupport&&this.accelerate(o),o.style.position=e?"absolute":"relative",o.style.display="block",o.style.height="100%",o.style.width="100%",o.style.left=0,o.style.top=0,this.depths.push(this.data(o,"depth")||0)}this.updateDimensions(),this.enable(),this.queueCalibration(this.calibrationDelay)},s.prototype.updateDimensions=function(){this.ox=this.offset(this.element).left,this.oy=this.offset(this.element).top,this.ow=this.element.offsetWidth,this.oh=this.element.offsetHeight,this.ww=t.innerWidth,this.wh=t.innerHeight,this.hw=this.ww/2,this.hh=this.wh/2},s.prototype.queueCalibration=function(t){clearTimeout(this.calibrationTimer),this.calibrationTimer=setTimeout(this.onCalibrationTimer,t)},s.prototype.enable=function(){this.enabled||(this.enabled=!0,this.orientationSupport?(this.portrait=null,t.addEventListener("deviceorientation",this.onDeviceOrientation),setTimeout(this.onOrientationTimer,this.supportDelay)):(this.cx=0,this.cy=0,this.portrait=!1,t.addEventListener("mousemove",this.onMouseMove)),t.addEventListener("resize",this.onWindowResize),this.raf=requestAnimationFrame(this.onAnimationFrame))},s.prototype.disable=function(){this.enabled&&(this.enabled=!1,this.orientationSupport?t.removeEventListener("deviceorientation",this.onDeviceOrientation):t.removeEventListener("mousemove",this.onMouseMove),t.removeEventListener("resize",this.onWindowResize),cancelAnimationFrame(this.raf))},s.prototype.calibrate=function(t,i){this.calibrateX=t===e?this.calibrateX:t,this.calibrateY=i===e?this.calibrateY:i},s.prototype.invert=function(t,i){this.invertX=t===e?this.invertX:t,this.invertY=i===e?this.invertY:i},s.prototype.friction=function(t,i){this.frictionX=t===e?this.frictionX:t,this.frictionY=i===e?this.frictionY:i},s.prototype.scalar=function(t,i){this.scalarX=t===e?this.scalarX:t,this.scalarY=i===e?this.scalarY:i},s.prototype.limit=function(t,i){this.limitX=t===e?this.limitX:t,this.limitY=i===e?this.limitY:i},s.prototype.clamp=function(t,i,e){return t=Math.max(t,i),t=Math.min(t,e)},s.prototype.css=function(t,i,s){for(var o=null,n=0,a=this.vendors.length;a>n;n++)if(o=null!==this.vendors[n]?this.camelCase(this.vendors[n][1]+"-"+i):i,t.style[o]!==e){t.style[o]=s;break}},s.prototype.accelerate=function(t){this.css(t,"transform","translate3d(0,0,0)"),this.css(t,"transform-style","preserve-3d"),this.css(t,"backface-visibility","hidden")},s.prototype.setPosition=function(t,i,e){i+="%",e+="%",this.transform3DSupport?this.css(t,"transform","translate3d("+i+","+e+",0)"):this.transform2DSupport?this.css(t,"transform","translate("+i+","+e+")"):(t.style.left=i,t.style.top=e)},s.prototype.onOrientationTimer=function(){this.orientationSupport&&0===this.orientationStatus&&(this.disable(),this.orientationSupport=!1,this.enable())},s.prototype.onCalibrationTimer=function(){this.calibrationFlag=!0},s.prototype.onWindowResize=function(){this.updateDimensions()},s.prototype.onAnimationFrame=function(){var t=this.ix-this.cx,i=this.iy-this.cy;(Math.abs(t)>this.calibrationThreshold||Math.abs(i)>this.calibrationThreshold)&&this.queueCalibration(0),this.portrait?(this.mx=(this.calibrateX?i:this.iy)*this.scalarX,this.my=(this.calibrateY?t:this.ix)*this.scalarY):(this.mx=(this.calibrateX?t:this.ix)*this.scalarX,this.my=(this.calibrateY?i:this.iy)*this.scalarY),isNaN(parseFloat(this.limitX))||(this.mx=this.clamp(this.mx,-this.limitX,this.limitX)),isNaN(parseFloat(this.limitY))||(this.my=this.clamp(this.my,-this.limitY,this.limitY)),this.vx+=(this.mx-this.vx)*this.frictionX,this.vy+=(this.my-this.vy)*this.frictionY;for(var e=0,s=this.layers.length;s>e;e++){var o=this.layers[e],n=this.depths[e],a=this.vx*n*(this.invertX?-1:1),r=this.vy*n*(this.invertY?-1:1);this.setPosition(o,a,r)}this.raf=requestAnimationFrame(this.onAnimationFrame)},s.prototype.onDeviceOrientation=function(t){if(!this.desktop&&null!==t.beta&&null!==t.gamma){this.orientationStatus=1;var i=(t.beta||0)/n,e=(t.gamma||0)/n,s=this.wh>this.ww;this.portrait!==s&&(this.portrait=s,this.calibrationFlag=!0),this.calibrationFlag&&(this.calibrationFlag=!1,this.cx=i,this.cy=e),this.ix=i,this.iy=e}},s.prototype.onMouseMove=function(t){this.ix=(t.pageX-this.hw)/this.hw,this.iy=(t.pageY-this.hh)/this.hh},t[o]=s})(window,document),function(){for(var t=0,i=["ms","moz","webkit","o"],e=0;i.length>e&&!window.requestAnimationFrame;++e)window.requestAnimationFrame=window[i[e]+"RequestAnimationFrame"],window.cancelAnimationFrame=window[i[e]+"CancelAnimationFrame"]||window[i[e]+"CancelRequestAnimationFrame"];window.requestAnimationFrame||(window.requestAnimationFrame=function(i){var e=(new Date).getTime(),s=Math.max(0,16-(e-t)),o=window.setTimeout(function(){i(e+s)},s);return t=e+s,o}),window.cancelAnimationFrame||(window.cancelAnimationFrame=function(t){clearTimeout(t)})}();
......@@ -13,7 +13,11 @@ Upcoming events and meetings!
{% block content %}
<div class="text-center">
<div class="visible-lg">
<div class="googlecal-container">
<iframe src="https://www.google.com/calendar/embed?title=Student-Run%20Computing%20and%20Technology&amp;showPrint=0&amp;showCalendars=0&amp;height=400&amp;wkst=1&amp;bgcolor=%23FFFFFF&amp;src=kaiuicpoki9p3u92eklent0eec%40group.calendar.google.com&amp;color=%23711616&amp;ctz=America%2FNew_York" style=" border-width:0 " width="425" height="350" frameborder="0" scrolling="no"></iframe>
</div>
<!-- <div class="visible-lg">
<iframe src="https://www.google.com/calendar/embed?title=Student-Run%20Computing%20and%20Technology&amp;showPrint=0&amp;showCalendars=0&amp;height=700&amp;wkst=1&amp;bgcolor=%23FFFFFF&amp;src=kaiuicpoki9p3u92eklent0eec%40group.calendar.google.com&amp;color=%23711616&amp;ctz=America%2FNew_York" style=" border-width:0 " width="850" height="650" frameborder="0" scrolling="no"></iframe>
</div>
......@@ -23,7 +27,7 @@ Upcoming events and meetings!
<div class="visible-xs">
<iframe src="https://www.google.com/calendar/embed?title=Student-Run%20Computing%20and%20Technology&amp;showPrint=0&amp;showCalendars=0&amp;height=400&amp;wkst=1&amp;bgcolor=%23FFFFFF&amp;src=kaiuicpoki9p3u92eklent0eec%40group.calendar.google.com&amp;color=%23711616&amp;ctz=America%2FNew_York" style=" border-width:0 " width="600" height="400" frameborder="0" scrolling="no"></iframe>
</div>
</div> -->
</div>
{% endblock %}
......@@ -41,7 +41,10 @@ srct-devs@lists.srct.gmu.edu
<a href="https://twitter.com/MasonSRCT">Twitter account</a>,
a <a href="https://reddit.com/MasonSRCT">subreddit</a>,
and many of our members are regular contributors on
<a href="https://reddit.com/r/gmu/">/r/gmu</a>.</p>
<a href="https://reddit.com/r/gmu/">/r/gmu</a>.
The <a href="http://si.gmu.edu/">Office of Student Involvement</a>
has all registered student organizations maintain pages on
<a href="https://gmu.collegiatelink.net/organization/srct">CollegiateLink</a>.</p>
<legend><strong>Mail</strong></legend>
......
......@@ -15,18 +15,21 @@ Constitution
<div class="row">
<div class="col-sm-10">
<p><strong><em>Last updated September 12, 2013</em></strong></p>
<div class="text-center">
<p><h4><strong><em>Last updated September 12, 2013</em></strong></h4></p>
<p><small>email questions, comments, and suggestions to <em>exec@srct.gmu.edu</em></small></p>
<legend><a name="ArticleI">Article I — Name of Organization</a></legend>
<p><small><a href="https://drive.google.com/uc?export=download&id=0BzEh4MeQpxTbb0pDdTc2Q1lpSFE">download PDF</a></small></p>
</div>
<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>
<legend><a name="ArticleII">Article II — Purpose of Organization</a></legend>
<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>
<legend><a name="ArticleIII">Article III — Membership</a></legend>
<legend><a name="ArticleIII" href="#ArticleIII">Article III — Membership</a></legend>
<p>Membership in this organization will not be restricted on the basis of race, color, religion, national origin, disability, sexual orientation, veteran status, sex, or age. Membership is open to all currently enrolled GMU students in good academic standing with the university with a minimum cumulative GPA of at least 2.5 who support the advancement of the organization’s principles. SRCT members will be classified as either contributors or developers.</p>
......@@ -42,7 +45,7 @@ Constitution
<p>In extraordinary circumstances, if a motion is brought and seconded at a meeting for membership revocation, all SRCT members will be notified by email of the motion not less than five days before the following meeting. If a quorum is present, an official vote will be held by secret ballot, requiring a 3/4 supermajority of present members. Although an official vote, all present contributors will be allowed to present arguments for or against membership revocation prior to the vote. Members will be automatically removed if suspended or expelled by the university.</p>
<legend><a name="ArticleIV">Article IV — Officers</a></legend>
<legend><a name="ArticleIV" href="#ArticleIV">Article IV — Officers</a></legend>
<p>Officers’ terms are for one semester; there are no term limits. All officers will attend any training required by OSI. The Executive Board is defined as the collection of all five officer positions.</p>
......@@ -74,7 +77,7 @@ Constitution
<p>The primary Advisor shall be a member of the faculty or staff at George Mason University. The Advisor shall be selected by agreement of the officers, and it is the responsibility of the officers to find a replacement should the Advisor no longer be suited for the position. The Advisor may offer guidance and support for SRCT, but may not participate in any votes.</p>
<legend><a name="ArticleV">Article V — Elections</a></legend>
<legend><a name="ArticleV" href="#ArticleV">Article V — Elections</a></legend>
<p><strong>Standard Elections</strong></p>
......@@ -84,7 +87,7 @@ Constitution
<p>In event of the resignation of an officer, then an election will be held to fill their position for the remainder of the term following the procedures above.</p>
<legend><a name="ArticleVI">Article VI — Meetings</a></legend>
<legend><a name="ArticleVI" href="ArticleVI">Article VI — Meetings</a></legend>
<p>SRCT shall meet on a weekly basis. Meetings should be scheduled to accommodate the greatest number of members. All members of the Mason community are welcome to attend meetings. Attendance by SRCT contributors and developers is not mandatory, but highly recommended. Consistent absence may be viewed as grounds for revocation of membership.</p>
......@@ -104,15 +107,15 @@ Constitution
<p>Development meetings are not subject to the rigorous standards outlined above. They are entirely optional meetings. Development meetings will be used to provide developers and contributors with an opportunity to meet in person and work together on projects in a relaxed atmosphere. There are no time or attendance limits, requirements, or expectations placed on development meetings.</p>
<legend><a name="ArticleVII">Article VII — Finance</a></legend>
<legend><a name="ArticleVII" href="#ArticleVII">Article VII — Finance</a></legend>
<p>No dues shall ever be required as part of SRCT membership. This clause shall not be construed to restrict other fundraising mechanisms.</p>
<legend><a name="ArticleVIII">Article VIII — Amendments</a></legend>
<legend><a name="ArticleVIII" href="#ArticleVII">Article VIII — Amendments</a></legend>
<p>Two members may jointly propose an explicitly defined constitutional amendment at a meeting. All members will be emailed a copy of the language of the amendment and have no fewer than five days to review the proposed amendment. At the next SRCT meeting, if a quorum is present, the amendment may be approved 3/4 by a vote by secret ballot of all present members. This is considered an official vote. The Office of Student Involvement must review all amendments in the same matter as a completely new constitution. Changes which do not affect the meaning of the text, such as updated formatting and links, may be made at the discretion of the board.</p>
<legend><a name="ArticleIX">Article IX — Ratification</a></legend>
<legend><a name="ArticleIX" href="ArticleIX">Article IX — Ratification</a></legend>
<p>This constitution shall become effective upon approval by a 3/4 vote of the membership, and the Assistant Director for Recognized Student Organizations. This is considered an official vote.</p>
......@@ -120,19 +123,17 @@ Constitution
<div class="col-sm-2 hidden-xs">
<h4 id="nav-pills"><strong>Documents</strong></h4>
<div class="bs-example">
<ul class="nav nav-pills">
<li class="active"><a href="{{ url_for('constitution') }}">Constitution</a></li>
<li><a href="{{ url_for('usagePolicy') }}">Usage Policy</a></li>
<li><a href="{{ url_for('termsOfService') }}">Terms of Service</a></li>
<li><a href="{{ url_for('privacyPolicy') }}">Privacy Policy</a></li>
<li><a href="{{ url_for('intellectualProperty') }}">Intellectual Property</a></li>
<li><a href="{{ url_for('softwareFreedom') }}">Software Freedom</a></li>
<li><a href="{{ url_for('logos') }}">Logos</a></li>
</ul>
</div>
<h4><strong>Documents</strong></h4>
<div class="list-group">
<a href="{{ url_for('constitution') }}" class="list-group-item active">Constitution</a>
<a href="{{ url_for('usagePolicy') }}" class="list-group-item">Usage Policy</a>
<a href="{{ url_for('termsOfService') }}" class="list-group-item">Terms of Service</a>
<a href="{{ url_for('privacyPolicy') }}" class="list-group-item">Privacy Policy</a>
<a href="{{ url_for('intellectualProperty') }}" class="list-group-item">Intellectual Property</a>
<a href="{{ url_for('softwareFreedom') }}" class="list-group-item">Software Freedom</a>
<a href="{{ url_for('logos') }}" class="list-group-item">Logos</a>
</div>
</div>
</div>
......
......@@ -26,19 +26,17 @@ Intellectual Property
<div class="col-sm-2 hidden-xs">
<h4 id="nav-pills"><strong>Documents</strong></h4>
<div class="bs-example">
<ul class="nav nav-pills">
<li><a href="{{ url_for('constitution') }}">Constitution</a></li>
<li><a href="{{ url_for('usagePolicy') }}">Usage Policy</a></li>
<li><a href="{{ url_for('termsOfService') }}">Terms of Service</a></li>
<li><a href="{{ url_for('privacyPolicy') }}">Privacy Policy</a></li>
<li class="active"><a href="{{ url_for('intellectualProperty') }}">Intellectual Property</a></li>
<li><a href="{{ url_for('softwareFreedom') }}">Software Freedom</a></li>
<li><a href="{{ url_for('logos') }}">Logos</a></li>
</ul>
</div>
<h4><strong>Documents</strong></h4>
<div class="list-group">
<a href="{{ url_for('constitution') }}" class="list-group-item">Constitution</a>
<a href="{{ url_for('usagePolicy') }}" class="list-group-item">Usage Policy</a>
<a href="{{ url_for('termsOfService') }}" class="list-group-item">Terms of Service</a>
<a href="{{ url_for('privacyPolicy') }}" class="list-group-item">Privacy Policy</a>
<a href="{{ url_for('intellectualProperty') }}" class="list-group-item active">Intellectual Property</a>
<a href="{{ url_for('softwareFreedom') }}" class="list-group-item">Software Freedom</a>
<a href="{{ url_for('logos') }}" class="list-group-item">Logos</a>
</div>
</div>
</div>
......
......@@ -38,22 +38,20 @@ Logos
PNG (Small)</a></strong></div>
</div>
<div class="col-sm-2 hidden-xs">
<h4 id="nav-pills"><strong>Documents</strong></h4>
<div class="bs-example">
<ul class="nav nav-pills">
<li><a href="{{ url_for('constitution') }}">Constitution</a></li>
<li><a href="{{ url_for('usagePolicy') }}">Usage Policy</a></li>
<li><a href="{{ url_for('termsOfService') }}">Terms of Service</a></li>
<li><a href="{{ url_for('privacyPolicy') }}">Privacy Policy</a></li>
<li><a href="{{ url_for('intellectualProperty') }}">Intellectual Property</a></li>
<li><a href="{{ url_for('softwareFreedom') }}">Software Freedom</a></li>
<li class="active"><a href="{{ url_for('logos') }}">Logos</a></li>
</ul>
</div>
<h4><strong>Documents</strong></h4>
<div class="list-group">
<a href="{{ url_for('constitution') }}" class="list-group-item">Constitution</a>
<a href="{{ url_for('usagePolicy') }}" class="list-group-item">Usage Policy</a>
<a href="{{ url_for('termsOfService') }}" class="list-group-item">Terms of Service</a>
<a href="{{ url_for('privacyPolicy') }}" class="list-group-item">Privacy Policy</a>
<a href="{{ url_for('intellectualProperty') }}" class="list-group-item">Intellectual Property</a>
<a href="{{ url_for('softwareFreedom') }}" class="list-group-item">Software Freedom</a>
<a href="{{ url_for('logos') }}" class="list-group-item active">Logos</a>
</div>
</div>
</div>
......
......@@ -56,19 +56,17 @@ Privacy Policy
<div class="col-sm-2 hidden-xs">
<h4 id="nav-pills"><strong>Documents</strong></h4>
<div class="bs-example">
<ul class="nav nav-pills">
<li><a href="{{ url_for('constitution') }}">Constitution</a></li>
<li><a href="{{ url_for('usagePolicy') }}">Usage Policy</a></li>
<li><a href="{{ url_for('termsOfService') }}">Terms of Service</a></li>
<li class="active"><a href="{{ url_for('privacyPolicy') }}">Privacy Policy</a></li>
<li><a href="{{ url_for('intellectualProperty') }}">Intellectual Property</a></li>
<li><a href="{{ url_for('softwareFreedom') }}">Software Freedom</a></li>
<li><a href="{{ url_for('logos') }}">Logos</a></li>
</ul>
</div>
<h4><strong>Documents</strong></h4>
<div class="list-group">
<a href="{{ url_for('constitution') }}" class="list-group-item">Constitution</a>
<a href="{{ url_for('usagePolicy') }}" class="list-group-item">Usage Policy</a>
<a href="{{ url_for('termsOfService') }}" class="list-group-item">Terms of Service</a>
<a href="{{ url_for('privacyPolicy') }}" class="list-group-item active">Privacy Policy</a>
<a href="{{ url_for('intellectualProperty') }}" class="list-group-item">Intellectual Property</a>
<a href="{{ url_for('softwareFreedom') }}" class="list-group-item">Software Freedom</a>
<a href="{{ url_for('logos') }}" class="list-group-item">Logos</a>
</div>
</div>
</div>
......
......@@ -64,19 +64,17 @@ Not free as in free beer, but free as in free speech.
<div class="col-sm-2 hidden-xs">
<h4 id="nav-pills"><strong>Documents</strong></h4>
<div class="bs-example">
<ul class="nav nav-pills">
<li><a href="{{ url_for('constitution') }}">Constitution</a></li>
<li><a href="{{ url_for('usagePolicy') }}">Usage Policy</a></li>
<li><a href="{{ url_for('termsOfService') }}">Terms of Service</a></li>
<li><a href="{{ url_for('privacyPolicy') }}">Privacy Policy</a></li>
<li><a href="{{ url_for('intellectualProperty') }}">Intellectual Property</a></li>
<li class="active"><a href="{{ url_for('softwareFreedom') }}">Software Freedom</a></li>
<li><a href="{{ url_for('logos') }}">Logos</a></li>
</ul>
</div>
<h4><strong>Documents</strong></h4>
<div class="list-group">
<a href="{{ url_for('constitution') }}" class="list-group-item">Constitution</a>
<a href="{{ url_for('usagePolicy') }}" class="list-group-item">Usage Policy</a>
<a href="{{ url_for('termsOfService') }}" class="list-group-item">Terms of Service</a>
<a href="{{ url_for('privacyPolicy') }}" class="list-group-item">Privacy Policy</a>
<a href="{{ url_for('intellectualProperty') }}" class="list-group-item">Intellectual Property</a>
<a href="{{ url_for('softwareFreedom') }}" class="list-group-item active">Software Freedom</a>
<a href="{{ url_for('logos') }}" class="list-group-item">Logos</a>
</div>
</div>
</div>
......
......@@ -173,19 +173,17 @@ Terms of Service
<div class="col-sm-2 hidden-xs">
<h4 id="nav-pills"><strong>Documents</strong></h4>
<div class="bs-example">
<ul class="nav nav-pills">
<li><a href="{{ url_for('constitution') }}">Constitution</a></li>
<li><a href="{{ url_for('usagePolicy') }}">Usage Policy</a></li>
<li class="active"><a href="{{ url_for('termsOfService') }}">Terms of Service</a></li>
<li><a href="{{ url_for('privacyPolicy') }}">Privacy Policy</a></li>
<li><a href="{{ url_for('intellectualProperty') }}">Intellectual Property</a></li>
<li><a href="{{ url_for('softwareFreedom') }}">Software Freedom</a></li>
<li><a href="{{ url_for('logos') }}">Logos</a></li>
</ul>
</div>
<h4><strong>Documents</strong></h4>
<div class="list-group">
<a href="{{ url_for('constitution') }}" class="list-group-item">Constitution</a>
<a href="{{ url_for('usagePolicy') }}" class="list-group-item">Usage Policy</a>
<a href="{{ url_for('termsOfService') }}" class="list-group-item active">Terms of Service</a>
<a href="{{ url_for('privacyPolicy') }}" class="list-group-item">Privacy Policy</a>
<a href="{{ url_for('intellectualProperty') }}" class="list-group-item">Intellectual Property</a>
<a href="{{ url_for('softwareFreedom') }}" class="list-group-item">Software Freedom</a>
<a href="{{ url_for('logos') }}" class="list-group-item">Logos</a>
</div>
</div>
</div>
......
......@@ -54,19 +54,17 @@ Usage Policy
<div class="col-sm-2 hidden-xs">
<h4 id="nav-pills"><strong>Documents</strong></h4>
<div class="bs-example">
<ul class="nav nav-pills">
<li><a href="{{ url_for('constitution') }}">Constitution</a></li>
<li class="active"><a href="{{ url_for('usagePolicy') }}">Usage Policy</a></li>
<li><a href="{{ url_for('termsOfService') }}">Terms of Service</a></li>
<li><a href="{{ url_for('privacyPolicy') }}">Privacy Policy</a></li>
<li><a href="{{ url_for('intellectualProperty') }}">Intellectual Property</a></li>
<li><a href="{{ url_for('softwareFreedom') }}">Software Freedom</a></li>
<li><a href="{{ url_for('logos') }}">Logos</a></li>
</ul>
</div>
<h4><strong>Documents</strong></h4>
<div class="list-group">
<a href="{{ url_for('constitution') }}" class="list-group-item">Constitution</a>
<a href="{{ url_for('usagePolicy') }}" class="list-group-item active">Usage Policy</a>
<a href="{{ url_for('termsOfService') }}" class="list-group-item">Terms of Service</a>
<a href="{{ url_for('privacyPolicy') }}" class="list-group-item">Privacy Policy</a>
<a href="{{ url_for('intellectualProperty') }}" class="list-group-item">Intellectual Property</a>
<a href="{{ url_for('softwareFreedom') }}" class="list-group-item">Software Freedom</a>
<a href="{{ url_for('logos') }}" class="list-group-item">Logos</a>
</div>
</div>
</div>
......
{% extends "layouts/base.html" %}
{% block title %}
SRCT | Events
{% endblock %}
{% block pagetitle %}
Events
{% endblock %}
{% block description %}
Upcoming events planned an organized by SRCT.
{% endblock %}
{% block content %}
<!-- <p>Along the lines of Meetings- a form for creating events, pagination, RSS feed</p> -->
<p>Will link to an as yet not created page on the wiki.</p>
<p>The beginnings of setting it up on the wiki is there, but it's not there yet.</p>
{% endblock %}
......@@ -4,92 +4,73 @@
SRCT
{% endblock %}
{% block content %}
{% block jumbotron %}
<div class="container">
<div id = "SRCTCarousel" class="carousel slide">
<ol class="carousel-indicators">
<li data-target = "#SRCTCarousel" data-slide-to = "0" class = "active"></li>
<li data-target = "#SRCTCarousel" data-slide-to = "1"></li>
<li data-target = "#SRCTCarousel" data-slide-to = "2"></li>
</ol>
<div class = "carousel-inner">
<div class = "item active">
<img src = "/static/img/renfredhaxxor_large.png" alt = "Renfred Haxxor" class = "img-responsive visible-lg">
<img src = "/static/img/renfredhaxxor_medium.png" alt = "Renfred Haxxor" class = "img-responsive visible-md visible-sm visible-xs">
<div class = "carousel-caption">
<h2>Renfred Haxxoring</h2>
<p class="visible-lg visible-md">Renfred hacking away at SRCT's most popular project: WhatsOpen.</p>
</div>
</div>
<!-- <ul id="jumboparallax">
<div class = "item">
<img src = "/static/img/2013firstmeet_large.png" alt = "First Meeting 2013-2014" class = "img-responsive visible-lg">
<img src = "/static/img/2013firstmeet_medium.png" alt = "First Meeting 2013-2014" class = "img-responsive visible-md visible-sm visible-xs">
<div class = "carousel-caption">
<h2>First Meeting 2013-2014</h2>
<p class="visible-lg visible-md">The first meeting of the school year.</p>
</div>
</div>
<li class="layer" data-depth="0.50"> -->
<div class="jumbotron jumbostyle">
<div class = "item">
<img src = "/static/img/bradhaxxor_large.png" alt = "Renfred Haxxor" class = "img-responsive visible-lg">
<img src = "/static/img/bradhaxxor_medium.png" alt = "Renfred Haxxor" class = "img-responsive visible-md visible-sm visible-xs">
<div class = "carousel-caption">
<h2>Server Troubleshooting</h2>
<p class="visible-lg visible-md">Brad troubleshooting the server donated by the University.</p>
<!-- <li class="layer" data-depth="0.00"> -->
<div class="container">
<div class="row">
<div class="col-md-offset-1 col-md-10">
<div class="text-center transparency">
<h1><strong>SRCT</strong></h1>
<p><h2>Student-Run Computing and Technology</h2></p>
</div>
</div>
</div>
</div>
<!-- </li> -->
</div>
<!-- </li>
</ul> -->
<