Changed multiple select for days of weekend to 'chosen'. Cleaned up some code. Removed success message when changing timezone.

6 files changed, 22 insertions, 26 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>&nbsp;&nbsp;
+                </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
@@ -36,21 +41,16 @@ OC_UTIL::addStyle('', 'jquery.multiselect');
 			echo '<option value="'.$i.'" id="select_'.$i.'">' . $l->t($weekdays[$i]) . '</option>';
 		}
 		?>
-		</select>&nbsp;&nbsp;
+		</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>&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("24 h"); ?></option>
-			<option value="ampm" id="ampm"><?php echo $l->t("am/pm"); ?></option>
-		</select>&nbsp;&nbsp;
+		</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 />
diff --git a/settings/js/users.js b/settings/js/users.js
index c60fb32c40e..4944f3a62f6 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -7,7 +7,7 @@
 $(document).ready(function(){
 	function applyMultiplySelect(element){
 		var checked=[];
-		var user=element.data('username')
+		var user=element.data('username');
 		if(element.data('userGroups')){
 			checked=element.data('userGroups').split(', ');
 		}
@@ -24,7 +24,7 @@ $(document).ready(function(){
 					},
 					function(){}
 				);
-			}
+			};
 		}else{
 			checkHandeler=false;
 		}
@@ -88,7 +88,6 @@ $(document).ready(function(){
 		var uid=img.parent().parent().data('uid');
 		var input=$('<input>');
 		var quota=img.parent().children('span').text();
-		img
 		if(quota=='None'){
 			quota='';
 		}
diff --git a/settings/personal.php b/settings/personal.php
index 687b1a7aa34..0e15f176f98 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -9,9 +9,12 @@ require_once('../lib/base.php');
 OC_Util::checkLoggedIn();
 
 // Highlight navigation entry
-OC_Util::addScript( "settings", "personal" );
-OC_Util::addStyle( "settings", "settings" );
-OC_App::setActiveNavigationEntry( "personal" );
+OC_Util::addScript( 'settings', 'personal' );
+OC_Util::addScript( 'core', 'multiselect' );
+OC_Util::addStyle( 'settings', 'settings' );
+OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );
+OC_Util::addStyle( '3rdparty', 'chosen' );
+OC_App::setActiveNavigationEntry( 'personal' );
 
 // calculate the disc space
 $used=OC_Filesystem::filesize('/');
@@ -33,7 +36,7 @@ foreach($languageCodes as $lang){
 }
 
 // Return template
-$tmpl = new OC_Template( "settings", "personal", "user");
+$tmpl = new OC_Template( 'settings', 'personal', 'user');
 $tmpl->assign('usage',OC_Helper::humanFileSize($used));
 $tmpl->assign('total_space',OC_Helper::humanFileSize($total));
 $tmpl->assign('usage_relative',$relative);
diff --git a/settings/settings.php b/settings/settings.php
index b08cb08db09..a49de85520b 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -8,8 +8,8 @@
 require_once('../lib/base.php');
 OC_Util::checkLoggedIn();
 
-OC_Util::addStyle( "settings", "settings" );
-OC_App::setActiveNavigationEntry( "settings" );
+OC_Util::addStyle( 'settings', 'settings' );
+OC_App::setActiveNavigationEntry( 'settings' );
 
 $tmpl = new OC_Template( 'settings', 'settings', 'user');
 $forms=OC_App::getForms('settings');
diff --git a/settings/users.php b/settings/users.php
index 08d6c53840f..9ca2cb369f7 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -10,7 +10,6 @@ OC_Util::checkAdminUser();
 
 // We have some javascript foo!
 OC_Util::addScript( 'settings', 'users' );
-OC_Util::addScript( 'core', 'multiselect' );
 OC_Util::addStyle( 'settings', 'settings' );
 OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );
 OC_Util::addStyle( '3rdparty', 'chosen' );