diff --git a/admin/apps.php b/admin/apps.php index de11dccc3d..83a48b6524 100644 --- a/admin/apps.php +++ b/admin/apps.php @@ -31,76 +31,21 @@ if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )) OC_Util::addStyle( "admin", "apps" ); OC_Util::addScript( "admin", "apps" ); - -if(isset($_GET['id'])) $id=$_GET['id']; else $id=0; -if(isset($_GET['cat'])) $cat=$_GET['cat']; else $cat=0; -if(isset($_GET['installed'])) $installed=true; else $installed=false; - -if($installed){ - global $SERVERROOT; - OC_Installer::installShippedApps(false); - $apps = OC_Appconfig::getApps(); - $records = array(); - - OC_App::setActiveNavigationEntry( "core_apps" ); - foreach($apps as $app){ - $info=OC_App::getAppInfo("$SERVERROOT/apps/$app/appinfo/info.xml"); - $record = array( 'id' => $app, - 'name' => $info['name'], - 'version' => $info['version'], - 'author' => $info['author'], - 'enabled' => OC_App::isEnabled( $app )); - $records[]=$record; - } - - $tmpl = new OC_Template( "admin", "appsinst", "user" ); - $tmpl->assign( "apps", $records ); - $tmpl->printPage(); - unset($tmpl); - exit(); -}else{ - $categories=OC_OCSClient::getCategories(); - if($categories==NULL){ - OC_App::setActiveNavigationEntry( "core_apps" ); - - $tmpl = new OC_Template( "admin", "app_noconn", "user" ); - $tmpl->printPage(); - unset($tmpl); - exit(); - } - - - if($id==0) { - OC_App::setActiveNavigationEntry( "core_apps_get" ); - - if($cat==0){ - $numcats=array(); - foreach($categories as $key=>$value) $numcats[]=$key; - $apps=OC_OCSClient::getApplications($numcats); - }else{ - $apps=OC_OCSClient::getApplications($cat); - } - - // return template - $tmpl = new OC_Template( "admin", "apps", "user" ); - - $tmpl->assign( "categories", $categories ); - $tmpl->assign( "apps", $apps ); - $tmpl->printPage(); - unset($tmpl); - - }else{ - OC_App::setActiveNavigationEntry( "core_apps" ); - - $app=OC_OCSClient::getApplication($id); - - $tmpl = new OC_Template( "admin", "app", "user" ); - $tmpl->assign( "categories", $categories ); - $tmpl->assign( "app", $app ); - $tmpl->printPage(); - unset($tmpl); - - } +$registeredApps=OC_App::getAllApps(); +$apps=array(); +foreach($registeredApps as $app){ + $info=OC_App::getAppInfo($app); + $active=(OC_Appconfig::getValue($app,'enabled','no')=='yes')?true:false; + $info['active']=$active; + $apps[]=$info; } +$categories=OC_OCSClient::getCategories(); +// print_r($categories); + +$tmpl = new OC_Template( "admin", "apps", "user" ); +$tmpl->assign('apps',$apps); + +$tmpl->printPage(); + ?> diff --git a/admin/css/apps.css b/admin/css/apps.css index 92ab64df55..6106ff3f7e 100644 --- a/admin/css/apps.css +++ b/admin/css/apps.css @@ -1,14 +1,3 @@ -/* APPS TABLE */ -table td.date { width:5em; padding:.5em 1em; text-align:left; } -table td.version, table td.enabled, table td.disabled { padding:.5em 1em; text-align:left; } -.preview { padding:3px; text-align:left; } -table td.date { width:11em; color:#555; } -table td.selection, table th.selection, table td.fileaction { width:2em; text-align:left; } -table td.name a { padding:6px; text-decoration:none; color:#555; } -.type { text-decoration:none; color:#888; font-size:.8em; } -.description { text-decoration:none; color:#666; font-size:.9em; } - -#content ul#apps { width:40em; list-style:none; } -#content ul#apps li { display:block; padding:.2em; clear:right; } -#content ul#apps em { color:#555; } -#content ul#apps input { float:right; } +li{color:#888} +li.active{color:#000} +span.version{margin-left:3em;color:#ddd} diff --git a/admin/js/apps.js b/admin/js/apps.js index 4def5ed555..069681e1cd 100644 --- a/admin/js/apps.js +++ b/admin/js/apps.js @@ -1,17 +1,38 @@ -$("input[x-use='appenablebutton']").live( "click", function(){ - appid = $(this).parent().data("uid"); - - //alert("dsfsdfsdf"); - if($(this).val() == "enabled"){ - $(this).attr("value","disabled"); - $(this).removeClass( "enabled" ); - $(this).addClass( "disabled" ); - $.post( "ajax/disableapp.php", 'appid='+appid); - } - else if($(this).val() == "disabled"){ - $(this).attr("value","enabled"); - $(this).removeClass( "disabled" ); - $(this).addClass( "enabled" ); - $.post( "ajax/enableapp.php", 'appid='+appid); - } -}); \ No newline at end of file +$(document).ready(function(){ + $('#leftcontent li').each(function(index,li){ + var app=$.parseJSON($(this).children('span').text()); + $(li).data('app',app); + }); + $('#leftcontent li').click(function(){ + var app=$(this).data('app'); + $('#rightcontent p').show(); + $('#rightcontent span.name').text(app.name); + $('#rightcontent span.version').text(app.version); + $('#rightcontent p.description').text(app.description); + $('#rightcontent span.author').text(app.author); + $('#rightcontent span.licence').text(app.licence); + + $('#rightcontent input.enable').show(); + $('#rightcontent input.enable').val((app.active)?t('admin','Disable'):t('admin','Enable')); + $('#rightcontent input.enable').data('appid',app.id); + $('#rightcontent input.enable').data('active',app.active); + }); + $('#rightcontent input.enable').click(function(){ + var app=$(this).data('appid'); + var active=$(this).data('active'); + if(app){ + if(active){ + $.post(OC.filePath('admin','ajax','disableapp.php'),{appid:app}); + $('#leftcontent li[data-id="'+app+'"]').removeClass('active'); + }else{ + $.post(OC.filePath('admin','ajax','enableapp.php'),{appid:app}); + $('#leftcontent li[data-id="'+app+'"]').addClass('active'); + } + active=!active; + $(this).data('active',active); + $(this).val((active)?t('admin','Disable'):t('admin','Enable')); + var appData=$('#leftcontent li[data-id="'+app+'"]'); + appData.active=active; + } + }); +}); diff --git a/admin/templates/app.php b/admin/templates/app.php deleted file mode 100644 index 06896121d0..0000000000 --- a/admin/templates/app.php +++ /dev/null @@ -1,22 +0,0 @@ - -
-'.$app['typename'].''); ?>
- "") { echo(' '); } ?> - "") { echo(' '); } ?> - "") { echo(' '); } ?> - |
-
-
- - '.$l->t( 'read more' ).' '); ?> - |
- t( 'Install' ); ?> | -
- | t( 'Name' ); ?> | -t( 'Modified' ); ?> | -
---|---|---|
"") { echo(' |
- " title=""> '.$app['typename'].''); ?> |
- l('datetime', $app["changed"]); ?> | -
t('By: ');?>
+t('Licence: ');?>
+ +