diff --git a/app/controllers/admin/SettingsController.php b/app/controllers/admin/SettingsController.php
index c714fefac1..e4a572298d 100755
--- a/app/controllers/admin/SettingsController.php
+++ b/app/controllers/admin/SettingsController.php
@@ -68,7 +68,8 @@ class SettingsController extends AdminController
// Declare the rules for the form validation
$rules = array(
- "per_page" => 'required|min:1|numeric',
+ "brand" => 'required|min:1|numeric',
+ "per_page" => 'required|min:1|numeric',
"qr_text" => 'min:1|max:31',
"logo" => 'mimes:jpeg,bmp,png,gif',
"custom_css" => 'alpha_space',
@@ -115,6 +116,7 @@ class SettingsController extends AdminController
if (Config::get('app.lock_passwords')==false) {
$setting->site_name = e(Input::get('site_name'));
+ $setting->brand = e(Input::get('brand'));
$setting->custom_css = e(Input::get('custom_css'));
}
diff --git a/app/database/migrations/2015_10_12_192706_add_brand_to_settings.php b/app/database/migrations/2015_10_12_192706_add_brand_to_settings.php
new file mode 100644
index 0000000000..eae3acd849
--- /dev/null
+++ b/app/database/migrations/2015_10_12_192706_add_brand_to_settings.php
@@ -0,0 +1,34 @@
+tinyInteger('brand')->default(1);
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('settings', function(Blueprint $table)
+ {
+ $table->dropColumn('brand');
+ });
+ }
+
+}
diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php
index b409510a44..1b3921fd76 100644
--- a/app/views/backend/layouts/default.blade.php
+++ b/app/views/backend/layouts/default.blade.php
@@ -113,7 +113,12 @@
- @if (Setting::getSettings()->logo)
+ @if (Setting::getSettings()->brand === 3)
+
+
+ {{{ Setting::getSettings()->site_name }}}
+
+ @elseif (Setting::getSettings()->brand === 2)
diff --git a/app/views/backend/settings/edit.blade.php b/app/views/backend/settings/edit.blade.php
index 41a7e89138..7c04f68dca 100755
--- a/app/views/backend/settings/edit.blade.php
+++ b/app/views/backend/settings/edit.blade.php
@@ -102,7 +102,7 @@
{{ Form::label('header_color', Lang::get('admin/settings/general.header_color')) }}