summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorMarvin Thomas Rabe <m.rabe@echtzeitraum.de>2011-10-02 15:51:24 +0200
committerMarvin Thomas Rabe <m.rabe@echtzeitraum.de>2011-10-02 15:51:24 +0200
commitdaee88fd26b69d997b5a203c42d6a3cb1dbe46dc (patch)
tree3e71eb59e39500d8d7c4749b02efe44f18d17d00 /settings
parentba49bcd5a912d6b70e408d8216a178bcaf554a7a (diff)
downloadnextcloud-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 'settings')
-rw-r--r--settings/js/users.js5
-rw-r--r--settings/personal.php11
-rw-r--r--settings/settings.php4
-rw-r--r--settings/users.php1
4 files changed, 11 insertions, 10 deletions
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' );