Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 11:05:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #4563 closes #4569 closes #4566

Browse Source
This commit is contained in:
barisusakli
2016-12-15 13:03:14 +03:00
parent e17b37edb6
commit 9d75c48236
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/less/admin/extend/plugins.less
View File

@@ -24,4 +24,10 @@
.pointer; .pointer;
} }
} }
.controls .btn {
display: list-item;
width: 120px;
margin-bottom: 3px;
margin-left: 10px;
}
} }

2
public/src/admin/modules/instance.js
View File

@@ -36,7 +36,7 @@ define('admin/modules/instance', function () {
alert_id: 'instance_restart', alert_id: 'instance_restart',
type: 'info', type: 'info',
title: 'Rebuilding... <i class="fa fa-spin fa-refresh"></i>', title: 'Rebuilding... <i class="fa fa-spin fa-refresh"></i>',
message: 'NodeBB is rebiulding front-end assets (css, javascript, etc).', message: 'NodeBB is rebuilding front-end assets (css, javascript, etc).',
timeout: 10000 timeout: 10000
}); });

1
src/plugins.js
View File

@@ -291,6 +291,7 @@ var middleware;
pluginMap[plugin.id].error = plugin.error || false; pluginMap[plugin.id].error = plugin.error || false;
pluginMap[plugin.id].active = plugin.active; pluginMap[plugin.id].active = plugin.active;
pluginMap[plugin.id].version = plugin.version; pluginMap[plugin.id].version = plugin.version;
pluginMap[plugin.id].settingsRoute = plugin.settingsRoute;
// If package.json defines a version to use, stick to that // If package.json defines a version to use, stick to that
if (dependencies.hasOwnProperty(plugin.id) && semver.valid(dependencies[plugin.id])) { if (dependencies.hasOwnProperty(plugin.id) && semver.valid(dependencies[plugin.id])) {

9
src/views/admin/partials/installed_plugin_item.tpl
View File

@@ -1,6 +1,6 @@
<!-- IF !installed.error --> <!-- 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-id="{installed.id}" data-version="{installed.version}" class="clearfix <!-- IF installed.active -->active<!-- ENDIF installed.active -->">
<div class="pull-right"> <div class="pull-right controls">
<!-- IF installed.isTheme --> <!-- IF installed.isTheme -->
<a href="{config.relative_path}/admin/appearance/themes" class="btn btn-info">Themes</a> <a href="{config.relative_path}/admin/appearance/themes" class="btn btn-info">Themes</a>
<!-- ELSE --> <!-- ELSE -->
@@ -8,6 +8,12 @@
<!-- ENDIF installed.isTheme --> <!-- ENDIF installed.isTheme -->
<button data-action="toggleInstall" data-installed="1" class="btn btn-danger"><i class="fa fa-trash-o"></i> Uninstall</button> <button data-action="toggleInstall" data-installed="1" class="btn btn-danger"><i class="fa fa-trash-o"></i> Uninstall</button>
<!-- IF installed.active -->
<!-- IF installed.settingsRoute -->
<a href="{config.relative_path}{installed.settingsRoute}" class="btn btn-primary"><i class="fa fa-wrench"></i> Settings </a>
<!-- ENDIF installed.settingsRoute -->
<!-- ENDIF installed.active -->
</div> </div>
<h2><strong>{installed.name}</strong></h2> <h2><strong>{installed.name}</strong></h2>
@@ -30,6 +36,7 @@
<button class="btn btn-default disabled"><i class="fa fa-exclamation-triangle"></i> Unknown</button> <button class="btn btn-default disabled"><i class="fa fa-exclamation-triangle"></i> Unknown</button>
<button data-action="toggleInstall" data-installed="1" class="btn btn-danger"><i class="fa fa-trash-o"></i> Uninstall</button> <button data-action="toggleInstall" data-installed="1" class="btn btn-danger"><i class="fa fa-trash-o"></i> Uninstall</button>
</div> </div>
<h2><strong>{installed.id}</strong></h2> <h2><strong>{installed.id}</strong></h2>