X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=js%2Futil.js;h=c22802651a1f270eae9ba4a7714f0ceabf04e239;hb=ec53e68cf2490fe3a9ed74914c0c96d31cabe8c0;hp=b2e28f275362f34f5b622998b00e665fdc11a9ec;hpb=e6c972ebcb1a42e315f6b9df9f88b0e15687c3aa;p=quix0rs-gnu-social.git

diff --git a/js/util.js b/js/util.js
index b2e28f2753..c22802651a 100644
--- a/js/util.js
+++ b/js/util.js
@@ -31,7 +31,8 @@ var SN = { // StatusNet
             CounterBlackout: false,
             MaxLength: 140,
             PatternUsername: /^[0-9a-zA-Z\-_.]*$/,
-            HTTP20x30x: [200, 201, 202, 203, 204, 205, 206, 300, 301, 302, 303, 304, 305, 306, 307]
+            HTTP20x30x: [200, 201, 202, 203, 204, 205, 206, 300, 301, 302, 303, 304, 305, 306, 307],
+            NoticeFormMaster: null // to be cloned from the one at top
         },
 
         /**
@@ -50,17 +51,6 @@ var SN = { // StatusNet
             Processing: 'processing',
             CommandResult: 'command_result',
             FormNotice: 'form_notice',
-            NoticeDataText: 'notice_data-text',
-            NoticeTextCount: 'notice_text-count',
-            NoticeInReplyTo: 'notice_in-reply-to',
-            NoticeDataAttach: 'notice_data-attach',
-            NoticeDataAttachSelected: 'notice_data-attach_selected',
-            NoticeActionSubmit: 'notice_action-submit',
-            NoticeLat: 'notice_data-lat',
-            NoticeLon: 'notice_data-lon',
-            NoticeLocationId: 'notice_data-location_id',
-            NoticeLocationNs: 'notice_data-location_ns',
-            NoticeGeoName: 'notice_data-geo_name',
             NoticeDataGeo: 'notice_data-geo',
             NoticeDataGeoCookie: 'NoticeDataGeo',
             NoticeDataGeoSelected: 'notice_data-geo_selected',
@@ -106,7 +96,7 @@ var SN = { // StatusNet
          */
         FormNoticeEnhancements: function(form) {
             if (jQuery.data(form[0], 'ElementData') === undefined) {
-                MaxLength = form.find('#'+SN.C.S.NoticeTextCount).text();
+                MaxLength = form.find('.count').text();
                 if (typeof(MaxLength) == 'undefined') {
                      MaxLength = SN.C.I.MaxLength;
                 }
@@ -114,7 +104,7 @@ var SN = { // StatusNet
 
                 SN.U.Counter(form);
 
-                NDT = form.find('#'+SN.C.S.NoticeDataText);
+                NDT = form.find('.notice_data-text:first');
 
                 NDT.bind('keyup', function(e) {
                     SN.U.Counter(form);
@@ -132,41 +122,10 @@ var SN = { // StatusNet
                 // Note there's still no event for mouse-triggered 'delete'.
                 NDT.bind('cut', delayedUpdate)
                    .bind('paste', delayedUpdate);
-
-                NDT.bind('keydown', function(e) {
-                    SN.U.SubmitOnReturn(e, form);
-                });
             }
             else {
-                form.find('#'+SN.C.S.NoticeTextCount).text(jQuery.data(form[0], 'ElementData').MaxLength);
-            }
-
-            if ($('body')[0].id != 'conversation' && window.location.hash.length === 0 && $(window).scrollTop() == 0) {
-                form.find('textarea').focus();
-            }
-        },
-
-        /**
-         * To be called from keydown event handler on the notice import form.
-         * Checks if return or enter key was pressed, and if so attempts to
-         * submit the form and cancel standard processing of the enter key.
-         *
-         * @param {Event} event
-         * @param {jQuery} el: jQuery object whose first element is the notice posting form
-         *
-         * @return {boolean} whether to cancel the event? Does this actually pass through?
-         * @access private
-         */
-        SubmitOnReturn: function(event, el) {
-            if (event.keyCode == 13 || event.keyCode == 10) {
-                el.submit();
-                event.preventDefault();
-                event.stopPropagation();
-                $('#'+el[0].id+' #'+SN.C.S.NoticeDataText).blur();
-                $('body').focus();
-                return false;
+                form.find('.count').text(jQuery.data(form[0], 'ElementData').MaxLength);
             }
-            return true;
         },
 
         /**
@@ -193,7 +152,7 @@ var SN = { // StatusNet
             }
 
             var remaining = MaxLength - SN.U.CharacterCount(form);
-            var counter = form.find('#'+SN.C.S.NoticeTextCount);
+            var counter = form.find('.count');
 
             if (remaining.toString() != counter.text()) {
                 if (!SN.C.I.CounterBlackout || remaining === 0) {
@@ -224,7 +183,7 @@ var SN = { // StatusNet
          * @return number of chars
          */
         CharacterCount: function(form) {
-            return form.find('#'+SN.C.S.NoticeDataText).val().length;
+            return form.find('.notice_data-text:first').val().length;
         },
 
         /**
@@ -269,15 +228,19 @@ var SN = { // StatusNet
          * will be extracted and copied in, replacing the original form.
          * If there's no form, the first paragraph will be used.
          *
+         * This will automatically be applied on the 'submit' event for
+         * any form with the 'ajax' class.
+         *
          * @fixme can sometimes explode confusingly if returnd data is bogus
          * @fixme error handling is pretty vague
          * @fixme can't submit file uploads
          *
          * @param {jQuery} form: jQuery object whose first element is a form
+         * @param function onSuccess: something extra to do on success
          *
          * @access public
          */
-        FormXHR: function(form) {
+        FormXHR: function(form, onSuccess) {
             $.ajax({
                 type: 'POST',
                 dataType: 'xml',
@@ -291,15 +254,39 @@ var SN = { // StatusNet
                             .attr(SN.C.S.Disabled, SN.C.S.Disabled);
                 },
                 error: function (xhr, textStatus, errorThrown) {
-                    alert(errorThrown || textStatus);
+                    // If the server end reported an error from StatusNet,
+                    // find it -- otherwise we'll see what was reported
+                    // from the browser.
+                    var errorReported = null;
+                    if (xhr.responseXML) {
+                        errorReported = $('#error', xhr.responseXML).text();
+                    }
+                    alert(errorReported || errorThrown || textStatus);
+
+                    // Restore the form to original state.
+                    // Hopefully. :D
+                    form
+                        .removeClass(SN.C.S.Processing)
+                        .find('.submit')
+                            .removeClass(SN.C.S.Disabled)
+                            .removeAttr(SN.C.S.Disabled);
                 },
                 success: function(data, textStatus) {
                     if (typeof($('form', data)[0]) != 'undefined') {
                         form_new = document._importNode($('form', data)[0], true);
                         form.replaceWith(form_new);
+                        if (onSuccess) {
+                            onSuccess();
+                        }
                     }
-                    else {
+                    else if (typeof($('p', data)[0]) != 'undefined') {
                         form.replaceWith(document._importNode($('p', data)[0], true));
+                        if (onSuccess) {
+                            onSuccess();
+                        }
+                    }
+                    else {
+                        alert('Unknown error.');
                     }
                 }
             });
@@ -365,46 +352,24 @@ var SN = { // StatusNet
                 dataType: 'xml',
                 timeout: '60000',
                 beforeSend: function(formData) {
-                    if (form.find('#'+SN.C.S.NoticeDataText)[0].value.length === 0) {
+                    if (form.find('.notice_data-text:first').val() == '') {
                         form.addClass(SN.C.S.Warning);
                         return false;
                     }
                     form
                         .addClass(SN.C.S.Processing)
-                        .find('#'+SN.C.S.NoticeActionSubmit)
+                        .find('.submit')
                             .addClass(SN.C.S.Disabled)
                             .attr(SN.C.S.Disabled, SN.C.S.Disabled);
 
-                    SN.C.I.NoticeDataGeo.NLat = $('#'+SN.C.S.NoticeLat).val();
-                    SN.C.I.NoticeDataGeo.NLon = $('#'+SN.C.S.NoticeLon).val();
-                    SN.C.I.NoticeDataGeo.NLNS = $('#'+SN.C.S.NoticeLocationNs).val();
-                    SN.C.I.NoticeDataGeo.NLID = $('#'+SN.C.S.NoticeLocationId).val();
-                    SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked');
-
-                    cookieValue = $.cookie(SN.C.S.NoticeDataGeoCookie);
-
-                    if (cookieValue !== null && cookieValue != 'disabled') {
-                        cookieValue = JSON.parse(cookieValue);
-                        SN.C.I.NoticeDataGeo.NLat = $('#'+SN.C.S.NoticeLat).val(cookieValue.NLat).val();
-                        SN.C.I.NoticeDataGeo.NLon = $('#'+SN.C.S.NoticeLon).val(cookieValue.NLon).val();
-                        if ($('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)) {
-                            SN.C.I.NoticeDataGeo.NLNS = $('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();
-                            SN.C.I.NoticeDataGeo.NLID = $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val();
-                        }
-                    }
-                    if (cookieValue == 'disabled') {
-                        SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', false).attr('checked');
-                    }
-                    else {
-                        SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', true).attr('checked');
-                    }
+                    SN.U.normalizeGeoData(form);
 
                     return true;
                 },
                 error: function (xhr, textStatus, errorThrown) {
                     form
                         .removeClass(SN.C.S.Processing)
-                        .find('#'+SN.C.S.NoticeActionSubmit)
+                        .find('.submit')
                             .removeClass(SN.C.S.Disabled)
                             .removeAttr(SN.C.S.Disabled, SN.C.S.Disabled);
                     removeFeedback();
@@ -421,7 +386,7 @@ var SN = { // StatusNet
                             if (parseInt(xhr.status) === 0 || jQuery.inArray(parseInt(xhr.status), SN.C.I.HTTP20x30x) >= 0) {
                                 form
                                     .resetForm()
-                                    .find('#'+SN.C.S.NoticeDataAttachSelected).remove();
+                                    .find('.attach-status').remove();
                                 SN.U.FormNoticeEnhancements(form);
                             }
                             else {
@@ -450,10 +415,29 @@ var SN = { // StatusNet
                         else {
                             // New notice post was successful. If on our timeline, show it!
                             var notice = document._importNode($('li', data)[0], true);
-                            var notices = $('#notices_primary .notices');
-                            if (notices.length > 0 && SN.U.belongsOnTimeline(notice)) {
+                            var notices = $('#notices_primary .notices:first');
+                            var replyItem = form.closest('li.notice-reply');
+
+                            if (replyItem.length > 0) {
+                                // If this is an inline reply, remove the form...
+                                var list = form.closest('.threaded-replies');
+                                var placeholder = list.find('.notice-reply-placeholder');
+                                replyItem.remove();
+
+                                var id = $(notice).attr('id');
+                                if ($("#"+id).length == 0) {
+                                    $(notice).insertBefore(placeholder);
+                                } else {
+                                    // Realtime came through before us...
+                                }
+
+                                // ...and show the placeholder form.
+                                placeholder.show();
+                            } else if (notices.length > 0 && SN.U.belongsOnTimeline(notice)) {
+                                // Not a reply. If on our timeline, show it at the top!
+
                                 if ($('#'+notice.id).length === 0) {
-                                    var notice_irt_value = $('#'+SN.C.S.NoticeInReplyTo).val();
+                                    var notice_irt_value = form.find('[name=inreplyto]').val();
                                     var notice_irt = '#notices_primary #notice-'+notice_irt_value;
                                     if($('body')[0].id == 'conversation') {
                                         if(notice_irt_value.length > 0 && $(notice_irt+' .notices').length < 1) {
@@ -468,39 +452,135 @@ var SN = { // StatusNet
                                         .css({display:'none'})
                                         .fadeIn(2500);
                                     SN.U.NoticeWithAttachment($('#'+notice.id));
-                                    SN.U.NoticeReplyTo($('#'+notice.id));
+                                    SN.U.switchInputFormTab("placeholder");
                                 }
-                            }
-                            else {
+                            } else {
                                 // Not on a timeline that this belongs on?
                                 // Just show a success message.
+                                // @fixme inline
                                 showFeedback('success', $('title', data).text());
                             }
                         }
                         form.resetForm();
-                        form.find('#'+SN.C.S.NoticeInReplyTo).val('');
-                        form.find('#'+SN.C.S.NoticeDataAttachSelected).remove();
+                        form.find('[name=inreplyto]').val('');
+                        form.find('.attach-status').remove();
                         SN.U.FormNoticeEnhancements(form);
                     }
                 },
                 complete: function(xhr, textStatus) {
                     form
                         .removeClass(SN.C.S.Processing)
-                        .find('#'+SN.C.S.NoticeActionSubmit)
+                        .find('.submit')
                             .removeAttr(SN.C.S.Disabled)
                             .removeClass(SN.C.S.Disabled);
 
-                    $('#'+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);
-                    $('#'+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);
-                    if ($('#'+SN.C.S.NoticeLocationNs)) {
-                        $('#'+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);
-                        $('#'+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID);
+                    form.find('[name=lat]').val(SN.C.I.NoticeDataGeo.NLat);
+                    form.find('[name=lon]').val(SN.C.I.NoticeDataGeo.NLon);
+                    form.find('[name=location_ns]').val(SN.C.I.NoticeDataGeo.NLNS);
+                    form.find('[name=location_id]').val(SN.C.I.NoticeDataGeo.NLID);
+                    form.find('[name=notice_data-geo]').attr('checked', SN.C.I.NoticeDataGeo.NDG);
+                }
+            });
+        },
+
+        FormProfileSearchXHR: function(form) {
+            $.ajax({
+                type: 'POST',
+                dataType: 'xml',
+                url: form.attr('action'),
+                data: form.serialize() + '&ajax=1',
+                beforeSend: function(xhr) {
+                    form
+                        .addClass(SN.C.S.Processing)
+                        .find('.submit')
+                            .addClass(SN.C.S.Disabled)
+                            .attr(SN.C.S.Disabled, SN.C.S.Disabled);
+                },
+                error: function (xhr, textStatus, errorThrown) {
+                    alert(errorThrown || textStatus);
+                },
+                success: function(data, textStatus) {
+                    var results_placeholder = $('#profile_search_results');
+                    if (typeof($('ul', data)[0]) != 'undefined') {
+                        var list = document._importNode($('ul', data)[0], true);
+                        results_placeholder.replaceWith(list);
+                    }
+                    else {
+                        var _error = $('<li/>').append(document._importNode($('p', data)[0], true));
+                        results_placeholder.html(_error);
                     }
-                    $('#'+SN.C.S.NoticeDataGeo).attr('checked', SN.C.I.NoticeDataGeo.NDG);
+                    form
+                        .removeClass(SN.C.S.Processing)
+                        .find('.submit')
+                            .removeClass(SN.C.S.Disabled)
+                            .attr(SN.C.S.Disabled, false);
                 }
             });
         },
 
+        FormPeopletagsXHR: function(form) {
+            $.ajax({
+                type: 'POST',
+                dataType: 'xml',
+                url: form.attr('action'),
+                data: form.serialize() + '&ajax=1',
+                beforeSend: function(xhr) {
+                    form.find('.submit')
+                            .addClass(SN.C.S.Processing)
+                            .addClass(SN.C.S.Disabled)
+                            .attr(SN.C.S.Disabled, SN.C.S.Disabled);
+                },
+                error: function (xhr, textStatus, errorThrown) {
+                    alert(errorThrown || textStatus);
+                },
+                success: function(data, textStatus) {
+                    var results_placeholder = form.parents('.entity_tags');
+                    if (typeof($('.entity_tags', data)[0]) != 'undefined') {
+                        var tags = document._importNode($('.entity_tags', data)[0], true);
+                        $(tags).find('.editable').append($('<button class="peopletags_edit_button"/>'));
+                        results_placeholder.replaceWith(tags);
+                    } else {
+                        results_placeholder.find('p').remove();
+                        results_placeholder.append(document._importNode($('p', data)[0], true));
+                        form.removeClass(SN.C.S.Processing)
+                            .find('.submit')
+                                .removeClass(SN.C.S.Disabled)
+                                .attr(SN.C.S.Disabled, false);
+                    }
+                }
+            });
+        },
+
+        normalizeGeoData: function(form) {
+            SN.C.I.NoticeDataGeo.NLat = form.find('[name=lat]').val();
+            SN.C.I.NoticeDataGeo.NLon = form.find('[name=lon]').val();
+            SN.C.I.NoticeDataGeo.NLNS = form.find('[name=location_ns]').val();
+            SN.C.I.NoticeDataGeo.NLID = form.find('[name=location_id]').val();
+            SN.C.I.NoticeDataGeo.NDG = form.find('[name=notice_data-geo]').attr('checked'); // @fixme
+
+            var cookieValue = $.cookie(SN.C.S.NoticeDataGeoCookie);
+
+            if (cookieValue !== null && cookieValue != 'disabled') {
+                cookieValue = JSON.parse(cookieValue);
+                SN.C.I.NoticeDataGeo.NLat = form.find('[name=lat]').val(cookieValue.NLat).val();
+                SN.C.I.NoticeDataGeo.NLon = form.find('[name=lon]').val(cookieValue.NLon).val();
+                if (cookieValue.NLNS) {
+                    SN.C.I.NoticeDataGeo.NLNS = form.find('[name=location_ns]').val(cookieValue.NLNS).val();
+                    SN.C.I.NoticeDataGeo.NLID = form.find('[name=location_id]').val(cookieValue.NLID).val();
+                } else {
+                    form.find('[name=location_ns]').val('');
+                    form.find('[name=location_id]').val('');
+                }
+            }
+            if (cookieValue == 'disabled') {
+                SN.C.I.NoticeDataGeo.NDG = form.find('[name=notice_data-geo]').attr('checked', false).attr('checked');
+            }
+            else {
+                SN.C.I.NoticeDataGeo.NDG = form.find('[name=notice_data-geo]').attr('checked', true).attr('checked');
+            }
+
+        },
+
         /**
          * Fetch an XML DOM from an XHR's response data.
          *
@@ -533,33 +613,19 @@ var SN = { // StatusNet
          * @access private
          */
         NoticeReply: function() {
-            if ($('#'+SN.C.S.NoticeDataText).length > 0 && $('#content .notice_reply').length > 0) {
-                $('#content .notice').each(function() { SN.U.NoticeReplyTo($(this)); });
-            }
+            $('#content .notice_reply').live('click', function(e) {
+                e.preventDefault();
+                var notice = $(this).closest('li.notice');
+                SN.U.NoticeInlineReplyTrigger(notice);
+                return false;
+            });
         },
 
         /**
-         * Setup function -- DOES NOT trigger actions immediately.
-         *
-         * Sets up event handlers on the given notice's reply button to
-         * tweak the new-notice form with needed variables and focus it
-         * when pushed.
-         *
-         * (This replaces the default reply button behavior to submit
-         * directly to a form which comes back with a specialized page
-         * with the form data prefilled.)
-         *
-         * @param {jQuery} notice: jQuery object containing one or more notices
+         * Stub -- kept for compat with plugins for now.
          * @access private
          */
         NoticeReplyTo: function(notice) {
-            notice.find('.notice_reply').live('click', function(e) {
-                e.preventDefault();
-                var nickname = ($('.author .nickname', notice).length > 0) ? $($('.author .nickname', notice)[0]) : $('.author .nickname.uid');
-                /* SN.U.NoticeReplySet(nickname.text(), $($('.notice_id', notice)[0]).text()); */
-                SN.U.NoticeInlineReplyTrigger(notice, '@' + nickname.text());
-                return false;
-            });
         },
 
         /**
@@ -572,179 +638,148 @@ var SN = { // StatusNet
             // Find the notice we're replying to...
             var id = $($('.notice_id', notice)[0]).text();
             var parentNotice = notice;
+            var stripForm = true; // strip a couple things out of reply forms that are inline
 
             // Find the threaded replies view we'll be adding to...
             var list = notice.closest('.notices');
-            if (list.hasClass('threaded-notices')) {
+            if (list.closest('.old-school').length) {
+            	// We're replying to an old-school conversation thread;
+            	// use the old-style ping into the top form.
+            	SN.U.switchInputFormTab("status")
+            	replyForm = $('#input_form_status').find('form');
+            	stripForm = false;
+            } else if (list.hasClass('threaded-replies')) {
                 // We're replying to a reply; use reply form on the end of this list.
                 // We'll add our form at the end of this; grab the root notice.
                 parentNotice = list.closest('.notice');
+
+		        // See if the form's already open...
+		        var replyForm = $('.notice-reply-form', list);
             } else {
                 // We're replying to a parent notice; pull its threaded list
                 // and we'll add on the end of it. Will add if needed.
-                list = $('ul.threaded-notices', notice);
+                list = $('ul.threaded-replies', notice);
                 if (list.length == 0) {
-                    list = $('<ul class="notices threaded-notices xoxo"></ul>');
-                    notice.append(list);
+                    SN.U.NoticeInlineReplyPlaceholder(notice);
+                    list = $('ul.threaded-replies', notice);
+                } else {
+                    var placeholder = $('li.notice-reply-placeholder', notice);
+                    if (placeholder.length == 0) {
+                        SN.U.NoticeInlineReplyPlaceholder(notice);
+                    }
                 }
+
+		        // See if the form's already open...
+		        var replyForm = $('.notice-reply-form', list);
             }
 
-            // See if the form's already open...
-            var replyForm = $('.notice-reply-form', list);
-            if (replyForm.length == 0) {
-                // Remove placeholder if any
-                $('li.notice-reply-placeholder').remove();
+            var nextStep = function() {
+                // Override...?
+                replyForm.find('input[name=inreplyto]').val(id);
+                if (stripForm) {
+                	// Don't do this for old-school reply form, as they don't come back!
+	                replyForm.find('#notice_to').attr('disabled', 'disabled').hide();
+    	            replyForm.find('#notice_private').attr('disabled', 'disabled').hide();
+    	            replyForm.find('label[for=notice_to]').hide();
+    	            replyForm.find('label[for=notice_private]').hide();
+    	        }
+
+                // Set focus...
+                var text = replyForm.find('textarea');
+                if (text.length == 0) {
+                    throw "No textarea";
+                }
+                var replyto = '';
+                if (initialText) {
+                    replyto = initialText + ' ';
+                }
+                text.val(replyto + text.val().replace(RegExp(replyto, 'i'), ''));
+                text.data('initialText', $.trim(initialText + ''));
+                text.focus();
+                if (text[0].setSelectionRange) {
+                    var len = text.val().length;
+                    text[0].setSelectionRange(len,len);
+                }
+            };
+            if (replyForm.length > 0) {
+                // Update the existing form...
+                nextStep();
+            } else {
+                // Hide the placeholder...
+                var placeholder = list.find('li.notice-reply-placeholder').hide();
 
                 // Create the reply form entry at the end
                 var replyItem = $('li.notice-reply', list);
                 if (replyItem.length == 0) {
-                    replyItem = $('<li class="notice-reply">' +
-                                      '<form class="notice-reply-form" method="post">' +
-                                          '<textarea name="status_textarea"></textarea>' +
-                                          '<div class="controls">' +
-                                          '<input type="hidden" name="token">' +
-                                          '<input type="hidden" name="inreplyto">' +
-                                          '<input type="submit" class="submit">' +
-                                      '</div>' +
-                                      '</form>' +
-                                  '</li>');
-
-                    var baseForm = $('#form_notice');
-                    replyForm = replyItem.find('form');
-                    replyForm.attr('action', baseForm.attr('action'));
-                    replyForm.find('input[name="token"]').val(baseForm.find('input[name=token]').val());
-                    replyForm.find('input[type="submit"]').val(SN.msg('reply_submit'));
-                    list.append(replyItem);
-
-                    replyForm.find('textarea').blur(function() {
-                        var textarea = $(this);
-                        var txt = $.trim(textarea.val());
-                        if (txt == '' || txt == textarea.data('initialText')) {
-                            // Nothing to say? Begone!
-                            replyItem.remove();
-                            SN.U.NoticeInlineReplyPlaceholder(parentNotice);
-                        }
-                    });
-                    replyForm.submit(function(event) {
-                        var form = replyForm;
-                        $.ajax({
-                            type: 'POST',
-                            dataType: 'xml',
-                            url: SN.U.RewriteAjaxAction(form.attr('action')),
-                            data: form.serialize() + '&ajax=1',
-                            beforeSend: function(xhr) {
-                                form
-                                    .addClass(SN.C.S.Processing)
-                                    .find('.submit')
-                                        .addClass(SN.C.S.Disabled)
-                                        .attr(SN.C.S.Disabled, SN.C.S.Disabled)
-                                        .end()
-                                    .find('textarea')
-                                        .addClass(SN.C.S.Disabled)
-                                        .attr(SN.C.S.Disabled, SN.C.S.Disabled);
-                            },
-                            error: function (xhr, textStatus, errorThrown) {
-                                alert(errorThrown || textStatus);
-                            },
-                            success: function(data, textStatus) {
-                                var orig_li = $('li', data)[0];
-                                if (orig_li) {
-                                    var li = document._importNode(orig_li, true);
-                                    replyItem.replaceWith(li);
-                                    SN.U.NoticeInlineReplyPlaceholder(parentNotice);
-                                }
-                            }
-                        });
-                        event.preventDefault();
-                        return false;
-                    });
-                }
-            }
+                    replyItem = $('<li class="notice-reply"></li>');
 
-            // Override...?
-            replyForm.find('input[name=inreplyto]').val(id);
+                    var intermediateStep = function(formMaster) {
+                        var formEl = document._importNode(formMaster, true);
+                        replyItem.append(formEl);
+                        list.append(replyItem); // *after* the placeholder
 
-            // Set focus...
-            var text = replyForm.find('textarea');
-            if (text.length == 0) {
-                throw "No textarea";
-            }
-            var replyto = '';
-            if (initialText) {
-                replyto = initialText + ' ';
-            }
-            text.val(replyto + text.val().replace(RegExp(replyto, 'i'), ''));
-            text.data('initialText', $.trim(initialText + ''));
-            text.focus();
-            if (text[0].setSelectionRange) {
-                var len = text.val().length;
-                text[0].setSelectionRange(len,len);
-            }
-        },
+                        var form = replyForm = $(formEl);
+                        SN.Init.NoticeFormSetup(form);
 
-        /**
-         * FIXME OBSOLETE?
-         * Updates the new notice posting form with bits for replying to the
-         * given user. Adds replyto parameter to the form, and a "@foo" to the
-         * text area.
-         *
-         * @fixme replyto is a global variable, but probably shouldn't be
-         *
-         * @param {String} nick
-         * @param {String} id
-         */
-        NoticeReplySet: function(nick,id) {
-            if (nick.match(SN.C.I.PatternUsername)) {
-                var text = $('#'+SN.C.S.NoticeDataText);
-                if (text.length > 0) {
-                    replyto = '@' + nick + ' ';
-                    text.val(replyto + text.val().replace(RegExp(replyto, 'i'), ''));
-                    $('#'+SN.C.S.FormNotice+' #'+SN.C.S.NoticeInReplyTo).val(id);
-
-                    text[0].focus();
-                    if (text[0].setSelectionRange) {
-                        var len = text.val().length;
-                        text[0].setSelectionRange(len,len);
+                        nextStep();
+                    };
+                    if (SN.C.I.NoticeFormMaster) {
+                        // We've already saved a master copy of the form.
+                        // Clone it in!
+                        intermediateStep(SN.C.I.NoticeFormMaster);
+                    } else {
+                        // Fetch a fresh copy of the notice form over AJAX.
+                        // Warning: this can have a delay, which looks bad.
+                        // @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)[0]);
+                        });
                     }
                 }
             }
         },
 
-        /**
-         * Setup function -- DOES NOT apply immediately.
-         *
-         * Sets up event handlers for favor/disfavor forms to submit via XHR.
-         * Uses 'live' rather than 'bind', so applies to future as well as present items.
-         */
-        NoticeFavor: function() {
-            $('.form_favor').live('click', function() { SN.U.FormXHR($(this)); return false; });
-            $('.form_disfavor').live('click', function() { SN.U.FormXHR($(this)); return false; });
-        },
-
         NoticeInlineReplyPlaceholder: function(notice) {
-            var list = notice.find('ul.threaded-notices');
+            var list = notice.find('ul.threaded-replies');
+            if (list.length == 0) {
+                list = $('<ul class="notices threaded-replies xoxo"></ul>');
+                notice.append(list);
+                list = notice.find('ul.threaded-replies');
+            }
             var placeholder = $('<li class="notice-reply-placeholder">' +
-                                    '<input class="placeholder">' +
+                                    '<input class="placeholder" />' +
                                 '</li>');
-            placeholder.click(function() {
-                SN.U.NoticeInlineReplyTrigger(notice);
-            });
-            placeholder.find('input').val(SN.msg('reply_comment'));
+            placeholder.find('input')
+                .val(SN.msg('reply_placeholder'));
             list.append(placeholder);
         },
 
         /**
          * Setup function -- DOES NOT apply immediately.
          *
-         * Sets up event handlers for favor/disfavor forms to submit via XHR.
+         * Sets up event handlers for inline reply mini-form placeholders.
          * Uses 'live' rather than 'bind', so applies to future as well as present items.
          */
         NoticeInlineReplySetup: function() {
-            $('.threaded-notices').each(function() {
-                var list = $(this);
-                var notice = list.closest('.notice');
-                SN.U.NoticeInlineReplyPlaceholder(notice);
-            });
+            $('li.notice-reply-placeholder input')
+                .live('focus', function() {
+                    var notice = $(this).closest('li.notice');
+                    SN.U.NoticeInlineReplyTrigger(notice);
+                    return false;
+                });
+            $('li.notice-reply-comments a')
+                .live('click', function() {
+                    var url = $(this).attr('href');
+                    var area = $(this).closest('.threaded-replies');
+                    $.get(url, {ajax: 1}, function(data, textStatus, xhr) {
+                        var replies = $('.threaded-replies', data);
+                        if (replies.length) {
+                            area.replaceWith(document._importNode(replies[0], true));
+                        }
+                    });
+                    return false;
+                });
         },
 
         /**
@@ -754,6 +789,7 @@ var SN = { // StatusNet
          * popout before submitting.
          *
          * Uses 'live' rather than 'bind', so applies to future as well as present items.
+         *
          */
         NoticeRepeat: function() {
             $('.form_repeat').live('click', function(e) {
@@ -864,36 +900,34 @@ var SN = { // StatusNet
          *
          * This preview box will also allow removing the attachment
          * prior to posting.
+         *
+         * @param {jQuery} form
          */
-        NoticeDataAttach: function() {
-            NDA = $('#'+SN.C.S.NoticeDataAttach);
+        NoticeDataAttach: function(form) {
+            var NDA = form.find('input[type=file]');
             NDA.change(function(event) {
+                form.find('.attach-status').remove();
+
                 var filename = $(this).val();
                 if (!filename) {
                     // No file -- we've been tricked!
-                    $('#'+SN.C.S.NoticeDataAttachSelected).remove();
                     return false;
                 }
 
-                // @fixme appending filename straight in is potentially unsafe
-                S = '<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+filename+'</code> <button class="close">&#215;</button></div>';
-                NDAS = $('#'+SN.C.S.NoticeDataAttachSelected);
-                if (NDAS.length > 0) {
-                    NDAS.replaceWith(S);
-                }
-                else {
-                    $('#'+SN.C.S.FormNotice).append(S);
-                }
-                $('#'+SN.C.S.NoticeDataAttachSelected+' button').click(function(){
-                    $('#'+SN.C.S.NoticeDataAttachSelected).remove();
+                var attachStatus = $('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');
+                attachStatus.find('code').text(filename);
+                attachStatus.find('button').click(function(){
+                    attachStatus.remove();
                     NDA.val('');
 
                     return false;
                 });
+                form.append(attachStatus);
+
                 if (typeof this.files == "object") {
                     // Some newer browsers will let us fetch the files for preview.
                     for (var i = 0; i < this.files.length; i++) {
-                        SN.U.PreviewAttach(this.files[i]);
+                        SN.U.PreviewAttach(form, this.files[i]);
                     }
                 }
             });
@@ -929,13 +963,14 @@ var SN = { // StatusNet
          * Known fail:
          * - Opera 10.63, 11 beta (no input.files interface)
          *
+         * @param {jQuery} form
          * @param {File} file
          *
          * @todo use configured thumbnail size
          * @todo detect pixel size?
          * @todo should we render a thumbnail to a canvas and then use the smaller image?
          */
-        PreviewAttach: function(file) {
+        PreviewAttach: function(form, file) {
             var tooltip = file.type + ' ' + Math.round(file.size / 1024) + 'KB';
             var preview = true;
 
@@ -995,11 +1030,11 @@ var SN = { // StatusNet
                         .attr('alt', tooltip)
                         .attr('src', url)
                         .attr('style', 'height: 120px');
-                    $('#'+SN.C.S.NoticeDataAttachSelected).append(img);
+                    form.find('.attach-status').append(img);
                 });
             } else {
                 var img = $('<div></div>').text(tooltip);
-                $('#'+SN.C.S.NoticeDataAttachSelected).append(img);
+                form.find('.attach-status').append(img);
             }
         },
 
@@ -1010,44 +1045,57 @@ var SN = { // StatusNet
          * new-notice form. Seems to set up some event handlers for
          * triggering lookups and using the new values.
          *
+         * @param {jQuery} form
+         *
          * @fixme tl;dr
          * @fixme there's not good visual state update here, so users have a
          *        hard time figuring out if it's working or fixing if it's wrong.
          *
          */
-        NoticeLocationAttach: function() {
-            var NLat = $('#'+SN.C.S.NoticeLat).val();
-            var NLon = $('#'+SN.C.S.NoticeLon).val();
-            var NLNS = $('#'+SN.C.S.NoticeLocationNs).val();
-            var NLID = $('#'+SN.C.S.NoticeLocationId).val();
-            var NLN = $('#'+SN.C.S.NoticeGeoName).text();
-            var NDGe = $('#'+SN.C.S.NoticeDataGeo);
-
-            function removeNoticeDataGeo() {
-                $('label[for='+SN.C.S.NoticeDataGeo+']')
-                    .attr('title', jQuery.trim($('label[for='+SN.C.S.NoticeDataGeo+']').text()))
+        NoticeLocationAttach: function(form) {
+            // @fixme this should not be tied to the main notice form, as there may be multiple notice forms...
+            var NLat = form.find('[name=lat]')
+            var NLon = form.find('[name=lon]')
+            var NLNS = form.find('[name=location_ns]').val();
+            var NLID = form.find('[name=location_id]').val();
+            var NLN = ''; // @fixme
+            var NDGe = form.find('[name=notice_data-geo]');
+            var check = form.find('[name=notice_data-geo]');
+            var label = form.find('label.notice_data-geo');
+
+            function removeNoticeDataGeo(error) {
+                label
+                    .attr('title', jQuery.trim(label.text()))
                     .removeClass('checked');
 
-                $('#'+SN.C.S.NoticeLat).val('');
-                $('#'+SN.C.S.NoticeLon).val('');
-                $('#'+SN.C.S.NoticeLocationNs).val('');
-                $('#'+SN.C.S.NoticeLocationId).val('');
-                $('#'+SN.C.S.NoticeDataGeo).attr('checked', false);
+                form.find('[name=lat]').val('');
+                form.find('[name=lon]').val('');
+                form.find('[name=location_ns]').val('');
+                form.find('[name=location_id]').val('');
+                form.find('[name=notice_data-geo]').attr('checked', false);
 
                 $.cookie(SN.C.S.NoticeDataGeoCookie, 'disabled', { path: '/' });
+
+                if (error) {
+                    form.find('.geo_status_wrapper').removeClass('success').addClass('error');
+                    form.find('.geo_status_wrapper .geo_status').text(error);
+                } else {
+                    form.find('.geo_status_wrapper').remove();
+                }
             }
 
             function getJSONgeocodeURL(geocodeURL, data) {
+                SN.U.NoticeGeoStatus(form, 'Looking up place name...');
                 $.getJSON(geocodeURL, data, function(location) {
                     var lns, lid;
 
                     if (typeof(location.location_ns) != 'undefined') {
-                        $('#'+SN.C.S.NoticeLocationNs).val(location.location_ns);
+                        form.find('[name=location_ns]').val(location.location_ns);
                         lns = location.location_ns;
                     }
 
                     if (typeof(location.location_id) != 'undefined') {
-                        $('#'+SN.C.S.NoticeLocationId).val(location.location_id);
+                        form.find('[name=location_id]').val(location.location_id);
                         lid = location.location_id;
                     }
 
@@ -1058,14 +1106,15 @@ var SN = { // StatusNet
                         NLN_text = location.name;
                     }
 
-                    $('label[for='+SN.C.S.NoticeDataGeo+']')
+                    SN.U.NoticeGeoStatus(form, NLN_text, data.lat, data.lon, location.url);
+                    label
                         .attr('title', NoticeDataGeo_text.ShareDisable + ' (' + NLN_text + ')');
 
-                    $('#'+SN.C.S.NoticeLat).val(data.lat);
-                    $('#'+SN.C.S.NoticeLon).val(data.lon);
-                    $('#'+SN.C.S.NoticeLocationNs).val(lns);
-                    $('#'+SN.C.S.NoticeLocationId).val(lid);
-                    $('#'+SN.C.S.NoticeDataGeo).attr('checked', true);
+                    form.find('[name=lat]').val(data.lat);
+                    form.find('[name=lon]').val(data.lon);
+                    form.find('[name=location_ns]').val(lns);
+                    form.find('[name=location_id]').val(lid);
+                    form.find('[name=notice_data-geo]').attr('checked', true);
 
                     var cookieValue = {
                         NLat: data.lat,
@@ -1081,33 +1130,33 @@ var SN = { // StatusNet
                 });
             }
 
-            if (NDGe.length > 0) {
+            if (check.length > 0) {
                 if ($.cookie(SN.C.S.NoticeDataGeoCookie) == 'disabled') {
-                    NDGe.attr('checked', false);
+                    check.attr('checked', false);
                 }
                 else {
-                    NDGe.attr('checked', true);
+                    check.attr('checked', true);
                 }
 
-                var NGW = $('#notice_data-geo_wrap');
-                var geocodeURL = NGW.attr('title');
-                NGW.removeAttr('title');
+                var NGW = form.find('.notice_data-geo_wrap');
+                var geocodeURL = NGW.attr('data-api');
 
-                $('label[for='+SN.C.S.NoticeDataGeo+']')
-                    .attr('title', jQuery.trim($('label[for='+SN.C.S.NoticeDataGeo+']').text()));
+                label
+                    .attr('title', label.text());
 
-                NDGe.change(function() {
-                    if ($('#'+SN.C.S.NoticeDataGeo).attr('checked') === true || $.cookie(SN.C.S.NoticeDataGeoCookie) === null) {
-                        $('label[for='+SN.C.S.NoticeDataGeo+']')
+                check.change(function() {
+                    if (check.attr('checked') === true || $.cookie(SN.C.S.NoticeDataGeoCookie) === null) {
+                        label
                             .attr('title', NoticeDataGeo_text.ShareDisable)
                             .addClass('checked');
 
                         if ($.cookie(SN.C.S.NoticeDataGeoCookie) === null || $.cookie(SN.C.S.NoticeDataGeoCookie) == 'disabled') {
                             if (navigator.geolocation) {
+                                SN.U.NoticeGeoStatus(form, 'Requesting location from browser...');
                                 navigator.geolocation.getCurrentPosition(
                                     function(position) {
-                                        $('#'+SN.C.S.NoticeLat).val(position.coords.latitude);
-                                        $('#'+SN.C.S.NoticeLon).val(position.coords.longitude);
+                                        form.find('[name=lat]').val(position.coords.latitude);
+                                        form.find('[name=lon]').val(position.coords.longitude);
 
                                         var data = {
                                             lat: position.coords.latitude,
@@ -1121,10 +1170,11 @@ var SN = { // StatusNet
                                     function(error) {
                                         switch(error.code) {
                                             case error.PERMISSION_DENIED:
-                                                removeNoticeDataGeo();
+                                                removeNoticeDataGeo('Location permission denied.');
                                                 break;
                                             case error.TIMEOUT:
-                                                $('#'+SN.C.S.NoticeDataGeo).attr('checked', false);
+                                                //$('#'+SN.C.S.NoticeDataGeo).attr('checked', false);
+                                                removeNoticeDataGeo('Location lookup timeout.');
                                                 break;
                                         }
                                     },
@@ -1146,21 +1196,22 @@ var SN = { // StatusNet
                                 }
                                 else {
                                     removeNoticeDataGeo();
-                                    $('#'+SN.C.S.NoticeDataGeo).remove();
-                                    $('label[for='+SN.C.S.NoticeDataGeo+']').remove();
+                                    check.remove();
+                                    label.remove();
                                 }
                             }
                         }
                         else {
                             var cookieValue = JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));
 
-                            $('#'+SN.C.S.NoticeLat).val(cookieValue.NLat);
-                            $('#'+SN.C.S.NoticeLon).val(cookieValue.NLon);
-                            $('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS);
-                            $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID);
-                            $('#'+SN.C.S.NoticeDataGeo).attr('checked', cookieValue.NDG);
+                            form.find('[name=lat]').val(cookieValue.NLat);
+                            form.find('[name=lon]').val(cookieValue.NLon);
+                            form.find('[name=location_ns]').val(cookieValue.NLNS);
+                            form.find('[name=location_id]').val(cookieValue.NLID);
+                            form.find('[name=notice_data-geo]').attr('checked', cookieValue.NDG);
 
-                            $('label[for='+SN.C.S.NoticeDataGeo+']')
+                            SN.U.NoticeGeoStatus(form, cookieValue.NLN, cookieValue.NLat, cookieValue.NLon, cookieValue.NLNU);
+                            label
                                 .attr('title', NoticeDataGeo_text.ShareDisable + ' (' + cookieValue.NLN + ')')
                                 .addClass('checked');
                         }
@@ -1172,6 +1223,43 @@ var SN = { // StatusNet
             }
         },
 
+        /**
+         * Create or update a geolocation status widget in this notice posting form.
+         *
+         * @param {jQuery} form
+         * @param {String} status
+         * @param {String} lat (optional)
+         * @param {String} lon (optional)
+         * @param {String} url (optional)
+         */
+        NoticeGeoStatus: function(form, status, lat, lon, url)
+        {
+            var wrapper = form.find('.geo_status_wrapper');
+            if (wrapper.length == 0) {
+                wrapper = $('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');
+                wrapper.find('button.close').click(function() {
+                    form.find('[name=notice_data-geo]').removeAttr('checked').change();
+                    return false;
+                });
+                form.append(wrapper);
+            }
+            var label;
+            if (url) {
+                label = $('<a></a>').attr('href', url);
+            } else {
+                label = $('<span></span>');
+            }
+            label.text(status);
+            if (lat || lon) {
+                var latlon = lat + ';' + lon;
+                label.attr('title', latlon);
+                if (!status) {
+                    label.text(latlon)
+                }
+            }
+            wrapper.find('.geo_status').empty().append(label);
+        },
+
         /**
          * Setup function -- DOES NOT trigger actions immediately.
          *
@@ -1296,7 +1384,7 @@ var SN = { // StatusNet
 
             var profileLink = $('#nav_profile a').attr('href');
             if (profileLink) {
-                var authorUrl = $(notice).find('.entry-title .author a.url').attr('href');
+                var authorUrl = $(notice).find('.vcard.author a.url').attr('href');
                 if (authorUrl == profileLink) {
                     if (action == 'all' || action == 'showstream') {
                         // Posts always show on your own friends and profile streams.
@@ -1311,6 +1399,50 @@ var SN = { // StatusNet
             // UI links currently on the page use malleable names.
 
             return false;
+        },
+
+        /**
+         * Switch to another active input sub-form.
+         * This will hide the current form (if any), show the new one, and
+         * update the input type tab selection state.
+         *
+         * @param {String} tag
+         */
+	switchInputFormTab: function(tag) {
+	    // The one that's current isn't current anymore
+	    $('.input_form_nav_tab.current').removeClass('current');
+            if (tag == 'placeholder') {
+                // Hack: when showing the placeholder, mark the tab
+                // as current for 'Status'.
+                $('#input_form_nav_status').addClass('current');
+            } else {
+                $('#input_form_nav_'+tag).addClass('current');
+            }
+
+            // Don't remove 'current' if we also have the "nonav" class.
+            // An example would be the message input form. removing
+            // 'current' will cause the form to vanish from the page.
+            var nonav = $('.input_form.current.nonav');
+            if (nonav.length > 0) {
+                return;
+            }
+
+	    $('.input_form.current').removeClass('current');
+	    $('#input_form_'+tag)
+                .addClass('current')
+                .find('.ajax-notice').each(function() {
+                    var form = $(this);
+                    SN.Init.NoticeFormSetup(form);
+                })
+                .find('.notice_data-text').focus();
+	},
+
+        showMoreMenuItems: function(menuid) {
+            $('#'+menuid+' .more_link').remove();
+            var selector = '#'+menuid+' .extended_menu';
+            var extended = $(selector);
+            extended.removeClass('extended_menu');
+            return void(0);
         }
     },
 
@@ -1325,14 +1457,71 @@ var SN = { // StatusNet
          */
         NoticeForm: function() {
             if ($('body.user_in').length > 0) {
-                SN.U.NoticeLocationAttach();
+                // SN.Init.NoticeFormSetup() will get run
+                // when forms get displayed for the first time...
+
+                // Hack to initialize the placeholder at top
+                $('#input_form_placeholder input.placeholder').focus(function() {
+                    SN.U.switchInputFormTab("status");
+                });
+
+                // Make inline reply forms self-close when clicking out.
+                $('body').bind('click', function(e) {
+                    var currentForm = $('#content .input_forms div.current');
+                    if (currentForm.length > 0) {
+                        if ($('#content .input_forms').has(e.target).length == 0) {
+                            // If all fields are empty, switch back to the placeholder.
+                            var fields = currentForm.find('textarea, input[type=text], input[type=""]');
+                            var anything = false;
+                            fields.each(function() {
+                                anything = anything || $(this).val();
+                            });
+                            if (!anything) {
+                                SN.U.switchInputFormTab("placeholder");
+                            }
+                        }
+                    }
 
-                $('.'+SN.C.S.FormNotice).each(function() {
-                    SN.U.FormNoticeXHR($(this));
-                    SN.U.FormNoticeEnhancements($(this));
+                    var openReplies = $('li.notice-reply');
+                    if (openReplies.length > 0) {
+                        var target = $(e.target);
+                        openReplies.each(function() {
+                            // Did we click outside this one?
+                            var replyItem = $(this);
+                            if (replyItem.has(e.target).length == 0) {
+                                var textarea = replyItem.find('.notice_data-text:first');
+                                var cur = $.trim(textarea.val());
+                                // Only close if there's been no edit.
+                                if (cur == '' || cur == textarea.data('initialText')) {
+                                    var parentNotice = replyItem.closest('li.notice');
+                                    replyItem.remove();
+                                    parentNotice.find('li.notice-reply-placeholder').show();
+                                }
+                            }
+                        });
+                    }
                 });
 
-                SN.U.NoticeDataAttach();
+                // Infield labels for notice form inputs.
+                $('.input_forms fieldset fieldset label').inFieldLabels({ fadeOpacity:0 });
+
+            }
+        },
+
+        /**
+         * Encapsulate notice form setup for a single form.
+         * Plugins can add extra setup by monkeypatching this
+         * function.
+         *
+         * @param {jQuery} form
+         */
+        NoticeFormSetup: function(form) {
+            if (!form.data('NoticeFormSetup')) {
+                SN.U.NoticeLocationAttach(form);
+                SN.U.FormNoticeXHR(form);
+                SN.U.FormNoticeEnhancements(form);
+                SN.U.NoticeDataAttach(form);
+                form.data('NoticeFormSetup', true);
             }
         },
 
@@ -1344,7 +1533,10 @@ var SN = { // StatusNet
          */
         Notices: function() {
             if ($('body.user_in').length > 0) {
-                SN.U.NoticeFavor();
+                var masterForm = $('.form_notice:first');
+                if (masterForm.length > 0) {
+                    SN.C.I.NoticeFormMaster = document._importNode(masterForm[0], true);
+                }
                 SN.U.NoticeRepeat();
                 SN.U.NoticeReply();
                 SN.U.NoticeInlineReplySetup();
@@ -1366,11 +1558,23 @@ var SN = { // StatusNet
                 $('.form_group_join').live('click', function() { SN.U.FormXHR($(this)); return false; });
                 $('.form_group_leave').live('click', function() { SN.U.FormXHR($(this)); return false; });
                 $('.form_user_nudge').live('click', function() { SN.U.FormXHR($(this)); return false; });
+                $('.form_peopletag_subscribe').live('click', function() { SN.U.FormXHR($(this)); return false; });
+                $('.form_peopletag_unsubscribe').live('click', function() { SN.U.FormXHR($(this)); return false; });
+                $('.form_user_add_peopletag').live('click', function() { SN.U.FormXHR($(this)); return false; });
+                $('.form_user_remove_peopletag').live('click', function() { SN.U.FormXHR($(this)); return false; });
 
                 SN.U.NewDirectMessage();
             }
         },
 
+        ProfileSearch: function() {
+            if ($('body.user_in').length > 0) {
+                $('.form_peopletag_edit_user_search input.submit').live('click', function() {
+                    SN.U.FormProfileSearchXHR($(this).parents('form')); return false;
+                });
+            }
+        },
+
         /**
          * Run setup code for login form:
          *
@@ -1393,6 +1597,122 @@ var SN = { // StatusNet
             });
         },
 
+        /**
+         * Called when a people tag edit box is shown in the interface
+         *
+         * - loads the jQuery UI autocomplete plugin
+         * - sets event handlers for tag completion
+         *
+         */
+        PeopletagAutocomplete: function(txtBox) {
+            var split = function(val) {
+                return val.split( /\s+/ );
+            }
+            var extractLast = function(term) {
+                return split(term).pop();
+            }
+
+            // don't navigate away from the field on tab when selecting an item
+            txtBox.live( "keydown", function( event ) {
+                if ( event.keyCode === $.ui.keyCode.TAB &&
+                        $(this).data( "autocomplete" ).menu.active ) {
+                    event.preventDefault();
+                }
+            }).autocomplete({
+                minLength: 0,
+                source: function(request, response) {
+		            // delegate back to autocomplete, but extract the last term
+		            response($.ui.autocomplete.filter(
+			            SN.C.PtagACData, extractLast(request.term)));
+	            },
+	            focus: function() {
+	                return false;
+                },
+	            select: function(event, ui) {
+		            var terms = split(this.value);
+		            terms.pop();
+		            terms.push(ui.item.value);
+		            terms.push("");
+		            this.value = terms.join(" ");
+		            return false;
+	            }
+            }).data('autocomplete')._renderItem = function(ul, item) {
+                    // FIXME: with jQuery UI you cannot have it highlight the match
+                    var _l = '<a class="ptag-ac-line-tag">' + item.tag
+                          + ' <em class="privacy_mode">' + item.mode + '</em>'
+                          + '<span class="freq">' + item.freq + '</span></a>'
+
+		            return $("<li/>")
+	                        .addClass('mode-' + item.mode)
+                            .addClass('ptag-ac-line')
+                            .data("item.autocomplete", item)
+                            .append(_l)
+                            .appendTo(ul);
+	            }
+        },
+
+        /**
+         * Run setup for the ajax people tags editor
+         *
+         * - show edit button
+         * - set event handle for click on edit button
+         *   - loads people tag autocompletion data if not already present
+         *     or if it is stale.
+         *
+         */
+        PeopleTags: function() {
+            $('.user_profile_tags .editable').append($('<button class="peopletags_edit_button"/>'));
+
+            $('.peopletags_edit_button').live('click', function() {
+                var form = $(this).parents('dd').eq(0).find('form');
+                // We can buy time from the above animation
+
+                $.ajax({
+                    url: _peopletagAC,
+                    dataType: 'json',
+                    data: {token: $('#token').val()},
+                    ifModified: true,
+                    success: function(data) {
+                        // item.label is used to match
+                        for (i=0; i < data.length; i++) {
+                            data[i].label = data[i].tag;
+                        }
+
+                        SN.C.PtagACData = data;
+                        SN.Init.PeopletagAutocomplete(form.find('#tags'));
+                    }
+                });
+
+                $(this).parents('ul').eq(0).fadeOut(200, function() {form.fadeIn(200).find('input#tags')});
+            });
+
+            $('.user_profile_tags form .submit').live('click', function() {
+                SN.U.FormPeopletagsXHR($(this).parents('form')); return false;
+            });
+        },
+
+        /**
+         * Set up any generic 'ajax' form so it submits via AJAX with auto-replacement.
+         */
+        AjaxForms: function() {
+            $('form.ajax').live('submit', function() {
+                SN.U.FormXHR($(this));
+                return false;
+            });
+            $('form.ajax input[type=submit]').live('click', function() {
+                // Some forms rely on knowing which submit button was clicked.
+                // Save a hidden input field which'll be picked up during AJAX
+                // submit...
+                var button = $(this);
+                var form = button.closest('form');
+                form.find('.hidden-submit-button').remove();
+                $('<input class="hidden-submit-button" type="hidden" />')
+                    .attr('name', button.attr('name'))
+                    .val(button.val())
+                    .appendTo(form);
+            });
+        },
+
         /**
          * Add logic to any file upload forms to handle file size limits,
          * on browsers that support basic FileAPI.
@@ -1417,7 +1737,26 @@ var SN = { // StatusNet
                     }
                 }
             });
-        }
+        },
+
+	CheckBoxes: function() {
+	    $("span[class='checkbox-wrapper']").addClass("unchecked");
+	    $(".checkbox-wrapper").click(function(){
+	        if($(this).children("input").attr("checked")){
+		    // uncheck
+		    $(this).children("input").attr({checked: ""});
+		    $(this).removeClass("checked");
+		    $(this).addClass("unchecked");
+		    $(this).children("label").text("Private?");
+		}else{
+		    // check
+		    $(this).children("input").attr({checked: "checked"});
+		    $(this).removeClass("unchecked");
+		    $(this).addClass("checked");
+		    $(this).children("label").text("Private");
+		}
+	    });
+	}
     }
 };
 
@@ -1429,7 +1768,9 @@ var SN = { // StatusNet
  * don't start them loading until after DOM-ready time!
  */
 $(document).ready(function(){
+    SN.Init.AjaxForms();
     SN.Init.UploadForms();
+    SN.Init.CheckBoxes();
     if ($('.'+SN.C.S.FormNotice).length > 0) {
         SN.Init.NoticeForm();
     }
@@ -1442,4 +1783,11 @@ $(document).ready(function(){
     if ($('#form_login').length > 0) {
         SN.Init.Login();
     }
+    if ($('#profile_search_results').length > 0) {
+        SN.Init.ProfileSearch();
+    }
+    if ($('.user_profile_tags .editable').length > 0) {
+        SN.Init.PeopleTags();
+    }
 });
+