From 940539c7f16f4a05d87b66b715d2b6f968340006 Mon Sep 17 00:00:00 2001 From: dignajar Date: Mon, 30 Nov 2015 23:57:46 -0300 Subject: [PATCH] Updates --- .../default/css/uikit/form-file.almost-flat.min.css | 0 .../css/uikit/placeholder.almost-flat.min.css | 0 .../default/css/uikit/progress.almost-flat.min.css | 0 .../default/css/uikit/uikit.almost-flat.min.css | 0 .../default/css/uikit/upload.almost-flat.min.css | 0 kernel/admin/themes/default/js/uikit/uikit.min.js | 0 kernel/admin/themes/default/js/uikit/upload.min.js | 0 kernel/admin/views/edit-user.php | 9 +++++++-- plugins/tinymce/plugin.php | 8 ++++++-- plugins/tinymce/tinymce/langs/bg.js | 0 plugins/tinymce/tinymce/langs/cs.js | 0 plugins/tinymce/tinymce/langs/de.js | 0 plugins/tinymce/tinymce/langs/es.js | 0 plugins/tinymce/tinymce/langs/fr.js | 0 plugins/tinymce/tinymce/langs/he.js | 0 plugins/tinymce/tinymce/langs/id.js | 0 plugins/tinymce/tinymce/langs/it.js | 0 plugins/tinymce/tinymce/langs/ja.js | 0 plugins/tinymce/tinymce/langs/pt.js | 0 plugins/tinymce/tinymce/langs/ru.js | 0 plugins/tinymce/tinymce/langs/uk.js | 0 plugins/tinymce/tinymce/langs/zh.js | 0 .../tinymce/tinymce/plugins/advlist/plugin.min.js | 0 .../tinymce/tinymce/plugins/anchor/plugin.min.js | 0 .../tinymce/tinymce/plugins/autolink/plugin.min.js | 0 .../tinymce/plugins/autoresize/plugin.min.js | 0 .../tinymce/tinymce/plugins/autosave/plugin.min.js | 0 .../tinymce/tinymce/plugins/bbcode/plugin.min.js | 0 .../tinymce/tinymce/plugins/charmap/plugin.min.js | 0 plugins/tinymce/tinymce/plugins/code/plugin.min.js | 0 .../tinymce/plugins/codesample/css/prism.css | 0 .../tinymce/plugins/codesample/plugin.min.js | 0 .../tinymce/plugins/colorpicker/plugin.min.js | 0 .../tinymce/plugins/contextmenu/plugin.min.js | 0 .../tinymce/plugins/directionality/plugin.min.js | 0 .../tinymce/plugins/emoticons/img/smiley-cool.gif | Bin .../tinymce/plugins/emoticons/img/smiley-cry.gif | Bin .../plugins/emoticons/img/smiley-embarassed.gif | Bin .../plugins/emoticons/img/smiley-foot-in-mouth.gif | Bin .../tinymce/plugins/emoticons/img/smiley-frown.gif | Bin .../plugins/emoticons/img/smiley-innocent.gif | Bin .../tinymce/plugins/emoticons/img/smiley-kiss.gif | Bin .../plugins/emoticons/img/smiley-laughing.gif | Bin .../plugins/emoticons/img/smiley-money-mouth.gif | Bin .../tinymce/plugins/emoticons/img/smiley-sealed.gif | Bin .../tinymce/plugins/emoticons/img/smiley-smile.gif | Bin .../plugins/emoticons/img/smiley-surprised.gif | Bin .../plugins/emoticons/img/smiley-tongue-out.gif | Bin .../plugins/emoticons/img/smiley-undecided.gif | Bin .../tinymce/plugins/emoticons/img/smiley-wink.gif | Bin .../tinymce/plugins/emoticons/img/smiley-yell.gif | Bin .../tinymce/tinymce/plugins/emoticons/plugin.min.js | 0 plugins/tinymce/tinymce/plugins/example/dialog.html | 0 .../tinymce/tinymce/plugins/example/plugin.min.js | 0 .../plugins/example_dependency/plugin.min.js | 0 .../tinymce/tinymce/plugins/fullpage/plugin.min.js | 0 .../tinymce/plugins/fullscreen/plugin.min.js | 0 plugins/tinymce/tinymce/plugins/hr/plugin.min.js | 0 plugins/tinymce/tinymce/plugins/image/plugin.min.js | 0 .../tinymce/plugins/imagetools/plugin.min.js | 0 .../tinymce/tinymce/plugins/importcss/plugin.min.js | 0 .../tinymce/plugins/insertdatetime/plugin.min.js | 0 plugins/tinymce/tinymce/plugins/layer/plugin.min.js | 0 .../tinymce/plugins/legacyoutput/plugin.min.js | 0 plugins/tinymce/tinymce/plugins/link/plugin.min.js | 0 plugins/tinymce/tinymce/plugins/lists/plugin.min.js | 0 .../tinymce/tinymce/plugins/media/moxieplayer.swf | Bin plugins/tinymce/tinymce/plugins/media/plugin.min.js | 0 .../tinymce/plugins/nonbreaking/plugin.min.js | 0 .../tinymce/plugins/noneditable/plugin.min.js | 0 .../tinymce/tinymce/plugins/pagebreak/plugin.min.js | 0 plugins/tinymce/tinymce/plugins/paste/plugin.min.js | 0 .../tinymce/tinymce/plugins/preview/plugin.min.js | 0 plugins/tinymce/tinymce/plugins/print/plugin.min.js | 0 plugins/tinymce/tinymce/plugins/save/plugin.min.js | 0 .../tinymce/plugins/searchreplace/plugin.min.js | 0 .../tinymce/plugins/spellchecker/plugin.min.js | 0 .../tinymce/tinymce/plugins/tabfocus/plugin.min.js | 0 plugins/tinymce/tinymce/plugins/table/plugin.min.js | 0 .../tinymce/tinymce/plugins/template/plugin.min.js | 0 .../tinymce/tinymce/plugins/textcolor/plugin.min.js | 0 .../tinymce/plugins/textpattern/plugin.min.js | 0 .../plugins/visualblocks/css/visualblocks.css | 0 .../tinymce/plugins/visualblocks/plugin.min.js | 0 .../tinymce/plugins/visualchars/plugin.min.js | 0 .../tinymce/tinymce/plugins/wordcount/plugin.min.js | 0 .../tinymce/skins/lightgray/content.inline.min.css | 0 .../tinymce/tinymce/skins/lightgray/content.min.css | 0 .../tinymce/skins/lightgray/fonts/tinymce-small.eot | Bin .../tinymce/skins/lightgray/fonts/tinymce-small.svg | 0 .../tinymce/skins/lightgray/fonts/tinymce-small.ttf | Bin .../skins/lightgray/fonts/tinymce-small.woff | Bin .../tinymce/skins/lightgray/fonts/tinymce.eot | Bin .../tinymce/skins/lightgray/fonts/tinymce.svg | 0 .../tinymce/skins/lightgray/fonts/tinymce.ttf | Bin .../tinymce/skins/lightgray/fonts/tinymce.woff | Bin .../tinymce/tinymce/skins/lightgray/img/anchor.gif | Bin .../tinymce/tinymce/skins/lightgray/img/loader.gif | Bin .../tinymce/tinymce/skins/lightgray/img/object.gif | Bin .../tinymce/tinymce/skins/lightgray/img/trans.gif | Bin .../tinymce/skins/lightgray/skin.ie7.min.css | 0 .../tinymce/tinymce/skins/lightgray/skin.min.css | 0 plugins/tinymce/tinymce/themes/modern/theme.min.js | 0 plugins/tinymce/tinymce/tinymce.min.js | 0 104 files changed, 13 insertions(+), 4 deletions(-) mode change 100755 => 100644 kernel/admin/themes/default/css/uikit/form-file.almost-flat.min.css mode change 100755 => 100644 kernel/admin/themes/default/css/uikit/placeholder.almost-flat.min.css mode change 100755 => 100644 kernel/admin/themes/default/css/uikit/progress.almost-flat.min.css mode change 100755 => 100644 kernel/admin/themes/default/css/uikit/uikit.almost-flat.min.css mode change 100755 => 100644 kernel/admin/themes/default/css/uikit/upload.almost-flat.min.css mode change 100755 => 100644 kernel/admin/themes/default/js/uikit/uikit.min.js mode change 100755 => 100644 kernel/admin/themes/default/js/uikit/upload.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/langs/bg.js mode change 100755 => 100644 plugins/tinymce/tinymce/langs/cs.js mode change 100755 => 100644 plugins/tinymce/tinymce/langs/de.js mode change 100755 => 100644 plugins/tinymce/tinymce/langs/es.js mode change 100755 => 100644 plugins/tinymce/tinymce/langs/fr.js mode change 100755 => 100644 plugins/tinymce/tinymce/langs/he.js mode change 100755 => 100644 plugins/tinymce/tinymce/langs/id.js mode change 100755 => 100644 plugins/tinymce/tinymce/langs/it.js mode change 100755 => 100644 plugins/tinymce/tinymce/langs/ja.js mode change 100755 => 100644 plugins/tinymce/tinymce/langs/pt.js mode change 100755 => 100644 plugins/tinymce/tinymce/langs/ru.js mode change 100755 => 100644 plugins/tinymce/tinymce/langs/uk.js mode change 100755 => 100644 plugins/tinymce/tinymce/langs/zh.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/advlist/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/anchor/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/autolink/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/autoresize/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/autosave/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/bbcode/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/charmap/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/code/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/codesample/css/prism.css mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/codesample/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/colorpicker/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/contextmenu/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/directionality/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/emoticons/img/smiley-cool.gif mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/emoticons/img/smiley-cry.gif mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/emoticons/img/smiley-embarassed.gif mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/emoticons/img/smiley-frown.gif mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/emoticons/img/smiley-innocent.gif mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/emoticons/img/smiley-kiss.gif mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/emoticons/img/smiley-laughing.gif mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/emoticons/img/smiley-money-mouth.gif mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/emoticons/img/smiley-sealed.gif mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/emoticons/img/smiley-smile.gif mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/emoticons/img/smiley-surprised.gif mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/emoticons/img/smiley-tongue-out.gif mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/emoticons/img/smiley-undecided.gif mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/emoticons/img/smiley-wink.gif mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/emoticons/img/smiley-yell.gif mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/emoticons/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/example/dialog.html mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/example/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/example_dependency/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/fullpage/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/fullscreen/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/hr/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/image/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/imagetools/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/importcss/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/insertdatetime/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/layer/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/legacyoutput/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/link/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/lists/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/media/moxieplayer.swf mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/media/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/nonbreaking/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/noneditable/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/pagebreak/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/paste/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/preview/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/print/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/save/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/searchreplace/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/spellchecker/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/tabfocus/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/table/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/template/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/textcolor/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/textpattern/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/visualblocks/css/visualblocks.css mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/visualblocks/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/visualchars/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/plugins/wordcount/plugin.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/skins/lightgray/content.inline.min.css mode change 100755 => 100644 plugins/tinymce/tinymce/skins/lightgray/content.min.css mode change 100755 => 100644 plugins/tinymce/tinymce/skins/lightgray/fonts/tinymce-small.eot mode change 100755 => 100644 plugins/tinymce/tinymce/skins/lightgray/fonts/tinymce-small.svg mode change 100755 => 100644 plugins/tinymce/tinymce/skins/lightgray/fonts/tinymce-small.ttf mode change 100755 => 100644 plugins/tinymce/tinymce/skins/lightgray/fonts/tinymce-small.woff mode change 100755 => 100644 plugins/tinymce/tinymce/skins/lightgray/fonts/tinymce.eot mode change 100755 => 100644 plugins/tinymce/tinymce/skins/lightgray/fonts/tinymce.svg mode change 100755 => 100644 plugins/tinymce/tinymce/skins/lightgray/fonts/tinymce.ttf mode change 100755 => 100644 plugins/tinymce/tinymce/skins/lightgray/fonts/tinymce.woff mode change 100755 => 100644 plugins/tinymce/tinymce/skins/lightgray/img/anchor.gif mode change 100755 => 100644 plugins/tinymce/tinymce/skins/lightgray/img/loader.gif mode change 100755 => 100644 plugins/tinymce/tinymce/skins/lightgray/img/object.gif mode change 100755 => 100644 plugins/tinymce/tinymce/skins/lightgray/img/trans.gif mode change 100755 => 100644 plugins/tinymce/tinymce/skins/lightgray/skin.ie7.min.css mode change 100755 => 100644 plugins/tinymce/tinymce/skins/lightgray/skin.min.css mode change 100755 => 100644 plugins/tinymce/tinymce/themes/modern/theme.min.js mode change 100755 => 100644 plugins/tinymce/tinymce/tinymce.min.js 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 = '