From e802b964b984136ae0d760bda6ba75149d279245 Mon Sep 17 00:00:00 2001 From: Gnieark Date: Thu, 23 Aug 2018 23:00:48 +0200 Subject: [PATCH 1/6] wip --- style-2018-06-12.css | 30 ++++++-- tpl/__layout.html | 163 +++++++++++++++++++----------------------- tpl/__layout1.html | 1 - tpl/_head.html | 2 +- tpl/_top.html | 4 +- tpl/category.html | 21 ++---- tpl/category.html.bak | 101 ++++++++++++++++++++++++++ tpl/home.html | 13 ---- 8 files changed, 206 insertions(+), 129 deletions(-) create mode 100644 tpl/category.html.bak diff --git a/style-2018-06-12.css b/style-2018-06-12.css index 8d3283c..3a2bf71 100644 --- a/style-2018-06-12.css +++ b/style-2018-06-12.css @@ -112,23 +112,40 @@ img, audio { height: auto; margin: 0 auto; } - -#page { +img.EntryFirstImage{ + max-width: 100%; + display: inline; + border-radius: 8px; + left: 50%; + transform: translate(50%, 0%); /* décalage de 50% de sa propre taille */ +} +section, aside { background-color: #fff9fb; overflow-x: hidden; } -#top p { +header p { padding: 1.5em 1.5em 0 1.5em; color: rgba(0,0,0,.4); font-size: 1em; } @media (min-width: 40em) { - #page { + section, aside { max-width: 40em; margin: 1em auto; background-color: #fff9fb; border-radius: 3em; box-shadow: -0.1em 0.1em 1em 0.1em rgba(0, 0, 0, 0.3); + + + } + img.EntryFirstImage{ + max-width: 15em; + float: right; + left: none; + transform: none; + } + article{ + overflow: auto; } } @@ -274,7 +291,7 @@ input[type="text"], textarea { /*Search form */ #search input[type="text"] { width: 10em; } -/* Pager */ +/*sectionr */ div.pagination-wrapper { background-color: #4b88a2; @@ -325,4 +342,5 @@ p.pagination>a, p.pagination>span { text-align: right; right: -1.5em; } -} \ No newline at end of file +} +.wholearticlelink{text-decoration: none;} \ No newline at end of file diff --git a/tpl/__layout.html b/tpl/__layout.html index 9f004fa..9058be7 100644 --- a/tpl/__layout.html +++ b/tpl/__layout.html @@ -22,7 +22,6 @@ - @@ -69,109 +68,91 @@ -
+ {{tpl:include src="_top.html"}} -
- -
- - - {{tpl:Breadcrumb}} - -
- - -
- -

{{tpl:EntryTitle encode_html="1"}}

- -

{{tpl:lang By}} {{tpl:EntryAuthorLink}} - {{tpl:lang on}} {{tpl:EntryDate}}, {{tpl:EntryTime}} - - - {{tpl:EntryCategory encode_html="1"}} - + + +

+ + + {{tpl:Breadcrumb}} + + + + + +
+

{{tpl:EntryTitle encode_html="1"}}

+ + {{tpl:SysBehavior behavior="publicEntryBeforeContent"}} + + + {{tpl:EntryFirstImage size="s" class="EntryFirstImage" with_category="1"}} +

+ + {{tpl:EntryExcerpt remove_html="1" encode_html="1"}}

- - - - - - - {{tpl:SysBehavior behavior="publicEntryBeforeContent"}} - - - -
{{tpl:EntryExcerpt}}
-

{{tpl:lang Continue - reading}}...

- - - - -
{{tpl:EntryContent}}
- - +

Lire la suite...

+ + + + + {{tpl:EntryFirstImage size="s" class="EntryFirstImage" with_category="1"}} +

+ + {{tpl:EntryContent remove_html="1" encode_html="1" cut_string="300"}} + +

+

Lire la suite...

+ + {{tpl:SysBehavior behavior="publicEntryAfterContent"}} - - - -

- - - {{tpl:EntryCommentCount}} - - - {{tpl:EntryPingCount}} - - {{tpl:EntryAttachmentCount}} - -

- -
- - - -
-

- {{tpl:lang page}} {{tpl:PaginationCurrent}} {{tpl:lang of}} {{tpl:PaginationCounter}} -

-
- - - - -
- -
- - - - - -
+ + + + + +

- + {{tpl:lang page}} {{tpl:PaginationCurrent}} {{tpl:lang of}} {{tpl:PaginationCounter}} + -

+ + + + + + + + + + + + + + + + + + {{tpl:include src="_footer.html"}} -
+ diff --git a/tpl/__layout1.html b/tpl/__layout1.html index 4a3ad52..f343850 100644 --- a/tpl/__layout1.html +++ b/tpl/__layout1.html @@ -21,7 +21,6 @@ - diff --git a/tpl/_head.html b/tpl/_head.html index 3b84d16..e0e6bf8 100644 --- a/tpl/_head.html +++ b/tpl/_head.html @@ -4,7 +4,7 @@ {{tpl:include src="user_head.html"}} {{tpl:SysBehavior behavior="publicHeadContent"}} - - + - +
-

Retour à la page d'accueil{{tpl:EntryTitle encode_html="1"}}

+

Retour à la page d'accueil{{tpl:BlogName encode_html="1"}}

{{tpl:SysBehavior behavior="publicTopAfterContent"}}
-
- +
+

main(){

+
+

{{tpl:EntryTitle encode_html="1"}}

{{tpl:lang By}} {{tpl:EntryAuthorLink}} {{tpl:lang on}} {{tpl:EntryDate}} @@ -157,7 +159,7 @@ -

+

{{tpl:lang Your comment}}

@@ -170,7 +172,6 @@

{{tpl:lang Add a comment}}

- {{tpl:SysBehavior behavior="publicCommentFormBeforeContent"}}

@@ -196,11 +197,9 @@ rows="7" placeholder="{{tpl:lang Comment}}">{{tpl:CommentPreviewContent raw="1" encode_html="1"}}

{{tpl:CommentHelp}}

- - {{tpl:SysBehavior behavior="publicCommentFormAfterContent"}}
- +

@@ -257,6 +256,6 @@ cut_string="50"}} » - +
From 2da744193ded0d2b1029c01889efebc66615c2ec Mon Sep 17 00:00:00 2001 From: Gnieark Date: Mon, 27 Aug 2018 18:26:49 +0200 Subject: [PATCH 4/6] archives --- tpl/archive.html | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tpl/archive.html b/tpl/archive.html index c1d08aa..20181de 100644 --- a/tpl/archive.html +++ b/tpl/archive.html @@ -18,17 +18,19 @@ - + -
-

{{tpl:lang Archives}}

-
+
+

{{tpl:lang Archives}}

+ + -
+ -

{{tpl:ArchiveDate format="%Y"}}

+ +

{{tpl:ArchiveDate format="%Y"}}

+ -
+ +
\ No newline at end of file From 22c933ed588d86d0ab72f282fc93333bb95856af Mon Sep 17 00:00:00 2001 From: Gnieark Date: Mon, 27 Aug 2018 19:06:18 +0200 Subject: [PATCH 5/6] archives --- tpl/archive.html | 11 +----- tpl/archive_month.html | 89 ++++++++++++++++++++++++------------------ 2 files changed, 53 insertions(+), 47 deletions(-) diff --git a/tpl/archive.html b/tpl/archive.html index 20181de..2fb0b5a 100644 --- a/tpl/archive.html +++ b/tpl/archive.html @@ -23,13 +23,8 @@

{{tpl:lang Archives}}

- - - - - - - + +

{{tpl:ArchiveDate format="%Y"}}

    @@ -39,8 +34,6 @@
- -
\ No newline at end of file diff --git a/tpl/archive_month.html b/tpl/archive_month.html index f004a31..9340136 100644 --- a/tpl/archive_month.html +++ b/tpl/archive_month.html @@ -14,52 +14,65 @@ - - - - - - - - - - - - - + - + + +
+ +

{{tpl:ArchiveDate}}

-
- +

{{tpl:EntryDate}}

 -

{{tpl:EntryTitle encode_html="1"}}

+ +
+

{{tpl:EntryTitle encode_html="1"}}

+ + {{tpl:SysBehavior behavior="publicEntryBeforeContent"}} + + + {{tpl:EntryFirstImage size="s" class="EntryFirstImage" with_category="1"}} +

+ + {{tpl:EntryExcerpt remove_html="1" encode_html="1"}} +

+

Lire la suite...

+ + + + + {{tpl:EntryFirstImage size="s" class="EntryFirstImage" with_category="1"}} +

+ + {{tpl:EntryContent remove_html="1" encode_html="1" cut_string="300"}} + +

+

Lire la suite...

+ + + + {{tpl:SysBehavior behavior="publicEntryAfterContent"}} -

{{tpl:lang By}} {{tpl:EntryAuthorLink}} - - - {{tpl:EntryCommentCount}} - - - - {{tpl:EntryPingCount}} - - - {{tpl:EntryAttachmentCount}} -

+
+ -
+ +
\ No newline at end of file From ef45db49432efc0d7a4ab989704bbc63c82c70d3 Mon Sep 17 00:00:00 2001 From: Gnieark Date: Wed, 29 Aug 2018 07:47:10 +0200 Subject: [PATCH 6/6] End? --- _define.php | 4 +- tpl/category.html | 116 +++++++++++++++++++--------------- tpl/page.html | 23 +++---- tpl/tag.html | 154 ++++++++++++++++++---------------------------- tpl/tags.html | 18 ++---- 5 files changed, 144 insertions(+), 171 deletions(-) diff --git a/_define.php b/_define.php index 40dea3e..c0c2c94 100644 --- a/_define.php +++ b/_define.php @@ -2,6 +2,6 @@ $this->registerModule( /* Name */ "Ventres mous", /* Description*/ "Thème Ventres mous", - /* Author */ "Zigazou", - /* Version */ '1.0' + /* Author */ "Zigazou & Gnieark", + /* Version */ '1.2' ); diff --git a/tpl/category.html b/tpl/category.html index 88b4d28..54f719c 100644 --- a/tpl/category.html +++ b/tpl/category.html @@ -18,39 +18,32 @@ - - - - - - - - - - - - - - - - - - +
+

Retour à la page d'accueil{{tpl:BlogName encode_html="1"}}

+
- - - -
- +
+

{{tpl:lang Categorie}}: {{tpl:CategoryTitle}}

{{tpl:CategoryDescription}} + + + +

{{tpl:lang Subcategories}}:

+ + + + +

{{tpl:lang Entries feed}} @@ -61,32 +54,55 @@

-
- - - - - - - + + + + + \ No newline at end of file diff --git a/tpl/page.html b/tpl/page.html index 5088f1a..78669d4 100644 --- a/tpl/page.html +++ b/tpl/page.html @@ -1,36 +1,32 @@ {{tpl:extends parent="post.html"}} - - - - + -
+
+
- +

{{tpl:EntryTitle}}

{{tpl:SysBehavior behavior="publicEntryBeforeContent"}} -
{{tpl:EntryExcerpt}}
{{tpl:EntryContent}}
- {{tpl:SysBehavior behavior="publicEntryAfterContent"}} -
+
-
+

{{tpl:lang Attachments}}

    @@ -52,7 +48,7 @@
-
+ @@ -60,7 +56,7 @@ -
+

{{tpl:lang Comments}}

@@ -80,7 +76,7 @@
-
+ @@ -191,4 +187,5 @@

{{tpl:lang This page's comments feed}}

+ \ No newline at end of file diff --git a/tpl/tag.html b/tpl/tag.html index 1b3429b..fa9bda2 100644 --- a/tpl/tag.html +++ b/tpl/tag.html @@ -16,109 +16,75 @@ - - - - - - - - - - - - - - - - - - - - + -
-

{{tpl:lang Tag}} - {{tpl:TagID}}

- -

{{tpl:lang Entries feed}} +

+

{{tpl:lang Tag}} - {{tpl:TagID}}

+
+ + -
- -

{{tpl:EntryDate}}

 - -

{{tpl:EntryTitle encode_html="1"}}

- -

{{tpl:lang By}} {{tpl:EntryAuthorLink}} - {{tpl:lang on}} {{tpl:EntryDate}}, {{tpl:EntryTime}} - - - {{tpl:EntryCategory encode_html="1"}} - -

- - - - - - - {{tpl:SysBehavior behavior="publicEntryBeforeContent"}} - - - -
{{tpl:EntryExcerpt}}
-

{{tpl:lang Continue - reading}}...

- - - - -
{{tpl:EntryContent}}
- - - - {{tpl:SysBehavior behavior="publicEntryAfterContent"}} - - - -

- - - {{tpl:EntryCommentCount}} - - - {{tpl:EntryPingCount}} - - {{tpl:EntryAttachmentCount}} - -

- -
- - - -

- - {{tpl:lang page}} {{tpl:PaginationCurrent}} {{tpl:lang of}} {{tpl:PaginationCounter}} - -

- - - + +
+

{{tpl:EntryTitle encode_html="1"}}

+ + {{tpl:SysBehavior behavior="publicEntryBeforeContent"}} + + + {{tpl:EntryFirstImage size="s" class="EntryFirstImage" with_category="1"}} +

+ + {{tpl:EntryExcerpt remove_html="1" encode_html="1"}} +

+

Lire la suite...

+ + + + + {{tpl:EntryFirstImage size="s" class="EntryFirstImage" with_category="1"}} +

+ + {{tpl:EntryContent remove_html="1" encode_html="1" cut_string="300"}} + +

+

Lire la suite...

+ + + + {{tpl:SysBehavior behavior="publicEntryAfterContent"}} + +
+ + + + + + + diff --git a/tpl/tags.html b/tpl/tags.html index acf262a..98eddb4 100644 --- a/tpl/tags.html +++ b/tpl/tags.html @@ -14,24 +14,18 @@ - - - - - - - - + -
+

{{tpl:lang Tags}}

-
+ + -
-
+ +