diff --git a/app/Resources/NetgenTagsBundle/views/tag/view.html.twig b/app/Resources/NetgenTagsBundle/views/tag/view.html.twig index ed0baf4c..82d8dc4d 100644 --- a/app/Resources/NetgenTagsBundle/views/tag/view.html.twig +++ b/app/Resources/NetgenTagsBundle/views/tag/view.html.twig @@ -9,32 +9,34 @@ {% block content %}
-
-
-
-

{{ 'Tags'|trans }} / {{ tag_keyword }}

-
+
+
+
+
+

{{ 'Tags'|trans }} / {{ tag_keyword }}

+
- {% if related_content|length > 0 %} -
- {% for related_content_item in related_content %} - {{ render(controller( + {% if related_content|length > 0 %} +
+ {% for related_content_item in related_content %} + {{ render(controller( "ez_content:viewAction", { "contentId": related_content_item.id, "locationId": related_content_item.mainLocationId, "viewType": "search_result_item", "layout": false } - )) }} - {% endfor %} -
+ )) }} + {% endfor %} +
- {% if related_content.haveToPaginate() %} -
- {{ pagerfanta( related_content, 'twitter_bootstrap3_translated' ) }} -
+ {% if related_content.haveToPaginate() %} +
+ {{ pagerfanta( related_content, 'twitter_bootstrap3_translated' ) }} +
+ {% endif %} {% endif %} - {% endif %} +
diff --git a/app/Resources/views/themes/admin/fields/eztags_field.html.twig b/app/Resources/views/themes/admin/fields/eztags_field.html.twig new file mode 100644 index 00000000..cdde511a --- /dev/null +++ b/app/Resources/views/themes/admin/fields/eztags_field.html.twig @@ -0,0 +1,10 @@ +{% extends "EzPublishCoreBundle::content_fields.html.twig" %} + +{% block eztags_field %} + {% for tag in field.value.tags %} + + {{ netgen_tags_tag_keyword(tag) }} + + {% if not loop.last %}, {% endif %} + {% endfor %} +{% endblock %} diff --git a/app/Resources/views/themes/tastefulplanet/fields/eztags_field.html.twig b/app/Resources/views/themes/tastefulplanet/fields/eztags_field.html.twig index cdde511a..aae478f7 100644 --- a/app/Resources/views/themes/tastefulplanet/fields/eztags_field.html.twig +++ b/app/Resources/views/themes/tastefulplanet/fields/eztags_field.html.twig @@ -2,9 +2,8 @@ {% block eztags_field %} {% for tag in field.value.tags %} - + {{ netgen_tags_tag_keyword(tag) }} - {% if not loop.last %}, {% endif %} {% endfor %} {% endblock %} diff --git a/app/Resources/views/themes/tastefulplanet/full/article.html.twig b/app/Resources/views/themes/tastefulplanet/full/article.html.twig index 3cb576f0..cdfc41c4 100644 --- a/app/Resources/views/themes/tastefulplanet/full/article.html.twig +++ b/app/Resources/views/themes/tastefulplanet/full/article.html.twig @@ -34,6 +34,10 @@
{{ ez_render_field(content, 'body') }}
+ +
+ {{ ez_render_field(content, 'tags') }} +
diff --git a/app/Resources/views/themes/tastefulplanet/full/blog_post.html.twig b/app/Resources/views/themes/tastefulplanet/full/blog_post.html.twig index 3ae962dd..b94a60a6 100644 --- a/app/Resources/views/themes/tastefulplanet/full/blog_post.html.twig +++ b/app/Resources/views/themes/tastefulplanet/full/blog_post.html.twig @@ -47,6 +47,10 @@
{{ ez_render_field(content, 'body') }}
+ +
+ {{ ez_render_field(content, 'tags') }} +
diff --git a/app/Resources/views/themes/tastefulplanet/full/place.html.twig b/app/Resources/views/themes/tastefulplanet/full/place.html.twig index 50054aad..7f0ea0f2 100644 --- a/app/Resources/views/themes/tastefulplanet/full/place.html.twig +++ b/app/Resources/views/themes/tastefulplanet/full/place.html.twig @@ -38,12 +38,16 @@
{{ ez_render_field(content, 'description') }}
+ +
+ {{ ez_render_field(content, 'tags') }} +
- {{ ez_render_field(content, 'location', { parameters:{ mapType:'TERRAIN', showInfo:false, zoom: 6, width:'false', height:'400px' } }) }} + {{ ez_render_field(content, 'location', { parameters:{ mapType:'TERRAIN', showInfo:false, zoom: 6, width:'false', height:'400px', scrollWheel:false } }) }}
diff --git a/app/Resources/views/themes/tastefulplanet/search_result_item/article.html.twig b/app/Resources/views/themes/tastefulplanet/search_result_item/article.html.twig new file mode 100644 index 00000000..ab11d562 --- /dev/null +++ b/app/Resources/views/themes/tastefulplanet/search_result_item/article.html.twig @@ -0,0 +1,43 @@ +{% block content %} + {% set url = path(location) %} + {% set title = ez_content_name(content) %} + +
+
+ + +
+ {{ ez_render_field(content, 'intro') }} +
+
+
+ {% if not ez_is_field_empty(content, 'image') %} + + {{ ez_render_field(content, 'image', { + 'parameters': { + 'alias': 'search_result_item', + 'class': 'w-100' + } + }) }} + + {% endif %} +
+
+{% endblock %} diff --git a/app/Resources/views/themes/tastefulplanet/search_result_item/default.html.twig b/app/Resources/views/themes/tastefulplanet/search_result_item/default.html.twig index 81771036..105aa60c 100644 --- a/app/Resources/views/themes/tastefulplanet/search_result_item/default.html.twig +++ b/app/Resources/views/themes/tastefulplanet/search_result_item/default.html.twig @@ -2,7 +2,7 @@ {% set url = path(location) %} {% set title = ez_content_name(content) %} -
+

@@ -11,12 +11,13 @@

-
+ {% endif %}
-