style="display: none;">
+
-
style="display: none;">
+
-
style="display: none;">
+
@@ -275,10 +337,10 @@
-
-
@@ -329,7 +391,7 @@
-
+
-
-
-
-
-
+
+
{L_DISABLE_BBCODE}
@@ -635,8 +636,7 @@ var help_line = {
{L_DISABLE_MAGIC_URL}
{L_OPTIONS}: {BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}
-
-
+
-
@@ -40,12 +40,12 @@
+
+
+
+
-
\ No newline at end of file
+
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 49ffae98af..bedb045397 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -23,7 +23,7 @@ html {
body {
/* Text-Sizing with ems: http://www.clagnut.com/blog/348/ */
- font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
color: #536482;
background: #E4EDF0 url("../images/bg_header.gif") 0 0 repeat-x;
font-size: 62.5%; /* This sets the default font size to be equivalent to 10px */
@@ -35,13 +35,13 @@ img {
}
h1 {
- font: bold 1.8em 'Trebuchet MS', Verdana, sans-serif;
+ font: bold 1.8em "Lucida Grande", 'Trebuchet MS', Verdana, sans-serif;
text-decoration: none;
color: #333333;
}
h2, caption {
- font: bold 1.2em Arial, Helvetica, sans-serif;
+ font: bold 1.2em "Lucida Grande", Arial, Helvetica, sans-serif;
text-decoration: none;
line-height: 120%;
text-align: left;
@@ -54,6 +54,12 @@ p {
font-size: 1.1em;
}
+ul {
+ list-style: disc;
+ margin-left: 2em;
+ margin-bottom: 1em;
+}
+
hr {
border: 0 none;
border-top: 1px solid #999999;
@@ -93,7 +99,7 @@ a:hover {
}
#page-header h1 {
- font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
font-size: 1.5em;
font-weight: normal;
padding-top: 15px;
@@ -237,6 +243,7 @@ span.corners-top span, span.corners-bottom span {
#menu ul {
list-style: none;
+ margin: 0;
}
/* Default list state */
@@ -274,7 +281,7 @@ span.corners-top span, span.corners-bottom span {
display: block;
padding: 5px;
font-size: 0.9em;
- font-family: Verdana;
+ font-family: "Lucida Grande", Verdana;
color: #FFA34F;
font-weight: bold;
background: #006699 url("../images/cellpic3.gif") 0 0 repeat-x;
@@ -304,7 +311,7 @@ table {
}
th, td {
- font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
font-size: 1.1em;
text-align: left;
}
@@ -377,7 +384,7 @@ fieldset p {
legend {
padding: 1px 0;
- font-family: arial,Verdana,Sans-serif;
+ font-family: "Lucida Grande", Arial, Verdana,Sans-serif;
font-size: 1.1em;
font-weight: bold;
color: #006699;
@@ -395,7 +402,7 @@ legend {
}
input {
- font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
font-size: 100%;
font-weight: normal;
background-color: #FAFAFA;
@@ -410,7 +417,7 @@ input {
}
select {
- font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
font-size: 100%;
font-weight: normal;
font-style: normal;
@@ -436,7 +443,7 @@ option {
}
textarea {
- font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
font-size: 100%;
width: 60%;
padding: 2px;
@@ -463,7 +470,7 @@ label img {
vertical-align: middle;
}
-fieldset.quick {
+fieldset.quick, p.quick {
margin: 0 0 5px 0;
padding: 5px 0 0 0;
border: none;
@@ -472,6 +479,14 @@ fieldset.quick {
font-size: 1.1em;
}
+fieldset.quick legend {
+ display: none;
+}
+
+fieldset.tabulated {
+ background-color: #DADFE4;
+}
+
fieldset.nobg {
margin: 15px 0 0 0;
padding: 0;
@@ -510,7 +525,7 @@ select#full_folder_action {
Other general def. list properties defined in prosilver_main.css
---------------------------------------- */
dl {
- font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
}
dt {
@@ -596,7 +611,7 @@ input:focus, textarea:focus {
}
-/* Submit button fieldset
+/* Submit button fieldset or paragraph
---------------------------------------- */
fieldset.submit-buttons {
text-align: center;
@@ -606,10 +621,21 @@ fieldset.submit-buttons {
margin-top: -1px;
}
-fieldset.submit-buttons input {
+p.submit-buttons {
+ text-align: center;
+ margin: 0;
+ padding: 4px;
+ margin-top: 10px;
+}
+
+fieldset.submit-buttons input, p.submit-buttons input {
padding: 3px 2px;
}
+fieldset.submit-buttons legend {
+ display: none;
+}
+
/* Input field styles
---------------------------------------- */
@@ -712,7 +738,7 @@ a.button1, input.button1, input.button3,
a.button2, input.button2 {
width: auto !important;
padding: 1px 3px 0 3px;
- font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
color: #000;
background-color: #EFEFEF;
cursor: pointer;
@@ -1012,7 +1038,7 @@ table.pmask td.name {
---------------------------------------- */
.sourcenum {
color: gray;
- font-family: 'Courier New', monospace;
+ font-family: Monaco, 'Courier New', monospace;
font-size: 125%;
font-weight: bold;
line-height: 120%;
@@ -1021,7 +1047,7 @@ table.pmask td.name {
}
.source {
- font-family: 'Courier New', monospace;
+ font-family: Monaco, 'Courier New', monospace;
font-size: 125%;
line-height: 120%;
padding: 0px;
diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js
index 9591fc67d1..54e7e61f3a 100644
--- a/phpBB/adm/style/editor.js
+++ b/phpBB/adm/style/editor.js
@@ -23,7 +23,7 @@ var is_mac = (clientPC.indexOf('mac') != -1);
*/
function helpline(help)
{
- document.forms[form_name].helpbox.value = eval(help + '_help');
+ document.forms[form_name].helpbox.value = help_line[help];
}
/**
@@ -64,29 +64,18 @@ function arraypop(thearray)
return retval;
}
+
/**
-* Insert emoticon
+* bbstyle
*/
-function smiley(text)
-{
- text = ' ' + text + ' ';
-
- if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos)
+function bbstyle(bbnumber)
+{
+ if (bbnumber != -1)
{
- var caretPos = document.forms[form_name].elements[text_name].caretPos;
-
- caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? caretPos.text + text + ' ' : caretPos.text + text;
- document.forms[form_name].elements[text_name].focus();
- }
- else
- {
- var selStart = document.forms[form_name].elements[text_name].selectionStart;
- var selEnd = document.forms[form_name].elements[text_name].selectionEnd;
-
- mozWrap(document.forms[form_name].elements[text_name], text, '')
- document.forms[form_name].elements[text_name].focus();
- document.forms[form_name].elements[text_name].selectionStart = selStart + text.length;
- document.forms[form_name].elements[text_name].selectionEnd = selEnd + text.length;
+ bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
+ } else {
+ insert_text('[*]');
+ document.forms[form_name].elements[text_name].focus();
}
}
@@ -96,7 +85,9 @@ function smiley(text)
function bbfontstyle(bbopen, bbclose)
{
theSelection = false;
- document.forms[form_name].elements[text_name].focus();
+
+ var textarea = document.forms[form_name].elements[text_name];
+ textarea.focus();
if ((clientVer >= 4) && is_ie && is_win)
{
@@ -120,59 +111,81 @@ function bbfontstyle(bbopen, bbclose)
return;
}
- // Close image tag before adding
- if (imageTag)
- {
- insert_text(bbtags[15]);
-
- // Remove the close image tag from the list
- lastValue = arraypop(bbcode) - 1;
-
- // Return button back to normal state
- document.forms[form_name].addbbcode14.value = 'Img';
- imageTag = false;
- }
+ //The new position for the cursor after adding the bbcode
+ var new_pos = getCaretPosition(textarea).start + bbopen.length;
// Open tag
insert_text(bbopen + bbclose);
- document.forms[form_name].elements[text_name].focus();
+ // Center the cursor when we don't have a selection
+ // Gecko and proper browsers
+ if (!isNaN(textarea.selectionStart))
+ {
+ textarea.selectionStart = new_pos;
+ textarea.selectionEnd = new_pos;
+ }
+ // IE
+ else if (document.selection)
+ {
+ var range = textarea.createTextRange();
+ range.move("character", new_pos);
+ range.select();
+ storeCaret(document.forms[form_name].elements[text_name]);
+ }
- storeCaret(document.forms[form_name].elements[text_name]);
+ document.forms[form_name].elements[text_name].focus();
return;
}
/**
* Insert text at position
*/
-function insert_text(text)
+function insert_text(text, spaces, popup)
{
- if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos)
+ var textarea;
+
+ if (!popup)
{
- var caretPos = document.forms[form_name].elements[text_name].caretPos;
- caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? caretPos.text + text + ' ' : caretPos.text + text;
+ textarea = document.forms[form_name].elements[text_name];
+ } else
+ {
+ textarea = opener.document.forms[form_name].elements[text_name];
}
- else if (document.forms[form_name].elements[text_name].selectionStart)
+ if (spaces)
{
- var selStart = document.forms[form_name].elements[text_name].selectionStart;
- var selEnd = document.forms[form_name].elements[text_name].selectionEnd;
+ text = ' ' + text + ' ';
+ }
+
+ if (!isNaN(textarea.selectionStart))
+ {
+ var sel_start = textarea.selectionStart;
+ var sel_end = textarea.selectionEnd;
- mozWrap(document.forms[form_name].elements[text_name], text, '')
- document.forms[form_name].elements[text_name].selectionStart = selStart + text.length;
- document.forms[form_name].elements[text_name].selectionEnd = selEnd + text.length;
+ mozWrap(textarea, text, '')
+ textarea.selectionStart = sel_start + text.length;
+ textarea.selectionEnd = sel_end + text.length;
+ }
+
+ else if (textarea.createTextRange && textarea.caretPos)
+ {
+ var caret_pos = textarea.caretPos;
+ caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
+
}
+
else
{
- document.forms[form_name].elements[text_name].value = document.forms[form_name].elements[text_name].value + text;
+ textarea.value = textarea.value + text;
}
+ document.forms[form_name].elements[text_name].focus();
}
/**
* Add inline attachment at position
*/
-function attach_inline()
+function attach_inline(index, filename)
{
- insert_text('[attachment=' + document.forms[form_name].elements['attachments'].value + ']' + document.forms[form_name].elements['attachments'].options[document.forms[form_name].elements['attachments'].selectedIndex].text + '[/attachment]');
+ insert_text('[attachment=' + index + ']' + filename + '[/attachment]');
document.forms[form_name].elements[text_name].focus();
}
@@ -187,11 +200,11 @@ function addquote(post_id, username)
if (document.all)
{
- eval('divarea = document.all.' + message_name + ';');
+ divarea = document.all[message_name];
}
else
{
- eval("divarea = document.getElementById('" + message_name + "');");
+ divarea = document.getElementById(message_name);
}
// Get text selection - not only the post content :(
@@ -210,7 +223,15 @@ function addquote(post_id, username)
if (theSelection == '' || typeof theSelection == 'undefined' || theSelection == null)
{
- if (document.all)
+ if (divarea.innerHTML)
+ {
+ theSelection = divarea.innerHTML.replace(/
/ig, '\n');
+ theSelection = theSelection.replace(//ig, '\n');
+ theSelection = theSelection.replace(/<\;/ig, '<');
+ theSelection = theSelection.replace(/>\;/ig, '>');
+ theSelection = theSelection.replace(/&\;/ig, '&');
+ }
+ else if (document.all)
{
theSelection = divarea.innerText;
}
@@ -232,185 +253,6 @@ function addquote(post_id, username)
return;
}
-/**
-* bbstyle
-*/
-function bbstyle(bbnumber)
-{
- donotinsert = false;
- theSelection = false;
- bblast = 0;
- document.forms[form_name].elements[text_name].focus();
-
- // Close all open tags & default button names
- if (bbnumber == -1)
- {
- while (bbcode[0])
- {
- butnumber = arraypop(bbcode) - 1;
- document.forms[form_name].elements[text_name].value += bbtags[butnumber + 1];
- buttext = eval('document.forms[form_name].addbbcode' + butnumber + '.value');
-
- if (buttext != '[*]')
- {
- eval('document.forms[form_name].addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"');
- }
- }
-
- document.forms[form_name].addbbcode10.value = 'List';
- bbtags[10] = '[list]';
-
- document.forms[form_name].addbbcode12.value = 'List=';
- bbtags[12] = '[list=]';
-
- // All tags are closed including image tags :D
- imageTag = false;
- document.forms[form_name].elements[text_name].focus();
-
- return;
- }
-
- // [*] doesn't have an end tag
- noEndTag = (bbtags[bbnumber] == '[*]')
-
- if ((clientVer >= 4) && is_ie && is_win)
- {
- // Get text selection
- theSelection = document.selection.createRange().text;
-
- if (theSelection)
- {
- // Add tags around selection
- document.selection.createRange().text = bbtags[bbnumber] + theSelection + ((!noEndTag) ? bbtags[bbnumber+1] : '');
- document.forms[form_name].elements[text_name].focus();
- theSelection = '';
- return;
- }
- }
- else if (document.forms[form_name].elements[text_name].selectionEnd && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0))
- {
- mozWrap(document.forms[form_name].elements[text_name], bbtags[bbnumber], ((!noEndTag) ? bbtags[bbnumber+1] : ''));
- document.forms[form_name].elements[text_name].focus();
- theSelection = '';
- return;
- }
-
- // Find last occurance of an open tag the same as the one just clicked
- for (i = 0; i < bbcode.length; i++)
- {
- if (bbcode[i] == bbnumber+1)
- {
- bblast = i;
- donotinsert = true;
- }
- }
-
- if (bbnumber == 10 && bbtags[10] != '[*]')
- {
- if (donotinsert)
- {
- document.forms[form_name].addbbcode12.value = 'List=';
- tmp_help = o_help;
- o_help = e_help;
- e_help = tmp_help;
- bbtags[12] = '[list=]';
- }
- else
- {
- document.forms[form_name].addbbcode12.value = '[*]';
- tmp_help = o_help;
- o_help = e_help;
- e_help = tmp_help;
- bbtags[12] = '[*]';
- }
- }
-
- if (bbnumber == 12 && bbtags[12] != '[*]')
- {
- if (donotinsert)
- {
- document.forms[form_name].addbbcode10.value = 'List';
- tmp_help = l_help;
- l_help = e_help;
- e_help = tmp_help;
- bbtags[10] = '[list]';
- }
- else
- {
- document.forms[form_name].addbbcode10.value = '[*]';
- tmp_help = l_help;
- l_help = e_help;
- e_help = tmp_help;
- bbtags[10] = '[*]';
- }
- }
-
- // Close all open tags up to the one just clicked & default button names
- if (donotinsert)
- {
- while (bbcode[bblast])
- {
- butnumber = arraypop(bbcode) - 1;
-
- if (bbtags[butnumber] != '[*]')
- {
- insert_text(bbtags[butnumber + 1]);
- }
- else
- {
- insert_text(bbtags[butnumber]);
- }
-
- buttext = eval('document.forms[form_name].addbbcode' + butnumber + '.value');
-
- if (bbtags[butnumber] != '[*]')
- {
- eval('document.forms[form_name].addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"');
- }
- imageTag = false;
- }
- document.forms[form_name].elements[text_name].focus();
- return;
- }
- else
- {
- // Open tags
-
- // Close image tag before adding another
- if (imageTag && (bbnumber != 14))
- {
- insert_text(bbtags[15]);
-
- // Remove the close image tag from the list
- lastValue = arraypop(bbcode) - 1;
-
- // Return button back to normal state
- document.forms[form_name].addbbcode14.value = 'Img';
- imageTag = false;
- }
-
- // Open tag
- insert_text(bbtags[bbnumber]);
-
- // Check to stop additional tags after an unclosed image tag
- if (bbnumber == 14 && imageTag == false)
- {
- imageTag = 1;
- }
-
- if (bbtags[bbnumber] != '[*]')
- {
- arraypush(bbcode, bbnumber + 1);
- eval('document.forms[form_name].addbbcode'+bbnumber+'.value += "*"');
- }
-
- document.forms[form_name].elements[text_name].focus();
- return;
- }
-
- storeCaret(document.forms[form_name].elements[text_name]);
-}
-
/**
* From http://www.massless.org/mozedit/
*/
@@ -440,7 +282,7 @@ function mozWrap(txtarea, open, close)
}
/**
-* Insert at Claret position. Code from
+* Insert at Caret position. Code from
* http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
*/
function storeCaret(textEl)
@@ -465,7 +307,7 @@ function colorPalette(dir, width, height)
numberList[3] = 'BF';
numberList[4] = 'FF';
- document.write('');
+ document.writeln('');
for (r = 0; r < 5; r++)
{
@@ -484,8 +326,8 @@ function colorPalette(dir, width, height)
for (b = 0; b < 5; b++)
{
color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
- document.write('');
- document.write(' ');
+ document.write(' | ');
+ document.write('');
document.writeln(' | ');
}
@@ -502,3 +344,54 @@ function colorPalette(dir, width, height)
}
document.writeln('
');
}
+
+
+/**
+* Caret Position object
+*/
+function caretPosition()
+{
+ var start = null;
+ var end = null;
+}
+
+
+/**
+* Get the caret position in an textarea
+*/
+function getCaretPosition(txtarea)
+{
+ var caretPos = new caretPosition();
+
+ // simple Gecko/Opera way
+ if(txtarea.selectionStart || txtarea.selectionStart == 0)
+ {
+ caretPos.start = txtarea.selectionStart;
+ caretPos.end = txtarea.selectionEnd;
+ }
+ // dirty and slow IE way
+ else if(document.selection)
+ {
+ // get current selection
+ var range = document.selection.createRange();
+
+ // a new selection of the whole textarea
+ var range_all = document.body.createTextRange();
+ range_all.moveToElementText(txtarea);
+
+ // calculate selection start point by moving beginning of range_all to beginning of range
+ var sel_start;
+ for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++)
+ {
+ range_all.moveStart('character', 1);
+ }
+
+ txtarea.sel_start = sel_start;
+
+ // we ignore the end value for IE, this is already dirty enough and we don't need it
+ caretPos.start = txtarea.sel_start;
+ caretPos.end = txtarea.sel_start;
+ }
+
+ return caretPos;
+}
\ No newline at end of file
diff --git a/phpBB/adm/style/install_install.html b/phpBB/adm/style/install_install.html
index f84f55d7b1..91a7f25480 100755
--- a/phpBB/adm/style/install_install.html
+++ b/phpBB/adm/style/install_install.html
@@ -54,12 +54,11 @@
-
+ {L_DL_CONFIG}
+ {L_DL_CONFIG_EXPLAIN}
@@ -67,6 +66,7 @@
@@ -74,4 +74,4 @@
-
\ No newline at end of file
+
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
index 16ce338e30..5cdf2eeea0 100644
--- a/phpBB/adm/style/install_update.html
+++ b/phpBB/adm/style/install_update.html
@@ -1,5 +1,15 @@
+
+
{L_NOTICE}
{ERROR_MSG}
@@ -82,9 +92,9 @@
- {L_COLLECTED_INFORMATIONS}
+ {L_COLLECTED_INFORMATION}
- {L_COLLECTED_INFORMATIONS_EXPLAIN}
+ {L_COLLECTED_INFORMATION_EXPLAIN}
@@ -110,9 +120,6 @@
{files.EXPLAIN}
-