From 752998e30bcdea5c50cf1e4776c284695991228f Mon Sep 17 00:00:00 2001
From: Fraenkiman <frank.pcn@gmail.com>
Date: Thu, 9 Feb 2023 01:12:36 +0100
Subject: [PATCH] Please merge the following changes

Fixes #201 and #144

 * In the admin area of the style Flatmaas-Rev is no longer tried via stylesheet to include the image nib-logo.png.
 * In the preview of the Leggero style "Posted by + time" is now displayed right-aligned - as in the blog.
 * The heading for posts and pages has received its own CSS class "entry-title".
 * In all three styles, both heading sizes are now displayed correctly; as in the blog, so in the preview.
 * The publication date is truncated from h2 and now uses h6.
 * Font size h4 can now also be conveniently set via BBCode button.
 * Long single line code in leggero-v2 style is now wrapped when printing.
---
 fp-interface/themes/leggero/default.tpl       |   2 +-
 fp-interface/themes/leggero/entry-default.tpl |   4 +--
 .../themes/leggero/flatmaas-rev/res/admin.css |  12 ++++---
 .../leggero/flatmaas-rev/res/common.css       |  14 +++++---
 .../themes/leggero/leggero-v2/res/admin.css   |  18 ++++++++--
 .../themes/leggero/leggero-v2/res/common.css  |  22 ++++++++----
 .../themes/leggero/leggero-v2/res/print.css   |   3 ++
 .../themes/leggero/leggero/res/admin.css      |  33 ++++++++++++++++++
 .../themes/leggero/leggero/res/common.css     |  12 ++++---
 fp-interface/themes/leggero/preview.tpl       |   4 +--
 fp-interface/themes/leggero/previewstatic.tpl |   2 +-
 fp-interface/themes/leggero/static.tpl        |   2 +-
 fp-plugins/bbcode/res/toolbaricons/h4.png     | Bin 0 -> 416 bytes
 fp-plugins/bbcode/tpls/toolbar.tpl            |   1 +
 14 files changed, 101 insertions(+), 28 deletions(-)
 create mode 100644 fp-plugins/bbcode/res/toolbaricons/h4.png

diff --git a/fp-interface/themes/leggero/default.tpl b/fp-interface/themes/leggero/default.tpl
index fa1749c..1e550a7 100755
--- a/fp-interface/themes/leggero/default.tpl
+++ b/fp-interface/themes/leggero/default.tpl
@@ -4,7 +4,7 @@
 				
 
 			<div class="entry">
-				<h3 class="title">{$subject}</h3>
+				<h2 class="title">{$subject}</h2>
 				<div class="body">
 				
 				{if isset($rawcontent) and $rawcontent} {$content}
diff --git a/fp-interface/themes/leggero/entry-default.tpl b/fp-interface/themes/leggero/entry-default.tpl
index fc07e55..9df2862 100644
--- a/fp-interface/themes/leggero/entry-default.tpl
+++ b/fp-interface/themes/leggero/entry-default.tpl
@@ -5,11 +5,11 @@
 				
 		{$date|date_format_daily:"<h2 class=\"date\">`$fp_config.locale.dateformat`</h2>"}
 		
-				<h3 itemprop="name">
+				<h2 itemprop="name" class="entry-title">
 				<a href="{$id|link:post_link}">
 				{$subject|tag:the_title}
 				</a>
-				</h3>
+				</h2>
 				{include file="shared:entryadminctrls.tpl"}
 				
 				<div itemprop="articleBody">
diff --git a/fp-interface/themes/leggero/flatmaas-rev/res/admin.css b/fp-interface/themes/leggero/flatmaas-rev/res/admin.css
index 8e676a8..0ae269f 100755
--- a/fp-interface/themes/leggero/flatmaas-rev/res/admin.css
+++ b/fp-interface/themes/leggero/flatmaas-rev/res/admin.css
@@ -124,11 +124,6 @@ input#subject {
 #admin-bbcode-toolbar select {width: 10em}
 
 
-#admin-content {
-	background: url(../imgs/nib-logo.png) bottom right no-repeat;
-}
-
-
 #admin-content table {
 	border-collapse: collapse;
 	width: 100%;	
@@ -367,6 +362,8 @@ input.maxsize, select.maxsize { width: 100% }
 /* ===== PREVIEW SETTINGS ===== */
 #post-preview .entry { padding: 2em }
 
+#post-preview div.entry h3 { font-size: 1.3em }
+
 #post-preview ul { list-style: none; padding: 0 0 0 1.6em }
 
 #post-preview  ol { list-style-position: inside; Padding: 0 1.6em 0 1.6em }
@@ -654,3 +651,8 @@ a.link-enable:hover {
 	margin-bottom: 2em;
 	padding: 1em 2em
 }
+
+form {
+    margin: auto;
+}
+
diff --git a/fp-interface/themes/leggero/flatmaas-rev/res/common.css b/fp-interface/themes/leggero/flatmaas-rev/res/common.css
index ddf1c91..2ee26c6 100755
--- a/fp-interface/themes/leggero/flatmaas-rev/res/common.css
+++ b/fp-interface/themes/leggero/flatmaas-rev/res/common.css
@@ -153,17 +153,23 @@ h1 {
 }
 
 
-h2 { /*  */ }
-
-h3 {
+h2 {
 	/* Titles of the entry */
-	font-size: 1.3em;
+	font-size: 1.4em;
 	color: #333333;
 	margin: 0;
+}
+
+.entry-title {
 	padding: 2px 0 2px 30px;
 	background: transparent url('../imgs/entry.png') center left no-repeat
 }
 
+.entry-title a {
+	color: #333333 !IMPORTANT;
+}
+
+h3 { margin: 0; font-size: 1.3em; }
 
 h4 { font-size: 1.2em; }
 	/* in the specific ID */
diff --git a/fp-interface/themes/leggero/leggero-v2/res/admin.css b/fp-interface/themes/leggero/leggero-v2/res/admin.css
index 31066ec..2883925 100755
--- a/fp-interface/themes/leggero/leggero-v2/res/admin.css
+++ b/fp-interface/themes/leggero/leggero-v2/res/admin.css
@@ -282,6 +282,16 @@ input.maxsize, select.maxsize { width: 99% }
 /* ===== PREVIEW SETTINGS ===== */
 #post-preview .entry { padding: 2em; max-height: 20em; overflow: auto  }
 
+#post-preview div.entry h2 {
+	font-family: sans-serif;
+	border-bottom: none;
+	margin: 0.83em 0;
+}
+
+#post-preview div.entry h4 {
+	margin: 2em 0 0 0;
+}
+
 .entry-footer {
 	margin: 2em 0 0.5em 0;
     text-align: right;
@@ -433,7 +443,7 @@ li.widget-class {
 
 
 .admin-widgetset h3 {
-	margin-bottom:1em;
+	margin-bottom: 1em;
 	padding: .3em;
 	background: #eee;
 	border: 1px solid #ddd;
@@ -596,4 +606,8 @@ a.link-general:hover, .main-cell a:hover {
 
 #footer {
 	color: black;
-}
\ No newline at end of file
+}
+
+form {
+    margin: auto;
+}
diff --git a/fp-interface/themes/leggero/leggero-v2/res/common.css b/fp-interface/themes/leggero/leggero-v2/res/common.css
index a30462b..677440e 100644
--- a/fp-interface/themes/leggero/leggero-v2/res/common.css
+++ b/fp-interface/themes/leggero/leggero-v2/res/common.css
@@ -124,13 +124,22 @@ h1 {
 	margin: 1em 0 0.5em 0;
 }
 
-h2 { } /* see h2.date */
-
-h3 {
+h2 {
 	/* Titles of the entry */
 	font-style: normal;
 	font-size: 1.6em;
-	margin: 0
+	margin: 0.83em 0;
+}
+
+h2.entry-title,
+h2.title {
+	margin: 0 !IMPORTANT;
+}
+
+h3 {
+	font-style: normal;
+	font-size: 1.4em;
+	margin: 0;
 }
 
 h4 { font-size: 1.2em; }
@@ -247,7 +256,7 @@ h4#addcomment {clear:both;}
 	}
 	
 	/* === Class of main block === */
-	h2.date {
+	h6.date {
 		font-size: 0.8em;
 		color: #444;
 	}
@@ -300,7 +309,8 @@ h4#addcomment {clear:both;}
 	
 	.navigation { /* next entries & previous entries link */
 		font-size: 90%;
-		margin-bottom: 3em
+		/* margin-bottom: 3em; */
+		display: flow-root;
 	}
 
 	form#search ul { 
diff --git a/fp-interface/themes/leggero/leggero-v2/res/print.css b/fp-interface/themes/leggero/leggero-v2/res/print.css
index a01abeb..5800b7a 100644
--- a/fp-interface/themes/leggero/leggero-v2/res/print.css
+++ b/fp-interface/themes/leggero/leggero-v2/res/print.css
@@ -81,6 +81,9 @@ pre {
   background-color: #eee;
   font-size: 70%;
   border: 1px dotted #333;
+  white-space: pre-line;
+  overflow: auto;
+  text-overflow: ellipsis;
 }
 
 .link-comments {
diff --git a/fp-interface/themes/leggero/leggero/res/admin.css b/fp-interface/themes/leggero/leggero/res/admin.css
index 6361cb0..cb8c03e 100755
--- a/fp-interface/themes/leggero/leggero/res/admin.css
+++ b/fp-interface/themes/leggero/leggero/res/admin.css
@@ -38,6 +38,12 @@ h2 {
 	border-bottom: 1px solid #ddd;
 }
 
+#admin-content h2,
+#admin-content form h2 {
+    font-style: normal;
+    padding: unset;
+}
+
 body { background: #eee; }
 
 /* === Redefines some stuff in inline mode === */
@@ -279,6 +285,24 @@ input.maxsize, select.maxsize { width: 100% }
 /* ===== PREVIEW SETTINGS ===== */
 #post-preview .entry { padding: 2em; max-height: 20em; overflow: auto  }
 
+#post-preview div.entry h2,
+#post-preview div.entry h3 {
+	border-bottom: none;
+}
+
+#post-preview div.entry h2 {
+	font-style: italic;
+	margin: 0;
+	padding: 1em 0 1em 0;
+}
+
+#post-preview div.entry h4 {
+	margin: 2em 0 0 0;
+}
+
+.entry-footer {
+	text-align: right;
+}
 
 /* ===== UPLOAD PANEL ===== */
 #admin-uploader-filelist {
@@ -426,6 +450,7 @@ li.widget-class {
 
 
 .admin-widgetset h3 {
+	font-style: italic;
 	margin-bottom:1em;
 	padding: .3em;
 	background: #eee;
@@ -492,6 +517,10 @@ li.widget-class {
 	margin-bottom: 4em;
 }
 
+.option-list ul li {
+	list-style-type: none;
+}
+
 .option-set dt {
     width: 33%;
     text-align:right;
@@ -586,3 +615,7 @@ a.link-general:hover, .main-cell a:hover {
 #admin-content ul.msgs {
 	margin:0;
 }
+
+form {
+    margin: auto;
+}
diff --git a/fp-interface/themes/leggero/leggero/res/common.css b/fp-interface/themes/leggero/leggero/res/common.css
index dc9067c..53ed2b5 100644
--- a/fp-interface/themes/leggero/leggero/res/common.css
+++ b/fp-interface/themes/leggero/leggero/res/common.css
@@ -158,9 +158,7 @@ h1 {
 	margin: 2em 0 0 0.5em
 }
 
-h2 { } /* see h2.date */
-
-h3 {
+h2 {
 	/* Titles of the entry */
 	font-family: 'book antiqua', georgia, garamond, times, 'times new roman', serif;
 	font-style: italic;
@@ -170,6 +168,12 @@ h3 {
     padding: 1em 0 1em 0;
 }
 
+h3 {
+	margin: 0;
+	font-size: 1.3em;
+	padding: 1em 0 1em 0;
+}
+
 h4 { font-size: 1.2em; }
 
 
@@ -272,7 +276,7 @@ h4 { font-size: 1.2em; }
 	}
 	
 	/* === Class of main block === */
-	h2.date {
+	h6.date {
 		font-size: 80%;
 		color: #aaa;
 	}
diff --git a/fp-interface/themes/leggero/preview.tpl b/fp-interface/themes/leggero/preview.tpl
index 06d103f..3e4f455 100755
--- a/fp-interface/themes/leggero/preview.tpl
+++ b/fp-interface/themes/leggero/preview.tpl
@@ -1,7 +1,7 @@
 			{entry content=$entry}
 			<div class="entry">
-			{$date|date_format_daily:"<h2 class=\"date\">`$fp_config.locale.dateformat`</h2>"}
-				<h3>{$subject|tag:the_title}</h3>
+			{$date|date_format_daily:"<h6 class=\"date\">`$fp_config.locale.dateformat`</h6>"}
+				<h2 class="entry-title">{$subject|tag:the_title}</h2>
 				{$content|tag:the_content}
 				<ul class="entry-footer">
 					<li class="entry-info">
diff --git a/fp-interface/themes/leggero/previewstatic.tpl b/fp-interface/themes/leggero/previewstatic.tpl
index 1b244c5..228435a 100755
--- a/fp-interface/themes/leggero/previewstatic.tpl
+++ b/fp-interface/themes/leggero/previewstatic.tpl
@@ -1,6 +1,6 @@
 			{static content=$entry}
 			<div class="entry">
-				<h3>{$subject|tag:the_title}</h3>
+				<h2 class="entry-title">{$subject|tag:the_title}</h2>
 				<p class="date">{$lang.staticauthor.published_by} {$author} {$lang.staticauthor.on} {$date|date_format_daily} </p>
 				{$content|tag:the_content}
 			</div>
diff --git a/fp-interface/themes/leggero/static.tpl b/fp-interface/themes/leggero/static.tpl
index 15bfc17..9b27bad 100755
--- a/fp-interface/themes/leggero/static.tpl
+++ b/fp-interface/themes/leggero/static.tpl
@@ -6,7 +6,7 @@
 		{static_block}
 		{static}
 			<div id="{$id}" class="entry page-{$id}">
-				<h3>{$subject}</h3>
+				<h2 class="entry-title">{$subject}</h2>
 				<p class="date">{$lang.staticauthor.published_by} {$author} {$lang.staticauthor.on} {$date|date_format_daily}</p>
 				
 				{$content|tag:the_content}
diff --git a/fp-plugins/bbcode/res/toolbaricons/h4.png b/fp-plugins/bbcode/res/toolbaricons/h4.png
new file mode 100644
index 0000000000000000000000000000000000000000..ceb98650da873b21fcd90d7263c600779f85a348
GIT binary patch
literal 416
zcmV;R0bl-!P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0X0cPK~y+T?Nhr>
zgg_J>z{Y~YSQBDtB(cSUS3^Tdgwl_&HoErygO!PqFQ6hZ*-)5l<rkQ2XRKLXo-;6H
zYb|U%$>lzVd+xbI(8h5TzkxpcALH){<Q?RBzCwJ)Lf`i<MNvE_Ns_m1d%4@~MAJ0y
zbzR@`-1EE>!!X{esydeU#|JITvTd5Ch019`5EQQKZW$|tVYq>PGG={Q0h2}7b#pcW
zlLZwhfbaqCampqf%w9G_vK7bi^(>ps7CnKfIozSH>#xHw$QrQ_pqchjmL;c1IF54x
z0?YS(?)`+ljVOxF=VOUw1rqGbCDaO-dWTeliUE6X5FattfQ3NG-iNAT@)b;{q30Aw
zUyMOEN&>L0@Zy>ckj-6%ZQJ>*U~QTvKeGgS?&)!%H}wDif)L-2f4`>txOFW60000<
KMNUMnLSTXyhO{pL

literal 0
HcmV?d00001

diff --git a/fp-plugins/bbcode/tpls/toolbar.tpl b/fp-plugins/bbcode/tpls/toolbar.tpl
index a31ab4f..a89eab8 100755
--- a/fp-plugins/bbcode/tpls/toolbar.tpl
+++ b/fp-plugins/bbcode/tpls/toolbar.tpl
@@ -15,6 +15,7 @@
 		<img src="fp-plugins/bbcode/res/toolbaricons/mail.png" id="bb_mail" accesskey="" alt="mail" title="mail" onclick="insBBCode('mail');" />
 		<img src="fp-plugins/bbcode/res/toolbaricons/h2.png" id="bb_h2" accesskey="" alt="h2" title="h2" onclick="insBBCode('h2');" />
 		<img src="fp-plugins/bbcode/res/toolbaricons/h3.png" id="bb_h3" accesskey="" alt="h3" title="h3" onclick="insBBCode('h3');" />
+		<img src="fp-plugins/bbcode/res/toolbaricons/h4.png" id="bb_h4" accesskey="" alt="h4" title="h4" onclick="insBBCode('h4');" />
 		<img src="fp-plugins/bbcode/res/toolbaricons/ul.png" id="bb_ul" accesskey="" alt="ul" title="unordered list" onclick="insBBCodeWithContent('list', '\n[*]\n[*]\n');" />
 		<img src="fp-plugins/bbcode/res/toolbaricons/ol.png" id="bb_ol" accesskey="" alt="ol" title="ordered list" onclick="insBBCodeWithParamsAndContent('list', '#', '\n[*]\n[*]\n');" />
 		<img src="fp-plugins/bbcode/res/toolbaricons/quote.png" id="bb_quote" accesskey="" alt="quote" title="{$lang.admin.plugin.bbcode.editor.quotetitle}" onclick="insBBCode('quote');" />