Changeset 1866

Timestamp:

07/30/2010 08:44:58 PM (6 weeks ago)

Author:

dordille

Message:

Made new fields start_time and end_time for events.
Added new time widget.

Location:

plugins/apostropheBlogPlugin/trunk

Files:

• config/doctrine/schema.yml (modified) (1 diff)
• lib/form/doctrine/PluginaEventForm.class.php (modified) (1 diff)
• lib/widget/aWidgetFormJQueryTime.class.php (added)
• modules/aEventAdmin/templates/_form.php (modified) (3 diffs)
• web/css/aBlog.css (modified) (1 diff)
• web/js/timepicker.js (added)

plugins/apostropheBlogPlugin/trunk/config/doctrine/schema.yml

@@ -221 +221 @@
     keyValue: 'event'
   columns:
-    start_date: timestamp
-    end_date: timestamp
+    start_date: date
+    start_time: time
+    end_date: date
+    end_time: time
     
 aEventSlot:

plugins/apostropheBlogPlugin/trunk/lib/form/doctrine/PluginaEventForm.class.php

@@ -19 +19 @@
     parent::setup();
 
-    $this->setWidget('start_date', new sfWidgetFormJQueryDateTime(
-                        array('date' => array('image' => '/apostrophePlugin/images/a-icon-datepicker.png'))
-                ));
-    
-    $this->setValidator('start_date', new sfValidatorDateTime(
+    $this->setWidget('start_date', new sfWidgetFormJQueryDate(
+                        array('image' => '/apostrophePlugin/images/a-icon-datepicker.png'))
+                );
+
+    $this->setValidator('start_date', new sfValidatorDate(
       array(
         'required' => true,
       )));
 
-    $this->setWidget('end_date', new sfWidgetFormJQueryDateTime(
-                        array('date' => array('image' => '/apostrophePlugin/images/a-icon-datepicker.png'))
-                ));
+    $this->setWidget('start_time', new aWidgetFormJQueryTime(array(), array('size' => 8)));
+    $this->setValidator('start_time', new sfValidatorTime(array('required' => false, 'time_output' => 'g:iA')));
 
-    $this->setValidator('end_date', new sfValidatorDateTime(
+    $this->setWidget('end_date', new sfWidgetFormJQueryDate(
+                        array('image' => '/apostrophePlugin/images/a-icon-datepicker.png'))
+                );
+
+    $this->setValidator('end_date', new sfValidatorDate(
       array(
         'required' => true,
       )));
 
-    if($this->getObject()->getStartDate() == $this->getObject()->getEndDate())
-    {
-      $this->getWidget('start_date')->addOption('with_time', false);
-      $this->getWidget('end_date')->addOption('with_time', false);
-    }
+    $this->setWidget('end_time', new aWidgetFormJQueryTime(array(), array('size' => 8)));
+    $this->setValidator('end_time', new sfValidatorTime(array('required' => false, 'time_output' => 'g:iA')));
 
     $this->getWidgetSchema()->setDefault('start_date', date('Y/m/d'));

plugins/apostropheBlogPlugin/trunk/modules/aEventAdmin/templates/_form.php

@@ -1 +1 @@
 <?php use_helper('I18N','jQuery') ?>
+<?php $sf_response->addJavascript('/apostropheBlogPlugin/js/timepicker.js', 'last') ?>
+
 
 <?php echo jq_form_remote_tag(array('url' => url_for('a_event_admin_update',$a_event) , 'update' => 'a-admin-blog-post-form'), array('id'=>'a-admin-form', 'class' => 'blog')) ?>
@@ -47 +49 @@
                 <?php echo $form['start_date']->render(array('beforeShow' => 'aBlogSetDateRange', 'onClose' => 'aBlogUpdateMulti')) ?>
                 <?php echo $form['start_date']->renderError() ?>
+    <?php echo $form['start_time'] ?>
+    <?php echo $form['start_time']->renderError() ?>
         </div>
         <h4>End Date</h4>
@@ -52 +56 @@
                 <?php echo $form['end_date']->render(array('beforeShow' => 'aBlogSetDateRange', 'onClose' => 'aBlogUpdateMulti')) ?>
                 <?php echo $form['end_date']->renderError() ?>
+    <?php echo $form['end_time'] ?>
+    <?php echo $form['end_time']->renderError() ?>
         </div>
 </div>

plugins/apostropheBlogPlugin/trunk/web/css/aBlog.css

@@ -870 +870 @@
         color: #999;
 }
+
+#timepicker
+{
+  position: absolute;
+  display: none;
+  padding: 0;
+  margin: 0;
+  float: left;
+  overflow: auto;
+  height: 100px;
+  background-color: #ffffff;
+}
+
+#timepicker .time-item
+{
+  padding: 3px;
+}
+#timepicker .time-item:hover
+{
+  background-color: #ddddff;
+}