Merge branch '2.0'

orchestral · Jun 26, 2013 · f8acc1b · f8acc1b
2 parents 313796b + bc10424
commit f8acc1b
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 30 deletions.
diff --git a/public/css/style.css b/public/css/style.css
@@ -14,7 +14,8 @@ section.container{clear:both;padding-top:45px;}
 .navbar ul.nav>li.dropdown.open ul.dropdown-menu a:hover{background:#508ec7;}
 .table tbody td .meta{font-size:11px;}
 .select2-container.col{padding-left:0;padding-right:0;}
-.navbar-form .select2-container{margin-top:5px;}.navbar-form .select2-container .select2-container-multi{min-width:200px;}.navbar-form .select2-container .select2-container-multi .select2-choices .select2-search-field input{max-height:34px;}
+.navbar-form .select2-container-multi .select2-choices{min-width:200px;height:38px !important;}
+.navbar-form .select2-container{margin-top:5px;}.navbar-form .select2-container .select2-container-multi{min-width:200px;}.navbar-form .select2-container .select2-container-multi .select2-choices{min-width:200px;height:34px;}.navbar-form .select2-container .select2-container-multi .select2-choices .select2-search-field input{max-height:34px;}
 form label.ui-state-active{background:transparent;}
 form .ui-slider .ui-slider-handle{z-index:1;}
 table.ui-datepicker-calendar td.ui-datepicker-unselectable.ui-state-disabled span.ui-state-default{display:block;padding:0 !important;border:0 none !important;width:30px;height:30px;line-height:30px;text-align:center;font-size:12px;text-decoration:none;font-weight:normal !important;}

diff --git a/public/css/style.less b/public/css/style.less
@@ -138,15 +138,28 @@ section.container {
 		padding-right: 0;
 	}
 }
+.navbar-form {
+	.select2-container-multi {
+		.select2-choices {
+			min-width: 200px;
+			height: 38px !important;
+		}
+	}
 
-.navbar-form .select2-container {
-	margin-top: 5px;
+	.select2-container {
+		margin-top: 5px;
 
-	.select2-container-multi {
-		min-width: 200px;
-
-		.select2-choices .select2-search-field input {
-			max-height: 34px;
+		.select2-container-multi {
+			min-width: 200px;
+
+			.select2-choices {
+				min-width: 200px;
+				height: 34px;
+
+				.select2-search-field input {
+					max-height: 34px;
+				}
+			}
 		}
 	}
 }

diff --git a/src/controllers/ResourcesController.php b/src/controllers/ResourcesController.php
@@ -7,20 +7,6 @@
 
 class ResourcesController extends AdminController {
 
-	/**
-	 * Construct Resources Controller, only authenticated user should be able
-	 * to access this controller.
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		$this->beforeFilter('orchestra.auth');
-	}
-
 	/**
 	 * Route to Resources List.
 	 *

diff --git a/src/services/Event/AdminMenuHandler.php b/src/services/Event/AdminMenuHandler.php
@@ -40,10 +40,6 @@ public function handle()
 				->link(App::handles('orchestra/foundation::settings'));
 		}
 
-		// If user aren't logged in, we should stop at this point,
-		// Resources only be available to logged-in user.
-		if (Auth::guest()) return;
-
 		$resources = Resources::all();
 
 		// Resources menu should only be appended if there is actually

diff --git a/src/services/Validation/UserAccount.php b/src/services/Validation/UserAccount.php
@@ -43,7 +43,7 @@ protected function onRegister()
 	 */
 	protected function onChangePassword()
 	{
-		$this->rules = new Fluent(array(
+		$this->setRules(array(
 			'current_password' => array('required'),
 			'new_password'     => array('required', 'different:current_password'),
 			'confirm_password' => array('same:new_password'),

diff --git a/tests/services/Event/AdminMenuHandlerTest.php b/tests/services/Event/AdminMenuHandlerTest.php
@@ -22,7 +22,6 @@ public function testHandleMethod()
 	{
 		\Orchestra\Support\Facades\App::swap($app = m::mock('Orchestra'));
 		\Orchestra\Support\Facades\Resources::swap($resources = m::mock('Resources'));
-		\Illuminate\Support\Facades\Auth::swap($auth = m::mock('Auth\Guard'));
 
 		$app->shouldReceive('acl')->once()->andReturn($acl = m::mock('Acl'))
 			->shouldReceive('menu')->once()->andReturn($menu = m::mock('Menu'))
@@ -47,8 +46,6 @@ public function testHandleMethod()
 			->shouldReceive('title')->once()->with('setting')->andReturn($menu)
 			->shouldReceive('link')->once()->with('setting')->andReturn(null);
 
-		$auth->shouldReceive('guest')->once()->andReturn(false);
-
 		$foo = new \Illuminate\Support\Fluent(array(
 			'name'    => 'Foo',
 			'visible' => true,