From 33569b8fd429758c32cd37a7f92f026ea84c112f Mon Sep 17 00:00:00 2001
From: opi <opi@no-log.org>
Date: Fri, 9 May 2014 11:53:57 +0200
Subject: [PATCH] [enh] Better application managment (access, default).

---
 js/app.js               | 15 ++++++++
 views/app/app_access.ms |  3 +-
 views/app/app_info.ms   | 83 ++++++++++++++++++++++++++---------------
 3 files changed, 69 insertions(+), 32 deletions(-)

diff --git a/js/app.js b/js/app.js
index 42c746a7..82880bea 100644
--- a/js/app.js
+++ b/js/app.js
@@ -604,6 +604,8 @@ app = Sammy('#main', function (sam) {
 
     sam.get('#/apps/:app', function (c) {
         c.api('/app/'+c.params['app']+'?raw=true', function(data) { // http://api.yunohost.org/#!/app/app_info_get_9
+            // Presentation
+            data.settings.allowed_users = data.settings.allowed_users.replace(',', ', ');
             c.view('app/app_info', data);
         });
     });
@@ -787,6 +789,19 @@ app = Sammy('#main', function (sam) {
         }
     });
 
+    // Make app default
+    sam.get('#/apps/:app/default', function (c) {
+        if (confirm('Are you sure you want to make this app default ?')) {
+            params = {'app': c.params['app']}
+            c.api('/app/default', function() { //
+                store.clear('slide');
+                c.redirect('#/apps/'+ c.params['app']);
+            }, 'PUT', params);
+        } else {
+            store.clear('slide');
+            c.redirect('#/apps/'+ c.params['app']);
+        }
+    });
 
     /**
      * Services
diff --git a/views/app/app_access.ms b/views/app/app_access.ms
index dd5cb0ad..05d15079 100644
--- a/views/app/app_access.ms
+++ b/views/app/app_access.ms
@@ -12,7 +12,7 @@
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h2 class="panel-title">Allowed users</h2>
+        <h2 class="panel-title"><span class="fa-fw fa-users"></span> Allowed users</h2>
     </div>
     {{#if settings.allowed_users}}
     <div class="list-group">
@@ -60,6 +60,7 @@
     <div class="panel-heading">
         <h2 class="panel-title">
             <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
+                <span class="fa-fw fa-wrench"></span>
                 Bulk operations
             </a>
         </h2>
diff --git a/views/app/app_info.ms b/views/app/app_info.ms
index 73df90d9..ac00324b 100644
--- a/views/app/app_info.ms
+++ b/views/app/app_info.ms
@@ -4,41 +4,62 @@
     </a>
 </div>
 <div class="pull-right">
-    <a href="#/apps/{{settings.id}}/access" class="btn btn-info slide">
-        <span class="fa-lock"></span> Access
-    </a>
 </div>
 <div class="clearfix"></div>
 <h1 class="view-title">{{settings.label}}</h1>
 
 <div class="br"></div>
 
-<ul class="list-group">
-    <li class="list-group-item">
-        <div class="row">
-            <div class="col-sm-3 text-right hidden-xs"><strong>ID</strong></div>
-            <div class="col-sm-3 visible-xs"><strong>ID</strong></div>
-            <div class="col-sm-9"> {{settings.id}}</div>
-        </div>
-    </li>
-    <li class="list-group-item">
-        <div class="row">
-            <div class="col-sm-3 text-right hidden-xs"><strong>Description</strong></div>
-            <div class="col-sm-3 visible-xs"><strong>Description</strong></div>
-            <div class="col-sm-9"> {{manifest.description.en}}</div>
-        </div>
-    </li>
-    <li class="list-group-item">
-        <div class="row">
-            <div class="col-sm-3 text-right hidden-xs"><strong>URL</strong></div>
-            <div class="col-sm-3 visible-xs"><strong>URL</strong></div>
-            <div class="col-sm-9"> <a href="https://{{settings.domain}}{{settings.path}}" target="_blank">https://{{settings.domain}}{{settings.path}}</a></div>
-        </div>
-    </li>
-</ul>
-
-<div class="text-center">
-    <a href="#/apps/{{settings.id}}/uninstall" class="btn btn-danger slide back">
-        <span class="fa-trash-o"></span> Uninstall
-    </a>
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <h2 class="panel-title"><span class="fa-fw fa-info-circle"></span> Infos</h2>
+    </div>
+    <div class="panel-body">
+        <dl class="dl-horizontal">
+            <dt>ID</dt>
+            <dd>{{settings.id}}</dd>
+            <dt>Description</dt>
+            <dd>{{manifest.description.en}}</dd>
+            <dt>Mode</dt>
+            <dd>{{settings.mode}}</dd>
+            <dt>URL</dt>
+            <dd><a href="https://{{settings.domain}}{{settings.path}}" target="_blank">https://{{settings.domain}}{{settings.path}}</a></dd>
+        </dl>
+    </div>
+</div>
+
+<div class="panel-group" id="accordion">
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <h2 class="panel-title">
+            <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
+                <span class="fa-fw fa-wrench"></span> Operations
+            </a>
+        </h2>
+    </div>
+    <div id="collapseOne" class="panel-collapse collapse">
+    <div class="panel-body">
+        <div class="container">
+            <p>Manage user access. Allowed users: {{settings.allowed_users}}.</p>
+            <a href="#/apps/{{settings.id}}/access" class="btn btn-info slide">
+                <span class="fa-lock"></span> Access
+            </a>
+        </div>
+        <hr>
+        <div class="container">
+            <p>Redirect domain root to this application ({{settings.domain}}).</p>
+            <a href="#/apps/{{settings.id}}/default" class="btn btn-success slide">
+                <span class="fa-star"></span> Make default
+            </a>
+        </div>
+        <hr>
+        <div class="container">
+            <p>Remove this application.</p>
+            <a href="#/apps/{{settings.id}}/uninstall" class="btn btn-danger slide back">
+                <span class="fa-trash-o"></span> Uninstall
+            </a>
+        </div>
+    </div>
+    </div>
+</div>
 </div>