Fix merge to gui

dmastylo · Oct 27, 2013 · 5bc4444 · 5bc4444
2 parents 8dde509 + fbdfbf4
commit 5bc4444
Show file tree

Hide file tree

Showing 9 changed files with 360 additions and 155 deletions.
diff --git a/main/c2g/static/css/common.scss b/main/c2g/static/css/common.scss
@@ -1,4 +1,5 @@
 @import "core/foundation";
+@import "datepicker";
 
 /**** UTILITIES ****/
 	/** Variables **/ 
@@ -20,8 +21,6 @@
 		.italic {font-style: italic;}
 
 /********************/
-
-
 /******** SPECIAL PAGES ******/
 .dead-end {
 	@include grid-row;
@@ -53,8 +52,12 @@
 	}
 }
 
-
 /*** TEMPLATES STYLES ***/
+.main-column{
+	h1, h2, h3{
+		margin-top:.8em;
+	}
+}
 section {
 	width: 100%;
 	padding: 2em 0;
@@ -120,9 +123,6 @@ section {
 	}
 }
 
-
-
-
 .subpage-navbar-container, nav.subpage-navbar {
 	background-color: $brand-secondary;
 }
@@ -148,12 +148,60 @@ nav.subpage-navbar {
 		@extend .sans;
 		@extend .light;
 	}
-	a:hover{
+/**
+	general link bar styles
+**/
+nav.top-bar{
+
+	color: #fff;
+
+	@include grid-row;
+
+	header > span{
+		text-shadow: 1px -1px #000;margin-right:15px;
+	}
+
+	a{
+		display:inline-block;
+		padding:0em 1em 0em 1em;
 		color:#fff;
-		border-bottom:1px solid #999;
+		&.active{
+			color:#fff;pointer-events:none; cursor:default;
+		}
 	}
 }
 
+div.red-bar-container, nav.red-bar{
+	background-color:#5B0000;
+}
+nav.red-bar{
+
+	a{
+		color:#ddd;
+
+		&:hover{
+			background-color: #761E1E;
+		}
+
+		&.active{
+			border-bottom: 6px solid #666;background-color:#470000;
+		}
+
+	}
+}
+div.grey-bar-container, nav.grey-bar{
+	background-color: #222;
+}
+nav.grey-bar{
+
+	a{
+		&:hover{
+			background-color: #444;
+		}
+	}
+
+}
+
 #logged-in {
 	form, input {margin: 0;}
 	input {
@@ -236,7 +284,8 @@ nav.subpage-navbar {
 	position: relative;  // Necessary to position background image absolutely
 	height: 20rem;
 	overflow: hidden;
-	padding: 5rem 0;
+	//padding: 5rem 0;
+	padding-top: 1em;	
 }
 .hero-background {
 	// Locking background image to be centered both axes in all cases, see http://codepen.io/shshaw/full/gEiDt
@@ -249,7 +298,7 @@ nav.subpage-navbar {
 	@include grid-row;
 	position: relative;
 	height: auto;
-	vertical-align: middle;
+	//vertical-align: middle;
 	#{$all-headings} {color: $brand-secondary;}
 	& > div {
 		@include grid-column(9);
@@ -267,7 +316,6 @@ nav.subpage-navbar {
 .intro-block {
 	@include grid-row;
 	background-color: $light-grey;
-	margin-top: -0.7em; // TEMPORARY FIX UNTIL WE FIGURE OUT WHAT WE CAN AND CANNOT REMOVE FROM TEMPLATES
 }
 .intro-content {
 	@include grid-column(6, $last-column: true, $center: true);
@@ -407,10 +455,12 @@ nav.subpage-navbar {
 }
 
 footer {
+
 	background-color: $brand-secondary;
 	padding-top: 2em;
 	padding-bottom: 2em;
-	font-size:1.3em;
+	font-size: 1em;
+
 	.brand {
 		@include grid-row();
 	}
@@ -423,20 +473,26 @@ footer {
 		}
 	}
 	.school-info {
-		opacity: 0.5;
 		@include grid-row();
-		#{$all-text} {
-			font-size: 0.8em;
-			color: white;
-		}
 	}
 	.addr-card {
 		@include grid-column(4);
+		p.vcard{
+			color: white;
+			border: none;
+			padding: 0;
+		}
 	}
 	.important-links {
 		@include grid-column(4);
 		ul {list-style: none}
 		li {@extend .sans;}
+		a{
+			color: #ccc;
+			&:hover{
+				color: #fff;
+			}
+		}
 	}
 }
 
@@ -447,17 +503,6 @@ footer {
 	display: inline-block;
 }
 
-footer .vcard {
-	border: none;
-	padding: 0;
-}
-
-
-
-
-
-
-
 /******************* FORMS ****************/
 .modal-form {
 	// Use this layout for forms that are
@@ -606,3 +651,4 @@ footer .vcard {
 	}
 }
 
+@import "forms";
diff --git a/main/c2g/static/css/core/foundation/_variables.scss b/main/c2g/static/css/core/foundation/_variables.scss
@@ -300,14 +300,14 @@ $microformat-border-color: #ddd;
 // $input-font-color: rgba(0,0,0,0.75);
 // $input-font-size: emCalc(14);
 // $input-bg-color: #fff;
-// $input-focus-bg-color: darken(#fff, 2%);
+   $input-focus-bg-color: input-bg-color;
 // $input-border-color: darken(#fff, 20%);
 // $input-focus-border-color: darken(#fff, 40%);
 // $input-border-style: solid;
 // $input-border-width: 1px;
 // $input-disabled-bg: #ddd;
-// $input-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
-// $input-include-glowing-effect: true;
+   $input-box-shadow: none;
+   $input-include-glowing-effect: false;
 
 // We use these to style the fieldset border and spacing.
 

diff --git a/main/c2g/static/js/core/app.js b/main/c2g/static/js/core/app.js
@@ -5,6 +5,18 @@
 
     window.c2g = window.c2g || {};
 
+    c2g.onLoad = function(){
+
+      // if we have a form element to focus on page load,
+      // we should go ahead and do so
+      var onload_focus_el = $(".onload-focus");
+      if(onload_focus_el.length)
+        onload_focus_el.focus();
+
+      // datepicker
+      $(".datepicker").fdatepicker();
+
+    }
 
     c2g.installLeftNavChevron = function () {
          $('.nav-list.collapse').on("hidden shown", function(e){
@@ -125,9 +137,9 @@
 
 
     // Datepicker
-    $('[data-datetimepicker]').datetimepicker({
+    /*$('[data-datetimepicker]').datetimepicker({
         ampm: false
-    });
+    });*/
 
     // Exercise list drag and drop
     function updateExerciseOrder(itemIndex, order, $container) {
@@ -139,7 +151,7 @@
       .val(itemIndex);
     }
 
-    $("[data-sortablecontainer]")
+/*    $("[data-sortablecontainer]")
     .sortable({
       placeholder: "ui-state-highlight",
       update: function(event, ui) {
@@ -153,10 +165,10 @@
 
       }
     })
-    .disableSelection();
+    .disableSelection();*/
 
     // Tooltip config
-    $("[data-c2g-tooltip]").tooltip();
+    //$("[data-c2g-tooltip]").tooltip();
 
     // Toggler
     $("[data-toggler-target]").change(function(e){
@@ -172,4 +184,9 @@
     });
 
 
-})(document);
+})(document);
+
+$(window).load(function(){
+      // Run startup functions
+      c2g.onLoad();
+});
diff --git a/main/courses/admin_views.py b/main/courses/admin_views.py
@@ -129,9 +129,10 @@ def new(request):
     else:
         now = datetime.datetime.now()
         date = "%02d-%02d-%04d" %(now.month, now.day, now.year)
+        current_year = now.year
 
         # List of institutions
         institutions = Institution.objects.all()
 
-        return render_to_response('courses/new.html', {'request': request, 'date': date, 'institutions': institutions }, context_instance=RequestContext(request))
+        return render_to_response('courses/new.html', {'request': request, 'date': date, 'institutions': institutions, 'current_year': current_year}, context_instance=RequestContext(request))
 
diff --git a/main/settings.py b/main/settings.py
@@ -96,7 +96,7 @@
     SITE_NAME_SHORT = 'Rensselaer'
     SITE_NAME_LONG = 'Rensselaer Polytechnic Institute'
     SITE_TITLE = 'Rensselaer Class2Go'
-    SITE_URL = 'http://class2go.rpi.edu'
+    SITE_URL = 'http://node03.cs.rpi.edu'
 
 
 # If you set this to False, Django will make some optimizations so as not

diff --git a/main/site_templates/Rensselaer/footer.html b/main/site_templates/Rensselaer/footer.html
@@ -22,7 +22,14 @@
             </ul>
         </div>
         <div class="addr-card">
-            <p class="vcard"><span class="fn org">Rensselaer Polytechnic Institute</span> <br> <span class="adr"><span class="locality">Troy</span>, <span class="region">New York</span> <span class="postal-code">12180</span></span></p>
+            <p class="vcard">
+                <span class="">Rensselaer Polytechnic Institute</span><br>
+                <span class="adr">
+                    <span class="locality">Troy</span>,
+                    <span class="region">New York</span>
+                    <span class="postal-code">12180</span>
+                </span>
+            </p>
         </div>
     </div>
 </footer>

diff --git a/main/site_templates/Rensselaer/landing.html b/main/site_templates/Rensselaer/landing.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% block title %}Available Courses | RPI Online{% endblock title %}
 {% load url from future %}
 
 {% block bodytag %}
@@ -9,10 +8,11 @@
 
 {% block hero %}
   <section class="hero">
-    <img src="http://24.media.tumblr.com/2ded2500a66d3999e4435b13b5729181/tumblr_mopq69jlcS1st5lhmo1_1280.jpg" alt="" class="hero-background">
+    <img src="http://photos.wikimapia.org/p/00/02/33/94/73_full.jpeg" alt="" class="hero-background">
     <div class="hero-content">
       <div class="hero-content--left">
-        <h1>Learn at Rensselaer. <br><strong>Anywhere.</strong></h1>
+        <h1>Learn at Rensselaer.<br/><br/><br/>
+        <span style="display:inline-block;width:500px;"></span><strong style="color:white">Anywhere.</strong></h1>
       </div>
     </div>
   </section>
@@ -28,13 +28,13 @@ <h1>Learn at Rensselaer. <br><strong>Anywhere.</strong></h1>
 <section class="intro-block">
   <div class="intro-content">
     <h4 class="greeting">
-      Welcome to Class2Go
+      Welcome to Class2Go!
     </h4>
     <h6 class="description">
-       We're RPI Online's internal platform, designed to be an open platform for online learning and research.
+       Rensselaer's open source online learning platform.
     </h6>
     <h5 id="important-tag">
-      Summer 2014
+      Opening Summer 2014
     </h5>
   </div>
 </section>