Removed unnessary controller functions that just call a view, HTML/CSS consistency updates
This commit is contained in:
@@ -39,7 +39,7 @@ class HomeController extends Controller
|
||||
})
|
||||
->get();
|
||||
|
||||
return view('file')
|
||||
return view('widgets.file')
|
||||
->with('f',$f);
|
||||
}
|
||||
|
||||
@@ -73,20 +73,11 @@ class HomeController extends Controller
|
||||
->with(['echoarea'])
|
||||
->get();
|
||||
|
||||
return view('packet')
|
||||
return view('widgets.packet')
|
||||
->with('nm',$nm)
|
||||
->with('em',$em);
|
||||
}
|
||||
|
||||
/**
|
||||
* Render a view that summarises the users permissions
|
||||
*/
|
||||
public function permissions()
|
||||
{
|
||||
return view('auth.permissions')
|
||||
->with('user',Auth::user());
|
||||
}
|
||||
|
||||
/**
|
||||
* Show a packet dump
|
||||
*
|
||||
|
@@ -323,7 +323,7 @@ class SystemController extends Controller
|
||||
|
||||
// Make sure that no other system has this address active.
|
||||
if ($o->role === Address::NODE_ACTIVE)
|
||||
return redirect()->back()->withErrors(['demaddress'=>sprintf('%s cannot be demoted any more',$o->ftn3D)]);
|
||||
return redirect()->back()->withErrors(['address'=>sprintf('%s cannot be demoted any more',$o->ftn3D)]);
|
||||
|
||||
$o->role = ($o->role << 1);
|
||||
$o->save();
|
||||
@@ -494,7 +494,7 @@ class SystemController extends Controller
|
||||
|
||||
// Make sure that no other system has this address active.
|
||||
if ($o->role === Address::NODE_NC)
|
||||
return redirect()->back()->withErrors(['proaddress'=>sprintf('%s cannot be promoted any more',$o->ftn3D)]);
|
||||
return redirect()->back()->withErrors(['address'=>sprintf('%s cannot be promoted any more',$o->ftn3D)]);
|
||||
|
||||
$o->role = ($o->role >> 1);
|
||||
$o->save();
|
||||
@@ -564,7 +564,7 @@ class SystemController extends Controller
|
||||
'active'=>TRUE,
|
||||
])->single())) {
|
||||
|
||||
return redirect()->back()->withErrors(['susaddress'=>sprintf('%s is already active on system [<a href="%s">%s</a>]',$o->ftn,url('system/addedit',$x->system_id),$x->system->name)]);
|
||||
return redirect()->back()->withErrors(['address'=>sprintf('%s is already active on system [<a href="%s">%s</a>]',$o->ftn,url('system/addedit',$x->system_id),$x->system->name)]);
|
||||
}
|
||||
|
||||
$o->active = (! $o->active);
|
||||
|
@@ -65,9 +65,4 @@ class UserController extends Controller
|
||||
|
||||
return view('user.link');
|
||||
}
|
||||
|
||||
public function register()
|
||||
{
|
||||
return view('user/system/register');
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user