Merge branch 'master' into issue171

Conflicts: app/models/User.php composer.json
opengovfoundation · Apr 7, 2014 · 877e7cd · 877e7cd
2 parents bd99a38 + f275e44
commit 877e7cd
Show file tree

Hide file tree

Showing 10 changed files with 175 additions and 218 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,7 @@
 VagrantConfig.json
 bootstrap/compiled.php
-public/.sass-cache/
-public/js/uservoice.js
-public/js/addthis.js
-public/js/ga.js
+public/.sass-cache/*
+public/private/*
 app/config/creds.yml
 app/config/smtp.yml
 app/config/remote.php

diff --git a/app/controllers/DashboardController.php b/app/controllers/DashboardController.php
@@ -7,7 +7,7 @@ class DashboardController extends BaseController{
 	public $restful = true;
 
 	public function __construct(){
-		//Filter to ensure user is signed in and is user_level == 1
+		//Filter to ensure user is signed in has an admin role
 		$this->beforeFilter('admin');
 
 		//Run csrf filter before all posts

diff --git a/app/controllers/DevController.php b/app/controllers/DevController.php
diff --git a/app/controllers/UserApiController.php b/app/controllers/UserApiController.php
@@ -48,7 +48,8 @@ public function postVerify(){
 	public function getAdmins(){
 		$this->beforeFilter('admin');
 
-		$admins = User::where('user_level', 1)->get();
+		$adminRole = Role::where('name', 'Admin')->first();
+		$admins = $adminRole->users()->get();
 
 		foreach($admins as $admin){
 			$admin->admin_contact();

diff --git a/app/models/Annotation.php b/app/models/Annotation.php
@@ -237,7 +237,6 @@ public function toAnnotatorArray($userId = null)
 				'updated' => $comment->updated_at->toRFC2822String(),
 				'user' => array(
 					'id' => $user->id,
-					'user_level' => $user->user_level,
 					'email' => $user->email,
 					'name' => "{$user->fname} {$user->lname[0]}"
 				)
@@ -256,7 +255,7 @@ public function toAnnotatorArray($userId = null)
 		}
 
 		$user = User::where('id', '=', $item['user_id'])->first();
-		$item['user'] = array_intersect_key($user->toArray(), array_flip(array('id', 'email', 'user_level')));
+		$item['user'] = array_intersect_key($user->toArray(), array_flip(array('id', 'email')));
 		$item['user']['name'] = $user->fname . ' ' . $user->lname{0};
 
 		$item['consumer'] = static::ANNOTATION_CONSUMER;

diff --git a/app/views/doc/reader/index.blade.php b/app/views/doc/reader/index.blade.php
@@ -5,7 +5,6 @@
 			var user = {
 				id: {{ Auth::user()->id }},
 				email: '{{ Auth::user()->email }}',
-				user_level: {{ Auth::user()->user_level }},
 				name: '{{ Auth::user()->fname . ' ' . substr(Auth::user()->lname, 0, 1) }}'
 			};
 		</script>
@@ -14,7 +13,6 @@
 			var user = {
 				id: '',
 				email: '',
-				user_level: '',
 				name: ''
 			}
 		</script>

diff --git a/app/views/layouts/main.blade.php b/app/views/layouts/main.blade.php
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html ng-app="madisonApp" lang="en">
+<html id="ng-app" ng-app="madisonApp" lang="en">
 	<head>
 		<meta charset="utf-8" />
 		<title>{{ $page_title }}</title>
@@ -13,6 +13,9 @@
 		@include('layouts.assets')
 	</head>
 	<body>
+		<!--[if lt IE 8]>
+			<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/" target="_blank">upgrade your browser</a> to improve your experience.</p>
+		<![endif]-->
 		<div id="wrap" class="wrap">
 			<div id="header-main" class="header row">
 				<div class="container">

diff --git a/composer.json b/composer.json
@@ -14,13 +14,13 @@
     	"way/phpunit-wrappers": "dev-master"
     },
 	"require": {
+        	"anahkiasen/rocketeer": "dev-master",
 		"zizaco/entrust" : "dev-master",
-        "anahkiasen/rocketeer": "dev-master",
 		"laravel/framework": "4.1.*",
 		"roumen/sitemap": "dev-master",
 		"elasticsearch/elasticsearch": "~0.4",
 		"illuminate/remote": "4.1.*",
-		"graham-campbell/markdown": "1.0.*",
+		"graham-campbell/markdown": "1.0.0",
 		"doctrine/dbal" : "2.3.*"
 	},
 	"autoload": {