From 0f0d37b85cfd3aea57c1d54ff005d881b55af304 Mon Sep 17 00:00:00 2001 From: Kamil Domanski Date: Mon, 20 Jun 2011 18:51:06 +0200 Subject: [PATCH 1/2] fixed minor string omission --- admin/templates/users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/templates/users.php b/admin/templates/users.php index c6ee57a61d..0c26fd3bdf 100644 --- a/admin/templates/users.php +++ b/admin/templates/users.php @@ -4,7 +4,7 @@ t( 'Name' ); ?> - Groups + t( 'Groups' ); ?> From d38e958ada1390c36112ab2b0b4b28d1cae3e1df Mon Sep 17 00:00:00 2001 From: Kamil Domanski Date: Mon, 20 Jun 2011 19:21:42 +0200 Subject: [PATCH 2/2] enable/disable apps by clicking their status --- admin/ajax/disableapp.php | 9 +++++++++ admin/ajax/enableapp.php | 9 +++++++++ admin/apps.php | 2 +- admin/js/apps.js | 17 +++++++++++++++++ admin/templates/appsinst.php | 4 ++-- 5 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 admin/ajax/disableapp.php create mode 100644 admin/ajax/enableapp.php create mode 100644 admin/js/apps.js diff --git a/admin/ajax/disableapp.php b/admin/ajax/disableapp.php new file mode 100644 index 0000000000..d23f8de7ef --- /dev/null +++ b/admin/ajax/disableapp.php @@ -0,0 +1,9 @@ + diff --git a/admin/ajax/enableapp.php b/admin/ajax/enableapp.php new file mode 100644 index 0000000000..d988d7fd2d --- /dev/null +++ b/admin/ajax/enableapp.php @@ -0,0 +1,9 @@ + diff --git a/admin/apps.php b/admin/apps.php index 725128a752..5eec7e626d 100644 --- a/admin/apps.php +++ b/admin/apps.php @@ -30,6 +30,7 @@ if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin' // Load the files we need OC_UTIL::addStyle( "admin", "apps" ); +OC_UTIL::addScript( "admin", "apps" ); if(isset($_GET['id'])) $id=$_GET['id']; else $id=0; @@ -42,7 +43,6 @@ if($installed){ $records = array(); OC_APP::setActiveNavigationEntry( "core_apps_installed" ); - echo count($apps); foreach($apps as $app){ $info=OC_APP::getAppInfo("$SERVERROOT/apps/$app/appinfo/info.xml"); $record = array( 'id' => $app, diff --git a/admin/js/apps.js b/admin/js/apps.js new file mode 100644 index 0000000000..4d8c68171b --- /dev/null +++ b/admin/js/apps.js @@ -0,0 +1,17 @@ +$("div[x-use='appenableddiv']").live( "click", function(){ + appid = $(this).parent().parent().attr("x-uid"); + + if($(this).text() == "enabled"){ + $(this).html( "disabled" ); + $(this).parent().removeClass( "enabled" ); + $(this).parent().addClass( "disabled" ); + //$.post( "ajax/disableapp.php", $(appid).serialize(), function(data){} ); + $.post( "ajax/disableapp.php", { appid: appid }, function(data){ alert(data.status);}); + } + else if($(this).text() == "disabled"){ + $(this).html( "enabled" ); + $(this).parent().removeClass( "disabled" ); + $(this).parent().addClass( "enabled" ); + $.post( "ajax/enableapp.php", { appid: appid }, function(data){ alert(data.status);} ); + } +}); \ No newline at end of file diff --git a/admin/templates/appsinst.php b/admin/templates/appsinst.php index c1acc09d5d..482273da1d 100644 --- a/admin/templates/appsinst.php +++ b/admin/templates/appsinst.php @@ -16,11 +16,11 @@ - + - t( $app['enabled'] ? 'enabled' : 'disabled' ); ?> +
t( $app['enabled'] ? 'enabled' : 'disabled' ); ?>