updated calendar settings

diff --git a/apps/calendar/templates/settings.php b/apps/calendar/templates/settings.php
index 44fbb230a4375e53026eefed48f0e67a32bfa4d4..3bfda702e9b5a30bad72a10003bb373f599c908e 100644 (file)
--- a/apps/calendar/templates/settings.php
+++ b/apps/calendar/templates/settings.php
@@ -11,8 +11,8 @@ OC_UTIL::addStyle('', 'jquery.multiselect');
 ?>
 <form id="calendar">
         <fieldset class="personalblock">
-                <label for="timezone"><strong><?php echo $l->t('Timezone');?></strong></label>
-               <select style="display: none;" id="timezone" name="timezone">
+               <table class="nostyle">
+                       <tr><td><label for="timezone" class="bold"><?php echo $l->t('Timezone');?></label></td><td><select style="display: none;" id="timezone" name="timezone">
                 <?php
                $continent = '';
                foreach($_['timezones'] as $timezone):
@@ -27,33 +27,40 @@ OC_UTIL::addStyle('', 'jquery.multiselect');
                                echo '<option value="'.$timezone.'"'.($_['timezone'] == $timezone?' selected="selected"':'').'>'.$city.'</option>';
                        endif;
                 endforeach;?>
-                </select>&nbsp;&nbsp;
-               <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
-               $weekdays = array("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday");
-               for($i = 0;$i <= 6;$i++){
-                       echo '<option value="'.$i.'" id="select_'.$i.'">' . $l->t($weekdays[$i]) . '</option>';
-               }
-               ?>
-               </select><br />
-               <label for="weekend"><strong><?php echo $l->t('Days of weekend');?></strong></label>
-               <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><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" /> <?php echo $l->t("Minutes");?>
-               <br />
+                </select></td></tr>
+
+                       <tr><td><label for="timeformat" class="bold"><?php echo $l->t('Timeformat');?></label></td><td>
+                               <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>
+                       </td></tr>
+
+                       <tr><td><label for="firstdayofweek" class="bold"><?php echo $l->t('First day of the week');?></label></td><td>
+                               <select style="display: none;" id="firstdayofweek" name="firstdayofweek">
+                               <?php
+                               $weekdays = array("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday");
+                               for($i = 0;$i <= 6;$i++){
+                                       echo '<option value="'.$i.'" id="select_'.$i.'">' . $l->t($weekdays[$i]) . '</option>';
+                               }
+                               ?>
+                               </select>
+                       </td></tr>
+
+                       <tr><td><label for="weekend" class="bold"><?php echo $l->t('Days of weekend');?></label></td><td>
+                               <select id="weekend" name="weekend[]" style="width: 30em;" 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>
+                       </td></tr>
+
+                       <tr><td><label for="duration" class="bold"><?php echo $l->t('Event duration');?></label></td><td><input type="text" maxlength="3" size="3" style="width: 2em;" id="duration" name="duration" /> <?php echo $l->t("Minutes");?></td></tr>
+               </table>
+
                <?php echo $l->t('Calendar CalDAV syncing address:');?> 
                <?php echo OC_Helper::linkTo('apps/calendar', 'caldav.php', null, true); ?><br />
         </fieldset>

diff --git a/core/css/styles.css b/core/css/styles.css
index 01db28c59c886915e305a7f1016caf7e30410b44..84a024f95b91f5375d0786251588424c7915db29 100644 (file)
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -98,13 +98,14 @@ label.infield { cursor: text !important; }
 
 /* VARIOUS REUSABLE SELECTORS */
 .hidden { display:none; }
+.bold { font-weight: bold; }
 
 #notification { z-index:101; cursor:pointer; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
 
 .action, .selectedActions a, #logout { opacity:.3; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; }
 .action:hover, .selectedActions a:hover, #logout:hover { opacity:1; }
 
-table tr { -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; }
+table:not(.nostyle) tr { -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; }
 tbody tr:hover, tr:active { background-color:#f8f8f8; }
 
 #body-settings .personalblock, #body-settings .helpblock { padding:.5em 1em; margin:1em; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 4b5bc06b21801b685d98364843e41905cbba488d..8d89cee6ec04777bead223cb5e88545cc5e3423b 100644 (file)
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -9,11 +9,13 @@ input#identity { width:20em; }
 .msg.success{ color:#fff; background-color:#0f0; padding:3px; text-shadow:1px 1px #000; }
 .msg.error{ color:#fff; background-color:#f00; padding:3px; text-shadow:1px 1px #000; }
 
+table.nostyle label { margin-right: 2em; }
+table.nostyle td { padding: 0.2em 0; }
 
 /* USERS */
 form { display:inline; }
-table th { height:2em; color:#999; }
-table th, table td { border-bottom:1px solid #ddd; padding:0 .5em; padding-left:.8em; text-align:left; font-weight:normal; }
+table:not(.nostyle) th { height:2em; color:#999; }
+table:not(.nostyle) th, table:not(.nostyle) td { border-bottom:1px solid #ddd; padding:0 .5em; padding-left:.8em; text-align:left; font-weight:normal; }
 td.name, td.password { padding-left:.8em; }
 td.password>img, td.remove>img, td.quota>img { visibility:hidden; }
 td.password, td.quota { width:12em; cursor:pointer; }
@@ -24,8 +26,8 @@ tr:hover>td.password>span { margin:0; cursor:pointer; }
 tr:hover>td.remove>img, tr:hover>td.password>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; }
 tr:hover>td.remove>img { float:right; }
 li.selected { background-color:#ddd; }
-#content>table { margin-top:6.5em; }
-table { width:100%; }
+#content>table:not(.nostyle) { margin-top:6.5em; }
+table:not(.nostyle) { width:100%; }
 
 
 /* APPS */