Index: branches/5.0.x/core/kernel/nparser/nparser.php
===================================================================
diff -u -r12277 -r12298
--- branches/5.0.x/core/kernel/nparser/nparser.php	(.../nparser.php)	(revision 12277)
+++ branches/5.0.x/core/kernel/nparser/nparser.php	(.../nparser.php)	(revision 12298)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: nparser.php 12277 2009-08-12 14:15:49Z alex $
+* @version	$Id: nparser.php 12298 2009-08-16 21:11:28Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -534,42 +534,21 @@
 //		$prepend = '[name: ' . $block_params['name'] . '] [params: ' . implode(', ', array_keys($block_params)) . ']';
 
 		$decorate = false;
+		$design = false;
 
-		if ($is_template) {
-			// content inside pair RenderElement tag
-//			$prepend = '<strong>CONTENT_OF_DESIGN:</strong> ' . $prepend;
+		if (EDITING_MODE == EDITING_MODE_DESIGN) {
+			$decorate = true;
 
-			if (EDITING_MODE == EDITING_MODE_INSIDES) {
-				$decorate = true;
+			if ($is_template) {
+				// content inside pair RenderElement tag
 			}
-		}
-		else {
-			if (strpos($block_params['name'], '__capture_') === 0) {
-				// capture tag (usually inside pair RenderElement)
-//				$prepend = '<strong>CAPTURE:</strong> ' . $prepend;
-
-				if (EDITING_MODE == EDITING_MODE_INSIDES) {
-					$decorate = true;
-				}
-			}
-			elseif (array_key_exists('content', $block_params)) {
-				// pair RenderElement (on template, were it's used)
-//				$prepend = '<strong>PAIR_RENDER_ELEMENT:</strong> ' . $prepend;
-
-				if (EDITING_MODE == EDITING_MODE_DESIGN) {
-					$decorate = true;
-				}
-			}
 			else {
-				// non-pair RenderElement
-//				$prepend = '<strong>SINGLE_RENDER_ELEMENT:</strong> ' . $prepend;
-
-				if (EDITING_MODE == EDITING_MODE_INSIDES) {
-					$decorate = true;
+				if (strpos($block_params['name'], '__capture_') === 0) {
+					// capture tag (usually inside pair RenderElement)
 				}
-
-				if (array_key_exists('layout_view', $block_params) && $block_params['layout_view'] && (EDITING_MODE == EDITING_MODE_LAYOUT)) {
-					$decorate = true;
+				elseif (array_key_exists('content', $block_params)) {
+					// pair RenderElement (on template, were it's used)
+					$design = true;
 				}
 			}
 		}
@@ -584,6 +563,14 @@
 		$block_name = $block_params['name'];
 		$function_name = $is_template ? $block_name : $this->Elements[$block_name];
 
+		$block_title = '';
+		if (array_key_exists($function_name, $this->Application->Parser->ElementLocations)) {
+			$element_location = $this->Application->Parser->ElementLocations[$function_name];
+
+			$block_title .= $element_location['template'] . '.tpl';
+			$block_title .= ' (' . $element_location['start_pos'] . ' - ' . $element_location['end_pos'] . ')';
+		}
+
 		// ensure unique id for every div (used from print lists)
 		$container_num = 1;
 		$container_id = 'parser_block[' . $function_name . ']';
@@ -597,14 +584,24 @@
 		// prepare parameter string
 		$param_string = $block_name . ':' . $function_name;
 
+		if ($design) {
+			$btn_text = 'Edit design';
+			$btn_class = 'cms-edit-design-btn';
+			$btn_container_class = 'block-edit-design-btn-container';
+		}
+		else {
+			$btn_text = 'Edit block';
+			$btn_class = 'cms-edit-block-btn';
+			$btn_container_class = 'block-edit-block-btn-container';
+		}
 
 		$block_editor = '
-			<div id="' . $container_id . '" params="' . $param_string . '" class="block-edit-btn-container">
-				<div class="cms-edit-btn">
+			<div id="' . $container_id . '" params="' . $param_string . '" class="' . $btn_container_class . '" title="' . htmlspecialchars($block_title) . '">
+				<div class="' . $btn_class . '">
 					<div class="cms-btn-image">
 						<img src="' . $base_url . 'core/admin_templates/img/top_frame/icons/content_mode.gif" width="15" height="16" alt=""/>
 					</div>
-					<div class="cms-btn-text" id="' . $container_id . '_btn">Edit</div>
+					<div class="cms-btn-text" id="' . $container_id . '_btn">' . $btn_text . '</div>
 				</div>
 				<div class="cms-btn-content">
 					%s