fix image behavior in entries

src/main/java/com/commafeed/backend/feeds/FeedUtils.java

@@ -126,8 +126,8 @@ public class FeedUtils {
 			whitelist.addAttributes("colgroup", "span", "width");
 			whitelist.addAttributes("iframe", "src", "height", "width",
 					"allowfullscreen", "frameborder", "style");
-			whitelist.addAttributes("img", "alt", "height", "src", "title",
+			whitelist.addAttributes("img", "align", "alt", "height", "src",
-					"width");
+					"title", "width");
 			whitelist.addAttributes("ol", "start", "type");
 			whitelist.addAttributes("q", "cite");
 			whitelist.addAttributes("table", "border", "bordercolor",

src/main/webapp/sass/components/_entry-list.scss

@@ -104,16 +104,19 @@
 	font-weight: normal;
 }
 
-#feed-accordion .entry-body img {
-	display: block;
-}
-
 #feed-accordion  .entry-body-content {
 	max-width: 650px;
 	color: black;
+	padding-bottom: 10px;
+}
+
+#feed-accordion .entry-enclosure {
+	clear: both;
+	padding-top: 10px;
 }
 
 #feed-accordion .entry-buttons {
+	clear: both;
 	background-color: #fafafa;
 	padding: 3px 0px;
 	border-top: 1px solid #ebebeb;

src/main/webapp/templates/feeds.view.html

@@ -45,6 +45,7 @@
 
 				<div class="entry-body-content">
 					<div ng-bind-html-unsafe="entry.content"></div>
+					<div class="entry-enclosure" ui-if="entry.enclosureType">
 						<video controls ui-if="entry.enclosureType && entry.enclosureType.indexOf('video') == 0">
 							<source src="{{entry.enclosureUrl}}" type="{{entry.enclosureType}}" />
 						</video>
@@ -58,6 +59,7 @@
 							${global.download}
 						</a>
 					</div>
+				</div>
 				<div class="entry-buttons form-horizontal">
 				
 					<span class="star" ng-mouseup="star(entry, !entry.starred, $event)">