Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit 2121550

Browse files
justincliftjustinclift
committed
webui: Improve the upload and home page layouts for live databases
1 parent 38e4014 commit 2121550

File tree

2 files changed

+53
-64
lines changed

2 files changed

+53
-64
lines changed

‎webui/templates/profile.html‎

Lines changed: 29 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ <h2 id="viewuser" style="margin-top: 10px;">
2727
<div class="row">
2828
<div class="col-md-6">
2929
<div class="pull-left" style="padding-top: 8px;">
30-
<h3 style="display: inline; vertical-align: middle;">Public databases</h3>
30+
<h3 style="display: inline; vertical-align: middle;">Public standard databases</h3>
3131
</div>
3232
<div class="pull-right" style="padding-bottom: 8px;">
3333
<button type="button" class="btn btn-default" ng-click="toggleCollapsedPub()" data-cy="pubexpand">{{ titleCollapsedPub }}</button>
@@ -62,15 +62,15 @@ <h3 style="display: inline; vertical-align: middle;">Public databases</h3>
6262
<table class="table table-striped table-responsive profileTable" data-cy="pubdbs">
6363
<tr>
6464
<td>
65-
<h4>No public databases yet</h4>
65+
<h4>No public standard databases yet</h4>
6666
</td>
6767
</tr>
6868
</table>
6969
[[ end ]]
7070
</div>
7171
<div class="col-md-6">
7272
<div class="pull-left" style="padding-top: 8px;">
73-
<h3 style="display: inline; vertical-align: middle;">Private databases</h3>
73+
<h3 style="display: inline; vertical-align: middle;">Private standard databases</h3>
7474
</div>
7575
<div class="pull-right" style="padding-bottom: 8px;">
7676
<button type="button" class="btn btn-default" ng-click="toggleCollapsedPriv()" data-cy="privexpand">{{ titleCollapsedPriv }}</button>
@@ -113,6 +113,32 @@ <h4>No private databases yet</h4>
113113
</div>
114114
</div>
115115

116+
[[ if .LiveDBS ]]
117+
<div class="row">
118+
<div class="col-md-6">&nbsp;</div>
119+
<div class="col-md-6">
120+
<div class="pull-left" style="padding-bottom: 8px;">
121+
<h3 style="display: inline; vertical-align: middle;">Private live databases (<span style="color: blue">in beta testing</span>)</h3>
122+
</div>
123+
</div>
124+
</div>
125+
<div class="row">
126+
<div class="col-md-6">&nbsp;</div>
127+
<div class="col-md-6">
128+
<table class="table table-striped table-responsive profileTable" data-cy="livedbstbl">
129+
<tr ng-repeat="row in livedbs">
130+
<td style="border: 1px solid #ddd">
131+
<h4><a class="blackLink" href="/{{ row.owner_name + '/' + row.database_name }}" data-cy="livedb-{{ row.owner_name }}-{{ row.database_name }}">{{ row.owner_name }}/{{ row.database_name }}</a></h4>
132+
</td>
133+
<td>
134+
<button type="button" class="btn btn-danger" ng-click="confirmDelete(row.database_name)" data-cy="delbtn">Delete database</button>
135+
</td>
136+
</tr>
137+
</table>
138+
</div>
139+
</div>
140+
[[ end ]]
141+
116142
<div class="row">
117143
<div class="col-md-6">
118144
<div class="pull-left" style="padding-top: 8px;">
@@ -242,40 +268,6 @@ <h4>No databases shared with others yet</h4>
242268
[[ end ]]
243269
</div>
244270
</div>
245-
[[ if .LiveDBS ]]
246-
<div class="row" style="border: 5px dashed #181a9c; margin: 2%; border-radius: 10px">
247-
<div class="col-md-12">
248-
<div style="text-align: center; font-size: large; font-style: italic; color: #181a9c; margin-top: 1%">Experimental</div>
249-
<div class="row">
250-
<div class="col-md-3">&nbsp;</div>
251-
<div class="col-md-6">
252-
<div style="padding-top: 8px; text-align: center">
253-
<h3 style="display: inline; vertical-align: middle;">Live databases (write enabled)</h3>
254-
<br />
255-
<h4 style="vertical-align: middle;"><a class="blackLink" href="https://api.dbhub.io">Access via API only (to start with)</a></h4>
256-
</div>
257-
</div>
258-
<div class="col-md-3">&nbsp;</div>
259-
</div>
260-
<div class="row">
261-
<div class="col-md-3">&nbsp;</div>
262-
<div class="col-md-6">
263-
<table class="table table-striped table-responsive profileTable" data-cy="livedbstbl">
264-
<tr ng-repeat="row in livedbs">
265-
<td style="border: 1px solid #ddd">
266-
<h4><a class="blackLink" href="/{{ row.owner_name + '/' + row.database_name }}" data-cy="livedb-{{ row.owner_name }}-{{ row.database_name }}">{{ row.owner_name }}/{{ row.database_name }}</a></h4>
267-
</td>
268-
<td>
269-
<button type="button" class="btn btn-danger" ng-click="confirmDelete(row.database_name)" data-cy="delbtn">Delete database</button>
270-
</td>
271-
</tr>
272-
</table>
273-
</div>
274-
<div class="col-md-3">&nbsp;</div>
275-
</div>
276-
</div>
277-
</div>
278-
[[ end ]]
279271
</div>
280272
[[ template "footer" . ]]
281273
<script>

‎webui/templates/upload.html‎

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,27 @@ <h2 style="text-align: center;" data-cy="uptitle">Upload a new commit</h2>
1515
[[ else ]]
1616
<h2 style="text-align: center;" data-cy="uptitle">Upload a database</h2>
1717
<h4 style="text-align: center;">
18-
The public/private setting is ignored when uploading new versions to an existing database.<br />
18+
The public/private setting is ignored when uploading new versions to an existing standard database.<br />
1919
To change it, visit the "Settings" page for the database after uploading.
2020
</h4>
2121
[[ end ]]
2222
<form action="/x/uploaddata/" enctype="multipart/form-data" method="POST">
2323
<table class="table table-striped table-responsive settingsTable">
2424
<tr>
25-
<th style="vertical-align: middle; width: 25%">Database file</th>
26-
<td style="vertical-align: middle;"><input type="file" name="database" data-cy="dbfile"></td>
25+
<th style="vertical-align: middle; width: 15%">Database file</th>
26+
<td style="vertical-align: middle;" colspan="2"><input type="file" name="database" data-cy="dbfile"></td>
27+
</tr>
28+
<tr>
29+
<th style="vertical-align: middle;">Database type?</th>
30+
<td style="width: 20%">
31+
<div class="btn-group">
32+
<label class="btn btn-default" ng-model="radioLive" ng-click="liveClick('false')" uib-btn-radio="'false'" data-cy="livebtn">Standard</label>
33+
<label class="btn btn-default" ng-model="radioLive" ng-click="liveClick('true')" uib-btn-radio="'true'" data-cy="livebtn">Live</label>
34+
</div>
35+
</td>
36+
<td style="vertical-align: middle; width: 65%">
37+
<span ng-bind-html="liveDesc"></span>
38+
</td>
2739
</tr>
2840
[[ if and (ne .Meta.Owner "") (ne .Meta.Database "") ]]
2941
<tr>
@@ -35,19 +47,21 @@ <h4 style="text-align: center;">
3547
</th>
3648
</tr>
3749
[[ else ]]
38-
<tr>
50+
<tr ng-if="radioLive === 'false'">
3951
<th style="vertical-align: middle;">Public?</th>
4052
<td>
4153
<div class="btn-group">
4254
<label class="btn btn-default" ng-model="radioPublic" ng-click="publicClick('true')" uib-btn-radio="'true'" data-cy="pubbtn">Public</label>
4355
<label class="btn btn-default" ng-model="radioPublic" ng-click="publicClick('false')" uib-btn-radio="'false'" data-cy="privbtn">Private</label>
4456
</div>
57+
</td>
58+
<td style="vertical-align: middle;">
4559
<span ng-bind-html="publicDesc"></span>
4660
</td>
4761
</tr>
48-
<tr>
49-
<th style="vertical-align: middle; width: 25%">Licence</th>
50-
<td style="vertical-align: middle;">
62+
<tr ng-if="radioLive === 'false'">
63+
<th style="vertical-align: middle;">Licence</th>
64+
<td style="vertical-align: middle;" colspan="2">
5165
<div class="dropdown">
5266
<div class="btn-group" uib-dropdown keyboard-nav="true">
5367
<button id="licence" type="button" class="btn" data-cy="licname">{{ Licence }}</button>
@@ -66,7 +80,7 @@ <h4 style="text-align: center;">
6680
</tr>
6781
[[ end ]]
6882
</table>
69-
<uib-accordion>
83+
<uib-accordion ng-if="radioLive === 'false'">
7084
<div uib-accordion-group class="panel-default" heading="Advanced" is-open="false">
7185
<table class="table table-striped table-responsive settingsTable" style="width: 100%">
7286
<tr>
@@ -103,23 +117,6 @@ <h4 style="text-align: center;">
103117
</td>
104118
</tr>
105119
</table>
106-
<div class="row" style="border: 5px dashed #181a9c; margin: 2%; border-radius: 10px">
107-
<div class="col-md-12">
108-
<div style="text-align: center; font-size: large; font-style: italic; color: #181a9c; margin-top: 1%">Experimental</div>
109-
<table class="table table-striped table-responsive settingsTable">
110-
<tr>
111-
<th style="vertical-align: middle; width: 33%">Live database? (not version controlled)</th>
112-
<td>
113-
<div class="btn-group">
114-
<label class="btn btn-default" ng-model="radioLive" ng-click="liveClick('false')" uib-btn-radio="'false'" data-cy="livebtn">Standard</label>
115-
<label class="btn btn-default" ng-model="radioLive" ng-click="liveClick('true')" uib-btn-radio="'true'" data-cy="livebtn">Live</label>
116-
</div>
117-
<span ng-bind-html="liveDesc"></span>
118-
</td>
119-
</tr>
120-
</table>
121-
</div>
122-
</div>
123120
</div>
124121
</uib-accordion>
125122
<div style="text-align: center;">
@@ -207,10 +204,10 @@ <h4 style="text-align: center;">
207204
$scope.liveClick = function(newValue) {
208205
if (newValue === "true") {
209206
$scope.radioLive = "true";
210-
$scope.liveDesc = "&nbsp; Database will be writable (not version controlled).";
207+
$scope.liveDesc = "<b>Live</b> means a traditional SQLite database. These <b>are</b> able to run INSERT/UPDATE/DELETE statements and other SQL queries. A good choice if you're not publishing data, or looking to share them with others.";
211208
} else {
212209
$scope.radioLive = "false";
213-
$scope.liveDesc = "&nbsp; Database will be standard (version controlled).";
210+
$scope.liveDesc = "<b>Standard</b> uses a git like system of read-only snapshots, suitable for publishing data, and collaborating upon with others. These databases <b>cannot</b> have INSERT/UPDATE/DELETE statements run on them directly.";
214211
}
215212
};
216213
$scope.liveClick($scope.radioLive);

0 commit comments

Comments
 (0)