summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--css/content.css24
-rw-r--r--templates/index.php3
-rw-r--r--templates/part.content.php98
-rw-r--r--templates/part.navigation.feed.php3
-rw-r--r--templates/part.settings.php4
5 files changed, 71 insertions, 61 deletions
diff --git a/css/content.css b/css/content.css
index 256bb3822..7cd0d2099 100644
--- a/css/content.css
+++ b/css/content.css
@@ -39,7 +39,6 @@
height: 100%;
}
-
#app-content-wrapper.autopaging:after {
content: '';
background-image: url('../img/loading.gif') no-repeat;
@@ -66,7 +65,7 @@
border-bottom: 1px solid #eee;
line-height: 52px;
box-sizing: border-box;
- padding: 5px 40px;
+ padding: 0 40px;
}
#app-content .utils ul {
@@ -83,15 +82,15 @@
}
#app-content .utils .util {
- padding: 5px 20px 5px 0;
+ padding: 9px 20px 9px 0;
}
#app-content .utils button,
#app-content .utils .external {
padding: 0;
margin: 0;
- height: 30px;
- width: 30px;
+ height: 24px;
+ width: 24px;
border: 0;
float: left;
background-color: transparent;
@@ -154,6 +153,16 @@
/**
* Source
*/
+ @media (max-width: 700px) {
+ #app-content .utils .source {
+ display: none;
+ }
+
+ #app-content .utils .date {
+ display: none;
+ }
+ }
+
#app-content .utils .source {
width: 200px;
text-overflow: ellipsis;
@@ -177,6 +186,7 @@
#app-content .date {
color: #aaa;
font-size: 15px;
+ padding-right: 40px;
white-space: nowrap;
}
@@ -185,7 +195,7 @@
*/
#app-content .article {
min-height: 69px;
- padding: 25px 45px 45px 45px;
+ padding: 35px 45px 45px 45px;
border-bottom: 1px solid #eee;
}
@@ -193,7 +203,7 @@
* Enclosure
*/
#app-content .enclosure {
- padding: 14px 42px 0 49px;
+ padding: 20px 0;
}
diff --git a/templates/index.php b/templates/index.php
index e5f0d6485..14a41f32d 100644
--- a/templates/index.php
+++ b/templates/index.php
@@ -40,13 +40,12 @@ style('news', [
<div id="app-settings" ng-controller="SettingsController as Settings">
<?php print_unescaped($this->inc('part.settings')) ?>
</div>
-
</div>
<!-- content -->
<script type="text/ng-template" id="content.html"><?php print_unescaped($this->inc('part.content')) ?></script>
- <div id="app-content" ng-class="{'loading-content': App.loading.isLoading('content')}">
+ <div id="app-content" ng-class="{'loading-content': App.loading.isLoading('content') && !App.loading.isLoading('global')}">
<div id="app-content-wrapper"
ng-class="{'autopaging': App.loading.isLoading('autopaging')}"
ng-hide="App.loading.isLoading('global')"
diff --git a/templates/part.content.php b/templates/part.content.php
index 49d755fc4..b5c63c439 100644
--- a/templates/part.content.php
+++ b/templates/part.content.php
@@ -5,59 +5,59 @@
<div ng-if="!App.isFirstRun()">
<ul>
<li class="item {{ Content.getFeed(item.feedId).cssClass }}"
- ng-repeat="item in Content.getItems() | orderBy:[Content.orderBy()] track by item.id"
- ng-click="Content.markRead(item.id)"
- ng-class="{read: !item.unread}"
- data-id="{{ item.id }}">
+ ng-repeat="item in Content.getItems() | orderBy:[Content.orderBy()] track by item.id"
+ ng-click="Content.markRead(item.id)"
+ ng-class="{read: !item.unread}"
+ data-id="{{ item.id }}">
- <div class="utils" ng-click="Content.toggleItem(item)">
- <ul>
- <li ng-click="Content.toggleStar(item.id)" class="util" news-stop-propagation>
- <button class="star svg" ng-class="{'starred': item.starred}" title="<?php p($l->t('Star')); ?>"></button>
- </li>
- <li class="util">
- <a class="external icon-link"
- target="_blank"
- ng-href="{{ item.url }}"
- title="<?php p($l->t('Open website')) ?>"
- news-stop-propagation>
- </a>
- </li>
- <li ng-click="Content.toggleKeepUnread(item.id)" class="util" news-stop-propagation>
- <button class="icon-toggle" ng-class="{'keep-unread': item.keepUnread}" title="<?php p($l->t('Keep unread')); ?>"></button>
- </li>
- <li class="title">
- <h1>
- <a target="_blank" >
- {{ item.title }}
- </a>
- </h1>
- </li>
- <li class="source">
- <a ng-href="#/items/feeds/{{ item.feedId }}/" news-stop-propagation>{{ Content.getFeed(item.feedId).title }}</a>
- </li>
- <li class="date">
- <time title="{{ item.pubDate*1000|date:'yyyy-MM-dd HH:mm:ss' }}"
- datetime="{{ item.pubDate*1000|date:'yyyy-MM-ddTHH:mm:ssZ' }}">
- {{ Content.getRelativeDate(item.pubDate) }}
- </time>
- </li>
- </ul>
- </div>
+ <div class="utils" ng-click="Content.toggleItem(item)">
+ <ul>
+ <li ng-click="Content.toggleStar(item.id)" class="util" news-stop-propagation>
+ <button class="star svg" ng-class="{'starred': item.starred}" title="<?php p($l->t('Star')); ?>"></button>
+ </li>
+ <li ng-click="Content.toggleKeepUnread(item.id)" class="util" news-stop-propagation>
+ <button class="icon-toggle" ng-class="{'keep-unread': item.keepUnread}" title="<?php p($l->t('Keep unread')); ?>"></button>
+ </li>
+ <li class="util">
+ <a class="external icon-link"
+ target="_blank"
+ ng-href="{{ item.url }}"
+ title="<?php p($l->t('Open website')) ?>"
+ news-stop-propagation>
+ </a>
+ </li>
+ <li class="title" title="{{ item.title }}">
+ <h1>
+ <a target="_blank" >
+ {{ item.title }}
+ </a>
+ </h1>
+ </li>
+ <li class="source">
+ <a ng-href="#/items/feeds/{{ item.feedId }}/" news-stop-propagation>{{ Content.getFeed(item.feedId).title }}</a>
+ </li>
+ <li class="date">
+ <time title="{{ item.pubDate*1000|date:'yyyy-MM-dd HH:mm:ss' }}"
+ datetime="{{ item.pubDate*1000|date:'yyyy-MM-ddTHH:mm:ssZ' }}">
+ {{ Content.getRelativeDate(item.pubDate) }}
+ </time>
+ </li>
+ </ul>
+ </div>
- <div class="article" ng-show="!Content.isCompactView() || item.show">
+ <div class="article" ng-show="!Content.isCompactView() || item.show">
- <div class="enclosure" ng-if="item.enclosureLink">
- <news-audio type="{{ item.enclosureType }}"
- ng-src="{{ item.enclosureLink|trustUrl }}">
- <?php p($l->t('Download')) ?>
- </news-audio>
- </div>
+ <div class="enclosure" ng-if="item.enclosureLink">
+ <news-audio type="{{ item.enclosureType }}"
+ ng-src="{{ item.enclosureLink|trustUrl }}">
+ <?php p($l->t('Download')) ?>
+ </news-audio>
+ </div>
- <div class="body" news-bind-html-unsafe="item.body"></div>
+ <div class="body" news-bind-html-unsafe="item.body"></div>
- <h2 class="author" ng-show="item.author">© {{ item.author }}</h2>
- </div>
- </li>
+ <h2 class="author" ng-show="item.author">© {{ item.author }}</h2>
+ </div>
+ </li>
</ul>
</div>
diff --git a/templates/part.navigation.feed.php b/templates/part.navigation.feed.php
index ae4442fe5..be3b09372 100644
--- a/templates/part.navigation.feed.php
+++ b/templates/part.navigation.feed.php
@@ -58,7 +58,8 @@
{{ Navigation.getFeedUnreadCount(feed.id) | unreadCountFormatter }}
</li>
<li class="app-navigation-entry-utils-menu-button">
- <button ng-click="App.toggleMenu('f' + feed.id)"></button>
+ <button ng-click="App.toggleMenu('f' + feed.id)"
+ title="<?php p($l->t('Menu')); ?>"></button>
</li>
</ul>
</div>
diff --git a/templates/part.settings.php b/templates/part.settings.php
index 4c9b3eca2..f863b601b 100644
--- a/templates/part.settings.php
+++ b/templates/part.settings.php
@@ -10,7 +10,7 @@
<p ng-click="Settings.toggleSetting('compact')">
<label for="compact">
<input type="checkbox" ng-checked="Settings.getSetting('compact')" name="compact">
- <?php p($l->t('Use compact view')); ?>
+ <?php p($l->t('Compact view')); ?>
</label>
</p>
@@ -32,7 +32,7 @@
<p ng-click="Settings.toggleSetting('preventReadOnScroll')">
<label for="preventReadOnScroll">
<input type="checkbox" ng-checked="Settings.getSetting('preventReadOnScroll')" name="preventReadOnScroll">
- <?php p($l->t('Do not as mark read when scrolling')); ?>
+ <?php p($l->t('Disable mark read during scrolling')); ?>
</label>
</p>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 13:01:30 +0000