Updated year to 2014

CruGlobal · Aug 21, 2013 · 15e382e · 15e382e
1 parent dd43e32
commit 15e382e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
@@ -162,7 +162,7 @@ def get_project_type_condition
   end
 
   def basic_conditions
-    @year = 2013
+    @year = 2014
     conditions = [[],[]]
     conditions[0] << "#{SpProject.table_name}.show_on_website = 1"
     conditions[0] << "(#{SpProject.table_name}.current_students_men + #{SpProject.table_name}.current_students_women + #{SpProject.table_name}.current_applicants_men + #{SpProject.table_name}.current_applicants_women) < (#{SpProject.table_name}.max_student_men_applicants + #{SpProject.table_name}.max_student_women_applicants)"

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -160,7 +160,6 @@
         <li class="head"><%= link_to("Social Media","/#connect") %></li>
         <li><%= link_to("Facebook","http://www.facebook.com/summerproject") %></li>
         <li><%= link_to("Twitter","https://twitter.com/gosummerproject") %></li>
-        <li><%= link_to("Tumblr", "http://gosummerproject.tumblr.com/") %></li>
       </ul>
       <ul class="links">
         <li class="head"><%= link_to("Contact","/contact") %></li>

diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb
@@ -160,9 +160,9 @@
 											<option value="31">31</option>
 										</select>
 										<select name="start_year" id="start_year">
-											<option value="2012">2012</option>
 											<option value="2013">2013</option>
 											<option value="2014">2014</option>
+											<option value="2015">2015</option>
 										</select>
 										</div>
 
@@ -364,9 +364,9 @@
 			<div class='col3'>
 				<%= link_to '/graphics' do %>
 					<h2 id='graphics'></h2>
-					<h2 class='downloadtag'>DOWNLOAD<br />2013 GRAPHICS</h2>
+					<h2 class='downloadtag'>DOWNLOAD<br />2014 GRAPHICS</h2>
 				<% end %>
-				<h3>Download a wallpaper, updated your Facebook profile image, and print posters to share with your friends on campus with a these Summer Project 2013 graphics.</h3>
+				<h3>Download a wallpaper, updated your Facebook profile image, and print posters to share with your friends on campus with a these Summer Project 2014 graphics.</h3>
 			</div>
 		</div>
 	</div>

diff --git a/public/javascripts/jquery.waypoints.js b/public/javascripts/jquery.waypoints.js
@@ -14,7 +14,7 @@ jQuery(function () {
 		  scrollTime	  = 600,
 		  openTime      = 600,
 		  completeTime  = 1200,
-		  siteName      = "Summer Project 2013",
+		  siteName      = "Summer Project 2014",
 		  scrollElement = "html,body";
 	// Initialize waypoints
 	$("#wrapper > section").waypoint({ offset: viewportTop });