improvements in upgrade menu information. Made it always visible

Author: xaviqv

src/Controllers/InstallController.php

@@ -78,28 +78,43 @@ public function index()
 				}
 
 				return view('panichd::install.index', compact('inactive_migrations', 'previous_ticketit', 'quickstart'));
-			}else{
-				$inactive_settings = $this->inactiveSettings();
-				
-				if($inactive_settings and count($inactive_settings) > 0){
-					// Panic Help Desk requires an upgrade
-					if (Member::isAdmin()){
-						return view('panichd::install.upgrade', compact('inactive_migrations', 'inactive_settings'));
-					}else{
-						return view('panichd::install.status', [
-							'title' => trans('panichd::install.package-requires-update'),
-							'description' => trans('panichd::install.package-requires-update-info'),
-						]);
-					}
-					
+			}elseif(!$this->isUpdated()){
+				// Panic Help Desk requires an upgrade
+				if (Member::isAdmin()){
+					return view('panichd::install.upgrade', [
+						'inactive_migrations' => $inactive_migrations,
+						'inactive_settings' => $this->inactiveSettings(),
+						'isUpdated' => false
+					]);
 				}else{
-					// Panic Help Desk installed and configured. Go to stats page
-					return redirect()->route('dashboard');
+					return view('panichd::install.status', [
+						'title' => trans('panichd::install.package-requires-update'),
+						'description' => trans('panichd::install.package-requires-update-info'),
+					]);
 				}
+			}else{
+				// Panic Help Desk installed and up to date. Go to stats page
+				return redirect()->route('dashboard');
 			}
 		}
     }
 
+	/**
+	 * Displays the upgrade menu although there isn't any pending action
+	*/
+	public function upgrade_menu()
+	{
+		if (!$this->isInstalled() or !Member::isAdmin()){
+			return redirect()->route('panichd.install.setup');
+		}
+		
+		return view('panichd::install.upgrade', [
+			'inactive_migrations' => $this->inactiveMigrations(),
+			'inactive_settings' => $this->inactiveSettings(),
+			'isUpdated' => $this->isUpdated()
+		]);
+	}
+	
 	/**
 	 * Check if PanicHD is installed
 	 *

src/PanicHDServiceProvider.php

@@ -49,7 +49,13 @@ public function boot()
                 'middleware' => $authMiddleware,
                 'as'         => 'panichd.install.setup',
                 'uses'       => 'PanicHD\PanicHD\Controllers\InstallController@setup',
-            ]);		
+            ]);
+			
+			Route::get('/panichd/upgrade', [
+                'middleware' => $authMiddleware,
+                'as'         => 'panichd.install.upgrade_menu',
+                'uses'       => 'PanicHD\PanicHD\Controllers\InstallController@upgrade_menu',
+            ]);			
 
 			Route::post('/panichd/upgrade', [
                 'middleware' => $authMiddleware,

src/Translations/ca/install.php

@@ -35,15 +35,16 @@
 	'package-requires-update'         => 'Panic Help Desk requereix <b>configurar una actualització</b>',
 	'package-requires-update-info'    => 'L\'Administrador ha instal·lat una actualització de Panic Help Desk però no ha acabat de configurar-la. Si us plau espera que el procés hagi acabat',
 
+	'status-updated'                  => 'La llibreria està actualitzada i <b>En línia</b> ara mateix',
 	'status-out-of-date'              => '<b>Estat actual: Fora de línia</b> fins que s\'instal·li la darrera actualització',
 	'about-to-update'                 => 'Aquest és el <b>menú d\'actualització</b> de Panic Help Desk',
 	'about-to-update-description'     => 'Un cop facis clic al botó "Actualitzar ara", es farà els següents canvis:',
-	'all-tables-migrated'             => 'No hi ha actualitzacions pendents de la base de dades així que no s\'executarà cap migració.',
+	'all-tables-migrated'             => 'Totes les modificacions de la base de dades ja estan instal·lades. No es farà canvis.',
 
 	'optional-config'                 => 'Configuració opcional',
-	'choose-public-folder-action'     => 'Has fet modificacions als fitxers del directori "public/vendor/panichd"? Vols fer-ne una còpia de seguretat?',
-	'public-folder-destroy'           => 'No (Opció recomanada)',
-	'public-folder-backup'            => 'Si. Fer còpia de seguretat del directori abans de copiar els fitxers nous',
+	'choose-public-folder-action'     => 'Vols fer una còpia de seguretat del directori "public/vendor/panichd" abans de reinstal·lar-lo? (Necessari només si has fet modificacions als fitxers que hi ha)',
+	'public-folder-destroy'           => 'No',
+	'public-folder-backup'            => 'Si (Es crearà una còpia de seguretat a "public/vendor")',
 
 	'upgrade-now'                     => 'Actualitzar ara!',
 
@@ -59,5 +60,6 @@
     'another-file'                    => 'un altre arxiu',
     'upgrade'                         => 'Actualització de la versió de Panic Help Desk',
     'settings-to-be-installed'        => 'S\'instal·laran aquests ajustos:',
-    'all-settings-installed'          => 'Tots els ajustos necessaris estan instal·lats',
+    'all-settings-installed'          => 'Ja hi ha registrats tots els paràmetres de configuració. No es farà canvis',
+	'public-folder-will-be-replaced'  => '<b>S\'eliminarà i es reinstal·larà</b> el contingut del directori public/vendor/panichd',
 ];

src/Translations/en/install.php

@@ -35,29 +35,31 @@
 	'package-requires-update'         => 'Panic Help Desk requires to <b>configure an upgrade</b>',
 	'package-requires-update-info'    => 'The administrator has installed a Panic Help Desk upgrade but has not finished configuring it. Please wait until the process has ended',
 
+	'status-updated'                  => 'The package is up to date and <b>Online</b> right now',
 	'status-out-of-date'              => '<b>Current status: Offline</b> until the the upgrade is configured',
-	'about-to-update'                 => 'This is the Panic Help Desk <b>upgrade menu</b>',
+	'about-to-update'                 => 'Upgrade menu',
 	'about-to-update-description'     => 'Once you click on the "Upgrade now" button, the following changes are going to be done:',
-	'all-tables-migrated'             => 'There are no pending database updates, so no migration will be executed',
+	'all-tables-migrated'             => 'All database modifications are already installed. No changes to do here',
 
 	'optional-config'                 => 'Optional configuration',
-	'choose-public-folder-action'     => 'Have you done any modifications to the files at Laravel\'s "public/vendor/panichd" folder? Do you want to backup it?',
-	'public-folder-destroy'           => 'No (Recommended option)',
-	'public-folder-backup'            => 'Yes. Make a directory backup before copying the new files',
+	'choose-public-folder-action'     => 'Do you want to backup "public/vendor/panichd" folder before it is reinstalled? (Needed if you have you done any modifications on it\'s files)',
+	'public-folder-destroy'           => 'No',
+	'public-folder-backup'            => 'Yes (A backup folder will be created inside "public/vendor")',
 
 	'upgrade-now'                     => 'Upgrade now!',
 
 	'upgrade-done'                    => 'The upgrade has finished correctly',
 
-		'pending-settings'                => 'There are still some <b>configurations pending</b>',
+	'pending-settings'                => 'There are still some <b>configurations pending</b>',
 	'pending-settings-description'    => 'Before you can add new tickets, you must ensure that you have at least one status, priority, category and an agent assigned to it.',
 
 	'master-template-file'            => 'Master template file',
     'master-template-other-path'      => 'Other path to the master template file',
     'master-template-other-path-ex'   => 'ex. views/layouts/app.blade.php',
     'migrations-to-be-installed'      => 'These migrations will be installed:',
     'another-file'                    => 'another File',
-    'upgrade'                         => 'Panic Help Desk version upgrade', // New v0.2.3
-    'settings-to-be-installed'        => 'These settings will be installed:', // New v0.2.3
-    'all-settings-installed'          => 'All needed settings are installed', // New v0.2.3
+    'upgrade'                         => 'Panic Help Desk version upgrade',
+    'settings-to-be-installed'        => 'These settings will be installed:',
+    'all-settings-installed'          => 'All needed configuration settings are registered. No changes to do here',
+	'public-folder-will-be-replaced'  => 'The public/vendor/panichd folder content will be <b>deleted and reinstalled</b>',
 ];

src/Views/install/partials/html.blade.php

@@ -24,7 +24,7 @@
 	<div class="page-header" style="margin: 20px 0px 10px 0px;">
 		<div class="row">
 			<div class="col-md-6 col-sm-5"><h1>{{ trans('panichd::install.main-title') }}</h1></div>
-			<div class="col-md-6 col-sm-7"><div class="text-warning pull-right" style="margin: 2em 0em 0em 0em;">@yield('current_status')</div></div>
+			<div class="col-md-6 col-sm-7"><div class="pull-right" style="margin: 2em 0em 0em 0em;">@yield('current_status')</div></div>
 		</div>
 
 	</div>

src/Views/install/upgrade.blade.php

@@ -1,7 +1,11 @@
 @extends('panichd::install.partials.html')
 
 @section('current_status')
-	<span class="glyphicon glyphicon-alert" style="font-size: 1.5em; padding: 0em 0.5em 0em 0em;"></span>{!! trans('panichd::install.status-out-of-date') !!}
+	@if ($isUpdated)
+		<span class="text-success"><span class="glyphicon glyphicon-ok" style="font-size: 1.5em; padding: 0em 0.5em 0em 0em;"></span>{!! trans('panichd::install.status-updated') !!}</span>
+	@else
+		<span class="text-warning"><span class="glyphicon glyphicon-alert" style="font-size: 1.5em; padding: 0em 0.5em 0em 0em;"></span>{!! trans('panichd::install.status-out-of-date') !!}</span>
+	@endif
 @stop
 
 @section('content')
@@ -30,6 +34,7 @@
 			@endforeach
 		</ul>
 	@endif
+		<li>{!! trans('panichd::install.public-folder-will-be-replaced') !!}</li>
 	</ol>
 
 	<form class="form-horizontal" action="{{url('/panichd/upgrade') }}" method="post">