diff --git a/kernel/admin/themes/default/css/uikit/form-file.almost-flat.min.css b/kernel/admin/themes/default/css/uikit/form-file.almost-flat.min.css old mode 100755 new mode 100644 diff --git a/kernel/admin/themes/default/css/uikit/placeholder.almost-flat.min.css b/kernel/admin/themes/default/css/uikit/placeholder.almost-flat.min.css old mode 100755 new mode 100644 diff --git a/kernel/admin/themes/default/css/uikit/progress.almost-flat.min.css b/kernel/admin/themes/default/css/uikit/progress.almost-flat.min.css old mode 100755 new mode 100644 diff --git a/kernel/admin/themes/default/css/uikit/uikit.almost-flat.min.css b/kernel/admin/themes/default/css/uikit/uikit.almost-flat.min.css old mode 100755 new mode 100644 diff --git a/kernel/admin/themes/default/css/uikit/upload.almost-flat.min.css b/kernel/admin/themes/default/css/uikit/upload.almost-flat.min.css old mode 100755 new mode 100644 diff --git a/kernel/admin/themes/default/js/uikit/uikit.min.js b/kernel/admin/themes/default/js/uikit/uikit.min.js old mode 100755 new mode 100644 diff --git a/kernel/admin/themes/default/js/uikit/upload.min.js b/kernel/admin/themes/default/js/uikit/upload.min.js old mode 100755 new mode 100644 diff --git a/kernel/admin/views/edit-user.php b/kernel/admin/views/edit-user.php index 5b06f05b..91c4989c 100644 --- a/kernel/admin/views/edit-user.php +++ b/kernel/admin/views/edit-user.php @@ -97,7 +97,12 @@ HTML::formClose(); echo ''; echo '
'; -echo ''.$L->g('Profile picture').''; +if(file_exists(PATH_UPLOADS_PROFILES.$_user['username'].'.jpg')) { + echo ''.$L->g('Profile picture').''; +} +else { + echo '
'.$L->g('Profile picture').'
'; +} HTML::profileUploader($_user['username']); echo '
'; echo ''; @@ -122,4 +127,4 @@ $(document).ready(function() { }); - + \ No newline at end of file diff --git a/plugins/tinymce/plugin.php b/plugins/tinymce/plugin.php index 8ca60b8e..c3606ceb 100644 --- a/plugins/tinymce/plugin.php +++ b/plugins/tinymce/plugin.php @@ -65,9 +65,13 @@ class pluginTinymce extends Plugin { // Load CSS and JS only on Controllers in array. if(in_array($layout['controller'], $this->loadWhenController)) { - $language = $Site->shortLanguage(); $pluginPath = $this->htmlPath(); + $language = ''; + if($Site->shortLanguage()!=='en') { + $language = 'language_url:"'.$pluginPath.'tinymce/langs/'.$Site->shortLanguage().'.js",'; + } + $html = '