Commit df26ab2f authored by Aaron Wells's avatar Aaron Wells Committed by Gerrit Code Review
Browse files

Merge "List un-installed plugins first for easier spotting (Bug #1206306)"

parents 3fd420f9 f2262dee
......@@ -162,7 +162,12 @@ function installplugin(name) {
// new parent node
var bits = name.split('\.');
var newparent = $(bits[0] + '.installed');
appendChildNodes(newparent, $(name));
var oldparent = $(name).parentNode;
insertSiblingNodesBefore(newparent, $(name));
// If there are no more plugins left for this type to be installed
if (oldparent.children.length == 0) {
oldparent.parentNode.style.display = 'none';
}
}
else {
var message = '';
......
......@@ -764,6 +764,9 @@ input#institution_suspend_submit {
list-style: none;
margin: 3px 0 0 0;
}
#adminplugin ul.adminpluginstypes ul li.notinstalled {
margin-bottom: 10px;
}
#adminplugin ul.adminpluginstypes ul ul ul li {
list-style: disc;
margin: 0 0 3px 15px;
......
......@@ -9,6 +9,23 @@
{assign var="installed" value=$plugins.installed}
{assign var="notinstalled" value=$plugins.notinstalled}
<ul>
{if $notinstalled}
<li class="notinstalled"><b>{str tag='notinstalledplugins'}</b>
<ul id="{$plugintype}.notinstalled">
{foreach from=$notinstalled key='plugin' item='data'}
<li id="{$plugintype}.{$plugin}">{$plugin}
{if $data.notinstallable}
{str tag='notinstallable'}: {$data.notinstallable}
{else}
<span id="{$plugintype}.{$plugin}.install">(<a href="" onClick="{$installlink}('{$plugintype}.{$plugin}'); return false;">{str tag='install' section='admin'}</a>)</span>
{/if}
<span id="{$plugintype}.{$plugin}.message"></span>
</li>
{/foreach}
</ul>
</li>
{/if}
<li><b>{str tag='installedplugins'}</b>
<ul id="{$plugintype}.installed">
{foreach from=$installed key='plugin' item='data'}
......@@ -35,22 +52,6 @@
{/foreach}
</ul>
</li>
{if $notinstalled}
<li><b>{str tag='notinstalledplugins'}</b>
<ul id="{$plugintype}.notinstalled">
{foreach from=$notinstalled key='plugin' item='data'}
<li id="{$plugintype}.{$plugin}">{$plugin}
{if $data.notinstallable}
{str tag='notinstallable'}: {$data.notinstallable}
{else}
<span id="{$plugintype}.{$plugin}.install">(<a href="" onClick="{$installlink}('{$plugintype}.{$plugin}'); return false;">{str tag='install' section='admin'}</a>)</span>
{/if}
<span id="{$plugintype}.{$plugin}.message"></span>
</li>
{/foreach}
</ul>
</li>
{/if}
</ul>
</li>
{/foreach}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment