diff --git a/include/staff/faq.inc.php b/include/staff/faq.inc.php
index dace2536a7989e2a556aec3961fbc0e3ecd02977..e96d302228e693d6aa507a94eecd7ef74b3ebaf0 100644
--- a/include/staff/faq.inc.php
+++ b/include/staff/faq.inc.php
@@ -128,12 +128,10 @@ if ($topics = Topic::getAllHelpTopics()) {
<?php echo __('Here you can manage the question and answer for the article. Multiple languages are available if enabled in the admin panel.'); ?>
<div class="clear"></div>
-<table width="100%"><tr>
<?php
$langs = Internationalization::getConfiguredSystemLanguages();
if ($faq && count($langs) > 1) { ?>
-<td valign="top">
- <ul class="vertical tabs left" id="trans" style="margin-top:10px;">
+ <ul class="tabs alt clean" id="trans" style="margin-top:10px;">
<li class="empty"><i class="icon-globe" title="This content is translatable"></i></li>
<?php foreach ($langs as $tag=>$i) {
list($lang, $locale) = explode('_', $tag);
@@ -145,11 +143,10 @@ if ($faq && count($langs) > 1) { ?>
</a></li>
<?php } ?>
</ul>
-</td>
<?php
} ?>
-<td id="trans_container">
+<div id="trans_container">
<?php foreach ($langs as $tag=>$i) {
$code = $i['code'];
if ($tag == $cfg->getPrimaryLanguage()) {
@@ -197,7 +194,7 @@ echo $attrs; ?>><?php echo $draft ?: $answer;
</div>
</div>
<?php } ?>
- </td></tr></table>
+ </div>
</div>
<div class="tab_content" id="attachments" style="display:none">
@@ -221,7 +218,7 @@ echo $attrs; ?>><?php echo $draft ?: $answer;
<div class="error"><?php echo $errors['files']; ?></div>
<div style="margin-top:15px"></div>
- <ul class="vertical tabs left">
+ <ul class="tabs alt clean">
<li class="empty"><i class="icon-globe" title="This content is translatable"></i></li>
<?php foreach ($langs as $lang=>$i) { ?>
<li class="<?php if ($i['code'] == $cfg->getPrimaryLanguage()) echo 'active';
diff --git a/include/staff/page.inc.php b/include/staff/page.inc.php
index 609066f86220513ec1d1bbf03e1025c94c70bfae..63d4fee2c02c1eab07f06d52db5bb2ac403b584e 100644
--- a/include/staff/page.inc.php
+++ b/include/staff/page.inc.php
@@ -111,25 +111,26 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<span class="error">* <?php echo $errors['isactive']; ?></span>
</td>
</tr>
- <tr>
- <td colspan="2">
- <ul class="tabs clean">
- <li class="active"><a href="#content"><?php echo __('Page Content'); ?></a></li>
- <li><a href="#notes"><?php echo __('Internal Notes'); ?></a></li>
- </ul>
- <div class="tab_content active" id="content">
-<table class="full-width"><tbody><tr><td style="vertical-align:top">
+ </tbody>
+</table>
+<div style="margin-top: 10px">
+ <ul class="tabs clean">
+ <li class="active"><a href="#page-content"><?php echo __('Page Content'); ?></a></li>
+ <li><a href="#notes"><?php echo __('Internal Notes'); ?></a></li>
+ </ul>
+ <div class="tab_content active" id="page-content">
+
<?php
$langs = Internationalization::getConfiguredSystemLanguages();
if ($page && count($langs) > 1) { ?>
- <ul class="vertical tabs" id="translations">
- <li class="empty"><i class="icon-globe" title="This content is translatable"></i></li>
+ <ul class="tabs alt clean" id="translations">
+ <li class="empty"><i class="icon-globe" title="This content is translatable"></i></li>
<?php foreach ($langs as $tag=>$nfo) { ?>
- <li class="<?php if ($tag == $cfg->getPrimaryLanguage()) echo "active";
- ?>"><a href="#translation-<?php echo $tag; ?>" title="<?php
- echo Internationalization::getLanguageDescription($tag);
- ?>"><span class="flag flag-<?php echo strtolower($nfo['flag']); ?>"></span>
- </a></li>
+ <li class="<?php if ($tag == $cfg->getPrimaryLanguage()) echo "active";
+ ?>"><a href="#translation-<?php echo $tag; ?>" title="<?php
+ echo Internationalization::getLanguageDescription($tag);
+ ?>"><span class="flag flag-<?php echo strtolower($nfo['flag']); ?>"></span>
+ </a></li>
<?php } ?>
</ul>
<?php
@@ -141,55 +142,52 @@ if ($info['type'] == 'landing')
else
$width = '100%';
?>
-</td>
-<td id="translations_container" style="padding-left: 10px">
- <div id="msg_info">
- <em><i class="icon-info-sign"></i> <?php
- echo __(
- 'Ticket variables are only supported in thank-you pages.'
- ); ?></em>
- </div>
-
- <div id="translation-<?php echo $cfg->getPrimaryLanguage(); ?>" class="tab_content"
- lang="<?php echo $cfg->getPrimaryLanguage(); ?>">
+ <div id="translations_container">
+ <div id="translation-<?php echo $cfg->getPrimaryLanguage(); ?>" class="tab_content"
+ lang="<?php echo $cfg->getPrimaryLanguage(); ?>">
<textarea name="body" cols="21" rows="12" class="richtext draft"
- data-width="<?php echo $width; ?>"
+ data-width="<?php echo $width; ?>"
<?php
if (!$info['type'] || $info['type'] == 'thank-you') echo 'data-root-context="thank-you"';
list($draft, $attrs) = Draft::getDraftAndDataAttrs('page', $info['id'], $info['body']);
- echo $attrs; ?>><?php echo $draft ?: $info['body']; ?></textarea>
- </div>
+ echo $attrs; ?>><?php echo $info['body'] ?: $draft; ?></textarea>
+ </div>
<?php if ($langs && $page) {
foreach ($langs as $tag=>$nfo) {
if ($tag == $cfg->getPrimaryLanguage())
- continue; ?>
- <div id="translation-<?php echo $tag; ?>" class="tab_content hidden"
- lang="<?php echo $tag; ?>">
+ continue; ?>
+ <div id="translation-<?php echo $tag; ?>" class="tab_content hidden"
+ dir="<?php echo $nfo['direction']; ?>" lang="<?php echo $tag; ?>">
<textarea name="trans[<?php echo $tag; ?>][body]" cols="21" rows="12"
<?php if ($info['type'] == 'thank-you') echo 'data-root-context="thank-you"'; ?>
- style="width:100%" class="richtext draft" data-width="<?php echo $width; ?>"
+ style="width:100%" class="richtext draft" data-width="<?php echo $width; ?>"
<?php
list($draft, $attrs) = Draft::getDraftAndDataAttrs('page', $info['id'].'.'.$tag, $info['trans'][$tag]);
- echo $attrs; ?>><?php echo $draft ?: $info['trans'][$tag]; ?></textarea>
- </div>
+ echo $attrs; ?>><?php echo $info['trans'][$tag] ?: $draft; ?></textarea>
+ </div>
<?php }
} ?>
-</td></tr></tbody></table>
- <div class="error" style="margin: 5px 0"><?php echo $errors['body']; ?></div>
- <div class="clear"></div>
- </div>
- <div class="tab_content" style="display:none" id="notes">
- <em><strong><?php echo __('Internal Notes'); ?></strong>:
- <?php echo __("be liberal, they're internal"); ?></em>
- <textarea class="richtext no-bar" name="notes" cols="21"
- rows="8" style="width: 80%;"><?php echo $info['notes']; ?></textarea>
+ <div id="msg_info">
+ <em><i class="icon-info-sign"></i> <?php
+ echo __(
+ 'Ticket variables are only supported in thank-you pages.'
+ ); ?></em>
+ </div>
+
+ <div class="error" style="margin: 5px 0"><?php echo $errors['body']; ?></div>
+ <div class="clear"></div>
</div>
- </td>
- </tr>
- </tbody>
-</table>
+ </div>
+ <div class="tab_content" style="display:none" id="notes">
+ <em><strong><?php echo __('Internal Notes'); ?></strong>:
+ <?php echo __("be liberal, they're internal"); ?></em>
+ <textarea class="richtext no-bar" name="notes" cols="21"
+ rows="8" style="width: 80%;"><?php echo $info['notes']; ?></textarea>
+ </div>
+</div>
+
<p style="text-align:center">
<input type="submit" name="submit" value="<?php echo $submit_text; ?>">
<input type="reset" name="reset" value="<?php echo __('Reset'); ?>">
diff --git a/include/staff/templates/content-manage.tmpl.php b/include/staff/templates/content-manage.tmpl.php
index 5ca6c82a3246c6e555bc1fc4d1675f3de25504cc..bf9410b2fa895652712fb0170a3581ab0ce48aa6 100644
--- a/include/staff/templates/content-manage.tmpl.php
+++ b/include/staff/templates/content-manage.tmpl.php
@@ -10,12 +10,9 @@
<form method="post" action="#content/<?php echo $content->getId(); ?>"
style="clear:none">
-<table>
- <tr>
<?php
if (count($langs) > 1) { ?>
-<td valign="top">
- <ul class="vertical left tabs" id="content-trans">
+ <ul class="tabs alt clean" id="content-trans">
<li class="empty"><i class="icon-globe" title="<?php echo __('This content is translatable'); ?>"></i></li>
<?php foreach ($langs as $tag=>$nfo) { ?>
<li class="<?php if ($tag == $cfg->getPrimaryLanguage()) echo "active";
@@ -25,13 +22,12 @@ if (count($langs) > 1) { ?>
</a></li>
<?php } ?>
</ul>
-</td>
<?php
} ?>
-<td id="content-trans_container">
+<div id="content-trans_container">
<div id="translation-<?php echo $cfg->getPrimaryLanguage(); ?>"
- class="tab_content" style="padding:0" lang="<?php echo $cfg->getPrimaryLanguage(); ?>">
+ class="tab_content" lang="<?php echo $cfg->getPrimaryLanguage(); ?>">
<div class="error"><?php echo $errors['name']; ?></div>
<input type="text" style="width: 100%; font-size: 14pt" name="name" value="<?php
echo Format::htmlchars($info['title']); ?>" spellcheck="true"
@@ -49,8 +45,8 @@ if (count($langs) > 1) { ?>
if ($tag == $cfg->getPrimaryLanguage())
continue;
$trans = $info['trans'][$tag]; ?>
- <div id="translation-<?php echo $tag; ?>" class="tab_content"
- style="display:none;padding:0" dir="<?php echo $nfo['direction']; ?>" lang="<?php echo $tag; ?>">
+ <div id="translation-<?php echo $tag; ?>" class="tab_content hidden"
+ dir="<?php echo $nfo['direction']; ?>" lang="<?php echo $tag; ?>">
<input type="text" style="width: 100%; font-size: 14pt"
name="trans[<?php echo $tag; ?>][title]" value="<?php
echo Format::htmlchars($trans['title']); ?>"
@@ -70,9 +66,7 @@ if (count($langs) > 1) { ?>
<div class="info-banner" style="margin-top:7px"><?php
echo $content->getNotes(); ?></div>
-</td>
- </tr>
-</table>
+</div>
<hr class="clear"/>
<p class="full-width">