YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #113 from zamentur/unstable

Browse source 
[enh]  Display store and state of each apps
This commit is contained in:
Zamentur aka ljf 2016-02-14 03:28:03 +01:00
commit 766587c606
6 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dist/css/style.min.css vendored
View file

File diff suppressed because one or more lines are too long

6
src/dist/js/script.min.js vendored
View file

File diff suppressed because one or more lines are too long

7
src/js/yunohost/controllers/apps.js
View file

@ -30,7 +30,12 @@
apps = []; apps = [];
$.each(data['apps'], function(k, v) { $.each(data['apps'], function(k, v) {
if ((!v['installed'] || dataraw[v['id']].manifest.multi_instance == "true") && !v['id'].match(/__[0-9]{1,5}$/)) { 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']]);
} }
}); });

6
src/locales/en.json
View file

@ -94,6 +94,12 @@
"available_apps" : "Available apps", "available_apps" : "Available apps",
"no_installed_apps" : "No installed apps.", "no_installed_apps" : "No installed apps.",
"app_list" : "App list", "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", "uninstall" : "Uninstall",
"install_name" : "Install %s", "install_name" : "Install %s",
"label" : "Label", "label" : "Label",

6
src/locales/fr.json
View file

@ -18,6 +18,12 @@
"app_install_cancel": "Installation annulée.", "app_install_cancel": "Installation annulée.",
"app_install_custom_no_manifest": "Aucun fichier manifest.json", "app_install_custom_no_manifest": "Aucun fichier manifest.json",
"app_list": "Liste des applications", "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", "app_make_default": "Définir par défaut",
"application": "Application", "application": "Application",
"applications": "Applications", "applications": "Applications",

8
src/views/app/app_list_install.ms
View file

@ -17,10 +17,14 @@
<a href="#/apps/install/{{id}}" class="list-group-item slide" title="{{t 'install'}}"> <a href="#/apps/install/{{id}}" class="list-group-item slide" title="{{t 'install'}}">
<span class="fa-chevron-right pull-right"></span> <span class="fa-chevron-right pull-right"></span>
<h2 class="list-group-item-heading"> <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}} {{#installed}}<span class="badge badge-success">{{t 'installed'}}</span>{{/installed}}
</h2> </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> </a>
{{/apps}} {{/apps}}