SD-SimpleDesk

@@ -13,16 +13,15 @@ function template_shd_custom_field_home()

 	global $context, $settings, $txt, $modSettings, $scripturl;

 	echo '

-				<div class="tborder">

 		<div class="cat_bar">

 			<h3 class="catbg">

 				<img src="', $settings['default_images_url'], '/simpledesk/custom_fields.png" class="icon" alt="*" />

 				', $txt['shd_admin_custom_fields_long'], '

 			</h3>

 		</div>

-					<p class="information">

+		<div class="information">

 			', $txt['shd_admin_custom_fields_desc'], '

-					</p>

+		</div>

 		<table class="table_grid">

 			<tr class="title_bar">

 				<td width="30%" colspan="2">

@@ -87,7 +86,6 @@ function template_shd_custom_field_home()

 			<div class="floatright">

 				<div class="additional_row">[<a href="', $scripturl, '?action=admin;area=helpdesk_customfield;sa=new">', $txt['shd_admin_new_custom_field'], '</a>]</div>

 			</div>

-					</div>

 		</div>';

 }

@@ -209,16 +207,14 @@ function template_shd_custom_field_edit()

 				}

 				// ]', ']></script>

 				<form action="', $scripturl, '?action=admin;area=helpdesk_customfield;sa=save', !empty($context['new_field']) ? ';new' : '', '" method="post">

-					<div class="tborder">

 					<div class="cat_bar">

 						<h3 class="catbg">

 							<img src="', $settings['default_images_url'], '/simpledesk/custom_fields.png" class="icon" alt="*" />

 							', $context['section_title'], '

 						</h3>

 					</div>

-						<p class="information">

+					<div class="information">

 							', $context['section_desc'],'

-						</p>

 					</div>

 					<div class="cat_bar">

 						<h3 class="catbg">

@@ -227,7 +223,6 @@ function template_shd_custom_field_edit()

 						</h3>

 					</div>

 					<div class="roundframe">

-						<div class="content">

 						<dl class="settings">

 							<dt><strong>', $txt['shd_admin_custom_fields_fieldname'], ':</strong><br><span class="smalltext">', $txt['shd_admin_custom_fields_fieldname_desc'], '</span></dt>

 							<dd><input type="text" name="field_name" id="cf_fieldname"', !empty($context['custom_field']['field_name']) ? ' value="' . $context['custom_field']['field_name'] . '"' : '', ' class="input_text" size="30" /></dd>

@@ -283,7 +278,6 @@ function template_shd_custom_field_edit()

 							</dd>

 						</dl>

 					</div>

-					</div>

 					<div class="cat_bar">

 						<h3 class="catbg">

 							<img src="', $settings['default_images_url'], '/simpledesk/fieldtype.png" alt="*" />

@@ -291,7 +285,6 @@ function template_shd_custom_field_edit()

 						</h3>

 					</div>

 					<div class="roundframe">

-						<div class="content">

 						<dl class="settings">

 							<dt><strong>', $txt['shd_admin_custom_fields_fieldtype'], ':</strong></dt>

 							<dd>

@@ -332,7 +325,6 @@ function template_shd_custom_field_edit()

 								</div>

 							</dt>

 							<dd id="options_dd"', in_array($context['field_type_value'], array(CFIELD_TYPE_SELECT, CFIELD_TYPE_RADIO, CFIELD_TYPE_MULTI)) ? '' : ' style="display: none;"','>

-									<div>

 								<input type="radio" id="radio_0" name="default_select" value="0"', $context['custom_field']['default_value'] == 0 ? ' checked="checked"' : '', $context['field_type_value'] != CFIELD_TYPE_MULTI ? '' : ' style="display:none;"', ' class="input_radio" /> <span id="radio_text_0"', $context['field_type_value'] != CFIELD_TYPE_MULTI ? '' : ' style="display:none;"', '>', $txt['shd_admin_custom_field_no_selected_default'], '</span>';

 	// Convert it to an array for displaying the main doodah

@@ -354,7 +346,6 @@ function template_shd_custom_field_edit()

 	echo '

 								<span id="addopt"></span>

 								[<a href="" onclick="add_option(); return false;">', $txt['more'], '</a>]

-									</div>

 							</dd>

 							<dt id="default_dt"', $context['field_type_value'] == CFIELD_TYPE_CHECKBOX ? '' : ' style="display: none;"','>

 								<strong>', $txt['shd_admin_custom_field_default_state'], ':</strong>

@@ -368,7 +359,6 @@ function template_shd_custom_field_edit()

 								<input type="checkbox" class="input_check"', (!empty($context['custom_field']['display_empty']) && $context['custom_field']['display_empty'] == 1 ? ' checked="checked"' : ''), ' name="display_empty" id="cf_display_empty"', (!empty($context['custom_field']['required']) && $context['custom_field']['required'] == 1 ? ' disabled="disabled"' : ''), '/>

 							</dd>

 						</dl>

-						</div>

 					</div>';

 	if (!empty($context['dept_fields']))

@@ -381,7 +371,6 @@ function template_shd_custom_field_edit()

 						</h3>

 					</div>

 					<div class="roundframe">

-						<div class="content">

 						<dl class="settings">';

 		foreach ($context['dept_fields'] as $id => $row)

 			echo '

@@ -396,7 +385,6 @@ function template_shd_custom_field_edit()

 		echo '

 						</dl>

-						</div>

 					</div>';

 	}

@@ -18,16 +18,15 @@ function template_shd_departments_home()

 	global $context, $settings, $txt, $modSettings, $scripturl;

 	echo '

-				<div class="tborder">

 		<div class="cat_bar">

 			<h3 class="catbg">

 				<img src="', $settings['default_images_url'], '/simpledesk/departments.png" class="icon" alt="*">

 				', $txt['shd_admin_departments_home'], '

 			</h3>

 		</div>

-					<p class="information">

+		<div class="information">

 			', $txt['shd_admin_departments_homedesc'], '

-					</p>

+		</div>

 		<table class="table_grid">

 			<tr class="title_bar">

 				<td width="1%"></td>

@@ -99,7 +98,6 @@ function template_shd_departments_home()

 			<div class="floatright">

 				<div class="additional_row">[<a href="', $scripturl, '?action=admin;area=helpdesk_depts;sa=createdept">', $txt['shd_create_dept'], '</a>]</div>

 			</div>

-					</div>

 		</div>';

 }

@@ -108,16 +106,14 @@ function template_shd_create_dept()

 	global $context, $settings, $txt, $modSettings, $scripturl;

 	echo '

-				<div class="tborder">

 		<div class="cat_bar">

 			<h3 class="catbg">

 				<img src="', $settings['default_images_url'], '/simpledesk/departments.png" class="icon" alt="*" />

 				', $txt['shd_admin_departments_home'], '

 			</h3>

 		</div>

-					<p class="information">

+		<div class="information">

 			', $txt['shd_admin_departments_homedesc'], '

-					</p>

 		</div>

 		<div class="cat_bar">

 			<h3 class="catbg">

@@ -127,7 +123,6 @@ function template_shd_create_dept()

 		</div>

 		<div class="roundframe">

 			<form action="', $scripturl, '?action=admin;area=helpdesk_depts;sa=createdept;part=2" method="post">

-						<div class="content">

 				<dl class="settings">

 					<dt><strong>', $txt['shd_new_dept_name'], '</strong></dt>

 					<dd><input type="text" name="dept_name" id="dept_name" value="" class="input_text" size="30" /></dd>

@@ -151,7 +147,6 @@ function template_shd_create_dept()

 						</select>

 					</dd>

 				</dl>

-						</div>

 				<input type="submit" value="', $txt['shd_create_dept'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button_submit" />

 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />

 				<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '" />

@@ -165,16 +160,14 @@ function template_shd_edit_dept()

 	echo '

 		<form action="', $scripturl, '?action=admin;area=helpdesk_depts;sa=savedept" method="post">

-					<div class="tborder">

 			<div class="cat_bar">

 				<h3 class="catbg">

 					<img src="', $settings['default_images_url'], '/simpledesk/departments.png" class="icon" alt="*" />

 					', $txt['shd_admin_departments_home'], '

 				</h3>

 			</div>

-						<p class="information">

+			<div class="information">

 				', $txt['shd_admin_departments_homedesc'], '

-						</p>

 			</div>

 			<div class="cat_bar">

 				<h3 class="catbg">

@@ -182,9 +175,7 @@ function template_shd_edit_dept()

 					', $txt['shd_edit_dept'], '

 				</h3>

 			</div>

-

 			<div class="roundframe">

-						<div class="content">

 				<dl class="settings">

 					<dt><strong>', $txt['shd_department_name'], '</strong></dt>

 					<dd><input type="text" name="dept_name" id="dept_name" value="', $context['shd_dept']['dept_name'], '" class="input_text" size="30" /></dd>

@@ -239,20 +231,19 @@ function template_shd_edit_dept()

 					</dd>

 				</dl>

 			</div>

-					</div>

-					<div class="tborder floatleft" style="width: 100%;">

+			<div class="floatleft" style="width: 100%;">

 				<div class="cat_bar">

 					<h3 class="catbg">

 						<img src="', $settings['default_images_url'], '/simpledesk/roles.png" alt="*" />

 						', $txt['shd_roles_in_dept'], '

 					</h3>

 				</div>

-						<p class="information">

+				<div class="information">

 					', $txt['shd_roles_in_dept_desc'], '

-						</p>

+				</div>

 				<table class="table_grid">

 					<tr class="title_bar">

-								<td width="50%">', $txt['shd_role'], '</td>

+						<td class="shd_50">', $txt['shd_role'], '</td>

 						<td>', $txt['shd_assign_dept'], '</td>

 					</tr>';

@@ -284,7 +274,5 @@ function template_shd_edit_dept()

 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />

 				<input type="hidden" name="dept" value="', $context['shd_dept']['id_dept'], '" />

 			</div>

-				</form>

-				<br class="clear" />';

+		</form>';

 }

\ No newline at end of file

-

@@ -18,27 +18,24 @@ function template_shd_permissions_home()

 	global $context, $settings, $txt, $modSettings, $scripturl;

 	echo '

-				<div class="tborder">

 		<div class="cat_bar">

 			<h3 class="catbg">

 				<img src="', $settings['default_images_url'], '/simpledesk/permissions.png" class="icon" alt="*" />

 				', $txt['shd_admin_permissions'], '

 			</h3>

 		</div>

-					<p class="information">

+		<div class="information">

 			', $txt['shd_admin_permissions_homedesc'], '

-					</p>

 		</div>

-				<div class="tborder">

 		<div class="title_bar">

 			<h3 class="titlebg">

 				<img src="', $settings['default_images_url'], '/simpledesk/position.png" alt="*" />

 				', $txt['shd_role_templates'], '

 			</h3>

 		</div>

-					<p class="information">

+		<div class="information">

 			', $txt['shd_role_templates_desc'], '

-					</p>

+		</div>

 		<table class="table_grid">

 			<tr class="title_bar">

 				<td colspan="2" width="30%">', $txt['shd_role'], '</td>

@@ -60,18 +57,15 @@ function template_shd_permissions_home()

 	echo '

 		</table>

-				</div>

-				<br><br>

-				<div class="tborder">

 		<div class="title_bar">

 			<h3 class="titlebg">

 				<img src="', $settings['default_images_url'], '/simpledesk/roles.png" alt="*" />

 				', $txt['shd_roles'], '

 			</h3>

 		</div>

-					<p class="information">

+		<div class="information">

 			', $txt['shd_roles_desc'], '

-					</p>

+		</div>

 		<table class="table_grid">

 			<tr class="title_bar">

 				<td colspan="2" width="20%">', $txt['shd_role'], '</td>

@@ -127,8 +122,7 @@ function template_shd_permissions_home()

 	}

 	echo '

-					</table>

-				</div>';

+		</table>';

 }

 /**

@@ -201,16 +195,14 @@ function template_shd_create_role()

 	global $context, $settings, $txt, $modSettings, $scripturl;

 	echo '

-				<div class="tborder">

 		<div class="cat_bar">

 			<h3 class="catbg">

 				<img src="', $settings['default_images_url'], '/simpledesk/permissions.png" class="icon" alt="*" />

 				', $txt['shd_admin_permissions'], '

 			</h3>

 		</div>

-					<p class="information">

+		<div class="information">

 			', $txt['shd_admin_permissions_homedesc'], '

-					</p>

 		</div>

 		<div class="cat_bar">

 			<h3 class="catbg">

@@ -220,7 +212,6 @@ function template_shd_create_role()

 		</div>

 		<div class="roundframe">

 			<form action="', $scripturl, '?action=admin;area=helpdesk_permissions;sa=createrole;part=2" method="post">

-						<div class="content">

 				<dl class="settings">

 					<dt><strong>', $txt['shd_create_based_on'], ':</strong></dt>

 					<dd>

@@ -230,7 +221,6 @@ function template_shd_create_role()

 					<dt><strong>', $txt['shd_create_name'], '</strong></dt>

 					<dd><input type="text" name="rolename" id="rolename" value="" class="input_text" size="30" /></dd>

 				</dl>

-						</div>

 				<input type="submit" value="', $txt['shd_create_role'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button_submit" />

 				<input type="hidden" name="template" value="', $_REQUEST['template'], '" />

 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />

@@ -253,16 +243,14 @@ function template_shd_edit_role()

 	// Start the page off, including the rename-role bit.

 	echo '

-				<div class="tborder">

 		<div class="cat_bar">

 			<h3 class="catbg">

 				<img src="', $settings['default_images_url'], '/simpledesk/permissions.png" class="icon" alt="*" />

 				', $txt['shd_admin_permissions'], '

 			</h3>

 		</div>

-					<p class="information">

+		<div class="information">

 			', $txt['shd_admin_permissions_homedesc'], '

-					</p>

 		</div>

 		<script type="text/javascript"><!-- // --><![CDATA[

 		function shd_chicon(obj)

@@ -314,7 +302,6 @@ function template_shd_edit_role()

 				</h3>

 			</div>

 			<div class="roundframe">

-						<div class="content">

 				<dl class="settings">

 					<dt><strong>', $txt['shd_is_based_on'], ':</strong></dt>

 					<dd>

@@ -324,7 +311,6 @@ function template_shd_edit_role()

 					<dt><strong>', $txt['shd_role_name'], ':</strong></dt>

 					<dd><input type="text" name="rolename" id="rolename" value="', $role['name'], '" class="input_text" size="30" /></dd>

 				</dl>

-						</div>

 			</div>';

 	// Get ready to display the actual permissions

@@ -362,7 +348,6 @@ function template_shd_edit_role()

 					</h3>

 				</div>

 				<div class="roundframe" id="permcontent_', $rowitem, '">

-							<div class="content">

 					<dl class="permsettings">';

 			foreach ($permission_set[$rowitem] as $permission)

@@ -414,7 +399,6 @@ function template_shd_edit_role()

 			echo '

 					</dl>

 				</div>

-						</div>

 				<span id="permfooter_', $rowitem, '"></span>

 				<br>';

 		}

@@ -441,21 +425,21 @@ function template_shd_edit_role()

 	}

 	echo '

-					<div class="tborder floatleft" style="width: 100%;">

+		<div class="floatleft" style="width: 100%;">

 			<div class="cat_bar">

 				<h3 class="catbg">

 					<img src="', $settings['default_images_url'], '/simpledesk/roles.png" alt="*" />

 					', $txt['shd_role_membergroups'], '

 				</h3>

 			</div>

-						<p class="information">

+			<div class="information">

 				', $txt['shd_role_membergroups_desc'], '

-						</p>

+			</div>

 			<table class="table_grid">

 				<tr class="title_bar">

-								<td width="30%">', $txt['shd_role'], '</td>

-								<td width="30%">', $txt['shd_badge_stars'], '</td>

-								<td>', $txt['shd_assign_group'], '</td>

+					<td class="shd_33">', $txt['shd_role'], '</td>

+					<td class="shd_33">', $txt['shd_badge_stars'], '</td>

+					<td class="shd_33">', $txt['shd_assign_group'], '</td>

 				</tr>';

 	foreach ($context['membergroups'] as $id_group => $group)

@@ -472,30 +456,29 @@ function template_shd_edit_role()

 				echo str_repeat('<img src="' . $settings['images_url'] . '/membericons/' . $icons[1] . '" alt="" />', $icons[0]);

 		}

-		echo '</td>

+		echo '

+					</td>

 					<td><input type="checkbox" class="input_check" name="group', $id_group, '"', (in_array($id_group, $context['role_groups']) ? ' checked="checked"' : ''), ' /></td>

-							</tr>';

+				</tr>

+			</div>';

 	}

 	echo '

 			</table>

-						<br>

-					</div>

-

-					<div class="tborder floatleft" style="width: 100%;">

+			<div class="floatleft" style="width: 100%;">

 				<div class="cat_bar">

 					<h3 class="catbg">

 						<img src="', $settings['default_images_url'], '/simpledesk/departments.png" alt="*" />

 						', $txt['shd_role_departments'], '

 					</h3>

 				</div>

-						<p class="information">

+				<div class="information">

 					', $txt['shd_role_departments_desc'], '

-						</p>

+				</div>

 				<table class="table_grid">

 					<tr class="title_bar">

-								<td width="50%">', $txt['shd_department_name'], '</td>

-								<td width="50%">', $txt['shd_assign_dept'], '</td>

+						<td class="shd_50">', $txt['shd_department_name'], '</td>

+						<td class="shd_50">', $txt['shd_assign_dept'], '</td>

 					</tr>';

 	foreach ($context['role_depts'] as $id_dept => $dept)

@@ -509,17 +492,12 @@ function template_shd_edit_role()

 	echo '

 				</table>

-						<br>

 			</div>

-

-					<div class="floatleft">

 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />

 			<input type="hidden" name="role" value="', $_REQUEST['role'], '" />

 			<input type="submit" value="', $txt['shd_edit_role'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button_submit" />

 			<input type="submit" value="', $txt['shd_delete_role'], '" onclick="return confirm(' . JavaScriptEscape($txt['shd_delete_role_confirm']) . ');" name="delete" class="button_submit" />

-					</div>

-				</form>

-				<br class="clear" />';

+		</form>';

 }

 /**

@@ -532,16 +510,14 @@ function template_shd_copy_role()

 	global $context, $settings, $txt, $modSettings, $scripturl;

 	echo '

-				<div class="tborder">

 		<div class="cat_bar">

 			<h3 class="catbg">

 				<img src="', $settings['default_images_url'], '/simpledesk/permissions.png" class="icon" alt="*" />

 				', $txt['shd_admin_permissions'], '

 			</h3>

 		</div>

-					<p class="information">

+		<div class="information">

 			', $txt['shd_admin_permissions_homedesc'], '

-					</p>

 		</div>

 		<div class="cat_bar">

 			<h3 class="catbg">

@@ -551,7 +527,6 @@ function template_shd_copy_role()

 		</div>

 		<div class="roundframe">

 			<form action="', $scripturl, '?action=admin;area=helpdesk_permissions;sa=copyrole;part=2" method="post">

-						<div class="content">

 				<dl class="settings">

 					<dt><strong>', $txt['shd_create_based_on'], ':</strong></dt>

 					<dd>

@@ -563,7 +538,6 @@ function template_shd_copy_role()

 					<dt><strong>', $txt['shd_copy_role_groups'], '</strong></dt>

 					<dd><input type="checkbox" name="copygroups" id="copygroups" value="1" class="input_check" /></dd>

 				</dl>

-						</div>

 				<input type="submit" value="', $txt['shd_copy_role'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button_submit" />

 				<input type="hidden" name="role" value="', $_REQUEST['role'], '" />

 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />