]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'uiredesign' of ../evan into uiredesign
authorsarven <csarven@plantard.controlezvous.ca>
Fri, 16 Jan 2009 17:03:37 +0000 (17:03 +0000)
committersarven <csarven@plantard.controlezvous.ca>
Fri, 16 Jan 2009 17:03:37 +0000 (17:03 +0000)
actions/newnotice.php
js/jquery.form.js [new file with mode: 0644]
js/util.js
lib/action.php
lib/common.php
theme/base/css/display.css

index cb02854a1da3379a530a6d44f0cd0be521eae065..b6ed87f8157bc7bf967297f8d9f22e9774aef923 100644 (file)
@@ -91,7 +91,7 @@ class NewnoticeAction extends Action
         common_broadcast_notice($notice);
 
         if ($this->boolean('ajax')) {
-            common_start_html('text/xml;charset=utf-8', true);
+            $this->startHTML('text/xml;charset=utf-8', true);
             $this->elementStart('head');
             $this->element('title', null, _('Notice posted'));
             $this->elementEnd('head');
diff --git a/js/jquery.form.js b/js/jquery.form.js
new file mode 100644 (file)
index 0000000..cb8b5a6
--- /dev/null
@@ -0,0 +1,632 @@
+/*\r
+ * jQuery Form Plugin\r
+ * version: 2.17 (06-NOV-2008)\r
+ * @requires jQuery v1.2.2 or later\r
+ *\r
+ * Examples and documentation at: http://malsup.com/jquery/form/\r
+ * Dual licensed under the MIT and GPL licenses:\r
+ *   http://www.opensource.org/licenses/mit-license.php\r
+ *   http://www.gnu.org/licenses/gpl.html\r
+ *\r
+ * Revision: $Id$\r
+ */\r
+;(function($) {\r
+\r
+/*\r
+    Usage Note:  \r
+    -----------\r
+    Do not use both ajaxSubmit and ajaxForm on the same form.  These\r
+    functions are intended to be exclusive.  Use ajaxSubmit if you want\r
+    to bind your own submit handler to the form.  For example,\r
+\r
+    $(document).ready(function() {\r
+        $('#myForm').bind('submit', function() {\r
+            $(this).ajaxSubmit({\r
+                target: '#output'\r
+            });\r
+            return false; // <-- important!\r
+        });\r
+    });\r
+\r
+    Use ajaxForm when you want the plugin to manage all the event binding\r
+    for you.  For example,\r
+\r
+    $(document).ready(function() {\r
+        $('#myForm').ajaxForm({\r
+            target: '#output'\r
+        });\r
+    });\r
+        \r
+    When using ajaxForm, the ajaxSubmit function will be invoked for you\r
+    at the appropriate time.  \r
+*/\r
+\r
+/**\r
+ * ajaxSubmit() provides a mechanism for immediately submitting \r
+ * an HTML form using AJAX.\r
+ */\r
+$.fn.ajaxSubmit = function(options) {\r
+    // fast fail if nothing selected (http://dev.jquery.com/ticket/2752)\r
+    if (!this.length) {\r
+        log('ajaxSubmit: skipping submit process - no element selected');\r
+        return this;\r
+    }\r
+\r
+    if (typeof options == 'function')\r
+        options = { success: options };\r
+\r
+    options = $.extend({\r
+        url:  this.attr('action') || window.location.toString(),\r
+        type: this.attr('method') || 'GET'\r
+    }, options || {});\r
+\r
+    // hook for manipulating the form data before it is extracted;\r
+    // convenient for use with rich editors like tinyMCE or FCKEditor\r
+    var veto = {};\r
+    this.trigger('form-pre-serialize', [this, options, veto]);\r
+    if (veto.veto) {\r
+        log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');\r
+        return this;\r
+    }\r
+\r
+    // provide opportunity to alter form data before it is serialized\r
+    if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {\r
+        log('ajaxSubmit: submit aborted via beforeSerialize callback');\r
+        return this;\r
+    }    \r
+   \r
+    var a = this.formToArray(options.semantic);\r
+    if (options.data) {\r
+        options.extraData = options.data;\r
+        for (var n in options.data) {\r
+          if(options.data[n] instanceof Array) {\r
+            for (var k in options.data[n])\r
+              a.push( { name: n, value: options.data[n][k] } )\r
+          }  \r
+          else\r
+             a.push( { name: n, value: options.data[n] } );\r
+        }\r
+    }\r
+\r
+    // give pre-submit callback an opportunity to abort the submit\r
+    if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {\r
+        log('ajaxSubmit: submit aborted via beforeSubmit callback');\r
+        return this;\r
+    }    \r
+\r
+    // fire vetoable 'validate' event\r
+    this.trigger('form-submit-validate', [a, this, options, veto]);\r
+    if (veto.veto) {\r
+        log('ajaxSubmit: submit vetoed via form-submit-validate trigger');\r
+        return this;\r
+    }    \r
+\r
+    var q = $.param(a);\r
+\r
+    if (options.type.toUpperCase() == 'GET') {\r
+        options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;\r
+        options.data = null;  // data is null for 'get'\r
+    }\r
+    else\r
+        options.data = q; // data is the query string for 'post'\r
+\r
+    var $form = this, callbacks = [];\r
+    if (options.resetForm) callbacks.push(function() { $form.resetForm(); });\r
+    if (options.clearForm) callbacks.push(function() { $form.clearForm(); });\r
+\r
+    // perform a load on the target only if dataType is not provided\r
+    if (!options.dataType && options.target) {\r
+        var oldSuccess = options.success || function(){};\r
+        callbacks.push(function(data) {\r
+            $(options.target).html(data).each(oldSuccess, arguments);\r
+        });\r
+    }\r
+    else if (options.success)\r
+        callbacks.push(options.success);\r
+\r
+    options.success = function(data, status) {\r
+        for (var i=0, max=callbacks.length; i < max; i++)\r
+            callbacks[i].apply(options, [data, status, $form]);\r
+    };\r
+\r
+    // are there files to upload?\r
+    var files = $('input:file', this).fieldValue();\r
+    var found = false;\r
+    for (var j=0; j < files.length; j++)\r
+        if (files[j])\r
+            found = true;\r
+\r
+    // options.iframe allows user to force iframe mode\r
+   if (options.iframe || found) { \r
+       // hack to fix Safari hang (thanks to Tim Molendijk for this)\r
+       // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d\r
+       if ($.browser.safari && options.closeKeepAlive)\r
+           $.get(options.closeKeepAlive, fileUpload);\r
+       else\r
+           fileUpload();\r
+       }\r
+   else\r
+       $.ajax(options);\r
+\r
+    // fire 'notify' event\r
+    this.trigger('form-submit-notify', [this, options]);\r
+    return this;\r
+\r
+\r
+    // private function for handling file uploads (hat tip to YAHOO!)\r
+    function fileUpload() {\r
+        var form = $form[0];\r
+        \r
+        if ($(':input[@name=submit]', form).length) {\r
+            alert('Error: Form elements must not be named "submit".');\r
+            return;\r
+        }\r
+        \r
+        var opts = $.extend({}, $.ajaxSettings, options);\r
+               var s = jQuery.extend(true, {}, $.extend(true, {}, $.ajaxSettings), opts);\r
+\r
+        var id = 'jqFormIO' + (new Date().getTime());\r
+        var $io = $('<iframe id="' + id + '" name="' + id + '" />');\r
+        var io = $io[0];\r
+\r
+        if ($.browser.msie || $.browser.opera) \r
+            io.src = 'javascript:false;document.write("");';\r
+        $io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });\r
+\r
+        var xhr = { // mock object\r
+            aborted: 0,\r
+            responseText: null,\r
+            responseXML: null,\r
+            status: 0,\r
+            statusText: 'n/a',\r
+            getAllResponseHeaders: function() {},\r
+            getResponseHeader: function() {},\r
+            setRequestHeader: function() {},\r
+            abort: function() { \r
+                this.aborted = 1; \r
+                $io.attr('src','about:blank'); // abort op in progress\r
+            }\r
+        };\r
+\r
+        var g = opts.global;\r
+        // trigger ajax global events so that activity/block indicators work like normal\r
+        if (g && ! $.active++) $.event.trigger("ajaxStart");\r
+        if (g) $.event.trigger("ajaxSend", [xhr, opts]);\r
+\r
+               if (s.beforeSend && s.beforeSend(xhr, s) === false) {\r
+                       s.global && jQuery.active--;\r
+                       return;\r
+        }\r
+        if (xhr.aborted)\r
+            return;\r
+        \r
+        var cbInvoked = 0;\r
+        var timedOut = 0;\r
+\r
+        // add submitting element to data if we know it\r
+        var sub = form.clk;\r
+        if (sub) {\r
+            var n = sub.name;\r
+            if (n && !sub.disabled) {\r
+                options.extraData = options.extraData || {};\r
+                options.extraData[n] = sub.value;\r
+                if (sub.type == "image") {\r
+                    options.extraData[name+'.x'] = form.clk_x;\r
+                    options.extraData[name+'.y'] = form.clk_y;\r
+                }\r
+            }\r
+        }\r
+\r
+        // take a breath so that pending repaints get some cpu time before the upload starts\r
+        setTimeout(function() {\r
+            // make sure form attrs are set\r
+            var t = $form.attr('target'), a = $form.attr('action');\r
+            $form.attr({\r
+                target:   id,\r
+                method:   'POST',\r
+                action:   opts.url\r
+            });\r
+            \r
+            // ie borks in some cases when setting encoding\r
+            if (! options.skipEncodingOverride) {\r
+                $form.attr({\r
+                    encoding: 'multipart/form-data',\r
+                    enctype:  'multipart/form-data'\r
+                });\r
+            }\r
+\r
+            // support timout\r
+            if (opts.timeout)\r
+                setTimeout(function() { timedOut = true; cb(); }, opts.timeout);\r
+\r
+            // add "extra" data to form if provided in options\r
+            var extraInputs = [];\r
+            try {\r
+                if (options.extraData)\r
+                    for (var n in options.extraData)\r
+                        extraInputs.push(\r
+                            $('<input type="hidden" name="'+n+'" value="'+options.extraData[n]+'" />')\r
+                                .appendTo(form)[0]);\r
+            \r
+                // add iframe to doc and submit the form\r
+                $io.appendTo('body');\r
+                io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);\r
+                form.submit();\r
+            }\r
+            finally {\r
+                // reset attrs and remove "extra" input elements\r
+                $form.attr('action', a);\r
+                t ? $form.attr('target', t) : $form.removeAttr('target');\r
+                $(extraInputs).remove();\r
+            }\r
+        }, 10);\r
+\r
+        function cb() {\r
+            if (cbInvoked++) return;\r
+            \r
+            io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);\r
+\r
+            var operaHack = 0;\r
+            var ok = true;\r
+            try {\r
+                if (timedOut) throw 'timeout';\r
+                // extract the server response from the iframe\r
+                var data, doc;\r
+\r
+                doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;\r
+                \r
+                if (doc.body == null && !operaHack && $.browser.opera) {\r
+                    // In Opera 9.2.x the iframe DOM is not always traversable when\r
+                    // the onload callback fires so we give Opera 100ms to right itself\r
+                    operaHack = 1;\r
+                    cbInvoked--;\r
+                    setTimeout(cb, 100);\r
+                    return;\r
+                }\r
+                \r
+                xhr.responseText = doc.body ? doc.body.innerHTML : null;\r
+                xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;\r
+                xhr.getResponseHeader = function(header){\r
+                    var headers = {'content-type': opts.dataType};\r
+                    return headers[header];\r
+                };\r
+\r
+                if (opts.dataType == 'json' || opts.dataType == 'script') {\r
+                    var ta = doc.getElementsByTagName('textarea')[0];\r
+                    xhr.responseText = ta ? ta.value : xhr.responseText;\r
+                }\r
+                else if (opts.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {\r
+                    xhr.responseXML = toXml(xhr.responseText);\r
+                }\r
+                data = $.httpData(xhr, opts.dataType);\r
+            }\r
+            catch(e){\r
+                ok = false;\r
+                $.handleError(opts, xhr, 'error', e);\r
+            }\r
+\r
+            // ordering of these callbacks/triggers is odd, but that's how $.ajax does it\r
+            if (ok) {\r
+                opts.success(data, 'success');\r
+                if (g) $.event.trigger("ajaxSuccess", [xhr, opts]);\r
+            }\r
+            if (g) $.event.trigger("ajaxComplete", [xhr, opts]);\r
+            if (g && ! --$.active) $.event.trigger("ajaxStop");\r
+            if (opts.complete) opts.complete(xhr, ok ? 'success' : 'error');\r
+\r
+            // clean up\r
+            setTimeout(function() {\r
+                $io.remove();\r
+                xhr.responseXML = null;\r
+            }, 100);\r
+        };\r
+\r
+        function toXml(s, doc) {\r
+            if (window.ActiveXObject) {\r
+                doc = new ActiveXObject('Microsoft.XMLDOM');\r
+                doc.async = 'false';\r
+                doc.loadXML(s);\r
+            }\r
+            else\r
+                doc = (new DOMParser()).parseFromString(s, 'text/xml');\r
+            return (doc && doc.documentElement && doc.documentElement.tagName != 'parsererror') ? doc : null;\r
+        };\r
+    };\r
+};\r
+\r
+/**\r
+ * ajaxForm() provides a mechanism for fully automating form submission.\r
+ *\r
+ * The advantages of using this method instead of ajaxSubmit() are:\r
+ *\r
+ * 1: This method will include coordinates for <input type="image" /> elements (if the element\r
+ *    is used to submit the form).\r
+ * 2. This method will include the submit element's name/value data (for the element that was\r
+ *    used to submit the form).\r
+ * 3. This method binds the submit() method to the form for you.\r
+ *\r
+ * The options argument for ajaxForm works exactly as it does for ajaxSubmit.  ajaxForm merely\r
+ * passes the options argument along after properly binding events for submit elements and\r
+ * the form itself.\r
+ */ \r
+$.fn.ajaxForm = function(options) {\r
+    return this.ajaxFormUnbind().bind('submit.form-plugin',function() {\r
+        $(this).ajaxSubmit(options);\r
+        return false;\r
+    }).each(function() {\r
+        // store options in hash\r
+        $(":submit,input:image", this).bind('click.form-plugin',function(e) {\r
+            var form = this.form;\r
+            form.clk = this;\r
+            if (this.type == 'image') {\r
+                if (e.offsetX != undefined) {\r
+                    form.clk_x = e.offsetX;\r
+                    form.clk_y = e.offsetY;\r
+                } else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin\r
+                    var offset = $(this).offset();\r
+                    form.clk_x = e.pageX - offset.left;\r
+                    form.clk_y = e.pageY - offset.top;\r
+                } else {\r
+                    form.clk_x = e.pageX - this.offsetLeft;\r
+                    form.clk_y = e.pageY - this.offsetTop;\r
+                }\r
+            }\r
+            // clear form vars\r
+            setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 10);\r
+        });\r
+    });\r
+};\r
+\r
+// ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm\r
+$.fn.ajaxFormUnbind = function() {\r
+    this.unbind('submit.form-plugin');\r
+    return this.each(function() {\r
+        $(":submit,input:image", this).unbind('click.form-plugin');\r
+    });\r
+\r
+};\r
+\r
+/**\r
+ * formToArray() gathers form element data into an array of objects that can\r
+ * be passed to any of the following ajax functions: $.get, $.post, or load.\r
+ * Each object in the array has both a 'name' and 'value' property.  An example of\r
+ * an array for a simple login form might be:\r
+ *\r
+ * [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]\r
+ *\r
+ * It is this array that is passed to pre-submit callback functions provided to the\r
+ * ajaxSubmit() and ajaxForm() methods.\r
+ */\r
+$.fn.formToArray = function(semantic) {\r
+    var a = [];\r
+    if (this.length == 0) return a;\r
+\r
+    var form = this[0];\r
+    var els = semantic ? form.getElementsByTagName('*') : form.elements;\r
+    if (!els) return a;\r
+    for(var i=0, max=els.length; i < max; i++) {\r
+        var el = els[i];\r
+        var n = el.name;\r
+        if (!n) continue;\r
+\r
+        if (semantic && form.clk && el.type == "image") {\r
+            // handle image inputs on the fly when semantic == true\r
+            if(!el.disabled && form.clk == el)\r
+                a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});\r
+            continue;\r
+        }\r
+\r
+        var v = $.fieldValue(el, true);\r
+        if (v && v.constructor == Array) {\r
+            for(var j=0, jmax=v.length; j < jmax; j++)\r
+                a.push({name: n, value: v[j]});\r
+        }\r
+        else if (v !== null && typeof v != 'undefined')\r
+            a.push({name: n, value: v});\r
+    }\r
+\r
+    if (!semantic && form.clk) {\r
+        // input type=='image' are not found in elements array! handle them here\r
+        var inputs = form.getElementsByTagName("input");\r
+        for(var i=0, max=inputs.length; i < max; i++) {\r
+            var input = inputs[i];\r
+            var n = input.name;\r
+            if(n && !input.disabled && input.type == "image" && form.clk == input)\r
+                a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});\r
+        }\r
+    }\r
+    return a;\r
+};\r
+\r
+/**\r
+ * Serializes form data into a 'submittable' string. This method will return a string\r
+ * in the format: name1=value1&amp;name2=value2\r
+ */\r
+$.fn.formSerialize = function(semantic) {\r
+    //hand off to jQuery.param for proper encoding\r
+    return $.param(this.formToArray(semantic));\r
+};\r
+\r
+/**\r
+ * Serializes all field elements in the jQuery object into a query string.\r
+ * This method will return a string in the format: name1=value1&amp;name2=value2\r
+ */\r
+$.fn.fieldSerialize = function(successful) {\r
+    var a = [];\r
+    this.each(function() {\r
+        var n = this.name;\r
+        if (!n) return;\r
+        var v = $.fieldValue(this, successful);\r
+        if (v && v.constructor == Array) {\r
+            for (var i=0,max=v.length; i < max; i++)\r
+                a.push({name: n, value: v[i]});\r
+        }\r
+        else if (v !== null && typeof v != 'undefined')\r
+            a.push({name: this.name, value: v});\r
+    });\r
+    //hand off to jQuery.param for proper encoding\r
+    return $.param(a);\r
+};\r
+\r
+/**\r
+ * Returns the value(s) of the element in the matched set.  For example, consider the following form:\r
+ *\r
+ *  <form><fieldset>\r
+ *      <input name="A" type="text" />\r
+ *      <input name="A" type="text" />\r
+ *      <input name="B" type="checkbox" value="B1" />\r
+ *      <input name="B" type="checkbox" value="B2"/>\r
+ *      <input name="C" type="radio" value="C1" />\r
+ *      <input name="C" type="radio" value="C2" />\r
+ *  </fieldset></form>\r
+ *\r
+ *  var v = $(':text').fieldValue();\r
+ *  // if no values are entered into the text inputs\r
+ *  v == ['','']\r
+ *  // if values entered into the text inputs are 'foo' and 'bar'\r
+ *  v == ['foo','bar']\r
+ *\r
+ *  var v = $(':checkbox').fieldValue();\r
+ *  // if neither checkbox is checked\r
+ *  v === undefined\r
+ *  // if both checkboxes are checked\r
+ *  v == ['B1', 'B2']\r
+ *\r
+ *  var v = $(':radio').fieldValue();\r
+ *  // if neither radio is checked\r
+ *  v === undefined\r
+ *  // if first radio is checked\r
+ *  v == ['C1']\r
+ *\r
+ * The successful argument controls whether or not the field element must be 'successful'\r
+ * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).\r
+ * The default value of the successful argument is true.  If this value is false the value(s)\r
+ * for each element is returned.\r
+ *\r
+ * Note: This method *always* returns an array.  If no valid value can be determined the\r
+ *       array will be empty, otherwise it will contain one or more values.\r
+ */\r
+$.fn.fieldValue = function(successful) {\r
+    for (var val=[], i=0, max=this.length; i < max; i++) {\r
+        var el = this[i];\r
+        var v = $.fieldValue(el, successful);\r
+        if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length))\r
+            continue;\r
+        v.constructor == Array ? $.merge(val, v) : val.push(v);\r
+    }\r
+    return val;\r
+};\r
+\r
+/**\r
+ * Returns the value of the field element.\r
+ */\r
+$.fieldValue = function(el, successful) {\r
+    var n = el.name, t = el.type, tag = el.tagName.toLowerCase();\r
+    if (typeof successful == 'undefined') successful = true;\r
+\r
+    if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||\r
+        (t == 'checkbox' || t == 'radio') && !el.checked ||\r
+        (t == 'submit' || t == 'image') && el.form && el.form.clk != el ||\r
+        tag == 'select' && el.selectedIndex == -1))\r
+            return null;\r
+\r
+    if (tag == 'select') {\r
+        var index = el.selectedIndex;\r
+        if (index < 0) return null;\r
+        var a = [], ops = el.options;\r
+        var one = (t == 'select-one');\r
+        var max = (one ? index+1 : ops.length);\r
+        for(var i=(one ? index : 0); i < max; i++) {\r
+            var op = ops[i];\r
+            if (op.selected) {\r
+                // extra pain for IE...\r
+                var v = $.browser.msie && !(op.attributes['value'].specified) ? op.text : op.value;\r
+                if (one) return v;\r
+                a.push(v);\r
+            }\r
+        }\r
+        return a;\r
+    }\r
+    return el.value;\r
+};\r
+\r
+/**\r
+ * Clears the form data.  Takes the following actions on the form's input fields:\r
+ *  - input text fields will have their 'value' property set to the empty string\r
+ *  - select elements will have their 'selectedIndex' property set to -1\r
+ *  - checkbox and radio inputs will have their 'checked' property set to false\r
+ *  - inputs of type submit, button, reset, and hidden will *not* be effected\r
+ *  - button elements will *not* be effected\r
+ */\r
+$.fn.clearForm = function() {\r
+    return this.each(function() {\r
+        $('input,select,textarea', this).clearFields();\r
+    });\r
+};\r
+\r
+/**\r
+ * Clears the selected form elements.\r
+ */\r
+$.fn.clearFields = $.fn.clearInputs = function() {\r
+    return this.each(function() {\r
+        var t = this.type, tag = this.tagName.toLowerCase();\r
+        if (t == 'text' || t == 'password' || tag == 'textarea')\r
+            this.value = '';\r
+        else if (t == 'checkbox' || t == 'radio')\r
+            this.checked = false;\r
+        else if (tag == 'select')\r
+            this.selectedIndex = -1;\r
+    });\r
+};\r
+\r
+/**\r
+ * Resets the form data.  Causes all form elements to be reset to their original value.\r
+ */\r
+$.fn.resetForm = function() {\r
+    return this.each(function() {\r
+        // guard against an input with the name of 'reset'\r
+        // note that IE reports the reset function as an 'object'\r
+        if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType))\r
+            this.reset();\r
+    });\r
+};\r
+\r
+/**\r
+ * Enables or disables any matching elements.\r
+ */\r
+$.fn.enable = function(b) { \r
+    if (b == undefined) b = true;\r
+    return this.each(function() { \r
+        this.disabled = !b \r
+    });\r
+};\r
+\r
+/**\r
+ * Checks/unchecks any matching checkboxes or radio buttons and\r
+ * selects/deselects and matching option elements.\r
+ */\r
+$.fn.selected = function(select) {\r
+    if (select == undefined) select = true;\r
+    return this.each(function() { \r
+        var t = this.type;\r
+        if (t == 'checkbox' || t == 'radio')\r
+            this.checked = select;\r
+        else if (this.tagName.toLowerCase() == 'option') {\r
+            var $sel = $(this).parent('select');\r
+            if (select && $sel[0] && $sel[0].type == 'select-one') {\r
+                // deselect all other options\r
+                $sel.find('option').selected(false);\r
+            }\r
+            this.selected = select;\r
+        }\r
+    });\r
+};\r
+\r
+// helper fn for console logging\r
+// set $.fn.ajaxSubmit.debug to true to enable debug logging\r
+function log() {\r
+    if ($.fn.ajaxSubmit.debug && window.console && window.console.log)\r
+        window.console.log('[jquery.form] ' + Array.prototype.join.call(arguments,''));\r
+};\r
+\r
+})(jQuery);\r
index 38a9589680ef9e9bb28d42f1240eded954bd1d3e..c43af23337a532a12fee435e4b456391ba37d983 100644 (file)
@@ -20,21 +20,21 @@ $(document).ready(function(){
        // count character on keyup
        function counter(event){
                var maxLength = 140;
-               var currentLength = $("#status_textarea").val().length;
+               var currentLength = $("#notice_data-text").val().length;
                var remaining = maxLength - currentLength;
                var counter = $("#counter");
                counter.text(remaining);
                
                if (remaining <= 0) {
-                       $("#status_form").addClass("response_error");
+                       $("#form_notice").addClass("response_error");
                } else {
-                       $("#status_form").removeClass("response_error");
+                       $("#form_notice").removeClass("response_error");
                }
        }
 
        function submitonreturn(event) {
                if (event.keyCode == 13) {
-                       $("#status_form").submit();
+                       $("#form_notice").submit();
                        event.preventDefault();
                        event.stopPropagation();
                        return false;
@@ -42,15 +42,15 @@ $(document).ready(function(){
                return true;
        }
 
-       if ($("#status_textarea").length) {
-               $("#status_textarea").bind("keyup", counter);
-               $("#status_textarea").bind("keydown", submitonreturn);
+       if ($("#notice_data-text").length) {
+               $("#notice_data-text").bind("keyup", counter);
+               $("#notice_data-text").bind("keydown", submitonreturn);
                
                // run once in case there's something in there
                counter();
                
                // set the focus
-               $("#status_textarea").focus();
+               $("#notice_data-text").focus();
        }
 
        // XXX: refactor this code
@@ -136,12 +136,12 @@ $(document).ready(function(){
 
 
        var PostNotice = { dataType: 'xml',
-                                          beforeSubmit: function(formData, jqForm, options) { if ($("#status_textarea").get(0).value.length == 0) {
-                                                                                                                                                               $("#status_form").addClass("response_error");
+                                          beforeSubmit: function(formData, jqForm, options) { if ($("#notice_data-text").get(0).value.length == 0) {
+                                                                                                                                                               $("#form_notice").addClass("warning");
                                                                                                                                                                return false;
                                                                                                                                                   }
-                                                                                                                                                  $("#status_form input[type=submit]").attr("disabled", "disabled");
-                                                                                                                                                  $("#status_form input[type=submit]").addClass("disabled");
+                                                                                                                                                  $("#notice_action-submit").attr("disabled", "disabled");
+                                                                                                                                                  $("#notice_action-submit").addClass("disabled");
                                                                                                                                                   return true;
                                                                                                                                                 },
                                           success: function(xml) {     if ($("#error", xml).length > 0 || $("#command_result", xml).length > 0) {
@@ -150,28 +150,37 @@ $(document).ready(function(){
                                                                                                        alert(result);
                                                                                                }
                                                                                                else {
-                                                                                                       $("#notices").prepend(document._importNode($("li", xml).get(0), true));
-                                                                                                       $("#status_textarea").val("");
+                                                                                                       $("#notices_primary .notices").prepend(document._importNode($("li", xml).get(0), true));
+                                                                                                       $("#notice_data-text").val("");
                                                                                                        counter();
-                                                                                                       $(".notice_single:first").css({display:"none"});
-                                                                                                       $(".notice_single:first").fadeIn(2500);
+                                                                                                       $("#notices_primary .notice:first").css({display:"none"});
+                                                                                                       $("#notices_primary .notice:first").fadeIn(2500);
                                                                                                }
-                                                                                               $("#status_form input[type=submit]").removeAttr("disabled");
-                                                                                               $("#status_form input[type=submit]").removeClass("disabled");
+                                                                                               $("#notice_action-submit").removeAttr("disabled");
+                                                                                               $("#notice_action-submit").removeClass("disabled");
                                                                                         }
                                           };
-       $("#status_form").ajaxForm(PostNotice);
-       $("#status_form").each(addAjaxHidden);
+       $("#form_notice").ajaxForm(PostNotice);
+       $("#form_notice").each(addAjaxHidden);
+
+    $(".notice").hover(
+        function () {
+            $(this).addClass('hover');
+        }, 
+        function () {
+            $(this).removeClass('hover');
+        }
+    );
 });
 
 function doreply(nick,id) {
        rgx_username = /^[0-9a-zA-Z\-_.]*$/;
        if (nick.match(rgx_username)) {
                replyto = "@" + nick + " ";
-               if ($("#status_textarea").length) {
-                       $("#status_textarea").val(replyto);
-                       $("form#status_form input#inreplyto").val(id);
-                       $("#status_textarea").focus();
+               if ($("#notice_data-text").length) {
+                       $("#notice_data-text").val(replyto);
+                       $("form#form_notice input#inreplyto").val(id);
+                       $("#notice_data-text").focus();
                        return false;
                }
        }
index 792b9c0575bad294e69b65dc2d9ef4c68fe78cf3..129a4b24b655d29638e196a2293a755db2e56804 100644 (file)
@@ -436,16 +436,16 @@ class Action extends HTMLOutputter // lawsuit
         $this->element('dt', array('id' => 'site_content_license'), _('Laconica software license'));
         $this->elementStart('dd', array('id' => 'site_content_license_cc'));
         $this->elementStart('p');
-        $this->text(_('Unless otherwise specified, contents of this site are copyright by the contributors and available under the '));
+        $this->element('img', array('id' => 'license_cc',
+                                    'src' => common_config('license', 'image'),
+                                    'alt' => common_config('license', 'title')));
+        $this->text(_('All criti.ca content and data are available under the '));
         $this->element('a', array('class' => 'license',
                                   'rel' => 'external license',
                                   'href' => common_config('license', 'url')),
                        common_config('license', 'title'));
-        $this->text(_('. Contributors should be attributed by full name or nickname.'));
+        $this->text(_('license.'));
         $this->elementEnd('p');
-        $this->element('img', array('id' => 'license_cc',
-                                    'src' => common_config('license', 'image'),
-                                    'alt' => common_config('license', 'title')));
         $this->elementEnd('dd');
     }
 
index 2ef26cfc628eb5b6e55db5ade3e26c51ed297744..05fef045a1b2074e0c5c2da58fcbf486bcefbefc 100644 (file)
@@ -79,7 +79,7 @@ $config =
         'license' =>
         array('url' => 'http://creativecommons.org/licenses/by/3.0/',
               'title' => 'Creative Commons Attribution 3.0',
-              'image' => 'http://i.creativecommons.org/l/by/3.0/88x31.png'),
+              'image' => 'http://i.creativecommons.org/l/by/3.0/80x15.png'),
         'mail' =>
         array('backend' => 'mail',
               'params' => null),
index b039dc110ae4bedf05d677ed1447f04c32d7052c..4d7611b3094ad2ca531c2202829e1e686a10f203 100644 (file)
@@ -15,7 +15,6 @@ position:relative;
 margin:0 auto;
 width:1004px;
 width:71.714em;
-max-width:100%;
 }
 h1 {
 font-size:2.1em;
@@ -176,7 +175,7 @@ margin-bottom:18px;
 
 #footer {
 float:left;
-width:100%;
+width:68%;
 padding-bottom:11px;
 }
 
@@ -254,6 +253,9 @@ margin-left:0;
 
 
 
+#licenses {
+font-size:0.9em;
+}
 
 #licenses dt {
 font-weight:bold;
@@ -261,17 +263,16 @@ display:none;
 }
 #licenses dd {
 margin-bottom:11px;
+line-height:1.5;
 }
 
 
 #site_content_license_cc p {
-float:left;
-margin-left:10%;
-width:90%;
 }
 #site_content_license_cc img {
-float:left;
-margin-left:-100%;
+display:inline;
+vertical-align:top;
+margin-right:4px;
 }