diff options
| author | Marvin Thomas Rabe <m.rabe@echtzeitraum.de> | 2011-10-02 15:51:24 +0200 |
|---|---|---|
| committer | Marvin Thomas Rabe <m.rabe@echtzeitraum.de> | 2011-10-02 15:51:24 +0200 |
| commit | daee88fd26b69d997b5a203c42d6a3cb1dbe46dc (patch) | |
| tree | 3e71eb59e39500d8d7c4749b02efe44f18d17d00 /apps | |
| parent | ba49bcd5a912d6b70e408d8216a178bcaf554a7a (diff) | |
| download | nextcloud-server-daee88fd26b69d997b5a203c42d6a3cb1dbe46dc.tar.gz nextcloud-server-daee88fd26b69d997b5a203c42d6a3cb1dbe46dc.zip | |
Changed multiple select for days of weekend to 'chosen'. Cleaned up some code. Removed success message when changing timezone.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/calendar/js/settings.js | 9 | ||||
| -rw-r--r-- | apps/calendar/templates/settings.php | 18 |
2 files changed, 11 insertions, 16 deletions
diff --git a/apps/calendar/js/settings.js b/apps/calendar/js/settings.js index 07e912aaa7a..6c00be06b39 100644 --- a/apps/calendar/js/settings.js +++ b/apps/calendar/js/settings.js @@ -4,7 +4,7 @@ $(document).ready(function(){ // Serialize the data var post = $( "#timezone" ).serialize(); $.post( OC.filePath('calendar', 'ajax', 'settimezone.php'), post, function(data){ - OC.msg.finishedSaving('#calendar .msg', data); + //OC.msg.finishedSaving('#calendar .msg', data); }); return false; }); @@ -27,12 +27,7 @@ $(document).ready(function(){ $("#selectweekend_" + day).attr('selected',true); } } - $("#weekend").multiselect({ - header: false, - noneSelectedText: $('#weekend').attr('title'), - selectedList: 2, - minWidth:'auto', - }); + $("#weekend").chosen(); }); $("#timeformat").change( function(){ var data = $("#timeformat").serialize(); diff --git a/apps/calendar/templates/settings.php b/apps/calendar/templates/settings.php index 75f094aab47..144a05059ca 100644 --- a/apps/calendar/templates/settings.php +++ b/apps/calendar/templates/settings.php @@ -27,7 +27,12 @@ OC_UTIL::addStyle('', 'jquery.multiselect'); echo '<option value="'.$timezone.'"'.($_['timezone'] == $timezone?' selected="selected"':'').'>'.$city.'</option>'; endif; endforeach;?> - </select><span class="msg"></span> + </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("24h"); ?></option> + <option value="ampm" id="ampm"><?php echo $l->t("12h"); ?></option> + </select><br /> <label for="firstdayofweek"><strong><?php echo $l->t('First day of the week');?></strong></label> <select style="display: none;" id="firstdayofweek" name="firstdayofweek"> <?php @@ -36,21 +41,16 @@ OC_UTIL::addStyle('', 'jquery.multiselect'); echo '<option value="'.$i.'" id="select_'.$i.'">' . $l->t($weekdays[$i]) . '</option>'; } ?> - </select> + </select><br /> <label for="weekend"><strong><?php echo $l->t('Days of weekend');?></strong></label> - <select id="weekend" name="weekend[]" multiple="multiple" title="<?php echo $l->t("Weekend"); ?>"> + <select id="weekend" name="weekend[]" style="width: 50%;" multiple="multiple" title="<?php echo $l->t("Weekend"); ?>"> <?php $weekdays = array("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"); for($i = 0;$i <= 6;$i++){ 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 /> <label for="duration"><strong><?php echo $l->t('Event duration');?></strong></label> <input type="text" maxlength="3" size="3" style="width: 2em;" id="duration" name="duration" /> <strong><?php echo $l->t("Minutes");?></strong> <br /> |