From e64167ec0ae8718b359bd67dda219c6414234f23 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Fri, 19 May 2017 17:48:16 +0200
Subject: Fix #151, Fix #145

---
 CHANGELOG.md                       |  8 ++++++
 img/app-dark.svg                   | 55 ++++++++++++++++++++++++++++++++++++++
 lib/Settings/Section.php           |  6 ++---
 templates/part.content.php         |  1 -
 templates/part.navigation.feed.php |  2 +-
 5 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 img/app-dark.svg

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c03dbe780..b03b14ed0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 11.0.1
+
+### Fixed
+
+- Fix admin section on latest master, #145
+- Do not show tooltip when hovering over headlines in compact mode, #151
+
+
 ## 11.0.0
 
 ### Removed
diff --git a/img/app-dark.svg b/img/app-dark.svg
new file mode 100644
index 000000000..a156f4a5d
--- /dev/null
+++ b/img/app-dark.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="32"
+   width="32"
+   version="1.0"
+   viewBox="0 0 32 32"
+   id="svg4"
+   sodipodi:docname="app-dark.svg"
+   inkscape:version="0.92.1 r">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="789"
+     inkscape:window-height="480"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="7.375"
+     inkscape:cx="16.271186"
+     inkscape:cy="15.457627"
+     inkscape:window-x="2422"
+     inkscape:window-y="241"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4" />
+  <path
+     d="m3 2c-0.554 0-1 0.446-1 1v2c0 0.554 0.446 1 1 1h26c0.554 0 1-0.446 1-1v-2c0-0.554-0.446-1-1-1h-26zm0 8c-0.554 0-1 0.446-1 1v2c0 0.554 0.446 1 1 1h18c0.554 0 1-0.446 1-1v-2c0-0.554-0.446-1-1-1h-18zm0 8c-0.554 0-1 0.446-1 1v2c0 0.554 0.446 1 1 1h24c0.554 0 1-0.446 1-1v-2c0-0.554-0.446-1-1-1h-24zm0 8c-0.554 0-1 0.446-1 1v2c0 0.554 0.446 1 1 1h12c0.554 0 1-0.446 1-1v-2c0-0.554-0.446-1-1-1h-12z"
+     fill="#FFF"
+     id="path2"
+     style="fill:#333333" />
+</svg>
diff --git a/lib/Settings/Section.php b/lib/Settings/Section.php
index 5e1e47476..dd0f1ff0c 100644
--- a/lib/Settings/Section.php
+++ b/lib/Settings/Section.php
@@ -4,9 +4,9 @@ namespace OCA\News\Settings;
 
 use OCP\IL10N;
 use OCP\IURLGenerator;
-use OCP\Settings\ISection;
+use OCP\Settings\IIconSection;
 
-class Section implements ISection {
+class Section implements IIconSection {
     private $l;
     private $url;
 
@@ -28,6 +28,6 @@ class Section implements ISection {
     }
 
     public function getIcon() {
-        return $this->url->imagePath('news', 'app.svg');
+        return $this->url->imagePath('news', 'app-dark.svg');
     }
 }
\ No newline at end of file
diff --git a/templates/part.content.php b/templates/part.content.php
index 2797ee58e..873c71bdc 100644
--- a/templates/part.content.php
+++ b/templates/part.content.php
@@ -35,7 +35,6 @@
                         </a>
                     </li>
                     <li class="title only-in-compact"
-                        title="{{ ::item.title }}"
                         ng-class="{
                             'icon-rss':
                                 !Content.getFeed(item.feedId).faviconLink
diff --git a/templates/part.navigation.feed.php b/templates/part.navigation.feed.php
index 3d80651ed..3c715761a 100644
--- a/templates/part.navigation.feed.php
+++ b/templates/part.navigation.feed.php
@@ -131,7 +131,7 @@
                 <button ng-click="Navigation.setUpdateMode(feed.id, 1)"
                         ng-hide="feed.updateMode == 1">
                     <span class="icon-updatemode-default"></span>
-                    <span><?php p($l->t('Mark updated unread')); ?></span>
+                    <span><?php p($l->t('Unread updated')); ?></span>
                 </button>
                 <button ng-click="Navigation.setUpdateMode(feed.id, 0)"
                         ng-show="feed.updateMode == 1">
-- 
cgit v1.2.3