From 816959215dff92ee0af295be6d801b4cfa150269 Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Wed, 31 May 2017 15:44:11 +0200 Subject: Two changes have been made in this commit: + Update [core]: Parsedown has been updated to version 1.6.2. + Optimization [admin template]: The markdown buttons have been placed directly above the content editor. + Optimization [admin template]: The content editor has been visually embellished (padding from the parent was removed). --- core/namespace/Parsedown.php | 16 ++++++++-------- template/admin/html/database.php | 2 +- template/admin/html/page/form.php | 32 ++++++++++++++++---------------- template/admin/html/post/form.php | 32 ++++++++++++++++---------------- template/admin/html/user/form.php | 32 ++++++++++++++++---------------- template/admin/rsrc/main.css | 16 ++++++++++++---- 6 files changed, 69 insertions(+), 61 deletions(-) diff --git a/core/namespace/Parsedown.php b/core/namespace/Parsedown.php index 610658b..f5dd0fa 100644 --- a/core/namespace/Parsedown.php +++ b/core/namespace/Parsedown.php @@ -448,7 +448,7 @@ class Parsedown return $Block; } - $Block['element']['text']['text'] .= "\n".$Line['body'];; + $Block['element']['text']['text'] .= "\n".$Line['body']; return $Block; } @@ -1204,7 +1204,7 @@ class Parsedown $remainder = $Excerpt['text']; - if (preg_match('/\[((?:[^][]|(?R))*)\]/', $remainder, $matches)) + if (preg_match('/\[((?:[^][]++|(?R))*+)\]/', $remainder, $matches)) { $Element['text'] = $matches[1]; @@ -1217,7 +1217,7 @@ class Parsedown return; } - if (preg_match('/^[(]\s*+((?:[^ ()]++|[(][^ )]+[)])++)(?:[ ]+("[^"]*"|\'[^\']*\'))?\s*[)]/', $remainder, $matches)) + if (preg_match('/^[(]\s*+((?:[^ ()]++|[(][^ )]+[)])++)(?:[ ]+("[^"]*"|\'[^\']*\'))?\s*[)]/', $remainder, $matches)) { $Element['attributes']['href'] = $matches[1]; @@ -1539,10 +1539,10 @@ class Parsedown 'b', 'em', 'big', 'cite', 'small', 'spacer', 'listing', 'i', 'rp', 'del', 'code', 'strike', 'marquee', 'q', 'rt', 'ins', 'font', 'strong', - 's', 'tt', 'sub', 'mark', - 'u', 'xm', 'sup', 'nobr', - 'var', 'ruby', - 'wbr', 'span', - 'time', + 's', 'tt', 'kbd', 'mark', + 'u', 'xm', 'sub', 'nobr', + 'sup', 'ruby', + 'var', 'span', + 'wbr', 'time', ); } diff --git a/template/admin/html/database.php b/template/admin/html/database.php index 8e69459..69dce0a 100644 --- a/template/admin/html/database.php +++ b/template/admin/html/database.php @@ -10,7 +10,7 @@
-
+
diff --git a/template/admin/html/page/form.php b/template/admin/html/page/form.php index 93c45fe..8930ec3 100644 --- a/template/admin/html/page/form.php +++ b/template/admin/html/page/form.php @@ -50,12 +50,22 @@
-
+
+
+
    +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
+
-
- -
    $data):?> @@ -63,18 +73,8 @@
-
-
    -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
+
+
diff --git a/template/admin/html/post/form.php b/template/admin/html/post/form.php index 14888aa..1f69529 100644 --- a/template/admin/html/post/form.php +++ b/template/admin/html/post/form.php @@ -50,12 +50,22 @@
-
+
+
+
    +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
+
-
- -
    $data):?> @@ -63,18 +73,8 @@
-
-
    -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
+
+
diff --git a/template/admin/html/user/form.php b/template/admin/html/user/form.php index 3da96d2..8156496 100644 --- a/template/admin/html/user/form.php +++ b/template/admin/html/user/form.php @@ -56,12 +56,22 @@
-
+
+
+
    +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
+
-
- -
    $data):?> @@ -69,18 +79,8 @@
-
-
    -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
  • -
+
+
diff --git a/template/admin/rsrc/main.css b/template/admin/rsrc/main.css index ed79989..e19aa31 100644 --- a/template/admin/rsrc/main.css +++ b/template/admin/rsrc/main.css @@ -177,11 +177,19 @@ form{border:0.05rem solid #AAA;} /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ /* Form buttons /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -.button-list {margin:0;padding:0;list-style:none;} -.button-list > li{display:inline-block;background:#EEE;padding:0.5rem;border:0.05rem solid #AAA;cursor:pointer;} +#button-list-wrapper{border-bottom:0.05rem solid #AAA;background:#EEE;} + +.button-list{margin:0;padding:0;list-style:none;} +.button-list.emoticons > li{display:inline-block;background:#EEE;padding:0.5rem;border:0.05rem solid #AAA;cursor:pointer;} .button-list.emoticons > li {padding:0.25rem 0.5rem;} -.button-list > li:hover, -.button-list > li:active{background:#CCC;} +.button-list.emoticons > li:hover, +.button-list.emoticons > li:active{background:#CCC;} + +.button-list.markdown > li{float:left;padding:0.5rem;cursor:pointer;width:1.75rem;height:1.75rem;box-sizing:border-box;text-align:center;} +.button-list.markdown > li:hover, +.button-list.markdown > li:active{color:#40779A;} + +#content-editor{border:none;margin:0;} /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ /* Form elements -- cgit v1.2.3