diff --git a/fp-content/images/Leggero-Themepreview/.thumbs/02-flatmaas-rev.png b/fp-content/images/Leggero-Themepreview/.thumbs/02-flatmaas-rev.png
index 56c19632..dd663837 100644
Binary files a/fp-content/images/Leggero-Themepreview/.thumbs/02-flatmaas-rev.png and b/fp-content/images/Leggero-Themepreview/.thumbs/02-flatmaas-rev.png differ
diff --git a/fp-content/images/Leggero-Themepreview/.thumbs/03-leggero.png b/fp-content/images/Leggero-Themepreview/.thumbs/03-leggero.png
index c2f2b991..c4ff507d 100644
Binary files a/fp-content/images/Leggero-Themepreview/.thumbs/03-leggero.png and b/fp-content/images/Leggero-Themepreview/.thumbs/03-leggero.png differ
diff --git a/fp-content/images/Leggero-Themepreview/.thumbs/04-leggero-v2.png b/fp-content/images/Leggero-Themepreview/.thumbs/04-leggero-v2.png
index cb539127..fae11122 100644
Binary files a/fp-content/images/Leggero-Themepreview/.thumbs/04-leggero-v2.png and b/fp-content/images/Leggero-Themepreview/.thumbs/04-leggero-v2.png differ
diff --git a/fp-content/images/Leggero-Themepreview/.thumbs/05-stringendo.png b/fp-content/images/Leggero-Themepreview/.thumbs/05-stringendo.png
index 3278667b..bc042bc6 100644
Binary files a/fp-content/images/Leggero-Themepreview/.thumbs/05-stringendo.png and b/fp-content/images/Leggero-Themepreview/.thumbs/05-stringendo.png differ
diff --git a/fp-content/images/Leggero-Themepreview/02-flatmaas-rev.png b/fp-content/images/Leggero-Themepreview/02-flatmaas-rev.png
index 16a45dcd..90a5ddf5 100644
Binary files a/fp-content/images/Leggero-Themepreview/02-flatmaas-rev.png and b/fp-content/images/Leggero-Themepreview/02-flatmaas-rev.png differ
diff --git a/fp-content/images/Leggero-Themepreview/03-leggero.png b/fp-content/images/Leggero-Themepreview/03-leggero.png
index 096ba4c2..d0a5d049 100644
Binary files a/fp-content/images/Leggero-Themepreview/03-leggero.png and b/fp-content/images/Leggero-Themepreview/03-leggero.png differ
diff --git a/fp-content/images/Leggero-Themepreview/04-leggero-v2.png b/fp-content/images/Leggero-Themepreview/04-leggero-v2.png
index c9b50cd2..ec5fd3e9 100644
Binary files a/fp-content/images/Leggero-Themepreview/04-leggero-v2.png and b/fp-content/images/Leggero-Themepreview/04-leggero-v2.png differ
diff --git a/fp-content/images/Leggero-Themepreview/05-stringendo.png b/fp-content/images/Leggero-Themepreview/05-stringendo.png
index a18df929..fc80be80 100644
Binary files a/fp-content/images/Leggero-Themepreview/05-stringendo.png and b/fp-content/images/Leggero-Themepreview/05-stringendo.png differ
diff --git a/fp-defaults/plugins.conf.php b/fp-defaults/plugins.conf.php
index 6309b7b2..bfc7b8ff 100755
--- a/fp-defaults/plugins.conf.php
+++ b/fp-defaults/plugins.conf.php
@@ -6,42 +6,38 @@
* remove it to enable :)
*/
- 'accessibleantispam',
- 'adminarea',
- 'archives',
- 'audiovideo',
- 'bbcode', // bbcode-style formatting; if you disable this
- // you'll loose some features, but you will be able to use html
- // as a default
- 'blockparser',
- // 'calendar',
- 'categories',
- 'commentcenter', // including Akismet interface
- 'cookiebanner',
- 'datechanger', // Lets you change the publish date for (new) entries.
- 'emoticons', // Activates an emoticons toolbar for entries and static pages
- 'favicon',
- 'feed', // Activates the RSS and Atom feed widget
- 'fpprotect', // Hardens your blog with additional features in the HTTP response header.
- // Removes the htaccess editor from the PrettyURLs plugin.
- 'gallerycaptions',
- 'gdprvideoembed', // Simple two-click solution for GDPR-compliant embedding of YouTube, Facebook and Vimeo videos.
- 'jquery', // needed by ligthbox2 (quite heavy in size)
- 'lastcomments', // cache-based last-comments block
- 'lastentries',
- 'mastodon',
- 'mediamanager',
- // 'newsletter',
- 'photoswipe',
- 'postviews', // Counts and displays entry views
- 'prettyurls', // PrettyURLs with NGINX? see https://wiki.flatpress.org/res:plugins:prettyurls#nginx
- 'qspam', // quick spam filter
- 'readmore',
- 'searchbox',
- 'seometataginfo', // Makes it easier to find with search engines and post on social media
- 'storage',
- 'support', // Provides the FlatPress admin and the community with all relevant data in case of problems.
- 'tag',
- 'thumb' // creates thumbnails adding scale=NN% to [img] tags :)
+ 0 => 'accessibleantispam',
+ 1 => 'adminarea',
+ 2 => 'archives',
+ 3 => 'audiovideo',
+ 4 => 'bbcode', // bbcode-style formatting
+ 5 => 'blockparser',
+ 6 => 'categories',
+ 7 => 'commentcenter', // including Akismet interface
+ 8 => 'cookiebanner',
+ 9 => 'datechanger', // Lets you change the publish date for (new) entries
+ 10 => 'emoticons', // Activates an emoticons toolbar for entries and static pages
+ 11 => 'favicon',
+ 12 => 'feed', // Activates the RSS and Atom feed widget
+ 13 => 'fpprotect', // Hardens your blog with additional features in the HTTP response header
+ 14 => 'gallerycaptions',
+ 15 => 'gdprvideoembed', // Simple two-click solution for GDPR-compliant embedding of YouTube, Facebook and Vimeo videos
+ 16 => 'jquery',
+ 17 => 'lastcomments', // cache-based last-comments block
+ 18 => 'lastentries',
+ 19 => 'mastodon',
+ 20 => 'mediamanager',
+ 21 => 'newsletter',
+ 22 => 'photoswipe',
+ 23 => 'postviews', // Counts and displays entry views
+ 24 => 'prettyurls', // PrettyURLs with NGINX? see https://wiki.flatpress.org/res:plugins:prettyurls#nginx
+ 25 => 'qspam', // quick spam filter
+ 26 => 'readmore',
+ 27 => 'searchbox',
+ 28 => 'seometataginfo', // Makes it easier to find with search engines and post on social media
+ 29 => 'storage',
+ 30 => 'support', // Provides the FlatPress admin and the community with all relevant data in case of problems
+ 31 => 'tag',
+ 32 => 'thumb' // creates thumbnails adding scale=NN% to [img] tags :)
);
?>
diff --git a/fp-defaults/settings-defaults.php b/fp-defaults/settings-defaults.php
index 59e99235..57253a89 100755
--- a/fp-defaults/settings-defaults.php
+++ b/fp-defaults/settings-defaults.php
@@ -29,8 +29,9 @@
'plugins' => array(
'blockparser' => array(
'pages' => array(
- 'menu',
- 'about'
+ 0 => 'menu',
+ 1 => 'bottommenu',
+ 2 => 'about'
),
),
'bbcode' => array (
diff --git a/fp-defaults/widgets.conf.php b/fp-defaults/widgets.conf.php
index 65afc60f..cac19632 100755
--- a/fp-defaults/widgets.conf.php
+++ b/fp-defaults/widgets.conf.php
@@ -7,7 +7,7 @@
*/
'top' => array (
- // (no widgets)
+ 0 => 'blockparser:menu'
),
/**
@@ -22,21 +22,19 @@
// Right side widgets
'right' => array (
- 'adminarea',
- 'blockparser:menu',
- 'categories',
- 'archives',
- //'calendar', // quite time consuming, not really recommended
- 'lastentries',
- // 'lastcomments',
- 'searchbox',
- 'feed',
- // 'newsletter',
- 'mastodon'
+ 0 => 'categories',
+ 1 => 'archives',
+ 2 => 'lastentries',
+ 3 => 'lastcomments',
+ 4 => 'searchbox',
+ 5 => 'feed',
+ 6 => 'newsletter',
+ 7 => 'mastodon'
),
'bottom' => array (
- // (no widgets)
+ 0 => 'blockparser:bottommenu',
+ 1 => 'adminarea'
),
);
?>
diff --git a/fp-interface/themes/leggero/comments.tpl b/fp-interface/themes/leggero/comments.tpl
index f5e01d9b..7f6e24da 100755
--- a/fp-interface/themes/leggero/comments.tpl
+++ b/fp-interface/themes/leggero/comments.tpl
@@ -1,67 +1,71 @@
{include file="header.tpl"}
+{include file="widgetstop.tpl"}
+
+ {entry_block}
+ {entry}
+ {include file="entry-default.tpl"}
+ {comment_block}
-
- {entry_block}
- {entry}
- {include file="entry-default.tpl"}
- {comment_block}
-
+ {/comment_block}
-
- {/comment}
-
- {/comment_block}
+ {/entry}
- {/entry}
+ {capture assign='fp_nextpage'}{strip}{nextpage}{/strip}{/capture}
+ {capture assign='fp_prevpage'}{strip}{prevpage}{/strip}{/capture}
+ {if $fp_nextpage != '' || $fp_prevpage != ''}
- {capture assign='fp_nextpage'}{strip}{nextpage}{/strip}{/capture}
- {capture assign='fp_prevpage'}{strip}{prevpage}{/strip}{/capture}
- {if $fp_nextpage != '' || $fp_prevpage != ''}
-
- {$fp_nextpage nofilter}{$fp_prevpage nofilter}
-
- {/if}
+
+
+ {$fp_nextpage nofilter}{$fp_prevpage nofilter}
+
+
+
+ {/if}
- {/entry_block}
+ {/entry_block}
- {include file="shared:comment-form.tpl"}
+ {include file="shared:comment-form.tpl"}
-
+
- {include file="widgets.tpl"}
+ {include file="widgets.tpl"}
+ {*
+
+ *}
{include file="footer.tpl"}
diff --git a/fp-interface/themes/leggero/default.tpl b/fp-interface/themes/leggero/default.tpl
index 1e550a79..3aa381f6 100755
--- a/fp-interface/themes/leggero/default.tpl
+++ b/fp-interface/themes/leggero/default.tpl
@@ -1,22 +1,29 @@
{include file="header.tpl"}
-
-
-
-
-
-
{$subject}
-
-
- {if isset($rawcontent) and $rawcontent} {$content}
- {else} {include file=$content}{/if}
-
+
+{include file="widgetstop.tpl"}
+
+
+
+
+
{$subject}
+
+
+ {if isset($rawcontent) and $rawcontent}
+
+ {$content}
+ {else}
+
+ {include file=$content}
+ {/if}
+
+
+
+
-
-
-
-
- {include file="widgets.tpl"}
-
+
+ {include file="widgets.tpl"}
+
+
{include file="footer.tpl"}
diff --git a/fp-interface/themes/leggero/flatmaas-rev/preview.png b/fp-interface/themes/leggero/flatmaas-rev/preview.png
index 14019f0a..90a5ddf5 100644
Binary files a/fp-interface/themes/leggero/flatmaas-rev/preview.png and b/fp-interface/themes/leggero/flatmaas-rev/preview.png differ
diff --git a/fp-interface/themes/leggero/flatmaas-rev/res/common.css b/fp-interface/themes/leggero/flatmaas-rev/res/common.css
index 28bff873..f4ef0ad2 100755
--- a/fp-interface/themes/leggero/flatmaas-rev/res/common.css
+++ b/fp-interface/themes/leggero/flatmaas-rev/res/common.css
@@ -1,18 +1,20 @@
-/*
-===================
-FlatMaas CSS Styles
-===================
-Ispired by: http://csszengarden.com/?cssfile=http://maas-online.nl/zengarden/layout.css
-Home page: http://www.maas-online.nl
--------------------
+/**
+ * ===================
+ * FlatMaas CSS Styles
+ * ===================
+ * Ispired by: http://csszengarden.com/?cssfile=http://maas-online.nl/zengarden/layout.css
+ * Home page: http://www.maas-online.nl
+ * -------------------
+ *
+ * Name: FlatMaas
+ * Author: Luciano Porro (drudo), reworked by Fraenkiman
+ * Version: 1.0.0
+ */
-Name: FlatMaas
-Author: Luciano Porro (drudo)
-Version: 0.0.1
-*/
-
-body { text-align: center }
+body {
+ text-align: center
+}
/* ==== Structure with fixed width ==== */
#body-container { /* Simplified Box Model Hack */
@@ -24,7 +26,9 @@ body { text-align: center }
background-color: white
}
-body > div#body-container { width: 760px }
+body > div#body-container {
+ width: 760px
+}
#head {
padding: 5px;
@@ -41,6 +45,12 @@ body > div#body-container { width: 760px }
background: #999977
}
+div#head p img {
+ float: right;
+ border: 0;
+ height: 75px
+}
+
#outer-container {
padding: 0px;
margin: 0px;
@@ -57,13 +67,18 @@ body > div#body-container { width: 760px }
border: solid 1px #ccc;
width: 205px;
font-size: 75%;
- height: 1%
+ height:1%
}
-#main + #column { width: 195px; font-size: 80% }
+#main + #column {
+ width: 195px;
+ font-size: 80%
+}
+
+#column ul li table {
+ font-size: 100%
+}
-#column ul li table { font-size: 100% }
-
#column ul {
margin-right: 10px;
display: block;
@@ -72,7 +87,7 @@ body > div#body-container { width: 760px }
}
#main {
- float:left;
+ float: left;
text-align: justify;
position: relative;
margin: 5px;
@@ -80,7 +95,9 @@ body > div#body-container { width: 760px }
font-size: 100%
}
-#outer-container > #main { width: 540px }
+#outer-container > #main {
+ width: 530px
+}
#footer {
clear: both;
@@ -107,15 +124,37 @@ body {
background: #EEEEDD
}
-hr { display: none }
+hr {
+ display: none
+}
-p { margin: .5em 0 }
+p {
+ margin: 0.5em 0
+}
+
+/* in the specific ID */
+#column p,
+#column div {
+ margin: 10px 5px
+}
+
+#main p {
+ line-height: 1.5em;
+ margin-top: 1.2em
+}
+
+#main .entry img {
+ max-width: 100%;
+ height: auto
+}
+
+#main .entry figure,
+#main .entry .photoswipe {
+ max-width: 100%;
+ overflow: hidden
+}
- /* in the specific ID */
- #column p, #column div { margin: 10px 5px }
- #main p { line-height: 1.5em; margin-top: 1.2em }
-
/* == Headers == */
h1 { /* Title of the blog */
font-size: 1.6em;
@@ -135,6 +174,11 @@ h1 { /* Title of the blog */
height: 12px
}
+#head div.noprint {
+ float: right;
+ text-align: right;
+}
+
h2 { /* Titles of the entry */
font-size: 1.4em;
color: #333333;
@@ -147,42 +191,42 @@ h2 { /* Titles of the entry */
background: transparent url('../imgs/entry.png') center left no-repeat
}
-.entry-title a { color: #333333 !IMPORTANT }
+.entry-title a {
+ color: #333333 !IMPORTANT
+}
-h3 { margin: 0;
+h3 {
+ margin: 0;
font-size: 1.3em;
padding: 1em 0 0.2em 0
}
-h4 { font-size: 1.2em }
-
-/* in the specific ID */
-#column h4 {
- /* Titles of the sections in #column */
- color: white;
- font-family: "Gill Sans", "Trebuchet MS", Helvetica, sans-serif;
- margin: 0 5px 5px 5px;
- padding: .2em .5em;
- background: #BBBB99 url('../imgs/sf_h4.png') bottom left repeat-x
+h4 {
+ font-size: 1.2em
}
-#main h4 { margin: 1.5em 0 1em 0 }
-
-img { border: none }
+ /* in the specific ID */
+ #column h4 {
+ /* Titles of the sections in #column */
+ color: white;
+ font-family: "Gill Sans", "Trebuchet MS", Helvetica, sans-serif;
+ margin: 0 5px 5px 5px;
+ padding: 0.2em 0.5em;
+ background: #BBBB99 url('../imgs/sf_h4.png') bottom left repeat-x
+ }
-/* in the specific ID */
-#main img { margin: .5em }
+ #main h4 {
+ margin: 1.5em 0 1em 0
+ }
-#main .entry img {
- max-width: 100%;
- height: auto
+img {
+ border: none
}
-#main .entry figure,
-#main .entry .photoswipe {
- max-width: 100%;
- overflow: hidden
-}
+ /* in the specific ID */
+ #main img {
+ margin: 0.5em
+ }
blockquote {
color: #666666;
@@ -191,9 +235,13 @@ blockquote {
background: #eeeeee url('../imgs/blockquote.png') bottom left no-repeat
}
-blockquote p { margin: 0; margin-top: unset !IMPORTANT }
+blockquote p {
+ margin: 0;
+ margin-top: unset !IMPORTANT
+}
-pre, code {
+pre,
+code {
color: #666666;
font-size: 1.1em;
font-family: "Lucida Console", Monaco, monospace;
@@ -210,9 +258,17 @@ pre {
padding: 5px
}
-ul, li, ol { margin: 0; padding: 0 }
+ul,
+li,
+ol {
+ margin: 0;
+ padding: 0
+}
-ul { padding-top: 0.3em; padding-bottom: 0.3em }
+ul {
+ padding-top: 0.3em;
+ padding-bottom: 0.3em
+}
/* == List in MAIN == */
@@ -221,7 +277,9 @@ ul { padding-top: 0.3em; padding-bottom: 0.3em }
padding: 0 0 0 1.6em
}
-#main ul li:before { content: "\00BB \0020" }
+#main ul li:before {
+ content: "\00BB \0020"
+}
#main ol {
list-style-position: inside;
@@ -247,40 +305,55 @@ a:hover {
text-decoration: underline
}
-h3 a, h3 a:link, h3 a:visited { color: #333 }
+h3 a,
+h3 a:link,
+h3 a:visited {
+ color: #333
+}
-#subheader a:link, #subheader a:visited, #footer a:link, #footer a:visited {
+#subheader a:link,
+#subheader a:visited,
+#footer a:link,
+#footer a:visited {
color: white;
text-decoration: none;
font-weight: bold
}
-#subheader a:hover, #footer a:hover { color: white; text-decoration: underline }
+#subheader a:hover,
+#footer a:hover {
+ color: white;
+ text-decoration: underline
+}
/* == Form == */
-form { margin: 1em 0 }
+form {
+ margin: 1em 0
+}
fieldset {
margin: 0 0 1em 0;
- padding: .5em;
+ padding: 0.5em;
border: 1px solid #999977
}
-
/* in the specific ID */
- #column fieldset { margin: 0 5px 0 5px }
+ #column fieldset {
+ margin: 0 5px 0 5px
+ }
legend {
color: #666666;
font-size: 80%;
font-style: oblique
}
-
/* in the specific ID */
- #column legend { font-size: 100% }
+ #column legend {
+ font-size: 100%
+ }
input {
- margin-top: .1em;
+ margin-top: 0.1em;
border: 1px solid #999977;
background-color: #EEEEDD
}
@@ -292,13 +365,15 @@ input:hover {
input[type=radio], input[type=checkbox] { height: 12px }
-select { background-color: #EEEEDD }
+select {
+ background-color: #EEEEDD
+}
textarea {
width: 99%;
font-size: 100%;
font-family: verdana, Helvetica, Arial, sans-serif;
- margin-top: .1em;
+ margin-top: 0.1em;
border: 1px solid #999977;
background-color: #EEEEDD
}
@@ -314,14 +389,14 @@ textarea:hover {
font-size: 80%;
font-style: oblique;
color: #F1F1F1;
- margin: .5em 0 0 0
+ margin: 0.5em 0 0 0
}
.date { /* Date under titles of the entry */
font-size: 80%;
font-style: oblique;
color: gray;
- margin: .2em 0 .8em 0
+ margin: 0.2em 0 0.8em 0
}
.entry {
@@ -335,7 +410,7 @@ textarea:hover {
font-size: 80%;
text-align: center;
color: gray;
- margin: .5em 0 0 0;
+ margin: 0.5em 0 0 0;
clear: both
}
@@ -347,13 +422,21 @@ textarea:hover {
background: #EEEEDD
}
-.floatLeft { float: left } /* don't touch this class!! */
+.floatLeft { /* don't touch this class!! */
+ float: left
+}
-.floatRight { float: right } /* don't touch this class!! */
+.floatRight { /* don't touch this class!! */
+ float: right
+}
-.imageColumn { text-align: center }
+.imageColumn {
+ text-align: center
+}
-.imageColumn img { margin: 2px 0px }
+.imageColumn img {
+ margin: 2px 0px
+}
.admincontrols {
text-align: right;
@@ -365,9 +448,13 @@ textarea:hover {
margin-bottom: 5em
}
-.alignleft { float: left }
+.alignleft {
+ float: left
+}
-.alignright { float: right }
+.alignright {
+ float: right
+}
/* notifications */
@@ -412,9 +499,6 @@ textarea:hover {
background: #fdd
}
-/* Search form */
-#search label { vertical-align: middle }
-
/* Search-widget */
div#widget-searchbox ul,
div#widget-searchbox li {
@@ -426,15 +510,22 @@ div#widget-searchbox div.buttonbar p input {
margin: 0 -5px
}
-form#search ul { list-style-type: none }
+form#search ul {
+ list-style-type: none
+}
-form#search ul li:before { content: none }
+form#search ul li:before {
+ content: none
+}
/* Calendar-widget */
-#widget_calendar table.calendar { font-size: 90% }
+#widget_calendar table.calendar {
+ font-size: 90%
+}
/* Feed-widget */
-.feed-widget { height: 12px !IMPORTANT; }
+.feed-widget { height: 12px !IMPORTANT }
+
/* BBcode toolbar for comments */
.bb-btn-tlb p { display: table-cell }
@@ -471,3 +562,19 @@ form#search ul li:before { content: none }
vertical-align: middle;
padding: 0
}
+
+/* ===== TOP/ BOTTOM BAR ===== */
+#columntop,
+#columnbottom {
+ text-align: center;
+ clear: both;
+}
+
+#columntop ul,
+#columnbottom ul {
+ list-style-type: none
+}
+
+#columntop ul li, #columnbottom ul li {
+ display: inline;
+}
\ No newline at end of file
diff --git a/fp-interface/themes/leggero/footer.tpl b/fp-interface/themes/leggero/footer.tpl
index 4640cfe7..ad4bde2c 100755
--- a/fp-interface/themes/leggero/footer.tpl
+++ b/fp-interface/themes/leggero/footer.tpl
@@ -1,27 +1,22 @@
-
-
-
-
+
+
+ {comment} - - {* - using this tag combo, the name is displayed as a link only - if user entered a URL. +-
- Syntax is quite intuitive:
- "if $url is not empty, show $name between a tags,
- else default fallback on displaying plain $name"
+
- *}
- {if $url}
- {if $url|is_external_url}
+ {if $url}
+ {if $url|is_external_url}
- {$name|wp_specialchars:1}
- {else}
+ {$name|wp_specialchars:1}
+ {else}
- {$name|wp_specialchars:1}
- {/if}
- {else}
+ {$name|wp_specialchars:1}
+ {/if}
+ {else}
- {$name|wp_specialchars:1}
- {/if}
-
+ {$name|wp_specialchars:1}
+ {/if}
+
+
+ {include file="shared:commentadminctrls.tpl"}
+
+
+ + {$date|date_format_daily} {$lang.entryauthor.at} {$date|date_format:"`$fp_config.locale.timeformat`"} +
+ + {$content|tag:comment_text} - {include file="shared:commentadminctrls.tpl"} {* this shows edit/delete links *} +- {$date|date_format_daily} {$lang.entryauthor.at} {$date|date_format:"`$fp_config.locale.timeformat`"} -
+ {/comment} - {$content|tag:comment_text} +