Integrating picasa carousel and youtube channel

12 files changed, 50 insertions, 9 deletions

diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
index 92d21bc3..49d1179a 100755
--- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
+++ b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
@@ -26,19 +26,29 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
                     "text": "Widgets",
                     "children": [
                         {
+                            "text": "Feed Reader",
+                            "dataFile" : "node_modules/components-data/feed-reader.json",
+                            "component": "feedreader"
+                        },
+                        {
                             "text": "Map",
                             "dataFile" : "node_modules/components-data/map.json",
                             "component": "map"
                         },
                         {
-                            "text": "Feed Reader",
-                            "dataFile" : "node_modules/components-data/feed-reader.json",
-                            "component": "feedreader"
+                            "text": "Picasa Carousel",
+                            "dataFile" : "node_modules/components-data/picasa-carousel.json",
+                            "component": "picasa-carousel"
                         },
                         {
                             "text": "Search Bar",
                             "dataFile" : "node_modules/components-data/searchfield.json",
                             "component": "searchfield"
+                        },
+                        {
+                            "text": "Youtube Channel",
+                            "dataFile" : "node_modules/components-data/youtube-channel.json",
+                            "component": "youtube-channel"
                         }
                     ]
                 },
diff --git a/node_modules/components-data/map.json b/node_modules/components-data/map.json
index 071fa73a..796b2fad 100644
--- a/node_modules/components-data/map.json
+++ b/node_modules/components-data/map.json
@@ -9,13 +9,13 @@
         {
             "name": "category",
             "type": "string",
-            "default": null,
+            "default": "",
             "possibleValues": ["restaurant", "hospital", "cafe", "museum"]
         },
         {
             "name": "center",
             "type": "string",
-            "default": null
+            "default": ""
         }
 
     ]
diff --git a/node_modules/components-data/picasa-carousel.json b/node_modules/components-data/picasa-carousel.json
new file mode 100644
index 00000000..34fe0e8f
--- /dev/null
+++ b/node_modules/components-data/picasa-carousel.json
@@ -0,0 +1,15 @@
+{
+    "component": "picasa-carousel",
+
+    "module": "montage/ui/picasa-carousel.reel",
+
+    "name": "PicasaCarousel",
+
+    "properties": [
+        {
+            "name": "queryParameter",
+            "type": "string",
+            "default": ""
+        }
+    ]
+}
\ No newline at end of file
diff --git a/node_modules/components-data/youtube-channel.json b/node_modules/components-data/youtube-channel.json
new file mode 100644
index 00000000..8affffba
--- /dev/null
+++ b/node_modules/components-data/youtube-channel.json
@@ -0,0 +1,16 @@
+{
+    "component": "youtube-channel",
+
+    "module": "montage/ui/youtube-channel.reel",
+
+    "name": "YoutubeChannel",
+
+    "properties": [
+        {
+            "name": "channelUrl",
+            "type": "string",
+            "default": ""
+        }
+
+    ]
+}
\ No newline at end of file
diff --git a/node_modules/montage/examples/youtube-channel-example/index.html b/node_modules/montage/examples/youtube-channel-example/index.html
index 71baba29..b313d5d8 100755
--- a/node_modules/montage/examples/youtube-channel-example/index.html
+++ b/node_modules/montage/examples/youtube-channel-example/index.html
@@ -12,7 +12,7 @@
     <script type="text/montage-serialization">
     {
         "player": {
-            "prototype": "youtube-channel.reel",
+            "prototype": "montage/ui/youtube-channel.reel",
             "properties": {
                 "element": {"#": "player"}
             }
diff --git a/node_modules/montage/ui/google/picasa-carousel.reel/image.reel/image.html b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html
index e3d9c7a2..e3d9c7a2 100644
--- a/node_modules/montage/ui/google/picasa-carousel.reel/image.reel/image.html
+++ b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html
diff --git a/node_modules/montage/ui/google/picasa-carousel.reel/image.reel/image.js b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.js
index 0bced41b..0bced41b 100644
--- a/node_modules/montage/ui/google/picasa-carousel.reel/image.reel/image.js
+++ b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.js
diff --git a/node_modules/montage/ui/google/picasa-carousel.reel/picasa-carousel.css b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css
index cab6d1bb..cab6d1bb 100755
--- a/node_modules/montage/ui/google/picasa-carousel.reel/picasa-carousel.css
+++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.css
diff --git a/node_modules/montage/ui/google/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html
index 73ccf076..73ccf076 100755
--- a/node_modules/montage/ui/google/picasa-carousel.reel/picasa-carousel.html
+++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html
diff --git a/node_modules/montage/ui/google/picasa-carousel.reel/picasa-carousel.js b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js
index 25d363b0..25d363b0 100644
--- a/node_modules/montage/ui/google/picasa-carousel.reel/picasa-carousel.js
+++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js
diff --git a/node_modules/montage/examples/youtube-channel-example/youtube-channel.reel/youtube-channel.html b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html
index 8514f5ce..b3858ec9 100644
--- a/node_modules/montage/examples/youtube-channel-example/youtube-channel.reel/youtube-channel.html
+++ b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html
@@ -10,7 +10,7 @@
     <script type="text/montage-serialization">
     {
         "player": {
-            "prototype": "montage/ui/youtube-player.reel",
+            "prototype": "ui/youtube-player.reel",
             "properties": {
                 "element": {"#": "player"}
             }
diff --git a/node_modules/montage/examples/youtube-channel-example/youtube-channel.reel/youtube-channel.js b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.js
index 1f5aa2d1..fd642290 100644
--- a/node_modules/montage/examples/youtube-channel-example/youtube-channel.reel/youtube-channel.js
+++ b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.js
@@ -5,8 +5,8 @@
  </copyright> */
 /*global require,exports*/
 var Montage = require("montage").Montage,
-    Component = require("montage/ui/component").Component,
-    Uuid = require("montage/core/uuid").Uuid;
+    Component = require("ui/component").Component,
+    Uuid = require("core/uuid").Uuid;
 
 
 var YoutubeChannel = exports.YoutubeChannel = Montage.create(Component, {