From 32ca5cc16d6b1014861e84f032235c4d166b6ce8 Mon Sep 17 00:00:00 2001
From: Faldrian <faldrian@och-noe.de>
Date: Sun, 8 Feb 2015 17:24:16 +0100
Subject: [PATCH 1/2] removed css-spill on reshare link in stream

---
 app/assets/stylesheets/stream_element.css.scss           | 2 +-
 app/assets/stylesheets/stream_element_blueprint.css.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/stream_element.css.scss b/app/assets/stylesheets/stream_element.css.scss
index f8ef5b3ae..33a2f031f 100644
--- a/app/assets/stylesheets/stream_element.css.scss
+++ b/app/assets/stylesheets/stream_element.css.scss
@@ -85,7 +85,7 @@
     }
   }
 
-  .reshare {
+  div.reshare {
     border-left: 2px solid $border-grey;
     margin-top: 3px;
 
diff --git a/app/assets/stylesheets/stream_element_blueprint.css.scss b/app/assets/stylesheets/stream_element_blueprint.css.scss
index e91fa9e1e..db787361c 100644
--- a/app/assets/stylesheets/stream_element_blueprint.css.scss
+++ b/app/assets/stylesheets/stream_element_blueprint.css.scss
@@ -202,7 +202,7 @@
   }
 }
 
-.stream_element .post-content .reshare {
+.stream_element .post-content div.reshare {
   border-left: 2px solid $border-grey;
 }
 

From 5d3145bf8fff8789e249bc7014fdd92678126b6f Mon Sep 17 00:00:00 2001
From: Faldrian <faldrian@och-noe.de>
Date: Sun, 8 Feb 2015 19:32:50 +0100
Subject: [PATCH 2/2] added avatar error correction on core view rendering

---
 app/assets/javascripts/app/views.js | 11 +++++++++++
 app/assets/javascripts/view.js      | 10 ----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/app/views.js b/app/assets/javascripts/app/views.js
index 001ad5840..9605dd966 100644
--- a/app/assets/javascripts/app/views.js
+++ b/app/assets/javascripts/app/views.js
@@ -46,6 +46,10 @@ app.views.Base = Backbone.View.extend({
     this.$el
       .html(this.template(presenter))
       .attr("data-template", _.last(this.templateName.split("/")));
+
+    // add avatar fallback if it can't be loaded
+    this.$el.find(this.avatars.selector).error(this.avatars.fallback);
+
     this.postRenderTemplate();
   },
 
@@ -136,6 +140,13 @@ app.views.Base = Backbone.View.extend({
         });
     }
   },
+
+  avatars: {
+    fallback: function(evt) {
+      $(this).attr("src", ImagePaths.get("user/default.png"));
+    },
+    selector: "img.avatar"
+  }
 });
 
 app.views.StaticContentView = app.views.Base.extend({
diff --git a/app/assets/javascripts/view.js b/app/assets/javascripts/view.js
index 7220d511c..a833bd035 100644
--- a/app/assets/javascripts/view.js
+++ b/app/assets/javascripts/view.js
@@ -26,9 +26,6 @@ var View = {
       .on('click', this.dropdowns.selector, this.dropdowns.click)
       .on('keypress', this.dropdowns.selector, this.dropdowns.click);
 
-    /* Avatars */
-    $(this.avatars.selector).error(this.avatars.fallback);
-
     /* Clear forms after successful submit, this is some legacy dan hanson stuff, do we still want it? */
     $.fn.clearForm = function() {
       return this.each(function() {
@@ -107,13 +104,6 @@ var View = {
     },
     selector: ".dropdown > .toggle",
     parentSelector: ".dropdown > .wrapper"
-  },
-
-  avatars: {
-    fallback: function(evt) {
-      $(this).attr("src", ImagePaths.get("user/default.png"));
-    },
-    selector: "img.avatar"
   }
 };