jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Further simplification of the layout code

Browse Source
This commit is contained in:
Johannes Zellner
2017-08-08 18:24:00 +02:00
parent 5a7e636f2d
commit 59936c6fbf
7 changed files with 107 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webadmin/src/views/activity.html
View File

@@ -1,11 +1,11 @@
<div class="row">
<div>
<div class="col-md-10 col-md-offset-1">
<h1>Activity Log</h1>
</div>
</div>
<div class="row">
<div>
<div class="col-md-10 col-md-offset-1">
<div class="filter">
<input type="text" class="form-control" ng-model="search" ng-model-options="{ debounce: 1000 }" ng-change="updateFilter()" placeholder="Search"/>
@@ -22,7 +22,7 @@
</div>
</div>
<div class="row">
<div>
<div class="col-md-10 col-md-offset-1">
<div class="card card-block" style="max-width: 100%">
<center ng-show="busy"><h2><i class="fa fa-circle-o-notch fa-spin"></i></h2></center>

98
webadmin/src/views/graphs.html
View File

@@ -1,68 +1,52 @@
<div class="content">
<div class="text-left">
<h2>Memory</h2>
</div>
<div class="graphs">
<div class="card card-large text-center">
<div class="row">
<div class="col-md-10 col-md-offset-1">
<div class="row">
<div class="col-md-12 text-left">
<h2>Memory</h2>
</div>
</div>
<div class="row shadow memory-app-container">
<div class="row">
<div class="col-md-6">
<h3>Apps</h3>
<canvas id="memoryUsageAppsChart" width="200" height="200"></canvas>
</div>
<div class="col-md-6">
<h3>System</h3>
<canvas id="memoryUsageSystemChart" width="200" height="200"></canvas>
</div>
</div>
<br/>
<div class="row">
<div class="col-md-12">
<h4 ng-show="activeApp === 'system'">System</h4>
<h4 ng-show="activeApp !== 'system'">{{ activeApp.location }}</h4>
<br/>
<canvas id="memoryAppChart" width="900" height="300"></canvas>
<p>Memory consumption in MB.</p>
</div>
</div>
</div>
</div>
<div class="col-md-6">
<h3>Apps</h3>
<canvas id="memoryUsageAppsChart" width="200" height="200"></canvas>
</div>
<div class="col-md-6">
<h3>System</h3>
<canvas id="memoryUsageSystemChart" width="200" height="200"></canvas>
</div>
</div>
<br/>
<br/>
<div class="row">
<div class="col-md-10 col-md-offset-1">
<div class="row">
<div class="col-md-12 text-left">
<h2>Disk Usage</h2>
</div>
</div>
<div class="row shadow memory-app-container">
<div class="col-md-12">
<h4><span class="badge">{{ diskUsage['system'].sum }} GB</span></h4>
<canvas id="systemDiskUsageChart" width="200" height="200"></canvas>
<p>
<span class="text-success">Free {{ diskUsage['system'].free }} GB</span>
&nbsp;
<span class="text-primary">Used {{ diskUsage['system'].used }} GB</span>
</p>
</div>
</div>
</div>
<div class="col-md-12">
<h4 ng-show="activeApp === 'system'">System</h4>
<h4 ng-show="activeApp !== 'system'">{{ activeApp.location }}</h4>
<br/>
<canvas id="memoryAppChart" width="900" height="300"></canvas>
<p>Memory consumption in MB.</p>
</div>
</div>
</div>
<br/>
<div class="text-left">
<h2>Disk Usage</h2>
</div>
<div class="card card-large text-center">
<div class="row">
<div class="col-md-12">
<h4><span class="badge">{{ diskUsage['system'].sum }} GB</span></h4>
<canvas id="systemDiskUsageChart" width="200" height="200"></canvas>
<p>
<span class="text-success">Free {{ diskUsage['system'].free }} GB</span>
&nbsp;
<span class="text-primary">Used {{ diskUsage['system'].used }} GB</span>
</p>
</div>
</div>
</div>
</div>
<br/>
<br/>

33
webadmin/src/views/logs.html
View File

@@ -1,23 +1,24 @@
<div class="row">
<div class="col-md-10 col-md-offset-1">
<h1>Logs</h1>
</div>
</div>
<div class="logs-main">
<div class="row">
<div class="col-md-10 col-md-offset-1">
<div class="filter">
<select class="form-control" ng-options="log.name for log in logs track by log.value" ng-model="selected"></select>
</div>
<div class="pagination pull-right">
<a class="btn btn-default btn-outline" ng-href="{{ selected.url }}&format=short&lines=800"><i class="fa fa-download"></i> Download </a>
<div class="logs-header">
<div class="col-md-10 col-md-offset-1">
<div class="text-left">
<h1>Logs</h1>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-10 col-md-offset-1">
<div class="card card-block log-line-container">
<div class="logs-controls">
<div class="col-md-10 col-md-offset-1">
<div class="filter">
<select class="form-control" ng-options="log.name for log in logs track by log.value" ng-model="selected"></select>
</div>
<div class="pagination pull-right">
<a class="btn btn-default btn-outline" ng-href="{{ selected.url }}&format=short&lines=800"><i class="fa fa-download"></i> Download </a>
</div>
</div>
</div>
<div class="col-md-10 col-md-offset-1 log-line-container"></div>
</div>

2
webadmin/src/views/logs.js
View File

@@ -64,7 +64,7 @@ angular.module('Application').controller('LogsController', ['$scope', '$location
logLine.html('<span class="time">' + timeString + ' </span>' + window.ansiToHTML(typeof data.message === 'string' ? data.message : ab2str(data.message)));
logViewer.append(logLine);
if (autoScroll) tmp.lastChild.scrollIntoView({ behavior: 'instant', block: 'end' });
// if (autoScroll) tmp.lastChild.scrollIntoView({ behavior: 'instant', block: 'end' });
};
});
});

16
webadmin/src/views/users.html
View File

@@ -233,12 +233,8 @@
<div class="content">
<div>
<div class="text-left">
<h1>
Users <button class="btn btn-primary btn-outline pull-right" ng-click="useradd.show()"><i class="fa fa-user-plus"></i> New User</button>
</h1>
</div>
<div class="text-left">
<h1>Users <button class="btn btn-primary btn-outline pull-right" ng-click="useradd.show()"><i class="fa fa-user-plus"></i> New User</button></h1>
</div>
<div class="card card-large">
@@ -298,12 +294,8 @@
<br/>
<div>
<div class="text-left">
<h1>
Groups <button class="btn btn-primary btn-outline pull-right" ng-click="groupAdd.show()"><i class="fa fa-plus"></i> New Group</button>
</h1>
</div>
<div class="text-left">
<h1>Groups <button class="btn btn-primary btn-outline pull-right" ng-click="groupAdd.show()"><i class="fa fa-plus"></i> New Group</button></h1>
</div>
<div class="card card-large">