Jelajahi Sumber

add table + resizablejq

Kévin Tessier 6 tahun lalu
induk
melakukan
911b7e78be

+ 99 - 187
cache/compiled/blueprints/master-dev.r2c.net.php

@@ -1,9 +1,15 @@
 <?php
 return [
     '@class' => 'Grav\\Common\\Config\\CompiledBlueprints',
-    'timestamp' => 1530525683,
-    'checksum' => 'b0eb8b14d56bcb4e56a44521f956677f',
+    'timestamp' => 1530607689,
+    'checksum' => 'b387ad70705342f55515e679d19bf460',
     'files' => [
+        'user/plugins/admin/blueprints/config' => [
+            'media' => [
+                'file' => 'user/plugins/admin/blueprints/config/media.yaml',
+                'modified' => 1529476888
+            ]
+        ],
         'system/blueprints/config' => [
             'media' => [
                 'file' => 'system/blueprints/config/media.yaml',
@@ -62,6 +68,53 @@ return [
                     'validation' => 'loose'
                 ]
             ],
+            'media.types' => [
+                'name' => 'media.types',
+                'type' => 'list',
+                'label' => 'PLUGIN_ADMIN.MEDIA_TYPES',
+                'style' => 'vertical',
+                'key' => 'extension',
+                'controls' => 'both',
+                'collapsed' => true,
+                'validation' => 'loose',
+                'array' => true
+            ],
+            'media.types.*' => [
+                'type' => '_parent',
+                'name' => 'media.types.*',
+                'form_field' => false
+            ],
+            'media.types.*.type' => [
+                'type' => 'text',
+                'label' => 'PLUGIN_ADMIN.TYPE',
+                'name' => 'media.types.*.type',
+                'validation' => 'loose'
+            ],
+            'media.types.*.thumb' => [
+                'type' => 'text',
+                'label' => 'PLUGIN_ADMIN.THUMB',
+                'name' => 'media.types.*.thumb',
+                'validation' => 'loose'
+            ],
+            'media.types.*.mime' => [
+                'type' => 'text',
+                'label' => 'PLUGIN_ADMIN.MIME_TYPE',
+                'validate' => [
+                    'type' => 'lower'
+                ],
+                'name' => 'media.types.*.mime',
+                'validation' => 'loose'
+            ],
+            'media.types.*.image' => [
+                'type' => 'textarea',
+                'yaml' => true,
+                'label' => 'PLUGIN_ADMIN.IMAGE_OPTIONS',
+                'validate' => [
+                    'type' => 'yaml'
+                ],
+                'name' => 'media.types.*.image',
+                'validation' => 'loose'
+            ],
             'site' => [
                 'type' => '_root',
                 'form_field' => false,
@@ -116,17 +169,10 @@ return [
                 'name' => 'site.taxonomies',
                 'validation' => 'loose'
             ],
-            'site.content' => [
-                'type' => 'section',
-                'underline' => true,
-                'name' => 'site.content',
-                'validation' => 'loose'
-            ],
             'site.summary' => [
-                'type' => 'section',
-                'underline' => true,
+                'type' => '_parent',
                 'name' => 'site.summary',
-                'validation' => 'loose'
+                'form_field' => false
             ],
             'site.summary.enabled' => [
                 'type' => 'toggle',
@@ -175,8 +221,8 @@ return [
                 'validation' => 'loose'
             ],
             'site.metadata' => [
-                'type' => 'section',
-                'underline' => true,
+                'type' => 'array',
+                'label' => 'PLUGIN_ADMIN.METADATA',
                 'name' => 'site.metadata',
                 'validation' => 'loose'
             ],
@@ -187,8 +233,8 @@ return [
                 'validation' => 'loose'
             ],
             'site.routes' => [
-                'type' => 'section',
-                'underline' => true,
+                'type' => 'array',
+                'label' => 'PLUGIN_ADMIN.CUSTOM_ROUTES',
                 'name' => 'site.routes',
                 'validation' => 'loose'
             ],
@@ -582,17 +628,10 @@ return [
                 'name' => 'system.pages.frontmatter.ignore_fields',
                 'validation' => 'loose'
             ],
-            'system.content' => [
-                'type' => 'section',
-                'underline' => true,
-                'name' => 'system.content',
-                'validation' => 'loose'
-            ],
             'system.languages' => [
-                'type' => 'section',
-                'underline' => true,
+                'type' => '_parent',
                 'name' => 'system.languages',
-                'validation' => 'loose'
+                'form_field' => false
             ],
             'system.languages.supported' => [
                 'type' => 'selectize',
@@ -750,12 +789,6 @@ return [
                 'name' => 'system.pages.vary_accept_encoding',
                 'validation' => 'loose'
             ],
-            'system.http_headers' => [
-                'type' => 'section',
-                'underline' => true,
-                'name' => 'system.http_headers',
-                'validation' => 'loose'
-            ],
             'system.pages.markdown' => [
                 'type' => '_parent',
                 'name' => 'system.pages.markdown',
@@ -817,12 +850,6 @@ return [
                 'name' => 'system.pages.markdown.escape_markup',
                 'validation' => 'loose'
             ],
-            'system.markdown' => [
-                'type' => 'section',
-                'underline' => true,
-                'name' => 'system.markdown',
-                'validation' => 'loose'
-            ],
             'system.cache' => [
                 'type' => '_parent',
                 'name' => 'system.cache',
@@ -1025,17 +1052,10 @@ return [
                 'name' => 'system.cache.redis.password',
                 'validation' => 'loose'
             ],
-            'system.caching' => [
-                'type' => 'section',
-                'underline' => true,
-                'name' => 'system.caching',
-                'validation' => 'loose'
-            ],
             'system.twig' => [
-                'type' => 'section',
-                'underline' => true,
+                'type' => '_parent',
                 'name' => 'system.twig',
-                'validation' => 'loose'
+                'form_field' => false
             ],
             'system.twig.cache' => [
                 'type' => 'toggle',
@@ -1108,10 +1128,9 @@ return [
                 'validation' => 'loose'
             ],
             'system.assets' => [
-                'type' => 'section',
-                'underline' => true,
+                'type' => '_parent',
                 'name' => 'system.assets',
-                'validation' => 'loose'
+                'form_field' => false
             ],
             'system.assets.css_pipeline' => [
                 'type' => 'toggle',
@@ -1277,10 +1296,9 @@ return [
                 'validation' => 'loose'
             ],
             'system.errors' => [
-                'type' => 'section',
-                'underline' => true,
+                'type' => '_parent',
                 'name' => 'system.errors',
-                'validation' => 'loose'
+                'form_field' => false
             ],
             'system.errors.display' => [
                 'type' => 'select',
@@ -1313,10 +1331,9 @@ return [
                 'validation' => 'loose'
             ],
             'system.debugger' => [
-                'type' => 'section',
-                'underline' => true,
+                'type' => '_parent',
                 'name' => 'system.debugger',
-                'validation' => 'loose'
+                'form_field' => false
             ],
             'system.debugger.enabled' => [
                 'type' => 'toggle',
@@ -1422,10 +1439,9 @@ return [
                 'validation' => 'loose'
             ],
             'system.media' => [
-                'type' => 'section',
-                'underline' => true,
+                'type' => '_parent',
                 'name' => 'system.media',
-                'validation' => 'loose'
+                'form_field' => false
             ],
             'system.media.enable_media_timestamp' => [
                 'type' => 'toggle',
@@ -1478,10 +1494,9 @@ return [
                 'validation' => 'loose'
             ],
             'system.session' => [
-                'type' => 'section',
-                'underline' => true,
+                'type' => '_parent',
                 'name' => 'system.session',
-                'validation' => 'loose'
+                'form_field' => false
             ],
             'system.session.enabled' => [
                 'type' => 'hidden',
@@ -1752,12 +1767,6 @@ return [
                 'name' => 'system.custom_base_url',
                 'validation' => 'loose'
             ],
-            'system.advanced' => [
-                'type' => 'section',
-                'underline' => true,
-                'name' => 'system.advanced',
-                'validation' => 'loose'
-            ],
             'plugins.admin' => [
                 'type' => '_root',
                 'form_field' => false,
@@ -1770,12 +1779,6 @@ return [
                 'name' => 'plugins',
                 'form_field' => false
             ],
-            'plugins.admin.Basics' => [
-                'type' => 'section',
-                'underline' => false,
-                'name' => 'plugins.admin.Basics',
-                'validation' => 'loose'
-            ],
             'plugins.admin.enabled' => [
                 'type' => 'hidden',
                 'label' => 'PLUGIN_ADMIN.PLUGIN_STATUS',
@@ -2074,19 +2077,6 @@ return [
                 'name' => 'plugins.admin.hide_modular_page_types',
                 'validation' => 'loose'
             ],
-            'plugins.admin.MediaResize' => [
-                'type' => 'section',
-                'underline' => true,
-                'name' => 'plugins.admin.MediaResize',
-                'validation' => 'loose'
-            ],
-            'plugins.admin.MediaResizeNote' => [
-                'type' => 'spacer',
-                'text' => 'PLUGIN_ADMIN.PAGEMEDIA_RESIZER',
-                'markdown' => true,
-                'name' => 'plugins.admin.MediaResizeNote',
-                'validation' => 'loose'
-            ],
             'plugins.admin.pagemedia' => [
                 'type' => '_parent',
                 'name' => 'plugins.admin.pagemedia',
@@ -2177,12 +2167,6 @@ return [
                 'name' => 'plugins.admin.pagemedia.resize_quality',
                 'validation' => 'loose'
             ],
-            'plugins.admin.Dashboard' => [
-                'type' => 'section',
-                'underline' => true,
-                'name' => 'plugins.admin.Dashboard',
-                'validation' => 'loose'
-            ],
             'plugins.admin.widgets' => [
                 'type' => '_parent',
                 'name' => 'plugins.admin.widgets',
@@ -2263,12 +2247,6 @@ return [
                 'name' => 'plugins.admin.widgets.dashboard-pages',
                 'validation' => 'loose'
             ],
-            'plugins.admin.Notifications' => [
-                'type' => 'section',
-                'underline' => true,
-                'name' => 'plugins.admin.Notifications',
-                'validation' => 'loose'
-            ],
             'plugins.admin.notifications' => [
                 'type' => '_parent',
                 'name' => 'plugins.admin.notifications',
@@ -2334,12 +2312,6 @@ return [
                 'name' => 'plugins.admin.notifications.themes',
                 'validation' => 'loose'
             ],
-            'plugins.admin.Popularity' => [
-                'type' => 'section',
-                'underline' => true,
-                'name' => 'plugins.admin.Popularity',
-                'validation' => 'loose'
-            ],
             'plugins.admin.popularity' => [
                 'type' => '_parent',
                 'name' => 'plugins.admin.popularity',
@@ -2560,15 +2532,10 @@ return [
                 'name' => 'plugins.form.inline_errors',
                 'validation' => 'strict'
             ],
-            'plugins.form.general' => [
-                'type' => 'section',
-                'name' => 'plugins.form.general',
-                'validation' => 'strict'
-            ],
             'plugins.form.files' => [
-                'type' => 'section',
+                'type' => '_parent',
                 'name' => 'plugins.form.files',
-                'validation' => 'strict'
+                'form_field' => false
             ],
             'plugins.form.files.multiple' => [
                 'type' => 'toggle',
@@ -2662,9 +2629,9 @@ return [
                 'validation' => 'strict'
             ],
             'plugins.form.recaptcha' => [
-                'type' => 'section',
+                'type' => '_parent',
                 'name' => 'plugins.form.recaptcha',
-                'validation' => 'strict'
+                'form_field' => false
             ],
             'plugins.form.recaptcha.site_key' => [
                 'type' => 'text',
@@ -2833,15 +2800,10 @@ return [
                 'name' => 'plugins.login.user_registration.redirect_after_activation',
                 'validation' => 'loose'
             ],
-            'plugins.login.routes' => [
-                'type' => 'section',
-                'name' => 'plugins.login.routes',
-                'validation' => 'loose'
-            ],
             'plugins.login.rememberme' => [
-                'type' => 'section',
+                'type' => '_parent',
                 'name' => 'plugins.login.rememberme',
-                'validation' => 'loose'
+                'form_field' => false
             ],
             'plugins.login.rememberme.enabled' => [
                 'type' => 'toggle',
@@ -2876,11 +2838,6 @@ return [
                 'name' => 'plugins.login.rememberme.name',
                 'validation' => 'loose'
             ],
-            'plugins.login.login' => [
-                'type' => 'tab',
-                'name' => 'plugins.login.login',
-                'validation' => 'loose'
-            ],
             'plugins.login.user_registration.enabled' => [
                 'type' => 'toggle',
                 'label' => 'PLUGIN_ADMIN.ENABLED',
@@ -2908,11 +2865,6 @@ return [
                 'name' => 'plugins.login.user_registration.default_values',
                 'validation' => 'loose'
             ],
-            'plugins.login.registration_fields' => [
-                'type' => 'section',
-                'name' => 'plugins.login.registration_fields',
-                'validation' => 'loose'
-            ],
             'plugins.login.user_registration.groups' => [
                 'type' => 'selectize',
                 'size' => 'large',
@@ -2940,12 +2892,6 @@ return [
                 'name' => 'plugins.login.user_registration.access.site',
                 'validation' => 'loose'
             ],
-            'plugins.login.access_levels' => [
-                'type' => 'section',
-                'security' => 'admin.super',
-                'name' => 'plugins.login.access_levels',
-                'validation' => 'loose'
-            ],
             'plugins.login.user_registration.options' => [
                 'type' => '_parent',
                 'name' => 'plugins.login.user_registration.options',
@@ -3032,16 +2978,6 @@ return [
                 'name' => 'plugins.login.user_registration.options.send_welcome_email',
                 'validation' => 'loose'
             ],
-            'plugins.login.options' => [
-                'type' => 'section',
-                'name' => 'plugins.login.options',
-                'validation' => 'loose'
-            ],
-            'plugins.login.registration' => [
-                'type' => 'tab',
-                'name' => 'plugins.login.registration',
-                'validation' => 'loose'
-            ],
             'plugins.login.max_pw_resets_count' => [
                 'type' => 'number',
                 'size' => 'x-small',
@@ -3090,18 +3026,6 @@ return [
                 'name' => 'plugins.login.max_login_interval',
                 'validation' => 'loose'
             ],
-            'plugins.login.Security' => [
-                'type' => 'tab',
-                'name' => 'plugins.login.Security',
-                'validation' => 'loose'
-            ],
-            'plugins.login.tabs' => [
-                'type' => 'tabs',
-                'active' => 1,
-                'class' => 'subtle',
-                'name' => 'plugins.login.tabs',
-                'validation' => 'loose'
-            ],
             'plugins.error' => [
                 'type' => '_root',
                 'form_field' => false,
@@ -3405,9 +3329,17 @@ return [
             
         ],
         'nested' => [
-            'media' => 'media',
+            'media' => [
+                'types' => [
+                    '*' => [
+                        'type' => 'media.types.*.type',
+                        'thumb' => 'media.types.*.thumb',
+                        'mime' => 'media.types.*.mime',
+                        'image' => 'media.types.*.image'
+                    ]
+                ]
+            ],
             'site' => [
-                'content' => 'site.content',
                 'title' => 'site.title',
                 'default_lang' => 'site.default_lang',
                 'author' => [
@@ -3422,8 +3354,8 @@ return [
                     'delimiter' => 'site.summary.delimiter'
                 ],
                 'metadata' => 'site.metadata',
-                'routes' => 'site.routes',
-                'redirects' => 'site.redirects'
+                'redirects' => 'site.redirects',
+                'routes' => 'site.routes'
             ],
             'streams' => [
                 'schemes' => [
@@ -3431,7 +3363,6 @@ return [
                 ]
             ],
             'system' => [
-                'content' => 'system.content',
                 'home' => [
                     'alias' => 'system.home.alias',
                     'hide_in_urls' => 'system.home.hide_in_urls'
@@ -3489,9 +3420,6 @@ return [
                     'http_accept_language' => 'system.languages.http_accept_language',
                     'override_locale' => 'system.languages.override_locale'
                 ],
-                'http_headers' => 'system.http_headers',
-                'markdown' => 'system.markdown',
-                'caching' => 'system.caching',
                 'cache' => [
                     'enabled' => 'system.cache.enabled',
                     'check' => [
@@ -3550,12 +3478,6 @@ return [
                         'close_connection' => 'system.debugger.shutdown.close_connection'
                     ]
                 ],
-                'media' => [
-                    'enable_media_timestamp' => 'system.media.enable_media_timestamp',
-                    'auto_metadata_exif' => 'system.media.auto_metadata_exif',
-                    'allowed_fallback_types' => 'system.media.allowed_fallback_types',
-                    'unsupported_inline_types' => 'system.media.unsupported_inline_types'
-                ],
                 'images' => [
                     'default_image_quality' => 'system.images.default_image_quality',
                     'cache_all' => 'system.images.cache_all',
@@ -3563,6 +3485,12 @@ return [
                     'debug' => 'system.images.debug',
                     'auto_fix_orientation' => 'system.images.auto_fix_orientation'
                 ],
+                'media' => [
+                    'enable_media_timestamp' => 'system.media.enable_media_timestamp',
+                    'auto_metadata_exif' => 'system.media.auto_metadata_exif',
+                    'allowed_fallback_types' => 'system.media.allowed_fallback_types',
+                    'unsupported_inline_types' => 'system.media.unsupported_inline_types'
+                ],
                 'session' => [
                     'enabled' => 'system.session.enabled',
                     'timeout' => 'system.session.timeout',
@@ -3572,7 +3500,6 @@ return [
                     'path' => 'system.session.path',
                     'split' => 'system.session.split'
                 ],
-                'advanced' => 'system.advanced',
                 'gpm' => [
                     'releases' => 'system.gpm.releases',
                     'proxy_url' => 'system.gpm.proxy_url',
@@ -3593,7 +3520,6 @@ return [
             ],
             'plugins' => [
                 'admin' => [
-                    'Basics' => 'plugins.admin.Basics',
                     'enabled' => 'plugins.admin.enabled',
                     'cache_enabled' => 'plugins.admin.cache_enabled',
                     'twofa_enabled' => 'plugins.admin.twofa_enabled',
@@ -3627,8 +3553,6 @@ return [
                     ],
                     'hide_page_types' => 'plugins.admin.hide_page_types',
                     'hide_modular_page_types' => 'plugins.admin.hide_modular_page_types',
-                    'MediaResize' => 'plugins.admin.MediaResize',
-                    'MediaResizeNote' => 'plugins.admin.MediaResizeNote',
                     'pagemedia' => [
                         'resize_width' => 'plugins.admin.pagemedia.resize_width',
                         'resize_height' => 'plugins.admin.pagemedia.resize_height',
@@ -3638,7 +3562,6 @@ return [
                         'res_max_height' => 'plugins.admin.pagemedia.res_max_height',
                         'resize_quality' => 'plugins.admin.pagemedia.resize_quality'
                     ],
-                    'Dashboard' => 'plugins.admin.Dashboard',
                     'widgets' => [
                         'dashboard-maintenance' => 'plugins.admin.widgets.dashboard-maintenance',
                         'dashboard-statistics' => 'plugins.admin.widgets.dashboard-statistics',
@@ -3646,14 +3569,12 @@ return [
                         'dashboard-feed' => 'plugins.admin.widgets.dashboard-feed',
                         'dashboard-pages' => 'plugins.admin.widgets.dashboard-pages'
                     ],
-                    'Notifications' => 'plugins.admin.Notifications',
                     'notifications' => [
                         'feed' => 'plugins.admin.notifications.feed',
                         'dashboard' => 'plugins.admin.notifications.dashboard',
                         'plugins' => 'plugins.admin.notifications.plugins',
                         'themes' => 'plugins.admin.notifications.themes'
                     ],
-                    'Popularity' => 'plugins.admin.Popularity',
                     'popularity' => [
                         'enabled' => 'plugins.admin.popularity.enabled',
                         'ignore' => 'plugins.admin.popularity.ignore',
@@ -3674,7 +3595,6 @@ return [
                 ],
                 'form' => [
                     'enabled' => 'plugins.form.enabled',
-                    'general' => 'plugins.form.general',
                     'built_in_css' => 'plugins.form.built_in_css',
                     'inline_css' => 'plugins.form.inline_css',
                     'refresh_prevention' => 'plugins.form.refresh_prevention',
@@ -3695,8 +3615,6 @@ return [
                     ]
                 ],
                 'login' => [
-                    'tabs' => 'plugins.login.tabs',
-                    'login' => 'plugins.login.login',
                     'enabled' => 'plugins.login.enabled',
                     'built_in_css' => 'plugins.login.built_in_css',
                     'route' => 'plugins.login.route',
@@ -3708,7 +3626,6 @@ return [
                     'parent_acl' => 'plugins.login.parent_acl',
                     'dynamic_page_visibility' => 'plugins.login.dynamic_page_visibility',
                     'protect_protected_page_media' => 'plugins.login.protect_protected_page_media',
-                    'routes' => 'plugins.login.routes',
                     'route_activate' => 'plugins.login.route_activate',
                     'route_register' => 'plugins.login.route_register',
                     'user_registration' => [
@@ -3735,11 +3652,6 @@ return [
                         'timeout' => 'plugins.login.rememberme.timeout',
                         'name' => 'plugins.login.rememberme.name'
                     ],
-                    'registration' => 'plugins.login.registration',
-                    'registration_fields' => 'plugins.login.registration_fields',
-                    'access_levels' => 'plugins.login.access_levels',
-                    'options' => 'plugins.login.options',
-                    'Security' => 'plugins.login.Security',
                     'max_pw_resets_count' => 'plugins.login.max_pw_resets_count',
                     'max_pw_resets_interval' => 'plugins.login.max_pw_resets_interval',
                     'max_login_count' => 'plugins.login.max_login_count',

+ 7 - 7
cache/compiled/config/master-dev.r2c.net.php

@@ -1,8 +1,8 @@
 <?php
 return [
     '@class' => 'Grav\\Common\\Config\\CompiledConfig',
-    'timestamp' => 1530525683,
-    'checksum' => '081c4d2482f9c21109c135564922b00c',
+    'timestamp' => 1530607689,
+    'checksum' => '549a992c6de56f113adb76ff05144552',
     'files' => [
         'user/config' => [
             'media' => [
@@ -15,7 +15,7 @@ return [
             ],
             'site' => [
                 'file' => 'user/config/site.yaml',
-                'modified' => 1529476888
+                'modified' => 1530607689
             ],
             'streams' => [
                 'file' => 'user/config/streams.yaml',
@@ -519,18 +519,18 @@ return [
             ]
         ],
         'site' => [
-            'title' => 'Grav',
+            'title' => 'r2c',
             'default_lang' => 'en',
             'author' => [
-                'name' => 'Joe Bloggs',
-                'email' => 'joe@example.com'
+                'name' => 'Kevin Tessier',
+                'email' => 'kevin@figureslibres.io'
             ],
             'taxonomies' => [
                 0 => 'category',
                 1 => 'tag'
             ],
             'metadata' => [
-                'description' => 'Grav is an easy to use, yet powerful, open source flat-file CMS'
+                'description' => 'R2C'
             ],
             'summary' => [
                 'enabled' => true,

+ 22 - 0
cache/compiled/files/ad12a3f8db5a78d537d0815f33e4e026.yaml.php

@@ -0,0 +1,22 @@
+<?php
+return [
+    '@class' => 'Grav\\Common\\File\\CompiledYamlFile',
+    'filename' => '/mnt/data/Sites/r2c.net/user/accounts/admin.yaml',
+    'modified' => 1530517073,
+    'data' => [
+        'email' => 'kevin@figureslibres.io',
+        'fullname' => 'Kévin Tessier',
+        'title' => 'Administrator',
+        'state' => 'enabled',
+        'access' => [
+            'admin' => [
+                'login' => true,
+                'super' => true
+            ],
+            'site' => [
+                'login' => true
+            ]
+        ],
+        'hashed_password' => '$2y$10$Y3Nmqv.R9JKjvYicyX.pjep.UYP6p4Y05tp1lGJyYpwxIRmr9BIT6'
+    ]
+];

+ 0 - 0
cache/problem-check-g-685a0067 → cache/problem-check-g-73ece062


+ 1 - 1
logs/popularity/daily.json

@@ -1 +1 @@
-{"02-07-2018":140}
+{"02-07-2018":140,"03-07-2018":176}

+ 1 - 1
logs/popularity/monthly.json

@@ -1 +1 @@
-{"07-2018":140}
+{"07-2018":316}

+ 1 - 1
logs/popularity/totals.json

@@ -1 +1 @@
-{"\/":140}
+{"\/":316}

+ 1 - 1
logs/popularity/visitors.json

@@ -1 +1 @@
-{"4b84b15bff6ee5796152495a230e45e3d7e947d9":1530538441}
+{"4b84b15bff6ee5796152495a230e45e3d7e947d9":1530632643}

+ 15 - 5
user/config/site.yaml

@@ -1,7 +1,17 @@
-title: Grav
+title: r2c
+default_lang: en
 author:
-  name: Joe Bloggs
-  email: 'joe@example.com'
+  name: 'Kevin Tessier'
+  email: kevin@figureslibres.io
+taxonomies:
+  - category
+  - tag
 metadata:
-    description: 'Grav is an easy to use, yet powerful, open source flat-file CMS'
-
+  description: R2C
+summary:
+  enabled: true
+  format: short
+  size: 300
+  delimiter: '==='
+blog:
+  route: /blog

File diff ditekan karena terlalu besar
+ 1 - 2
user/themes/r2c/css-compiled/template.css


File diff ditekan karena terlalu besar
+ 0 - 1
user/themes/r2c/css-compiled/template.min.css


File diff ditekan karena terlalu besar
+ 3 - 0
user/themes/r2c/css/jquery-ui.css


+ 31 - 10
user/themes/r2c/js/site.js

@@ -1,14 +1,35 @@
-// function resizable() {
-//   $( "#start > div" ).resizable();
-//
-// };
+function wrap(){
+  $('#start > div:nth-child(-n+3)').wrapAll('<div class="top"></div> ')
+  $('#start > div:nth-child(n+2)').wrapAll('<div class="bottom"></div> ')
+};
 
 $(document).ready(function() {
-  $( function() {
-    $( "#start > div " ).resizable({
-      resetAxes: true,
-      maxWidth: 1000,
-      minWidth: 300
+  wrap();
+
+  $(window).on("load resize", function() {
+
+    var windowWidth = $(window).width();
+    var windowHeight = $(window).height();
+    var v1Width = $("#récit").width()
+
+
+    $("#récit").resizable({
+      minWidth: 50,
+      maxWidth: windowWidth - 80,
+      maxHeight: windowHeight * (.83)
+    }).on("#resize", function() {
+
+      if (v1Width == $("#récit").width()) {
+        $("#interview").height(0)
+      }
+      v1Width = $("#interview").width()
+    });
+
+    $("#interview").resizable({
+      maxHeight: windowHeight * (.83)
+    }).on("#resize", function() {
+      $("#récit").height(0)
     });
-  } );
+  });
+
 });

+ 1 - 1
user/themes/r2c/scss/template.scss

@@ -3,7 +3,7 @@
 @import "configuration/config";
 
 //reset$
-// @import "template/reset";
+@import "template/reset";
 
 // Typography
 // @import "template/typography";

+ 4 - 1
user/themes/r2c/scss/template/_reset.scss

@@ -30,9 +30,12 @@ footer, header, hgroup, menu, nav, section {
 	display: block;
 }
 
+html, body{
+  height: 100%;
+}
+
 body {
 	line-height: 1;
-	margin: 0 10%;
 }
 
 ol, ul {

+ 27 - 16
user/themes/r2c/scss/template/_section.scss

@@ -1,20 +1,31 @@
-#page-wrapper{
-  #start{
-      display: inline-flex;
-      flex-wrap: wrap;
+  #page{
+    height: 100%;
+    #start{
       width: 100%;
-      height: 100%;
-      position: relative;
-      & > div{
-        width: 500px;
-        height: 50%;
-        text-align: center;
-        outline: 1px solid #ccc;
+      // height: 100%;
+      display: table;
+      height: 90%;
+
+      // display: inline-grid;
+      // grid-template-columns: 33% 33% 33%;
+      // grid-template-rows: auto auto;
+      // justify-items: stretch;
+      // align-items: stretch;
+      // justify-content: stretch;
+      // display: flex;
+      // align-content: stretch;
+      & > div {
+        display: table-row;
         & > div {
-          background: red;
-          width: 10px;
-          height: 10px;
-        }
+          display: table-cell;
+          text-align: center;
+          outline: 1px solid black;
         }
+        // width: calc(100% / 3);
+        // // height: 50%;
+      }
+      .ui-icon, .ui-widget-content .ui-icon{
+        background: red;
+      }
     }
-}
+  }

+ 5 - 5
user/themes/r2c/templates/modular.html.twig

@@ -47,9 +47,9 @@
 {% endblock %} #}
 
 {% block body %}
-    {% for module in page.collection() if module.template != 'modular/hero' %}
-        <div id="{{ _self.pageLinkName(module.menu) }}">
-        {{ module.content }}
-        </div>
-    {% endfor %}
+      {% for module in page.collection if module.template != 'modular/hero' %}  
+          <div id="{{ _self.pageLinkName(module.menu) }}">
+            {{ module.content }}
+          </div>
+      {% endfor %}
 {% endblock %}

+ 3 - 3
user/themes/r2c/templates/modular/text.html.twig

@@ -1,6 +1,6 @@
 {% set grid_size = theme_var('grid-size') %}
 {% set image = page.media.images|first %}
 
-<section id="modular-text" class="section {{ page.header.class}} bg-gray">
-    {{ content }}
-</section>
+  <section id="modular-text" class="{{ page.header.class}}">
+      {{ content }}
+  </section>

+ 12 - 18
user/themes/r2c/templates/partials/base.html.twig

@@ -7,19 +7,19 @@
 {% block head %}
     <meta charset="utf-8" />
     <title>{% if header.title %}{{ header.title|e('html') }} | {% endif %}{{ site.title|e('html') }}</title>
-
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+
     {% include 'partials/metadata.html.twig' %}
 
     <link rel="icon" type="image/png" href="{{ url('theme://images/favicon.png') }}" />
     <link rel="canonical" href="{{ page.url(true, true) }}" />
 
     {% block stylesheets %}
-
-        {% do assets.addCss('theme://css-compiled/template.css') %}
-
+      {% do assets.addCss('theme://css/jquery-ui.css') %}
+      {% do assets.addCss('theme://css-compiled/template.css') %}
     {% endblock %}
+
     {{ assets.css() }}
 
     {% block javascripts %}
@@ -27,32 +27,26 @@
         {% do assets.addJs('theme://js/jquery-ui.js', {group:'bottom'}) %}
         {% do assets.addJs('theme://js/site.js', {group:'bottom'}) %}
     {% endblock %}
+
     {{ assets.js() }}
 
 {% endblock head %}
 </head>
-<body id="top" class="{% block body_classes %}{{ body_classes }}{% endblock %}">
-    <div id="page-wrapper">
+<body id="top">
+    <div id="page">
     {% block header %}
         <section id="header" class="section">
-            <section class="container {{ grid_size }}">
                 <nav class="navbar">
-                    <section class="navbar-section logo">
-                        <a href="{{ home_url }}" class="navbar-brand mr-10">{% include('@images/grav-logo.svg') %}</a>
-                    </section>
+                    <a href="{{ home_url }}" class="navbar-brand mr-10">{{site.title}}</a>
                     <section class="navbar-section">
-
-                        <nav class="dropmenu animated">
-                            {% block header_navigation %}
-                        {% include 'partials/navigation.html.twig' %}
-                            {% endblock %}
+                        <nav>
+                          {% block header_navigation %}
+                            {% include 'partials/navigation.html.twig' %}
+                          {% endblock %}
                         </nav>
-
                         {% if config.plugins.login.enabled and grav.user.username %}
                             <span class="login-status-wrapper"><i class="fa fa-user"></i> {% include 'partials/login-status.html.twig' %}</span>
                         {% endif %}
-
-                    </section>
                 </nav>
             </section>
         </section>

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini