- fine-tune dashboard

Labs64 · Jun 4, 2017 · 56b421d · 56b421d
1 parent 0d6c8d7
commit 56b421d
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 39 deletions.
diff --git a/config/mail.php b/config/mail.php
@@ -56,8 +56,8 @@
     */
 
     'from' => [
-        'address' => env('MAIL_FROM_ADDRESS', '[email protected]'),
-        'name' => env('MAIL_FROM_NAME', 'Example'),
+        'address' => env('MAIL_FROM_ADDRESS', '[email protected]'),
+        'name' => env('MAIL_FROM_NAME', 'Laravel Boilerplate'),
     ],
 
     /*

diff --git a/database/seeds/Auth/UsersRolesSeeder.php b/database/seeds/Auth/UsersRolesSeeder.php
@@ -20,10 +20,9 @@ public function run()
 
         $data = [
             '[email protected]' => ['administrator', 'authenticated'],
-            'demo@Demo.com' => 'authenticated',
+            'demo@demo.com' => 'authenticated',
         ];
 
-
         foreach ($data as $email => $role) {
             /** @var  $user \App\Models\Auth\User\User */
             $user = \App\Models\Auth\User\User::whereEmail($email)->first();

diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile
@@ -3,7 +3,7 @@ FROM centos:7
 MAINTAINER Labs64 GmbH [email protected]
 
 # Install some must-haves
-RUN yum -y install vim wget
+RUN yum -y install vim wget sendmail
 RUN yum -y install libtool make automake autoconf nasm libpng-static
 RUN yum -y install git
 RUN git --version

diff --git a/public/phpinfo.php b/public/phpinfo.php
@@ -0,0 +1 @@
+<?php phpinfo(); ?>
diff --git a/resources/lang/en.json b/resources/lang/en.json
@@ -6,9 +6,9 @@
   "auth.failed": "These credentials do not match our records.",
   "auth.throttle": "Too many login attempts. Please try again in :seconds seconds.",
   "auth.active": "Your account has been suspended",
-  "auth.confirmed": "Account not confirmed. Check your email or <a href=':url'/> re-request</a> a confirmation email.",
-  "auth.need_confirm": "Please confirm your email address, confirmation sent to your email.",
-  "auth.social": "You are not allowed to log in through the social network.",
+  "auth.confirmed": "Account not confirmed. Check your e-mail or <a href=':url'/> re-request</a> a confirmation email.",
+  "auth.need_confirm": "Please confirm your e-mail address, confirmation sent to your email.",
+  "auth.social": "You are not allowed to login through the social network.",
   "************************ Pagination ***********************": "Pagination i18n",
   "pagination.previous": "&laquo; Previous",
   "pagination.next": "Next &raquo;",
@@ -25,37 +25,37 @@
   "notification.regards": "Regards,",
   "notification.auth.confirm_email.mail.subject": ":app confirmation",
   "notification.auth.confirm_email.mail.greeting": "Hello :user!",
-  "notification.auth.confirm_email.mail.line.0": "To confirm your account and verify your email address, please click the following button:",
-  "notification.auth.confirm_email.mail.line.1": "If you`ve received this mail in error, it`s likely that another user entered your email address while trying to create an account for a different email address. If you don`t click the link, the account won`t be activated.",
+  "notification.auth.confirm_email.mail.line.0": "To confirm your account and verify your e-mail address, please click the following button:",
+  "notification.auth.confirm_email.mail.line.1": "If you`ve received this e-mail in error, it`s likely that another user entered your e-mail address while trying to create an account for a different email address. If you don`t click the link, the account won`t be activated.",
   "notification.auth.confirm_email.mail.line.2": "If you have any questions about the service, feel free to contact us anytime at :email.",
   "notification.auth.confirm_email.mail.line.3": "Thanks for using :app!",
   "notification.auth.confirm_email.mail.action": "Verify your email",
-  "**************************** Mail **************************": "Mail i18n",
+  "*************************** E-Mail *************************": "E-Mail i18n",
   "mail.copyright": "All rights reserved.",
   "**************************** Exception *********************": "Exception i18n",
   "exception.unauthenticated": "Unauthenticated.",
   "**************************** Login Form ********************": "Login Form i18n",
-  "views.auth.login.header": "Login Form",
+  "views.auth.login.header": "Log in Form",
   "views.auth.login.input_0": "E-Mail Address",
   "views.auth.login.input_1": "Password",
   "views.auth.login.input_2": "Remember Me",
   "views.auth.login.action_0": "Log in",
   "views.auth.login.action_1": "Forgot Your Password?",
-  "views.auth.login.action_2": "Create Account",
+  "views.auth.login.action_2": "Sign up",
   "views.auth.login.message_0": "Sign in with:",
-  "views.auth.login.message_1": "New to site?",
+  "views.auth.login.message_1": "Do not have an account?",
   "views.auth.login.copyright": "All Rights Reserved",
   "**************************** Registration Form **************": "Registration Form i18n",
   "views.auth.register.header": "Create Account",
   "views.auth.register.input_0": "Username",
   "views.auth.register.input_1": "E-Mail Address",
   "views.auth.register.input_2": "Password",
   "views.auth.register.input_3": "Confirm Password",
-  "views.auth.register.action_1": "Register",
+  "views.auth.register.action_1": "Sign up",
   "views.auth.register.action_2": "Log in",
-  "views.auth.register.message": "Already a member ?",
+  "views.auth.register.message": "Already a member?",
   "views.auth.register.copyright_0": "All Rights Reserved",
-  "views.auth.register.copyright_1": "Privacy and Terms",
+  "views.auth.register.copyright_1": "Terms of Service and Privacy Policy",
   "**************************** Reset Password *****************": "Reset Password Form i18n",
   "views.auth.passwords.reset.header": "Reset Password",
   "views.auth.passwords.reset.input_0": "E-Mail Address",
@@ -74,19 +74,21 @@
   "views.backend.section.navigation.sub_header_0": "General",
   "views.backend.section.navigation.sub_header_1": "Management",
   "views.backend.section.navigation.sub_header_2": "Development",
-  "views.backend.section.navigation.menu_0": "Dashboard",
-  "views.backend.section.navigation.menu_1": "Users",
-  "views.backend.section.navigation.menu_2": "Log viewer",
-  "views.backend.section.navigation.menu_3": "Dashboard",
-  "views.backend.section.navigation.menu_4": "Logs",
+  "views.backend.section.navigation.sub_header_3": "Credits",
+  "views.backend.section.navigation.menu_0_1": "Dashboard",
+  "views.backend.section.navigation.menu_1_1": "Users",
+  "views.backend.section.navigation.menu_2_1": "Log viewer",
+  "views.backend.section.navigation.menu_2_2": "Dashboard",
+  "views.backend.section.navigation.menu_2_3": "Logs",
   "**************************** Backend Header *******************": "Backend Header i18n",
-  "views.backend.section.header.menu_0": "Log out",
+  "views.backend.section.header.menu_0": "Logout",
   "**************************** Backend Footer *******************": "Backend Footer i18n",
   "views.backend.section.footer.copyright": "All Rights Reserved",
   "**************************** Welcome *******************": "Welcome i18n",
-  "views.welcome.login": "Login",
-  "views.welcome.register": "Register",
-  "views.welcome.admin": "Admin panel",
+  "views.welcome.login": "Log in",
+  "views.welcome.logout": "Log out",
+  "views.welcome.register": "Sign up",
+  "views.welcome.admin": "Dashboard",
   "**************************** Admin dashboard *****************": "Admin dashboard i18n",
   "views.admin.dashboard.title": "Dashboard",
   "**************************** Admin user **********************": "Admin user i18n",
@@ -127,4 +129,4 @@
   "views.admin.users.edit.confirm_password": "Confirm Password",
   "views.admin.users.edit.cancel": "Cancel",
   "views.admin.users.edit.save": "Save"
-}
+}
diff --git a/resources/views/admin/sections/footer.blade.php b/resources/views/admin/sections/footer.blade.php
@@ -1,4 +1,4 @@
 <div class="pull-right">
-    © {{ date('Y') }} {{ config('app.name') }}. {{ __('views.backend.section.footer.copyright') }}
+    &copy; {{ date('Y') }} {{ config('app.name') }}. {{ __('views.backend.section.footer.copyright') }}
 </div>
-<div class="clearfix"></div>
+<div class="clearfix"></div>
diff --git a/resources/views/admin/sections/navigation.blade.php b/resources/views/admin/sections/navigation.blade.php
@@ -14,7 +14,6 @@
                 <img src="{{ auth()->user()->avatar }}" alt="..." class="img-circle profile_img">
             </div>
             <div class="profile_info">
-                <span>{{ __('views.backend.section.navigation.greeting') }},</span>
                 <h2>{{ auth()->user()->name }}</h2>
             </div>
         </div>
@@ -30,7 +29,7 @@
                     <li>
                         <a href="{{ route('admin.dashboard') }}">
                             <i class="fa fa-home" aria-hidden="true"></i>
-                            {{ __('views.backend.section.navigation.menu_0') }}
+                            {{ __('views.backend.section.navigation.menu_0_1') }}
                         </a>
                     </li>
                 </ul>
@@ -41,7 +40,7 @@
                     <li>
                         <a href="{{ route('admin.users') }}">
                             <i class="fa fa-users" aria-hidden="true"></i>
-                            {{ __('views.backend.section.navigation.menu_1') }}
+                            {{ __('views.backend.section.navigation.menu_1_1') }}
                         </a>
                     </li>
                 </ul>
@@ -53,25 +52,36 @@
                     <li>
                         <a>
                             <i class="fa fa-list"></i>
-                            {{ __('views.backend.section.navigation.menu_2') }}
+                            {{ __('views.backend.section.navigation.menu_2_1') }}
                             <span class="fa fa-chevron-down"></span>
                         </a>
                         <ul class="nav child_menu">
                             <li>
                                 <a href="{{ route('log-viewer::dashboard') }}">
-                                    {{ __('views.backend.section.navigation.menu_3') }}
+                                    {{ __('views.backend.section.navigation.menu_2_2') }}
                                 </a>
                             </li>
                             <li>
                                 <a href="{{ route('log-viewer::logs.list') }}">
-                                    {{ __('views.backend.section.navigation.menu_4') }}
+                                    {{ __('views.backend.section.navigation.menu_2_3') }}
                                 </a>
                             </li>
                         </ul>
                     </li>
                 </ul>
             </div>
+            <div class="menu_section">
+                <h3>{{ __('views.backend.section.navigation.sub_header_3') }}</h3>
+                <ul class="nav side-menu">
+                  <li>
+                      <a href="http://netlicensing.io/?utm_source=Laravel_Boilerplate&utm_medium=github&utm_campaign=laravel_boilerplate&utm_content=credits" target="_blank" title="Online Software License Management"><i class="fa fa-lock" aria-hidden="true"></i>NetLicensing</a>
+                  </li>
+                  <li>
+                      <a href="https://photolancer.zone/?utm_source=Laravel_Boilerplate&utm_medium=github&utm_campaign=laravel_boilerplate&utm_content=credits" target="_blank" title="Individual digital content for your next campaign"><i class="fa fa-camera-retro" aria-hidden="true"></i>Photolancer Zone</a>
+                  </li>
+                </ul>
+            </div>
         </div>
         <!-- /sidebar menu -->
     </div>
-</div>
+</div>
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
@@ -59,7 +59,8 @@ class="btn btn-default submit">{{ __('views.auth.register.action_1') }}</button>
 
                             <div>
                                 <div class="h1">{{ config('app.name') }}</div>
-                                <p>&copy; {{ date('Y') }} {{ __('views.auth.register.copyright_0') }}. {{ config('app.name') }}. {{ __('views.auth.register.copyright_1') }}</p>
+                                <p>&copy; {{ date('Y') }} {{ config('app.name') }}. {{ __('views.auth.register.copyright_0') }}</p>
+                                <p>{{ __('views.auth.register.copyright_1') }}</p>
                             </div>
                         </div>
                     {{ Form::close() }}
@@ -74,4 +75,3 @@ class="btn btn-default submit">{{ __('views.auth.register.action_1') }}</button>
 
     {{ Html::style(mix('assets/auth/css/register.css')) }}
 @endsection
-
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
@@ -61,6 +61,15 @@
                 text-transform: uppercase;
             }
 
+            .footer {
+                position:fixed;
+                width:100%;
+                height:20px;
+                padding:5px;
+                bottom:0px;
+                font-size: smaller;
+            }
+
             .m-b-md {
                 margin-bottom: 30px;
             }
@@ -74,12 +83,13 @@
             @if (Route::has('login'))
                 <div class="top-right links">
                     @if (!Auth::check())
-                        <a href="{{ url('/login') }}">{{ __('views.welcome.login') }}</a>
                         <a href="{{ url('/register') }}">{{ __('views.welcome.register') }}</a>
+                        <a href="{{ url('/login') }}">{{ __('views.welcome.login') }}</a>
                     @else
                         @if(auth()->user()->hasRole('administrator'))
                             <a href="{{ url('/admin') }}">{{ __('views.welcome.admin') }}</a>
                         @endif
+                        <a href="{{ url('/logout') }}">{{ __('views.welcome.logout') }}</a>
                     @endif
                 </div>
             @endif
@@ -88,6 +98,16 @@
                 <div class="title m-b-md">
                    {{ config('app.name') }}
                 </div>
+                <div class="m-b-md">
+                   Sample users:<br/>
+                   Admin user: [email protected] / password: admin<br/>
+                   Demo user: [email protected] / password: demo
+                </div>
+                <div class="footer">
+                   Credits:&nbsp;
+                   <a href="http://netlicensing.io/?utm_source=Laravel_Boilerplate&amp;utm_medium=github&amp;utm_campaign=laravel_boilerplate&amp;utm_content=credits" target="_blank" title="Online Software License Management"><i class="fa fa-lock" aria-hidden="true"></i>NetLicensing</a>&nbsp;&bull;&nbsp;
+                   <a href="https://photolancer.zone/?utm_source=Laravel_Boilerplate&amp;utm_medium=github&amp;utm_campaign=laravel_boilerplate&amp;utm_content=credits" target="_blank" title="Individual digital content for your next campaign"><i class="fa fa-camera-retro" aria-hidden="true"></i>Photolancer Zone</a>
+                </div>
             </div>
         </div>
     </body>