From ebea5b839dd949bf2eaeefca1cc6d63f8eecfcc9 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Tue, 3 Feb 2015 15:34:45 +0000
Subject: [PATCH] Issue #2349721 by lauriii, preshetin, wheatpenny, mortendk:
Copy node templates to Classy
---
.../templates/field--node--created.html.twig | 12 +-
.../templates/field--node--title.html.twig | 12 +-
.../node/templates/field--node--uid.html.twig | 12 +-
.../node/templates/node-add-list.html.twig | 2 +-
.../node/templates/node-edit-form.html.twig | 12 +-
core/modules/node/templates/node.html.twig | 26 +---
.../templates/field--node--created.html.twig | 38 ++++++
.../templates/field--node--title.html.twig | 38 ++++++
.../templates/field--node--uid.html.twig | 38 ++++++
.../classy/templates/node-add-list.html.twig | 32 +++++
.../classy/templates/node-edit-form.html.twig | 30 +++++
core/themes/classy/templates/node.html.twig | 111 ++++++++++++++++++
12 files changed, 298 insertions(+), 65 deletions(-)
create mode 100644 core/themes/classy/templates/field--node--created.html.twig
create mode 100644 core/themes/classy/templates/field--node--title.html.twig
create mode 100644 core/themes/classy/templates/field--node--uid.html.twig
create mode 100644 core/themes/classy/templates/node-add-list.html.twig
create mode 100644 core/themes/classy/templates/node-edit-form.html.twig
create mode 100644 core/themes/classy/templates/node.html.twig
diff --git a/core/modules/node/templates/field--node--created.html.twig b/core/modules/node/templates/field--node--created.html.twig
index 496d6b20d1e9..049144f50d95 100644
--- a/core/modules/node/templates/field--node--created.html.twig
+++ b/core/modules/node/templates/field--node--created.html.twig
@@ -21,17 +21,7 @@
* @ingroup themeable
*/
#}
-{% set field_name_class = field_name|clean_class %}
-{%
- set classes = [
- 'field',
- 'field-' ~ entity_type|clean_class ~ '--' ~ field_name_class,
- 'field-name-' ~ field_name_class,
- 'field-type-' ~ field_type|clean_class,
- 'field-label-' ~ label_display,
- ]
-%}
-<span{{ attributes.addClass(classes) }}>
+<span{{ attributes }}>
{%- for item in items -%}
{{ item.content }}
{%- endfor -%}
diff --git a/core/modules/node/templates/field--node--title.html.twig b/core/modules/node/templates/field--node--title.html.twig
index 5b37bfa72ab7..68142ca5d1b0 100644
--- a/core/modules/node/templates/field--node--title.html.twig
+++ b/core/modules/node/templates/field--node--title.html.twig
@@ -21,17 +21,7 @@
* @ingroup themeable
*/
#}
-{% set field_name_class = field_name|clean_class %}
-{%
- set classes = [
- 'field',
- 'field-' ~ entity_type|clean_class ~ '--' ~ field_name_class,
- 'field-name-' ~ field_name_class,
- 'field-type-' ~ field_type|clean_class,
- 'field-label-' ~ label_display,
- ]
-%}
-<span{{ attributes.addClass(classes) }}>
+<span{{ attributes }}>
{%- for item in items -%}
{{ item.content }}
{%- endfor -%}
diff --git a/core/modules/node/templates/field--node--uid.html.twig b/core/modules/node/templates/field--node--uid.html.twig
index 0798d7e7d213..91a97b3a9bf8 100644
--- a/core/modules/node/templates/field--node--uid.html.twig
+++ b/core/modules/node/templates/field--node--uid.html.twig
@@ -21,17 +21,7 @@
* @ingroup themeable
*/
#}
-{% set field_name_class = field_name|clean_class %}
-{%
- set classes = [
- 'field',
- 'field-' ~ entity_type|clean_class ~ '--' ~ field_name_class,
- 'field-name-' ~ field_name_class,
- 'field-type-' ~ field_type|clean_class,
- 'field-label-' ~ label_display,
- ]
-%}
-<span{{ attributes.addClass(classes) }}>
+<span{{ attributes }}>
{%- for item in items -%}
{{ item.content }}
{%- endfor -%}
diff --git a/core/modules/node/templates/node-add-list.html.twig b/core/modules/node/templates/node-add-list.html.twig
index 258d3e631f73..c64751bf54f1 100644
--- a/core/modules/node/templates/node-add-list.html.twig
+++ b/core/modules/node/templates/node-add-list.html.twig
@@ -16,7 +16,7 @@
*/
#}
{% if types is not empty %}
- <dl class="node-type-list">
+ <dl>
{% for type in types %}
<dt>{{ type.add_link }}</dt>
<dd>{{ type.description }}</dd>
diff --git a/core/modules/node/templates/node-edit-form.html.twig b/core/modules/node/templates/node-edit-form.html.twig
index 6d8ac2aca7cd..79f066ce81b7 100644
--- a/core/modules/node/templates/node-edit-form.html.twig
+++ b/core/modules/node/templates/node-edit-form.html.twig
@@ -17,14 +17,6 @@
* @ingroup themeable
*/
#}
-<div class="layout-node-form clearfix">
- <div class="layout-region layout-region-node-main">
- {{ form|without('advanced', 'actions') }}
- </div>
- <div class="layout-region layout-region-node-secondary">
- {{ form.advanced }}
- </div>
- <div class="layout-region layout-region-node-footer">
- {{ form.actions }}
- </div>
+<div>
+ {{ form }}
</div>
diff --git a/core/modules/node/templates/node.html.twig b/core/modules/node/templates/node.html.twig
index a78fcb30171c..f460f4325443 100644
--- a/core/modules/node/templates/node.html.twig
+++ b/core/modules/node/templates/node.html.twig
@@ -68,17 +68,7 @@
* @ingroup themeable
*/
#}
-{%
- 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,
- ]
-%}
-<article{{ attributes.addClass(classes) }}>
+<article{{ attributes }}>
{{ title_prefix }}
{% if not page %}
@@ -89,23 +79,17 @@
{{ title_suffix }}
{% if display_submitted %}
- <footer class="node__meta">
+ <footer>
{{ author_picture }}
- <div{{ author_attributes.addClass('node__submitted') }}>
+ <div{{ author_attributes }}>
{% trans %}Submitted by {{ author_name|passthrough }} on {{ date|passthrough }}{% endtrans %}
{{ metadata }}
</div>
</footer>
{% endif %}
- <div{{ content_attributes.addClass('node__content') }}>
- {{ content|without('links') }}
+ <div{{ content_attributes }}>
+ {{ content }}
</div>
- {% if content.links %}
- <div class="node__links">
- {{ content.links }}
- </div>
- {% endif %}
-
</article>
diff --git a/core/themes/classy/templates/field--node--created.html.twig b/core/themes/classy/templates/field--node--created.html.twig
new file mode 100644
index 000000000000..496d6b20d1e9
--- /dev/null
+++ b/core/themes/classy/templates/field--node--created.html.twig
@@ -0,0 +1,38 @@
+{#
+/**
+ * @file
+ * Default theme implementation for the node created field.
+ *
+ * This is an override of field.html.twig for the node created field. See that
+ * template for documentation about its details and overrides.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing span element.
+ * - items: List of all the field items. Each item contains:
+ * - attributes: List of HTML attributes for each item.
+ * - content: The field item content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see field.html.twig
+ *
+ * @ingroup themeable
+ */
+#}
+{% set field_name_class = field_name|clean_class %}
+{%
+ set classes = [
+ 'field',
+ 'field-' ~ entity_type|clean_class ~ '--' ~ field_name_class,
+ 'field-name-' ~ field_name_class,
+ 'field-type-' ~ field_type|clean_class,
+ 'field-label-' ~ label_display,
+ ]
+%}
+<span{{ attributes.addClass(classes) }}>
+ {%- for item in items -%}
+ {{ item.content }}
+ {%- endfor -%}
+</span>
diff --git a/core/themes/classy/templates/field--node--title.html.twig b/core/themes/classy/templates/field--node--title.html.twig
new file mode 100644
index 000000000000..5b37bfa72ab7
--- /dev/null
+++ b/core/themes/classy/templates/field--node--title.html.twig
@@ -0,0 +1,38 @@
+{#
+/**
+ * @file
+ * Default theme implementation for the node title field.
+ *
+ * This is an override of field.html.twig for the node title field. See that
+ * template for documentation about its details and overrides.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing span element.
+ * - items: List of all the field items. Each item contains:
+ * - attributes: List of HTML attributes for each item.
+ * - content: The field item content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see field.html.twig
+ *
+ * @ingroup themeable
+ */
+#}
+{% set field_name_class = field_name|clean_class %}
+{%
+ set classes = [
+ 'field',
+ 'field-' ~ entity_type|clean_class ~ '--' ~ field_name_class,
+ 'field-name-' ~ field_name_class,
+ 'field-type-' ~ field_type|clean_class,
+ 'field-label-' ~ label_display,
+ ]
+%}
+<span{{ attributes.addClass(classes) }}>
+ {%- for item in items -%}
+ {{ item.content }}
+ {%- endfor -%}
+</span>
diff --git a/core/themes/classy/templates/field--node--uid.html.twig b/core/themes/classy/templates/field--node--uid.html.twig
new file mode 100644
index 000000000000..0798d7e7d213
--- /dev/null
+++ b/core/themes/classy/templates/field--node--uid.html.twig
@@ -0,0 +1,38 @@
+{#
+/**
+ * @file
+ * Default theme implementation for the node user field.
+ *
+ * This is an override of field.html.twig for the node user field. See that
+ * template for documentation about its details and overrides.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing span element.
+ * - items: List of all the field items. Each item contains:
+ * - attributes: List of HTML attributes for each item.
+ * - content: The field item content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see field.html.twig
+ *
+ * @ingroup themeable
+ */
+#}
+{% set field_name_class = field_name|clean_class %}
+{%
+ set classes = [
+ 'field',
+ 'field-' ~ entity_type|clean_class ~ '--' ~ field_name_class,
+ 'field-name-' ~ field_name_class,
+ 'field-type-' ~ field_type|clean_class,
+ 'field-label-' ~ label_display,
+ ]
+%}
+<span{{ attributes.addClass(classes) }}>
+ {%- for item in items -%}
+ {{ item.content }}
+ {%- endfor -%}
+</span>
diff --git a/core/themes/classy/templates/node-add-list.html.twig b/core/themes/classy/templates/node-add-list.html.twig
new file mode 100644
index 000000000000..258d3e631f73
--- /dev/null
+++ b/core/themes/classy/templates/node-add-list.html.twig
@@ -0,0 +1,32 @@
+{#
+/**
+ * @file
+ * Default theme implementation to list node types available for adding content.
+ *
+ * This list is displayed on the Add content admin page.
+ *
+ * Available variables:
+ * - types: A list of content types, each with the following properties:
+ * - add_link: Link to create a piece of content of this type.
+ * - description: Description of this type of content.
+ *
+ * @see template_preprocess_node_add_list()
+ *
+ * @ingroup themeable
+ */
+#}
+{% if types is not empty %}
+ <dl class="node-type-list">
+ {% for type in types %}
+ <dt>{{ type.add_link }}</dt>
+ <dd>{{ type.description }}</dd>
+ {% endfor %}
+ </dl>
+{% else %}
+ <p>
+ {% set create_content = path('node.type_add') %}
+ {% trans %}
+ You have not created any content types yet. Go to the <a href="{{ create_content }}">content type creation page</a> to add a new content type.
+ {% endtrans %}
+ </p>
+{% endif %}
diff --git a/core/themes/classy/templates/node-edit-form.html.twig b/core/themes/classy/templates/node-edit-form.html.twig
new file mode 100644
index 000000000000..6d8ac2aca7cd
--- /dev/null
+++ b/core/themes/classy/templates/node-edit-form.html.twig
@@ -0,0 +1,30 @@
+{#
+/**
+ * @file
+ * Default theme implementation for a node edit form.
+ *
+ * Two column template for the node add/edit form.
+ *
+ * This template will be used when a node edit form specifies 'node_edit_form'
+ * as its #theme callback. Otherwise, by default, node add/edit forms will be
+ * themed by form.html.twig.
+ *
+ * Available variables:
+ * - form: The node add/edit form.
+ *
+ * @see seven_form_node_form_alter()
+ *
+ * @ingroup themeable
+ */
+#}
+<div class="layout-node-form clearfix">
+ <div class="layout-region layout-region-node-main">
+ {{ form|without('advanced', 'actions') }}
+ </div>
+ <div class="layout-region layout-region-node-secondary">
+ {{ form.advanced }}
+ </div>
+ <div class="layout-region layout-region-node-footer">
+ {{ form.actions }}
+ </div>
+</div>
diff --git a/core/themes/classy/templates/node.html.twig b/core/themes/classy/templates/node.html.twig
new file mode 100644
index 000000000000..a78fcb30171c
--- /dev/null
+++ b/core/themes/classy/templates/node.html.twig
@@ -0,0 +1,111 @@
+{#
+/**
+ * @file
+ * Default theme implementation to display a node.
+ *
+ * Available variables:
+ * - node: Full node entity.
+ * - id: The node ID.
+ * - bundle: The type of the node, for example, "page" or "article".
+ * - authorid: The user ID of the node author.
+ * - createdtime: Formatted creation date. Preprocess functions can
+ * reformat it by calling format_date() with the desired parameters on
+ * $variables['node']->getCreatedTime().
+ * - 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.
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+ 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,
+ ]
+%}
+<article{{ attributes.addClass(classes) }}>
+
+ {{ title_prefix }}
+ {% if not page %}
+ <h2{{ title_attributes }}>
+ <a href="{{ url }}" rel="bookmark">{{ label }}</a>
+ </h2>
+ {% endif %}
+ {{ title_suffix }}
+
+ {% if display_submitted %}
+ <footer class="node__meta">
+ {{ author_picture }}
+ <div{{ author_attributes.addClass('node__submitted') }}>
+ {% trans %}Submitted by {{ author_name|passthrough }} on {{ date|passthrough }}{% endtrans %}
+ {{ metadata }}
+ </div>
+ </footer>
+ {% endif %}
+
+ <div{{ content_attributes.addClass('node__content') }}>
+ {{ content|without('links') }}
+ </div>
+
+ {% if content.links %}
+ <div class="node__links">
+ {{ content.links }}
+ </div>
+ {% endif %}
+
+</article>
--
GitLab