_layouts/contenttool-feature.html in appscms-tools-theme-4.7.8 vs _layouts/contenttool-feature.html in appscms-tools-theme-4.7.9

- old
+ new

@@ -1,46 +1,42 @@ {% assign file = page.fileName %} {% assign lang = page.lang %} {% assign folder - = page.folderName %} {% assign pageData = site.data[folder][lang][file] %} {%- - assign boxColor = site.data[page.folderName][page.lang][page.fileName].color -%} - - <!DOCTYPE html> - <html lang="{{ page.lang }}"> - {%- include appscms/head/head.html -%} - <body> - {%- include appscms/navbars/navbar.html -%} {%- include - appscms/navbars/toolbar.html -%} {%- include bookmark.html -%} - - - {%- include appscms/headings/headings.html -%} - {%- include - appscms/uploadbutton/uploadbutton.html -%} {%- include - appscms/featurehighlight/featurehighlight.html -%} {%- include - appscms/howto/howto.html -%} {%- if pageData.infographics.size > 0 -%} {%- - include /appscms/infographics/infographics.html -%} {%- endif -%} {%- include - appscms/faq/faq.html -%} - <!-- {%- include += page.folderName %} {% assign pageData = site.data[folder][lang][file] %} {%- +assign boxColor = site.data[page.folderName][page.lang][page.fileName].color -%} + +<!DOCTYPE html> +<html lang="{{ page.lang }}"> + {%- include appscms/head/head.html -%} + <body> + {%- include appscms/navbars/navbar.html -%} {%- include + appscms/navbars/toolbar.html -%} {%- include bookmark.html -%} {%- include + appscms/headings/headings.html -%} {%- include + appscms/uploadbutton/uploadbutton.html -%} {%- include + appscms/featurehighlight/featurehighlight.html -%} {%- include + appscms/howto/howto.html -%} {%- if pageData.infographics.size > 0 -%} {%- + include /appscms/infographics/infographics.html -%} {%- endif -%} {%- + include appscms/faq/faq.html -%} + <!-- {%- include appscms/extras/traffic-count.html -%} --> - {%- if site.userTrackingCount -%} {%- include userTracking.html -%} {%- - endif -%} {%- assign langen = "en" -%} {%- if - site.data[folder][langen][file].categories -%} {% assign categories= - site.data[folder][langen][file].categories %} {%- else -%} {% assign - categories= page.categories %} {%- endif -%} {%- if - site.data[folder][langen][file].tags -%} {% assign tags= - site.data[folder][langen][file].tags %} {%- else -%} {% assign tags= - page.tags %} {%- endif -%} {%- if pageData.posts.size > 0 -%} {%- include - appscms/customblog/pageRelatedPosts.html -%} {%- else -%} {%- if - categories.size > 0 or tags.size > 0 -%} {%- include - appscms/recent-posts/related_categories_post.html -%} {%- else -%} {%- - include appscms/recent-posts/recent_posts.html -%} {%- endif -%} {%- endif - -%} {%- if site.customblogdata -%} {%- if categories.size> 0 or - tags.size>0-%} {%- include appscms/customblog/relatedposts.html -%} {%- else - -%} {%- include appscms/customblog/recentposts.html -%} {% endif %} {%- - endif -%} {%- include appscms/extras/ratings.html -%} {%- if - pageData.author.size > 0 -%} {% include - appscms/featurePageAuthors/featurePageAuthors.html %} {%- endif -%} {%- - include appscms/footer/products.html -%} {%- include - appscms/footer/footer.html -%} {%- if site.customCode -%} {%- include - customCode.html -%} {%- endif -%} {%- include appscms/scripts/script.html - -%} - </body> - </html> - \ No newline at end of file + {%- if site.userTrackingCount -%} {%- include userTracking.html -%} {%- + endif -%} {%- assign langen = "en" -%} {%- if + site.data[folder][langen][file].categories -%} {% assign categories= + site.data[folder][langen][file].categories %} {%- else -%} {% assign + categories= page.categories %} {%- endif -%} {%- if + site.data[folder][langen][file].tags -%} {% assign tags= + site.data[folder][langen][file].tags %} {%- else -%} {% assign tags= + page.tags %} {%- endif -%} {%- if pageData.posts.size > 0 -%} {%- include + appscms/customblog/pageRelatedPosts.html -%} {%- else -%} {%- if + categories.size > 0 or tags.size > 0 -%} {%- include + appscms/recent-posts/related_categories_post.html -%} {%- else -%} {%- + include appscms/recent-posts/recent_posts.html -%} {%- endif -%} {%- endif + -%} {%- if site.customblogdata -%} {%- if categories.size> 0 or + tags.size>0-%} {%- include appscms/customblog/relatedposts.html -%} {%- else + -%} {%- include appscms/customblog/recentposts.html -%} {% endif %} {%- + endif -%} {%- include appscms/extras/ratings.html -%} {%- if + pageData.author.size > 0 -%} {% include + appscms/featurePageAuthors/featurePageAuthors.html %} {%- endif -%} {%- + include appscms/footer/products.html -%}{%- include + internationalization-section.html -%} {%- include appscms/footer/footer.html + -%} {%- if site.customCode -%} {%- include customCode.html -%} {%- endif -%} + {%- include appscms/scripts/script.html -%} + </body> +</html>