From c0568e0443a8beaebc3ecd25af5f9a5dca498a42 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 11 Jun 2013 17:24:47 +0200
Subject: remove App management top bar and move buttons more contextually in
 the interface

---
 settings/templates/apps.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'settings/templates')

diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index d3639cbab34..cdb690f9a27 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -7,11 +7,12 @@
 	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="controls">
-	<a class="button" target="_blank" href="http://owncloud.org/dev"><?php p($l->t('Add your App'));?></a>
-	<a class="button" target="_blank" href="http://apps.owncloud.com"><?php p($l->t('More Apps'));?></a>
-</div>
-<ul id="leftcontent" class="applist hascontrols">
+
+<ul id="leftcontent" class="applist">
+	<li>
+		<a class="app-external" target="_blank" href="http://owncloud.org/dev">+ <?php p($l->t('Add your App'));?></a>
+	</li>
+
 	<?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'])."}\""); } ?>
@@ -22,6 +23,10 @@
 			print_unescaped('<small class="'.OC_Util::sanitizeHTML($app['internalclass']).' list">'.OC_Util::sanitizeHTML($app['internallabel']).'</small>') ?>
 	</li>
 	<?php endforeach;?>
+
+	<li>
+		<a class="app-external" target="_blank" href="http://apps.owncloud.com"><?php p($l->t('More Apps'));?> …</a>
+	</li>
 </ul>
 <div id="rightcontent">
 	<div class="appinfo">
-- 
cgit v1.2.3


From 4cafe21aa46a7b6589b81a83a2dcf7e310890bb3 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 12 Jun 2013 14:49:23 +0200
Subject: apps management: change misleading + to ...

---
 settings/templates/apps.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'settings/templates')

diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index cdb690f9a27..0903b9bd5c4 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -10,7 +10,7 @@
 
 <ul id="leftcontent" class="applist">
 	<li>
-		<a class="app-external" target="_blank" href="http://owncloud.org/dev">+ <?php p($l->t('Add your App'));?></a>
+		<a class="app-external" target="_blank" href="http://owncloud.org/dev"><?php p($l->t('Add your App'));?> …</a>
 	</li>
 
 	<?php foreach($_['apps'] as $app):?>
-- 
cgit v1.2.3