From 8742d556be1255110a8072f9c734a9a10a4fa62b Mon Sep 17 00:00:00 2001 From: Peter Rotich <peter@osticket.com> Date: Wed, 2 Apr 2014 15:44:17 +0000 Subject: [PATCH] Fix layout related issues --- include/staff/org-view.inc.php | 11 +++++------ include/staff/templates/dynamic-form.tmpl.php | 1 + include/staff/ticket-view.inc.php | 2 +- include/staff/user-view.inc.php | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/staff/org-view.inc.php b/include/staff/org-view.inc.php index 89a8ee39d..7951460c2 100644 --- a/include/staff/org-view.inc.php +++ b/include/staff/org-view.inc.php @@ -16,10 +16,10 @@ if(!defined('OSTSCPINC') || !$thisstaff || !is_object($org)) die('Invalid path') </table> <table class="ticket_info" cellspacing="0" cellpadding="0" width="940" border="0"> <tr> - <td width="50"> + <td width="50%"> <table border="0" cellspacing="" cellpadding="4" width="100%"> <tr> - <th width="100">Name:</th> + <th width="150">Name:</th> <td><b><a href="#orgs/<?php echo $org->getId(); ?>/edit" class="org-action"><i class="icon-edit"></i> <?php echo @@ -27,16 +27,15 @@ if(!defined('OSTSCPINC') || !$thisstaff || !is_object($org)) die('Invalid path') ?></a></td> </tr> <tr> - <th>Users:</th> - <td> {num-here} - </td> + <th>Account Manager:</th> + <td> </td> </tr> </table> </td> <td width="50%" style="vertical-align:top"> <table border="0" cellspacing="" cellpadding="4" width="100%"> <tr> - <th>Created:</th> + <th width="150">Created:</th> <td><?php echo Format::db_datetime($org->getCreateDate()); ?></td> </tr> <tr> diff --git a/include/staff/templates/dynamic-form.tmpl.php b/include/staff/templates/dynamic-form.tmpl.php index e6afae15a..aaaf1bf69 100644 --- a/include/staff/templates/dynamic-form.tmpl.php +++ b/include/staff/templates/dynamic-form.tmpl.php @@ -8,6 +8,7 @@ if (isset($options['entry']) && $options['mode'] == 'edit' return; ?> <tbody> + <tr><td style="width:<?php echo $options['width'] ?: 150;?>px;"></td><td></td></tr> <?php // Keep up with the entry id in a hidden field to decide what to add and // delete when the parent form is submitted diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php index d2c8ebe9a..c76bf30af 100644 --- a/include/staff/ticket-view.inc.php +++ b/include/staff/ticket-view.inc.php @@ -132,7 +132,7 @@ if($ticket->isOverdue()) </table> <table class="ticket_info" cellspacing="0" cellpadding="0" width="940" border="0"> <tr> - <td width="50"> + <td width="50%"> <table border="0" cellspacing="" cellpadding="4" width="100%"> <tr> <th width="100">Status:</th> diff --git a/include/staff/user-view.inc.php b/include/staff/user-view.inc.php index a548a9e05..de27ddc2f 100644 --- a/include/staff/user-view.inc.php +++ b/include/staff/user-view.inc.php @@ -59,10 +59,10 @@ $org = $account ? $account->getOrganization() : null; </table> <table class="ticket_info" cellspacing="0" cellpadding="0" width="940" border="0"> <tr> - <td width="50"> + <td width="50%"> <table border="0" cellspacing="" cellpadding="4" width="100%"> <tr> - <th width="100">Name:</th> + <th width="150">Name:</th> <td><b><a href="#users/<?php echo $user->getId(); ?>/edit" class="user-action"><i class="icon-edit"></i> <?php echo @@ -99,7 +99,7 @@ $org = $account ? $account->getOrganization() : null; <td width="50%" style="vertical-align:top"> <table border="0" cellspacing="" cellpadding="4" width="100%"> <tr> - <th>Status:</th> + <th width="150">Status:</th> <td> <span id="user-<?php echo $user->getId(); ?>-status"><?php echo $user->getAccountStatus(); ?></span></td> </tr> -- GitLab