From 9f8fda388b8658200b8e03fa959759d519c83ab7 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 23 Jun 2009 16:37:13 +0000 Subject: [PATCH] - web: add buttons for BBCode editing. From John Hallissey svn path=/trunk/boinc/; revision=18485 --- checkin_notes | 15 ++ html/inc/bbcode_bbcodehtml.inc | 61 ++++++++ html/inc/util.inc | 10 +- html/user/bbcode_toolbar.js | 252 +++++++++++++++++++++++++++++++++ html/user/forum_edit.php | 10 +- html/user/forum_post.php | 7 +- html/user/forum_reply.php | 7 +- 7 files changed, 351 insertions(+), 11 deletions(-) create mode 100644 html/inc/bbcode_bbcodehtml.inc create mode 100644 html/user/bbcode_toolbar.js diff --git a/checkin_notes b/checkin_notes index c1427643c9..a54931d2d0 100644 --- a/checkin_notes +++ b/checkin_notes @@ -5969,3 +5969,18 @@ Rom 23 June 2009 AccountManagerInfoPage.cpp, .h ProjectInfoPage.cpp, .h clientgui/ProjectListCtrl.cpp, .h + +David 23 June 2009 + - web: add buttons for BBCode editing. + From John Hallissey + + html/ + inc/ + bbcode_bbdodehtml.inc + pm.inc + util.inc + user/ + bbcode_toolbar.js + forum_edit.php + forum_post.php + forum_reply.php diff --git a/html/inc/bbcode_bbcodehtml.inc b/html/inc/bbcode_bbcodehtml.inc new file mode 100644 index 0000000000..0ea558127d --- /dev/null +++ b/html/inc/bbcode_bbcodehtml.inc @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
+ + + + + +
 Font colour: +  Font size: + Close Tags
+
\ No newline at end of file diff --git a/html/inc/util.inc b/html/inc/util.inc index fa7392cd61..0f08e058d5 100644 --- a/html/inc/util.inc +++ b/html/inc/util.inc @@ -100,7 +100,7 @@ $cache_control_extra=""; // To do so, define page_head() in the project include file. // if (!function_exists("page_head")){ -function page_head($title, $java_onload=null, $title_plain=null, $prefix="") { +function page_head($title, $java_onload=null, $title_plain=null, $prefix="", $bbcode_js_head=null) { global $caching; global $cache_control_extra; @@ -127,11 +127,19 @@ function page_head($title, $java_onload=null, $title_plain=null, $prefix="") { } else { echo "".strip_tags($title_plain)."\n"; } + if ($bbcode_js_head){ echo " + $bbcode_js_head + + "; + } else { + echo " + "; + } if ($java_onload){ echo ""; } else { diff --git a/html/user/bbcode_toolbar.js b/html/user/bbcode_toolbar.js new file mode 100644 index 0000000000..ec4d959bc7 --- /dev/null +++ b/html/user/bbcode_toolbar.js @@ -0,0 +1,252 @@ +// This file is part of BOINC. +// http://boinc.berkeley.edu +// Copyright (C) 2008 University of California +// +// BOINC is free software; you can redistribute it and/or modify it +// under the terms of the GNU Lesser General Public License +// as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. +// +// BOINC is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +// See the GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with BOINC. If not, see . + +//**Original Code by** +// bbCode control by +// subBlue design +// www.subBlue.com +// Altered by John37309 for boinc.berkeley.edu 18th June 2009 + +// This javascript adds a bbcode toolbar +// functionallity to the posting page of the forums + +// Startup variables +var imageTag = false; +var theSelection = false; + +// 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); // Get browser version + +var is_ie = ((clientPC.indexOf("msie") != -1) && (clientPC.indexOf("opera") == -1)); +var is_nav = ((clientPC.indexOf('mozilla')!=-1) && (clientPC.indexOf('spoofer')==-1) + && (clientPC.indexOf('compatible') == -1) && (clientPC.indexOf('opera')==-1) + && (clientPC.indexOf('webtv')==-1) && (clientPC.indexOf('hotjava')==-1)); +var is_moz = 0; + +var is_win = ((clientPC.indexOf("win")!=-1) || (clientPC.indexOf("16bit") != -1)); +var is_mac = (clientPC.indexOf("mac")!=-1); + +// Helpline messages +b_help = "Bold text: [b]text[/b] (alt+b)"; +i_help = "Italic text: [i]text[/i] (alt+i)"; +u_help = "Underline text: [u]text[/u] (alt+u)"; +q_help = "Quote text: [quote]text[/quote] (alt+q)"; +c_help = "Code display: [code]code[/code] (alt+c)"; +l_help = "List: [list]text[/list] (alt+l)"; +o_help = "Ordered list: [list=]text[/list] (alt+o)"; +p_help = "Insert image: [img]http://image_url[/img] (alt+p)"; +w_help = "Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url] (alt+w)"; +a_help = "Close all open bbCode tags"; +s_help = "Font color: [color=red]text[/color] Tip: you can also use color=#FF0000"; +f_help = "Font size: [size=x-small]small text[/size]"; +y_help = "Youtube video: [youtube]URL of movie[/youtube]"; +k_help = "Strike text; [s]text[/s]"; + +// Define the bbCode tags +bbcode = new Array(); +bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[youtube]','[/youtube]','[s]','[/s]'); +imageTag = false; + +// Shows the help messages in the helpline window +function helpline(help) { + document.post.helpbox.value = eval(help + "_help"); +} + + +// Replacement for arrayname.length property +function getarraysize(thearray) { + for (i = 0; i < thearray.length; i++) { + if ((thearray[i] == "undefined") || (thearray[i] == "") || (thearray[i] == null)) + return i; + } + return thearray.length; +} + +// Replacement for arrayname.push(value) not implemented in IE until version 5.5 +// Appends element to the array +function arraypush(thearray,value) { + thearray[ getarraysize(thearray) ] = value; +} + +// Replacement for arrayname.pop() not implemented in IE until version 5.5 +// Removes and returns the last element of an array +function arraypop(thearray) { + thearraysize = getarraysize(thearray); + retval = thearray[thearraysize - 1]; + delete thearray[thearraysize - 1]; + return retval; +} + + +function checkForm() { + + formErrors = false; + + if (document.post.content.value.length < 2) { + formErrors = "You must enter a message when posting."; + } + + if (formErrors) { + alert(formErrors); + return false; + } else { + bbstyle(-1); + //formObj.preview.disabled = true; + //formObj.submit.disabled = true; + return true; + } +} + +function emoticon(text) { + var txtarea = document.post.content; + text = ' ' + text + ' '; + if (txtarea.createTextRange && txtarea.caretPos) { + var caretPos = txtarea.caretPos; + caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? caretPos.text + text + ' ' : caretPos.text + text; + txtarea.focus(); + } else { + txtarea.value += text; + txtarea.focus(); + } +} + +function bbfontstyle(bbopen, bbclose) { + var txtarea = document.post.content; + + if ((clientVer >= 4) && is_ie && is_win) { + theSelection = document.selection.createRange().text; + if (!theSelection) { + txtarea.value += bbopen + bbclose; + txtarea.focus(); + return; + } + document.selection.createRange().text = bbopen + theSelection + bbclose; + txtarea.focus(); + return; + } + else if (txtarea.selectionEnd && (txtarea.selectionEnd - txtarea.selectionStart > 0)) + { + mozWrap(txtarea, bbopen, bbclose); + return; + } + else + { + txtarea.value += bbopen + bbclose; + txtarea.focus(); + } + storeCaret(txtarea); +} + + +function bbstyle(bbnumber) { + var txtarea = document.post.content; + + txtarea.focus(); + donotinsert = false; + theSelection = false; + bblast = 0; + + if (bbnumber == -1) { // Close all open tags & default button names + while (bbcode[0]) { + butnumber = arraypop(bbcode) - 1; + txtarea.value += bbtags[butnumber + 1]; + buttext = eval('document.post.addbbcode' + butnumber + '.value'); + eval('document.post.addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"'); + } + imageTag = false; // All tags are closed including image tags :D + txtarea.focus(); + return; + } + + if ((clientVer >= 4) && is_ie && is_win) + { + theSelection = document.selection.createRange().text; // Get text selection + if (theSelection) { + // Add tags around selection + document.selection.createRange().text = bbtags[bbnumber] + theSelection + bbtags[bbnumber+1]; + txtarea.focus(); + theSelection = ''; + return; + } + } + else if (txtarea.selectionEnd && (txtarea.selectionEnd - txtarea.selectionStart > 0)) + { + mozWrap(txtarea, bbtags[bbnumber], bbtags[bbnumber+1]); + 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 (donotinsert) { // Close all open tags up to the one just clicked & default button names + while (bbcode[bblast]) { + butnumber = arraypop(bbcode) - 1; + txtarea.value += bbtags[butnumber + 1]; + buttext = eval('document.post.addbbcode' + butnumber + '.value'); + eval('document.post.addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"'); + imageTag = false; + } + txtarea.focus(); + return; + } else { // Open tags + + if (imageTag && (bbnumber != 14)) { // Close image tag before adding another + txtarea.value += bbtags[15]; + lastValue = arraypop(bbcode) - 1; // Remove the close image tag from the list + document.post.addbbcode14.value = "Img"; // Return button back to normal state + imageTag = false; + } + + // Open tag + txtarea.value += bbtags[bbnumber]; + if ((bbnumber == 14) && (imageTag == false)) imageTag = 1; // Check to stop additional tags after an unclosed image tag + arraypush(bbcode,bbnumber+1); + eval('document.post.addbbcode'+bbnumber+'.value += "*"'); + txtarea.focus(); + return; + } + storeCaret(txtarea); +} + +// From http://www.massless.org/mozedit/ +function mozWrap(txtarea, open, close) +{ + var selLength = txtarea.textLength; + var selStart = txtarea.selectionStart; + var selEnd = txtarea.selectionEnd; + 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; + return; +} + +// Insert at Claret 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(); +} diff --git a/html/user/forum_edit.php b/html/user/forum_edit.php index 84b4498eed..9e9a049b11 100644 --- a/html/user/forum_edit.php +++ b/html/user/forum_edit.php @@ -82,7 +82,7 @@ if (post_str('submit',true) && (!$preview)) { } } -page_head('Forum'); +page_head('Forum','','','',''); show_forum_header($logged_in_user); switch ($forum->parent_type) { @@ -103,7 +103,7 @@ if ($preview == tra("Preview")) { echo "\n"; } -echo "
id."\" method=\"POST\">\n"; +echo "id."\" method=\"POST\" name=\"post\" onsubmit=\"return checkForm(this)\">\n"; echo form_tokens($logged_in_user->authenticator); start_table(); row1("Edit your message"); @@ -122,15 +122,17 @@ if ($can_edit_title) { } }; +$bbcode_bbcodehtml = file_get_contents('../inc/bbcode_bbcodehtml.inc'); + if ($preview) { row2( tra("Message").html_info().post_warning(), - "" + $bbcode_bbcodehtml."" ); } else { row2( tra("Message").html_info().post_warning(), - '' + $bbcode_bbcodehtml.'' ); } diff --git a/html/user/forum_post.php b/html/user/forum_post.php index 39319f4a90..3a8ec9fdc6 100644 --- a/html/user/forum_post.php +++ b/html/user/forum_post.php @@ -61,7 +61,7 @@ if ($content && $title && (!$preview)){ } } -page_head('Create new thread'); +page_head('Create new thread','','','',''); show_forum_header($logged_in_user); if ($warning) { @@ -86,7 +86,7 @@ if ($preview == tra("Preview")) { echo "\n"; } -echo "id."\" method=\"POST\">\n"; +echo "id."\" method=\"POST\" name=\"post\" onsubmit=\"return checkForm(this)\">\n"; echo form_tokens($logged_in_user->authenticator); start_table(); @@ -108,8 +108,9 @@ if ($force_title && $title){ } //Message +$bbcode_bbcodehtml = file_get_contents('../inc/bbcode_bbcodehtml.inc'); row2(tra("Message").html_info().post_warning().$body_help, - "" + $bbcode_bbcodehtml."" ); if (!$logged_in_user->prefs->no_signature_by_default) { diff --git a/html/user/forum_reply.php b/html/user/forum_reply.php index a18072290a..75cf50839b 100644 --- a/html/user/forum_reply.php +++ b/html/user/forum_reply.php @@ -81,7 +81,7 @@ if ($content && (!$preview)){ } } -page_head(tra("Post to thread")); +page_head(tra("Post to thread"),'','','',''); show_forum_header($logged_in_user); @@ -128,9 +128,10 @@ function show_message_row($thread, $parent_post) { $x2 .= "&post=".$parent_post->id; } - $x2 .= " method=\"post\">\n"; + $x2 .= " method=\"post\" name=\"post\" onsubmit=\"return checkForm(this)\">\n"; $x2 .= form_tokens($g_logged_in_user->authenticator); - $x2 .= "