Some more cleanup

modules/Installer/Resources/views/app.blade.php

@@ -18,7 +18,11 @@
     <link href="/vendor/select2/dist/css/select2.min.css" rel="stylesheet"/>
     <link href="/assets/frontend/css/now-ui-kit.css" rel="stylesheet"/>
     <link href="/assets/frontend/css/styles.css" rel="stylesheet"/>
-    <link href="/assets/frontend/css/installer.css" rel="stylesheet"/>
+    {{--<link href="/assets/frontend/css/installer.css" rel="stylesheet"/>--}}
+
+    <link rel="stylesheet"
+          href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css">
+
     @yield('css')
 </head>
 
@@ -60,22 +64,23 @@
     <div class="clearfix" style="height: 200px;"></div>
 </div>
 
-<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>
+{{--<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>--}}
 
 <script src="/assets/frontend/js/core/jquery.3.2.1.min.js" type="text/javascript"></script>
-<script src="/assets/frontend/js/core/tether.min.js" type="text/javascript"></script>
+{{--<script src="/assets/frontend/js/core/bootstrap.min.js" type="text/javascript"></script>--}}
-<script src="/assets/frontend/js/core/bootstrap.min.js" type="text/javascript"></script>
+{{--<script src="/assets/frontend/js/now-ui-kit.js" type="text/javascript"></script>--}}
-<script src="/assets/frontend/js/plugins/bootstrap-switch.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
-<script src="/assets/frontend/js/plugins/nouislider.min.js" type="text/javascript"></script>
+
-<script src="/assets/frontend/js/plugins/bootstrap-datepicker.js" type="text/javascript"></script>
-<script src="/assets/frontend/js/now-ui-kit.js" type="text/javascript"></script>
-<script src="/vendor/select2/dist/js/select2.js"></script>
 <script>
+    hljs.configure({languages: ['sh']});
+
     $(document).ready(function () {
-        $(".select2").select2();
+        $('pre code').each(function (i, block) {
+            hljs.fixMarkup(block);
+            hljs.highlightBlock(block);
+        });
     });
 </script>
-
 @yield('scripts')
 
 </body>

modules/Installer/Resources/views/steps/step2a-completed.blade.php

@@ -1,17 +1,18 @@
 @extends('installer::app')
-@section('title', 'Database Setup')
+@section('title', 'Database Setup Completed')
 @section('content')
 <div style="align-content: center;">
     {!! Form::open(['route' => 'installer.complete', 'method' => 'GET']) !!}
 
-    <pre class="prettyprint lang-html">
+    <pre class="lang-sh">
-        <code class="language-bash">
+        <code class="lang-sh">
+        {{--<code class="language-bash">--}}
         {!! $console_output !!}
         </code>
     </pre>
 
     <p style="text-align: right">
-        {!! Form::submit('Complete Setup >>', ['class' => 'btn btn-success']) !!}
+        {!! Form::submit('Continue >>', ['class' => 'btn btn-success']) !!}
     </p>
     {!! Form::close() !!}
 </div>

modules/Installer/Services/DatabaseService.php

@@ -44,16 +44,17 @@ class DatabaseService {
      */
     public function setupDB()
     {
-        $output = "";
+        $output = '';
+
         #\Artisan::call('database:create');
         #$output .= \Artisan::output();
 
         \Artisan::call('migrate');
-        $output .= \Artisan::output();
+        $output .= trim(\Artisan::output());
 
         \Artisan::call('db:seed');
-        $output .= \Artisan::output();
+        $output .= trim(\Artisan::output());
 
-        return $output;
+        return trim($output);
     }
 }

public/assets/frontend/css/installer.css

@@ -1,135 +0,0 @@
-/* desert scheme ported from vim to google prettify */
-pre.prettyprint {
-    display: block;
-    padding-left: 4px;
-    background-color: #333
-}
-
-pre .nocode {
-    background-color: none;
-    color: #000
-}
-
-pre .str {
-    color: #ffa0a0
-}
-
-/* string  - pink */
-pre .kwd {
-    color: #f0e68c;
-    font-weight: bold
-}
-
-pre .com {
-    color: #87ceeb
-}
-
-/* comment - skyblue */
-pre .typ {
-    color: #98fb98
-}
-
-/* type    - lightgreen */
-pre .lit {
-    color: #cd5c5c
-}
-
-/* literal - darkred */
-pre .pun {
-    color: #fff
-}
-
-/* punctuation */
-pre .pln {
-    color: #fff
-}
-
-/* plaintext */
-pre .tag {
-    color: #f0e68c;
-    font-weight: bold
-}
-
-/* html/xml tag    - lightyellow */
-pre .atn {
-    color: #bdb76b;
-    font-weight: bold
-}
-
-/* attribute name  - khaki */
-pre .atv {
-    color: #ffa0a0
-}
-
-/* attribute value - pink */
-pre .dec {
-    color: #98fb98
-}
-
-/* decimal         - lightgreen */
-
-/* Specify class=linenums on a pre to get line numbering */
-ol.linenums {
-    margin-top: 0;
-    margin-bottom: 0;
-    color: #AEAEAE
-}
-
-/* IE indents via margin-left */
-li.L0, li.L1, li.L2, li.L3, li.L5, li.L6, li.L7, li.L8 {
-    list-style-type: none
-}
-
-/* Alternate shading for lines */
-li.L1, li.L3, li.L5, li.L7, li.L9 {
-}
-
-@media print {
-    pre.prettyprint {
-        background-color: none
-    }
-
-    pre .str, code .str {
-        color: #060
-    }
-
-    pre .kwd, code .kwd {
-        color: #006;
-        font-weight: bold
-    }
-
-    pre .com, code .com {
-        color: #600;
-        font-style: italic
-    }
-
-    pre .typ, code .typ {
-        color: #404;
-        font-weight: bold
-    }
-
-    pre .lit, code .lit {
-        color: #044
-    }
-
-    pre .pun, code .pun {
-        color: #440
-    }
-
-    pre .pln, code .pln {
-        color: #000
-    }
-
-    pre .tag, code .tag {
-        color: #006;
-        font-weight: bold
-    }
-
-    pre .atn, code .atn {
-        color: #404
-    }
-
-    pre .atv, code .atv {
-        color: #060
-    }
-}