Commit Graph

12599 Commits

Author SHA1 Message Date
Zach Copley 8ffae63b38 Merge branch '1.0.x' into profile-fixups 2011-03-08 14:03:40 -08:00
Brion Vibber 28809035d0 Replace explicit FormXHR setup for a bunch of simple AJAX form submissions with adding the 'ajax' class on them.
This avoids having to add extra custom JS bits just to initialize forms using the common AJAX submission path.
2011-03-08 13:58:28 -08:00
Brion Vibber 90f1cfcfc0 Poll plugin: make the polling response form submit via AJAX and return the results.
Now, any form marked with 'ajax' class will get the simple FormXHR treatment. Should help cut down on code that just adds that into individual forms.
2011-03-08 13:45:51 -08:00
Brion Vibber ba1ada2880 de-IDifying labels in notice form to fix issue with geo pin activating the wrong place when cloning the form
Note that changes to the attachment from <label for/><input id/> to <label><input></label> affect some of the existing styles which attempt to place them both in the same place based on having a common parent. Only 'neo' has been fully tested and fixed for this case, as the others all fail due to the new layout anyway. :)
2011-03-08 12:14:44 -08:00
Brion Vibber 9185364f5a Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-08 10:58:45 -08:00
Brion Vibber 5b0ca315b4 'note' -> 'notice' in an error message -- thx to AVRS on IRC for the catch on translatewiki.net :D 2011-03-08 10:58:14 -08:00
Zach Copley cfe3e83293 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
* '1.0.x' of gitorious.org:statusnet/mainline:
  Initial checkin of Poll plugin: micro-app to post mini polls/surveys from the notice form.
  Localisation updates from http://translatewiki.net.
  More doc comments on MicroApp stuff; some of the show-notice code & the ActivityStreams stuff is a bit wonky and may need smoothing out
  Doc comments for MicroAppPlugin
  mailboxes were wrongly overriding global menu
2011-03-07 21:35:48 -08:00
Zach Copley 99bd8c670c Fix a couple things 2011-03-07 21:34:57 -08:00
Brion Vibber 3438a78c02 Initial checkin of Poll plugin: micro-app to post mini polls/surveys from the notice form.
This version is fairly basic; votes do not (yet) show a reply, they just got in the table. No pretty graphs for the results yet, just text.
The ActivityStream output is temporary and probably should be replaced; the current structures for adding custom data aren't really ready yet (especially since we need to cover JSON and Atom formats, probably pretty differently)

Uses similar system as Bookmark for attaching to notices -- saves a custom URI for an alternate action, which we can then pass in and hook back up to our poll object. This can probably do with a little more simplification in the parent MicroAppPlugin class.

Currently adds two tables:
- poll holds the main poll info: id and URI to associate with the notice, then the question and a text blob with the options.
- poll_response records the selections picked by our nice fellows.

Hopefully no off-by-one bugs left in the selection, but I give no guarantees. ;)
Some todo notes in the README and in doc comments.
2011-03-07 21:28:36 -08:00
Zach Copley be53b94bfd - Fix table name; add comments 2011-03-07 17:26:19 -08:00
Siebrand Mazeland b9e2c72740 Localisation updates from http://translatewiki.net. 2011-03-08 02:18:32 +01:00
Zach Copley 68a3246f1c Fixup sphinx plugin to have additional sort orders 2011-03-07 17:18:30 -08:00
Brion Vibber 541613ce69 More doc comments on MicroApp stuff; some of the show-notice code & the ActivityStreams stuff is a bit wonky and may need smoothing out 2011-03-07 15:15:21 -08:00
Zach Copley b431a3b216 Rearrange alphanav to better fit 3CL 2011-03-07 14:32:14 -08:00
Brion Vibber 4a54bb337a Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-07 13:36:54 -08:00
Brion Vibber 9a837ee33b Doc comments for MicroAppPlugin 2011-03-07 13:36:15 -08:00
Zach Copley 4b24f09ab4 Merge branch '1.0.x' into directory
* 1.0.x: (68 commits)
  Avoid AJAX fetch delay for inline replies when possible; we clone a copy of the notice form skeleton at initialization, then insert it in place instead of fetching a new one.
  Fix bad reference
  lost a </div> in input_forms
  neo is the default
  First version of 3cl theme neo.
  cleaner is the new default theme (for now)
  store reply_to notices as comment activity objects
  fix object errors with bookmark notices
  save the object type when saving a new bookmark notice
  ActivityObject uses Notice's object_type by default
  Notice saves its object type
  show correct notice in output
  UR FACE
  wrapper div for primary nav
  Revert "abstraction for starting and ending a menu"
  Revert "primarynav uses menustart and menuend"
  primarynav uses menustart and menuend
  abstraction for starting and ending a menu
  remove adminpanelnav from adminpanelaction module
  Input form switcher works
  ...
2011-03-07 12:37:51 -08:00
Evan Prodromou 07f62f1412 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-07 15:21:47 -05:00
Brion Vibber f4f4e7499f Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-07 12:20:11 -08:00
Brion Vibber 0c2289fb2f Avoid AJAX fetch delay for inline replies when possible; we clone a copy of the notice form skeleton at initialization, then insert it in place instead of fetching a new one. 2011-03-07 12:18:46 -08:00
Evan Prodromou f8427f3d1e Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-07 15:12:51 -05:00
Evan Prodromou 884c3d06d2 mailboxes were wrongly overriding global menu 2011-03-07 15:11:38 -05:00
Zach Copley 985ff92431 Fix bad reference 2011-03-07 12:10:34 -08:00
Evan Prodromou b7a8863b27 lost a </div> in input_forms 2011-03-07 15:06:21 -05:00
Evan Prodromou 4c0a746831 neo is the default 2011-03-07 15:00:43 -05:00
Samantha Doherty 15686cdf56 First version of 3cl theme neo. 2011-03-07 14:43:06 -05:00
Evan Prodromou 0b95d68910 cleaner is the new default theme (for now) 2011-03-07 14:32:21 -05:00
Evan Prodromou 55b4303ea4 Merge branch '3cl' into 1.0.x 2011-03-07 14:30:30 -05:00
Evan Prodromou e1d177de7e store reply_to notices as comment activity objects 2011-03-07 14:27:23 -05:00
Evan Prodromou 095e2a74d4 fix object errors with bookmark notices 2011-03-07 14:25:37 -05:00
Evan Prodromou f5782e9e56 save the object type when saving a new bookmark notice 2011-03-07 14:25:05 -05:00
Evan Prodromou 6862f765f6 ActivityObject uses Notice's object_type by default 2011-03-07 14:21:16 -05:00
Evan Prodromou 32f4daf44d Notice saves its object type 2011-03-07 14:20:55 -05:00
Evan Prodromou 618a658985 show correct notice in output 2011-03-07 14:06:46 -05:00
Evan Prodromou 998733cdd4 UR FACE 2011-03-07 12:49:20 -05:00
Evan Prodromou 2272044ad1 wrapper div for primary nav 2011-03-07 12:42:51 -05:00
Evan Prodromou b751ab70fb Revert "abstraction for starting and ending a menu"
This reverts commit b4f1281799.
2011-03-07 12:39:52 -05:00
Evan Prodromou 6ab7329e85 Revert "primarynav uses menustart and menuend"
This reverts commit 8e03c83a57.
2011-03-07 12:39:31 -05:00
Evan Prodromou 8e03c83a57 primarynav uses menustart and menuend 2011-03-07 12:37:07 -05:00
Evan Prodromou b4f1281799 abstraction for starting and ending a menu 2011-03-07 12:36:45 -05:00
Evan Prodromou 876c7a42c8 remove adminpanelnav from adminpanelaction module 2011-03-07 12:36:04 -05:00
Evan Prodromou 7380f36d86 Merge branch 'microapp' of gitorious.org:~evan/statusnet/evans-mainline into microapp
Conflicts:
	lib/action.php
2011-03-07 05:02:26 -05:00
Evan Prodromou cf1a4d8292 Input form switcher works
This change adds the input form switcher, which adds a navigation menu
across the top of the input form, letting you switch between different kinds of input.

The input menu doesn't yet look like a nice set of tabs; it could use some love.
2011-03-07 04:57:49 -05:00
Evan Prodromou 7aa55f8200 made the input-form switcher work, kinda 2011-03-07 03:34:20 -05:00
Evan Prodromou 52952d13c0 first (non-working) move to microapp structure for bookmarks 2011-03-07 03:34:20 -05:00
Evan Prodromou 0c3d27046e move microapp.php to microappplugin.php 2011-03-07 03:34:20 -05:00
Evan Prodromou a7b6f7a669 add a couple of methods to MicroAppPlugin 2011-03-07 03:34:20 -05:00
Evan Prodromou 1b5faf1c4e correct length and default value for object_type 2011-03-07 03:34:20 -05:00
Evan Prodromou a0e2ebec8f add activity object type to notice 2011-03-07 03:34:20 -05:00
Evan Prodromou 97dc0260d9 first pass at microapp class 2011-03-07 03:34:20 -05:00