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

Handle high-quality state + have a orangish-green for app level 5 to 7

Browse source
This commit is contained in:
Alexandre Aubin 2019-04-25 23:32:24 +02:00
parent 9ac324b16a
commit 426bd60d8a
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/css/style.less
View file

@ -573,6 +573,16 @@ input[type='radio'].nice-radio {
} }
} }
.label-hmokay, .btn-hmokay, .btn-hmokay:active, .btn-hmokay.active {
background-color: #71ae2a;
color: white;
}
.btn-hmokay:hover, .btn-hmokay:active:hover, .btn-hmokay.active:hover {
background-color: #5e8f24;
}
// only one card for small screens // only one card for small screens
.app-card { .app-card {
width: 100%; width: 100%;

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

@ -18,9 +18,12 @@
}); });
function levelToColor(level) { function levelToColor(level) {
if (level >= 3) { if (level >= 8) {
return 'success'; return 'success';
} }
else if (level > 4) {
return 'hmokay';
}
else if (level >= 1) { else if (level >= 1) {
return 'warning'; return 'warning';
} }
@ -32,9 +35,12 @@
} }
function stateToColor(state) { function stateToColor(state) {
if (state === "working" || state === "official") { if (state === "high-quality") {
return 'success'; return 'success';
} }
else if (state === "working") {
return 'hmokay';
}
else { else {
return 'danger'; return 'danger';
} }
@ -47,6 +53,9 @@
else if (stateColor === "warning" || levelColor === "warning" || levelColor === "default") { else if (stateColor === "warning" || levelColor === "warning" || levelColor === "default") {
return 'warning'; return 'warning';
} }
else if (stateColor === "hmokay" || levelColor === "hmokay") {
return 'hmokay';
}
else else
{ {
return 'success'; return 'success';
@ -59,13 +68,13 @@
c.api('/apps?raw', function (dataraw) { // http://api.yunohost.org/#!/app/app_list_get_8 c.api('/apps?raw', function (dataraw) { // http://api.yunohost.org/#!/app/app_list_get_8
var apps = [] var apps = []
$.each(data['apps'], function(k, v) { $.each(data['apps'], function(k, v) {
if (dataraw[v['id']]['state'] === "validated") if(dataraw[v['id']]['high_quality'] && parseInt(dataraw[v['id']]['level']) > 7)
{ {
dataraw[v['id']]['state'] = "official"; dataraw[v['id']]['state'] = "high-quality";
} }
var state = dataraw[v['id']]['state']; var state = dataraw[v['id']]['state'];
var levelFormatted = parseInt(dataraw[v['id']]['level']); var levelFormatted = parseInt(dataraw[v['id']]['level']);
var isWorking = (state === 'working' || state === 'official') && levelFormatted > 0; var isWorking = (state === 'working' || state === "high-quality") && levelFormatted > 0;
// Keep only the first instance of each app and remove community not working apps // Keep only the first instance of each app and remove community not working apps
if (!v['id'].match(/__[0-9]{1,5}$/) && (dataraw[v['id']]['repository'] === 'yunohost' || state !== 'notworking')) { if (!v['id'].match(/__[0-9]{1,5}$/) && (dataraw[v['id']]['repository'] === 'yunohost' || state !== 'notworking')) {