Moved modules to config

3 files changed, 19 insertions, 12 deletions

diff --git a/templates/show_modules.inc.php b/templates/show_modules.inc.php
index 19177b1c..6da5563d 100644
--- a/templates/show_modules.inc.php
+++ b/templates/show_modules.inc.php
@@ -33,11 +33,13 @@ $web_path = conf('web_path');
 ?>
 
 <!-- Localplay Modules --> 
-<?php show_box_top(_('Localplay Modules')); ?>
 <table class="tabledata" border="0" cellspacing="0">
+<tr class="odd">
+<th colspan="2" class="header2" align="left"><?php echo _('Localplay Modules');?></th>
+</tr>
 <tr class="table-header">
-	<th><?php echo _('Module Name'); ?></th>
-	<th><?php echo _('Action'); ?></th>
+	<td><?php echo _('Module Name'); ?></td>
+	<td><?php echo _('Action'); ?></td>
 </tr>
 <?php 
 foreach ($localplay_modules as $module) { 
@@ -60,12 +62,12 @@ foreach ($localplay_modules as $module) {
 </tr>
 <?php } ?>
 </table>
-<?php show_box_bottom(); ?>
-
+<br />
 
 <!-- Plugins --> 
-<?php show_box_top(_('Available Plugins')); ?>
 <table class="tabledata">
+<tr class="odd">
+<th colspan="4" class="header2" align="left"><?php echo _('Available Plugins'); ?></th>
 <tr class="table-header">
 	<td><?php echo _('Name'); ?></td>
 	<td><?php echo _('Description'); ?></td>
@@ -95,4 +97,4 @@ foreach ($plugins as $key=>$plugin) {
 </tr>
 <?php } ?>
 </table>
-<?php show_box_bottom(); ?>
+
diff --git a/templates/show_preferences.inc b/templates/show_preferences.inc
index 7221c73a..714381d0 100644
--- a/templates/show_preferences.inc
+++ b/templates/show_preferences.inc
@@ -74,14 +74,19 @@ if (($GLOBALS['user']->has_access(100)) AND ($user_id == '-1' AND conf('use_auth
 <li <?php echo $tab_system; ?>>
 	<a href="<?php echo $link; ?>?tab=system&amp;user_id=<?php echo $user_id; ?>" <?php echo $a_system; ?>>System</a>
 </li>
+<li <?php echo $tab_modules; ?>>
+	<a href="<?php echo $link; ?>?tab=modules&amp;user_id=<?php echo $user_id; ?>" <?php echo $a_modules; ?>>Modules</a>
+</li>
+
 <?php } ?>
 </ul>
 </div>
 <div class="text-box" style="width:45em;">
 <form method="post" name="preferences" action="<?php echo conf('web_path'); ?><?php echo $target; ?>" enctype="multipart/form-data">
 <?php 
-if ($current_tab != 'account') { 
+if ($current_tab != 'account' && $current_tab != 'modules') { 
 	show_preference_box($preferences[$current_tab]); 
+
 ?>
 	<input class="button" type="submit" value="<?php echo _("Update Preferences"); ?>" />
 	<input type="hidden" name="action" value="update_preferences" />
@@ -90,8 +95,10 @@ if ($current_tab != 'account') {
 	<input class="button" type="submit" name="action" value="<?php echo _("Cancel"); ?>" />
 <?php
 	} 
-
-	else { 
+if ($current_tab == 'modules') {
+	        require (conf('prefix') .  '/templates/show_modules.inc.php');
+}
+if ($current_tab == 'account') { 
 		$this_user = new User($user_id);
 		require (conf('prefix') . '/templates/show_user.inc.php');
 	}
diff --git a/templates/sidebar.inc.php b/templates/sidebar.inc.php
index 62568d53..553514b5 100644
--- a/templates/sidebar.inc.php
+++ b/templates/sidebar.inc.php
@@ -30,7 +30,6 @@ $admin_items[] = array('title'=>_('Mail Users'),'url'=>'admin/mail.php','active'
 $admin_items[] = array('title'=>_('Catalog'),'url'=>'admin/index.php','active'=>$location['page']);
 $admin_items[] = array('title'=>_('Config'),'url'=>'admin/preferences.php','active'=>$location['page']);
 $admin_items[] = array('title'=>_('Access List'),'url'=>'admin/access.php','active'=>$location['page']);
-$admin_items[] = array('title'=>_('Modules'),'url'=>'admin/modules.php','active'=>$location['page']);
 
 $browse_items[] = array('title'=>_("Albums"),'url'=>'albums.php','active'=>$location['page']);
 $browse_items[] = array('title'=>_("Artists"),'url'=>'artists.php','active'=>$location['page']);
@@ -57,7 +56,6 @@ $web_path = conf('web_path');
                     $location['page'] == 'admin/mail.php' ||
                     $location['page'] == 'admin/catalog.php' ||
                     $location['page'] == 'admin/preferences.php' ||
-		    $location['page'] == 'admin/modules.php' ||
                     $location['page'] == 'admin/access.php' ){
                     echo " id=\"activetopmenu\" ";
                     }?>>