Merge commit '45c2c06b'

* commit '45c2c06b':
  Squashed 'Modules/Setting/' changes from 8dd75b2..fb7cc0f

Modules/Setting/Http/Controllers/Admin/SettingController.php

@@ -6,7 +6,6 @@ use Laracasts\Flash\Flash;
 use Modules\Core\Http\Controllers\Admin\AdminBaseController;
 use Modules\Setting\Http\Requests\SettingRequest;
 use Modules\Setting\Repositories\SettingRepository;
-use Pingpong\Modules\Module;
 
 class SettingController extends AdminBaseController
 {
@@ -19,12 +18,12 @@ class SettingController extends AdminBaseController
      */
     private $module;
 
-    public function __construct(SettingRepository $setting, Module $module)
+    public function __construct(SettingRepository $setting)
     {
         parent::__construct();
 
         $this->setting = $setting;
-        $this->module = $module;
+        $this->module = app('modules');
     }
 
     public function index()

Modules/Setting/Repositories/Eloquent/EloquentSettingRepository.php

@@ -139,8 +139,8 @@ class EloquentSettingRepository extends EloquentBaseRepository implements Settin
 
         $modulesWithSettings = [];
         foreach ($modules as $module) {
-            if ($moduleSettings = Config::get(strtolower($module) . "::settings")) {
-                $modulesWithSettings[$module] = $moduleSettings;
+            if ($moduleSettings = Config::get(strtolower($module->getName()) . "::settings")) {
+                $modulesWithSettings[$module->getName()] = $moduleSettings;
             }
         }
 

Modules/Setting/Resources/views/admin/module-settings.blade.php

@@ -12,7 +12,7 @@
 @stop
 
 @section('styles')
-<link href="{!! Module::asset('core', 'css/vendor/iCheck/flat/blue.css') !!}" rel="stylesheet" type="text/css" />
+<link href="{!! Module::asset('core:css/vendor/iCheck/flat/blue.css') !!}" rel="stylesheet" type="text/css" />
 @stop
 
 @section('content')
@@ -49,15 +49,7 @@
             <?php if ($translatableSettings): ?>
             <div class="box-body">
                 <div class="nav-tabs-custom">
-                    <ul class="nav nav-tabs">
-                        <?php $i = 0; ?>
-                        <?php foreach(LaravelLocalization::getSupportedLocales() as $locale => $language): ?>
-                            <?php $i++; ?>
-                            <li class="{{ App::getLocale() == $locale ? 'active' : '' }}">
-                                <a href="#tab_{{ $i }}" data-toggle="tab">{{ trans('core::core.tab.'. strtolower($language['name'])) }}</a>
-                            </li>
-                        <?php endforeach; ?>
-                    </ul>
+                    @include('core::partials.form-tab-headers')
                     <div class="tab-content">
                         <?php $i = 0; ?>
                         <?php foreach(LaravelLocalization::getSupportedLocales() as $locale => $language): ?>