diff options
-rw-r--r-- | css/news.css | 58 | ||||
-rw-r--r-- | js/news.js | 4 | ||||
-rw-r--r-- | templates/part.feeddialog.php | 6 | ||||
-rw-r--r-- | templates/part.items.php | 10 | ||||
-rw-r--r-- | templates/part.nofeeds.php | 4 |
5 files changed, 48 insertions, 34 deletions
diff --git a/css/news.css b/css/news.css index f66413786..6b0469cfe 100644 --- a/css/news.css +++ b/css/news.css @@ -593,27 +593,6 @@ div.feed_controls { } /** - * Secondary feed items which are only shown on hover - */ - .feed_item .secondary_item_utils { - display: none; - float: right; - color: #aaa; - } - - .feed_item:hover .secondary_item_utils { - display: block; - } - - .feed_item:hover .secondary_item_utils li.keep_unread { - cursor: pointer; - } - - .feed_item .secondary_item_utils li input[type=checkbox]{ - margin-left: .8em; - } - - /** * Feed title */ .feed_item h1.item_title { @@ -664,7 +643,7 @@ div.feed_controls { * Body of the feed item */ .feed_item div.body { - padding: .5em 2.5em 2em 2.5em; + padding: .5em 2.5em 0 2.5em; } .feed_item div.body p { @@ -696,8 +675,41 @@ div.feed_controls { font-family: monospace; font-size: 1.5em; } - + + /** + * Line with utils at the bottom + */ + .bottom_utils { + width: 100%; + padding: 0 2.5em; + height: 2.5em; + box-sizing: border-box; + -moz-box-sizing: border-box; + } + + /** + * Secondary feed items which are only shown on hover + */ + .feed_item .secondary_item_utils { + display: none; + color: #aaa; + float: right; + } + + .feed_item:hover .secondary_item_utils { + display: block; + height: 2.5em; + } + + .feed_item:hover .secondary_item_utils li.keep_unread { + cursor: pointer; + line-height: 2.5em; + } + + .feed_item .secondary_item_utils li input[type=checkbox]{ + margin-right: 1em; + } /* dialog/menues */ div.dialog { diff --git a/js/news.js b/js/news.js index cddc1c420..39b4cc0d8 100644 --- a/js/news.js +++ b/js/news.js @@ -527,7 +527,7 @@ News={ * @return true if its checked, otherwise false */ var _isKeptRead = function(){ - var _$currentItemKeepUnread = _$currentItem.children('.utils').children('.secondary_item_utils').children('.keep_unread').children('input[type=checkbox]'); + var _$currentItemKeepUnread = _$currentItem.children('.bottom_utils').children('.secondary_item_utils').children('.keep_unread').children('input[type=checkbox]'); return _$currentItemKeepUnread.prop('checked'); } @@ -536,7 +536,7 @@ News={ * except the current one */ var _toggleKeepUnread = function(){ - var _$currentItemKeepUnread = _$currentItem.children('.utils').children('.secondary_item_utils').children('.keep_unread').children('input[type=checkbox]'); + var _$currentItemKeepUnread = _$currentItem.children('.bottom_utils').children('.secondary_item_utils').children('.keep_unread').children('input[type=checkbox]'); if(_isKeptRead()){ _$currentItemKeepUnread.prop("checked", false); } else { diff --git a/templates/part.feeddialog.php b/templates/part.feeddialog.php index 6df940164..31628e12a 100644 --- a/templates/part.feeddialog.php +++ b/templates/part.feeddialog.php @@ -8,7 +8,7 @@ <button id="dropdownBtn" onclick="News.DropDownMenu.dropdown(this)"> <?php echo $l->t('Choose folder'); ?> </button> - <input id="inputfolderid" type="hidden" placeholder="<?php echo $l->t("Link"); ?>" name="folderid" value="0" /> + <input id="inputfolderid" type="hidden" name="folderid" value="0" /> <ul class="menu" id="dropdownmenu"> <?php echo $this->inc("part.folderlist"); ?> </ul> @@ -16,7 +16,7 @@ </td> </tr> <tr> - <td><input type="text" id="feed_add_url" placeholder="<?php echo $l->t('URL'); ?>" class="news_input" /></td> - <td><input type="submit" value="<?php echo $l->t('Add feed'); ?>" onclick="News.Feed.submit(this)" id="feed_add_submit" /></td> + <td><input type="text" id="feed_add_url" placeholder="<?php echo $l->t('Link'); ?>" class="news_input" /></td> + <td><input type="submit" value="<?php echo $l->t('Add'); ?>" onclick="News.Feed.submit(this)" id="feed_add_submit" /></td> </tr> </table>
\ No newline at end of file diff --git a/templates/part.items.php b/templates/part.items.php index efe37821a..85eb17c08 100644 --- a/templates/part.items.php +++ b/templates/part.items.php @@ -37,10 +37,6 @@ foreach($items as $item) { echo '<ul class="primary_item_utils">'; echo '<li class="star ' . $starClass . '" title="' . $startTitle . '"></li>'; echo '</ul>'; - - echo '<ul class="secondary_item_utils">'; - echo '<li class="keep_unread">' . $l->t('Keep unread') . '<input type="checkbox" /></li>'; - echo '</ul>'; echo '</div>'; echo '<h1 class="item_title"><a target="_blank" href="' . $item->getUrl() . '">' . $item->getTitle() . '</a></h1>'; @@ -54,6 +50,12 @@ foreach($items as $item) { echo '<div class="body">' . $item->getBody() . '</div>'; + echo '<div class="bottom_utils">'; + echo '<ul class="secondary_item_utils">'; + echo '<li class="keep_unread">' . $l->t('Keep unread') . '<input type="checkbox" /></li>'; + echo '</ul>'; + echo '</div>'; + echo '</li>'; } diff --git a/templates/part.nofeeds.php b/templates/part.nofeeds.php index e3b85a1f8..82743f17c 100644 --- a/templates/part.nofeeds.php +++ b/templates/part.nofeeds.php @@ -19,8 +19,8 @@ </td> </tr> <tr> - <td><input type="text" id="feed_add_url" placeholder="<?php echo $l->t('URL'); ?>" class="news_input" /></td> - <td><input type="submit" value="<?php echo $l->t('Add feed'); ?>" onclick="News.Feed.submit(this)" id="feed_add_submit" /></td> + <td><input type="text" id="feed_add_url" placeholder="<?php echo $l->t('Link'); ?>" class="news_input" /></td> + <td><input type="submit" value="<?php echo $l->t('Add'); ?>" onclick="News.Feed.submit(this)" id="feed_add_submit" /></td> </tr> </table> </div> |