diff --git a/core/modules/node/templates/node-add-list.html.twig b/core/modules/node/templates/node-add-list.html.twig index 258d3e6..c64751b 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 %} -
+
{% for type in types %}
{{ type.add_link }}
{{ type.description }}
diff --git a/core/modules/node/templates/node-edit-form.html.twig b/core/modules/node/templates/node-edit-form.html.twig index e34baf9..09c2b3b 100644 --- a/core/modules/node/templates/node-edit-form.html.twig +++ b/core/modules/node/templates/node-edit-form.html.twig @@ -17,14 +17,14 @@ * @ingroup themeable */ #} -
-
+
+
{{ form|without('advanced', 'actions') }}
-
+
{{ form.advanced }}
-
+
{{ form.actions }}
diff --git a/core/modules/node/templates/node.html.twig b/core/modules/node/templates/node.html.twig index 37f1bfc..e02c512 100644 --- a/core/modules/node/templates/node.html.twig +++ b/core/modules/node/templates/node.html.twig @@ -63,17 +63,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, - ] -%} - + {{ title_prefix }} {% if not page %} @@ -84,21 +74,21 @@ {{ title_suffix }} {% if display_submitted %} -
+
{{ author_picture }} - + {% trans %}Submitted by {{ author_name|passthrough }} on {{ date|passthrough }}{% endtrans %} {{ metadata }}
{% endif %} - + {{ content|without('links') }}
{% if content.links %} -
+
{{ content.links }}
{% endif %} 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 0000000..258d3e6 --- /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 %} +
+ {% for type in types %} +
{{ type.add_link }}
+
{{ type.description }}
+ {% endfor %} +
+{% else %} +

+ {% set create_content = path('node.type_add') %} + {% trans %} + You have not created any content types yet. Go to the content type creation page to add a new content type. + {% endtrans %} +

+{% 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 0000000..e34baf9 --- /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 theme_form(). + * + * Available variables: + * - form: The node add/edit form. + * + * @see seven_form_node_form_alter() + * + * @ingroup themeable + */ +#} +
+
+ {{ form|without('advanced', 'actions') }} +
+
+ {{ form.advanced }} +
+
+ {{ form.actions }} +
+
diff --git a/core/themes/classy/templates/node.html.twig b/core/themes/classy/templates/node.html.twig new file mode 100644 index 0000000..37f1bfc --- /dev/null +++ b/core/themes/classy/templates/node.html.twig @@ -0,0 +1,106 @@ +{# +/** + * @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_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. + * - is_front: Flag for front. Will be true when presented on the front page. + * - 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, + ] +%} + + + {{ title_prefix }} + {% if not page %} + + {{ label }} + + {% endif %} + {{ title_suffix }} + + {% if display_submitted %} +
+ {{ author_picture }} + + {% trans %}Submitted by {{ author_name|passthrough }} on {{ date|passthrough }}{% endtrans %} + {{ metadata }} +
+ + {% endif %} + + + {{ content|without('links') }} +
+ + {% if content.links %} +
+ {{ content.links }} +
+ {% endif %} + +