mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 06:38:00 +02:00
Code Issues Releases Wiki Activity

Closes #330

Browse Source
This commit is contained in:
Cameron
2013-05-25 16:52:45 -07:00
parent beca1115c5
commit 348c26a6a0
6 changed files with 38 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_core/templates/header_default.php
View File

@@ -23,9 +23,11 @@ $sql = e107::getDb();
$sql->db_Mark_Time('(Header Top)');
e107::css('core', 'bootstrap-datetimepicker/css/datetimepicker.css', 'jquery');
e107::js('core', 'bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js', 'jquery', 2);
e107::js('core','bootstrap/js/bootstrap-tooltip.js','jquery');
e107::css('core','bootstrap/css/tooltip.css','jquery');
e107::js('core', 'bootstrap/js/bootstrap-tooltip.js','jquery');
e107::css('core', 'bootstrap/css/tooltip.css','jquery');
// ------------------

52
e107_handlers/form_handler.php
View File

@@ -612,57 +612,40 @@ class e_form
* @example $frm->datepicker('my_field',time(),'type=date');
* @example $frm->datepicker('my_field',time(),'type=datetime&inline=1');
* @example $frm->datepicker('my_field',time(),'type=date&format=yyyy-mm-dd');
* @example $frm->datepicker('my_field',time(),'type=datetime&format=MM, dd, yyyy hh:ii');
*
* @url http://trentrichardson.com/examples/timepicker/
*/
function datepicker($name, $datestamp = false, $options = null)
{
if(vartrue($options) && is_string($options))
{
parse_str($options,$options);
}
$type = varset($options['type']) ? trim($options['type']) : "date"; // 'datetime'
$type = varset($options['type']) ? trim($options['type']) : "date"; // OR 'datetime'
$dateFormat = varset($options['format']) ? trim($options['format']) :e107::getPref('inputdate', '%Y-%m-%d');
// $timeFormat = varset($options['timeformat']) ? trim($options['timeformat']) :e107::getPref('inputtime', '%H:%M:%S');
$ampm = (preg_match("/%l|%I|%p|%P/",$dateFormat)) ? 'true' : 'false';
if($type == 'datetime' && !varset($options['format']))
{
$dateFormat .= " ".e107::getPref('inputtime', '%H:%M:%S');
}
// echo "TYPE=".$type;
$ampm = (preg_match("/%l|%I|%p|%P/",$dateFormat)) ? 'true' : 'false';
$dformat = e107::getDate()->toMask($dateFormat);
// $tformat = e107::getDate()->toMask($timeFormat);
$id = $this->name2id($name);
$classes = array(
'date' => 'e-date',
// 'time' => 'e-time',
'datetime' => 'e-datetime'
);
$def = array(
'date' => $dateFormat,
// 'time' => $timeFormat,
'datetime' => $dateFormat // ." ".$timeFormat
);
$defdisp = (isset($def[$type])) ? $def[$type] : $def['date'];
$classes = array('date' => 'e-date', 'datetime' => 'e-datetime');
if ($datestamp)
{
$value = is_numeric($datestamp) ? e107::getDate()->convert_date($datestamp, $defdisp) : $datestamp; //date("d/m/Y H:i:s", $datestamp);
$value = is_numeric($datestamp) ? e107::getDate()->convert_date($datestamp, $dateFormat) : $datestamp; //date("d/m/Y H:i:s", $datestamp);
}
$text = "";
// $text .= 'dformat='.$dformat.' defdisp='.$defdisp;
// $text .= 'dformat='.$dformat.' defdisp='.$dateFormat;
$class = (isset($classes[$type])) ? $classes[$type] : "tbox e-date";
$size = vartrue($options['size']) ? intval($options['size']) : 40;
@@ -676,25 +659,12 @@ class e_form
";
}
else
{
// http://tarruda.github.com/bootstrap-datetimepicker/
//XXX Problem -doesn't support non-numerical date formats. eg. 2 February, 2013
/*
$text .= "
<div class='{$class} input-append date'>
<input data-format='{$dformat}' type='text' id='{$id}' value='{$value}' />
<span class='add-on'>
<i data-time-icon='icon-time' data-date-icon='icon-calendar'></i>
</span>
</div>";
*/
{
$text .= "<input class='{$class} input-xlarge' type='text' size='{$size}' name='{$name}' id='{$id}' value='{$value}' data-date-format='{$dformat}' data-date-ampm='{$ampm}' data-date-firstday='{$firstDay}' {$required} />";
}
// $text .= "ValueFormat: ".$defdisp." Value: ".$value;
// $text .= " ({$dformat}) type:".$defdisp." ".$value;
// $text .= "ValueFormat: ".$dateFormat." Value: ".$value;
// $text .= " ({$dformat}) type:".$dateFormat." ".$value;
return $text;

6
e107_handlers/user_extended_class.php
View File

@@ -829,6 +829,12 @@ class e107_user_extended
break;
case EUF_DATE : //date
if($curval == '0000-00-00') // Quick datepicker fix.
{
$curval = '';
}
return e107::getForm()->datepicker($fname,$curval,'format=yyyy-mm-dd');
break;

8
e107_themes/bootstrap/admin_dark.css
View File

@@ -31,11 +31,19 @@ min-height:50px;
tr.highlight-odd { background-color: #212121; }
tr.highlight-even { background-color: #212121; }
.datetimepicker table tr td.day:hover {
color: black;
}
.datetimepicker table tr td span:hover {
color: black;
}
.bootstrap-select.btn-group .dropdown-menu .optgroup-div {
color: #363636;
}

6
e107_themes/bootstrap/admin_style.css
View File

@@ -127,6 +127,12 @@ td.options { }
legend { display:none }
/* Datepicker */
fieldset.hour legend {
display: inline-block
}
.bootstrap-select.btn-group, .bootstrap-select.btn-group[class*="span"] {
margin-bottom: 0px;

5
usersettings.php
View File

@@ -70,8 +70,9 @@ function addtext_us(sc)
document.getElementById('dataform').image.value = sc;
}
");
e107::css('core', 'bootstrap-datetimepicker/css/datetimepicker.css', 'jquery');
e107::js('core', 'bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js', 'jquery', 2);
$photo_to_delete = '';
$avatar_to_delete = '';