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

enh

Browse source
This commit is contained in:
elie 2018-08-30 23:56:46 +02:00
parent 26765973a8
commit 24e15b714f
4 changed files with 51 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/bower.json
View file

@ -10,6 +10,7 @@
"handlebars": "4.0.11",
"sammy": "0.7.6",
"js-cookie": "2.1.0",
"isotope-layout": "3.0.6",
"source-sans-pro": "git://github.com/adobe-fonts/source-sans-pro.git#2.020R-ro/1.075R-it",
"source-code-pro": "git://github.com/adobe-fonts/source-code-pro.git#2.010R-ro/1.030R-it"
}

1
src/gulpfile.js
View file

@ -47,6 +47,7 @@ gulp.task('js', function() {
'bower_components/sammy/lib/plugins/sammy.json.js',
'bower_components/sammy/lib/plugins/sammy.storage.js',
'bower_components/bootstrap/dist/js/bootstrap.js',
'bower_components/isotope-layout/dist/isotope.pkgd.js',
'js/yunohost/y18n.js',
'js/yunohost/main.js',
'js/yunohost/helpers.js',

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

@ -18,15 +18,41 @@
});
function levelToColor(level) {
if (level > 6) {
return 'success';
}
else if (level > 2) {
return 'warning';
}
else {
return 'danger';
}
if (level > 6) {
return 'success';
}
else if (level > 2) {
return 'warning';
}
else if (isNaN(level)) {
return 'default';
} else {
return 'danger'
}
}
function stateToColor(state) {
if (state === "working" || state === "validated") {
return 'success';
}
else if (state === "inprogress") {
return 'warning';
}
else {
return 'danger';
}
}
function combineColors(stateColor, levelColor, installable) {
if (stateColor === "dangers" || levelColor === "danger") {
return 'danger';
}
if (stateColor === "warnings" || levelColor === "warnings" || levelColor === "default") {
return 'warning';
}
else {
return 'success';
}
}
@ -51,15 +77,20 @@
c.api('/apps?raw', function (dataraw) { // http://api.yunohost.org/#!/app/app_list_get_8
var apps = []
$.each(data['apps'], function(k, v) {
// Keep only uninstalled apps, or multi-instance apps
if ((!v['installed'] || dataraw[v['id']].manifest.multi_instance) && !v['id'].match(/__[0-9]{1,5}$/)) {
// Keep only on instance of each apps
if (!v['id'].match(/__[0-9]{1,5}$/)) {
// Check app source
dataraw[v['id']]['installable'] = (!v['installed'] || dataraw[v['id']].manifest.multi_instance)
dataraw[v['id']]['official'] = (dataraw[v['id']]['repository'] === 'yunohost');
dataraw[v['id']]['color'] = levelToColor(dataraw[v['id']]['level']);
levelFormatted = parseInt(dataraw[v['id']]['level']);
dataraw[v['id']]['levelFormatted'] = isNaN(levelFormatted) ? '?' : levelFormatted;
dataraw[v['id']]['levelColor'] = levelToColor(levelFormatted);
dataraw[v['id']]['stateColor'] = stateToColor(dataraw[v['id']]['state']);
dataraw[v['id']]['installColor'] = combineColors(dataraw[v['id']]['stateColor'], dataraw[v['id']]['levelColor']);
dataraw[v['id']]['displayLicense'] = (dataraw[v['id']]['manifest']['license'] !== undefined
&& dataraw[v['id']]['manifest']['license'] !== 'free');
dataraw[v['id']]['updateDate'] = timeConverter(dataraw[v['id']]['lastUpdate']);
dataraw[v['id']]['isSafe'] = (dataraw[v['id']]['installColor'] === 'danger');
jQuery.extend(dataraw[v['id']], v);
apps.push(dataraw[v['id']]);

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

@ -21,9 +21,10 @@
<div class="panel-body">
<h3>{{name}}</h3>
<div class="category">
<span class="label label-{{color}} label-as-badge">{{level}}</span>
<a href="https://yunohost.org/#/packaging_apps_levels_fr"><span class="label label-{{levelColor}} label-as-badge" title="{{t 'app_level'}}">{{levelFormatted}}</span></a>
{{^official}}<span class="label label-info label-as-badge app-validated">{{t 'community'}}</span>{{/official}}
{{#official}}<span class="label label-success label-as-badge app-validated">{{t 'official'}}</span>{{/official}}
<span class="label label-{{stateColor}} label-as-badge app-validated">{{state}}</span>
{{#displayLicense}}<span class="label label-default">{{license}}</span>{{/displayLicense}}
</div>
<div class="app-card-desc">{{description}}</div>
@ -38,10 +39,10 @@
<i class="fa-globe"></i> Code
</a>
<a href="{{git.url}}/blob/master/README.md" target="_BLANK" type="button" class="btn btn-default col-sm-4">
<i class="fa-book"></i> Doc
<i class="fa-book"></i> Readme
</a>
<a href="#/apps/install/{{id}}" type="button" class="btn btn-{{color}} col-sm-4 active">
<i class="fa-plus"></i> Install
<a href="#/apps/install/{{id}}" type="button" class="btn btn-{{installColor}} col-sm-4 active">
<i class="fa-plus"></i> Install {{#isSafe}}<i class="fa-warning"></i>{{/isSafe}}
</a>
</div>
</div>