diff options
| author | Kevin Jardine <kevinjardine@yahoo.com> | 2011-08-30 17:52:12 +0200 |
|---|---|---|
| committer | Kevin Jardine <kevinjardine@yahoo.com> | 2011-08-30 17:52:12 +0200 |
| commit | 6b20e80c9d577a3eeeb570a6d9fd706fe619709b (patch) | |
| tree | cecec3ee8ed121617500c6601bbeb407aed99754 /views | |
| parent | 2557245a41579a15dd960e2033f4d5f39ff566ac (diff) | |
| download | elgg-6b20e80c9d577a3eeeb570a6d9fd706fe619709b.tar.gz elgg-6b20e80c9d577a3eeeb570a6d9fd706fe619709b.tar.bz2 | |
a few small fixes
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/input/timepicker.php | 6 | ||||
| -rw-r--r-- | views/default/object/event_calendar.php | 20 |
2 files changed, 15 insertions, 11 deletions
diff --git a/views/default/input/timepicker.php b/views/default/input/timepicker.php index 35fa5ac98..faadd6450 100644 --- a/views/default/input/timepicker.php +++ b/views/default/input/timepicker.php @@ -1,6 +1,6 @@ <?php -$time_format = get_plugin_setting('timeformat', 'event_calendar'); +$time_format = elgg_get_plugin_setting('timeformat', 'event_calendar'); if (!$time_format) { $time_format = 24; } @@ -32,7 +32,7 @@ for($i=0;$i<60;$i=$i+5) { $minutes[$i+1] = sprintf("%02d",$i); } -echo elgg_view('input/pulldown',array('internalname'=>$vars['internalname'].'_h','value'=>$hour,'options_values'=>$hours)); -echo elgg_view('input/pulldown',array('internalname'=>$vars['internalname'].'_m','value'=>$minute,'options_values'=>$minutes)); +echo elgg_view('input/dropdown',array('name'=>$vars['name'].'_h','value'=>$hour,'options_values'=>$hours)); +echo elgg_view('input/dropdown',array('name'=>$vars['name'].'_m','value'=>$minute,'options_values'=>$minutes)); ?>
\ No newline at end of file diff --git a/views/default/object/event_calendar.php b/views/default/object/event_calendar.php index 97829e7c2..43e7847dc 100644 --- a/views/default/object/event_calendar.php +++ b/views/default/object/event_calendar.php @@ -36,7 +36,7 @@ if ($vars['full']) { 'class' => 'elgg-menu-hz', )); - $tags = elgg_view('output/tags', array('tags' => $event->event_tags)); + $tags = elgg_view('output/tags', array('tags' => $event->tags)); $params = array( 'entity' => $event, @@ -73,14 +73,18 @@ if ($vars['full']) { $info = ''; } - $metadata = elgg_view_menu('entity', array( - 'entity' => $event, - 'handler' => 'event_calendar', - 'sort_by' => 'priority', - 'class' => 'elgg-menu-hz', - )); + if (elgg_in_context('widgets')) { + $metadata = ''; + } else { + $metadata = elgg_view_menu('entity', array( + 'entity' => $event, + 'handler' => 'event_calendar', + 'sort_by' => 'priority', + 'class' => 'elgg-menu-hz', + )); + } - $tags = elgg_view('output/tags', array('tags' => $event->event_tags)); + $tags = elgg_view('output/tags', array('tags' => $event->tags)); $params = array( 'entity' => $event, |