garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

fix image behavior in entries

Browse Source
This commit is contained in:
Athou
2013-06-26 15:48:06 +02:00
parent 7432bd510d
commit 322676e9e5
3 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/commafeed/backend/feeds/FeedUtils.java
View File

@@ -126,8 +126,8 @@ public class FeedUtils {
whitelist.addAttributes("colgroup", "span", "width"); whitelist.addAttributes("colgroup", "span", "width");
whitelist.addAttributes("iframe", "src", "height", "width", whitelist.addAttributes("iframe", "src", "height", "width",
"allowfullscreen", "frameborder", "style"); "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("ol", "start", "type");
whitelist.addAttributes("q", "cite"); whitelist.addAttributes("q", "cite");
whitelist.addAttributes("table", "border", "bordercolor", whitelist.addAttributes("table", "border", "bordercolor",

11
src/main/webapp/sass/components/_entry-list.scss
View File

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

24
src/main/webapp/templates/feeds.view.html
View File

@@ -45,18 +45,20 @@
<div class="entry-body-content"> <div class="entry-body-content">
<div ng-bind-html-unsafe="entry.content"></div> <div ng-bind-html-unsafe="entry.content"></div>
<video controls ui-if="entry.enclosureType && entry.enclosureType.indexOf('video') == 0"> <div class="entry-enclosure" ui-if="entry.enclosureType">
<source src="{{entry.enclosureUrl}}" type="{{entry.enclosureType}}" /> <video controls ui-if="entry.enclosureType && entry.enclosureType.indexOf('video') == 0">
</video> <source src="{{entry.enclosureUrl}}" type="{{entry.enclosureType}}" />
<audio controls ui-if="entry.enclosureType && entry.enclosureType.indexOf('audio') == 0"> </video>
<source src="{{entry.enclosureUrl}}" type="{{entry.enclosureType}}" /> <audio controls ui-if="entry.enclosureType && entry.enclosureType.indexOf('audio') == 0">
</audio> <source src="{{entry.enclosureUrl}}" type="{{entry.enclosureType}}" />
<div ui-if="entry.enclosureType && entry.enclosureType.indexOf('image') == 0"> </audio>
<img ng-src="{{entry.enclosureUrl}}" /> <div ui-if="entry.enclosureType && entry.enclosureType.indexOf('image') == 0">
<img ng-src="{{entry.enclosureUrl}}" />
</div>
<a href="{{entry.enclosureUrl}}" target="_blank" ui-if="entry.enclosureType" download>
${global.download}
</a>
</div> </div>
<a href="{{entry.enclosureUrl}}" target="_blank" ui-if="entry.enclosureType" download>
${global.download}
</a>
</div> </div>
<div class="entry-buttons form-horizontal"> <div class="entry-buttons form-horizontal">