diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-17 11:59:06 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-17 11:59:06 +0000 |
| commit | 94a91530da9f952a8b6e729ff187932706282f5a (patch) | |
| tree | 4477d65c06a123707f171beb4f26659c4c24d668 /phpBB/adm/style | |
| parent | 9d5e18714d527ffbad2d3a687db9ba6e07deb684 (diff) | |
| download | forums-94a91530da9f952a8b6e729ff187932706282f5a.tar forums-94a91530da9f952a8b6e729ff187932706282f5a.tar.gz forums-94a91530da9f952a8b6e729ff187932706282f5a.tar.bz2 forums-94a91530da9f952a8b6e729ff187932706282f5a.tar.xz forums-94a91530da9f952a8b6e729ff187932706282f5a.zip | |
adjust smilies. Also allow adding more codes to existing smilies... no one noticed this before. :/
git-svn-id: file:///svn/phpbb/trunk@7614 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm/style')
| -rw-r--r-- | phpBB/adm/style/acp_icons.html | 60 | ||||
| -rw-r--r-- | phpBB/adm/style/editor.js | 27 |
2 files changed, 73 insertions, 14 deletions
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index 40a2cd166e..81f56cc299 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -4,6 +4,43 @@ <!-- IF S_EDIT --> + <!-- IF S_ADD_CODE --> + <script type="text/javascript" defer="defer"> + <!-- + + var smiley = Array(); + <!-- BEGIN smile --> + smiley['{smile.SMILEY_URL}'] = Array(); + smiley['{smile.SMILEY_URL}']['code'] = '{smile.CODE}'; + smiley['{smile.SMILEY_URL}']['emotion'] = '{smile.EMOTION}'; + smiley['{smile.SMILEY_URL}']['width'] = {smile.WIDTH}; + smiley['{smile.SMILEY_URL}']['height'] = {smile.HEIGHT}; + smiley['{smile.SMILEY_URL}']['order'] = {smile.ORDER}; + <!-- END smile --> + + function update_image(newimage) + { + var use_element = smiley[newimage]; + + document.getElementById('add_image_src').src = '{PHPBB_ROOT_PATH}{IMG_PATH}/' + newimage; + document.getElementById('add_code').value = use_element['code']; + document.getElementById('add_emotion').value = use_element['emotion']; + document.getElementById('add_width').value = use_element['width']; + document.getElementById('add_height').value = use_element['height']; + + element = document.getElementById('add_order'); + for (var i = 0; i < element.length; i++) + { + if (element.options[i].value == use_element['order']) + { + document.getElementById('add_order').options.selectedIndex = i; + } + } + } + //--> + </script> + <!-- ENDIF --> + <a href="{U_BACK}" style="float: right">« {L_BACK}</a> <h1>{L_TITLE}</h1> @@ -20,6 +57,7 @@ <tr> <th colspan="{COLSPAN}">{L_CONFIG}</th> </tr> + <!-- IF .items or S_ADD_CODE --> <tr class="row3"> <td>{L_URL}</td> <td>{L_LOCATION}</td> @@ -64,6 +102,27 @@ <!-- ENDIF --> </tr> <!-- END items --> + <!-- IF S_ADD_CODE --> + <tr> + <th colspan="{COLSPAN}">{L_ADD_SMILEY_CODE}</th> + </tr> + <tr class="row1"> + <td style="text-align: center;"><select name="add_image" id="add_image" onchange="update_image(this.options[selectedIndex].value);">{S_IMG_OPTIONS}</select></td> + <td style="vertical-align: top;"><img src="{IMG_SRC}" id="add_image_src" alt="" title="" /></td> + <td><input class="text post" type="text" name="add_code" id="add_code" value="{CODE}" size="10" maxlength="50" /></td> + <td><input class="text post" type="text" name="add_emotion" id="add_emotion" value="{EMOTION}" size="10" maxlength="50" /></td> + <td><input class="text post" type="text" size="3" name="add_width" id="add_width" value="{WIDTH}" /></td> + <td><input class="text post" type="text" size="3" name="add_height" id="add_height" value="{HEIGHT}" /></td> + <td><input type="checkbox" class="radio" name="add_display_on_posting" checked="checked" /></td> + <td><select name="add_order" id="add_order">{S_ADD_ORDER_LIST}</select></td> + <td><input type="checkbox" class="radio" name="add_additional_code" value="1" /></td> + </tr> + <!-- ENDIF --> + <!-- ELSE --> + <tr class="row3"> + <td colspan="{COLSPAN}">{L_NO_ICONS}</td> + </tr> + <!-- ENDIF --> </tbody> </table> @@ -71,6 +130,7 @@ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> </p> + </fieldset> </form> diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js index c7632633d9..e82b9d5d62 100644 --- a/phpBB/adm/style/editor.js +++ b/phpBB/adm/style/editor.js @@ -55,12 +55,12 @@ function initInsertions() * bbstyle */ function bbstyle(bbnumber) -{ +{ if (bbnumber != -1) { bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]); - } - else + } + else { insert_text('[*]'); document.forms[form_name].elements[text_name].focus(); @@ -117,7 +117,6 @@ function bbfontstyle(bbopen, bbclose) // IE else if (document.selection) { - var range = textarea.createTextRange(); range.move("character", new_pos); range.select(); @@ -135,19 +134,20 @@ function insert_text(text, spaces, popup) { var textarea; - if (!popup) + if (!popup) { textarea = document.forms[form_name].elements[text_name]; - } - else + } + else { textarea = opener.document.forms[form_name].elements[text_name]; } - if (spaces) + + if (spaces) { text = ' ' + text + ' '; } - + if (!isNaN(textarea.selectionStart)) { var sel_start = textarea.selectionStart; @@ -164,7 +164,7 @@ function insert_text(text, spaces, popup) { 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; @@ -366,15 +366,14 @@ function getCaretPosition(txtarea) var caretPos = new caretPosition(); // simple Gecko/Opera way - if(txtarea.selectionStart || txtarea.selectionStart == 0) + if (txtarea.selectionStart || txtarea.selectionStart == 0) { caretPos.start = txtarea.selectionStart; caretPos.end = txtarea.selectionEnd; } // dirty and slow IE way - else if(document.selection) + else if (document.selection) { - // get current selection var range = document.selection.createRange(); @@ -385,7 +384,7 @@ function getCaretPosition(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); } |