Merge commit 'f25405eed117b8364ed54569a5b65ba043512c47' into devel-clean

superdesk · Jul 15, 2014 · c8a2f97 · c8a2f97
2 parents 44fc4dc + f25405e
commit c8a2f97
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/plugins/embed/gui-resources/scripts/js/build/main.js b/plugins/embed/gui-resources/scripts/js/build/main.js
diff --git a/plugins/embed/gui-resources/scripts/js/build/themes/nzz/desktop.js b/plugins/embed/gui-resources/scripts/js/build/themes/nzz/desktop.js
diff --git a/plugins/embed/gui-resources/scripts/js/build/themes/zeit-solo/desktop.js b/plugins/embed/gui-resources/scripts/js/build/themes/zeit-solo/desktop.js
diff --git a/plugins/embed/gui-resources/scripts/js/build/themes/zeit/desktop.js b/plugins/embed/gui-resources/scripts/js/build/themes/zeit/desktop.js
diff --git a/plugins/embed/gui-themes/themes/nzz/desktop/container.dust b/plugins/embed/gui-themes/themes/nzz/desktop/container.dust
@@ -1,6 +1,6 @@
 {>"themeBase/container"/}
 {<mainContainer}
-<div id="livedesk-root">
+<div id="livedesk-root" {+additionalAttributes}{/additionalAttributes} data-gimme="blog.view">
 	{+main}
 	<div class="liveblog-container">
 

diff --git a/plugins/embed/gui-themes/themes/zeit-solo/desktop/container.dust b/plugins/embed/gui-themes/themes/zeit-solo/desktop/container.dust
@@ -1,6 +1,6 @@
 {>"themeBase/container"/}
 {<mainContainer}
-<div id="livedesk-root" data-gimme="blog.view">
+<div id="livedesk-root" {+additionalAttributes}{/additionalAttributes} data-gimme="blog.view">
 	{+main}
 	<div class="liveblog-container">
 

diff --git a/plugins/embed/gui-themes/themes/zeit/desktop/container.dust b/plugins/embed/gui-themes/themes/zeit/desktop/container.dust
@@ -1,6 +1,6 @@
 {>"themeBase/container"/}
 {<mainContainer}
-<div id="livedesk-root" data-gimme="blog.view">
+<div id="livedesk-root" {+additionalAttributes}{/additionalAttributes} data-gimme="blog.view">
     {+main}
         <div class="liveblog-container">