Merge remote-tracking branch 'origin/develop'

Author: snipe

app/controllers/admin/UsersController.php

@@ -691,7 +691,7 @@ public function postImport()
 	public function getDatatable($status = null)
     {
 
-	$users = User::with('assets','licenses','manager','sentryThrottle');
+	$users = User::with('assets','licenses','manager','userloc','sentryThrottle');
 
 	switch ($status) {
 		case 'deleted':
@@ -747,6 +747,13 @@ public function getDatatable($status = null)
 		       	}
 	        })
 
+            ->addColumn('location',function($users)
+   	        {
+   		        if ($users->userloc) {
+   		       	 return '<a title="'.$users->userloc->name.'" href="users/'.$users->location_id.'/view">'.$users->userloc->name.'</a>';
+   		       	}
+   	        })
+
 		->addColumn('assets',function($users)
 	        {
 		        return $users->assets->count();
@@ -762,8 +769,8 @@ public function getDatatable($status = null)
 	        })
 
 	    ->addColumn($actions)
-        ->searchColumns('name','email','manager','activated', 'licenses','assets')
-        ->orderColumns('name','email','manager','activated', 'licenses','assets')
+        ->searchColumns('name','email','manager','activated','licenses','location','assets')
+        ->orderColumns('name','email','manager','activated', 'licenses','location','assets')
         ->make();
 
 		}

app/views/backend/layouts/default.blade.php

@@ -110,7 +110,7 @@
 
 	            @if (Setting::getSettings()->logo)
 	            	<a class="navbar-brand" href="{{ Config::get('app.url') }}" style="padding: 5px;">
-	            	<img src="/uploads/{{{ Setting::getSettings()->logo }}}">
+	            	<img src="{{ Config::get('app.url') }}/uploads/{{{ Setting::getSettings()->logo }}}">
 	            	</a>
 	            @else
 	            	<a class="navbar-brand" href="{{ Config::get('app.url') }}">

app/views/backend/users/index.blade.php

@@ -34,20 +34,21 @@
 
 {{ Datatable::table()
     ->addColumn(
-	    Lang::get('admin/users/table.name'), 
-	    Lang::get('admin/users/table.email'), 
+	    Lang::get('admin/users/table.name'),
+	    Lang::get('admin/users/table.email'),
 	    Lang::get('admin/users/table.manager'),
-	    Lang::get('general.assets'), 
-	    Lang::get('general.licenses'), 
-	    Lang::get('admin/users/table.activated'), 
+        Lang::get('general.location'),
+	    Lang::get('general.assets'),
+	    Lang::get('general.licenses'),
+	    Lang::get('admin/users/table.activated'),
 	    Lang::get('table.actions')
     )
     ->setOptions(
             array(
                 'sAjaxSource'=>route('api.users.list', Input::get('status')),
                 'dom' =>'CT<"clear">lfrtip',
                 'colVis'=> array('showAll'=>'Show All','restore'=>'Restore','activate'=>'mouseover'),
-                'columnDefs'=> array(array('visible'=>false,'targets'=>array()),array('bSortable'=>false,'targets'=>array(6))),
+                'columnDefs'=> array(array('visible'=>false,'targets'=>array()),array('bSortable'=>false,'targets'=>array(7))),
                 'order'=>array(array(1,'asc')),
             )
         )

app/views/backend/users/view.blade.php

@@ -67,7 +67,7 @@
                                 <div class="alert alert-danger">
                                     <i class="fa fa-exclamation-circle"></i>
 
-                                    @lang('admin/users/messages.user_deleted_warning')
+                                    @lang('admin/users/message.user_deleted_warning')
 
                                 </div>
                             </div>

app/views/error/500.blade.php

@@ -117,7 +117,7 @@
             </p>
 
             <p>
-                Perhaps you would like to go to our <a href="{{ URL::to('home'); }}">home page</a>?
+                Perhaps you would like to go to our <a href="{{ URL::route('home'); }}">home page</a>?
             </p>
         </div>
     </div>