diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-11-03 20:31:05 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-11-03 20:31:05 +0000 |
| commit | 18d014c7656717fe09aba0cafe2967eae7cea421 (patch) | |
| tree | 7e0a54c10e7d6f70d4c64c0e76f1289038a3a389 /phpBB/styles/prosilver/template | |
| parent | 61fc9605faa29d1bc5b1be8df2a4ab7f36c92264 (diff) | |
| download | forums-18d014c7656717fe09aba0cafe2967eae7cea421.tar forums-18d014c7656717fe09aba0cafe2967eae7cea421.tar.gz forums-18d014c7656717fe09aba0cafe2967eae7cea421.tar.bz2 forums-18d014c7656717fe09aba0cafe2967eae7cea421.tar.xz forums-18d014c7656717fe09aba0cafe2967eae7cea421.zip | |
further fixes
- fix infinite loop on checking ban for those not having ever visited the page (or removed all session cookies)
- avatar width/height switched in language files
- fix windows switching to background on IE7 (smlies window for example)
git-svn-id: file:///svn/phpbb/trunk@8224 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/styles/prosilver/template')
| -rw-r--r-- | phpBB/styles/prosilver/template/editor.js | 9 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_pm_options.html | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js index 61747f7e56..5631ab67d1 100644 --- a/phpBB/styles/prosilver/template/editor.js +++ b/phpBB/styles/prosilver/template/editor.js @@ -34,7 +34,7 @@ function initInsertions() { var doc; - if( document.forms[form_name]) + if (document.forms[form_name]) { doc = document; } @@ -44,11 +44,16 @@ function initInsertions() } var textarea = doc.forms[form_name].elements[text_name]; + if (is_ie && typeof(baseHeight) != 'number') { textarea.focus(); baseHeight = doc.selection.createRange().duplicate().boundingHeight; - // document.body.focus(); + + if (!document.forms[form_name]) + { + document.body.focus(); + } } } diff --git a/phpBB/styles/prosilver/template/ucp_pm_options.html b/phpBB/styles/prosilver/template/ucp_pm_options.html index 3fe24f04ee..db5781febf 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_options.html +++ b/phpBB/styles/prosilver/template/ucp_pm_options.html @@ -14,7 +14,7 @@ <ol class="def-rules"> <!-- BEGIN rule --> - <li><input type="submit" name="delete_rule[{rule.RULE_ID}]" value="{L_DELETE_RULE}" class="right-box button2" /><strong>{L_IF}</strong> {rule.CHECK} <em>{rule.RULE}</em> <!-- IF rule.STRING --><strong>{rule.STRING}</strong> | <!-- ENDIF -->{rule.ACTION}<!-- IF rule.FOLDER -->: {rule.FOLDER}<!-- ENDIF --></li> + <li><div class="right-box"><input type="submit" name="delete_rule[{rule.RULE_ID}]" value="{L_DELETE_RULE}" class="button2" /></div><strong>{L_IF}</strong> {rule.CHECK} <em>{rule.RULE}</em> <!-- IF rule.STRING --><strong>{rule.STRING}</strong> | <!-- ENDIF -->{rule.ACTION}<!-- IF rule.FOLDER -->: {rule.FOLDER}<!-- ENDIF --></li> <!-- BEGINELSE --> <li><strong>{L_NO_RULES_DEFINED}</strong></li> <!-- END rule --> |