Merge pull request #113 from zamentur/unstable

[enh]  Display store and state of each apps

src/js/yunohost/controllers/apps.js

@@ -30,7 +30,12 @@
                 apps = [];
                 $.each(data['apps'], function(k, v) {
                     if ((!v['installed'] || dataraw[v['id']].manifest.multi_instance == "true") && !v['id'].match(/__[0-9]{1,5}$/)) {
-                        apps.push(v);
+                        if (dataraw[v['id']]['store']!='yunohost')
+                        {
+                            dataraw[v['id']]['isUnofficial']=true;
+                        }
+                        dataraw[v['id']]['description']=v.description;
+                        apps.push(dataraw[v['id']]);
                     }
                 });
 
@@ -446,4 +451,4 @@
         );
     });
 
-})();
+})();

src/locales/en.json

@@ -94,6 +94,12 @@
     "available_apps" : "Available apps",
     "no_installed_apps" : "No installed apps.",
     "app_list" : "App list",
+    "app_store": "Store : ",
+    "app_state": "State : ",
+    "app_state_validated": "Validated",
+    "app_state_working": "Working",
+    "app_state_inprogress": "In progress",
+    "app_state_notworking": "Not working",
     "uninstall" : "Uninstall",
     "install_name" : "Install %s",
     "label" : "Label",

src/locales/fr.json

@@ -18,6 +18,12 @@
     "app_install_cancel": "Installation annulée.",
     "app_install_custom_no_manifest": "Aucun fichier manifest.json",
     "app_list": "Liste des applications",
+    "app_store": "Store : ",
+    "app_state": "Etat : ",
+    "app_state_validated": "Validé",
+    "app_state_working": "Fonctionnel",
+    "app_state_inprogress": "En cours de développement",
+    "app_state_notworking": "Non fonctionnel",
     "app_make_default": "Définir par défaut",
     "application": "Application",
     "applications": "Applications",
@@ -269,4 +275,4 @@
     "write": "Écriture",
     "wrong_password": "Mot de passe incorrect",
     "yes": "Oui"
-}
+}

src/views/app/app_list_install.ms

@@ -17,10 +17,14 @@
     <a href="#/apps/install/{{id}}" class="list-group-item slide" title="{{t 'install'}}">
         <span class="fa-chevron-right pull-right"></span>
         <h2 class="list-group-item-heading">
-            {{name}} <small>{{id}}</small>
+            {{manifest.name}} <small>{{manifest.id}}</small>
             {{#installed}}<span class="badge badge-success">{{t 'installed'}}</span>{{/installed}}
         </h2>
-        <p class="list-group-item-text">{{description}}</p>
+        <p class="list-group-item-text">{{manifest.description}}</p>
+        {{#isUnofficial}}
+            <p class="list-group-item-text">{{t 'app_store'}} {{store}}</p>
+            <p class="list-group-item-text">{{t 'app_state'}} {{state}}</p>
+        {{/isUnofficial}}
     </a>
 {{/apps}}