This commit is contained in:
Julian Lam
2017-08-03 12:06:01 -04:00
parent 29e7bdbc99
commit 4f9cbabec3
6 changed files with 75 additions and 25 deletions

View File

@@ -44,9 +44,20 @@ function loadPluginInfo(pluginPath, callback) {
}
var pluginData;
var packageData;
var licenseData;
try {
pluginData = JSON.parse(results.plugin);
packageData = JSON.parse(results.package);
try {
licenseData = require('spdx-license-list/licenses/' + packageData.license);
pluginData.license = {
name: licenseData.name,
text: licenseData.licenseText,
};
} catch (e) {
// No license matched
pluginData.license = null;
}
pluginData.id = packageData.name;
pluginData.name = packageData.name;
@@ -55,7 +66,6 @@ function loadPluginInfo(pluginPath, callback) {
pluginData.repository = packageData.repository;
pluginData.nbbpm = packageData.nbbpm;
pluginData.path = pluginPath;
pluginData.license = packageData.license;
} catch (err) {
var pluginDir = path.basename(pluginPath);

View File

@@ -1,5 +1,5 @@
<!-- IF !installed.error -->
<li id="{installed.id}" data-plugin-id="{installed.id}" data-version="{installed.version}" class="clearfix <!-- IF installed.active -->active<!-- ENDIF installed.active -->">
<li id="{installed.id}" data-plugin-index="@index" data-plugin-id="{installed.id}" data-version="{installed.version}" class="clearfix <!-- IF installed.active -->active<!-- ENDIF installed.active -->">
<div class="pull-right controls">
<!-- IF installed.isTheme -->
<a href="{config.relative_path}/admin/appearance/themes" class="btn btn-info">[[admin/extend/plugins:plugin-item.themes]]</a>

View File

@@ -0,0 +1,5 @@
[[admin/extend/plugins:license.intro, {name}, {license.name}]]
<blockquote>{license.text}</blockquote>
[[admin/extend/plugins:license.cta]]