From e3845ad1729cad25839ac9517e53d59d1c248706 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Sat, 30 Nov 2013 19:45:22 -0600
Subject: [PATCH] ui: Fix large image display
Fixes oversize image display to be resized in both the ticket thread and
the redactor editor in (at least)
* Ticket-view boxes
* Client new-ticket form
* Staff new ticket
* Page add/edit
* FAQ add/edit
* Canned response add/edit
Fixes osTicket/osTicket-1.8#247
---
assets/default/css/theme.css | 9 +++++++++
css/thread.css | 1 +
include/staff/cannedresponse.inc.php | 3 ++-
include/staff/faq.inc.php | 5 +++--
include/staff/page.inc.php | 3 ++-
include/staff/ticket-open.inc.php | 7 ++++++-
scp/css/scp.css | 15 +++++++++++++--
7 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/assets/default/css/theme.css b/assets/default/css/theme.css
index 077b79fbb..c4bd447e8 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 1312af2f3..83f24571c 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 4e38ff964..d82baad74 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 476cf5b0a..8b390c3de 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 b76a40607..884d7377e 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 a143ebb80..f491756f3 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 1ed00d4db..736d6f5a0 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 {
--
GitLab