TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing issues with files in modules/backend

This commit is contained in:
Stefan Talen 2014-10-18 12:05:51 +02:00
parent 509e7d2a12
commit 0a05e08a38
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/backend/formwidgets/ColorPicker.php
View File

@ -78,4 +78,4 @@ class ColorPicker extends FormWidgetBase
{ {
return strlen($value) ? $value : null; return strlen($value) ? $value : null;
} }
} }

2
modules/backend/lang/es-ar/lang.php
View File

@ -251,4 +251,4 @@ return [
'filter' => [ 'filter' => [
'all' => 'Todo' 'all' => 'Todo'
] ]
]; ];

10
modules/backend/models/BrandSettings.php
View File

@ -65,8 +65,9 @@ class BrandSettings extends Model
public static function getLogo() public static function getLogo()
{ {
$settings = self::instance(); $settings = self::instance();
if (!$settings->logo) if (!$settings->logo) {
return null; return null;
}
return $settings->logo->getPath(); return $settings->logo->getPath();
} }
@ -83,10 +84,11 @@ class BrandSettings extends Model
'secondary-color-dark' => self::get('secondary_color_dark', self::SECONDARY_DARK), 'secondary-color-dark' => self::get('secondary_color_dark', self::SECONDARY_DARK),
]); ]);
$parser->parse(File::get(PATH_BASE.'/modules/backend/models/brandsettings/custom.less').self::get('custom_css')); $parser->parse(
File::get(PATH_BASE.'/modules/backend/models/brandsettings/custom.less').self::get('custom_css')
);
$css = $parser->getCss(); $css = $parser->getCss();
return $css; return $css;
} }
}
}