From 59d1ee565e66a0394e2cf1d59bde125cb2e70a48 Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Thu, 20 Mar 2014 13:34:50 +0530
Subject: Makes #app-navigation a part of app management.

---
 settings/templates/apps.php | 49 +++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

(limited to 'settings/templates/apps.php')

diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 4c77c62f511..b7f3b6121ad 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -7,32 +7,33 @@
 	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>
 
+<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; ?>
 
-<ul id="leftcontent" 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 foreach($_['apps'] as $app):?>
+		<li <?php if($app['active']) print_unescaped('class="active"')?> data-id="<?php p($app['id']) ?>"
+			<?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 foreach($_['apps'] as $app):?>
-	<li <?php if($app['active']) print_unescaped('class="active"')?> data-id="<?php p($app['id']) ?>"
-		<?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 id="rightcontent">
+		<?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>
-- 
cgit v1.2.3