From cb21c33a14937a87551a0b39c2f814dca187a134 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Fri, 27 Sep 2013 16:56:06 +0300 Subject: [ticket/11872] Template syntax typos in oauth templates PHPBB3-11872 --- phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/styles/subsilver2/template') diff --git a/phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html b/phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html index 56a4c89125..80564d207b 100644 --- a/phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html +++ b/phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html @@ -23,7 +23,7 @@ - + {oauth.HIDDEN_FIELDS} {S_HIDDEN_FIELDS} -- cgit v1.2.1 From dbd4b5bdbce1e84e6686f8b76efdf4489a8c081f Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Fri, 25 Oct 2013 14:18:53 +0300 Subject: [ticket/11969] Change topic link to unread post in subsilver2 PHPBB3-11969 --- phpBB/styles/subsilver2/template/search_results.html | 2 +- phpBB/styles/subsilver2/template/ucp_main_bookmarks.html | 2 +- phpBB/styles/subsilver2/template/ucp_main_front.html | 2 +- phpBB/styles/subsilver2/template/ucp_main_subscribed.html | 2 +- phpBB/styles/subsilver2/template/viewforum_body.html | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) (limited to 'phpBB/styles/subsilver2/template') diff --git a/phpBB/styles/subsilver2/template/search_results.html b/phpBB/styles/subsilver2/template/search_results.html index 19ba0b196a..092779055d 100644 --- a/phpBB/styles/subsilver2/template/search_results.html +++ b/phpBB/styles/subsilver2/template/search_results.html @@ -36,7 +36,7 @@ {NEWEST_POST_IMG} - {searchresults.ATTACH_ICON_IMG} {searchresults.TOPIC_TITLE} + {searchresults.ATTACH_ICON_IMG} {searchresults.TOPIC_TITLE} {searchresults.UNAPPROVED_IMG}  diff --git a/phpBB/styles/subsilver2/template/ucp_main_bookmarks.html b/phpBB/styles/subsilver2/template/ucp_main_bookmarks.html index e91417503f..a8c6b4a9a8 100644 --- a/phpBB/styles/subsilver2/template/ucp_main_bookmarks.html +++ b/phpBB/styles/subsilver2/template/ucp_main_bookmarks.html @@ -41,7 +41,7 @@ {L_DELETED_TOPIC} -

{NEWEST_POST_IMG} {topicrow.ATTACH_ICON_IMG} {topicrow.TOPIC_TITLE}

+

{NEWEST_POST_IMG} {topicrow.ATTACH_ICON_IMG} {topicrow.TOPIC_TITLE}

{L_GLOBAL_ANNOUNCEMENT}{L_FORUM}{L_COLON} {topicrow.FORUM_NAME}

[ {GOTO_PAGE_IMG}{L_GOTO_PAGE}{L_COLON} diff --git a/phpBB/styles/subsilver2/template/ucp_main_front.html b/phpBB/styles/subsilver2/template/ucp_main_front.html index 5dea2b4f03..bc26266bef 100644 --- a/phpBB/styles/subsilver2/template/ucp_main_front.html +++ b/phpBB/styles/subsilver2/template/ucp_main_front.html @@ -16,7 +16,7 @@ {topicrow.TOPIC_FOLDER_IMG} -

{NEWEST_POST_IMG} {topicrow.ATTACH_ICON_IMG} {topicrow.TOPIC_TITLE}

{topicrow.GOTO_PAGE}

+

{NEWEST_POST_IMG} {topicrow.ATTACH_ICON_IMG} {topicrow.TOPIC_TITLE}

{topicrow.GOTO_PAGE}

{topicrow.LAST_POST_TIME}

diff --git a/phpBB/styles/subsilver2/template/ucp_main_subscribed.html b/phpBB/styles/subsilver2/template/ucp_main_subscribed.html index 45094abe5f..9de44dd9ed 100644 --- a/phpBB/styles/subsilver2/template/ucp_main_subscribed.html +++ b/phpBB/styles/subsilver2/template/ucp_main_subscribed.html @@ -50,7 +50,7 @@ {topicrow.TOPIC_FOLDER_IMG} -

{NEWEST_POST_IMG} {topicrow.ATTACH_ICON_IMG} {topicrow.TOPIC_TITLE}

+

{NEWEST_POST_IMG} {topicrow.ATTACH_ICON_IMG} {topicrow.TOPIC_TITLE}

{L_GLOBAL_ANNOUNCEMENT}{L_FORUM}{L_COLON} {topicrow.FORUM_NAME}

[ {GOTO_PAGE_IMG}{L_GOTO_PAGE}{L_COLON} diff --git a/phpBB/styles/subsilver2/template/viewforum_body.html b/phpBB/styles/subsilver2/template/viewforum_body.html index dfbe0a605b..7ad81f5737 100644 --- a/phpBB/styles/subsilver2/template/viewforum_body.html +++ b/phpBB/styles/subsilver2/template/viewforum_body.html @@ -207,7 +207,8 @@ {NEWEST_POST_IMG} - {topicrow.ATTACH_ICON_IMG} {topicrow.TOPIC_TYPE} {topicrow.TOPIC_TITLE} + {topicrow.ATTACH_ICON_IMG} {topicrow.TOPIC_TYPE} + {topicrow.TOPIC_TITLE} {topicrow.UNAPPROVED_IMG}  -- cgit v1.2.1 From 069f8061698e95f9a94ac65cbf4c8f3c6a7a7714 Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 24 Oct 2013 19:44:40 -0700 Subject: [ticket/11972] Add posting_editor_subject_after template event PHPBB3-11972 --- phpBB/styles/subsilver2/template/posting_body.html | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/styles/subsilver2/template') diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html index 635b05aaa0..ea35ccc20f 100644 --- a/phpBB/styles/subsilver2/template/posting_body.html +++ b/phpBB/styles/subsilver2/template/posting_body.html @@ -168,6 +168,7 @@ {L_SUBJECT}{L_COLON} + {L_MESSAGE_BODY}{L_COLON}
{L_MESSAGE_BODY_EXPLAIN} 

-- cgit v1.2.1 From 3be5fe535470f075af9718dc301b06981c9c695f Mon Sep 17 00:00:00 2001 From: David King Date: Wed, 30 Oct 2013 21:25:57 -0700 Subject: [ticket/11972] Add posting_editor_subject_before template event PHPBB3-11972 --- phpBB/styles/subsilver2/template/posting_body.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/styles/subsilver2/template') diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html index ea35ccc20f..efd606550e 100644 --- a/phpBB/styles/subsilver2/template/posting_body.html +++ b/phpBB/styles/subsilver2/template/posting_body.html @@ -163,7 +163,7 @@ - + {L_SUBJECT}{L_COLON} -- cgit v1.2.1 From b8eeca7048cdb6573b3c055f4e2aa3410cb4b506 Mon Sep 17 00:00:00 2001 From: David King Date: Wed, 30 Oct 2013 21:27:40 -0700 Subject: [ticket/11972] Add posting_editor_message_before template event PHPBB3-11972 --- phpBB/styles/subsilver2/template/posting_body.html | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/styles/subsilver2/template') diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html index efd606550e..ee36e76eb0 100644 --- a/phpBB/styles/subsilver2/template/posting_body.html +++ b/phpBB/styles/subsilver2/template/posting_body.html @@ -203,6 +203,7 @@ + -- cgit v1.2.1 From 835900123e2b6a16288cb6eb635716326dd523c0 Mon Sep 17 00:00:00 2001 From: David King Date: Wed, 30 Oct 2013 21:28:50 -0700 Subject: [ticket/11972] Add posting_editor_message_after template event PHPBB3-11972 --- phpBB/styles/subsilver2/template/posting_body.html | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/styles/subsilver2/template') diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html index ee36e76eb0..9395e24eb1 100644 --- a/phpBB/styles/subsilver2/template/posting_body.html +++ b/phpBB/styles/subsilver2/template/posting_body.html @@ -216,6 +216,7 @@ +
-- cgit v1.2.1 From abd035fcc963803ad4bbce140dcf0050f0402960 Mon Sep 17 00:00:00 2001 From: David King Date: Fri, 25 Oct 2013 18:33:01 -0700 Subject: [ticket/11975] Add ACP link next to MCP link in header PHPBB3-11975 --- phpBB/styles/subsilver2/template/index_body.html | 4 ++-- phpBB/styles/subsilver2/template/mcp_header.html | 4 +--- phpBB/styles/subsilver2/template/posting_body.html | 4 ++-- phpBB/styles/subsilver2/template/viewforum_body.html | 2 +- phpBB/styles/subsilver2/template/viewtopic_body.html | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) (limited to 'phpBB/styles/subsilver2/template') diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html index e07cfda8b3..158e5f2720 100644 --- a/phpBB/styles/subsilver2/template/index_body.html +++ b/phpBB/styles/subsilver2/template/index_body.html @@ -1,8 +1,8 @@ - +



diff --git a/phpBB/styles/subsilver2/template/mcp_header.html b/phpBB/styles/subsilver2/template/mcp_header.html index f107732234..9b9f7849f4 100644 --- a/phpBB/styles/subsilver2/template/mcp_header.html +++ b/phpBB/styles/subsilver2/template/mcp_header.html @@ -3,9 +3,7 @@ diff --git a/phpBB/styles/subsilver2/template/viewforum_body.html b/phpBB/styles/subsilver2/template/viewforum_body.html index dfbe0a605b..612c2e42ea 100644 --- a/phpBB/styles/subsilver2/template/viewforum_body.html +++ b/phpBB/styles/subsilver2/template/viewforum_body.html @@ -109,7 +109,7 @@

{L_MODERATOR}{L_MODERATORS}{L_COLON} {MODERATORS}

-

[ {L_MCP} ]

+

[ {L_ACP} | {L_MCP} ]

diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html index 26e74b8c38..c3f8bf205b 100644 --- a/phpBB/styles/subsilver2/template/viewtopic_body.html +++ b/phpBB/styles/subsilver2/template/viewtopic_body.html @@ -21,7 +21,7 @@

{L_MODERATOR}{L_MODERATORS}{L_COLON} {MODERATORS}

-

[ {L_MCP} ]

+

[ {L_ACP} | {L_MCP} ]

-- cgit v1.2.1 From 9328d42809ff85d654f55cbf53218301a5d13491 Mon Sep 17 00:00:00 2001 From: Lukasz Date: Thu, 7 Nov 2013 20:09:02 +0100 Subject: [ticket/12005] Delete templates files PHPBB3-12005 --- phpBB/styles/subsilver2/template/ucp_pm_popup.html | 37 ---------------------- 1 file changed, 37 deletions(-) delete mode 100644 phpBB/styles/subsilver2/template/ucp_pm_popup.html (limited to 'phpBB/styles/subsilver2/template') diff --git a/phpBB/styles/subsilver2/template/ucp_pm_popup.html b/phpBB/styles/subsilver2/template/ucp_pm_popup.html deleted file mode 100644 index b7032c6c30..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_pm_popup.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - -
- - - - -
-
- - {L_LOGIN_CHECK_PM} - - {MESSAGE}

{CLICK_TO_VIEW} - - -

{L_CLOSE_WINDOW}

-
-
- - -- cgit v1.2.1 From e74f1c1790bae04c1729491e0a728c70b41009ec Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 11 Nov 2013 15:28:18 -0800 Subject: [ticket/12014] Template Event index_body.html before forumlist Add content above the forums list (on forum index only) PHPBB3-12014 --- phpBB/styles/subsilver2/template/index_body.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'phpBB/styles/subsilver2/template') diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html index 158e5f2720..00c328e994 100644 --- a/phpBB/styles/subsilver2/template/index_body.html +++ b/phpBB/styles/subsilver2/template/index_body.html @@ -8,6 +8,8 @@

+ + -- cgit v1.2.1 From c386bf7911edfc4613c6a70dae37db76bfe645cb Mon Sep 17 00:00:00 2001 From: Cesar G Date: Fri, 18 Oct 2013 20:47:22 -0700 Subject: [ticket/11472] Make prosilver's editor.js an asset used by all styles. PHPBB3-11472 --- phpBB/styles/subsilver2/template/editor.js | 385 --------------------- .../subsilver2/template/posting_buttons.html | 2 +- .../subsilver2/template/posting_smilies.html | 2 +- 3 files changed, 2 insertions(+), 387 deletions(-) delete mode 100644 phpBB/styles/subsilver2/template/editor.js (limited to 'phpBB/styles/subsilver2/template') diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js deleted file mode 100644 index 6cf616e180..0000000000 --- a/phpBB/styles/subsilver2/template/editor.js +++ /dev/null @@ -1,385 +0,0 @@ -/** -* bbCode control by subBlue design [ www.subBlue.com ] -* Includes unixsafe colour palette selector by SHS` -*/ - -// Startup variables -var imageTag = false; -var theSelection = false; -var bbcodeEnabled = true; - -// Check for Browser & Platform for PC & IE specific bits -// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html -var clientPC = navigator.userAgent.toLowerCase(); // Get client info -var clientVer = parseInt(navigator.appVersion, 10); // Get browser version - -var is_ie = ((clientPC.indexOf('msie') !== -1) && (clientPC.indexOf('opera') === -1)); -var is_win = ((clientPC.indexOf('win') !== -1) || (clientPC.indexOf('16bit') !== -1)); -var baseHeight; - -/** -* Shows the help messages in the helpline window -*/ -function helpline(help) { - document.forms[form_name].helpbox.value = help_line[help]; -} - -/** -* Fix a bug involving the TextRange object. From -* http://www.frostjedi.com/terra/scripts/demo/caretBug.html -*/ -function initInsertions() { - var doc; - - if (document.forms[form_name]) { - doc = document; - } else { - doc = opener.document; - } - - var textarea = doc.forms[form_name].elements[text_name]; - phpbb.applyCodeEditor(textarea); - - if (is_ie && typeof(baseHeight) !== 'number') { - textarea.focus(); - baseHeight = doc.selection.createRange().duplicate().boundingHeight; - - if (!document.forms[form_name]) { - document.body.focus(); - } - } -} - -/** -* bbstyle -*/ -function bbstyle(bbnumber) { - if (bbnumber !== -1) { - bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]); - } else { - insert_text('[*]'); - document.forms[form_name].elements[text_name].focus(); - } -} - -/** -* Apply bbcodes -*/ -function bbfontstyle(bbopen, bbclose) { - theSelection = false; - - var textarea = document.forms[form_name].elements[text_name]; - - textarea.focus(); - - 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 = bbopen + theSelection + bbclose; - 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], bbopen, bbclose); - document.forms[form_name].elements[text_name].focus(); - theSelection = ''; - return; - } - - //The new position for the cursor after adding the bbcode - var caret_pos = getCaretPosition(textarea).start; - var new_pos = caret_pos + bbopen.length; - - // Open tag - insert_text(bbopen + bbclose); - - // 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(textarea); - } - - textarea.focus(); - return; -} - -/** -* Insert text at position -*/ -function insert_text(text, spaces, popup) { - var textarea; - - if (!popup) { - textarea = document.forms[form_name].elements[text_name]; - } else { - textarea = opener.document.forms[form_name].elements[text_name]; - } - - if (spaces) { - text = ' ' + text + ' '; - } - - // Since IE9, IE also has textarea.selectionStart, but it still needs to be treated the old way. - // Therefore we simply add a !is_ie here until IE fixes the text-selection completely. - if (!isNaN(textarea.selectionStart) && !is_ie) { - var sel_start = textarea.selectionStart; - var sel_end = textarea.selectionEnd; - - mozWrap(textarea, text, ''); - textarea.selectionStart = sel_start + text.length; - textarea.selectionEnd = sel_end + text.length; - } else if (textarea.createTextRange && textarea.caretPos) { - if (baseHeight !== textarea.caretPos.boundingHeight) { - textarea.focus(); - storeCaret(textarea); - } - - 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 { - textarea.value = textarea.value + text; - } - - if (!popup) { - textarea.focus(); - } -} - -/** -* Add inline attachment at position -*/ -function attach_inline(index, filename) { - insert_text('[attachment=' + index + ']' + filename + '[/attachment]'); - document.forms[form_name].elements[text_name].focus(); -} - -/** -* Add quote text to message -*/ -function addquote(post_id, username, l_wrote) { - var message_name = 'message_' + post_id; - var theSelection = ''; - var divarea = false; - var i; - - if (l_wrote === undefined) { - // Backwards compatibility - l_wrote = 'wrote'; - } - - if (document.all) { - divarea = document.all[message_name]; - } else { - divarea = document.getElementById(message_name); - } - - // Get text selection - not only the post content :( - // IE9 must use the document.selection method but has the *.getSelection so we just force no IE - if (window.getSelection && !is_ie && !window.opera) { - theSelection = window.getSelection().toString(); - } else if (document.getSelection && !is_ie) { - theSelection = document.getSelection(); - } else if (document.selection) { - theSelection = document.selection.createRange().text; - } - - if (theSelection === '' || typeof theSelection === 'undefined' || theSelection === null) { - 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, '&'); - theSelection = theSelection.replace(/ \;/ig, ' '); - } else if (document.all) { - theSelection = divarea.innerText; - } else if (divarea.textContent) { - theSelection = divarea.textContent; - } else if (divarea.firstChild.nodeValue) { - theSelection = divarea.firstChild.nodeValue; - } - } - - if (theSelection) { - if (bbcodeEnabled) { - insert_text('[quote="' + username + '"]' + theSelection + '[/quote]'); - } else { - insert_text(username + ' ' + l_wrote + ':' + '\n'); - var lines = split_lines(theSelection); - for (i = 0; i < lines.length; i++) { - insert_text('> ' + lines[i] + '\n'); - } - } - } - - return; -} - -function split_lines(text) { - var lines = text.split('\n'); - var splitLines = new Array(); - var j = 0; - var i; - - for(i = 0; i < lines.length; i++) { - if (lines[i].length <= 80) { - splitLines[j] = lines[i]; - j++; - } else { - var line = lines[i]; - var splitAt; - do { - splitAt = line.indexOf(' ', 80); - - if (splitAt === -1) { - splitLines[j] = line; - j++; - } else { - splitLines[j] = line.substring(0, splitAt); - line = line.substring(splitAt); - j++; - } - } - while(splitAt !== -1); - } - } - return splitLines; -} - -/** -* From http://www.massless.org/mozedit/ -*/ -function mozWrap(txtarea, open, close) { - var selLength = (typeof(txtarea.textLength) === 'undefined') ? txtarea.value.length : txtarea.textLength; - var selStart = txtarea.selectionStart; - var selEnd = txtarea.selectionEnd; - var scrollTop = txtarea.scrollTop; - - if (selEnd === 1 || selEnd === 2) { - selEnd = selLength; - } - - var s1 = (txtarea.value).substring(0,selStart); - var s2 = (txtarea.value).substring(selStart, selEnd); - var s3 = (txtarea.value).substring(selEnd, selLength); - - txtarea.value = s1 + open + s2 + close + s3; - txtarea.selectionStart = selStart + open.length; - txtarea.selectionEnd = selEnd + open.length; - txtarea.focus(); - txtarea.scrollTop = scrollTop; - - return; -} - -/** -* Insert at Caret position. Code from -* http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130 -*/ -function storeCaret(textEl) { - if (textEl.createTextRange) { - textEl.caretPos = document.selection.createRange().duplicate(); - } -} - -/** -* Color pallette -*/ -function colorPalette(dir, width, height) { - var r = 0, g = 0, b = 0; - var numberList = new Array(6); - var color = ''; - - numberList[0] = '00'; - numberList[1] = '40'; - numberList[2] = '80'; - numberList[3] = 'BF'; - numberList[4] = 'FF'; - - document.writeln(''); - - for (r = 0; r < 5; r++) { - if (dir === 'h') { - document.writeln(''); - } - - for (g = 0; g < 5; g++) { - if (dir === 'v') { - document.writeln(''); - } - - for (b = 0; b < 5; b++) { - color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]); - document.write(''); - } - - if (dir === 'v') { - document.writeln(''); - } - } - - if (dir === 'h') { - document.writeln(''); - } - } - document.writeln('
'); - document.write('#' + color + ''); - 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; -} diff --git a/phpBB/styles/subsilver2/template/posting_buttons.html b/phpBB/styles/subsilver2/template/posting_buttons.html index 1a7093e1be..6ffb1d89d8 100644 --- a/phpBB/styles/subsilver2/template/posting_buttons.html +++ b/phpBB/styles/subsilver2/template/posting_buttons.html @@ -33,7 +33,7 @@ // ]]> - + diff --git a/phpBB/styles/subsilver2/template/posting_smilies.html b/phpBB/styles/subsilver2/template/posting_smilies.html index d0ced9ff12..c916198ca5 100644 --- a/phpBB/styles/subsilver2/template/posting_smilies.html +++ b/phpBB/styles/subsilver2/template/posting_smilies.html @@ -6,7 +6,7 @@ var text_name = opener.text_name; // ]]> - + -- cgit v1.2.1 From 79b5e9689617df62030be13f8b9912aee32e7bcb Mon Sep 17 00:00:00 2001 From: Cesar G Date: Fri, 18 Oct 2013 21:23:53 -0700 Subject: [ticket/11472] Make the color swatch configurable and fix it in subsilver2 PHPBB3-11472 --- phpBB/styles/subsilver2/template/posting_body.html | 7 +------ phpBB/styles/subsilver2/template/ucp_main_drafts.html | 7 +------ phpBB/styles/subsilver2/template/ucp_profile_signature.html | 7 +------ 3 files changed, 3 insertions(+), 18 deletions(-) (limited to 'phpBB/styles/subsilver2/template') diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html index 7b77f85694..53e8e02d33 100644 --- a/phpBB/styles/subsilver2/template/posting_body.html +++ b/phpBB/styles/subsilver2/template/posting_body.html @@ -207,12 +207,7 @@ - diff --git a/phpBB/styles/subsilver2/template/ucp_main_drafts.html b/phpBB/styles/subsilver2/template/ucp_main_drafts.html index 8e18e9cabf..96af9c44e4 100644 --- a/phpBB/styles/subsilver2/template/ucp_main_drafts.html +++ b/phpBB/styles/subsilver2/template/ucp_main_drafts.html @@ -75,12 +75,7 @@
- +
-
- +
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_signature.html b/phpBB/styles/subsilver2/template/ucp_profile_signature.html index 85c8b0f616..4ed3287b39 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_signature.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_signature.html @@ -61,12 +61,7 @@ 		-
- +
-- cgit v1.2.1 From 1ea07e2270a0e18bc6008f4ac28df03b5fd52432 Mon Sep 17 00:00:00 2001 From: Cesar G Date: Sun, 20 Oct 2013 16:35:28 -0700 Subject: [ticket/11472] Use {T_ASSETS_PATH}. PHPBB3-11472 --- phpBB/styles/subsilver2/template/posting_buttons.html | 2 +- phpBB/styles/subsilver2/template/posting_smilies.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/styles/subsilver2/template') diff --git a/phpBB/styles/subsilver2/template/posting_buttons.html b/phpBB/styles/subsilver2/template/posting_buttons.html index 6ffb1d89d8..7a3a4ca73c 100644 --- a/phpBB/styles/subsilver2/template/posting_buttons.html +++ b/phpBB/styles/subsilver2/template/posting_buttons.html @@ -33,7 +33,7 @@ // ]]> - + diff --git a/phpBB/styles/subsilver2/template/posting_smilies.html b/phpBB/styles/subsilver2/template/posting_smilies.html index c916198ca5..0be71098db 100644 --- a/phpBB/styles/subsilver2/template/posting_smilies.html +++ b/phpBB/styles/subsilver2/template/posting_smilies.html @@ -6,7 +6,7 @@ var text_name = opener.text_name; // ]]> - + -- cgit v1.2.1 From 13d2d7d03684c44d2d2dc12fa205ee05e71e923d Mon Sep 17 00:00:00 2001 From: Cesar G Date: Tue, 29 Oct 2013 06:52:38 -0700 Subject: [ticket/11472] Expand palette cell links to the full block size. PHPBB3-11472 --- phpBB/styles/subsilver2/template/posting_body.html | 2 +- phpBB/styles/subsilver2/template/ucp_main_drafts.html | 2 +- phpBB/styles/subsilver2/template/ucp_profile_signature.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/styles/subsilver2/template') diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html index 53e8e02d33..79c0fa2dbb 100644 --- a/phpBB/styles/subsilver2/template/posting_body.html +++ b/phpBB/styles/subsilver2/template/posting_body.html @@ -207,7 +207,7 @@ - diff --git a/phpBB/styles/subsilver2/template/ucp_main_drafts.html b/phpBB/styles/subsilver2/template/ucp_main_drafts.html index 96af9c44e4..0206c7c613 100644 --- a/phpBB/styles/subsilver2/template/ucp_main_drafts.html +++ b/phpBB/styles/subsilver2/template/ucp_main_drafts.html @@ -75,7 +75,7 @@ - diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html index b8e7e29481..1499f90eaf 100644 --- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html +++ b/phpBB/styles/subsilver2/template/ucp_groups_manage.html @@ -49,7 +49,11 @@ - + diff --git a/phpBB/styles/subsilver2/template/ucp_main_drafts.html b/phpBB/styles/subsilver2/template/ucp_main_drafts.html index 0206c7c613..d63d678250 100644 --- a/phpBB/styles/subsilver2/template/ucp_main_drafts.html +++ b/phpBB/styles/subsilver2/template/ucp_main_drafts.html @@ -75,7 +75,7 @@
+
-
+
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_signature.html b/phpBB/styles/subsilver2/template/ucp_profile_signature.html index 4ed3287b39..5a2690edda 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_signature.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_signature.html @@ -61,7 +61,7 @@ 		-
+
-- cgit v1.2.1 From c5680ca8227915ff7fc5f56bb4c4e9fd42b08e20 Mon Sep 17 00:00:00 2001 From: Cesar G Date: Wed, 13 Nov 2013 01:24:37 -0800 Subject: [ticket/10810] Update all palettes. PHPBB3-10810 --- phpBB/styles/subsilver2/template/posting_body.html | 2 +- phpBB/styles/subsilver2/template/ucp_groups_manage.html | 6 +++++- phpBB/styles/subsilver2/template/ucp_main_drafts.html | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'phpBB/styles/subsilver2/template') diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html index 79c0fa2dbb..b501c4146a 100644 --- a/phpBB/styles/subsilver2/template/posting_body.html +++ b/phpBB/styles/subsilver2/template/posting_body.html @@ -207,7 +207,7 @@
+

{L_GROUP_COLOR_EXPLAIN}		  [ {L_COLOUR_SWATCH} ] +    + [ {L_COLOUR_SWATCH} ] + +
-
+
-- cgit v1.2.1 From 9d39457e35632d2770af986f78286d239fd00c78 Mon Sep 17 00:00:00 2001 From: OpenShift guest Date: Mon, 18 Nov 2013 23:17:03 -0500 Subject: [ticket/12024] Template event overall_header_content_before http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44959 http://tracker.phpbb.com/browse/PHPBB3-12024 PHPBB3-12024 --- phpBB/styles/subsilver2/template/overall_footer.html | 1 + phpBB/styles/subsilver2/template/overall_header.html | 1 + 2 files changed, 2 insertions(+) (limited to 'phpBB/styles/subsilver2/template') diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html index 3a29a0d752..84a02430b9 100644 --- a/phpBB/styles/subsilver2/template/overall_footer.html +++ b/phpBB/styles/subsilver2/template/overall_footer.html @@ -1,3 +1,4 @@ + {RUN_CRON_TASK} diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 0317d6e45c..20d06e4921 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -243,3 +243,4 @@ function marklist(id, name, state)
+ \ No newline at end of file -- cgit v1.2.1 From bc47455dfba70f43bf335753e0329e2eff6d7082 Mon Sep 17 00:00:00 2001 From: OpenShift guest Date: Mon, 18 Nov 2013 23:43:39 -0500 Subject: [ticket/12024] Replace newline PHPBB3-12024 --- phpBB/styles/subsilver2/template/overall_header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/styles/subsilver2/template') diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 20d06e4921..02e056798b 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -243,4 +243,4 @@ function marklist(id, name, state)
- \ No newline at end of file + -- cgit v1.2.1 From 55670d75b00079a06ed1ac701786e41d7a367f89 Mon Sep 17 00:00:00 2001 From: OpenShift guest Date: Tue, 19 Nov 2013 09:55:58 -0500 Subject: [ticket/12024] Add new line PHPBB3-12024 --- phpBB/styles/subsilver2/template/overall_footer.html | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/styles/subsilver2/template') diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html index 84a02430b9..4d69f8dff1 100644 --- a/phpBB/styles/subsilver2/template/overall_footer.html +++ b/phpBB/styles/subsilver2/template/overall_footer.html @@ -1,4 +1,5 @@ + {RUN_CRON_TASK} -- cgit v1.2.1 From 263f213ffe9fa5999fff8274983daa24eec07f55 Mon Sep 17 00:00:00 2001 From: s9e Date: Thu, 21 Nov 2013 23:20:16 +0100 Subject: [ticket/12028] Replace L_COLON with literal colon Replace L_COLON with literal colon in JavaScript context. [ci skip] PHPBB3-12028 --- phpBB/styles/subsilver2/template/posting_buttons.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/styles/subsilver2/template') diff --git a/phpBB/styles/subsilver2/template/posting_buttons.html b/phpBB/styles/subsilver2/template/posting_buttons.html index 7a3a4ca73c..06de2c3169 100644 --- a/phpBB/styles/subsilver2/template/posting_buttons.html +++ b/phpBB/styles/subsilver2/template/posting_buttons.html @@ -27,7 +27,7 @@ d: '{LA_BBCODE_D_HELP}', tip: '{L_STYLES_TIP}' - ,cb_{custom_tags.BBCODE_ID}{L_COLON} '{custom_tags.A_BBCODE_HELPLINE}' + ,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}' } -- cgit v1.2.1