introduce new app page layout

filter installed and not-installed apps properly

kill unneeded file

load category 'Installed' on page load

adding documentation links

new apps mgmt: first style adjustment

apps mgmt: only show license and preview if they exist

adding buttons

new apps mgmt: fix for mobile

use app icon if available

new apps mgmt: position enable/disable toggle to the right

new apps mgmt: proper display of icons or previews

new apps mgmt: fix loading spinner

reenable group selection for apps

new apps mgmt: position enable button normally again

new apps mgmt: clarify wording from 'Installed' to 'Enabled'

reintroduce enable/disable

Move rating image path generation to client-side

Move expression outside of l10n

fix group handling

add buttons for 'More apps' and 'Add your app' again

disable changed date of app for now

adding recommended label

style 'Recommended' app tag

fixing php warning

sort by rating

adding meta-category 'Recommended'

 Only show existing documentation links

lacy loading of screenshots

making group based app activation work again

adding support to get the app icon not only by the app name but also simply by the fixed name 'app.svg'

adding app.svg for all core apps

query string '?installed' is not longer needed

update and uninstall is back + error feedback

remove unneeded parameter

fix alignment of 'recommended' label

1 files changed, 72 insertions, 55 deletions

diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 5199d3fd7c7..1ad37000f39 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -1,65 +1,82 @@
-<?php /**
- * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */?>
- <script type="text/javascript"
-	src="<?php print_unescaped(OC_Helper::linkToRoute('apps_custom'));?>?appid=<?php p($_['appid']); ?>"></script>
- <script type="text/javascript" src="<?php print_unescaped(OC_Helper::linkTo('settings/js', 'apps.js'));?>"></script>
+<script id="categories-template" type="text/x-handlebars-template">
+{{#each this}}
+	<li id="app-category-{{id}}" data-category-id="{{id}}"><a>{{displayName}}</a></li>
+{{/each}}
 
-<div id="app-navigation">
-	<ul class="applist">
-		<?php if(OC_Config::getValue('appstoreenabled', true) === true): ?>
-		<li>
-			<a class="app-external" target="_blank" href="http://owncloud.org/dev"><?php p($l->t('Add your App'));?> …</a>
-		</li>
-		<?php endif; ?>
+<?php if(OC_Config::getValue('appstoreenabled', true) === true): ?>
+	<li>
+		<a class="app-external" target="_blank" href="http://apps.owncloud.com/?xsortmode=high"><?php p($l->t('More apps'));?> …</a>
+	</li>
+	<li>
+		<a class="app-external" target="_blank" href="http://owncloud.org/dev"><?php p($l->t('Add your app'));?> …</a>
+	</li>
+<?php endif; ?>
+</script>
 
-		<?php foreach($_['apps'] as $app):?>
-		<li <?php if($app['active']) print_unescaped('class="active"')?> data-id="<?php p($app['id']) ?>" data-groups="<?php p($app['groups']) ?>"
-			<?php if ( isset( $app['ocs_id'] ) ) { print_unescaped("data-id-ocs=\"{".OC_Util::sanitizeHTML($app['ocs_id'])."}\""); } ?>
-				data-type="<?php p($app['internal'] ? 'internal' : 'external') ?>" data-installed="1">
-			<a class="app<?php if(!$app['internal']) p(' externalapp') ?>"
-				href="?appid=<?php p($app['id']) ?>"><?php p($app['name']) ?></a>
-			<?php  if(!$app['internal'])
-				print_unescaped('<small class="'.OC_Util::sanitizeHTML($app['internalclass']).' list">'.OC_Util::sanitizeHTML($app['internallabel']).'</small>') ?>
-		</li>
-		<?php endforeach;?>
-
-		<?php if(OC_Config::getValue('appstoreenabled', true) === true): ?>
-		<li>
-			<a class="app-external" target="_blank" href="http://apps.owncloud.com"><?php p($l->t('More Apps'));?> …</a>
-		</li>
-		<?php endif; ?>
-	</ul>
-</div>
-<div id="app-content">
-	<div class="appinfo">
-	<h3><strong><span class="name"><?php p($l->t('Select an App'));?></span></strong><span
-		class="version"></span><small class="externalapp" style="visibility:hidden;"></small></h3>
-	<span class="score"></span>
-	<p class="description"></p>
-	<p class="documentation hidden">
+<script id="app-template" type="text/x-handlebars">
+	<div class="section" id="app-{{id}}">
+	{{#if preview}}
+	<div class="app-image{{#if previewAsIcon}} app-image-icon{{/if}} hidden">
+	</div>
+	{{/if}}
+	<h2 class="app-name"><a href="{{detailpage}}" target="_blank">{{name}}</a></h2>
+	<div class="app-version"> {{version}}</div>
+	<div class="app-author"><?php p($l->t('by')); ?> {{author}}
+		{{#if license}}
+		({{license}}-<?php p($l->t('licensed')); ?>)
+		{{/if}}
+	</div>
+	{{#if score}}
+	<div class="app-score">{{{score}}}</div>
+	{{/if}}
+	{{#if internalclass}}
+	<div class="{{internalclass}} icon-checkmark">{{internallabel}}</div>
+	{{/if}}
+	<div class="app-detailpage"></div>
+	<div class="app-description"><pre>{{description}}</pre></div>
+	<!--<div class="app-changed">{{changed}}</div>-->
+	{{#if documentation}}
+	<p class="documentation">
 		<?php p($l->t("Documentation:"));?>
-		<span class="userDocumentation appslink"></span>
-		<span class="adminDocumentation appslink"></span>
+		{{#if documentation.user}}
+		<span class="userDocumentation appslink">
+		<a id='userDocumentation' href='{{documentation.user}}' target="_blank"><?php p($l->t("User Documentation"));?></a>
+		</span>
+		{{/if}}
+
+		{{#if documentation.admin}}
+		<span class="adminDocumentation appslink">
+		<a id='adminDocumentation' href='{{documentation.admin}}' target="_blank"><?php p($l->t("Admin Documentation"));?></a>
+		</span>
+		{{/if}}
 	</p>
-	<img src="" class="preview hidden" />
-	<p class="appslink appstore hidden"><a id="appstorelink" href="#" target="_blank"><?php
-		p($l->t('See application page at apps.owncloud.com'));?></a></p>
-	<p class="appslink website hidden"><a id="websitelink" href="#" target="_blank"><?php
-		p($l->t('See application website'));?></a></p>
-	<p class="license hidden"><?php
-		print_unescaped($l->t('<span class="licence"></span>-licensed by <span class="author"></span>'));?></p>
-	<input class="enable hidden" type="submit" />
-	<input class="update hidden" type="submit" value="<?php p($l->t('Update')); ?>" />
-	<a class="uninstall hidden" href="#"><?php p($l->t('Uninstall')); ?></a>
-	<br />
-	<input class="hidden" type="checkbox" id="groups_enable"/>
-	<label class="hidden" for="groups_enable"><?php p($l->t('Enable only for specific groups')); ?></label>
+	{{/if}}
+	{{#if update}}
+	<input class="update" type="submit" value="<?php p($l->t('Update to %s', array('{{update}}'))); ?>" data-appid="{{id}}" />
+	{{/if}}
+	{{#if active}}
+	<input class="enable" type="submit" data-appid="{{id}}" data-active="true" value="<?php p($l->t("Disable"));?>"/>
+	<input type="checkbox" class="groups-enable" id="groups_enable-{{id}}"/>
+	<label for="groups_enable-{{id}}"><?php p($l->t('Enable only for specific groups')); ?></label>
 	<br />
 	<input type="hidden" id="group_select" title="<?php p($l->t('All')); ?>" style="width: 200px">
+	{{else}}
+	<input class="enable" type="submit" data-appid="{{id}}" data-active="false" value="<?php p($l->t("Enable"));?>"/>
+	{{/if}}
+	{{#if canUnInstall}}
+	<input class="uninstall" type="submit" value="<?php p($l->t('Uninstall App')); ?>" data-appid="{{id}}" />
+	{{/if}}
 
 	<div class="warning hidden"></div>
+
 	</div>
+</script>
+
+<div id="app-navigation" class="icon-loading">
+	<ul id="apps-categories">
+
+	</ul>
+</div>
+<div id="app-content">
+	<div id="apps-list" class="icon-loading"></div>
 </div>