From e79a15f22a49a95f2749430fb60f58aa4f6dd448 Mon Sep 17 00:00:00 2001
From: Alexis Deveria <adeveria@gmail.com>
Date: Thu, 29 Jul 2010 15:22:09 +0000
Subject: [PATCH] Fixed bug in last revision where labels for imported images
 weren't showing

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1650 eee81c28-f429-11dd-99c0-75d572ba1ddd
---
 editor/svg-editor.html | 24 +++++++++++-------------
 editor/svg-editor.js   |  8 ++++----
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/editor/svg-editor.html b/editor/svg-editor.html
index cd69b312..46c063fb 100644
--- a/editor/svg-editor.html
+++ b/editor/svg-editor.html
@@ -225,17 +225,6 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
 
 	</div>
 
-	<div id="g_panel">
-		<div class="tool_sep"></div>
-		
-		<label id="group_title" title="Group identification label">
-			<span>label:</span>
-			<input id="g_title" data-attr="title" size="10" type="text"/>
-		</label>
-		
-		<div class="push_button" id="tool_ungroup" title="Ungroup Elements [G]"></div>
-	</div>
-
 	<div id="rect_panel">
 		<div class="toolset">
 			<label id="rect_width_tool" title="Change rectangle width">
@@ -361,14 +350,23 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
 
 	<!-- formerly gsvg_panel -->
 	<div id="container_panel">
+		<div class="tool_sep"></div>
+
 		<!-- Add viewBox field here? -->
+
+		<label id="group_title" title="Group identification label">
+			<span>label:</span>
+			<input id="g_title" data-attr="title" size="10" type="text"/>
+		</label>
 	</div>
 	
 	<div id="use_panel">
-		<div class="tool_sep"></div>
-		
 		<div class="push_button" id="tool_unlink_use" title="Break link to reference element (make unique)"></div>
 	</div>
+	
+	<div id="g_panel">
+		<div class="push_button" id="tool_ungroup" title="Ungroup Elements [G]"></div>
+	</div>
 
 	
 	<div id="path_node_panel">
diff --git a/editor/svg-editor.js b/editor/svg-editor.js
index c09127fd..e334cde5 100644
--- a/editor/svg-editor.js
+++ b/editor/svg-editor.js
@@ -1407,10 +1407,9 @@
 					
 					var el_name = elem.tagName;
 					
-					if($(elem).data('gsvg')) {
-						$('#container_panel').show();
-						$('#g_panel').show();
-					}
+// 					if($(elem).data('gsvg')) {
+// 						$('#g_panel').show();
+// 					}
 					
 					if(panels[el_name]) {
 						var cur_panel = panels[el_name];
@@ -1449,6 +1448,7 @@
 							setImageURL(href);
 						} // image
 						else if(el_name == 'g' || el_name == 'use') {
+							$('#container_panel').show();
 							var title = svgCanvas.getTitle();
 							$('#g_title').val(title);
 						}