Commit f25b6e61 authored by Zach Copley's avatar Zach Copley

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.
parents 443b495a 34b6038b
......@@ -480,7 +480,7 @@ class EventPlugin extends MicroappPlugin
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)
......
......@@ -83,7 +83,7 @@ class EventForm extends Form
*/
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->li();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment