From 41717783acbfcd938abbbb5470d882a1c173a818 Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Mon, 23 Apr 2018 23:35:26 +0200 Subject: [PATCH] agenda dates displaying ok --- .../edlptheme/assets/dist/styles/app.min.css | 16 ++++ .../custom/edlptheme/assets/styles/app.scss | 14 +++ .../templates/content/edlp-agenda.html.twig | 13 +-- .../content/node--evenement--teaser.html.twig | 94 +++++++++++++++++++ .../content/old__edlp-agenda.html.twig | 15 +++ ...tity_view_display.node.evenement.aside.yml | 10 +- ...ty_view_display.node.evenement.default.yml | 4 +- ...ity_view_display.node.evenement.teaser.yml | 12 +-- sites/default/config/sync/piwik.settings.yml | 44 +++++++-- 9 files changed, 187 insertions(+), 35 deletions(-) create mode 100644 sites/all/themes/custom/edlptheme/templates/content/node--evenement--teaser.html.twig create mode 100644 sites/all/themes/custom/edlptheme/templates/content/old__edlp-agenda.html.twig diff --git a/sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css b/sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css index 99cb7e1b2..054483009 100644 --- a/sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css +++ b/sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css @@ -1283,6 +1283,22 @@ main[role="main"] .agenda { font-weight: normal; line-height: 1.4; } +main[role="main"] article.node--type-evenement.node--view-mode-teaser .field--name-field-page-liee { + font-size: 0.82em; + font-weight: 600; + line-height: 1.6; + text-transform: none; } + +main[role="main"] article.node--type-evenement.node--view-mode-teaser .field--name-field-date { + font-size: 0.82em; + font-weight: normal; + line-height: 1.4; } + +main[role="main"] article.node--type-evenement.node--view-mode-teaser .field--name-title { + font-size: 0.82em; + font-weight: normal; + line-height: 1.4; } + main[role="main"] div.taxonomy-term > h2 { font-size: 0.82em; font-weight: 600; diff --git a/sites/all/themes/custom/edlptheme/assets/styles/app.scss b/sites/all/themes/custom/edlptheme/assets/styles/app.scss index 46f051dab..37f14c0e4 100644 --- a/sites/all/themes/custom/edlptheme/assets/styles/app.scss +++ b/sites/all/themes/custom/edlptheme/assets/styles/app.scss @@ -348,7 +348,19 @@ main[role="main"]{ @include content_courant; } } + } + article.node--type-evenement.node--view-mode-teaser{ + .field--name-field-page-liee{ + @include content_subtitles; + } + .field--name-field-date{ + @include content_courant; + } + .field--name-title{ + @include content_courant; + } + // .field--name-body{} } div.taxonomy-term{ @@ -439,6 +451,8 @@ main[role="main"]{ } } + + img{ max-width: 100%; height: auto; diff --git a/sites/all/themes/custom/edlptheme/templates/content/edlp-agenda.html.twig b/sites/all/themes/custom/edlptheme/templates/content/edlp-agenda.html.twig index 0fdd0095d..8649306ee 100644 --- a/sites/all/themes/custom/edlptheme/templates/content/edlp-agenda.html.twig +++ b/sites/all/themes/custom/edlptheme/templates/content/edlp-agenda.html.twig @@ -1,15 +1,8 @@ -
+
- {{ coming_events }} - {{ past_events }} -
-
-
-
-
-
- {{ next_event }} + {{ coming_events }} + {{ past_events }}
diff --git a/sites/all/themes/custom/edlptheme/templates/content/node--evenement--teaser.html.twig b/sites/all/themes/custom/edlptheme/templates/content/node--evenement--teaser.html.twig new file mode 100644 index 000000000..73cd1d544 --- /dev/null +++ b/sites/all/themes/custom/edlptheme/templates/content/node--evenement--teaser.html.twig @@ -0,0 +1,94 @@ +{# +/** + * @file + * Theme override to display a node. + * + * Available variables: + * - node: The node entity with limited access to object properties and methods. + * Only method names starting with "get", "has", or "is" and a few common + * methods such as "id", "label", and "bundle" are available. For example: + * - node.getCreatedTime() will return the node creation timestamp. + * - node.hasField('field_example') returns TRUE if the node bundle includes + * field_example. (This does not indicate the presence of a value in this + * field.) + * - node.isPublished() will return whether the node is published or not. + * Calling other methods, such as node.delete(), will result in an exception. + * See \Drupal\node\Entity\Node for a full list of public properties and + * methods for the node object. + * - label: The title of the node. + * - content: All node items. Use {{ content }} to print them all, + * or print a subset such as {{ content.field_example }}. Use + * {{ content|without('field_example') }} to temporarily suppress the printing + * of a given child element. + * - author_picture: The node author user entity, rendered using the "compact" + * view mode. + * - metadata: Metadata for this node. + * - date: Themed creation date field. + * - author_name: Themed author name field. + * - url: Direct URL of the current node. + * - display_submitted: Whether submission information should be displayed. + * - attributes: HTML attributes for the containing element. + * The attributes.class element may contain one or more of the following + * classes: + * - node: The current template type (also known as a "theming hook"). + * - node--type-[type]: The current node type. For example, if the node is an + * "Article" it would result in "node--type-article". Note that the machine + * name will often be in a short form of the human readable label. + * - node--view-mode-[view_mode]: The View Mode of the node; for example, a + * teaser would result in: "node--view-mode-teaser", and + * full: "node--view-mode-full". + * The following are controlled through the node publishing options. + * - node--promoted: Appears on nodes promoted to the front page. + * - node--sticky: Appears on nodes ordered above other non-sticky nodes in + * teaser listings. + * - node--unpublished: Appears on unpublished nodes visible only to site + * admins. + * - title_attributes: Same as attributes, except applied to the main title + * tag that appears in the template. + * - content_attributes: Same as attributes, except applied to the main + * content tag that appears in the template. + * - author_attributes: Same as attributes, except applied to the author of + * the node tag that appears in the template. + * - title_prefix: Additional output populated by modules, intended to be + * displayed in front of the main title tag that appears in the template. + * - title_suffix: Additional output populated by modules, intended to be + * displayed after the main title tag that appears in the template. + * - view_mode: View mode; for example, "teaser" or "full". + * - teaser: Flag for the teaser state. Will be true if view_mode is 'teaser'. + * - page: Flag for the full page state. Will be true if view_mode is 'full'. + * - readmore: Flag for more state. Will be true if the teaser content of the + * node cannot hold the main body content. + * - logged_in: Flag for authenticated user status. Will be true when the + * current user is a logged-in member. + * - is_admin: Flag for admin user status. Will be true when the current user + * is an administrator. + * + * @see template_preprocess_node() + * + * @todo Remove the id attribute (or make it a class), because if that gets + * rendered twice on a page this is invalid CSS for example: two lists + * in different view modes. + */ +#} +{% + set classes = [ + 'node', + 'node--type-' ~ node.bundle|clean_class, + node.isPromoted() ? 'node--promoted', + node.isSticky() ? 'node--sticky', + not node.isPublished() ? 'node--unpublished', + view_mode ? 'node--view-mode-' ~ view_mode|clean_class, + ] +%} +{{ attach_library('classy/node') }} + + + {{ content.field_page_liee }} + + {{ content.field_date }} + + {{ label }} + + {{ content|without('field_page_liee')|without('field_date') }} + + diff --git a/sites/all/themes/custom/edlptheme/templates/content/old__edlp-agenda.html.twig b/sites/all/themes/custom/edlptheme/templates/content/old__edlp-agenda.html.twig new file mode 100644 index 000000000..0fdd0095d --- /dev/null +++ b/sites/all/themes/custom/edlptheme/templates/content/old__edlp-agenda.html.twig @@ -0,0 +1,15 @@ +
+
+
+ {{ coming_events }} + {{ past_events }} +
+
+
+
+
+
+ {{ next_event }} +
+
+
diff --git a/sites/default/config/sync/core.entity_view_display.node.evenement.aside.yml b/sites/default/config/sync/core.entity_view_display.node.evenement.aside.yml index 34efc513f..b514fb1e3 100644 --- a/sites/default/config/sync/core.entity_view_display.node.evenement.aside.yml +++ b/sites/default/config/sync/core.entity_view_display.node.evenement.aside.yml @@ -20,13 +20,13 @@ mode: aside content: body: type: text_default - weight: 2 + weight: 1 region: content label: hidden settings: { } third_party_settings: { } field_date: - weight: 1 + weight: 0 label: hidden settings: timezone_override: '' @@ -35,12 +35,8 @@ content: third_party_settings: { } type: daterange_custom region: content - links: - weight: 0 - region: content - settings: { } - third_party_settings: { } hidden: field_page_liee: true field_workflow_generic: true langcode: true + links: true diff --git a/sites/default/config/sync/core.entity_view_display.node.evenement.default.yml b/sites/default/config/sync/core.entity_view_display.node.evenement.default.yml index e6d5ac5cc..9edd36865 100644 --- a/sites/default/config/sync/core.entity_view_display.node.evenement.default.yml +++ b/sites/default/config/sync/core.entity_view_display.node.evenement.default.yml @@ -35,7 +35,7 @@ content: type: daterange_custom region: content field_page_liee: - weight: 3 + weight: 0 label: hidden settings: link: true @@ -43,7 +43,7 @@ content: type: entity_reference_label region: content links: - weight: 0 + weight: 3 region: content settings: { } third_party_settings: { } diff --git a/sites/default/config/sync/core.entity_view_display.node.evenement.teaser.yml b/sites/default/config/sync/core.entity_view_display.node.evenement.teaser.yml index ce78b2865..4298b4486 100644 --- a/sites/default/config/sync/core.entity_view_display.node.evenement.teaser.yml +++ b/sites/default/config/sync/core.entity_view_display.node.evenement.teaser.yml @@ -21,7 +21,7 @@ content: body: label: hidden type: text_default - weight: 3 + weight: 2 settings: { } third_party_settings: { } region: content @@ -32,7 +32,7 @@ content: label: hidden settings: timezone_override: '' - date_format: 'l j F Y G\hi' + date_format: 'l j F Y' separator: '-' third_party_settings: { } field_page_liee: @@ -41,13 +41,9 @@ content: region: content label: hidden settings: - link: false - third_party_settings: { } - links: - weight: 2 - region: content - settings: { } + link: true third_party_settings: { } hidden: field_workflow_generic: true langcode: true + links: true diff --git a/sites/default/config/sync/piwik.settings.yml b/sites/default/config/sync/piwik.settings.yml index 5a8e89e4b..1c656b5f7 100644 --- a/sites/default/config/sync/piwik.settings.yml +++ b/sites/default/config/sync/piwik.settings.yml @@ -1,10 +1,10 @@ -site_id: '' -url_http: '' -url_https: '' -domain_mode: 0 +site_id: '1' +url_http: 'https://analytics.figureslibres.io/' +url_https: 'https://analytics.figureslibres.io/' +domain_mode: 1 visibility: request_path_mode: 0 - request_path_pages: "/admin\n/admin/*\n/batch\n/node/add*\n/node/*/*\n/user/*/*" + request_path_pages: "/admin\r\n/admin/*\r\n/batch\r\n/node/add*\r\n/node/*/*\r\n/user/*/*" user_role_mode: 0 user_role_roles: { } user_account_mode: 0 @@ -14,17 +14,45 @@ track: files_extensions: '7z|aac|arc|arj|asf|asx|avi|bin|csv|doc(x|m)?|dot(x|m)?|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mp(2|3|4|e?g)|mov(ie)?|msi|msp|pdf|phps|png|ppt(x|m)?|pot(x|m)?|pps(x|m)?|ppam|sld(x|m)?|thmx|qtm?|ra(m|r)?|sea|sit|tar|tgz|torrent|txt|wav|wma|wmv|wpd|xls(x|m|b)?|xlt(x|m)|xlam|xml|z|zip' colorbox: true userid: false - messages: { } + messages: + status: status + warning: warning + error: error site_search: false privacy: donottrack: true custom: - variable: { } + variable: + 1: + name: '' + value: '' + scope: visit + slot: 1 + 2: + name: '' + value: '' + scope: visit + slot: 2 + 3: + name: '' + value: '' + scope: visit + slot: 3 + 4: + name: '' + value: '' + scope: visit + slot: 4 + 5: + name: '' + value: '' + scope: visit + slot: 5 codesnippet: before: '' after: '' translation_set: false -cache: false +cache: true page_title_hierarchy: false page_title_hierarchy_exclude_home: true _core: