summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-09-16 20:37:29 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-09-16 20:37:29 +0200
commitd099f00e9aa1b8569f5bc8bbd3b76d1d1466cf96 (patch)
tree4490b49bd82258330b59e25bb4ce6d54de7e2999
parent637e6b9642083e9d0f93fed36ddc97b01244184c (diff)
use default favicon for compact view if none given
-rw-r--r--css/content.css5
-rw-r--r--css/navigation.css2
-rw-r--r--templates/part.content.php7
3 files changed, 12 insertions, 2 deletions
diff --git a/css/content.css b/css/content.css
index 9e99dd7f1..9cc317897 100644
--- a/css/content.css
+++ b/css/content.css
@@ -353,6 +353,11 @@
background-color: #000;
}
+#app-content .enclosure-error {
+ line-height: 1.5;
+ height: 40px;
+}
+
/**
* Article body
*/
diff --git a/css/navigation.css b/css/navigation.css
index 6202a5c7e..f733852d3 100644
--- a/css/navigation.css
+++ b/css/navigation.css
@@ -83,7 +83,7 @@
background-image: url('../img/starred.png');
}
-#app-navigation .icon-rss {
+.icon-rss {
background-image: url('../img/rss.svg') !important;
}
diff --git a/templates/part.content.php b/templates/part.content.php
index c91e83ff2..14eeb93b5 100644
--- a/templates/part.content.php
+++ b/templates/part.content.php
@@ -20,6 +20,7 @@
<li class="util-spacer"></li>
<li class="title only-in-compact"
title="{{ item.title }}"
+ ng-class="{'icon-rss': !Content.getFeed(item.feedId).faviconLink }"
ng-style="{ backgroundImage: 'url(' + Content.getFeed(item.feedId).faviconLink + ')'}">
<h1><a>{{ item.title }}</a></h1>
</li>
@@ -68,8 +69,12 @@
<div class="enclosure" ng-if="item.enclosureLink">
<news-enclosure type="{{ item.enclosureMime }}"
link="{{ item.enclosureLink }}">
+ <p class="enclosure-error">
+ <?php p($l->t('Browser can not play media type')) ?>
+ {{ item.enclosureMime }}
+ </p>
<a class="button"
- ng-href="{{ item.enclosureLink | trustUrl}}"
+ ng-href="{{ item.enclosureLink | trustUrl }}"
target="_blank">
<?php p($l->t('Download')) ?>
</a>