5 files changed, 18 insertions, 8 deletions
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
index 49d1179a..e8d5ef75 100755
--- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
+++ b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
@@ -366,6 +366,16 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
                    el = NJUtils.makeNJElement("div", "Feed Reader", "component");
                    el.elementModel.pi = "FeedReaderPi";
                    el.elementModel.isComponent = true;
+                case "picasa-carousel":
+                    el = NJUtils.makeNJElement("div", "Picasa Carousel", "component");
+                    el.elementModel.pi = "PicasaCarouselPi";
+                    el.elementModel.isComponent = true;
+                    break;
+                case "youtube-channel":
+                    el = NJUtils.makeNJElement("div", "Youtube Channel", "component");
+                    el.elementModel.pi = "YoutubeChannelPi";
+                    el.elementModel.isComponent = true;
+                    break;
            }
diff --git a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.html b/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.html
index 177eb068..4cb48733 100755
--- a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.html
+++ b/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.html
@@ -24,7 +24,7 @@
            },
            "picasa-carousel": {
-                "prototype": "montage/ui/google/picasa-carousel.reel",
+                "prototype": "montage/ui/picasa-carousel.reel",
                "properties": {
                    "element": {"#": "picasa-carousel"}
                },
@@ -51,7 +51,7 @@
                    "element": {"#": "searchButton"}
                }
            }
-                        
        }
diff --git a/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html
index e3d9c7a2..1e94f43b 100644
--- a/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html
+++ b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.html
@@ -9,7 +9,7 @@
    <script type="text/montage-serialization">
        {
            "owner": {
-                "module": "montage/ui/google/picasa-carousel.reel/image.reel",
+                "module": "montage/ui/picasa-carousel.reel/image.reel",
                "name": "Image",
                "properties": {
                    "element": {"#": "Image"}
diff --git a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html
index 73ccf076..fdb452d7 100755
--- a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html
+++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html
@@ -12,7 +12,7 @@
    <script type="text/montage-serialization">
    {
        "owner": {
-            "prototype": "montage/ui/google/picasa-carousel.reel",
+            "prototype": "montage/ui/picasa-carousel.reel",
            "properties": {
                "element": {"#": "montage-google-picasa-carousel"},
                "searchResultsList": {"@": "searchResultsList"}
@@ -29,7 +29,7 @@
                }
            },
            "image1": {
-                "prototype": "montage/ui/google/picasa-carousel.reel/image.reel",
+                "prototype": "montage/ui/picasa-carousel.reel/image.reel",
                "properties": {
                    "element": {"#": "image"}
                },
@@ -170,7 +170,7 @@
 </head>
 <body>
-    
    <div data-montage-id="montage-google-picasa-carousel" class="montage-google-picasa-carousel">
        <div id="flow" class="flow">
                <img id="image" class="image"/>
diff --git a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html
index b3858ec9..184ac360 100644
--- a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html
+++ b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html
@@ -10,14 +10,14 @@
    <script type="text/montage-serialization">
    {
        "player": {
-            "prototype": "ui/youtube-player.reel",
+            "prototype": "montage/ui/youtube-player.reel",
            "properties": {
                "element": {"#": "player"}
            }
        },
        "owner": {
-            "prototype": "youtube-channel.reel",
+            "prototype": "montage/ui/youtube-channel.reel",
            "properties": {
                "element": {"#": "container"},
                "player": {"@": "player"}