diff --git a/assets/default/css/theme.css b/assets/default/css/theme.css index 077b79fbb6a5e65a4cf9136ccf686f3077b552b8..c4bd447e8ce924d267453b60b4b0faa764ce5a5f 100644 --- a/assets/default/css/theme.css +++ b/assets/default/css/theme.css @@ -568,6 +568,15 @@ label.required { position: relative; top: 6px; } +#ticketForm > table { + table-layout: fixed; +} +#ticketForm > table td { + width: 160px; +} +#ticketForm > table td + td { + width: auto; +} #ticketForm td textarea, #clientLogin td textarea, #ticketForm div textarea, diff --git a/css/thread.css b/css/thread.css index 1312af2f38a45e73bce112edf6475ad2c4f1f642..83f24571cc3f948225b681a1bad85d9faeb26823 100644 --- a/css/thread.css +++ b/css/thread.css @@ -455,6 +455,7 @@ table.thread-entry { .image-hover { display: inline-block; position: relative; + max-width: 100%; /* Ensure image hovered is resized */ } .image-hover .caption { background-color: rgba(0,0,0,0.5); diff --git a/include/staff/cannedresponse.inc.php b/include/staff/cannedresponse.inc.php index 4e38ff9649cb3447e3d4a6d98b6277ea144c32d4..d82baad74ffb9a98cd6dc494f3ab4ce9ae55c8fb 100644 --- a/include/staff/cannedresponse.inc.php +++ b/include/staff/cannedresponse.inc.php @@ -28,8 +28,9 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info); <input type="hidden" name="a" value="<?php echo Format::htmlchars($_REQUEST['a']); ?>"> <input type="hidden" name="id" value="<?php echo $info['id']; ?>"> <h2>Canned Response</h2> - <table class="form_table" width="940" border="0" cellspacing="0" cellpadding="2"> + <table class="form_table fixed" width="940" border="0" cellspacing="0" cellpadding="2"> <thead> + <tr><td></td><td></td></tr> <!-- For fixed table layout --> <tr> <th colspan="2"> <h4><?php echo $title; ?></h4> diff --git a/include/staff/faq.inc.php b/include/staff/faq.inc.php index 476cf5b0af0e9a4a9cb63d4ec8edc6051c455a27..8b390c3de8d43762ce79f5560d07486e2c8bc636 100644 --- a/include/staff/faq.inc.php +++ b/include/staff/faq.inc.php @@ -30,8 +30,9 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info); <input type="hidden" name="a" value="<?php echo Format::htmlchars($_REQUEST['a']); ?>"> <input type="hidden" name="id" value="<?php echo $info['id']; ?>"> <h2>FAQ</h2> - <table class="form_table" width="940" border="0" cellspacing="0" cellpadding="2"> + <table class="form_table fixed" width="940" border="0" cellspacing="0" cellpadding="2"> <thead> + <tr><td></td><td></td></tr> <!-- For fixed table layout --> <tr> <th colspan="2"> <h4><?php echo $title; ?></h4> @@ -125,7 +126,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info); <em><strong>Help Topics</strong>: Check all help topics related to this FAQ.</em> </th> </tr> - <tr><td> + <tr><td colspan="2"> <?php while(list($topicId,$topic)=db_fetch_row($res)) { echo sprintf('<input type="checkbox" name="topics[]" value="%d" %s>%s<br>', diff --git a/include/staff/page.inc.php b/include/staff/page.inc.php index b76a40607b58614c031829b62431e66c9496183e..884d7377eacb64d6152eda71373e504716a290fd 100644 --- a/include/staff/page.inc.php +++ b/include/staff/page.inc.php @@ -32,8 +32,9 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info); <input type="hidden" name="a" value="<?php echo Format::htmlchars($_REQUEST['a']); ?>"> <input type="hidden" name="id" value="<?php echo $info['id']; ?>"> <h2>Site Pages</h2> - <table class="form_table" width="940" border="0" cellspacing="0" cellpadding="2"> + <table class="form_table fixed" width="940" border="0" cellspacing="0" cellpadding="2"> <thead> + <tr><td></td><td></td></tr> <!-- For fixed table layout --> <tr> <th colspan="2"> <h4><?php echo $title; ?></h4> diff --git a/include/staff/ticket-open.inc.php b/include/staff/ticket-open.inc.php index a143ebb80fe42cf40fb984473e7fc42bfccc2cec..f491756f34b0ebbe7a65b370d1931e8d15121a43 100644 --- a/include/staff/ticket-open.inc.php +++ b/include/staff/ticket-open.inc.php @@ -8,8 +8,13 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info); <input type="hidden" name="do" value="create"> <input type="hidden" name="a" value="open"> <h2>Open New Ticket</h2> - <table class="form_table" width="940" border="0" cellspacing="0" cellpadding="2"> + <table class="form_table fixed" width="940" border="0" cellspacing="0" cellpadding="2"> <thead> + <!-- This looks empty - but beware, with fixed table layout, the user + agent will usually only consult the cells in the first row to + construct the column widths of the entire toable. Therefore, the + first row needs to have two cells --> + <tr><td></td><td></td></tr> <tr> <th colspan="2"> <h4>New Ticket</h4> diff --git a/scp/css/scp.css b/scp/css/scp.css index 1ed00d4dbb4fe6bf044bc506268ef787e4cac89f..736d6f5a010c93c1c66a435e8c64f53942208a74 100644 --- a/scp/css/scp.css +++ b/scp/css/scp.css @@ -546,6 +546,17 @@ a.print { border-bottom:1px solid #ddd; } +.form_table.fixed { + table-layout: fixed; + border-collapse: collapse; + width: 100%; +} +.form_table.fixed td { + width: 180px; +} +.form_table.fixed td + td { + width: auto; +} td.multi-line { vertical-align:top; @@ -902,8 +913,8 @@ h2 .reload { border-top:none; } -#response_options > table { - width:928px; +#response_options > form > table { + table-layout: fixed; } #response_options > table td {