Merge branch 'master' of https://github.com/mozilla/CSOL-site

Conflicts:
	static/media/js/custom_logic.js

bin/migrate-db

@@ -8,8 +8,9 @@ db
   .getMigrator({path: migrationsPath})
     .migrate()
       .success(function () {
-        console.log("Success!");
+        console.log("Migration successful");
       })
       .error(function (err) {
-        console.log("Error:", err);
+        console.log("Migration error:", err);
+        process.exit(1);
       });

migrations/20130530095331-add-user-real-names.js

@@ -1,4 +1,5 @@
-var runMigrations = require('../db').runMigrations;
+var path = require('path');
+var runMigrations = require(path.join(__dirname, '../db')).runMigrations;
 
 module.exports = {
   up: function(target, DataTypes, callback) {

migrations/20130531084137-add-token-last-reminder.js

@@ -1,4 +1,5 @@
-var runMigrations = require('../db').runMigrations;
+var path = require('path');
+var runMigrations = require(path.join(__dirname, '../db')).runMigrations;
 
 module.exports = {
   up: function(target, DataTypes, callback) {

migrations/20130531165656-add-reviews-to-applications.js

@@ -1,4 +1,5 @@
-var runMigrations = require('../db').runMigrations;
+var path = require('path');
+var runMigrations = require(path.join(__dirname, '../db')).runMigrations;
 
 module.exports = {
   up: function(target, DataTypes, callback) {

migrations/20130531222314-add-guardian-denial-state.js

@@ -1,4 +1,5 @@
-var runMigrations = require('../db').runMigrations;
+var path = require('path');
+var runMigrations = require(path.join(__dirname, '../db')).runMigrations;
 
 module.exports = {
   up: function(target, DataTypes, callback) {

migrations/20130602230835-add-unique-idx-to-favorites.js

@@ -1,4 +1,5 @@
-var runMigrations = require('../db').runMigrations;
+var path = require('path');
+var runMigrations = require(path.join(__dirname, '../db')).runMigrations;
 
 module.exports = {
   up: function(target, DataTypes, callback) {

migrations/20130604142742-add-playlist-unique-index.js

@@ -1,4 +1,5 @@
-var runMigrations = require('../db').runMigrations;
+var path = require('path');
+var runMigrations = require(path.join(__dirname, '../db')).runMigrations;
 
 module.exports = {
   up: function(target, DataTypes, callback) {

migrations/20130604225500-add-birthday-to-learner.js

@@ -1,4 +1,5 @@
-var runMigrations = require('../db').runMigrations;
+var path = require('path');
+var runMigrations = require(path.join(__dirname, '../db')).runMigrations;
 
 module.exports = {
   up: function(target, DataTypes, callback) {

static/media/js/custom_logic.js

@@ -5,15 +5,6 @@ var mob = 0;
 if( /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent) ) mob = 1
 
 	$('.show-tooltip').tooltip();
-	
-	/*move filter labels into the selectors*/
-	if($('.navbar.filter').length != 0) {
-		$('.navbar.filter form label').each(function(){
-			var selectID = ($(this).attr('for'));
-			var selectEle = $('#' + selectID);
-			$('#' + selectID + ' option:first').text($(this).text());
-		});
-	}
 
 	/*landing page overrides*/
 	if($('body.home').length != 0) {
@@ -35,8 +26,9 @@ if( /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent) ) mob
 			}
 			return false;
 		});
+
 		/*landing page mobile overrides*/
-		if(mob) { 
+		if(mob) {
 			vidLink = '<a href="http://www.youtube.com/v/6WwpwtYNsNk">watch video</a>';
 		}
 		$('li.claim').after($('<li class="video"></li>').append(vidLink));
@@ -66,4 +58,4 @@ if( /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent) ) mob
 			});
 		}
 	}
-});
+});

static/media/less/core.less

@@ -26,7 +26,6 @@ body {
 #main {
 	padding-top: 45px;
 	padding-bottom: 25px;
-
 	& > h1:first-child,
 	& > h2:first-child,
 	& > h3:first-child,
@@ -35,7 +34,6 @@ body {
 		margin-top: 0px;
 		padding-top: 0px;
 	}
-
 	& > div > h1:first-child, & > div > h2:first-child, & > div > h3:first-child, & > div > h4:first-child, & > div > p:first-child {
 		margin-top: 0px;
 		padding-top: 0px;
@@ -921,6 +919,13 @@ input[type="password"].metered {
 /* CSOL-site SPECIFIC ----------- */
 /* ------------------------------ */
 body {
+	#main {
+		> .container {
+			> h2 {
+			
+			}
+		}
+	}
 	.navbar.filter {
 		margin-top:20px;
 		label, select, input {

views/filter.html

@@ -3,7 +3,7 @@
 
 {% block content %}
 	{% block filter %}
-		{% if filters %}
+    {% if filters %}
 			<div class="navbar filter">
 				<form class="navbar-inner navbar-form form-inline text-center" method="get">
 					{% for filter in filters %}
@@ -11,17 +11,17 @@
     						<label for="filter-{{ filter.name }}" class="filter-icon filter-{{ filter.name }}">{{ filter.label }}</label>
     						{% if filter.options %}
     							<select id="filter-{{ filter.name }}" name="{{ filter.name }}" class="input-medium{% if filter.class %} {{ filter.class }}{% endif %}">
-    								<option></option>
-    								{% if filter.is_grouped %}
-    									{% for label, options in filter.options %}
+    								<option value="">{{ filter.label }}</option>
+                    {% if filter.is_grouped %}
+                      {% for label, options in filter.options %}
     										<optgroup label="{{ label }}">
     											{% for value, label in options %}
     												<option value="{{ value }}"{% if filter.selected == value %} selected="selected"{% endif %}>{{ label }}</option>
     											{% endfor %}
     										</optgroup>
     									{% endfor %}
-    								{% else %}
-    									{% for item in filter.options %}
+                    {% else %}
+                      {% for item in filter.options %}
     										<option value="{{ item.value }}"{% if filter.selected == item.value %} selected="selected"{% endif %}>{{ item.label }}</option>
     									{% endfor %}
     								{% endif %}