From cc04d5dc7220d5df149f3a6b0824a6a57959eab0 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Mon, 7 Jul 2014 16:26:26 -0500
Subject: [PATCH] i18n: Fix layout issues and redactor crash
---
include/staff/ticket-view.inc.php | 4 ++--
js/redactor-osticket.js | 3 ++-
scp/css/scp.css | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index d16313353..7860f18aa 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -40,12 +40,12 @@ if($ticket->isOverdue())
?>
<table width="940" cellpadding="2" cellspacing="0" border="0">
<tr>
- <td width="50%" class="has_bottom_border">
+ <td width="20%" class="has_bottom_border">
<h2><a href="tickets.php?id=<?php echo $ticket->getId(); ?>"
title="<?php echo __('Reload'); ?>"><i class="icon-refresh"></i>
<?php echo sprintf(__('Ticket #%s'), $ticket->getNumber()); ?></a></h2>
</td>
- <td width="50%" class="right_align has_bottom_border">
+ <td width="auto" class="right_align has_bottom_border">
<?php
if ($thisstaff->canBanEmails()
|| $thisstaff->canEditTickets()
diff --git a/js/redactor-osticket.js b/js/redactor-osticket.js
index 1aa1dca23..71a203d17 100644
--- a/js/redactor-osticket.js
+++ b/js/redactor-osticket.js
@@ -259,7 +259,8 @@ $(function() {
options.draftDelete = el.hasClass('draft-delete');
}
getConfig().then(function(c) {
- if (c.lang && c.lang.toLowerCase() != 'en_us')
+ if (c.lang && c.lang.toLowerCase() != 'en_us' &&
+ $.Redactor.opts.langs[c.lang.toLowerCase()])
options['lang'] = c.lang.toLowerCase();
el.redactor(options);
});
diff --git a/scp/css/scp.css b/scp/css/scp.css
index c7d22f54d..dcd6222fc 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -915,7 +915,7 @@ ul.tabs li {
}
ul.tabs li a {
- width:130px;
+ min-width:130px;
font-weight:bold;
padding:5px;
height:18px;
--
GitLab