choosable time format
This commit is contained in:
parent
0514a1925b
commit
bf6414d3ad
|
@ -0,0 +1,17 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
|
||||||
|
* This file is licensed under the Affero General Public License version 3 or
|
||||||
|
* later.
|
||||||
|
* See the COPYING-README file.
|
||||||
|
*/
|
||||||
|
require_once('../../../lib/base.php');
|
||||||
|
OC_JSON::checkLoggedIn();
|
||||||
|
if(isset($_POST["timeformat"])){
|
||||||
|
OC_Preferences::setValue(OC_User::getUser(), 'calendar', 'timeformat', $_POST["timeformat"]);
|
||||||
|
OC_JSON::success();
|
||||||
|
}else{
|
||||||
|
OC_JSON::error();
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
|
||||||
|
* This file is licensed under the Affero General Public License version 3 or
|
||||||
|
* later.
|
||||||
|
* See the COPYING-README file.
|
||||||
|
*/
|
||||||
|
require_once('../../../lib/base.php');
|
||||||
|
OC_JSON::checkLoggedIn();
|
||||||
|
$timeformat = OC_Preferences::getValue( OC_User::getUser(), 'calendar', 'timeformat', "24");
|
||||||
|
OC_JSON::encodedPrint(array("timeformat" => $timeformat));
|
||||||
|
?>
|
|
@ -34,6 +34,18 @@ $(document).ready(function(){
|
||||||
minWidth:'auto',
|
minWidth:'auto',
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
$("#timeformat").change( function(){
|
||||||
|
var data = $("#timeformat").serialize();
|
||||||
|
$.post( OC.filePath('calendar', 'ajax', 'settimeformat.php'), data, function(data){
|
||||||
|
if(data == "error"){
|
||||||
|
console.log("saving timeformat failed");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
$.getJSON(OC.filePath('calendar', 'ajax', 'timeformat.php'), function(jsondata, status) {
|
||||||
|
$("#" + jsondata.timeformat).attr('selected',true);
|
||||||
|
$("#timeformat").chosen();
|
||||||
|
});
|
||||||
$("#weekend").change( function(){
|
$("#weekend").change( function(){
|
||||||
var data = $("#weekend").serialize();
|
var data = $("#weekend").serialize();
|
||||||
$.post( OC.filePath('calendar', 'ajax', 'setdaysofweekend.php'), data, function(data){
|
$.post( OC.filePath('calendar', 'ajax', 'setdaysofweekend.php'), data, function(data){
|
||||||
|
|
|
@ -1,32 +1,4 @@
|
||||||
<?php
|
<?php
|
||||||
$hours = array(
|
|
||||||
'allday' => $l->t('All day'),
|
|
||||||
0 => '0',
|
|
||||||
1 => '1',
|
|
||||||
2 => '2',
|
|
||||||
3 => '3',
|
|
||||||
4 => '4',
|
|
||||||
5 => '5',
|
|
||||||
6 => '6',
|
|
||||||
7 => '7',
|
|
||||||
8 => '8',
|
|
||||||
9 => '9',
|
|
||||||
10 => '10',
|
|
||||||
11 => '11',
|
|
||||||
12 => '12',
|
|
||||||
13 => '13',
|
|
||||||
14 => '14',
|
|
||||||
15 => '15',
|
|
||||||
16 => '16',
|
|
||||||
17 => '17',
|
|
||||||
18 => '18',
|
|
||||||
19 => '19',
|
|
||||||
20 => '20',
|
|
||||||
21 => '21',
|
|
||||||
22 => '22',
|
|
||||||
23 => '23',
|
|
||||||
);
|
|
||||||
/*
|
|
||||||
$hours24 = array(
|
$hours24 = array(
|
||||||
'allday' => $l->t('All day'),
|
'allday' => $l->t('All day'),
|
||||||
0 => '0',
|
0 => '0',
|
||||||
|
@ -81,7 +53,11 @@ $hoursampm = array(
|
||||||
22 => '10 p.m.',
|
22 => '10 p.m.',
|
||||||
23 => '11 p.m.',
|
23 => '11 p.m.',
|
||||||
);
|
);
|
||||||
*/
|
if(OC_Preferences::getValue( OC_User::getUser(), 'calendar', 'timeformat', "24") == "24"){
|
||||||
|
$hours = $hours24;
|
||||||
|
}else{
|
||||||
|
$hours = $hoursampm;
|
||||||
|
}
|
||||||
$weekdaynames = array('sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday');
|
$weekdaynames = array('sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday');
|
||||||
$dayforgenerator = OC_Preferences::getValue( OC_User::getUser(), 'calendar', 'firstdayofweek', "1");
|
$dayforgenerator = OC_Preferences::getValue( OC_User::getUser(), 'calendar', 'firstdayofweek', "1");
|
||||||
$weekdays = array();
|
$weekdays = array();
|
||||||
|
|
|
@ -38,13 +38,18 @@ OC_UTIL::addStyle('', 'jquery.multiselect');
|
||||||
?>
|
?>
|
||||||
</select>
|
</select>
|
||||||
<label for="weekend"><strong><?php echo $l->t('Days of weekend');?></strong></label>
|
<label for="weekend"><strong><?php echo $l->t('Days of weekend');?></strong></label>
|
||||||
<select id="weekend" name="weekend[]" multiple="multiple" title="<?php echo "Wochenende"; ?>">
|
<select id="weekend" name="weekend[]" multiple="multiple" title="<?php echo $l->t("Weekend"); ?>">
|
||||||
<?php
|
<?php
|
||||||
$weekdays = array("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday");
|
$weekdays = array("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday");
|
||||||
for($i = 0;$i <= 6;$i++){
|
for($i = 0;$i <= 6;$i++){
|
||||||
echo '<option value="'.$weekdays[$i].'" id="selectweekend_' . $weekdays[$i] . '">' . $l->t($weekdays[$i]) . '</option>';
|
echo '<option value="'.$weekdays[$i].'" id="selectweekend_' . $weekdays[$i] . '">' . $l->t($weekdays[$i]) . '</option>';
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
</select>
|
||||||
|
<label for="timeformat"><strong><?php echo $l->t('Timeformat');?></strong></label>
|
||||||
|
<select style="display: none;" id="timeformat" title="<?php echo "timeformat"; ?>" name="timeformat">
|
||||||
|
<option value="24" id="24h"><?php echo $l->t("24 h"); ?></option>
|
||||||
|
<option value="ampm" id="ampm"><?php echo $l->t("am/pm"); ?></option>
|
||||||
</select>
|
</select>
|
||||||
<br />
|
<br />
|
||||||
Calendar CalDAV syncing address:
|
Calendar CalDAV syncing address:
|
||||||
|
|
Loading…
Reference in New Issue