From 64b4d1ffc179d60a386308a86841c552c3b9e300 Mon Sep 17 00:00:00 2001
From: Joseph Nuthalapati <njoseph@thoughtworks.com>
Date: Fri, 27 Oct 2017 14:23:09 +0530
Subject: [PATCH] Rename store_type to store_name

Signed-off-by: Joseph Nuthalapati <njoseph@thoughtworks.com>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
---
 plinth/modules/diaspora/manifest.py |  2 +-
 plinth/modules/ejabberd/manifest.py |  8 ++++----
 plinth/modules/minetest/manifest.py |  4 ++--
 plinth/modules/mumble/manifest.py   |  8 ++++----
 plinth/modules/quassel/manifest.py  |  2 +-
 plinth/modules/radicale/manifest.py |  2 +-
 plinth/modules/repro/manifest.py    |  6 +++---
 plinth/modules/tor/manifest.py      |  4 ++--
 plinth/modules/ttrss/manifest.py    |  4 ++--
 plinth/templates/clients.html       | 22 +++++++++-------------
 10 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/plinth/modules/diaspora/manifest.py b/plinth/modules/diaspora/manifest.py
index 86fb0ce0c..0070a2692 100644
--- a/plinth/modules/diaspora/manifest.py
+++ b/plinth/modules/diaspora/manifest.py
@@ -30,7 +30,7 @@ clients = [
                 'type': 'store',
                 'os': 'Android',
                 'os_version': '>4.2.0',
-                'store_type': 'fdroid_store',
+                'store_name': 'fdroid_store',
                 'url': 'https://f-droid.org/repository/browse/?fdid=com'
                        '.github.dfa.diaspora_android ',
                 'fully_qualified_name': 'com.github.dfa.diaspora_android'
diff --git a/plinth/modules/ejabberd/manifest.py b/plinth/modules/ejabberd/manifest.py
index aa0e9f2ec..ff82d9b03 100644
--- a/plinth/modules/ejabberd/manifest.py
+++ b/plinth/modules/ejabberd/manifest.py
@@ -26,7 +26,7 @@ clients = [
             {
                 'type': 'store',
                 'os': 'Android',
-                'store_type': 'google_play_store',
+                'store_name': 'google_play_store',
                 'fully_qualified_name': 'org.yaxim.androidclient',
                 'url': 'https://play.google.com/store/apps/details?id=org'
                        '.yaxim.androidclient '
@@ -40,7 +40,7 @@ clients = [
             {
                 'type': 'store',
                 'os': 'Android',
-                'store_type': 'google_play_store',
+                'store_name': 'google_play_store',
                 'fully_qualified_name': 'org.yaxim.bruno',
                 'url': 'https://play.google.com/store/apps/details?id'
                        '=org.yaxim.bruno '
@@ -60,7 +60,7 @@ clients = [
             {
                 'type': 'store',
                 'os': 'iOS',
-                'store_type': 'apple_store',
+                'store_name': 'apple_store',
                 'url': 'https://itunes.apple.com/us/app/chatsecure'
                        '/id464200063 '
             }
@@ -72,7 +72,7 @@ clients = [
             {
                 'type': 'store',
                 'os': 'Android',
-                'store_type': 'google_play_store',
+                'store_name': 'google_play_store',
                 'url': 'https://play.google.com/store/apps/details?id'
                        '=eu.siacs.conversations ',
                 'fully_qualified_name': 'eu.siacs.conversations'
diff --git a/plinth/modules/minetest/manifest.py b/plinth/modules/minetest/manifest.py
index bc637c5b9..394c21461 100644
--- a/plinth/modules/minetest/manifest.py
+++ b/plinth/modules/minetest/manifest.py
@@ -31,7 +31,7 @@ clients = [
             {
                 'type': 'store',
                 'os': 'Android',
-                'store_type': 'google_play_store',
+                'store_name': 'google_play_store',
                 'fully_qualified_name': 'net.minetest.minetest',
                 'url': 'https://play.google.com/store/apps/details?id=net'
                        '.minetest.minetest '
@@ -39,7 +39,7 @@ clients = [
             {
                 'type': 'store',
                 'os': 'Android',
-                'store_type': 'fdroid_store',
+                'store_name': 'fdroid_store',
                 'fully_qualified_name': 'net.minetest.minetest',
                 'url': 'https://f-droid.org/packages/net.minetest.minetest/ '
             },
diff --git a/plinth/modules/mumble/manifest.py b/plinth/modules/mumble/manifest.py
index db211000f..5661773c4 100644
--- a/plinth/modules/mumble/manifest.py
+++ b/plinth/modules/mumble/manifest.py
@@ -48,7 +48,7 @@ clients = [
                 'type': 'store',
                 'os': 'iOS',
                 'os_version': '>=8.0',
-                'store_type': 'apple_store',
+                'store_name': 'apple_store',
                 'url': 'https://itunes.apple.com/us/app/mumble/id443472808'
             }
         ]
@@ -59,7 +59,7 @@ clients = [
             {
                 'type': 'store',
                 'os': 'Android',
-                'store_type': 'google_play_store',
+                'store_name': 'google_play_store',
                 'url': 'https://play.google.com/store/apps/details?id=com'
                        '.morlunk.mumbleclient.free ',
                 'fully_qualified_name': 'com.morlunk.mumbleclient'
@@ -67,7 +67,7 @@ clients = [
             {
                 'type': 'store',
                 'os': 'Android',
-                'store_type': 'fdroid_store',
+                'store_name': 'fdroid_store',
                 'url': 'https://play.google.com/store/apps/details?id=com'
                        '.morlunk.mumbleclient.free ',
                 'fully_qualified_name': 'com.morlunk.mumbleclient'
@@ -81,7 +81,7 @@ clients = [
                 'type': 'store',
                 'os': 'iOS',
                 'os_version': '>=7.0',
-                'store_type': 'apple_store',
+                'store_name': 'apple_store',
                 'url': 'https://itunes.apple.com/dk/app/mumblefy/id858752232'
             }
         ]
diff --git a/plinth/modules/quassel/manifest.py b/plinth/modules/quassel/manifest.py
index 5e64a83bc..963c83970 100644
--- a/plinth/modules/quassel/manifest.py
+++ b/plinth/modules/quassel/manifest.py
@@ -40,7 +40,7 @@ clients = [
             {
                 'type': 'store',
                 'os': 'Android',
-                'store_type': 'google_play_store',
+                'store_name': 'google_play_store',
                 'url': 'https://play.google.com/store/apps/details?id=com'
                        '.iskrembilen.quasseldroid',
                 'fully_qualified_name': 'com.iskrembilen.quasseldroid'
diff --git a/plinth/modules/radicale/manifest.py b/plinth/modules/radicale/manifest.py
index 180ca797f..1b2939a0b 100644
--- a/plinth/modules/radicale/manifest.py
+++ b/plinth/modules/radicale/manifest.py
@@ -28,7 +28,7 @@ clients = [
             {
                 'type': 'store',
                 'os': 'Android',
-                'store_type': 'google_play_store',
+                'store_name': 'google_play_store',
                 'url': 'https://play.google.com/store/apps/details?id=at'
                        '.bitfire.davdroid',
                 'fully_qualified_name': 'at.bitfire.davdroid'
diff --git a/plinth/modules/repro/manifest.py b/plinth/modules/repro/manifest.py
index 3847d5fb3..d3022d4cc 100644
--- a/plinth/modules/repro/manifest.py
+++ b/plinth/modules/repro/manifest.py
@@ -32,7 +32,7 @@ clients = [
             {
                 'type': 'store',
                 'os': 'Android',
-                'store_type': 'google_play_store',
+                'store_name': 'google_play_store',
                 'fully_qualified_name': 'org.jitsi.meet',
                 'url': 'https://play.google.com/store/apps/details?id=org'
                        '.jitsi.meet '
@@ -40,7 +40,7 @@ clients = [
             {
                 'type': 'store',
                 'os': 'iOS',
-                'store_type': 'apple_store',
+                'store_name': 'apple_store',
                 'url': 'https://itunes.apple.com/in/app/jitsi-meet/id1165103905'
             },
             {
@@ -79,7 +79,7 @@ clients = [
             {
                 'type': 'store',
                 'os': 'Android',
-                'store_type': 'google_play_store',
+                'store_name': 'google_play_store',
                 'fully_qualified_name': 'com.csipsimple',
                 'url': 'https://play.google.com/store/apps/details?id=com'
                        '.csipsimple '
diff --git a/plinth/modules/tor/manifest.py b/plinth/modules/tor/manifest.py
index 6143f6068..13edce814 100644
--- a/plinth/modules/tor/manifest.py
+++ b/plinth/modules/tor/manifest.py
@@ -56,7 +56,7 @@ clients = [
             {
                 'type': 'store',
                 'os': 'Android',
-                'store_type': 'google_play_store',
+                'store_name': 'google_play_store',
                 'url': 'https://play.google.com/store/apps/details?id=org'
                        '.torproject.android',
                 'fully_qualified_name': 'org.torproject.android'
@@ -64,7 +64,7 @@ clients = [
             {
                 'type': 'store',
                 'os': 'Android',
-                'store_type': 'fdroid_store',
+                'store_name': 'fdroid_store',
                 'url': 'https://play.google.com/store/apps/details?id=org'
                        '.torproject.android',
                 'fully_qualified_name': 'org.torproject.android'
diff --git a/plinth/modules/ttrss/manifest.py b/plinth/modules/ttrss/manifest.py
index 83f53f498..fd35970b7 100644
--- a/plinth/modules/ttrss/manifest.py
+++ b/plinth/modules/ttrss/manifest.py
@@ -24,7 +24,7 @@ clients = [
             {
                 'type': 'store',
                 'os': 'Android',
-                'store_type': 'google_play-store',
+                'store_name': 'google_play-store',
                 'url': 'https://play.google.com/store/apps/details?id=org'
                        '.ttrssreader',
                 'fully_qualified_name': 'org.ttrssreader'
@@ -32,7 +32,7 @@ clients = [
             {
                 'type': 'store',
                 'os': 'Android',
-                'store_type': 'fdroid_store',
+                'store_name': 'fdroid_store',
                 'url': 'https://f-droid.org/packages/org.ttrssreader/',
                 'fully_qualified_name': 'org.ttrssreader'
             },
diff --git a/plinth/templates/clients.html b/plinth/templates/clients.html
index 879f3bda0..12a929d2b 100644
--- a/plinth/templates/clients.html
+++ b/plinth/templates/clients.html
@@ -40,12 +40,8 @@
   <p class="heading">{% trans "Desktop Clients" %}:
     <ul>
       {% for client in module.clients %}
-      <li class="col-md-12 col-xs-12">
-        <span>
-            {{ client.name }}
-        </span>
-      </li>
-      <div class ="row">
+        <li class="col-md-12 col-xs-12"> <span> {{ client.name }} </span> </li>
+        <div class ="row">
           {% for platform in client.platforms %}
             {% if platform.type == 'download' %}
           <div class="col-md-1 col-xs-2">
@@ -61,6 +57,7 @@
           </div>
             {% endif %}
           {% endfor %}
+        </div>
       {% endfor %}
     </ul>
 </div>
@@ -76,17 +73,16 @@
           {% if platform.type == 'store' and platform.os == 'Android' %}
             {% if platform.store_name == 'fdroid_store' %}
             <div class="col-md-2 col-xs-4">
-                <a href="{{ platform.url }}">
-                    <img class="store-icon" src="{% static 'theme/img/f-droid.png' %}"/>
-                </a>
+              <a href="{{ platform.url }}">
+                <img class="store-icon" src="{% static 'theme/img/f-droid.png' %}"/>
+              </a>
             </div>
             {% endif %}
             {% if platform.store_name == 'google_play_store' %}
             <div class="col-md-2 col-xs-4">
-                <a href="{{ platform.url }}">
-                    <img class="store-icon"
-                         src="{% static 'theme/img/google-play.png' %}"/>
-                </a>
+              <a href="{{ platform.url }}">
+                <img class="store-icon" src="{% static 'theme/img/google-play.png' %}"/>
+              </a>
             </div>
             {% endif %}
         {% endif %}