From bec5b784f1a27c56267d21538285caa30b9a9641 Mon Sep 17 00:00:00 2001 From: Krivchikov Dmitry Date: Sat, 3 Oct 2015 19:00:49 +0300 Subject: [PATCH] =?UTF-8?q?ADD=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0,=20?= =?UTF-8?q?=D0=BE=D1=82=D0=BA=D0=BB=D1=8E=D1=87=D0=B0=D1=8E=D1=89=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=B0=D0=B2=D1=82=D0=BE=D0=BF=D1=80=D0=BE=D1=81=D0=BC?= =?UTF-8?q?=D0=BE=D1=82=D1=80=20-=20=D0=B0=D0=B2=D1=82=D0=BE=D0=BC=D0=B0?= =?UTF-8?q?=D1=80=D0=BA=D0=B4=D0=B0=D1=83=D0=BD,=20=D1=82=D0=B0=D0=BA=20?= =?UTF-8?q?=D1=81=D0=BA=D0=B0=D0=B7=D0=B0=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ground/controllers/ArticleController.php | 1 + ground/views/articles/edit.php | 15 +++++++++------ public/css/articleEdit.css | 4 ++++ public/js/articleEdit.js | 12 +++++++++++- 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/ground/controllers/ArticleController.php b/ground/controllers/ArticleController.php index dd9789b..79a617a 100644 --- a/ground/controllers/ArticleController.php +++ b/ground/controllers/ArticleController.php @@ -77,6 +77,7 @@ class ArticleController extends Controller self::addScript('/js/jquery-ui-1.10.4.custom.min.js'); self::addScript('/js/bootstrap.min.js'); self::addScript('/js/app.js?ver=' . App::getConfig('version')); + self::addScript('/js/jquery.cookie.js'); self::addScript('/js/articleEdit.js?ver=' . App::getConfig('version')); self::addScript('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.js'); self::addStyle('/css/style.css?ver=' . App::getConfig('version')); diff --git a/ground/views/articles/edit.php b/ground/views/articles/edit.php index 8673714..86f57e3 100644 --- a/ground/views/articles/edit.php +++ b/ground/views/articles/edit.php @@ -3,7 +3,7 @@ - +
" id="mainEditorTable"> - - + - +
@@ -21,13 +21,13 @@ выйти из редактора
-
+
status == 'draft') : ?>
-
+
@@ -35,13 +35,16 @@
+
+ +
+
diff --git a/public/css/articleEdit.css b/public/css/articleEdit.css index df7502d..c6e42ed 100644 --- a/public/css/articleEdit.css +++ b/public/css/articleEdit.css @@ -6,6 +6,10 @@ input#articleTitle {font-size: 30px;font-weight: 600;height: 45px; border-radius .nopaddingx {padding-left: 0;padding-right: 0;} .nopaddingy {padding-bottom: 0;padding-top: 0;} +table.doubleEditor tr.main td {width: 50%} +table.singleEditor tr.main td {width: 100%} +table.singleEditor tr.main td#monitorContainer {display: none;} + #articleText {border-radius:0;} #articleText {width: 100%;-webkit-box-sizing: border-box;-moz-box-sizing: border-box;box-sizing: border-box;font-family: monospace;color: #fffbec;background-color: #1e1e1e;} #monitor {height: 100%; width: 100%; background-color: white; overflow-y: scroll; padding: 5px 10px; border: solid 1px #ccc; border-radius: 0px;} diff --git a/public/js/articleEdit.js b/public/js/articleEdit.js index 609e77b..53b94d6 100644 --- a/public/js/articleEdit.js +++ b/public/js/articleEdit.js @@ -101,7 +101,9 @@ $('#articleText').keyup(function () { clearTimeout(monitorTimeout); monitorTimeout = setTimeout(function () { $('#submitButton').removeClass('btn-default').addClass('btn-info'); - markdown(); + if ($('#mainEditorTable').hasClass('doubleEditor')) { + markdown(); + } }, 200); }).keydown(function () { clearTimeout(monitorTimeout) @@ -129,3 +131,11 @@ function togglePhotobank() { $('#photobankContainer').slideToggle(200); } + +function toggleAutoview() +{ + $('#mainEditorTable').toggleClass('doubleEditor').toggleClass('singleEditor'); + $('#autoviewSwitcher').toggleClass('active'); + markdown(); + $.cookie('disableAutoview', $('#mainEditorTable').hasClass('singleEditor')); +}