fix #964

4 files changed, 28 insertions, 4 deletions

diff --git a/css/content.css b/css/content.css
index cce25d741..62f3ee249 100644
--- a/css/content.css
+++ b/css/content.css
@@ -11,6 +11,19 @@
     display: none;
 }
 
+#app-content #text-content {
+    padding: 20px;
+}
+
+#app-content #text-content h1 {
+    font-size: 18pt;
+    margin-bottom: 15px;
+}
+
+#app-content #text-content p {
+    font-size: 11pt;
+}
+
 #app-content .no-feeds-available {
     text-align: center;
     color: #333;
diff --git a/js/app/Config.js b/js/app/Config.js
index 7f9c54bef..b795374a0 100644
--- a/js/app/Config.js
+++ b/js/app/Config.js
@@ -207,6 +207,9 @@ app.config(function ($routeProvider, $provide, $httpProvider) {
         }).when('/shortcuts', {
             templateUrl: 'shortcuts.html',
             type: -1
+        }).when('/subscription-url', {
+            templateUrl: 'subscription.html',
+            type: -1
         });
 
 });
diff --git a/templates/index.php b/templates/index.php
index d6c713aaa..b1e5ed4f3 100644
--- a/templates/index.php
+++ b/templates/index.php
@@ -82,6 +82,8 @@ foreach (Plugin::getScripts() as $appName => $fileName) {
     <script type="text/ng-template" id="shortcuts.html">
         <?php print_unescaped($this->inc('part.content.shortcuts')) ?>
     </script>
+        <?php print_unescaped($this->inc('part.content.subscription')) ?>
+    </script>
     <script type="text/ng-template" id="explore.html">
         <?php print_unescaped($this->inc('part.content.explore')) ?>
     </script>
diff --git a/templates/part.settings.php b/templates/part.settings.php
index 8970ee33f..0ab70ecdf 100644
--- a/templates/part.settings.php
+++ b/templates/part.settings.php
@@ -8,10 +8,6 @@
     <h3><?php p($l->t('Settings')); ?></h3>
 
     <p>
-        <a href="#/shortcuts"><?php p($l->t('Keyboard shortcuts')); ?></a>
-    </p>
-
-    <p>
         <label>
             <input type="checkbox"
                    ng-click="Settings.toggleSetting('preventReadOnScroll')"
@@ -62,6 +58,16 @@
         </label>
     </p>
 
+    <h3><?php p($l->t('Help')); ?></h3>
+
+    <p>
+        <a href="#/shortcuts/"><?php p($l->t('Keyboard shortcuts')); ?></a>
+    </p>
+
+    <p>
+        <a target="_blank" href="https://github.com/owncloud/news/wiki"><?php p($l->t('Documentation')); ?></a>
+    </p>
+
     <div class="import-export">
         <h3><?php p($l->t('Subscriptions (OPML)')); ?></h3>