diff --git a/admin/panels/entry/admin.entry.commentlist.tpl b/admin/panels/entry/admin.entry.commentlist.tpl index c7476d1..cd9cd9a 100755 --- a/admin/panels/entry/admin.entry.commentlist.tpl +++ b/admin/panels/entry/admin.entry.commentlist.tpl @@ -2,7 +2,7 @@ {entry_block} {entry} -

{$panelstrings.head} {$subject}

+

{$panelstrings.head} {$subject}

{include file="shared:errorlist.tpl"}

{$panelstrings.descr}

diff --git a/admin/panels/entry/admin.entry.delete.tpl b/admin/panels/entry/admin.entry.delete.tpl index b20a55d..0de3bb6 100755 --- a/admin/panels/entry/admin.entry.delete.tpl +++ b/admin/panels/entry/admin.entry.delete.tpl @@ -4,7 +4,7 @@ {entry_block} {html_form} -
{$panelstrings.preview} +
{$panelstrings.preview} {include file="preview.tpl"}

{$panelstrings.confirm}

diff --git a/admin/panels/static/admin.static.delete.tpl b/admin/panels/static/admin.static.delete.tpl index b447028..837a9da 100755 --- a/admin/panels/static/admin.static.delete.tpl +++ b/admin/panels/static/admin.static.delete.tpl @@ -2,7 +2,7 @@

{$panelstrings.descr}

{statics} -
{$panelstrings.preview} +
{$panelstrings.preview} {include file="previewstatic.tpl"}
{/statics} 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 @@
-

{$subject}

+

{$subject}

{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:"

`$fp_config.locale.dateformat`

"} -

+

{$subject|tag:the_title} -

+ {include file="shared:entryadminctrls.tpl"}
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..92f54ae 100755 --- a/fp-interface/themes/leggero/leggero-v2/res/admin.css +++ b/fp-interface/themes/leggero/leggero-v2/res/admin.css @@ -34,6 +34,10 @@ h2 { border-bottom: 1px solid #ddd; } +.head-link { + font-size: 0.83em; +} + body { background: #eee; } /* === Redefines some stuff in inline mode === */ @@ -282,6 +286,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 +447,7 @@ li.widget-class { .admin-widgetset h3 { - margin-bottom:1em; + margin-bottom: 1em; padding: .3em; background: #eee; border: 1px solid #ddd; @@ -596,4 +610,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}
- {$date|date_format_daily:"

`$fp_config.locale.dateformat`

"} -

{$subject|tag:the_title}

+ {$date|date_format_daily:"
`$fp_config.locale.dateformat`
"} +

{$subject|tag:the_title}

{$content|tag:the_content}
  • 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}
    -

    {$subject|tag:the_title}

    +

    {$subject|tag:the_title}

    {$lang.staticauthor.published_by} {$author} {$lang.staticauthor.on} {$date|date_format_daily}

    {$content|tag:the_content}
    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}
    -

    {$subject}

    +

    {$subject}

    {$lang.staticauthor.published_by} {$author} {$lang.staticauthor.on} {$date|date_format_daily}

    {$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 0000000..ceb9865 Binary files /dev/null and b/fp-plugins/bbcode/res/toolbaricons/h4.png differ 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 @@ mail h2 h3 + h4 ul ol quote