Merge branch '1.0.x' into testing

js/util.js

@@ -273,7 +273,7 @@ var SN = { // StatusNet
                 },
                 success: function(data, textStatus) {
                     if (typeof($('form', data)[0]) != 'undefined') {
-                        var form_new = document._importNode($('form', data)[0], true);
+                        form_new = document._importNode($('form', data)[0], true);
                         form.replaceWith(form_new);
                         if (onSuccess) {
                             onSuccess();
@@ -693,7 +693,7 @@ var SN = { // StatusNet
                 nextStep();
             } else {
                 // Hide the placeholder...
-                placeholder = list.find('li.notice-reply-placeholder').hide();
+                var placeholder = list.find('li.notice-reply-placeholder').hide();
 
                 // Create the reply form entry at the end
                 var replyItem = $('li.notice-reply', list);
@@ -701,10 +701,11 @@ var SN = { // StatusNet
                     replyItem = $('<li class="notice-reply"></li>');
 
                     var intermediateStep = function(formMaster) {
-                        replyItem.append(formMaster);
+                        var formEl = document._importNode(formMaster, true);
+                        replyItem.append(formEl);
                         list.append(replyItem); // *after* the placeholder
 
-                        var form = replyForm = formMaster;
+                        var form = replyForm = $(formEl);
                         SN.Init.NoticeFormSetup(form);
 
                         nextStep();
@@ -719,8 +720,8 @@ var SN = { // StatusNet
                         // @fixme this fallback may or may not work
                         var url = $('#form_notice').attr('action');
                         $.get(url, {ajax: 1}, function(data, textStatus, xhr) {
-                            intermediateStep($('form', $(data).children()));
+                            intermediateStep($('form', data)[0]);
-                        }, 'xml');
+                        });
                     }
                 }
             }
@@ -759,11 +760,11 @@ var SN = { // StatusNet
                     var url = $(this).attr('href');
                     var area = $(this).closest('.threaded-replies');
                     $.get(url, {ajax: 1}, function(data, textStatus, xhr) {
-                        var replies = $('.threaded-replies', $(data).children());
+                        var replies = $('.threaded-replies', data);
                         if (replies.length) {
-                            area.replaceWith(replies);
+                            area.replaceWith(document._importNode(replies[0], true));
                         }
-                    }, 'xml');
+                    });
                     return false;
                 });
         },
@@ -1266,7 +1267,7 @@ var SN = { // StatusNet
                 if (NDMF.length === 0) {
                     $(this).addClass(SN.C.S.Processing);
                     $.get(NDM.attr('href'), null, function(data) {
-                        $('.entity_send-a-message').append($('form', $(data).children()));
+                        $('.entity_send-a-message').append(document._importNode($('form', data)[0], true));
                         NDMF = $('.entity_send-a-message .form_notice');
                         SN.U.FormNoticeXHR(NDMF);
                         SN.U.FormNoticeEnhancements(NDMF);
@@ -1276,7 +1277,7 @@ var SN = { // StatusNet
                             return false;
                         });
                         NDM.removeClass(SN.C.S.Processing);
-                    }, 'xml');
+                    });
                 }
                 else {
                     NDMF.show();
@@ -1513,7 +1514,7 @@ var SN = { // StatusNet
             if ($('body.user_in').length > 0) {
                 var masterForm = $('.form_notice:first');
                 if (masterForm.length > 0) {
-                    SN.C.I.NoticeFormMaster = masterForm;
+                    SN.C.I.NoticeFormMaster = document._importNode(masterForm[0], true);
                 }
                 SN.U.NoticeRepeat();
                 SN.U.NoticeReply();

theme/neo/css/display.css

@@ -1326,48 +1326,82 @@ ul.bookmark-tags a:hover {
 
 /* Onboard specific styles */
 
-.onboard-flash {
+#cboxOverlay{
-    position: relative;
+    background: url(../images/lightbox_bg.png) repeat 0 0 !important;
-    right: -800px;
-    top: 10px;
-    border-radius: 6px;
- 	-moz-border-radius: 6px;
-   	-webkit-border-radius: 6px;
-    font-size: 1.1em;
-    box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.5);
-    -moz-box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.5);
-    -webkit-box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.5);
 }
 
-.onboard-flash p {
+#cboxContent{
+    background: #fff url(../logo.png) no-repeat 10px bottom !important;
+}
+
+.onboard_iframe {
+    background: none;
+    padding: 10px;
+}
+
+.onboard_welcome p {
     margin-bottom: 10px;
 }
 
-.onboard-flash .next:before {
+.onboard_welcome ul {
-    content: '\00BB';
+    list-style-type: none;
-    padding-right: 6px;
+    margin-bottom: 10px;
 }
 
-.onboard-breadcrumbs {
+.onboard_welcome ul li {
-    margin-bottom: 16px !important;
+    background: url(../images/resultset_next.png) no-repeat 0px 3px;
+    padding-left: 20px;
+    margin-left: 10px;
 }
 
-.onboard-breadcrumbs li {
+#aside_primary #onboard_section {
-    background: none !important;
+    background: #f2f2f2;
-    border-top: none !important;
+    width: 198px;
-    padding: 6px 12px 2px 0px !important;
+    padding: 10px;
+    border-radius: 4px;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    border: 1px solid #516499;
+    background: #fafafa;
 }
 
-.onboard-breadcrumbs li:last-child {
+#onboard_section H2 {
-    padding-right: 0px !important;
+    -webkit-border-top-left-radius: 4px;
+    -moz-border-radius-topleft: 4px;
+    border-top-left-radius: 4px;
+    -webkit-border-top-right-radius: 4px;
+    -moz-border-radius-topright: 4px;
+    border-top-right-radius: 4px;
+    position: relative;
+    top: -11px;
+    left: -11px;
+    padding: 2px 0px 2px 10px;
+    margin-right: -22px;
+    margin-bottom: 5px;
+    color: #fff;
+    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
+    background: #364A84;
+    background: -moz-linear-gradient(top, #516499 , #364a84);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#516499), color-stop(100%,#364a84));
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#516499', endColorstr='#364a84',GradientType=0 );
 }
 
-.onboard-breadcrumbs a {
+#onboard_section ul {
-    text-decoration: none;
+    list-style-type: none;
 }
 
-.onboard-breadcrumbs a:hover {
+#onboard_section .onboard-step-incomplete {
-    color: #3e3e8c !important;
+    background: url(../images/resultset_next.png) no-repeat 0px 1px;
+    padding-left: 20px;
+    margin-bottom: 10px;
+}
+
+#onboard_section .onboard-step-complete {
+    background: url(../images/tick.png) no-repeat 0px 1px;
+    padding-left: 20px;
+    margin-bottom: 10px;
+    text-decoration: line-through;
+    color: #555;
 }
 
 /* Billing specific styles */