Merge pull request #882 from superdesk/zeit-online-wip

Zeit online wip

plugins/embed/gui-resources/scripts/js/lib/dust/helpers/date.js

@@ -9,6 +9,20 @@ define(['dust/core', 'lib/gettext', 'moment', 'moment-timezone'], function(dust,
         }
         return date.format(gt.pgettext('moment', 'post-date'));
     };
+    dust.filters['splitted-post-time'] = function(string) {
+        var date = moment(string);
+        if (gt.pgettext('moment', 'timezone') !== 'timezone') {
+            date.tz(gt.pgettext('moment', 'timezone'));
+        }
+        return date.format(gt.pgettext('moment', 'splitted-post-time'));
+    };
+    dust.filters['splitted-post-date'] = function(string) {
+        var date = moment(string);
+        if (gt.pgettext('moment', 'timezone') !== 'timezone') {
+            date.tz(gt.pgettext('moment', 'timezone'));
+        }
+        return date.format(gt.pgettext('moment', 'splitted-post-date'));
+    };
     dust.filters['closed-date'] = function(string) {
         var date = moment(string);
         if (gt.pgettext('moment', 'timezone') !== 'timezone') {

plugins/embed/gui-resources/scripts/js/lib/require/i18n.js

@@ -16,6 +16,8 @@ define([
             //   we keep a mapper with the language codes to moment lanugage codes.
             var defaultsMapper = {
                     'post-date': 'llll',
+                    'splitted-post-time': 'LT',
+                    'splitted-post-date': 'LL',
                     'closed-date': 'llll',
                     'status-time': 'HH:mm',
                     'pretty-day-time': 'HH:mm',

plugins/embed/gui-resources/scripts/js/plugins/predefined-types.js

@@ -0,0 +1,24 @@
+'use strict';
+
+define([
+    'plugins',
+    'dust',
+    'lib/utils'
+], function (plugins, dust, utils) {
+    plugins['predefined-types'] = function (config) {
+        utils.dispatcher.on('before-render.post-view', function (view) {
+            if (view.model.get('item') !== 'posttype/normal') {
+                return;
+            }
+            var Meta = view.model.get('Meta'),
+                predefinedType;
+            if (Meta['post-predefined-type']) {
+                predefinedType = Meta['post-predefined-type'].text.toLowerCase();
+                if (dust.cache['theme/item/predefined/' + predefinedType]) {
+                    view.setTemplate('theme/item/predefined/' + predefinedType);
+                }
+            }
+        });
+    };
+    return plugins['predefined-types'];
+});

plugins/embed/gui-themes/themes/base/translation.dust

@@ -19,6 +19,8 @@ _('Share this post on Google+');
 _('Share this post via Email');
 _('%(full_name)s commentator');
 pgettext('moment', 'post-date');
+pgettext('moment', 'splitted-post-time');
+pgettext('moment', 'splitted-post-date');
 pgettext('moment', 'closed-date');
 pgettext('moment', 'months');
 pgettext('moment', 'monthsShort');

plugins/embed/gui-themes/themes/zeit-online-solo.js

@@ -0,0 +1,28 @@
+define([
+    // 'plugins/scroll-pagination',
+    'plugins/button-pagination',
+    'plugins/twitter-widgets',
+    'plugins/post-hash',
+    'plugins/social-share',
+    'plugins/status',
+    'plugins/wrappup-toggle',
+    'plugins/predefined-types',
+    'css!theme/liveblog',
+    'tmpl!theme/container',
+    'tmpl!theme/item/base',
+    'tmpl!theme/plugins/social-share',
+    'tmpl!theme/item/predefined/scorecard'
+], function(dust, gt, moment) {
+    'use strict';
+
+    return {
+        plugins: [
+            // 'scroll-pagination',
+            'button-pagination',
+            'twitter-widgets',
+            'social-share',
+            'status',
+            'wrappup-toggle'
+        ]
+    };
+});

plugins/embed/gui-themes/themes/zeit-online-solo/container.dust

@@ -0,0 +1,23 @@
+{>"themeBase/container"/}
+
+{! Empty default blocks !}
+
+{<headerContainer}
+{/headerContainer}
+
+{<footerContainer}
+{/footerContainer}
+
+{<contentTopContainer}
+	<div class="liveblog-content-top">
+		<div class="liveblog-content-top-bar">
+			{+contentTop}
+				{+status}{/status}
+				{+statusNewPost}{/statusNewPost}
+			{/contentTop}
+		</div>
+	</div>
+{/contentTopContainer}
+
+{<contentBottomContainer}
+{/contentBottomContainer}

plugins/embed/gui-themes/themes/zeit-online-solo/item/base.dust

@@ -0,0 +1,28 @@
+{>"themeBase/item/base"/}
+
+{! Attention! Opening tag in headerContainer … !}
+{<headerContainer}
+	<div class="liveblog-post">
+		<div class="post-header">
+			{+header}{/header}
+		</div>
+{/headerContainer}
+
+{! … closing tag in footerContainer !}
+{<footerContainer}
+		<div class="post-footer">
+			{+footer}{/footer}
+		</div>
+	</div>
+	{+shareContainer}{/shareContainer}
+{/footerContainer}
+
+{<contentSideContainer}{/contentSideContainer}
+
+{<header}{/header}
+
+{<footer}{/footer}
+
+{<share}
+	{+socialShare}{/socialShare}
+{/share}

plugins/embed/gui-themes/themes/zeit-online-solo/item/predefined/scorecard.dust

@@ -0,0 +1,2 @@
+{>"themeBase/item/posttype/base"/}
+{<itemClass}scorecard{/itemClass}

plugins/embed/gui-themes/themes/zeit-online-solo/liveblog.scss

@@ -0,0 +1,24 @@
+@import "../zeit-online/liveblog";
+
+.liveblog-postlist {
+	li {
+		padding-left: 0;
+
+		.post-header {
+			display: none;
+		}
+		&.scorecard {
+			.liveblog-post {
+				&:before {
+					content: none;
+				}
+			}
+		}
+	}
+}
+
+.liveblog-post {
+	&:after {
+		content: none;
+	}
+}

plugins/embed/gui-themes/themes/zeit-online-solo/plugins/social-share.dust

@@ -0,0 +1,8 @@
+<div data-gimme="post.share-social" class="share-box" style="visibility:hidden">
+	<span><a href="#" class="social facebook" title="_('Share this post on Facebook');" data-gimme="fb">Facebook</a></span>
+	<span><a href="#" class="social twitter" title="_('Share this post on Twitter');" data-gimme="twt">Twitter</a></span>
+	{#showLin}<span><a href="#" class="social linkedin" title="_('Share this post on Linkedin');" data-gimme="lin">LinkedIn</a></span>{/showLin}
+	{#showPin}<span><a href="#" class="social pinterest" title="_('Share this post on Pinterest');" data-gimme="pin">Pinterest</a></span>{/showPin}
+	<span><a href="#" class="social google" title="_('Share this post on Google+');" data-gimme="ggl">Google +</a></span>
+	<span><a href="{emailurl}" class="social email" title="_('Share this post via Email');" target="_blank">Mail</a></span>
+</div>

plugins/embed/gui-themes/themes/zeit-online.js

@@ -0,0 +1,28 @@
+define([
+    // 'plugins/scroll-pagination',
+    'plugins/button-pagination',
+    'plugins/twitter-widgets',
+    'plugins/post-hash',
+    'plugins/social-share',
+    'plugins/status',
+    'plugins/wrappup-toggle',
+    'plugins/predefined-types',
+    'css!theme/liveblog',
+    'tmpl!theme/container',
+    'tmpl!theme/item/base',
+    'tmpl!theme/plugins/social-share',
+    'tmpl!theme/item/predefined/scorecard'
+], function(dust, gt, moment) {
+    'use strict';
+
+    return {
+        plugins: [
+            // 'scroll-pagination',
+            'button-pagination',
+            'twitter-widgets',
+            'social-share',
+            'status',
+            'wrappup-toggle'
+        ]
+    };
+});

plugins/embed/gui-themes/themes/zeit-online/container.dust

@@ -0,0 +1,23 @@
+{>"themeBase/container"/}
+
+{! Empty default blocks !}
+
+{<headerContainer}
+{/headerContainer}
+
+{<footerContainer}
+{/footerContainer}
+
+{<contentTopContainer}
+	<div class="liveblog-content-top">
+		<div class="liveblog-content-top-bar">
+			{+contentTop}
+				{+status}{/status}
+				{+statusNewPost}{/statusNewPost}
+			{/contentTop}
+		</div>
+	</div>
+{/contentTopContainer}
+
+{<contentBottomContainer}
+{/contentBottomContainer}

plugins/embed/gui-themes/themes/zeit-online/item/base.dust

@@ -0,0 +1,48 @@
+{>"themeBase/item/base"/}
+
+{! Attention! Opening tag in headerContainer … !}
+{<headerContainer}
+	<div class="liveblog-post">
+		<div class="post-header">
+			{+header}{/header}
+		</div>
+{/headerContainer}
+
+{! … closing tag in footerContainer !}
+{<footerContainer}
+		<div class="post-footer">
+			{+footer}{/footer}
+		</div>
+	</div>
+	{+shareContainer}{/shareContainer}
+{/footerContainer}
+
+{<contentSideContainer}{/contentSideContainer}
+
+{<header}
+	<div class="post-header-meta">
+		{+verificationLabel}{/verificationLabel}
+		{+splitedTimeContainer}{/splitedTimeContainer}
+		{+splitedDateContainer}{/splitedDateContainer}
+	</div>
+	<div class="post-header-user">
+		{+userInfo}
+			{+userNameContainer}{/userNameContainer}
+			{+userAvatar}{/userAvatar}
+		{/userInfo}
+	</div>
+{/header}
+
+{<footer}{/footer}
+
+{<share}
+	{+socialShare}{/socialShare}
+{/share}
+
+{<splitedDateContainer}
+	<span class="post-datetime">{PublishedOn|splitted-post-date}</span>
+{/splitedDateContainer}
+
+{<splitedTimeContainer}
+	<span class="post-time">{PublishedOn|splitted-post-time}</span>
+{/splitedTimeContainer}

plugins/embed/gui-themes/themes/zeit-online/item/predefined/scorecard.dust

@@ -0,0 +1,3 @@
+{>"themeBase/item/posttype/base"/}
+{<itemClass}scorecard{/itemClass}
+{<userInfo}{/userInfo}