From bb0297380062d66767178d3b154bdba37b1e358f Mon Sep 17 00:00:00 2001
From: pherum83 <pherum83@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Fri, 9 Dec 2011 00:46:26 +0000
Subject: [PATCH] r336
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Перенос аяксовых админ функций в выпадающее меню git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@336 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/config.php                             |  4 +--
 .../templates/default/usercp_viewprofile.tpl  | 25 +++++++++----------
 upload/templates/default/viewonline.tpl       |  2 +-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/upload/config.php b/upload/config.php
index b7e1ce88e..f5c1bbfa6 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -63,8 +63,8 @@ $bb_cfg = $tr_cfg = $page_cfg = array();
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.4 (beta)';
-$bb_cfg['tp_release_state'] = 'R335';
-$bb_cfg['tp_release_date'] = '06-12-2011';
+$bb_cfg['tp_release_state'] = 'R336';
+$bb_cfg['tp_release_date'] = '09-12-2011';
 
 // Database
 $charset  = 'utf8';
diff --git a/upload/templates/default/usercp_viewprofile.tpl b/upload/templates/default/usercp_viewprofile.tpl
index 60d3da591..5ed653f96 100644
--- a/upload/templates/default/usercp_viewprofile.tpl
+++ b/upload/templates/default/usercp_viewprofile.tpl
@@ -228,9 +228,19 @@ ajax.callback.mod_action = function(data) {
 				<td id="user_regdate">
 					<span class="editable bold">{USER_REGDATE}</span>
 					<!-- IF IS_ADMIN -->
-					[ <a href="#" onclick="ajax.exec({action : 'manage_user', mode: '<!-- IF USER_ACTIVE -->user_deactivate<!-- ELSE -->user_activate<!-- ENDIF -->', user_id : {PROFILE_USER_ID}}); return false;" class="<!-- IF USER_ACTIVE -->adm<!-- ELSE -->seed bold<!-- ENDIF -->"><!-- IF USER_ACTIVE -->{L_USER_DEACTIVATE}<!-- ELSE -->{L_USER_ACTIVATE}<!-- ENDIF --></a> ]&nbsp;
-					[ <a href="#" onclick="ajax.exec({action : 'manage_user', mode: 'delete_profile', user_id : '{PROFILE_USER_ID}'}); return false;" class="adm">{L_USER_DELETE_EXPLAIN}</a> ]
+					[ <a href="#admin" class="menu-root menu-alt1"><span class="adm">{L_MANAGE_USER}</span></a> ]
+		            <div class="menu-sub row1 border bw_TRBL" id="admin">
+			            <fieldset class="mrg_6">
+			            <div class="tLeft" style="padding: 5px 6px 6px; display: block; font-size: 13px;">
+				            <a href="#" onclick="ajax.exec({action : 'manage_user', mode: '<!-- IF USER_ACTIVE -->user_deactivate<!-- ELSE -->user_activate<!-- ENDIF -->', user_id : {PROFILE_USER_ID}}); return false;" class="<!-- IF USER_ACTIVE -->adm<!-- ELSE -->seed bold<!-- ENDIF -->"><!-- IF USER_ACTIVE -->{L_USER_DEACTIVATE}<!-- ELSE -->{L_USER_ACTIVATE}<!-- ENDIF --></a> <br />
+					        <a href="#" onclick="ajax.exec({action : 'manage_user', mode: 'delete_profile', user_id : '{PROFILE_USER_ID}'}); return false;" class="adm">{L_USER_DELETE_EXPLAIN}</a> <br />
+							<a href="#" onclick="ajax.exec({action : 'manage_user', mode: 'delete_topics', user_id : '{PROFILE_USER_ID}'}); return false;" class="adm">{L_DELETE_USER_ALL_POSTS}</a> <br />
+                            <a href="#" onclick="ajax.exec({action : 'manage_user', mode: 'delete_message', user_id : '{PROFILE_USER_ID}'}); return false;" class="adm">{L_DELETE_USER_POSTS}</a> <br />
+			            </div>
+			            </fieldset>
+		            </div>
 					<!-- ENDIF -->
+					<!-- IF IS_AM -->[ <a href="#" class="adm" onclick="ajax.mod_action('profile_ip'); return false;">{L_IP_ADDRESS}</a> ]<!-- ENDIF -->
 				</td>
 			</tr>
 			<tr>
@@ -252,21 +262,10 @@ ajax.callback.mod_action = function(data) {
 						[ <a href="{U_SEARCH_USER}" class="med">{L_SEARCH_USER_POSTS}</a> ]
 						[ <a href="{U_SEARCH_TOPICS}" class="med">{L_SEARCH_USER_TOPICS}</a> ]
 						[ <a class="med" href={U_SEARCH_RELEASES}>{L_SEARCH_RELEASES}</a> ]
-						<!-- IF IS_AM -->[ <a href="#" class="adm" onclick="ajax.mod_action('profile_ip'); return false;">{L_IP_ADDRESS}</a> ]<!-- ENDIF -->
-						<!-- IF IS_ADMIN -->[ <a href="#" onclick="toggle_block('delete'); return false;" class="adm">{L_USER_DELETE}</a> ]<!-- ENDIF -->
 					</p>
 				</td>
 			</tr>
 
-			<!-- IF IS_ADMIN -->
-			<tr id="delete" style="display: none;">
-			    <td colspan="2" class="med tCenter">
-					[ <a href="#" onclick="ajax.exec({action : 'manage_user', mode: 'delete_topics', user_id : '{PROFILE_USER_ID}'}); return false;" class="adm">{L_DELETE_USER_ALL_POSTS}</a> ]&nbsp;
-                    [ <a href="#" onclick="ajax.exec({action : 'manage_user', mode: 'delete_message', user_id : '{PROFILE_USER_ID}'}); return false;" class="adm">{L_DELETE_USER_POSTS}</a> ]
-			    </td>
-		    </tr>
-			<!-- ENDIF -->
-
 			<!-- IF LOCATION -->
 			<tr>
 				<th class="vBottom">{L_LOCATION}:</th>
diff --git a/upload/templates/default/viewonline.tpl b/upload/templates/default/viewonline.tpl
index e7b299c18..a9cdf922c 100644
--- a/upload/templates/default/viewonline.tpl
+++ b/upload/templates/default/viewonline.tpl
@@ -26,7 +26,7 @@
 <tr class="{guest_user_row.ROW_CLASS}">
 	<td>{guest_user_row.USER}</td>
 	<td class="tCenter">{guest_user_row.LASTUPDATE}</td>
-	<!-- IF ADMIN --><td class="tCenter"><a href="{guest_user_row.U_WHOIS_IP}" class="gen" target="_blank">{guest_user_row.USERIP}</a></td><!-- ENDIF -->
+	<!-- IF IS_ADMIN --><td class="tCenter"><a href="{guest_user_row.U_WHOIS_IP}" class="gen" target="_blank">{guest_user_row.USERIP}</a></td><!-- ENDIF -->
 </tr>
 <!-- END guest_user_row -->
 </tfoot>