diff options
| author | Bartek Przybylski <bart.p.pl@gmail.com> | 2011-12-21 18:35:29 +0100 |
|---|---|---|
| committer | Bartek Przybylski <bart.p.pl@gmail.com> | 2011-12-21 18:35:29 +0100 |
| commit | 3c428671090e2bd3d46d76567a45c2a9e1639127 (patch) | |
| tree | 785f2821086745b4bbef1bc01e4fb111c961dc83 /settings | |
| parent | 865be6064a1f2f896ca3657fa6eef590748a4e39 (diff) | |
| parent | e1b9b65e4159bdd6e0ed81c8cd6b588f03b3a018 (diff) | |
| download | nextcloud-server-3c428671090e2bd3d46d76567a45c2a9e1639127.tar.gz nextcloud-server-3c428671090e2bd3d46d76567a45c2a9e1639127.zip | |
merged
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/ajax/setquota.php | 2 | ||||
| -rw-r--r-- | settings/apps.php | 8 | ||||
| -rw-r--r-- | settings/js/users.js | 7 | ||||
| -rw-r--r-- | settings/templates/help.php | 5 | ||||
| -rw-r--r-- | settings/templates/personal.php | 4 |
5 files changed, 21 insertions, 5 deletions
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php index edbf5b74516..5c07285cfca 100644 --- a/settings/ajax/setquota.php +++ b/settings/ajax/setquota.php @@ -10,6 +10,6 @@ $quota= OC_Helper::computerFileSize($_POST["quota"]); // Return Success story OC_Preferences::setValue($username,'files','quota',$quota); -OC_JSON::success(array("data" => array( "username" => $username ,'quota'=>$quota))); +OC_JSON::success(array("data" => array( "username" => $username ,'quota'=>OC_Helper::humanFileSize($quota)))); ?> diff --git a/settings/apps.php b/settings/apps.php index 27b4c17f9e6..12a7bf77202 100644 --- a/settings/apps.php +++ b/settings/apps.php @@ -43,6 +43,14 @@ foreach($registeredApps as $app){ } } +function app_sort($a, $b){ + if ($a['active'] != $b['active']){ + return $b['active'] - $a['active']; + } + return strcmp($a['name'], $b['name']); +} +usort($apps, 'app_sort'); + // dissabled for now // $catagoryNames=OC_OCSClient::getCategories(); // if(is_array($catagoryNames)){ diff --git a/settings/js/users.js b/settings/js/users.js index 684fee21c64..4fea52e4a1f 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -101,8 +101,11 @@ $(document).ready(function(){ if($(this).val().length>0){ $.post( OC.filePath('settings','ajax','setquota.php'), - {username:uid,quota:$(this).val()}, - function(result){} + {username:uid,quota:$(this).val()}, + function(result){ + img.parent().children('span').text(result.data.quota) + $(this).parent().attr('data-quota',result.data.quota); + } ); input.blur(); }else{ diff --git a/settings/templates/help.php b/settings/templates/help.php index 4e3cdd7b908..754bf8b6376 100644 --- a/settings/templates/help.php +++ b/settings/templates/help.php @@ -9,7 +9,10 @@ <?php $url=OC_Helper::linkTo( "settings", "help.php" ).'?page='; $pageNavi=OC_Util::getPageNavi($_['pagecount'],$_['page'],$url); - $pageNavi->printPage(); + if($pageNavi) + { + $pageNavi->printPage(); + } ?> </diV> <?php if(is_null($_["kbe"])):?> diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 54487165f3c..8c5de5ccf2a 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -50,7 +50,9 @@ };?> <p class="personalblock"> - <strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?>, <a href="http://gitorious.org/owncloud" target="_blank">source code</a> licensed freely under <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank">AGPL</a> + <strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?><br /> + <?php echo(OC_Updater::ShowUpdatingHint()); ?><br /> + <a href="http://gitorious.org/owncloud" target="_blank">source code</a> licensed freely under <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank">AGPL</a> </p> |