Kévin Tessier před 5 roky
rodič
revize
723314fbb8

+ 1 - 1
cache/compiled/blueprints/master-dev.hehe.net.php

@@ -1,7 +1,7 @@
 <?php
 return [
     '@class' => 'Grav\\Common\\Config\\CompiledBlueprints',
-    'timestamp' => 1535111354,
+    'timestamp' => 1535374700,
     'checksum' => '1d14f778d90686cdd66810a9bf28392f',
     'files' => [
         'system/blueprints/config' => [

+ 5 - 5
cache/compiled/config/master-dev.hehe.net.php

@@ -1,8 +1,8 @@
 <?php
 return [
     '@class' => 'Grav\\Common\\Config\\CompiledConfig',
-    'timestamp' => 1535111354,
-    'checksum' => '0606ec3bf08c69f617c790931359ad60',
+    'timestamp' => 1535376240,
+    'checksum' => 'af9010a82fe8ddb0d6784c533e2b9cc7',
     'files' => [
         'user/config' => [
             'media' => [
@@ -27,7 +27,7 @@ return [
             ],
             'system' => [
                 'file' => 'user/config/system.yaml',
-                'modified' => 1534926821
+                'modified' => 1535376238
             ]
         ],
         'system/config' => [
@@ -618,8 +618,8 @@ return [
                 ],
                 'dateformat' => [
                     'default' => NULL,
-                    'short' => 'jS M Y',
-                    'long' => 'F jS \\a\\t g:ia'
+                    'short' => 'd.m.y',
+                    'long' => 'd.m.y'
                 ],
                 'publish_dates' => true,
                 'process' => [

+ 1 - 1
cache/compiled/files/2d5fa3f2e561fcda0c830b5dff5b98df.yaml.php

@@ -2,7 +2,7 @@
 return [
     '@class' => 'Grav\\Common\\File\\CompiledYamlFile',
     'filename' => '/mnt/data/Sites/hehe.net/user/plugins/admin/blueprints/config/media.yaml',
-    'modified' => 1534926555,
+    'modified' => 1535111354,
     'data' => [
         'title' => 'PLUGIN_ADMIN.MEDIA',
         'form' => [

+ 3 - 3
cache/compiled/files/41e27877bae384c98ac5a023db4b7036.yaml.php

@@ -2,7 +2,7 @@
 return [
     '@class' => 'Grav\\Common\\File\\CompiledYamlFile',
     'filename' => '/mnt/data/Sites/hehe.net/user/config/system.yaml',
-    'modified' => 1534926821,
+    'modified' => 1535376238,
     'data' => [
         'absolute_urls' => false,
         'param_sep' => ':',
@@ -35,8 +35,8 @@ return [
                 'count' => 20
             ],
             'dateformat' => [
-                'short' => 'jS M Y',
-                'long' => 'F jS \\a\\t g:ia'
+                'short' => 'd.m.y',
+                'long' => 'd.m.y'
             ],
             'publish_dates' => true,
             'process' => [

+ 124 - 0
cache/compiled/files/a73364d4c6c5f58716b3a6b0902a6810.yaml.php

@@ -0,0 +1,124 @@
+<?php
+return [
+    '@class' => 'Grav\\Common\\File\\CompiledYamlFile',
+    'filename' => '/mnt/data/Sites/hehe.net/user/plugins/admin/blueprints/admin/pages/modular_raw.yaml',
+    'modified' => 1535111354,
+    'data' => [
+        'rules' => [
+            'slug' => [
+                'pattern' => '[a-zA-Zа-яA-Я0-9_\\-]+',
+                'min' => 1,
+                'max' => 200
+            ]
+        ],
+        'form' => [
+            'validation' => 'loose',
+            'fields' => [
+                'tabs' => [
+                    'type' => 'tabs',
+                    'active' => 1,
+                    'fields' => [
+                        'content' => [
+                            'type' => 'tab',
+                            'title' => 'PLUGIN_ADMIN.CONTENT',
+                            'fields' => [
+                                'frontmatter' => [
+                                    'classes' => 'frontmatter',
+                                    'type' => 'editor',
+                                    'label' => 'PLUGIN_ADMIN.FRONTMATTER',
+                                    'autofocus' => true,
+                                    'codemirror' => [
+                                        'mode' => 'yaml',
+                                        'indentUnit' => 4,
+                                        'autofocus' => true,
+                                        'indentWithTabs' => false,
+                                        'lineNumbers' => true,
+                                        'styleActiveLine' => true,
+                                        'gutters' => [
+                                            0 => 'CodeMirror-lint-markers'
+                                        ],
+                                        'lint' => true
+                                    ]
+                                ],
+                                'content' => [
+                                    'type' => 'markdown'
+                                ],
+                                'header.media_order' => [
+                                    'type' => 'pagemedia',
+                                    'label' => 'PLUGIN_ADMIN.PAGE_MEDIA'
+                                ]
+                            ]
+                        ],
+                        'options' => [
+                            'type' => 'tab',
+                            'title' => 'PLUGIN_ADMIN.OPTIONS',
+                            'fields' => [
+                                'columns' => [
+                                    'type' => 'columns',
+                                    'fields' => [
+                                        'column1' => [
+                                            'type' => 'column',
+                                            'fields' => [
+                                                'ordering' => [
+                                                    'type' => 'toggle',
+                                                    'label' => 'PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX',
+                                                    'help' => 'PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX_HELP',
+                                                    'highlight' => 1,
+                                                    'options' => [
+                                                        1 => 'PLUGIN_ADMIN.ENABLED',
+                                                        0 => 'PLUGIN_ADMIN.DISABLED'
+                                                    ],
+                                                    'validate' => [
+                                                        'type' => 'bool'
+                                                    ]
+                                                ],
+                                                'folder' => [
+                                                    'type' => 'text',
+                                                    'label' => 'PLUGIN_ADMIN.FILENAME',
+                                                    'validate' => [
+                                                        'rule' => 'slug',
+                                                        'required' => true
+                                                    ]
+                                                ],
+                                                'route' => [
+                                                    'type' => 'parents',
+                                                    'label' => 'PLUGIN_ADMIN.PARENT',
+                                                    'classes' => 'fancy',
+                                                    'validate' => [
+                                                        'required' => true
+                                                    ]
+                                                ],
+                                                'name' => [
+                                                    'type' => 'select',
+                                                    'classes' => 'fancy',
+                                                    'label' => 'PLUGIN_ADMIN.MODULAR_TEMPLATE',
+                                                    'default' => 'default',
+                                                    'data-options@' => '\\Grav\\Plugin\\AdminPlugin::pagesModularTypes',
+                                                    'validate' => [
+                                                        'required' => true
+                                                    ]
+                                                ]
+                                            ]
+                                        ],
+                                        'column2' => [
+                                            'type' => 'column',
+                                            'fields' => [
+                                                'order' => [
+                                                    'type' => 'order',
+                                                    'label' => 'PLUGIN_ADMIN.ORDERING'
+                                                ]
+                                            ]
+                                        ]
+                                    ]
+                                ],
+                                'blueprint' => [
+                                    'type' => 'blueprint'
+                                ]
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ]
+    ]
+];

+ 9 - 3
cache/compiled/files/e08035d8cd7725be69d6b78ffd186911.yaml.php

@@ -2,7 +2,7 @@
 return [
     '@class' => 'Grav\\Common\\File\\CompiledYamlFile',
     'filename' => '/mnt/data/Sites/hehe.net/system/blueprints/pages/default.yaml',
-    'modified' => 1535111318,
+    'modified' => 1535375937,
     'data' => [
         'title' => 'PLUGIN_ADMIN.DEFAULT',
         'rules' => [
@@ -65,9 +65,15 @@ return [
                                                 'type' => 'bool'
                                             ]
                                         ],
-                                        'header.date' => [
+                                        'header.date_start' => [
                                             'type' => 'datetime',
-                                            'label' => 'PLUGIN_ADMIN.DATE',
+                                            'label' => 'Date start',
+                                            'toggleable' => true,
+                                            'help' => 'PLUGIN_ADMIN.DATE_HELP'
+                                        ],
+                                        'header.date_end' => [
+                                            'type' => 'datetime',
+                                            'label' => 'Date End',
                                             'toggleable' => true,
                                             'help' => 'PLUGIN_ADMIN.DATE_HELP'
                                         ],

+ 0 - 0
cache/problem-check-g-41cebf81 → cache/problem-check-g-73669507


+ 1 - 1
logs/popularity/daily.json

@@ -1 +1 @@
-{"01-08-2018":19,"02-08-2018":424,"20-08-2018":112,"21-08-2018":214,"22-08-2018":440,"24-08-2018":273,"27-08-2018":220}
+{"01-08-2018":19,"02-08-2018":424,"20-08-2018":112,"21-08-2018":214,"22-08-2018":440,"24-08-2018":273,"27-08-2018":253}

+ 1 - 1
logs/popularity/monthly.json

@@ -1 +1 @@
-{"08-2018":1702}
+{"08-2018":1735}

+ 1 - 1
logs/popularity/totals.json

@@ -1 +1 @@
-{"\/":819,"\/projets":99,"\/news":147,"\/a-propros":57,"\/projets-n-1":1,"\/projets\/projets-n-1":514,"\/projets\/projet-n-2":43,"\/projets\/projets-n-2":5,"\/projets\/projets-n":17}
+{"\/":820,"\/projets":99,"\/news":178,"\/a-propros":57,"\/projets-n-1":1,"\/projets\/projets-n-1":515,"\/projets\/projet-n-2":43,"\/projets\/projets-n-2":5,"\/projets\/projets-n":17}

+ 1 - 1
logs/popularity/visitors.json

@@ -1 +1 @@
-{"4b84b15bff6ee5796152495a230e45e3d7e947d9":1535374219}
+{"4b84b15bff6ee5796152495a230e45e3d7e947d9":1535376254}

+ 8 - 2
system/blueprints/pages/default.yaml

@@ -61,9 +61,15 @@ form:
                   validate:
                     type: bool
 
-                header.date:
+                header.date_start:
                   type: datetime
-                  label: PLUGIN_ADMIN.DATE
+                  label: Date start
+                  toggleable: true
+                  help: PLUGIN_ADMIN.DATE_HELP
+
+                header.date_end:
+                  type: datetime
+                  label: Date End
                   toggleable: true
                   help: PLUGIN_ADMIN.DATE_HELP
 

+ 2 - 2
user/config/system.yaml

@@ -25,8 +25,8 @@ pages:
   list:
     count: 20
   dateformat:
-    short: 'jS M Y'
-    long: 'F jS \a\t g:ia'
+    short: 'd.m.y'
+    long: 'd.m.y'
   publish_dates: true
   process:
     markdown: true

+ 3 - 0
user/pages/03.news/_news-1/text.md

@@ -1,6 +1,9 @@
 ---
 title: 'News 1'
 image_align: left
+date_start: '15-08-2018 15:09'
+date_end: '21-08-2018 15:19'
+date: '05-08-2018 14:54'
 ---
 
 Faux-texte: a pour fonction de faire office de texte de substitution ou d'outil permettant la comparaison et l'appréciation de différentes polices.

+ 2 - 0
user/pages/03.news/_news/text.md

@@ -1,6 +1,8 @@
 ---
 title: 'News 2'
 image_align: left
+date_start: '01-08-2018 15:08'
+date_end: '02-08-2018 15:08'
 ---
 
 Faux-texte: a pour fonction de faire office de texte de substitution ou d'outil permettant la comparaison et l'appréciation de différentes polices.

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 2 - 0
user/themes/hehe/css-compiled/template.css


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
user/themes/hehe/css-compiled/template.min.css


+ 9 - 0
user/themes/hehe/scss/template/_typography.scss

@@ -114,4 +114,13 @@ p{
     text-transform: uppercase;
     font-weight: normal;
   }
+  .blog-date{
+    time{
+      font-family:$roboto_light;
+      text-transform: uppercase;
+      font-weight: normal;
+      font-size:0.8em;
+
+    }
+  }
 }

+ 2 - 0
user/themes/hehe/templates/modular/text.html.twig

@@ -3,6 +3,8 @@
 
 <section class="news">
 
+  {% include 'partials/blog/date.html.twig' %}
+
   <h3><a href="#">{{header.title}}</a></h3>
 
     <div class="txt">

+ 7 - 1
user/themes/hehe/templates/partials/blog/date.html.twig

@@ -1,5 +1,11 @@
 <span class="blog-date">
     <time class="dt-published" datetime="{{ page.date|date("c") }}">
-        <i class="fa fa-calendar"></i> {{ page.date|date(system.pages.dateformat.short) }}
+        <i class="fa fa-calendar"></i> {{ page.header.date_start|date(system.pages.dateformat.short) }}
+
+        {% if page.header.date_end %}
+
+          - <i class="fa fa-calendar"></i> {{ page.header.date_end|date(system.pages.dateformat.short) }}
+
+        {% endif %}
     </time>
 </span>

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů