Merge pull request #76 from bvipul/master

Added Changes regarding theme erros

Author: viralsolani

app/Http/Controllers/Backend/Blogs/BlogsController.php

@@ -22,7 +22,7 @@ class BlogsController extends Controller
     protected $status = [
         'Published' => 'Published',
         'Draft'     => 'Draft',
-        'Inactive'  => 'Inactive',
+        'InActive'  => 'InActive',
         'Scheduled' => 'Scheduled',
     ];
 

app/Models/Access/User/Traits/Attribute/UserAttribute.php

@@ -372,6 +372,11 @@ public function getActionButtonsByPermissionName($permissionName, $counter)
         return $button;
     }
 
+    public function getNameAttribute()
+    {
+        return $this->first_name . ' ' . $this->last_name;
+    }
+
     /**
      * @return string
      */

config/locale.php

@@ -8,7 +8,7 @@
      *
      * @var bool
      */
-    'status' => true,
+    'status' => false,
 
     /*
      * Available languages
@@ -29,19 +29,19 @@
          * Index 1 of sub-array is the PHP locale code for setlocale()
          * Index 2 of sub-array is whether or not to use RTL (right-to-left) css for this language
          */
-        'ar'    => ['ar', 'ar_AR', true],
-        'da'    => ['da', 'da_DK', false],
-        'de'    => ['de', 'de_DE', false],
-        'el'    => ['el', 'el_GR', false],
+        // 'ar'    => ['ar', 'ar_AR', true],
+        // 'da'    => ['da', 'da_DK', false],
+        // 'de'    => ['de', 'de_DE', false],
+        // 'el'    => ['el', 'el_GR', false],
         'en'    => ['en', 'en_US', false],
-        'es'    => ['es', 'es_ES', false],
-        'fr'    => ['fr', 'fr_FR', false],
-        'id'    => ['id', 'id_ID', false],
-        'it'    => ['it', 'it_IT', false],
-        'nl'    => ['nl', 'nl_NL', false],
-        'pt_BR' => ['pt_BR', 'pt_BR', false],
-        'ru'    => ['ru', 'ru-RU', false],
-        'sv'    => ['sv', 'sv_SE', false],
-        'th'    => ['th', 'th_TH', false],
+        // 'es'    => ['es', 'es_ES', false],
+        // 'fr'    => ['fr', 'fr_FR', false],
+        // 'id'    => ['id', 'id_ID', false],
+        // 'it'    => ['it', 'it_IT', false],
+        // 'nl'    => ['nl', 'nl_NL', false],
+        // 'pt_BR' => ['pt_BR', 'pt_BR', false],
+        // 'ru'    => ['ru', 'ru-RU', false],
+        // 'sv'    => ['sv', 'sv_SE', false],
+        // 'th'    => ['th', 'th_TH', false],
     ],
 ];

public/css/custom-style.css

@@ -9,6 +9,9 @@
     -ms-box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);
     -o-box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);
 }
+.box.box-info {
+    border-top-color: var(--theme-co);
+}
 
 .box-header {
     padding: 15px 10px;
@@ -219,13 +222,13 @@ textarea.form-control { max-width: 100%; min-height: 50px; }
 .control-group { display: block; text-align: left; padding: 0; margin: 3px 0 0; }
 .control { display: inline-block; vertical-align: top; position: relative; padding-left: 32px; padding-right: 10px; cursor: pointer; font-size: 14px; line-height: 28px; font-weight: 500; }
 .control input { position: absolute; z-index: -1; opacity: 0; }
-.control__indicator { position: absolute; top: 3px; left: 0; height: 24px; width: 24px; }
+.control__indicator { position: absolute; top: 3px; left: 0; height: 24px; width: 24px; border: 1px solid var(--theme-co); }
 .control--radio .control__indicator { border-radius: 50%; }
 .control input:disabled ~ .control__indicator { opacity: 0.6; pointer-events: none; }
 .control__indicator:after { content: ''; position: absolute; display: none; }
 .control input:checked ~ .control__indicator:after { display: block; }
-.control--checkbox .control__indicator:after { left: 8px; top: 4px; width: 7px; height: 12px; border: solid #fff; border-width: 0 3px 3px 0; transform: rotate(45deg); }
-.control--radio .control__indicator:after { left: 7px; top: 7px; height: 10px; width: 10px; border-radius: 50%; background: #fff; }
+.control--checkbox .control__indicator:after { left: 8px; top: 4px; width: 7px; height: 12px; border: solid var(--theme-co); border-width: 0 3px 3px 0; transform: rotate(45deg); }
+.control--radio .control__indicator:after { left: 6px; top: 6px; height: 10px; width: 10px; border-radius: 50%; background: var(--theme-co); }
 /* selectbox css */
 ::-moz-focus-inner, select:focus, select:active { outline: 0 !important; -moz-outline: 0 !important; }
 .data-table-wrapper .dataTables_length label { position: relative; display: inline-block; width: 100%; }
@@ -322,6 +325,11 @@ ul.timeline.notification-list>li>.timeline-item { margin-right: 0; }
 ul.timeline.notification-list>li>.timeline-item>.timeline-header { border-bottom: 0; font-size: 15px; }
 ul.timeline.notification-list>li>.timeline-item>.timeline-header>span.comment-hl { padding-right: 3px; font-weight: 600; }
 
+.pagination>.active>a, .pagination>.active>a:focus, .pagination>.active>a:hover, .pagination>.active>span, .pagination>.active>span:focus, .pagination>.active>span:hover {
+    background-color: var(--theme-co);
+    border-color: var(--theme-co);
+}
+
 /* Tab CSS start */
 .setting-tab-list.nav-tabs>li>a { color: #555; }
 .tab-content.setting-tab { padding-top: 30px; }

resources/views/backend/includes/header.blade.php

@@ -77,7 +77,7 @@
                 <li class="dropdown user user-menu">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                         <img src="{{ access()->user()->picture }}" class="user-image" alt="User Avatar"/>
-                        <span class="hidden-xs">{{ access()->user()->name }}</span>
+                        <span class="hidden-xs">{{ access()->user()->first_name }}</span>
                         <div class="clearfix"></div>
                     </a>
 

resources/views/backend/layouts/app.blade.php

@@ -54,7 +54,9 @@
                 <section class="content-header">
                     @yield('page-header')
                     <!-- Breadcrumbs would render from routes/breadcrumb.php -->
-
+                    @if(Breadcrumbs::exists())
+                        {!! Breadcrumbs::render() !!}
+                    @endif
                 </section>
 
                 <!-- Main content -->