From 13154f02cfb5ea1e98ef90e77acaa4e4195c2314 Mon Sep 17 00:00:00 2001 From: dignajar Date: Sun, 2 Aug 2015 01:40:24 -0300 Subject: [PATCH] Minor changes --- admin/controllers/themes.php | 7 + admin/themes/default/css/default.css | 35 ++-- admin/views/dashboard.php | 2 +- languages/en_US.json | 3 +- plugins/opengraph/language/en_US.json | 6 +- plugins/pages/language/en_US.json | 6 +- plugins/pages/language/fr_FR.json | 6 +- plugins/tinymce/language/en_US.json | 10 +- plugins/tinymce/language/fr_FR.json | 12 -- plugins/tinymce/plugin.php | 3 +- plugins/trumbowyg/language/en_US.json | 12 -- plugins/trumbowyg/language/fr_FR.json | 12 -- plugins/trumbowyg/plugin.php | 59 ------- plugins/trumbowyg/trumbowyg/langs/ar.min.js | 9 - plugins/trumbowyg/trumbowyg/langs/ca.min.js | 11 -- plugins/trumbowyg/trumbowyg/langs/cs.min.js | 8 - plugins/trumbowyg/trumbowyg/langs/da.min.js | 9 - plugins/trumbowyg/trumbowyg/langs/de.min.js | 9 - plugins/trumbowyg/trumbowyg/langs/es.min.js | 9 - .../trumbowyg/trumbowyg/langs/es_ar.min.js | 9 - plugins/trumbowyg/trumbowyg/langs/fa.min.js | 10 -- plugins/trumbowyg/trumbowyg/langs/fi.min.js | 9 - plugins/trumbowyg/trumbowyg/langs/fr.min.js | 10 -- plugins/trumbowyg/trumbowyg/langs/he.min.js | 9 - plugins/trumbowyg/trumbowyg/langs/id.min.js | 11 -- plugins/trumbowyg/trumbowyg/langs/it.min.js | 8 - plugins/trumbowyg/trumbowyg/langs/ja.min.js | 10 -- plugins/trumbowyg/trumbowyg/langs/ko.min.js | 10 -- plugins/trumbowyg/trumbowyg/langs/nl.min.js | 9 - plugins/trumbowyg/trumbowyg/langs/pl.min.js | 9 - plugins/trumbowyg/trumbowyg/langs/pt.min.js | 11 -- plugins/trumbowyg/trumbowyg/langs/ro.min.js | 13 -- plugins/trumbowyg/trumbowyg/langs/rs.min.js | 8 - .../trumbowyg/trumbowyg/langs/rs_latin.min.js | 8 - plugins/trumbowyg/trumbowyg/langs/ru.min.js | 8 - plugins/trumbowyg/trumbowyg/langs/sk.min.js | 8 - plugins/trumbowyg/trumbowyg/langs/tr.min.js | 10 -- .../trumbowyg/trumbowyg/langs/zh_cn.min.js | 10 -- .../plugins/base64/trumbowyg.base64.js | 81 --------- .../plugins/base64/trumbowyg.base64.min.js | 1 - .../plugins/colors/trumbowyg.colors.js | 83 --------- .../plugins/colors/trumbowyg.colors.min.js | 1 - .../colors/ui/images/icons-black-2x.png | Bin 1376 -> 0 bytes .../plugins/colors/ui/images/icons-black.png | Bin 983 -> 0 bytes .../colors/ui/images/icons-white-2x.png | Bin 1385 -> 0 bytes .../plugins/colors/ui/images/icons-white.png | Bin 926 -> 0 bytes .../plugins/colors/ui/trumbowyg.colors.css | 70 -------- .../colors/ui/trumbowyg.colors.min.css | 2 - .../plugins/upload/trumbowyg.upload.js | 157 ------------------ .../plugins/upload/trumbowyg.upload.min.js | 1 - plugins/trumbowyg/trumbowyg/trumbowyg.min.js | 2 - .../trumbowyg/ui/images/icons-black-2x.png | Bin 15142 -> 0 bytes .../trumbowyg/ui/images/icons-black.png | Bin 8119 -> 0 bytes .../trumbowyg/ui/images/icons-white-2x.png | Bin 13806 -> 0 bytes .../trumbowyg/ui/images/icons-white.png | Bin 7196 -> 0 bytes .../trumbowyg/trumbowyg/ui/trumbowyg.min.css | 2 - themes/pure/language/en_US.json | 6 +- 57 files changed, 54 insertions(+), 760 deletions(-) delete mode 100755 plugins/tinymce/language/fr_FR.json delete mode 100755 plugins/trumbowyg/language/en_US.json delete mode 100755 plugins/trumbowyg/language/fr_FR.json delete mode 100755 plugins/trumbowyg/plugin.php delete mode 100755 plugins/trumbowyg/trumbowyg/langs/ar.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/ca.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/cs.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/da.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/de.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/es.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/es_ar.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/fa.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/fi.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/fr.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/he.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/id.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/it.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/ja.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/ko.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/nl.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/pl.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/pt.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/ro.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/rs.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/rs_latin.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/ru.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/sk.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/tr.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/langs/zh_cn.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/plugins/base64/trumbowyg.base64.js delete mode 100755 plugins/trumbowyg/trumbowyg/plugins/base64/trumbowyg.base64.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/plugins/colors/trumbowyg.colors.js delete mode 100755 plugins/trumbowyg/trumbowyg/plugins/colors/trumbowyg.colors.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/plugins/colors/ui/images/icons-black-2x.png delete mode 100755 plugins/trumbowyg/trumbowyg/plugins/colors/ui/images/icons-black.png delete mode 100755 plugins/trumbowyg/trumbowyg/plugins/colors/ui/images/icons-white-2x.png delete mode 100755 plugins/trumbowyg/trumbowyg/plugins/colors/ui/images/icons-white.png delete mode 100755 plugins/trumbowyg/trumbowyg/plugins/colors/ui/trumbowyg.colors.css delete mode 100755 plugins/trumbowyg/trumbowyg/plugins/colors/ui/trumbowyg.colors.min.css delete mode 100755 plugins/trumbowyg/trumbowyg/plugins/upload/trumbowyg.upload.js delete mode 100755 plugins/trumbowyg/trumbowyg/plugins/upload/trumbowyg.upload.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/trumbowyg.min.js delete mode 100755 plugins/trumbowyg/trumbowyg/ui/images/icons-black-2x.png delete mode 100755 plugins/trumbowyg/trumbowyg/ui/images/icons-black.png delete mode 100755 plugins/trumbowyg/trumbowyg/ui/images/icons-white-2x.png delete mode 100755 plugins/trumbowyg/trumbowyg/ui/images/icons-white.png delete mode 100755 plugins/trumbowyg/trumbowyg/ui/trumbowyg.min.css diff --git a/admin/controllers/themes.php b/admin/controllers/themes.php index 901e8d82..c8d2a7de 100644 --- a/admin/controllers/themes.php +++ b/admin/controllers/themes.php @@ -21,3 +21,10 @@ if( $_SERVER['REQUEST_METHOD'] == 'POST' ) // ============================================================================ // Main // ============================================================================ + +$themes = Filesystem::listDirectories(PATH_THEMES); + +// Load each plugin clasess +foreach($themes as $themePath) { +// include($themePath.DS.'plugin.php'); +} \ No newline at end of file diff --git a/admin/themes/default/css/default.css b/admin/themes/default/css/default.css index 07a95df2..bef79c3f 100644 --- a/admin/themes/default/css/default.css +++ b/admin/themes/default/css/default.css @@ -12,6 +12,10 @@ body { background-color: #f9f9f9; } +div.unit-80 { + margin-left: 1% !important; +} + /* ----------- FONTS AWESOME ----------- */ .fa-right { margin-right: 5px; @@ -241,30 +245,41 @@ a.btn-red:hover { /* ----------- THEMES ----------- */ -div.pluginBox { +div.themeBox { box-shadow: 0 1px 2px rgba(0,0,0,.26); background-color: #fff; border-radius: 2px; box-sizing: border-box; - padding: 20px; + padding: 15px 20px; width: 70%; margin-bottom: 20px; } -div.pluginBox p { - margin-bottom: 10px; +div.themeBox p { + margin-bottom: 6px; } -div.pluginBox span.author { - color: #999; - margin-left: 10px; - float: right; +div.themeBox p.name { + border-bottom: 1px dashed #ccc; } -div.pluginBox span.version { - color: #999; +div.themeBox a.btn-smaller { + padding: 4px 10px; + margin-right: 10px; +} + +div.themeBox span.author { + color: #777; margin-left: 10px; float: right; + font-size: 0.9em; +} + +div.themeBox span.version { + color: #777; + margin-left: 10px; + float: right; + font-size: 0.9em; } /* ----------- PLUGINS ----------- */ diff --git a/admin/views/dashboard.php b/admin/views/dashboard.php index 8efb064b..f96240a9 100644 --- a/admin/views/dashboard.php +++ b/admin/views/dashboard.php @@ -5,7 +5,7 @@
-

Start here!

+

p('Start here') ?>