show text preview in compact mode

2016-01-17 17:31:33 +01:00 · 2016-01-17 17:31:33 +01:00 · a4759b31dd
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,6 @@
+owncloud-news (7.0.1)
+* **Enhancement**: Show text preview in compact mode
+
 owncloud-news (7.0.0)
 * **New dependency**: Bump required ownCloud version to 8.2
 * **Backwards incompatible change**: Remove console commands and instead run them after specific updates
--- a/css/content.css
+++ b/css/content.css
@ -381,7 +381,7 @@
    }

    #app-content .utils .title h1 a {
-        text-overflow: ellipsis;
+        /*text-overflow: ellipsis;*/
        white-space: nowrap;
        overflow: hidden;
        width: 100%;
@ -394,6 +394,17 @@
        min-height: 40px;
    }

+    #app-content .open .title .intro {
+        display: none;
+    }
+
+    #app-content .title .intro {
+        color: #777;
+        font-size: 10pt;
+        font-weight: normal;
+        margin-left: 20px;
+    }
+
    #app-content .open .utils .title h1 a {
        overflow: auto;
        white-space: normal;
--- a/css/news.min.css
+++ b/css/news.min.css
--- a/css/news.min.css.map
+++ b/css/news.min.css.map
--- a/db/item.php
+++ b/db/item.php
@ -130,7 +130,8 @@ class Item extends Entity implements IAPI, \JsonSerializable {
            'unread' => $this->isUnread(),
            'starred' => $this->isStarred(),
            'lastModified' => $this->getLastModified(),
-            'rtl' => $this->getRtl()
+            'rtl' => $this->getRtl(),
+            'intro' => $this->getIntro()
        ];
    }

@ -173,6 +174,10 @@ class Item extends Entity implements IAPI, \JsonSerializable {
    }


+    public function getIntro() {
+        return strip_tags($this->getBody());
+    }
+
    public static function fromImport($import) {
        $item = new static();
        $item->setGuid($import['guid']);
--- a/templates/part.content.php
+++ b/templates/part.content.php
@ -52,7 +52,7 @@
                                    + Content.getFeed(item.feedId).faviconLink +
                                ')'
                            }">
-                        <h1 ng-attr-dir="{{item.rtl && 'rtl'}}"><a>{{ ::item.title }}</a></h1>
+                        <h1 ng-attr-dir="{{item.rtl && 'rtl'}}"><a>{{ ::item.title }} <span class="intro">{{ ::item.intro }}</span></a></h1>
                    </li>
                    <li class="only-in-compact">
                        <time class="date"
--- a/tests/unit/db/ItemTest.php
+++ b/tests/unit/db/ItemTest.php
@ -100,7 +100,7 @@ class ItemTest extends \PHPUnit_Framework_TestCase {
        $item->setTitle('title');
        $item->setAuthor('author');
        $item->setPubDate(123);
-        $item->setBody('body');
+        $item->setBody('<body><div>this is a test</body>');
        $item->setEnclosureMime('audio/ogg');
        $item->setEnclosureLink('enclink');
        $item->setFeedId(1);
@ -118,14 +118,15 @@ class ItemTest extends \PHPUnit_Framework_TestCase {
            'title' => 'title',
            'author' => 'author',
            'pubDate' => 123,
-            'body' => 'body',
+            'body' => '<body><div>this is a test</body>',
            'enclosureMime' => 'audio/ogg',
            'enclosureLink' => 'enclink',
            'feedId' => 1,
            'unread' => true,
            'starred' => true,
            'lastModified' => 321,
-            'rtl' => true
+            'rtl' => true,
+            'intro' => 'this is a test'
            ], $item->jsonSerialize());
    }