update plugins stuff with older but nicer UI, remove unused files, update menu to reflect repositioning of admin area

3 files changed, 23 insertions, 74 deletions

diff --git a/templates/admin_nexus.tpl b/templates/admin_nexus.tpl
index 36834a6..7488280 100644
--- a/templates/admin_nexus.tpl
+++ b/templates/admin_nexus.tpl
@@ -10,36 +10,30 @@
 	</div>
 {/legend}
 
-{form}
+{form legend="Nexus Menu Plugins"}
 	<input type="hidden" name="page" value="{$page}" />
 
-	<table class="panel">
-		<caption>{tr}Nexus Plugins{/tr}</caption>
-		<tr>
-			<th style="width:70%;">{tr}Plugin{/tr}</th>
-			<th style="width:20%;">{tr}GUID{/tr}</th>
-			<th style="width:10%;">{tr}Active{/tr}</th>
-		</tr>
-
-		{foreach from=$gNexusSystem->mPlugins item=plugin key=guid}
-			<tr class="{cycle values="odd,even"}">
-				<td>
-					<h3>{$plugin.title|escape}</h3>
-					<label for="{$guid}">
-						{$plugin.description|escape}
-					</label>
-				</td>
-				<td>{$guid}</td>
-				<td align="center">
-					{if $plugin.is_active == 'x'}
-						{tr}Missing{/tr}
-					{else}
-						{html_checkboxes name="plugins[`$guid`]" values="y" checked=`$plugin.is_active` labels=false id=$guid}
-					{/if}
-				</td>
-			</tr>
+	<ul class="data">
+		{foreach from=$gNexusSystem->mPlugins item=plugin}
+			<li class="item {cycle values='even,odd'}">
+				<div class="floaticon">
+					<input type="checkbox" name="plugins[{$plugin.plugin_guid}]" id="{$plugin.plugin_guid}" value="y" {if $plugin.is_active eq 'y'}checked="checked"{/if} />
+				</div>
+				<h3><label for="{$plugin.plugin_guid}">{$plugin.plugin_guid}</label></h3>
+				{$plugin.plugin_description}<br />
+				{tr}Menu subtypes{/tr}
+				<ul class="small">
+					{foreach from=$plugin.menu_types item=menu_type}
+						<li>{$menu_type.note}</li>
+					{/foreach}
+				</ul>
+				<small>
+				{if $plugin.web_link}<strong>{tr}Online Resource{/tr}:</strong> {$plugin.web_link}<br />{/if}
+					<strong>{tr}Browser Requirements{/tr}:</strong> {$plugin.browser_requirements}
+				</small>
+			</li>
 		{/foreach}
-	</table>
+	</ul>
 
 	<div class="row submit">
 		<input type="submit" name="pluginsave" value="{tr}Save Plugin Settings{/tr}" />
diff --git a/templates/menu_nexus.tpl b/templates/menu_nexus.tpl
index 337a468..1a4953a 100644
--- a/templates/menu_nexus.tpl
+++ b/templates/menu_nexus.tpl
@@ -2,16 +2,10 @@
 <ul>
 	{if $gNexus->mInfo.menu_id}
 		<li><a class="head" href="{$smarty.const.NEXUS_PKG_URL}menus.php">{biticon ipackage="icons" iname="folder-remote" iexplain="menus"} Menus</a>
-			<ul>
-				<li><a class="item" href="{$smarty.const.NEXUS_PKG_URL}menu_items.php?menu_id={$gNexus->mInfo.menu_id}">{biticon ipackage="icons" iname="accessories-text-editor" iexplain="edit items" iforce=icon} {tr}Add/Edit items{/tr}</a></li>
-				<li><a class="item" href="{$smarty.const.NEXUS_PKG_URL}menu_sort.php?menu_id={$gNexus->mInfo.menu_id}">{biticon ipackage="icons" iname="view-refresh" iexplain="organise items" iforce=icon} {tr}Organise items{/tr}</a></li>
-			</ul>
-		</li>
+		<li><a class="item" href="{$smarty.const.NEXUS_PKG_URL}menu_items.php?menu_id={$gNexus->mInfo.menu_id}">{biticon ipackage="icons" iname="accessories-text-editor" iexplain="edit items" iforce=icon} {tr}Add/Edit items{/tr}</a></li>
+		<li><a class="item" href="{$smarty.const.NEXUS_PKG_URL}menu_sort.php?menu_id={$gNexus->mInfo.menu_id}">{biticon ipackage="icons" iname="view-refresh" iexplain="organise items" iforce=icon} {tr}Organise items{/tr}</a></li></li>
 	{else}
 		<li><a class="item" href="{$smarty.const.NEXUS_PKG_URL}menus.php">{biticon ipackage="icons" iname="folder-remote" iexplain="menus" iforce=icon} Menus</a></li>
 	{/if}
-	{if $gBitUser->hasPermission('p_admin')}
-		<li><a class="item" href="{$smarty.const.NEXUS_PKG_URL}admin/nexus_plugins.php">{biticon ipackage="icons" iname="applications-accessories" iexplain="menus" iforce=icon} Nexus Plugins</a></li>
-	{/if}
 </ul>
 {/strip}
diff --git a/templates/nexus_plugins.tpl b/templates/nexus_plugins.tpl
deleted file mode 100644
index 32ba8e9..0000000
--- a/templates/nexus_plugins.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-{strip}
-<div class="admin nexus">
-	<div class="header">
-		<h1>{tr}Nexus Menu Plugins{/tr}</h1>
-	</div>
-
-	<div class="body">
-		{form legend="Nexus Menu Plugins"}
-			<ul class="data">
-				{foreach from=$gNexusSystem->mPlugins item=plugin}
-					{if $plugin.verified}
-						<li class="item {cycle values='even,odd'}">
-							<div class="floaticon">
-								<input type="checkbox" name="PLUGINS[{$plugin.plugin_guid}]" id="{$plugin.plugin_guid}" value="y" {if $plugin.is_active eq 'y'}checked="checked"{/if} />
-							</div>
-							<h3><label for="{$plugin.plugin_guid}">{$plugin.plugin_guid}</label></h3>
-							{$plugin.plugin_description}<br />
-							{tr}Menu subtypes{/tr}
-							<ul class="small">
-								{foreach from=$plugin.menu_types item=menu_type}
-									<li>{$menu_type.note}</li>
-								{/foreach}
-							</ul>
-							<small>
-							{if $plugin.web_link}<strong>{tr}Online Resource{/tr}:</strong> {$plugin.web_link}<br />{/if}
-								<strong>{tr}Browser Requirements{/tr}:</strong> {$plugin.browser_requirements}
-							</small>
-						</li>
-					{/if}
-				{/foreach}
-			</ul>
-
-			<div class="row submit">
-				<input type="submit" name="store_plugins" value="{tr}Save Plugin Settings{/tr}" />
-			</div>
-		{/form}
-	</div><!-- end .body -->
-</div><!-- end .nexus -->
-{/strip}