Skip to content
This repository has been archived by the owner on Aug 2, 2019. It is now read-only.

Commit

Permalink
Added a params to form_datepicker to account for when January is not the
Browse files Browse the repository at this point in the history
first element in the dropdown.
  • Loading branch information
EricHogue committed Mar 29, 2013
1 parent 8595c88 commit 4783427
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 22 deletions.
13 changes: 7 additions & 6 deletions src/system/application/helpers/common_helper.php
Expand Up @@ -186,13 +186,14 @@ function escape_allowing_presentation_tags($str)
/** /**
* Returns the javascript required for a datepicker for a form * Returns the javascript required for a datepicker for a form
* *
* @param string $day Day to select initially in datepicker * @param string $day Day to select initially in datepicker
* @param string $month Month to select initially in datepicker * @param string $month Month to select initially in datepicker
* @param string $year Year to select initially in datepicker * @param string $year Year to select initially in datepicker
* @param int $monthFirstIndex Index of January in the dropdow.
* *
* @return string * @return string
**/ **/
function form_datepicker($day, $month, $year) function form_datepicker($day, $month, $year, $monthFirstIndex = 0)
{ {
$javascript = <<< JSCRIPT $javascript = <<< JSCRIPT
<input type='hidden' id='{$day}_{$month}_{$year}' /> <input type='hidden' id='{$day}_{$month}_{$year}' />
Expand All @@ -210,7 +211,7 @@ function form_datepicker($day, $month, $year)
var selectdte = function(dateText, inst) { var selectdte = function(dateText, inst) {
var vals = dateText.split('-'); var vals = dateText.split('-');
yr.val(vals[2]); yr.val(vals[2]);
mo.get(0).selectedIndex = (vals[0]-1); mo.get(0).selectedIndex = (vals[0]-1 + {$monthFirstIndex});
da.val(vals[1].replace(/^0/, "")); da.val(vals[1].replace(/^0/, ""));
}; };
$('#{$day}_{$month}_{$year}').datepicker({ $('#{$day}_{$month}_{$year}').datepicker({
Expand All @@ -233,7 +234,7 @@ function form_datepicker($day, $month, $year)
* Remove htmlspecialchars from a string, used for comments * Remove htmlspecialchars from a string, used for comments
* Because CI has decided to embed htmlspecialchars in the form helper... * Because CI has decided to embed htmlspecialchars in the form helper...
* *
* @param string $comment Comment to decode * @param string $comment Comment to decode
* *
* @return string * @return string
*/ */
Expand Down
32 changes: 16 additions & 16 deletions src/system/application/views/search/main.php
@@ -1,6 +1,6 @@
<?php <?php
if (!empty($results)) { if (!empty($results)) {
menu_pagetitle('Search for: ' . escape($this->validation->search_term)); menu_pagetitle('Search for: ' . escape($this->validation->search_term));
} else { } else {
menu_pagetitle('Search'); menu_pagetitle('Search');
} }
Expand All @@ -9,53 +9,53 @@


<div class="box"> <div class="box">
<?php echo form_open('/search'); ?> <?php echo form_open('/search'); ?>

<?php if (!empty($this->validation->error_string)): ?> <?php if (!empty($this->validation->error_string)): ?>
<?php $this->load->view('msg_error', array('msg' => $this->validation->error_string)); ?> <?php $this->load->view('msg_error', array('msg' => $this->validation->error_string)); ?>
<?php endif; ?> <?php endif; ?>

<div class="row"> <div class="row">
<label for="search_term">Search term</label> <label for="search_term">Search term</label>
<?php <?php
$arr=array( $arr=array(
'name' => 'search_term', 'name' => 'search_term',
'id' => 'search_term', 'id' => 'search_term',
'size' => 50, 'size' => 50,
'value' => $this->validation->search_term 'value' => $this->validation->search_term
); );
echo form_input($arr); echo form_input($arr);
?> ?>
<div class="clear"></div> <div class="clear"></div>
</div> </div>

<div class="row"> <div class="row">
<label for="search_term">Date range</label> <label for="search_term">Date range</label>
<?php <?php
foreach (range(1,12) as $v) { $start_mo[$v]=strftime('%B', strtotime('2000-' . $v . '-01')); } foreach (range(1,12) as $v) { $start_mo[$v]=strftime('%B', strtotime('2000-' . $v . '-01')); }
foreach (range(1,31) as $v) { $start_day[$v]=sprintf('%02d', $v); } foreach (range(1,31) as $v) { $start_day[$v]=sprintf('%02d', $v); }
foreach (range(date('Y')-5, date('Y')+5) as $v) { $start_yr[$v]=$v; } foreach (range(date('Y')-5, date('Y')+5) as $v) { $start_yr[$v]=$v; }

$start_mo = array(''=>'Month') + $start_mo; $start_mo = array(''=>'Month') + $start_mo;
$start_day = array(''=>'Day') + $start_day; $start_day = array(''=>'Day') + $start_day;
$start_yr = array(''=>'Year') + $start_yr; $start_yr = array(''=>'Year') + $start_yr;

echo form_dropdown('start_mo', $start_mo, $this->validation->start_mo); echo form_dropdown('start_mo', $start_mo, $this->validation->start_mo);
echo form_dropdown('start_day', $start_day, $this->validation->start_day); echo form_dropdown('start_day', $start_day, $this->validation->start_day);
echo form_dropdown('start_yr', $start_yr, $this->validation->start_yr); echo form_dropdown('start_yr', $start_yr, $this->validation->start_yr);
echo form_datepicker('start_day', 'start_mo', 'start_yr'); echo form_datepicker('start_day', 'start_mo', 'start_yr', 1);
echo ' - '; echo ' - ';
echo form_dropdown('end_mo', $start_mo, $this->validation->end_mo); echo form_dropdown('end_mo', $start_mo, $this->validation->end_mo);
echo form_dropdown('end_day', $start_day, $this->validation->end_day); echo form_dropdown('end_day', $start_day, $this->validation->end_day);
echo form_dropdown('end_yr', $start_yr, $this->validation->end_yr); echo form_dropdown('end_yr', $start_yr, $this->validation->end_yr);
echo form_datepicker('end_day', 'end_mo', 'end_yr'); echo form_datepicker('end_day', 'end_mo', 'end_yr', 1);
?> ?>
<div class="clear"></div> <div class="clear"></div>
</div> </div>

<div class="row row-buttons"> <div class="row row-buttons">
<?php echo form_submit(array('name' => 'sub', 'class' => 'btn'), 'Search'); ?> <?php echo form_submit(array('name' => 'sub', 'class' => 'btn'), 'Search'); ?>
</div> </div>

<?php echo form_close(); ?> <?php echo form_close(); ?>


</div> </div>
Expand Down Expand Up @@ -86,7 +86,7 @@
?> ?>
</div> </div>
<?php endif; ?> <?php endif; ?>

<?php if (!empty($results['users'])): ?> <?php if (!empty($results['users'])): ?>
<div class="box"> <div class="box">
<h2>Users</h2> <h2>Users</h2>
Expand All @@ -97,7 +97,7 @@
?> ?>
</div> </div>
<?php endif; ?> <?php endif; ?>

<?php endif; ?> <?php endif; ?>
<?php endif; <?php endif;


0 comments on commit 4783427

Please sign in to comment.