add german feeds and allow to change the language

2 files changed, 36 insertions, 21 deletions

diff --git a/templates/part.content.explore.php b/templates/part.content.explore.php
index 740957d59..c7e971e4f 100644
--- a/templates/part.content.explore.php
+++ b/templates/part.content.explore.php
@@ -6,32 +6,47 @@
             <input ng-model="Explore.filter" type="search" placeholder="<?php p(addslashes($l->t('filter'))) ?>" news-auto-focus>
         </label>
     </div>-->
+
     <div class="explore-header">
         <a href="https://github.com/owncloud/news/wiki/Explore-Feed-Section"><?php p($l->t('Got more awesome feeds? Share them with us!')) ?></a>
     </div>
+
+    <div class="explore-filter">
+        <label for="explorelanguagecode"><?php p($l->t('Language')) ?>: </label>
+        <select id="explorelanguagecode" name="explorelanguagecode"
+                ng-change="Explore.showLanguage(Explore.selectedLanguageCode)"
+                ng-options="language as language for language in Explore.getSupportedLanguageCodes()"
+                ng-model="Explore.selectedLanguageCode"></select>
+    </div>
     <div class="grid">
         <div ng-repeat="entry in Explore.feeds | filter:Explore.filter | orderBy:'-votes'" ng-show="!Explore.feedExists(entry.feed)" class="explore-feed grid-item" news-refresh-masonry>
-            <span class="category">{{ entry.category }}</span>
-            <h1 ng-show="entry.favicon"
-                ng-style="{ backgroundImage: 'url(' + entry.favicon + ')'}">
-                <a target="_blank" ng-href="{{ entry.url }}">{{ entry.title }}</a>
-            </h1>
-            <h1 ng-hide="entry.favicon" class="icon-rss">
-                {{ entry.title }}
-            </h1>
-            <div style="clear:both"></div>
-            <div class="explore-content">
-                <p>{{ entry.description }}</p>
-
-                <div class="explore-logo">
-                    <img ng-src="{{ entry.image }}" ng-if="entry.image">
+            <div class="category-wrapper">
+                <div class="category">
+                    {{ entry.category }}
                 </div>
             </div>
-            <div class="explore-subscribe">
-                <button ng-click="Explore.subscribeTo(entry.feed)">
-                    <?php p($l->t('Subscribe')) ?>
-                </button>
+            <div class="grid-item-content">
+                <h1 ng-show="entry.favicon"
+                    ng-style="{ backgroundImage: 'url(' + entry.favicon + ')'}">
+                    <a target="_blank" ng-href="{{ entry.url }}">{{ entry.title }}</a>
+                </h1>
+                <h1 ng-hide="entry.favicon" class="icon-rss">
+                    {{ entry.title }}
+                </h1>
+                <div style="clear:both"></div>
+                <div class="explore-content">
+                    <p>{{ entry.description }}</p>
+
+                    <div class="explore-logo">
+                        <img ng-src="{{ entry.image }}" ng-if="entry.image">
+                    </div>
+                </div>
+                <div class="explore-subscribe">
+                    <button ng-click="Explore.subscribeTo(entry.feed)">
+                        <?php p($l->t('Subscribe')) ?>
+                    </button>
+                </div>
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/part.navigation.explore.php b/templates/part.navigation.explore.php
index acae91b2d..8575afb1c 100644
--- a/templates/part.navigation.explore.php
+++ b/templates/part.navigation.explore.php
@@ -1,5 +1,5 @@
 <li ng-class="{active: Navigation.isExploreActive()}" class="explore-feed">
-    <a class="icon-link" ng-href="#/explore/">
+    <a class="icon-link" ng-href="#/explore/?lang={{Navigation.getLanguageCode()}}">
        <?php p($l->t('Explore')) ?>
     </a>
-</li>
\ No newline at end of file
+</li>