Move license info the install form, don't show it on app market anymore

This commit is contained in:
Alexandre Aubin 2019-05-31 17:02:03 +02:00
parent 01cc551305
commit da0d86603a
4 changed files with 7 additions and 5 deletions

View file

@ -143,8 +143,6 @@
app.maintainedColor = maintainedStateToColor(app.maintained);
app.installColor = combineColors(app.stateColor, app.levelColor);
app.displayLicense = (app['manifest']['license'] !== undefined
&& app['manifest']['license'] !== 'free');
app.updateDate = app.lastUpdate * 1000 || 0;
app.isSafe = (app.installColor !== 'danger');
app.isWorking = isWorking ? "isworking" : "notFullyWorking";
@ -542,7 +540,8 @@
app.helper('appInstallForm', function(appId, manifest, params) {
var data = {
id: appId,
manifest: manifest
manifest: manifest,
displayLicense: (manifest['license'] !== undefined && manifest['license'] !== 'free')
};
formatYunoHostStyleArguments(data.manifest.arguments.install, params);

View file

@ -29,7 +29,6 @@
"app_install_cancel": "Installation cancelled.",
"app_install_custom_no_manifest": "No manifest.json file",
"app_list": "App list",
"app_license": "License of the app",
"app_level": "App level",
"app_make_default": "Make default",
"app_no_actions": "This application doesn't have any actions",
@ -192,6 +191,7 @@
"label": "Label",
"label_for_manifestname": "Label for %s",
"level": "level",
"license": "License",
"loading": "Loading …",
"local_archives": "Local archives",
"local_ip": "Local IP",

View file

@ -19,6 +19,10 @@
<dd>{{id}}</dd>
<dt>{{t 'description'}}</dt>
<dd>{{description}}</dd>
{{#displayLicense}}
<dt>{{t 'license'}}</dt>
<dd>{{manifest.license}}</dd>
{{/displayLicense}}
<dt>{{t 'version'}}</dt>
<dd>{{manifest.version}}</dd>
<dt>{{t 'multi_instance'}}</dt>

View file

@ -42,7 +42,6 @@
<span class="label label-{{stateColor}} label-as-badge app-state" title="{{t (concat 'app_state_' state '_explanation') }}">{{t (concat 'app_state_' state) }}</span>
<a target="_BLANK" href="https://yunohost.org/#/packaging_apps_levels"><span class="label label-{{levelColor}} label-as-badge app-level" title="{{t 'app_level'}}">{{t 'level'}} {{levelFormatted}}</span></a>
<span class="label label-{{maintainedColor}} label-as-badge maintained-status" title="{{t (concat maintained '_details') }}"> {{t maintained}}</span>
{{#displayLicense}}<span class="label label-default app-license" title="{{t 'app_license'}}">{{license}}</span>{{/displayLicense}}
</div>
<div class="app-card-desc">{{description}}</div>
</div>