From e4ee83df0952489abbef5e51b5621d6d30fa77a7 Mon Sep 17 00:00:00 2001 From: Matthias Mees Date: Fri, 21 Oct 2016 20:05:25 +0200 Subject: [PATCH] Prepare staticpages for 2.x backend changes --- .../default_staticpage_backend.tpl | 248 +++++++++--------- .../serendipity_event_staticpage.php | 4 +- .../style_staticpage_backend.css | 35 ++- 3 files changed, 152 insertions(+), 135 deletions(-) diff --git a/serendipity_event_staticpage/backend_templates/default_staticpage_backend.tpl b/serendipity_event_staticpage/backend_templates/default_staticpage_backend.tpl index e5d55562..17b010a8 100644 --- a/serendipity_event_staticpage/backend_templates/default_staticpage_backend.tpl +++ b/serendipity_event_staticpage/backend_templates/default_staticpage_backend.tpl @@ -27,139 +27,141 @@ -
-
-

{$CONST.STATICPAGE_SECTION_STRUCT}

+
+
+
+

{$CONST.STATICPAGE_SECTION_STRUCT}

-
- - {staticpage_input item="pagetitle"} +
+ + {staticpage_input item="pagetitle"} +
+ +
+ + {staticpage_input item="permalink"} +
+ +
+ + {staticpage_input item="publishstatus"} +
+ +
+ + {staticpage_input item="articletype"} +
+ +
+ + {staticpage_input item="language"} +
+ +
+ + {staticpage_input item="related_category_id"} +
+
-
- - {staticpage_input item="permalink"} +
+
+

{$CONST.STATICPAGE_SECTION_ACCESS}

+ +
+ + {staticpage_input item="pass"} +
+ +
+ + {staticpage_input item="parent_id"} +
+ +
+ {staticpage_input item="show_childpages" what="name"|escape:js} + {staticpage_input item="show_childpages"} +
+ +
+ {staticpage_input item="shownavi" what="name"|escape:js} + {staticpage_input item="shownavi"} +
+ +
+ {staticpage_input item="showonnavi" what="name"|escape:js} + {staticpage_input item="showonnavi"} +
+ +
+ {staticpage_input item="show_breadcrumb" what="name"|escape:js} + {staticpage_input item="show_breadcrumb"} +
+
-
- - {staticpage_input item="publishstatus"} +
+
+

{$CONST.STATICPAGE_SECTION_META}

+ +
+ + {staticpage_input item="timestamp"} +
+ +
+ + {staticpage_input item="authorid"} +
+ +
+ + {staticpage_input item="title_element"} +
+ +
+ + {staticpage_input item="meta_description"} +
+ +
+ + {staticpage_input item="meta_keywords"} +
+
-
- - {staticpage_input item="articletype"} +
+
+

{$CONST.STATICPAGE_SECTION_OPT}

+ +
+ {staticpage_input item="is_startpage" what="name"|escape:js} + {staticpage_input item="is_startpage"} +
+ +
+ {staticpage_input item="is_404_page" what="name"|escape:js} + {staticpage_input item="is_404_page"} +
+ +
+ {staticpage_input item="markup" what="name"|escape:js} + {staticpage_input item="markup"} +
+ +
+ {staticpage_input item="articleformat" what="name"|escape:js} + {staticpage_input item="articleformat"} +
- -
- - {staticpage_input item="language"} -
- -
- - {staticpage_input item="related_category_id"} -
-
-
- -
-
-

{$CONST.STATICPAGE_SECTION_ACCESS}

- -
- - {staticpage_input item="pass"} -
- -
- - {staticpage_input item="parent_id"} -
- -
- {staticpage_input item="show_childpages" what="name"|escape:js} - {staticpage_input item="show_childpages"} -
- -
- {staticpage_input item="shownavi" what="name"|escape:js} - {staticpage_input item="shownavi"} -
- -
- {staticpage_input item="showonnavi" what="name"|escape:js} - {staticpage_input item="showonnavi"} -
- -
- {staticpage_input item="show_breadcrumb" what="name"|escape:js} - {staticpage_input item="show_breadcrumb"} -
-
-
- -
-
-

{$CONST.STATICPAGE_SECTION_META}

- -
- - {staticpage_input item="timestamp"} -
- -
- - {staticpage_input item="authorid"} -
- -
- - {staticpage_input item="title_element"} -
- -
- - {staticpage_input item="meta_description"} -
- -
- - {staticpage_input item="meta_keywords"} -
-
-
- -
-
-

{$CONST.STATICPAGE_SECTION_OPT}

- -
- {staticpage_input item="is_startpage" what="name"|escape:js} - {staticpage_input item="is_startpage"} -
- -
- {staticpage_input item="is_404_page" what="name"|escape:js} - {staticpage_input item="is_404_page"} -
- -
- {staticpage_input item="markup" what="name"|escape:js} - {staticpage_input item="markup"} -
- -
- {staticpage_input item="articleformat" what="name"|escape:js} - {staticpage_input item="articleformat"} -
-
-
+ + {* EXAMPLE FOR CUSTOM STATICPAGE PROPERTIES -
-
+
+

Custom

@@ -184,4 +186,4 @@
-
+
\ No newline at end of file diff --git a/serendipity_event_staticpage/serendipity_event_staticpage.php b/serendipity_event_staticpage/serendipity_event_staticpage.php index 41286b3b..bc3cf2ad 100644 --- a/serendipity_event_staticpage/serendipity_event_staticpage.php +++ b/serendipity_event_staticpage/serendipity_event_staticpage.php @@ -91,7 +91,7 @@ class serendipity_event_staticpage extends serendipity_event $propbag->add('page_configuration', $this->config); $propbag->add('type_configuration', $this->config_types); $propbag->add('author', 'Marco Rinck, Garvin Hicking, David Rolston, Falk Doering, Stephan Manske, Pascal Uhlmann, Ian, Don Chambers'); - $propbag->add('version', '4.11'); + $propbag->add('version', '4.12'); $propbag->add('requirements', array( 'serendipity' => '2.0', 'smarty' => '2.6.7', @@ -3226,4 +3226,4 @@ foreach($select AS $select_value => $select_desc) { } -/* vim: set sts=4 ts=4 expandtab : */ +/* vim: set sts=4 ts=4 expandtab : */ \ No newline at end of file diff --git a/serendipity_event_staticpage/style_staticpage_backend.css b/serendipity_event_staticpage/style_staticpage_backend.css index 931114c9..cbca0a1c 100644 --- a/serendipity_event_staticpage/style_staticpage_backend.css +++ b/serendipity_event_staticpage/style_staticpage_backend.css @@ -189,26 +189,41 @@ max-width: 30em; } - .staticpage_structure, - .staticpage_access, - .staticpage_meta, - .staticpage_options { + .no-flexbox .staticpage_structure, + .no-flexbox .staticpage_access, + .no-flexbox .staticpage_meta, + .no-flexbox .staticpage_options { box-sizing: border-box; float: left; width: 50%; } - .staticpage_structure, - .staticpage_meta { + .no-flexbox .staticpage_structure, + .no-flexbox .staticpage_meta { padding-right: .5em; } - .staticpage_access, - .staticpage_options { + .no-flexbox .staticpage_access, + .no-flexbox .staticpage_options { padding-left: .5em; } - .staticpage_save { + .no-flexbox .staticpage_save { clear: both; } -} + + .staticpage_container { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + } + + .staticpage_section { + flex: 0 0 48%; + margin: 0 2% 1em 0; + } + + .staticpage_section:nth-of-type(even) { + margin: 0 0 1em 2%; + } +} \ No newline at end of file