Skip to content

Commit

Permalink
Merge commit 'e7b05c2682317deed4fe2446627513411b236acc'
Browse files Browse the repository at this point in the history
  • Loading branch information
nistormihai committed Sep 17, 2015
2 parents 75db81d + e7b05c2 commit 267dbad
Show file tree
Hide file tree
Showing 145 changed files with 2,239 additions and 77 deletions.
22 changes: 11 additions & 11 deletions plugins/embed/gui-resources/scripts/js/build/main.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions plugins/embed/gui-resources/scripts/js/build/themes/rhrnt.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
liveblog.define("themeFile",[],function(){return{environments:{desktop:"desktop","default":"desktop"}}});

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
liveblog.define("themeFile",[],function(){return{environments:{desktop:"desktop","default":"desktop"}}});

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions plugins/embed/gui-themes/themes/base/item/posttype/image.dust
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

{<contentExternal}
{+extenalImageContainer}{/extenalImageContainer}
{+externalTextContainer}{/externalTextContainer}
{/contentExternal}

{<externalImageLink}
Expand All @@ -25,3 +26,7 @@
{<externalImageAlt}
{Meta.caption}
{/externalImageAlt}

{<externalText}
{Meta.caption}
{/externalText}
9 changes: 9 additions & 0 deletions plugins/embed/gui-themes/themes/zeit-classic.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
define(function() {
'use strict';
return {
environments: {
'desktop': 'desktop',
'default': 'desktop'
}
};
});
22 changes: 22 additions & 0 deletions plugins/embed/gui-themes/themes/zeit-classic/desktop.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
'use strict';

define([
'css!theme/liveblog',
'plugins/button-pagination',
'plugins/twitter-widgets',
'plugins/post-hash',
'plugins/social-share',
'tmpl!theme/container',
'tmpl!theme/item/base'
], function() {
liveblog.hashmark = '?';
liveblog.hashaddition = '#livedesk-root';
return {
plugins: [
'button-pagination',
'twitter-widgets',
'post-hash',
'social-share'
]
};
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{>"themeBase/container"/}
{<mainContainer}
<div id="livedesk-root" {+additionalAttributes}{/additionalAttributes} data-gimme="blog.view">
{+main}
<div class="liveblog-container">

{+contentContainer}
<div class="liveblog-content">
{+content}
{+contentTopContainer}
<div class="liveblog-content-top">
{+contentTop}
{+status}{/status}
{+actionTotop}{/actionTotop}
{/contentTop}
</div>
{/contentTopContainer}

{+contentMiddleContainer}
<div class="liveblog-content-middle">
{+contentMiddle}
{+postsList}{/postsList}
{/contentMiddle}
</div>
{/contentMiddleContainer}

{+contentBottomContainer}
{/contentBottomContainer}
{/content}
</div>
{/contentContainer}

{+footer}
{/footer}
</div>
{/main}
</div>
{/mainContainer}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{>"themeBase/item/base"/}

{<headerContainer}
{/headerContainer}

{<contentMainBody}
<div class="post-info">
{+postDateContainer}{/postDateContainer}
{+userNameContainer}{/userNameContainer}
{+shareContainer}{/shareContainer}
</div>
{+commentBefore}{/commentBefore}
{+contentMainFull}
<div class="post-content-full">
{+contentFull}
{+contentCoreContainer}
<div class="post-core-content">
{+contentCore}
{/contentCore}
</div>
{/contentCoreContainer}
{+contentAttrContainer}

{/contentAttrContainer}
{/contentFull}
</div>
{/contentMainFull}
{+commentAfter}{/commentAfter}
{/contentMainBody}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{>"themeBase/item/posttype/image"/}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{>"themeBase/item/posttype/link"/}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{>"themeBase/item/posttype/normal"/}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{>"themeBase/item/posttype/quote"/}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{>"themeBase/item/posttype/wrapup"/}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{>"themeBase/item/source/comments"/}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{>"themeBase/item/source/facebook"/}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{>"themeBase/item/source/flickr"/}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{>"themeBase/item/source/google"/}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{>"themeBase/item/source/google/images"/}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{>"themeBase/item/source/google/news"/}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{>"themeBase/item/source/google/web"/}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{>"themeBase/item/source/instagram"/}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{>"themeBase/item/source/sms"/}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{>"themeBase/item/source/soundcloud"/}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{>"themeBase/item/source/twitter"/}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{>"themeBase/item/source/youtube"/}
Loading

0 comments on commit 267dbad

Please sign in to comment.