diff --git a/Changelog.md b/Changelog.md index d7ef6bc7d..ee9bb71b2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,6 +4,7 @@ A new feature [has been added](https://github.com/diaspora/diaspora/pull/4602) to allow pods to report extra statistics. Automatically after this code change, the route /statistics.json contains some basic data that was also available before via page headers (pod name, version, status of signups). But also, optionally podmins can enable user and post counts in the diaspora.yml configuration file. The counts are by default switched off, so if you want to report the total user, active user and local post counts, please edit your diaspora.yml configuration with the example values in diaspora.yml.example and uncomment the required lines as indicated. ## Refactor +* Remove old SPV code [#4612](https://github.com/diaspora/diaspora/pull/4612) * Move non-model federation stuff into lib/ [#4363](https://github.com/diaspora/diaspora/pull/4363) * Build a color palette to uniform color usage [#4437](https://github.com/diaspora/diaspora/pull/4437) [#4469](https://github.com/diaspora/diaspora/pull/4469) [#4479](https://github.com/diaspora/diaspora/pull/4479) * Rename bitcoin_wallet_id setting to bitcoin_address [#4485](https://github.com/diaspora/diaspora/pull/4485) diff --git a/app/assets/javascripts/app/models/post.js b/app/assets/javascripts/app/models/post.js index 12ba81cc5..51623c5ae 100644 --- a/app/assets/javascripts/app/models/post.js +++ b/app/assets/javascripts/app/models/post.js @@ -15,14 +15,6 @@ app.models.Post = Backbone.Model.extend(_.extend({}, app.models.formatDateMixin, } }, - setFrameName : function(){ - this.set({frame_name : new app.models.Post.TemplatePicker(this).getFrameName()}) - }, - - applicableTemplates: function() { - return new app.models.Post.TemplatePicker(this).applicableTemplates() - }, - interactedAt : function() { return this.timeOf("interacted_at"); }, @@ -67,13 +59,4 @@ app.models.Post = Backbone.Model.extend(_.extend({}, app.models.formatDateMixin, hasText : function(){ return $.trim(this.get("text")) !== "" } -}), { - headlineLimit : 118, - - frameMoods : [ - "Wallpaper", - "Vanilla", - "Typist", - "Fridge" - ] -}); +})); diff --git a/app/assets/javascripts/app/models/post/template_picker.js b/app/assets/javascripts/app/models/post/template_picker.js deleted file mode 100644 index faaa424a5..000000000 --- a/app/assets/javascripts/app/models/post/template_picker.js +++ /dev/null @@ -1,35 +0,0 @@ -//require ../post - -app.models.Post.TemplatePicker = function(model){ - this.model = model -} - -_.extend(app.models.Post.TemplatePicker.prototype, { - getFrameName : function getFrameName() { - var frameName - - if(this.isNewspaper()){ - frameName = "Typist" - } else if(this.isWallpaper()) { - frameName = "Wallpaper" - } else { - frameName = "Vanilla" - } - - return frameName - }, - - isNewspaper : function(){ - return this.model.get("text").length > 300 - }, - - isWallpaper : function(){ - return this.model.get("photos").length == 1 - }, - - applicableTemplates : function(){ - /* don't show the wallpaper option if there is no image */ - var moods = app.models.Post.frameMoods; - return (!this.isWallpaper() ? _.without(moods, "Wallpaper") : moods) - } -}); \ No newline at end of file diff --git a/app/assets/javascripts/app/pages/post-viewer.js b/app/assets/javascripts/app/pages/post-viewer.js deleted file mode 100644 index 237fdd3f1..000000000 --- a/app/assets/javascripts/app/pages/post-viewer.js +++ /dev/null @@ -1,107 +0,0 @@ -app.pages.PostViewer = app.views.Base.extend({ - templateName: "post-viewer", - - subviews : { - "#post-content" : "postView", - "#post-nav" : "navView", - "#post-interactions" : "interactionsView", - "#author-info" : "authorView" - }, - - initialize : function(options) { - this.model = new app.models.Post({ id : options.id }); - this.model.preloadOrFetch().done(_.bind(this.initViews, this)); - this.model.interactions.fetch() //async, yo, might want to throttle this later. - - this.bindEvents() - }, - - initViews : function() { - /* init view */ - this.authorView = new app.views.PostViewerAuthor({ model : this.model }); - this.interactionsView = new app.views.PostViewerInteractions({ model : this.model }); - this.navView = new app.views.PostViewerNav({ model : this.model }); - this.postView = app.views.Post.showFactory(this.model) - - this.render(); - }, - - bindEvents : function(){ - this.prepIdleHooks(); - this.bindNavHooks(); - - $(document).bind("keypress", _.bind(this.commentAnywhere, this)) - $(document).bind("keypress", _.bind(this.invokePane, this)) - $(document).bind("keyup", _.bind(this.closePane, this)) - }, - - unbind : function(){ - $(document).unbind("idle.idleTimer") - $(document).unbind("active.idleTimer") - $(document).unbind('keydown') - $(document).unbind('keypress') - $(document).unbind('keyup') - }, - - prepIdleHooks : function () { - $.idleTimer(3000); - - $(document).bind("idle.idleTimer", function(){ - $("body").addClass('idle'); - }); - - $(document).bind("active.idleTimer", function(){ - $("body").removeClass('idle'); - }); - }, - - bindNavHooks : function() { - var model = this.model; - $(document).keydown(function(evt){ - // prevent nav from happening if the user is using the arrow keys to navigate through their comment text - if($(evt.target).is("textarea")) { return } - - switch(evt.keyCode) { - case KEYCODES.LEFT: - app.router.navigate(model.get("next_post"), true); break; - case KEYCODES.RIGHT: - app.router.navigate(model.get("previous_post"), true); break; - default: - break; - } - }) - }, - - postRenderTemplate : function() { - if(this.model.get("title")){ - // formats title to html... - var html_title = app.helpers.textFormatter(this.model.get("title"), this.model); - //... and converts html to plain text - document.title = $('
').html(html_title).text(); - } - }, - - commentAnywhere : function(evt) { - /* ignore enter, space bar, arrow keys */ - if(_.include([KEYCODES.RETURN, KEYCODES.SPACE, KEYCODES.LEFT, - KEYCODES.UP, KEYCODES.RIGHT, KEYCODES.DOWN], evt.keyCode) || - this.modifierPressed(evt) ) { return } - - this.interactionsView.invokePane(); - $('#new-post-comment textarea').focus(); - }, - - invokePane : function(evt) { - if(evt.keyCode != KEYCODES.SPACE) { return } - this.interactionsView.invokePane(); - }, - - closePane : function(evt) { - if(evt.keyCode != KEYCODES.ESC) { return } - this.interactionsView.hidePane(); - }, - - modifierPressed: function(evt) { - return (evt.altKey || evt.ctrlKey || evt.shiftKey); - } -}); diff --git a/app/assets/javascripts/app/router.js b/app/assets/javascripts/app/router.js index 169c1e32c..e75de9944 100644 --- a/app/assets/javascripts/app/router.js +++ b/app/assets/javascripts/app/router.js @@ -2,8 +2,6 @@ app.Router = Backbone.Router.extend({ routes: { //new hotness "posts/:id": "singlePost", - "posts/:id/next": "siblingPost", - "posts/:id/previous": "siblingPost", "p/:id": "singlePost", //oldness @@ -28,17 +26,6 @@ app.Router = Backbone.Router.extend({ this.renderPage(function(){ return new app.pages.SinglePostViewer({ id: id })}); }, - siblingPost : function(){ //next or previous - var post = new app.models.Post(); - post.bind("change", setPreloadAttributesAndNavigate) - post.fetch({url : window.location}) - - function setPreloadAttributesAndNavigate(){ - window.gon.preloads.post = post.attributes - app.router.navigate(post.url(), {trigger:true, replace: true}) - } - }, - renderPage : function(pageConstructor){ app.page && app.page.unbind && app.page.unbind() //old page might mutate global events $(document).keypress, so unbind before creating app.page = pageConstructor() //create new page after the world is clean (like that will ever happen) diff --git a/app/assets/javascripts/app/views/post-viewer/author.js b/app/assets/javascripts/app/views/post-viewer/author.js deleted file mode 100644 index af8e0aee2..000000000 --- a/app/assets/javascripts/app/views/post-viewer/author.js +++ /dev/null @@ -1,15 +0,0 @@ -app.views.PostViewerAuthor = app.views.Base.extend({ - - id : "post-author", - className : "media", - - tooltipSelector : ".profile-image-container", - - templateName: "post-viewer/author", - - initialize : function() { - /* add a class so we know how to color the text for the author name */ - this.$el.addClass(this.model.get("frame_name")) - } - -}); \ No newline at end of file diff --git a/app/assets/javascripts/app/views/post-viewer/feedback.js b/app/assets/javascripts/app/views/post-viewer/feedback.js deleted file mode 100644 index 18437bd4e..000000000 --- a/app/assets/javascripts/app/views/post-viewer/feedback.js +++ /dev/null @@ -1,34 +0,0 @@ -//= require ../feedback_view - -app.views.PostViewerFeedback = app.views.Feedback.extend({ - id : "user-controls", - className : "", - - templateName: "post-viewer/feedback", - - subviews : { - ".feedback-actions" : "feedbackActions" - }, - - events :_.extend({}, app.views.Feedback.prototype.events, { - "click *[rel='invoke-interaction-pane']" : "invokePane", - "click *[rel='hide-interaction-pane']" : "hidePane" - }), - - initViews : function(){ - this.feedbackActions = new app.views.FeedbackActions({model : this.model}) - }, - - postRenderTemplate : function() { - this.sneakyVisiblity() - }, - - sneakyVisiblity : function() { - if(!$("#post-info").is(":visible")) { - this.$("#post-info-sneaky").removeClass('passive') - } - }, - - invokePane : function(evt){ this.trigger("invokePane") }, - hidePane : function(evt){ this.trigger("hidePane") }, -}); diff --git a/app/assets/javascripts/app/views/post-viewer/interactions.js b/app/assets/javascripts/app/views/post-viewer/interactions.js deleted file mode 100644 index b9206ee2a..000000000 --- a/app/assets/javascripts/app/views/post-viewer/interactions.js +++ /dev/null @@ -1,56 +0,0 @@ -app.views.PostViewerInteractions = app.views.Base.extend({ - - className : "", - - subviews : { - "#post-feedback" : "feedbackView", - "#post-reactions" : "reactionsView", - "#new-post-comment" : "newCommentView" - }, - - templateName: "post-viewer/interactions", - - initialize : function() { - this.initViews(); - - this.feedbackView && this.feedbackView.bind("invokePane", this.invokePane, this) - this.feedbackView && this.feedbackView.bind("hidePane", this.hidePane, this) - }, - - initViews : function() { - this.reactionsView = new app.views.PostViewerReactions({ model : this.model.interactions }) - - /* subviews that require user */ - this.feedbackView = new app.views.PostViewerFeedback({ model : this.model }) - if(app.currentUser.authenticated()) { - this.newCommentView = new app.views.PostViewerNewComment({ model : this.model }) - } - }, - - togglePane : function(evt) { - if(evt) { evt.preventDefault() } - $("#post-interactions").toggleClass("active") - this.$("#post-info").slideToggle(300) - this.removeTooltips() - }, - - invokePane : function() { - if(!this.$("#post-info").is(":visible")) { - this.$("#post-info-sneaky").addClass("passive") - this.togglePane() - } - }, - - hidePane : function() { - if(this.$("#post-info").is(":visible")) { - - /* it takes about 400ms for the pane to hide. we need to keep - * the sneaky hidden until the slide is complete */ - setTimeout(function(){ - this.$("#post-info-sneaky").removeClass("passive") - }, 400) - - this.togglePane() - } - } -}); \ No newline at end of file diff --git a/app/assets/javascripts/app/views/post-viewer/nav.js b/app/assets/javascripts/app/views/post-viewer/nav.js deleted file mode 100644 index 575a42493..000000000 --- a/app/assets/javascripts/app/views/post-viewer/nav.js +++ /dev/null @@ -1,3 +0,0 @@ -app.views.PostViewerNav = app.views.Base.extend({ - templateName: "post-viewer/nav" -}); \ No newline at end of file diff --git a/app/assets/javascripts/app/views/post/mood_view.js b/app/assets/javascripts/app/views/post/mood_view.js deleted file mode 100644 index 14748bc3a..000000000 --- a/app/assets/javascripts/app/views/post/mood_view.js +++ /dev/null @@ -1,66 +0,0 @@ -//= require ../post_view -app.views.Post.Mood = app.views.Post.extend({ - templateName : "mood", - className : "post loaded", - tagName : "article", - subviews : { "section.photo_viewer" : "photoViewer" }, - - initialize : function(){ - $(this.el).addClass(this.mood) - }, - - presenter : function(){ - var model = this.model - return _.extend(this.defaultPresenter(), { - headline : $(app.helpers.textFormatter(model.headline(), model)).html(), - body : app.helpers.textFormatter(model.body(), model) - }) - }, - - photoViewer : function(){ - return new app.views.PhotoViewer({ model : this.model }) - }, - - postRenderTemplate : function(){ - if(this.model.body().length < 200){ - this.$('section.body').addClass('short_body'); - } - } -}); - -app.views.Post.Day = app.views.Post.Mood.extend({ - mood : "day" -}) - -app.views.Post.Night = app.views.Post.Mood.extend({ - mood : "night" -}) - -app.views.Post.Newspaper = app.views.Post.Mood.extend({ - mood : "newspaper" -}) - -app.views.Post.Wallpaper = app.views.Post.Mood.extend({ - mood : "wallpaper", - templateName : "wallpaper-mood", - - - presenter : function(){ - var backgroundPhoto = _.first(this.model.get("photos") || []) - return _.extend(app.views.Post.Mood.prototype.presenter.call(this), { - backgroundUrl : backgroundPhoto && backgroundPhoto.sizes.large - }) - } -}) - -app.views.Post.Typist = app.views.Post.Mood.extend({ - mood : "typist" -}) - -app.views.Post.Vanilla = app.views.Post.Mood.extend({ - mood : "vanilla" -}) - -app.views.Post.Fridge = app.views.Post.Mood.extend({ - mood : "fridge" -}) \ No newline at end of file diff --git a/app/assets/javascripts/app/views/post_view.js b/app/assets/javascripts/app/views/post_view.js index 7d3e25173..7d45e6bdf 100644 --- a/app/assets/javascripts/app/views/post_view.js +++ b/app/assets/javascripts/app/views/post_view.js @@ -14,38 +14,4 @@ app.views.Post = app.views.Base.extend({ showPost : function() { return (app.currentUser.get("showNsfw")) || !this.model.get("nsfw") } -}, { //static methods below - - showFactory : function(model) { - var frameName = model.get("frame_name"); - - //translate obsolete template names to the new Moods, should be removed when template picker comes client side. - var map = { - 'status-with-photo-backdrop' : 'Wallpaper', //equivalent - 'status' : 'Day', //equivalent - 'note' : 'Newspaper', //equivalent - 'photo-backdrop' : 'Day' //that theme was bad - } - - frameName = map[frameName] || frameName - - return new app.views.Post[frameName]({ - model : model - }) - - function legacyShow(model) { - return new app.views.Post.Legacy({ - model : model, - className : frameName + " post loaded", - templateName : "post-viewer/content/" + frameName - }); - } - } }); - -app.views.Post.Legacy = app.views.Post.extend({ - tagName : "article", - initialize : function(options) { - this.templateName = options.templateName || this.templateName - } -}) diff --git a/app/assets/javascripts/app/views/post-viewer/new_comment.js b/app/assets/javascripts/app/views/single-post-viewer/new_comment.js similarity index 94% rename from app/assets/javascripts/app/views/post-viewer/new_comment.js rename to app/assets/javascripts/app/views/single-post-viewer/new_comment.js index f31da66ca..3ec049b1d 100644 --- a/app/assets/javascripts/app/views/post-viewer/new_comment.js +++ b/app/assets/javascripts/app/views/single-post-viewer/new_comment.js @@ -1,6 +1,6 @@ app.views.PostViewerNewComment = app.views.Base.extend({ - templateName: "post-viewer/new-comment", + templateName: "single-post-viewer/new-comment", events : { "click button" : "createComment", @@ -39,4 +39,4 @@ app.views.PostViewerNewComment = app.views.Base.extend({ $(this.scrollableArea).scrollTop($(this.scrollableArea).prop("scrollHeight")) } -}); \ No newline at end of file +}); diff --git a/app/assets/javascripts/app/views/post-viewer/reactions.js b/app/assets/javascripts/app/views/single-post-viewer/reactions.js similarity index 96% rename from app/assets/javascripts/app/views/post-viewer/reactions.js rename to app/assets/javascripts/app/views/single-post-viewer/reactions.js index 26b11030d..393c8243a 100644 --- a/app/assets/javascripts/app/views/post-viewer/reactions.js +++ b/app/assets/javascripts/app/views/single-post-viewer/reactions.js @@ -2,7 +2,7 @@ app.views.PostViewerReactions = app.views.Base.extend({ className : "", - templateName: "post-viewer/reactions", + templateName: "single-post-viewer/reactions", tooltipSelector : ".avatar", diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss index 4904c2987..d5942bf20 100644 --- a/app/assets/stylesheets/new_styles/_base.scss +++ b/app/assets/stylesheets/new_styles/_base.scss @@ -42,218 +42,6 @@ a { color : $link-blue } color: inherit; } -#author-info { - position : absolute; - z-index : 300; - - .author-name { - color: #555; - } - - .bd { - margin-top : 5px; - display: inline-block; - } - - .post-time, - .icon-retweet { - color: #555; - @include opacity(0.5); - } -} - -#post-author { - margin : 0; - padding : 10px; - - &.status-with-photo-backdrop, - &.Wallpaper { - .author-name { - color : #fff; - } - - .post-time, - .icon-retweet { - color: #fff; - @include opacity(0.5); - } - } -} - -.post-view { - display: table; - height: 100%; - width: 100%; -} - -#post-content { - display: table; - position: absolute; - - height: 93%; - width: 100%; - - img, - iframe { - @include photo-shadow(); - } - - iframe { - width: 857px; - height: 480px; - max-width: 100%; - } - - .opengraph { - a { - text-decoration: none; - color: #000; - } - h2 { - margin-bottom: 20px; - } - img { - margin-bottom: 20px; - } - } -} - -article { //mood posts - //default frame show styles - $big-text-size : 2.5em; - $medium-text-size : 1.5em; - $small-text-size: 1em; - width: 960px; - margin: 0 auto; - - img { - max-height: 70%; - border : 10px solid #fff; - } - - .photo_viewer { - margin-bottom : 20px; - } - - @include centered-frame(); - .container { - padding: 70px 0; - max-width: 85%; - } - - header { - padding : 0 100px; - } - - header, header p{ - //big text - @include media-text(); - font-size: $big-text-size; - line-height: 1.5em; - } - - section.body{ - p { font-size: $small-text-size; } - - &.short_body{ - p{ - font-size: $medium-text-size; - margin-top: .5em; - } - } - } - - &.night{ - background-color : $night-background-color; - color : $night-text-color; - - #author-info { - color : $night-text-color; - } - } - - &.newspaper { - @include newspaper-type(); - - text-align: left; - - .container { - max-width: 600px; - } - - .photo_viewer { - float: right; - margin-left: 20px; - max-width: 320px; - } - - header { - margin-bottom: 1em; - line-height: 1.2em; - } - - .body p { - @include newspaper-type(); - font-size: 1.2em; - line-height: 1.7em; - margin-bottom: 1.2em; - } - } - - &.wallpaper{ - color : #fff; - } - - .img-bounding-box { - margin : 10px; - display : inline-block; - text-align : left; - } - - img { - max-height: 400px; - max-width: 400px; - } -} - -.status-with-photo-backdrop { - p { - color: #fff; - - a { - @include transition(background-color, 0.3s); - - color: #000; - background-color: #fff; - background-color: rgba(255,255,255,0.7); - padding: 0 5px; - - &:hover { - text-decoration: none; - background-color: #fff; - background-color: rgba(255,255,255,1); - } - } - } -} - -.darken { - position: absolute; - top: 0; - left: 0; - height: 100%; - width: 100%; - background-color: rgba(0,0,0,0.3); - - display: table; - - .darken-content { - @include centered-frame(); - height: 100%; - width: 100%; - } -} - .photo-fill { @include background-cover(); position: absolute; @@ -263,21 +51,6 @@ article { //mood posts width: 100%; } -.photo-backdrop { - p { - color: #fff; - z-index: 2; - } - - img { - position: relative; - } - - .photo-fill { - @include opacity(0.2) - } -} - $bring-dark-accent-forward-color: #DDD; #top-right-nav { diff --git a/app/assets/stylesheets/new_styles/_interactions.scss b/app/assets/stylesheets/new_styles/_interactions.scss index 78c4f82b5..a0e12d638 100644 --- a/app/assets/stylesheets/new_styles/_interactions.scss +++ b/app/assets/stylesheets/new_styles/_interactions.scss @@ -1,22 +1,6 @@ @import '../mixins'; -#post-interactions { - position: fixed; - width: 100%; - bottom: 0; - left: 0; - text-align: center; -} - -#post-reactions { - height: 80%; - max-height: 350px; - overflow: auto; - margin-top: 5px; -} - -#post-info, -#post-info-sneaky { +#post-info { text-align: center; z-index: 10; @@ -69,16 +53,6 @@ padding-top: 0; } - #new-post-comment { - -webkit-box-shadow: 0 -3px 6px -5px rgba(0,0,0,0.8); - -moz-box-shadow: 0 -3px 6px -5px rgba(0,0,0,0.8); - box-shadow: 0 -3px 6px -5px rgba(0,0,0,0.8); - - border-top: 1px solid #444; - text-align: left; - background-image: image-url("texture/hatched-dark.png"); - } - #new-post-comment-container { position: relative; @@ -105,58 +79,6 @@ } } -#post-info-sneaky { - @include transition(all, 0.2s); - - z-index: 1; - position: fixed; - width: 100%; - margin: 0; - padding: 0; - bottom: 0; - - margin-bottom: -60px; - min-height: 20px; - - #post-info-container-sneaky { - @include info-container(); - - padding: 10px 0; - min-height: 20px; - } -} - -.home-button { - @include transition(opacity, 0.3s); - @include opacity(0.6); - - position: absolute; - left: 2px; - top: 4px; - - padding: 4px 6px; - - &:hover { - @include opacity(1); - } -} - -.invoker { - display: block; - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; -} - -#post-feedback:hover { - #post-info-sneaky:not(.passive) { - @include opacity(1); - margin-bottom: -13px; - } -} - .comment-content h1, .comment-content h2, .comment-content h3, .comment-content h4, .comment-content h5, .comment-content h6 { color: white; text-shadow: 1px 1px black; @@ -277,44 +199,6 @@ } } -#post-feedback { -/* fixes flicker on hover... no idea as to why */ - position: relative; - z-index: 30; -} - -#close-reactions-pane { - display: none; - - text-align: center; - position: absolute; - width: 100%; - left: 0; - top: -3px; - - #close-reactions-pane-container { - @include pane-width(); - top: 0; - - min-height: 30px; - display: inline-block; - position: relative; - } -} - -#post-interactions.active #close-reactions-pane { - display: block; -} - -.info-tick { - @include opacity(0.8); - - position: absolute; - right: 8px; - top: 8px; -} - - /* stream specific wrapper */ #stream-interactions { position : fixed; diff --git a/app/assets/stylesheets/new_styles/_viewer_nav.scss b/app/assets/stylesheets/new_styles/_viewer_nav.scss index 2379f4be1..36b847652 100644 --- a/app/assets/stylesheets/new_styles/_viewer_nav.scss +++ b/app/assets/stylesheets/new_styles/_viewer_nav.scss @@ -1,10 +1,5 @@ @import '../mixins'; -#post-nav { - @include transition(opacity, 0.5s); - @include opacity(1); -} - body.idle { #post-nav { @include opacity(0); @@ -21,51 +16,3 @@ body.idle { } } - -.nav-arrow { - @include opacity(0.8); - @include transition(all, 0.3s); - - display: table; - - position: fixed; - height: 100%; - z-index: 3; - top: 0; - padding: 0 1.2%; - - background-color: rgba(0,0,0,0); - - .nav-arrow-inner { - padding: 0; margin: 0; - display: table-cell; - vertical-align: middle; - } - - img { - @include opacity(0.5); - - height: 30px; - width: 30px; - - /* half the size of the nav arrows on mobile phones */ - @media (max-width: 480px) { - height: 15px; - width: 15px; - } - } - - &.left { - left: 0; - padding-right: 19px; - } - - &.right { - right: 0; - padding-left: 19px; - } - - &:hover { - background-color: rgba(0,0,0,0.1) - } -} diff --git a/app/assets/templates/post-viewer/author_tpl.jst.hbs b/app/assets/templates/post-viewer/author_tpl.jst.hbs deleted file mode 100644 index 3828014cc..000000000 --- a/app/assets/templates/post-viewer/author_tpl.jst.hbs +++ /dev/null @@ -1,25 +0,0 @@ -
- {{#linkToPerson author}} -
- {{/linkToPerson}} -
- -
- {{#linkToPerson author}} - {{name}} - {{/linkToPerson}} - - {{#if root}} - - {{#linkToPerson root.author}} - {{name}} - {{/linkToPerson}} - {{/if}} - -
-
-
diff --git a/app/assets/templates/post-viewer/comment_tpl.jst.hbs b/app/assets/templates/post-viewer/comment_tpl.jst.hbs deleted file mode 100644 index 41f91d427..000000000 --- a/app/assets/templates/post-viewer/comment_tpl.jst.hbs +++ /dev/null @@ -1,27 +0,0 @@ -{{#if canRemove}} -
- -
- -
-{{/if}} - -
- {{#linkToPerson author}} -
- {{/linkToPerson}} -
- -
- - {{author.name}} - - -
- {{{text}}} -
- -
-
-
diff --git a/app/assets/templates/post-viewer/content/activity-streams-photo_tpl.jst.hbs b/app/assets/templates/post-viewer/content/activity-streams-photo_tpl.jst.hbs deleted file mode 100644 index 30e543995..000000000 --- a/app/assets/templates/post-viewer/content/activity-streams-photo_tpl.jst.hbs +++ /dev/null @@ -1,7 +0,0 @@ -
-
- - - -
-
diff --git a/app/assets/templates/post-viewer/content/note_tpl.jst.hbs b/app/assets/templates/post-viewer/content/note_tpl.jst.hbs deleted file mode 100644 index bb45a09d9..000000000 --- a/app/assets/templates/post-viewer/content/note_tpl.jst.hbs +++ /dev/null @@ -1,3 +0,0 @@ -
- {{{text}}} -
diff --git a/app/assets/templates/post-viewer/content/photo-backdrop_tpl.jst.hbs b/app/assets/templates/post-viewer/content/photo-backdrop_tpl.jst.hbs deleted file mode 100644 index 6afb41df1..000000000 --- a/app/assets/templates/post-viewer/content/photo-backdrop_tpl.jst.hbs +++ /dev/null @@ -1,4 +0,0 @@ -{{#each photos}} -
- -{{/each}} diff --git a/app/assets/templates/post-viewer/content/rich-media_tpl.jst.hbs b/app/assets/templates/post-viewer/content/rich-media_tpl.jst.hbs deleted file mode 100644 index 02aaa7c8e..000000000 --- a/app/assets/templates/post-viewer/content/rich-media_tpl.jst.hbs +++ /dev/null @@ -1,11 +0,0 @@ -
-
- - {{{o_embed_cache.data.html}}} - -
-
- - {{{text}}} -
-
diff --git a/app/assets/templates/post-viewer/content/status_tpl.jst.hbs b/app/assets/templates/post-viewer/content/status_tpl.jst.hbs deleted file mode 100644 index 05a443902..000000000 --- a/app/assets/templates/post-viewer/content/status_tpl.jst.hbs +++ /dev/null @@ -1 +0,0 @@ -{{{text}}} diff --git a/app/assets/templates/post-viewer/feedback_tpl.jst.hbs b/app/assets/templates/post-viewer/feedback_tpl.jst.hbs deleted file mode 100644 index 1eacdf1dc..000000000 --- a/app/assets/templates/post-viewer/feedback_tpl.jst.hbs +++ /dev/null @@ -1,18 +0,0 @@ -