From f5ff25934453c77c001a1f011f01a756f21f8d1d Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 8 Feb 2014 14:56:57 +0200 Subject: [PATCH 01/13] UI Improvements - Admin Theme Updates #194 --- admin/themes/default/css/default.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/admin/themes/default/css/default.css b/admin/themes/default/css/default.css index 34de9d4..8a71313 100644 --- a/admin/themes/default/css/default.css +++ b/admin/themes/default/css/default.css @@ -411,6 +411,7 @@ td, th { border-bottom: 1px solid #ccc; } + /* Editor */ #editor_area { height: 400px!important; @@ -434,6 +435,10 @@ td, th { border-bottom: 1px solid #F3F3F3; } +.modal-header .close { + font-size: 26px; +} + .modal-footer { border-top: 1px solid #F3F3F3; } From baefbef8ab14a21c7bf974afb7b8360de7c84b18 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 9 Feb 2014 21:50:02 +0200 Subject: [PATCH 02/13] Plugins. README.MD #167 --- plugins/box/plugins/views/backend/index.view.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/plugins/box/plugins/views/backend/index.view.php b/plugins/box/plugins/views/backend/index.view.php index ba93533..b4b31c3 100755 --- a/plugins/box/plugins/views/backend/index.view.php +++ b/plugins/box/plugins/views/backend/index.view.php @@ -44,8 +44,8 @@
'btn btn-info', 'data-toggle' => 'modal', 'data-target' => '#readme')); + '#', + array('class' => 'btn btn-info readme_plugin', 'data-toggle' => 'modal', 'data-target' => '#readme', 'readme_plugin' => $plugin['id'])); ?> + +
From ba78201812ffc81408c7a7f4f8bd4d59b51198c2 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 11 Feb 2014 23:14:59 +0200 Subject: [PATCH 07/13] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3b9649..db6018c 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,7 @@ Monstra 2.4.0, 2014-xx-xx - Monstra Dashboard created and set as default Plugin for Admin Panel - Monstra Dashboard Google Analytics statistic added. - Ink Framework for Monstra Email Templates -- iCheck plugin for checkboxes +- iCheck plugin for checkboxes added. - Emails Manager Plugin added. - HubSpot Messaging Library added for notifications - Gelato: Unzip Functionality added. From 0a08b4131dca6467b211d09fde6cd31fc79ffc23 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 11 Feb 2014 23:15:34 +0200 Subject: [PATCH 08/13] Plugins. README.MD #167 --- admin/themes/default/css/default.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/admin/themes/default/css/default.css b/admin/themes/default/css/default.css index 8a71313..a3b83eb 100644 --- a/admin/themes/default/css/default.css +++ b/admin/themes/default/css/default.css @@ -465,6 +465,10 @@ td, th { border: none; } +#readme .modal-dialog { + width: 70%; +} + /************************************* 3. MEDIA QUERIES *************************************/ From d8a9c746b405d7b3815ca1f7686d602fe6a21528 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 11 Feb 2014 23:16:41 +0200 Subject: [PATCH 09/13] Plugins. README.MD #167 --- storage/database/plugins.table.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/database/plugins.table.xml b/storage/database/plugins.table.xml index 75408e3..a879642 100644 --- a/storage/database/plugins.table.xml +++ b/storage/database/plugins.table.xml @@ -1,2 +1,2 @@ -261dd4ef4d35cPagesplugins/box/pages/pages.plugin.phpactive12ae8f24db1eFilesmanagerplugins/box/filesmanager/filesmanager.plugin.phpactive2363477fb180Pluginsplugins/box/plugins/plugins.plugin.phpactive1451cef0f1d7Themesplugins/box/themes/themes.plugin.phpactive3596d232738bMenuplugins/box/menu/menu.plugin.phpactive46f1b72e74c3Systemplugins/box/system/system.plugin.phpactive47945b0245f0Snippetsplugins/box/snippets/snippets.plugin.phpactive68df8fb7deccUsersplugins/box/users/users.plugin.phpactive795994da8240Backupplugins/box/backup/backup.plugin.phpactive810fba0b8bdcaSitemapplugins/box/sitemap/sitemap.plugin.phpactive1011f4d1aa1d5aInformationplugins/box/information/information.plugin.phpactive151478b14de2e1editorplugins/box/editor/editor.plugin.phpactive11578b14de2e2blocksplugins/box/blocks/blocks.plugin.phpactive6183f28d7656amarkitupplugins/markitup/markitup.plugin.phpactive1522f8c19df066captchaplugins/captcha/captcha.plugin.phpactive152397e3bff319blogplugins/blog/blog.plugin.phpactive1524ff449c2bb0codemirrorplugins/codemirror/codemirror.plugin.phpactive1525754e408ef5dashboardplugins/box/dashboard/dashboard.plugin.phpactive15266ba11431c3emailsplugins/box/emails/emails.plugin.phpactive15 +271dd4ef4d35cPagesplugins/box/pages/pages.plugin.phpactive12ae8f24db1eFilesmanagerplugins/box/filesmanager/filesmanager.plugin.phpactive2363477fb180Pluginsplugins/box/plugins/plugins.plugin.phpactive1451cef0f1d7Themesplugins/box/themes/themes.plugin.phpactive3596d232738bMenuplugins/box/menu/menu.plugin.phpactive46f1b72e74c3Systemplugins/box/system/system.plugin.phpactive47945b0245f0Snippetsplugins/box/snippets/snippets.plugin.phpactive68df8fb7deccUsersplugins/box/users/users.plugin.phpactive795994da8240Backupplugins/box/backup/backup.plugin.phpactive810fba0b8bdcaSitemapplugins/box/sitemap/sitemap.plugin.phpactive1011f4d1aa1d5aInformationplugins/box/information/information.plugin.phpactive151478b14de2e1editorplugins/box/editor/editor.plugin.phpactive11578b14de2e2blocksplugins/box/blocks/blocks.plugin.phpactive6183f28d7656amarkitupplugins/markitup/markitup.plugin.phpactive1522f8c19df066captchaplugins/captcha/captcha.plugin.phpactive152397e3bff319blogplugins/blog/blog.plugin.phpactive1524ff449c2bb0codemirrorplugins/codemirror/codemirror.plugin.phpactive1525754e408ef5dashboardplugins/box/dashboard/dashboard.plugin.phpactive15266ba11431c3emailsplugins/box/emails/emails.plugin.phpactive15276de9688fa8markdownplugins/markdown/markdown.plugin.phpactive10 From e662a9937bb7f4c0ef9615c833b17a98f26d6e19 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 12 Feb 2014 00:08:13 +0200 Subject: [PATCH 10/13] Plugins. README.MD #167 --- plugins/box/plugins/languages/de.lang.php | 1 + plugins/box/plugins/languages/en.lang.php | 1 + plugins/box/plugins/languages/es.lang.php | 1 + plugins/box/plugins/languages/fa.lang.php | 1 + plugins/box/plugins/languages/fr.lang.php | 1 + plugins/box/plugins/languages/hu.lang.php | 1 + plugins/box/plugins/languages/id.lang.php | 1 + plugins/box/plugins/languages/it.lang.php | 1 + plugins/box/plugins/languages/ja.lang.php | 1 + plugins/box/plugins/languages/lt.lang.php | 1 + plugins/box/plugins/languages/nl.lang.php | 1 + plugins/box/plugins/languages/pl.lang.php | 1 + plugins/box/plugins/languages/pt-br.lang.php | 1 + plugins/box/plugins/languages/ru.lang.php | 1 + plugins/box/plugins/languages/sk.lang.php | 1 + plugins/box/plugins/languages/sr-yu.lang.php | 1 + plugins/box/plugins/languages/uk.lang.php | 1 + plugins/box/plugins/plugins.admin.php | 22 +++++++++++++------ .../box/plugins/views/backend/index.view.php | 2 ++ 19 files changed, 34 insertions(+), 7 deletions(-) diff --git a/plugins/box/plugins/languages/de.lang.php b/plugins/box/plugins/languages/de.lang.php index a051658..d95c263 100644 --- a/plugins/box/plugins/languages/de.lang.php +++ b/plugins/box/plugins/languages/de.lang.php @@ -16,5 +16,6 @@ 'Get More Plugins' => 'Hole weitere Plugins', 'Install' => 'Installieren', 'Uninstall' => 'Deinstallieren', + 'README.md not found' => 'README.md not found', ) ); diff --git a/plugins/box/plugins/languages/en.lang.php b/plugins/box/plugins/languages/en.lang.php index 7c5adf6..6cbe795 100644 --- a/plugins/box/plugins/languages/en.lang.php +++ b/plugins/box/plugins/languages/en.lang.php @@ -16,5 +16,6 @@ 'Get More Plugins' => 'Get More Plugins', 'Install' => 'Install', 'Uninstall' => 'Uninstall', + 'README.md not found' => 'README.md not found', ) ); diff --git a/plugins/box/plugins/languages/es.lang.php b/plugins/box/plugins/languages/es.lang.php index c02c7d7..005fdc9 100644 --- a/plugins/box/plugins/languages/es.lang.php +++ b/plugins/box/plugins/languages/es.lang.php @@ -16,5 +16,6 @@ 'Get More Plugins' => 'Obtener mas plugins', 'Install' => 'Instalar', 'Uninstall' => 'Desinstalar', + 'README.md not found' => 'README.md not found', ) ); \ No newline at end of file diff --git a/plugins/box/plugins/languages/fa.lang.php b/plugins/box/plugins/languages/fa.lang.php index bfc873b..849e026 100644 --- a/plugins/box/plugins/languages/fa.lang.php +++ b/plugins/box/plugins/languages/fa.lang.php @@ -16,5 +16,6 @@ 'Get More Plugins' => 'دریافت افزونه های بیشتر', 'Install' => 'نصب', 'Uninstall' => 'حذف', + 'README.md not found' => 'README.md not found', ) ); diff --git a/plugins/box/plugins/languages/fr.lang.php b/plugins/box/plugins/languages/fr.lang.php index f438b6e..e1324fb 100644 --- a/plugins/box/plugins/languages/fr.lang.php +++ b/plugins/box/plugins/languages/fr.lang.php @@ -16,5 +16,6 @@ 'Get More Plugins' => 'Obtenez plus de plugins', 'Install' => 'Installer', 'Uninstall' => 'Désinstaller', + 'README.md not found' => 'README.md not found', ) ); \ No newline at end of file diff --git a/plugins/box/plugins/languages/hu.lang.php b/plugins/box/plugins/languages/hu.lang.php index abb3e75..ee20943 100644 --- a/plugins/box/plugins/languages/hu.lang.php +++ b/plugins/box/plugins/languages/hu.lang.php @@ -16,5 +16,6 @@ 'Get More Plugins' => 'Még több Plugin', 'Install' => 'Telepít', 'Uninstall' => 'Töröl', + 'README.md not found' => 'README.md not found', ) ); diff --git a/plugins/box/plugins/languages/id.lang.php b/plugins/box/plugins/languages/id.lang.php index 03cd8e5..b53dd87 100644 --- a/plugins/box/plugins/languages/id.lang.php +++ b/plugins/box/plugins/languages/id.lang.php @@ -16,5 +16,6 @@ 'Get More Plugins' => 'Cari Plugins Baru', 'Install' => 'Memasangkan', 'Uninstall' => 'Menghapus Program', + 'README.md not found' => 'README.md not found', ) ); diff --git a/plugins/box/plugins/languages/it.lang.php b/plugins/box/plugins/languages/it.lang.php index 4d0f0a6..e47599a 100644 --- a/plugins/box/plugins/languages/it.lang.php +++ b/plugins/box/plugins/languages/it.lang.php @@ -16,5 +16,6 @@ 'Get More Plugins' => 'Scarica altri plugin', 'Install' => 'Installa', 'Uninstall' => 'Disinstalla', + 'README.md not found' => 'README.md not found', ) ); diff --git a/plugins/box/plugins/languages/ja.lang.php b/plugins/box/plugins/languages/ja.lang.php index 9d52c2f..816afd4 100644 --- a/plugins/box/plugins/languages/ja.lang.php +++ b/plugins/box/plugins/languages/ja.lang.php @@ -16,5 +16,6 @@ 'Get More Plugins' => 'さらにプラグインを取得', 'Install' => 'インストール', 'Uninstall' => '停止', + 'README.md not found' => 'README.md not found', ) ); diff --git a/plugins/box/plugins/languages/lt.lang.php b/plugins/box/plugins/languages/lt.lang.php index ecfb8a4..6bcefbb 100644 --- a/plugins/box/plugins/languages/lt.lang.php +++ b/plugins/box/plugins/languages/lt.lang.php @@ -16,5 +16,6 @@ 'Get More Plugins' => 'Gauti daugiau papildinių', 'Install' => 'Įdiegti', 'Uninstall' => 'Išdiegti', + 'README.md not found' => 'README.md not found', ) ); diff --git a/plugins/box/plugins/languages/nl.lang.php b/plugins/box/plugins/languages/nl.lang.php index bf77064..44b2171 100644 --- a/plugins/box/plugins/languages/nl.lang.php +++ b/plugins/box/plugins/languages/nl.lang.php @@ -16,5 +16,6 @@ 'Get More Plugins' => 'Vind meer plugins', 'Install' => 'Installeren', 'Uninstall' => 'Deinstalleren', + 'README.md not found' => 'README.md not found', ) ); diff --git a/plugins/box/plugins/languages/pl.lang.php b/plugins/box/plugins/languages/pl.lang.php index 4211147..8b97cf4 100644 --- a/plugins/box/plugins/languages/pl.lang.php +++ b/plugins/box/plugins/languages/pl.lang.php @@ -16,5 +16,6 @@ 'Get More Plugins' => 'Pobierz więcej wtyczek', 'Install' => 'Instaluj', 'Uninstall' => 'Odinstaluj', + 'README.md not found' => 'README.md not found', ) ); diff --git a/plugins/box/plugins/languages/pt-br.lang.php b/plugins/box/plugins/languages/pt-br.lang.php index 91e5600..cb10e0d 100644 --- a/plugins/box/plugins/languages/pt-br.lang.php +++ b/plugins/box/plugins/languages/pt-br.lang.php @@ -16,5 +16,6 @@ 'Get More Plugins' => 'Ver mais plugins', 'Install' => 'Instalar', 'Uninstall' => 'Desinstalar', + 'README.md not found' => 'README.md not found', ) ); diff --git a/plugins/box/plugins/languages/ru.lang.php b/plugins/box/plugins/languages/ru.lang.php index e0253d3..f68c639 100644 --- a/plugins/box/plugins/languages/ru.lang.php +++ b/plugins/box/plugins/languages/ru.lang.php @@ -16,5 +16,6 @@ 'Get More Plugins' => 'Скачать другие плагины', 'Install' => 'Установить', 'Uninstall' => 'Удалить', + 'README.md not found' => 'README.md not found', ) ); diff --git a/plugins/box/plugins/languages/sk.lang.php b/plugins/box/plugins/languages/sk.lang.php index 133f294..e09265c 100644 --- a/plugins/box/plugins/languages/sk.lang.php +++ b/plugins/box/plugins/languages/sk.lang.php @@ -16,5 +16,6 @@ 'Get More Plugins' => 'Získať viacej pluginov', 'Install' => 'Inštalovať', 'Uninstall' => 'Odinštalovať', + 'README.md not found' => 'README.md not found', ) ); diff --git a/plugins/box/plugins/languages/sr-yu.lang.php b/plugins/box/plugins/languages/sr-yu.lang.php index 0aba28b..b6368a8 100644 --- a/plugins/box/plugins/languages/sr-yu.lang.php +++ b/plugins/box/plugins/languages/sr-yu.lang.php @@ -16,5 +16,6 @@ 'Get More Plugins' => 'Dodaj još dodataka', 'Install' => 'Instaliraj', 'Uninstall' => 'Deinstaliraj', + 'README.md not found' => 'README.md not found', ) ); \ No newline at end of file diff --git a/plugins/box/plugins/languages/uk.lang.php b/plugins/box/plugins/languages/uk.lang.php index 464bee4..ff0bcb4 100644 --- a/plugins/box/plugins/languages/uk.lang.php +++ b/plugins/box/plugins/languages/uk.lang.php @@ -16,5 +16,6 @@ 'Get More Plugins' => 'Завантажити інші плагіни', 'Install' => 'Установити', 'Uninstall' => 'Видалити', + 'README.md not found' => 'README.md not found', ) ); diff --git a/plugins/box/plugins/plugins.admin.php b/plugins/box/plugins/plugins.admin.php index e3a1c4a..b500d55 100755 --- a/plugins/box/plugins/plugins.admin.php +++ b/plugins/box/plugins/plugins.admin.php @@ -15,13 +15,6 @@ Action::add('admin_pre_render','PluginsAdmin::_readmeLoadAjax'); class PluginsAdmin extends Backend { - public static function _readmeLoadAjax() { - if (Request::post('readme_plugin')) { - echo Text::toHtml(markdown(Html::toText(File::getContent(PLUGINS . DS . Request::post('readme_plugin') . DS . 'README.md')))); - Request::shutdown(); - } - } - /** * Plugins admin */ @@ -230,4 +223,19 @@ class PluginsAdmin extends Backend )) ->display(); } + + /** + * _readmeLoadAjax + */ + public static function _readmeLoadAjax() { + if (Request::post('readme_plugin')) { + if (File::exists($file = PLUGINS . DS . Request::post('readme_plugin') . DS . 'README.md')) { + echo Text::toHtml(markdown(Html::toText(File::getContent($file)))); + } else { + echo __('README.md not found', 'plugins'); + } + Request::shutdown(); + } + } + } diff --git a/plugins/box/plugins/views/backend/index.view.php b/plugins/box/plugins/views/backend/index.view.php index 075b8d1..b6c5d45 100755 --- a/plugins/box/plugins/views/backend/index.view.php +++ b/plugins/box/plugins/views/backend/index.view.php @@ -43,10 +43,12 @@
+ 'btn btn-info readme_plugin', 'data-toggle' => 'modal', 'data-target' => '#readme', 'readme_plugin' => $plugin['id'])); ?> + 'btn btn-danger', 'onclick' => "return confirmDelete('".__('Delete plugin :plugin', 'plugins', array(':plugin' => $plugin['title']))."')")); From e17bc2454d9a0864fc0c48168c7884813157e7bd Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 12 Feb 2014 00:32:53 +0200 Subject: [PATCH 11/13] Plugins. README.MD #167 --- plugins/codemirror/README.md | 2 +- plugins/markdown/README.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 plugins/markdown/README.md diff --git a/plugins/codemirror/README.md b/plugins/codemirror/README.md index b0f0066..ef6c4f6 100644 --- a/plugins/codemirror/README.md +++ b/plugins/codemirror/README.md @@ -1,4 +1,4 @@ CodeMirror ====================== -CodeMirror is a versatile text editor implemented in JavaScript for the browser. +CodeMirror is a versatile text editor implemented in JavaScript for the browser. \ No newline at end of file diff --git a/plugins/markdown/README.md b/plugins/markdown/README.md new file mode 100644 index 0000000..7b745f3 --- /dev/null +++ b/plugins/markdown/README.md @@ -0,0 +1,4 @@ +Markdown +====================== + +Markdown Syntax Documentation: [http://daringfireball.net/projects/markdown/syntax](http://daringfireball.net/projects/markdown/syntax) \ No newline at end of file From 1a5d05bfaa0591f1e2a60e90fc1b2a0c6fc6d8cf Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 12 Feb 2014 00:33:08 +0200 Subject: [PATCH 12/13] Plugins. README.MD #167 --- admin/themes/default/css/default.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/admin/themes/default/css/default.css b/admin/themes/default/css/default.css index a3b83eb..3c8461b 100644 --- a/admin/themes/default/css/default.css +++ b/admin/themes/default/css/default.css @@ -469,6 +469,10 @@ td, th { width: 70%; } +#readme .modal-body { + padding-top: 0px; +} + /************************************* 3. MEDIA QUERIES *************************************/ From 308483f167ba430f4aae6c53940aa01deef15268 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 12 Feb 2014 00:55:54 +0200 Subject: [PATCH 13/13] Admin Default Theme Updates --- admin/themes/default/css/default.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/admin/themes/default/css/default.css b/admin/themes/default/css/default.css index 3c8461b..26d38b2 100644 --- a/admin/themes/default/css/default.css +++ b/admin/themes/default/css/default.css @@ -209,17 +209,24 @@ a.navbar-brand { .alert, .tooltip, .tooltip-inner, +pre, code { border-radius: 0px; } .badge, .tooltip, .tooltip-inner, -.label { +.label, +pre, +code { font-weight: normal; text-shadow: none; } +pre { + border: none; +} + /* Inputs */ select, textarea,