sistemazione

resources/views/components/menu.blade.php

@@ -49,7 +49,21 @@
 @endcan @can('progetti')
 <li><a href="{{ route('progetti'); }}"><i class="fa fa-list fa-fw"></i>
 		Progetti <span class="fa arrow"></span></a></li>
-@endcan @can('amministrazione')
+
+@endcan
+@can('gruppi')
+<li><a href="{{ route('gruppi'); }}"><i class="fa fa-group fa-fw"></i>
+		Gruppi <span class="fa arrow"></span></a></li>
+@endcan
+@can('rivista')
+<li><a href="{{ route('rivista'); }}"><i class="fa fa-newspaper-o fa-fw"></i>
+		Rivista <span class="fa arrow"></span></a></li>
+@endcan
+@can('associazione')
+<li><a href="{{ route('associazione'); }}"><i class="fa fa-black-tie fa-fw"></i>
+		Associazione <span class="fa arrow"></span></a></li>
+@endcan
+@can('amministrazione')
 <li><a href="#"><i class="fa fa-gears fa-fw"></i>Amministrazione<span
 		class="fa arrow"></span></a>
 	<ul class="nav nav-second-level">
@@ -59,8 +73,13 @@
 		<li><a class="active" href="/admin/users/newPermission">Permessi</a></li>
 		-->
 		<li><a class="active" href="/admin/users/givepermission">Assegna Permessi</a></li>
+<<<<<<< HEAD
 		<!--  
 		<li><a href="/login">Login Page</a></li> 
+=======
+		<!--
+		<li><a href="/login">Login Page</a></li>
+>>>>>>> 7a85f2280afa53ac016b540da1f9b547b40b3e42
 		-->
 	</ul> <!-- /.nav-second-level --></li>
 @endcan