updated templates due to new structure

sulu · Aug 29, 2014 · 51cb276 · 51cb276
1 parent bbc4c14
commit 51cb276
Show file tree

Hide file tree

Showing 7 changed files with 106 additions and 42 deletions.
diff --git a/composer.json b/composer.json
@@ -49,7 +49,8 @@
         "friendsofsymfony/rest-bundle": "@dev",
         "friendsofsymfony/http-cache": "@dev",
         "willdurand/hateoas-bundle": "0.3.*",
-        "massive/build-bundle": "~0.1.0"
+        "massive/build-bundle": "~0.1.0",
+        "pagerfanta/pagerfanta": "1.0.2"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Client/Bundle/WebsiteBundle/Resources/themes/default/blocks/meta.html.twig b/src/Client/Bundle/WebsiteBundle/Resources/themes/default/blocks/meta.html.twig
@@ -1,5 +1,5 @@
-    <meta name="title" content="{{ content.ext.seo.title|default('') }}">
-    <meta name="keywords" content="{{ content.ext.seo.keywords|default('') }}">
-    <meta name="description" content="{{ content.ext.seo.keywords|default('') }}">
-    <meta name="robots" content="{{ content.ext.seo.noIndex ? 'noIndex' : 'index' }}">
-    <meta name="robots" content="{{ content.ext.seo.noFollow ? 'nofollow' : 'follow' }}">
+    <meta name="title" content="{{ extension.seo.title|default('') }}">
+    <meta name="keywords" content="{{ extension.seo.keywords|default('') }}">
+    <meta name="description" content="{{ extension.seo.keywords|default('') }}">
+    <meta name="robots" content="{{ extension.seo.noIndex ? 'noIndex' : 'index' }}">
+    <meta name="robots" content="{{ extension.seo.noFollow ? 'nofollow' : 'follow' }}">
diff --git a/src/Client/Bundle/WebsiteBundle/Resources/themes/default/templates/default.html.twig b/src/Client/Bundle/WebsiteBundle/Resources/themes/default/templates/default.html.twig
@@ -26,8 +26,8 @@
 
                 <h3>Images</h3>
 
-                <div class="row {{ content.images.displayOption }}" property="images" typeof="collection">
-                    {% for image in content.images.data %}
+                <div class="row {{ view.images.displayOption }}" property="images" typeof="collection">
+                    {% for image in content.images %}
                         <div class="col-lg-4" rel="images" typeof="images">
                             <img src="{{ image.thumbnails['170x170'] }}" alt="{{ image.name }}"/>
 
@@ -40,7 +40,7 @@
 
                 {% if content.links is defined %}
                     <ul property="links">
-                        {% for link in content.links.data %}
+                        {% for link in content.links %}
                             <li>
                                 <a href="{{ content_path(link) }}">{{ link.title|default('No Title') }}</a>
                             </li>

diff --git a/src/Client/Bundle/WebsiteBundle/Resources/themes/default/templates/example.html.twig b/src/Client/Bundle/WebsiteBundle/Resources/themes/default/templates/example.html.twig
@@ -57,7 +57,7 @@
         {% if content.links is defined %}
             <h3>Links:</h3>
             <ul property="links">
-                {% for link in content.links.data %}
+                {% for link in content.links %}
                     <li>
                         <a href="{{ content_path(link) }}">{{ link.title|default('No Title') }}</a>
                     </li>
@@ -76,7 +76,7 @@
         {% endif %}
 
         <div property="smartcontent">
-            {% for smartcontent in content.smartcontent.data %}
+            {% for smartcontent in content.smartcontent %}
                 <div class="col-lg-4">
                     <h2><a href="{{ content_path(smartcontent) }}">{{ smartcontent.title }}</a></h2>
                     {% autoescape false %}
@@ -86,10 +86,10 @@
             {% endfor %}
         </div>
 
-        <h3>Images (display-options: {{ content.images.displayOption }})</h3>
+        <h3>Images (display-options: {{ view.images.displayOption }})</h3>
 
         <div class="row" property="images" typeof="collection">
-            {% for image in content.images.data %}
+            {% for image in content.images %}
                 <div class="col-lg-4" rel="images" typeof="images">
                     <img src="{{ image.thumbnails['170x170'] }}" alt="{{ image.name }}"/>
 

diff --git a/src/Client/Bundle/WebsiteBundle/Resources/themes/default/templates/overview.html.twig b/src/Client/Bundle/WebsiteBundle/Resources/themes/default/templates/overview.html.twig
@@ -22,7 +22,7 @@
             </div>
 
             <div property="smartcontent">
-                {% for page in content.smartcontent.data %}
+                {% for page in content.smartcontent %}
                     <div class="col-lg-4">
                         <h2>
                             <a href="{{ content_path(page) }}">{{ page.title }}</a>

diff --git a/src/Client/Bundle/WebsiteBundle/Resources/themes/default/views/navigation.html.twig b/src/Client/Bundle/WebsiteBundle/Resources/themes/default/views/navigation.html.twig
@@ -1,5 +1,5 @@
 <ul class="nav nav-justified">
-    {% for item in root_navigation(content, 1, false, 'main') %}
+    {% for item in root_navigation(webspaceKey, locale, 1, false, 'main') %}
         <li>
             <a href="{{ content_path(item) }}" title="{{ item.title }}">{{ item.title }}</a>
         </li>