From d553f060303931120d40679dec17f348ead20ee5 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Wed, 13 Jun 2012 15:28:18 -0700
Subject: Clean up

---
 .../color/colorpanelpopup.reel/colorpanelpopup.html     | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'js/panels/color/colorpanelpopup.reel/colorpanelpopup.html')

diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
index f65d5bc0..5ad5c615 100755
--- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
+++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
@@ -16,7 +16,12 @@
             "owner": {
                 "prototype": "js/panels/Color/colorpanelpopup.reel[ColorPanelPopup]",
                 "properties": {
-                    "element": {"#": "cpp_popup"}
+                    "element": {"#": "cpp_popup"},
+                    "wheel": {"#": "cntnr_wheel"},
+                    "images": {"#": "cntnr_images"},
+                    "gradients": {"#": "cntnr_gradients"},
+                    "palettes": {"#": "cntnr_palettes"},
+                    "alpha": {"#": "cntnr_alpha"}
                 }
             }
         }
@@ -47,13 +52,13 @@
     		</div>
     		
     		<div class="cp_pu_content">
-    			<div class="cp_pu_wheel_container cp_pu_content_container"></div>
-    			<div class="cp_pu_gradient_container cp_pu_content_container"></div>
-    			<div class="cp_pu_palette_container cp_pu_content_container"></div>
-    			<div class="cp_pu_image_container cp_pu_content_container"></div>
+    			<div data-montage-id="cntnr_wheel" class="cp_pu_wheel_container cp_pu_content_container"></div>
+    			<div data-montage-id="cntnr_gradients" class="cp_pu_gradient_container cp_pu_content_container"></div>
+    			<div data-montage-id="cntnr_palettes" class="cp_pu_palette_container cp_pu_content_container"></div>
+    			<div data-montage-id="cntnr_images" class="cp_pu_image_container cp_pu_content_container"></div>
     		</div>
     		
-    		<div class="cp_pu_alpha">
+    		<div data-montage-id="cntnr_alpha" class="cp_pu_alpha">
     			<div class="cp_pu_a_label">Alpha</div>
     			<div class="cp_pu_a_slider"></div>
     			<input class="cp_pu_a_hottext"/>
-- 
cgit v1.2.3


From 708d6d4736cdb67bde5ecfb31b34e19d26eef611 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Thu, 14 Jun 2012 15:22:28 -0700
Subject: Cleaning up references

Still need to do more cleaning up.
---
 .../colorpanelpopup.reel/colorpanelpopup.html      | 33 ++++++++++++++--------
 1 file changed, 22 insertions(+), 11 deletions(-)

(limited to 'js/panels/color/colorpanelpopup.reel/colorpanelpopup.html')

diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
index 5ad5c615..596580b4 100755
--- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
+++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
@@ -21,7 +21,18 @@
                     "images": {"#": "cntnr_images"},
                     "gradients": {"#": "cntnr_gradients"},
                     "palettes": {"#": "cntnr_palettes"},
-                    "alpha": {"#": "cntnr_alpha"}
+                    "alpha": {"#": "cntnr_alpha"},
+                    "alphaSlider": {"#": "alpha_slider"},
+                    "alphaHottext": {"#": "alpha_hottext"},
+                    "btnPrevious": {"#": "btn_previous"},
+                    "btnCurrent": {"#": "btn_current"},
+                    "btnWheel": {"#": "btn_wheel"},
+                    "btnImage": {"#": "btn_images"},
+                    "btnGradient": {"#": "btn_gradients"},
+                    "btnPalette": {"#": "btn_palettes"},
+                    "btnNocolor": {"#": "btn_nocolor"},
+                    "inputHex": {"#": "input_hex"}
+                    
                 }
             }
         }
@@ -36,18 +47,18 @@
 	    		
 	    		<div class="cp_pu_history">
 	    			
-	    			<button class="cp_pu_color_previous">Previous Color</button>
-    				<button class="cp_pu_color_current">Current Color</button>
+	    			<button data-montage-id="btn_previous" class="cp_pu_color_previous">Previous Color</button>
+    				<button data-montage-id="btn_current" class="cp_pu_color_current">Current Color</button>
     				
    				</div>
 	    		
-	    		<div class="cp_pu_hex">#<input class="cp_pu_hottext_hex" maxlength="6" /></div>
+	    		<div data-montage-id="input_hex" class="cp_pu_hex">#<input class="cp_pu_hottext_hex" maxlength="6" /></div>
     			
-    			<button class="cp_pu_wheel" title="Color Wheel">Color Wheel</button>
-    			<button class="cp_pu_images" title="Background Image">Images</button>
-    			<button class="cp_pu_gradients" title="Gradient">Gradients</button>
-    			<button class="cp_pu_palettes" title="Color Palette">Palettes</button>
-    			<button class="cp_pu_nocolor" title="No Color">No Color</button>
+    			<button data-montage-id="btn_wheel" class="cp_pu_wheel" title="Color Wheel">Color Wheel</button>
+    			<button data-montage-id="btn_images" class="cp_pu_images" title="Background Image">Images</button>
+    			<button data-montage-id="btn_gradients" class="cp_pu_gradients" title="Gradient">Gradients</button>
+    			<button data-montage-id="btn_palettes" class="cp_pu_palettes" title="Color Palette">Palettes</button>
+    			<button data-montage-id="btn_nocolor" class="cp_pu_nocolor" title="No Color">No Color</button>
     			
     		</div>
     		
@@ -60,8 +71,8 @@
     		
     		<div data-montage-id="cntnr_alpha" class="cp_pu_alpha">
     			<div class="cp_pu_a_label">Alpha</div>
-    			<div class="cp_pu_a_slider"></div>
-    			<input class="cp_pu_a_hottext"/>
+    			<div data-montage-id="alpha_slider" class="cp_pu_a_slider"></div>
+    			<input data-montage-id="alpha_hottext" class="cp_pu_a_hottext"/>
     			<div class="cp_pu_a_label2">%</div>
     		</div>
     		
-- 
cgit v1.2.3