Merge pull request #357 from dbarzin/dev

Dev

Author: dbarzin

app/Http/Controllers/ConfigurationController.php

@@ -51,8 +51,8 @@ public function save(Request $request)
         abort_if(Auth::User()->role !== 1, Response::HTTP_FORBIDDEN, '403 Forbidden');
 
         // Error and message variables
-        $error = null;
-        $message = null;
+        $errors = Collect();
+        $messages = Collect();
 
         // read request
         $mail_from = request('mail_from');
@@ -78,7 +78,7 @@ public function save(Request $request)
                 file_put_contents(config_path('deming.php'), $text);
 
                 // Return
-                $message = 'Configuration saved !';
+                $messages.push('Configuration saved !');
                 break;
 
             case 'test':
@@ -118,9 +118,10 @@ public function save(Request $request)
                     // Send email
                     $mail->send();
 
-                    $message = 'Message has been sent';
+                    $messages.push('Message has been sent.');
                 } catch (Exception $e) {
-                    $error = "Message could not be sent. Mailer Error: {$mail->ErrorInfo}";
+                    $errors.push("Message could not be sent.");
+                    $errors.push("Mailer Error: {$mail->ErrorInfo}");
                 }
 
                 break;
@@ -129,13 +130,14 @@ public function save(Request $request)
                 return redirect('/');
 
             default:
-                $message = 'No actions made.';
+                $messages.push('No actions made.');
         }
 
         return view(
             'config',
-            compact('mail_from', 'mail_subject', 'mail_content', 'frequency', 'expire_delay', 'reminder', 'message')
-        )
-            ->withErrors($error);
+            compact('mail_from', 'mail_subject', 'mail_content', 'frequency', 'expire_delay', 'reminder')
+            )
+            ->with($messages)
+            ->withErrors($errors);
     }
 }

resources/views/documents/index.blade.php

@@ -19,7 +19,8 @@ function bytesToHuman($bytes) {
                     @if (file_exists(storage_path('app/models/control_.docx')))
                         / <a href="/doc/template?id=2" target="_new">{{ trans('cruds.document.model.custom') }}</a>
                     @endif
-                    <input type="file" data-role="file" name="template1">
+                    <!-- input type="file" data-role="file" name="template1"/-->
+                    <br><br><input type="file" name="template1"/>
                 </div>
             </div>
             <div class="row">
@@ -28,7 +29,8 @@ function bytesToHuman($bytes) {
                     @if (file_exists(storage_path('app/models/pilotage_.docx')))
                         / <a href="/doc/template?id=4" target="_new">{{ trans('cruds.document.model.custom') }}</a>
                     @endif
-                    <input type="file" data-role="file" name="template2">
+                    <!-- input type="file" data-role="file" name="template2"/-->
+                    <br><br><input type="file" name="template2"/>
                 </div>
             </div>
             <div class="row">

resources/views/measures/import.blade.php

@@ -33,7 +33,8 @@
     	<div class="row">
             <div class="cell-5">
                 {{ trans('cruds.imports.or') }}
-    			<input name="file" type="file" id="file" data-role="file" data-prepend="Select import file:">
+                <!-- input name="file" type="file" id="file" data-role="file" data-prepend="Select import file:"-->
+                <br><input name="file" type="file" id="file"/><br><br>
     		</div>
         </div>
     	<div class="row">