Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
* '1.0.x' of gitorious.org:statusnet/mainline: Correct fieldset ID for Event form. Update Event plugin datepicker function for new unique input IDs.
This commit is contained in:
commit
f25b6e6116
@ -480,7 +480,7 @@ class EventPlugin extends MicroappPlugin
|
|||||||
|
|
||||||
function onEndShowScripts($action)
|
function onEndShowScripts($action)
|
||||||
{
|
{
|
||||||
$action->inlineScript('$(document).ready(function() { $("#startdate").datepicker(); $("#enddate").datepicker(); });');
|
$action->inlineScript('$(document).ready(function() { $("#event-startdate").datepicker(); $("#event-enddate").datepicker(); });');
|
||||||
}
|
}
|
||||||
|
|
||||||
function onEndShowStyles($action)
|
function onEndShowStyles($action)
|
||||||
|
@ -83,7 +83,7 @@ class EventForm extends Form
|
|||||||
*/
|
*/
|
||||||
function formData()
|
function formData()
|
||||||
{
|
{
|
||||||
$this->out->elementStart('fieldset', array('id' => 'new_bookmark_data'));
|
$this->out->elementStart('fieldset', array('id' => 'new_event_data'));
|
||||||
$this->out->elementStart('ul', 'form_data');
|
$this->out->elementStart('ul', 'form_data');
|
||||||
|
|
||||||
$this->li();
|
$this->li();
|
||||||
|
Loading…
Reference in New Issue
Block a user