Template tidies

2 files changed, 8 insertions, 183 deletions

diff --git a/templates/admin_role_permissions.tpl b/templates/admin_role_permissions.tpl
index f1006fb..d89eb3b 100644..100755
--- a/templates/admin_role_permissions.tpl
+++ b/templates/admin_role_permissions.tpl
@@ -8,7 +8,8 @@
 		{formfeedback hash=$feedback}
 
 		{form}
-			<input type="hidden" name="package" value="{$smarty.request.package}" />
+			<input type="hidden" name="package" value="{$smarty.request.package|default:'All'}" />
+			<input type="hidden" name="tk" value="{$gBitUser->mTicket}" />
 
 			<p>
 				{smartlink ititle=All package=$packageKey}
@@ -34,8 +35,8 @@
 						</tr>
 						{assign var=prev_package value=$perm.package}
 					{/if}
-					<tr class="{cycle values="odd,even"}{if $unassignedPerms.$p} prio5{/if}">
-						<td>{if $unassignedPerms.$p}{booticon iname="fa-triangle-exclamation" iexplain="Unassigned Permission"}{/if}</td>
+					<tr class="{cycle values="odd,even"}{if $unassignedPerms.$p|default:false} prio5{/if}">
+						<td>{if $unassignedPerms.$p|default:false}{booticon iname="fa-triangle-exclamation" iexplain="Unassigned Permission"}{/if}</td>
 						<td title="{$perm.perm_desc}"><abbr title="{$perm.perm_desc}">{$p}</abbr></td>
 						{foreach from=$allRoles item=role}
 							{if     $perm.perm_level == 'admin'     }{assign var=id value=1}
@@ -43,18 +44,18 @@
 							{elseif $perm.perm_level == 'registered'}{assign var=id value=3}
 							{elseif $perm.perm_level == 'basic'     }{assign var=id value=-1}{/if}
 
-							{if $id == $role.role_id and !$role.perms.$p}
+							{if $id == $role.role_id && !$role.perms.$p|default:false}
 								{assign var=class value="prio5"}
-							{elseif $id == $role.role_id and $role.perms.$p}
+							{elseif $id == $role.role_id && $role.perms.$p|default:false}
 								{assign var=class value="prio1"}
-							{elseif $id != $role.role_id and $role.perms.$p}
+							{elseif $id != $role.role_id && $role.perms.$p|default:false}
 								{assign var=class value="prio5"}
 							{else}
 								{assign var=class value=""}
 							{/if}
 
 							<td class="{if $role.role_id lt 4}alignright{else}content-center{/if} {$class}">
-								<input id="{$p}{$role.role_id}" type="checkbox" value="{$p}" name="perms[{$role.role_id}][{$p}]" title="{$role.role_name}" {if $role.perms.$p}checked="checked"{/if}/>
+								<input id="{$p}{$role.role_id}" type="checkbox" value="{$p}" name="perms[{$role.role_id}][{$p}]" title="{$role.role_name}" {if $role.perms.$p|default:false}checked="checked"{/if}/>
 							</td>
 
 							{if $role.role_id lt 4}
diff --git a/templates/user_assigned_modules.tpl b/templates/user_assigned_modules.tpl
index 69608ca..5437440 100644..100755
--- a/templates/user_assigned_modules.tpl
+++ b/templates/user_assigned_modules.tpl
@@ -170,180 +170,4 @@
 		{/jstabs}
 	</div><!-- end .body -->
 </div><!-- end .usermodules -->
-
 {/strip}
-
-
-{* old code. left here in case we need something... xing
-for instance, i don't know where the page heading stuff is used.
-
-<table width="100%">
-{if $gBitSystem->isFeatureActive( 'users_layouts' ) or $gBitSystem->getConfig('users_layouts') eq 'h'}
-
-{if $canassign eq 'y'}
-<tr>
-	<td valign="top">
-
-<form action="{$smarty.const.USERS_PKG_URL}assigned_modules.php" method="post">
-<table class="panel">
-<caption>{tr}Assign Left Column{/tr}</caption>
-<tr>
-	<td>{tr}Module{/tr}:</td>
-	<td>
-		<select name="fAssign[module_rsrc]">
-		{section name=ix loop=$assignables.border}
-		<option value="{$assignables.border[ix].module_rsrc|escape}">{$assignables.border[ix].name}</option>
-		{sectionelse}
-			<option>{tr}No records found{/tr}</option>
-		{/section}
-		</select>
-	</td>
-</tr>
-<tr>
-	<td>
-{tr}Column{/tr}:</td><td>
-	<input type="hidden" name="fAssign[pos]" value="l" />
-	{tr}left{/tr}
-	</td>
-</tr>
-<tr>
-	<td>{tr}Order{/tr}:</td>
-	<td>
-	<select name="fAssign[ord]">
-	{section name=ix loop=$orders}
-		<option value="{$orders[ix]|escape}">{$orders[ix]}</option>
-	{/section}
-	</select>
-	</td>
-</tr>
-<tr class="panelsubmitrow">
-	<td colspan="2"><input type="submit" class="btn btn-default" name="fSubmitAssign" value="{tr}assign{/tr}" /></td>
-</tr>
-</table>
-</form>
-
-	</td>
-	<td valign="top">
-
-<form action="{$smarty.const.USERS_PKG_URL}assigned_modules.php" method="post">
-<table class="panel">
-<caption>{tr}Assign Center Column{/tr}</caption>
-<tr>
-	<td>{tr}Center Piece{/tr}:</td>
-	<td>
-		<select name="fAssign[module_rsrc]">
-		{section name=ix loop=$assignables.center}
-		<option value="{$assignables.center[ix].module_rsrc|escape}">{$assignables.center[ix].name}</option>
-		{sectionelse}
-			<option>{tr}No records found{/tr}</option>
-		{/section}
-		</select>
-	</td>
-</tr>
-<tr>
-	<td>{tr}Column{/tr}:</td>
-	<td>{tr}Center{/tr}
-		<input type="hidden" name="fAssign[pos]" value="c" />
-	</td>
-</tr>
-<tr>
-	<td>{tr}Order{/tr}:</td>
-	<td>
-	<select name="fAssign[ord]">
-	{section name=ix loop=$orders}
-		<option value="{$orders[ix]|escape}">{$orders[ix]}</option>
-	{/section}
-	</select>
-	</td>
-</tr>
-<tr class="panelsubmitrow">
-	<td colspan="2"><input type="submit" class="btn btn-default" name="fSubmitAssign" value="{tr}assign{/tr}" /></td>
-</tr>
-</table>
-</form>
-
-	</td>
-	<td valign="top">
-
-<form action="{$smarty.const.USERS_PKG_URL}assigned_modules.php" method="post">
-<table class="panel">
-<caption>{tr}Assign Right Column{/tr}</caption>
-<tr>
-	<td>{tr}Module{/tr}:</td>
-	<td>
-		<select name="fAssign[module_rsrc]">
-		{section name=ix loop=$assignables.border}
-		<option value="{$assignables.border[ix].module_rsrc|escape}">{$assignables.border[ix].name}</option>
-		{/section}
-		</select>
-	</td>
-</tr>
-<tr>
-	<td>
-{tr}Column{/tr}:</td><td>
-	<input type="hidden" name="fAssign[pos]" value="r" />
-{tr}right{/tr}
-	</td>
-</tr>
-<tr>
-	<td>{tr}Order{/tr}:</td>
-	<td>
-	<select name="fAssign[ord]">
-	{section name=ix loop=$orders}
-		<option value="{$orders[ix]|escape}">{$orders[ix]}</option>
-	{sectionelse}
-		<option>{tr}No records found{/tr}</option>
-	{/section}
-	</select>
-	</td>
-</tr>
-<tr class="panelsubmitrow">
-	<td colspan="2"><input type="submit" class="btn btn-default" name="fSubmitAssign" value="{tr}assign{/tr}" /></td>
-</tr>
-</table>
-</form>
-
-{/if}
-
-	</td>
-</tr>
-<tr><td colspan="3"><hr /></td></tr>
-{/if}
-<tr>
-	<td colspan="2" valign="top">
-
-	<form action="{$smarty.const.USERS_PKG_URL}assigned_modules.php" method="post">
-<table class="panel">
-<caption>{tr}Enter Homepage Heading{/tr}</caption>
-<tr><td>{tr}Enter a maximum of 250 characters. You can include Wiki syntax.{/tr}</td></tr>
-<tr>
-	<td><textarea name="homeHeaderData" cols="50" rows="3">{$homeHeaderData}</textarea></td>
-</tr>
-<tr class="panelsubmitrow">
-	<td><input type="submit" class="btn btn-default" name="fSubmitSetHeading" value="{tr}Set Heading{/tr}" /></td>
-</tr>
-</table>
-	</form>
-</td>
-<td style="vertical-align:top;">
-{if $gBitSystem->isFeatureActive( 'users_themes' ) || $gBitSystem->getConfig('users_themes') eq 'h' }
-
-	<form method="POST" action="{$smarty.const.USERS_PKG_URL}assigned_modules.php">
-	<table class="panel">
-		<caption>{tr}Select Theme for your Homepage{/tr}</caption>
-		<tr><td>
-		<select name="style">
-		{section name=ix loop=$styles}
-			<option value="{$styles[ix]|escape}" {if $assignStyle eq $styles[ix]}selected="selected"{/if}>{$styles[ix]}</option>
-		{/section}
-		</select>
-		</td><td>
-		<input type="submit" class="btn btn-default" value="Change Theme" name="fSubmitSetTheme">
-		</td></tr></table>
-	</form>
-{/if}
-	</td>
-</tr>
-</table>
-
-*}