From 36df6b9e1ef2c5a33d8239f64081d7b5bcc03a56 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Wed, 7 Apr 2021 10:36:01 +0200
Subject: [PATCH] Group terminal/logs/filemanager toolbar buttons

---
 src/theme.scss      |  3 ++-
 src/views/app.html  |  8 +++++---
 src/views/apps.html | 38 --------------------------------------
 src/views/apps.js   | 15 ---------------
 4 files changed, 7 insertions(+), 57 deletions(-)

diff --git a/src/theme.scss b/src/theme.scss
index ba43872cb..401a75eee 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -612,10 +612,11 @@ multiselect {
             }
         }
 
-        div {
+        &>div {
             white-space: nowrap;
             text-align: right;
             padding-top: 10px;
+            margin-top: 10px;
         }
     }
 
diff --git a/src/views/app.html b/src/views/app.html
index f363dc35b..7575fbd44 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -410,9 +410,11 @@
             <i ng-show="app.installationState === 'pending_start' || app.installationState === 'pending_stop'" class="fa fa-circle-notch fa-spin"></i>
             <i ng-hide="app.installationState === 'pending_start' || app.installationState === 'pending_stop'" class="fas" ng-class="{ 'fa-pause': !uninstall.startButton, 'fa-play': uninstall.startButton }"></i>
           </button>
-          <a class="btn btn-sm btn-default" ng-href="{{ '/logs.html?appId=' + app.id }}" target="_blank" uib-tooltip="{{ 'app.logsActionTooltip' | tr }}" tooltip-append-to-body="true" tooltip-placement="bottom"><i class="fas fa-align-left"></i></a>
-          <a class="btn btn-sm btn-default" ng-href="{{ '/terminal.html?id=' + app.id }}" target="_blank" uib-tooltip="{{ 'app.terminalActionTooltip' | tr }}" tooltip-append-to-body="true" tooltip-placement="bottom"><i class="fa fa-terminal"></i></a>
-          <a class="btn btn-sm btn-default" ng-href="{{ '/filemanager.html?appId=' + app.id }}" target="_blank" uib-tooltip="{{ 'app.filemanagerActionTooltip' | tr }}" tooltip-append-to-body="true" tooltip-placement="bottom"><i class="fas fa-folder"></i></a>
+          <div class="btn-group btn-group-sm" role="group">
+            <a class="btn btn-sm btn-default" ng-href="{{ '/logs.html?appId=' + app.id }}" target="_blank" uib-tooltip="{{ 'app.logsActionTooltip' | tr }}" tooltip-append-to-body="true" tooltip-placement="bottom"><i class="fas fa-align-left"></i></a>
+            <a class="btn btn-sm btn-default" ng-href="{{ '/terminal.html?id=' + app.id }}" target="_blank" uib-tooltip="{{ 'app.terminalActionTooltip' | tr }}" tooltip-append-to-body="true" tooltip-placement="bottom"><i class="fa fa-terminal"></i></a>
+            <a class="btn btn-sm btn-default" ng-href="{{ '/filemanager.html?appId=' + app.id }}" target="_blank" uib-tooltip="{{ 'app.filemanagerActionTooltip' | tr }}" tooltip-append-to-body="true" tooltip-placement="bottom"><i class="fas fa-folder"></i></a>
+          </div>
           <div class="dropdown" style="display: inline-block">
             <button class="btn btn-sm btn-default dropdown-toggle" type="button" data-toggle="dropdown" uib-tooltip="{{ 'app.docsActionTooltip' | tr }}" tooltip-append-to-body="true" tooltip-placement="bottom">
               <i class="fas fa-book"></i>
diff --git a/src/views/apps.html b/src/views/apps.html
index d0659b502..58100e32e 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -31,44 +31,6 @@
   </div>
 </div>
 
-<!-- Modal app info -->
-<div class="modal fade" id="appInfoModal" tabindex="-1" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <img ng-src="{{appInfo.app.iconUrl}}" onerror="this.onerror=null;this.src='img/appicon_fallback.png'" class="app-info-icon" style="padding-right: 10px;"/>
-        <h4 style="margin-top: 0;">
-          {{ appInfo.app.manifest.title }}
-          <br/>
-          <span class="text-small text-muted">{{ 'app.appInfo.package' | tr }} <a ng-href="/#/appstore/{{appInfo.app.manifest.id}}?version={{appInfo.app.manifest.version}}">v{{ appInfo.app.manifest.version }}</a></span>
-          <br/>
-          <span class="text-small text-muted" ng-show="appInfo.app.upstreamVersion">App v{{ appInfo.app.upstreamVersion }}</a></span>
-        </h5>
-      </div>
-      <div class="modal-body">
-        <p ng-hide="appInfo.app.appStoreId" ng-bind-html="'app.appInfo.customAppUpdateWarning' | tr:{ docsLink: 'https://docs.cloudron.io/custom-apps/tutorial/' }"></p>
-        <p ng-show="appInfo.app.manifest.documentationUrl" ng-bind-html="'app.appInfo.appDocsUrl' | tr:{ docsUrl: appInfo.app.manifest.documentationUrl, title: appInfo.app.manifest.title, forumUrl: (appInfo.app.manifest.forumUrl || 'https://forum.cloudron.io') }"></p>
-
-        <p ng-show="appInfo.app.manifest.addons.email">{{ 'app.appInfo.ssoEmail' | tr }}</p>
-        <p ng-show="appInfo.app.sso && !appInfo.app.manifest.addons.email">{{ 'app.appInfo.sso' | tr }}</p>
-
-        <a ng-show="appInfo.app.manifest.postInstallMessage" href="" data-toggle="collapse" data-parent="#accordion" data-target="#appinfoPostinstallMessage">
-          <i class="fa fa-angle-right"></i> {{ 'app.appInfo.firstTimeCollapseHeader' | tr }}
-        </a>
-
-        <div id="appinfoPostinstallMessage" class="panel-collapse collapse">
-          <br/>
-          <div ng-bind-html="appInfo.app.manifest.postInstallMessage | markdown2html"></div>
-        </div>
-
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-primary" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
-      </div>
-    </div>
-  </div>
-</div>
-
 <script>
     function imageErrorHandler(elem) {
         'use strict';
diff --git a/src/views/apps.js b/src/views/apps.js
index b5fba7317..9b8e4c073 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -73,21 +73,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$translat
         }
     };
 
-    $scope.appInfo = {
-        app: {},
-        message: '',
-
-        show: function (app) {
-            $scope.appInfo.app = app;
-            $scope.appInfo.message = app.manifest.postInstallMessage;
-
-            $('#appinfoPostinstallMessage').collapse('hide');
-            $('#appInfoModal').modal('show');
-
-            return false; // prevent propagation and default
-        }
-    };
-
     $scope.showAppConfigure = function (app, view) {
         $location.path('/app/' + app.id + '/' + view);
     };