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

Add 'decent quality' (level >= 5) filter as default filter

Browse source
This commit is contained in:
Alexandre Aubin 2019-04-26 00:27:42 +02:00
parent 3e3f75dc72
commit db6722c510
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -87,8 +87,10 @@
&& dataraw[v['id']]['manifest']['license'] !== 'free'); && dataraw[v['id']]['manifest']['license'] !== 'free');
dataraw[v['id']]['updateDate'] = dataraw[v['id']]['lastUpdate'] * 1000 || 0; dataraw[v['id']]['updateDate'] = dataraw[v['id']]['lastUpdate'] * 1000 || 0;
dataraw[v['id']]['isSafe'] = (dataraw[v['id']]['installColor'] !== 'danger'); dataraw[v['id']]['isSafe'] = (dataraw[v['id']]['installColor'] !== 'danger');
dataraw[v['id']]['decentQuality'] = (dataraw[v['id']]['levelColor'] === "hmokay"
|| dataraw[v['id']]['levelColor'] === "success")?"decentQuality":"badQuality";
dataraw[v['id']]['isWorking'] = isWorking ? "isworking" : "notFullyWorking"; dataraw[v['id']]['isWorking'] = isWorking ? "isworking" : "notFullyWorking";
dataraw[v['id']]['isHighQuality'] = (state === "high-quality") ? "ishighquality" : ""; dataraw[v['id']]['isHighQuality'] = (state === "high-quality") ? "isHighQuality" : "";
jQuery.extend(dataraw[v['id']], v); jQuery.extend(dataraw[v['id']], v);
apps.push(dataraw[v['id']]); apps.push(dataraw[v['id']]);
@ -116,8 +118,8 @@
return inputMatch && classMatch; return inputMatch && classMatch;
}, },
// Keep only official apps at first render // Default filter is 'decent quality apps'
cardGrid.isotope({ filter: '.isworking' }); cardGrid.isotope({ filter: '.decentQuality' });
jQuery('.dropdownFilter').on('click', function() { jQuery('.dropdownFilter').on('click', function() {
// change dropdown label // change dropdown label

1
src/locales/en.json
View file

@ -227,6 +227,7 @@
"ok": "OK", "ok": "OK",
"only_highquality_apps": "Only high-quality apps", "only_highquality_apps": "Only high-quality apps",
"only_working_apps": "Only working apps", "only_working_apps": "Only working apps",
"only_decent_quality_apps": "Only decent quality apps",
"open": "Open", "open": "Open",
"operations": "Operations", "operations": "Operations",
"os": "OS", "os": "OS",

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

@ -20,11 +20,12 @@
<input type="text" id="filter-app-cards" class="form-control" role="textbox" placeholder="{{t 'search_for_apps'}}" aria-describedby="basic-addon0"/> <input type="text" id="filter-app-cards" class="form-control" role="textbox" placeholder="{{t 'search_for_apps'}}" aria-describedby="basic-addon0"/>
<div class="input-group-btn"> <div class="input-group-btn">
<button type="button" role="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <button type="button" role="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span id="app-cards-list-filter-text">{{t 'only_working_apps'}}</span> <span class="caret"></span> <span id="app-cards-list-filter-text">{{t 'only_decent_quality_apps'}}</span> <span class="caret"></span>
</button> </button>
<ul id="dropdownFilter" class="dropdown-menu" data-filter="isworking" role="menu"> <ul id="dropdownFilter" class="dropdown-menu" data-filter="decentQuality" role="menu">
<li role="presentation" class="button dropdownFilter" data-filter="isHighQuality"><a class="menu-item" role="menu-item" tabindex="-1">{{t 'only_highquality_apps'}}</a></li>
<li role="presentation" class="button dropdownFilter" data-filter="decentQuality"><a class="menu-item" role="menu-item" tabindex="-1">{{t 'only_decent_quality_apps'}}</a></li>
<li role="presentation" class="button dropdownFilter" data-filter="isworking"><a class="menu-item" role="menu-item" tabindex="-1">{{t 'only_working_apps'}}</a></li> <li role="presentation" class="button dropdownFilter" data-filter="isworking"><a class="menu-item" role="menu-item" tabindex="-1">{{t 'only_working_apps'}}</a></li>
<li role="presentation" class="button dropdownFilter" data-filter="ishighquality"><a class="menu-item" role="menu-item" tabindex="-1">{{t 'only_highquality_apps'}}</a></li>
<li role="presentation" class="button dropdownFilter" data-filter="*"><a class="menu-item" role="menu-item" tabindex="-1">{{t 'all_apps'}}</a></li> <li role="presentation" class="button dropdownFilter" data-filter="*"><a class="menu-item" role="menu-item" tabindex="-1">{{t 'all_apps'}}</a></li>
</ul> </ul>
</div> </div>
@ -34,7 +35,7 @@
<div class="list-group grid"> <div class="list-group grid">
{{#apps}} {{#apps}}
<div class="app-card panel panel-default {{status}} {{state}} {{isWorking}} {{isHighQuality}} {{level}}-level"> <div class="app-card panel panel-default {{status}} {{state}} {{isWorking}} {{isHighQuality}} {{decentQuality}} {{level}}-level">
<div class="panel-body"> <div class="panel-body">
<h2 class="app-title">{{name}}</h2> <h2 class="app-title">{{name}}</h2>
<div class="category"> <div class="category">