Merge branch 'ticket-679' into OPW-Moderation-Update

Conflicts:
	mediagoblin/auth/tools.py
	mediagoblin/auth/views.py
	mediagoblin/db/migration_tools.py
	mediagoblin/db/migrations.py
	mediagoblin/db/models.py
	mediagoblin/decorators.py
	mediagoblin/user_pages/views.py

mediagoblin/static/css/base.css

@@ -129,6 +129,7 @@ header {
 
 .header_dropdown {
   margin-bottom: 20px;
+  padding: 0px 10px 0px 10px;
 }
 
 .header_dropdown li {
@@ -333,6 +334,10 @@ text-align: center;
   width: 20px;
 }
 
+.boolean {
+  margin-bottom: 8px;
+  }
+
 textarea#description, textarea#bio {
   resize: vertical;
   height: 100px;
@@ -384,6 +389,12 @@ a.comment_whenlink:hover, a.report_whenlink:hover {
   margin-top: 8px;
 }
 
+.comment_active {
+  box-shadow: 0px 0px 15px 15px #378566;
+  background: #378566;
+  color: #f7f7f7;
+}
+
 textarea#comment_content {
   resize: vertical;
   width: 100%;

mediagoblin/static/js/notifications.js

@@ -0,0 +1,36 @@
+'use strict';
+/**
+ * GNU MediaGoblin -- federated, autonomous media hosting
+ * Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+var notifications = {};
+
+(function (n) {
+    n._base = '/';
+    n._endpoint = 'notifications/json';
+
+    n.init = function () {
+        $('.notification-gem').on('click', function () {
+            $('.header_dropdown_down:visible').click();
+        });
+    }
+
+})(notifications)
+
+$(document).ready(function () {
+    notifications.init();
+});