Allow multiple upload fields and add logo option to labels (#6736)

* Change upload js to work with multiple upload elements on a single page

* Change uploadFile in upload modal and form partial

* Change uploadFile to js-uploadFile to avoid potential issues in the future

* Remove duplicate style attribute causing webpack to fail

* Missed a css class in rename to js- prefix

* - Move logo uploads to partial for eaiser usage
- Add label logo
- Add css classes to label elements
- Change label prefix text (M: S: ...) to css::before content for easy removal in config

* Add more css classes to labels

* Allow unescaped " (quot) in css ouput

* Add max size param to partial, set defaults for allowedType and size
This commit is contained in:
Steffen
2019-03-02 00:25:42 +01:00
committed by snipe
parent c47fa5ad1c
commit e1907e30b1
11 changed files with 226 additions and 161 deletions
+5 -4
View File
@@ -215,6 +215,8 @@ class Setting extends Model
// Needed for modifying the bootstrap nav :(
$custom_css = str_ireplace('script', 'SCRIPTS-NOT-ALLOWED-HERE', $custom_css);
$custom_css = str_replace('>', '>', $custom_css);
// Allow String output (needs quotes)
$custom_css = str_replace('"', '"', $custom_css);
return $custom_css;
}
@@ -320,9 +322,9 @@ class Setting extends Model
/**
* Get the specific LDAP settings
*
*
* @author Wes Hulette <jwhulette@gmail.com>
*
*
* @since 5.0.0
*
* @return Collection
@@ -330,7 +332,7 @@ class Setting extends Model
public static function getLdapSettings(): Collection
{
$ldapSettings = self::select([
'ldap_enabled',
'ldap_enabled',
'ldap_server',
'ldap_uname',
'ldap_pword',
@@ -354,5 +356,4 @@ class Setting extends Model
return collect($ldapSettings);
}
}