diff options
| author | Vjacheslav Trushkin <cyberalien@gmail.com> | 2013-08-30 15:20:14 +0300 |
|---|---|---|
| committer | Vjacheslav Trushkin <cyberalien@gmail.com> | 2013-09-14 10:10:44 +0300 |
| commit | e6d87c5bc09e7f3d3813589f99a5e1435f61d517 (patch) | |
| tree | 4cd7b427ef85ce0cb2a36d6823690fafd1769614 /phpBB | |
| parent | 0a9ba5415c6ce1f69e50f9a7a77929d7ca0b06b8 (diff) | |
| download | forums-e6d87c5bc09e7f3d3813589f99a5e1435f61d517.tar forums-e6d87c5bc09e7f3d3813589f99a5e1435f61d517.tar.gz forums-e6d87c5bc09e7f3d3813589f99a5e1435f61d517.tar.bz2 forums-e6d87c5bc09e7f3d3813589f99a5e1435f61d517.tar.xz forums-e6d87c5bc09e7f3d3813589f99a5e1435f61d517.zip | |
[ticket/11795] Move find user JS to forum_fn
Move JavaScript from user search results to forum_fn.js
PHPBB3-11795
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/styles/prosilver/template/forum_fn.js | 46 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/memberlist_body.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/memberlist_search.html | 40 |
3 files changed, 48 insertions, 42 deletions
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index fc6c418b2e..7b88520f93 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -362,6 +362,52 @@ function im_contact(address) } /** +* Functions for user search popup +*/ +function insert_user(formId, value) +{ + var form = jQuery(formId), + formName = form.attr('data-form-name'), + fieldName = form.attr('data-field-name'), + item = opener.document.forms[formName][fieldName]; + + if (item.value.length && item.type == 'textarea') { + value = item.value + "\n" + value; + } + + item.value = value; +} + +function insert_marked_users(formId, users) +{ + if (typeof(users.length) == "undefined") + { + if (users.checked) + { + insert_user(formId, users.value); + } + } + else if (users.length > 0) + { + for (i = 0; i < users.length; i++) + { + if (users[i].checked) + { + insert_user(formId, users[i].value); + } + } + } + + self.close(); +} + +function insert_single_user(formId, user) +{ + insert_user(formId, user); + self.close(); +} + +/** * Run onload functions */ (function($) { diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html index 459c3f6bc6..46b35eae2c 100644 --- a/phpBB/styles/prosilver/template/memberlist_body.html +++ b/phpBB/styles/prosilver/template/memberlist_body.html @@ -1,7 +1,7 @@ <!-- IF S_IN_SEARCH_POPUP --> <!-- INCLUDE simple_header.html --> <!-- INCLUDE memberlist_search.html --> - <form method="post" id="results" action="{S_MODE_ACTION}" onsubmit="insert_marked(this.user); return false"> + <form method="post" id="results" action="{S_MODE_ACTION}" onsubmit="insert_marked_users('#results', this.user); return false;" data-form-name="{S_FORM_NAME}" data-field-name="{S_FIELD_NAME}"> <!-- ELSE --> <!-- INCLUDE overall_header.html --> @@ -109,7 +109,7 @@ <!-- ENDIF --> <tr class="<!-- IF memberrow.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->"> - <td><!-- IF memberrow.RANK_IMG --><span class="rank-img">{memberrow.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{memberrow.RANK_TITLE}</span><!-- ENDIF --><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><input type="checkbox" name="user" value="{memberrow.USERNAME}" /> <!-- ENDIF --><!-- EVENT memberlist_body_username_prepend -->{memberrow.USERNAME_FULL}<!-- EVENT memberlist_body_username_append --><!-- IF S_SELECT_SINGLE --><br />[ <a href="#" onclick="insert_single('{memberrow.A_USERNAME}'); return false;">{L_SELECT}</a> ]<!-- ENDIF --></td> + <td><!-- IF memberrow.RANK_IMG --><span class="rank-img">{memberrow.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{memberrow.RANK_TITLE}</span><!-- ENDIF --><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><input type="checkbox" name="user" value="{memberrow.USERNAME}" /> <!-- ENDIF --><!-- EVENT memberlist_body_username_prepend -->{memberrow.USERNAME_FULL}<!-- EVENT memberlist_body_username_append --><!-- IF S_IN_SEARCH_POPUP --><br />[ <a href="#" onclick="insert_single_user('#results', '{memberrow.A_USERNAME}'); return false;">{L_SELECT}</a> ]<!-- ENDIF --></td> <td class="posts"><!-- IF memberrow.POSTS and S_DISPLAY_SEARCH --><a href="{memberrow.U_SEARCH_USER}" title="{L_SEARCH_USER_POSTS}">{memberrow.POSTS}</a><!-- ELSE -->{memberrow.POSTS}<!-- ENDIF --></td> <td class="info"><!-- IF memberrow.U_WWW or memberrow.LOCATION --><!-- IF memberrow.U_WWW --><div><a href="{memberrow.U_WWW}" title="{L_VISIT_WEBSITE}{L_COLON} {memberrow.U_WWW}">{memberrow.U_SHORT_WWW}</a></div><!-- ENDIF --><!-- IF memberrow.LOCATION --><div>{memberrow.LOCATION}</div><!-- ENDIF --><!-- ELSE --> <!-- ENDIF --></td> <td>{memberrow.JOINED}</td> diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html index f9538ef2e2..0b04d0087c 100644 --- a/phpBB/styles/prosilver/template/memberlist_search.html +++ b/phpBB/styles/prosilver/template/memberlist_search.html @@ -1,43 +1,3 @@ -<!-- IF S_IN_SEARCH_POPUP --> -<!-- You should retain this javascript in your own template! --> -<script type="text/javascript"> -// <![CDATA[ -function insert_user(user) -{ - opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value = ( opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value.length && opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.type == "textarea" ) ? opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value + "\n" + user : user; -} - -function insert_marked(users) -{ - if (typeof(users.length) == "undefined") - { - if (users.checked) - { - insert_user(users.value); - } - } - else if (users.length > 0) - { - for (i = 0; i < users.length; i++) - { - if (users[i].checked) - { - insert_user(users[i].value); - } - } - } - - self.close(); -} - -function insert_single(user) -{ - opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value = user; - self.close(); -} -// ]]> -</script> -<!-- ENDIF --> <h2 class="solo">{L_FIND_USERNAME}</h2> <form method="post" action="{S_MODE_ACTION}" id="search_memberlist"> |