aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-05-14 15:04:54 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-05-14 15:04:54 +0000
commit1c4ddb5366b9f8311f81e3233a150e44bfa484fa (patch)
treebb4b77835f13335adc4edd7614e7c00a6b473339 /phpBB
parent2b020b033dc3953696b10c062bc0e9ea8760c81f (diff)
downloadforums-1c4ddb5366b9f8311f81e3233a150e44bfa484fa.tar
forums-1c4ddb5366b9f8311f81e3233a150e44bfa484fa.tar.gz
forums-1c4ddb5366b9f8311f81e3233a150e44bfa484fa.tar.bz2
forums-1c4ddb5366b9f8311f81e3233a150e44bfa484fa.tar.xz
forums-1c4ddb5366b9f8311f81e3233a150e44bfa484fa.zip
not ideal, but hey!
git-svn-id: file:///svn/phpbb/trunk@7569 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/adm/style/acp_users_signature.html12
-rw-r--r--phpBB/adm/style/editor.js20
2 files changed, 21 insertions, 11 deletions
diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
index 43373a2a7e..b01f03cf9f 100644
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -47,6 +47,7 @@
<fieldset>
<legend>{L_SIGNATURE}</legend>
<p>{L_SIGNATURE_EXPLAIN}</p>
+
<div id="format-buttons">
<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" />
<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px;" onclick="bbstyle(2)" onmouseover="helpline('i')" onmouseout="helpline('tip')" />
@@ -81,8 +82,15 @@
<!-- ENDIF -->
</div>
+
<p><input type="text" class="text full" style="border: 0; background: none;" name="helpbox" value="{L_STYLES_TIP}" /></p>
- <div style="text-align: left;"><textarea name="signature" rows="10" cols="60" style="width: 80%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{SIGNATURE}</textarea></div>
+ <div style="text-align: left;">
+ <div style="width: 10%; float: right; margin-right: 1%;"><script type="text/javascript"><!--
+ colorPalette('v', 17, 5);
+ //--></script>
+ </div>
+ <textarea name="signature" rows="10" cols="60" style="width: 86%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{SIGNATURE}</textarea>
+ </div>
<div>
<!-- IF S_BBCODE_ALLOWED -->
@@ -98,7 +106,7 @@
</div>
</fieldset>
- <fieldset class="quick">
+ <fieldset class="submit-buttons">
<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />
</fieldset>
diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js
index 2f490f4746..c7632633d9 100644
--- a/phpBB/adm/style/editor.js
+++ b/phpBB/adm/style/editor.js
@@ -35,16 +35,17 @@ function initInsertions()
var doc;
if(document.forms[form_name])
{
- doc = document;
- }
- else
+ doc = document;
+ }
+ else
{
doc = opener.document;
}
+
var textarea = doc.forms[form_name].elements[text_name];
if (is_ie && typeof(baseHeight) != 'number')
- {
- textarea.focus();
+ {
+ textarea.focus();
baseHeight = doc.selection.createRange().duplicate().boundingHeight;
document.body.focus();
}
@@ -118,7 +119,7 @@ function bbfontstyle(bbopen, bbclose)
{
var range = textarea.createTextRange();
- range.move("character", new_pos);
+ range.move("character", new_pos);
range.select();
storeCaret(textarea);
}
@@ -172,10 +173,11 @@ function insert_text(text, spaces, popup)
{
textarea.value = textarea.value + text;
}
- if (!popup)
+
+ if (!popup)
{
textarea.focus();
- }
+ }
}
@@ -307,7 +309,7 @@ function colorPalette(dir, width, height)
numberList[3] = 'BF';
numberList[4] = 'FF';
- document.writeln('<table cellspacing="1" cellpadding="0" border="0">');
+ document.writeln('<table class="type2">');
for (r = 0; r < 5; r++)
{