jstabs for 3 kinds of menu settings, <table> for listing of top bar menu names/visibility

1 files changed, 66 insertions, 34 deletions

diff --git a/templates/admin_themes_menus.tpl b/templates/admin_themes_menus.tpl
index ff7f685..c0cb893 100644
--- a/templates/admin_themes_menus.tpl
+++ b/templates/admin_themes_menus.tpl
@@ -1,12 +1,15 @@
 {strip}
 <div class="admin themes">
 	<div class="header">
-		<h1> {tr}Active Menus{/tr}</h1>
+		<h1>{tr}Active Menus{/tr}</h1>
 	</div>
 
 	<div class="body">
-		{form}
-			{legend legend="Menu Settings"}
+	
+	{jstabs}
+		{jstab title="Settings"}
+		
+			{form legend="Menu Settings"}
 				{foreach from=$formMenuSettings key=feature item=output}
 					<div class="row">
 						{formlabel label=`$output.label` for=$feature}
@@ -16,7 +19,7 @@
 						{/forminput}
 					</div>
 				{/foreach}
-
+        	
 				<div class="row">
 					{formlabel label="Menu Title" for="site_menu_title"}
 					{forminput}
@@ -24,14 +27,16 @@
 						{formhelp note="Override the default home page link name in the top menu bar."}
 					{/forminput}
 				</div>
-
+        	
 				<div class="row submit">
 					<input type="submit" name="menu_settings" value="{tr}Change preferences{/tr}" />
 				</div>
-			{/legend}
-
+			{/form}
+		{/jstab}
+		
+		{jstab title="Effects"}
 			{if $gBitSystem->isFeatureActive( 'site_top_bar' ) && $gBitSystem->isFeatureActive( 'site_top_bar_dropdown' )}
-				{legend legend="Menu Javascript Settings"}
+				{form legend="Menu Javascript Settings"}
 					{foreach from=$formMenuJsSettings key=feature item=output}
 						<div class="row">
 							{formlabel label=`$output.label` for=$feature}
@@ -41,39 +46,66 @@
 							{/forminput}
 						</div>
 					{/foreach}
-
 					<div class="row submit">
 						<input type="submit" name="menu_js_settings" value="{tr}Change preferences{/tr}" />
 					</div>
-				{/legend}
+				{/form}
+			{else}
+				<p class="warning">{tr}No menu enabled.{/tr}</p>
 			{/if}
-		{/form}
+		{/jstab}
 
-		{if $gBitSystem->isFeatureActive( 'site_top_bar' )}
-			{form legend="Top bar menu"}
-				<p class="help">
-					{tr}Here you can select what menus to display, their order and what title they should have. If you don't provide positional information, they will be sorted alphabetically.{/tr}<br />
-					{tr}If you want to create custom menus, please use the Nexus package.{/tr}
-				</p>
+		{jstab title="Visibility"}
+			{if $gBitSystem->isFeatureActive( 'site_top_bar' )}
+				{form legend="Top bar menu"}
+					<p class="help">
+						{tr}Select what menus to display at the <strong>top of the page</strong>, their order and what title they should have. If you don't provide positional information, they will be sorted alphabetically. To create <strong>custom menus</strong>, please use the Nexus package instead.{/tr}
+					</p>			
+					<table summary="{tr}Select menus to display, their order and titles.{/tr}">
+						<thead>
+							<tr>
+								<th>{tr}Package{/tr}</th>
+								<th>{tr}Title{/tr}</th>
+								<th>{tr}Position{/tr}</th>
+							</tr>
+						</thead>
+						<tfoot>
+							<tr>
+								<td colspan="3">
+									<div class="row submit">
+										<input type="submit" name="update_menus" value="{tr}Update Menus{/tr}" />
+									</div>
+								</td>
+							</tr>
+						</tfoot>
+						<tbody>
+							{foreach from=$gBitSystem->mAppMenu key=pkgName item=menu}
+								{forminput}
+									<tr>
+										<td title="{tr}Visible?{/tr}">
+											<input type="checkbox" name="menu_{$pkgName}" id="menu_{$pkgName}" {if !$menu.is_disabled}checked="checked"{/if}/>
+											&nbsp;
+											<label for="menu_{$pkgName}">{tr}{$pkgName}{/tr}
+										</td>
+										<td>
+											<input type="text" name="{$pkgName}_menu_text" value="{$menu.menu_title|escape}"/>
+										</td>
+										<td>
+											<input type="text" name="{$pkgName}_menu_position" size="2" value="{$menu.menu_position|escape}"/>
+										</td>
+									</tr>
+								{/forminput}
+							{/foreach}
+						</tbody>
+					</table>
+				{/form}
+			{else}
+				<p class="warning">{tr}No menu enabled.{/tr}</p>
+			{/if}
+		{/jstab}
+	{/jstabs}
 
-				{foreach from=$gBitSystem->mAppMenu key=pkgName item=menu}
-					<div class="row">
-						{formlabel label="$pkgName" for=""}
-						{forminput}
-							<label>{tr}Visisble{/tr}: <input type="checkbox" name="menu_{$pkgName}" {if !$menu.is_disabled}checked="checked"{/if}/></label>
-							<br />
-							<label>{tr}Title{/tr}: <input type="text" name="{$pkgName}_menu_text" value="{$menu.menu_title|escape}"/></label>
-							<br />
-							<label>{tr}Position{/tr}: <input type="text" name="{$pkgName}_menu_position" size="2" value="{$menu.menu_position|escape}"/></label>
-						{/forminput}
-					</div>
-				{/foreach}
 
-				<div class="row submit">
-					<input type="submit" name="update_menus" value="{tr}Update Menus{/tr}" />
-				</div>
-			{/form}
-		{/if}
 	</div> <!-- end .body -->
 </div>  <!-- end .themes -->