Skip to content

Commit 35a2e38

Browse files
skadefroskadefro
committed
improve html q
1 parent ccc2dbc commit 35a2e38

4 files changed

Lines changed: 21 additions & 38 deletions

File tree

‎OpenFlow/src/public/Login.html‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,20 @@ <h5 class="card-title text-center"><span translate lib="web">signin</span> {{ctr
2121
</div>
2222
<button class="btn btn-lg btn-primary btn-block text-uppercase" type="submit" ng-show="ctrl.localenabled"
2323
translate lib="web">signin</button>
24-
<!-- <button class="btn btn-lg btn-primary btn-block text-uppercase" type="button" ng-click="ctrl.submit()"
25-
ng-show="ctrl.localenabled" translate lib="web">signin</button> -->
26-
<!-- <button class="btn btn-lg btn-primary btn-block text-uppercase" type="button" ng-click="ctrl.Signup()"
27-
ng-show="ctrl.WebSocketClientService.stripe_api_key != ''" translate lib="web">signup</button> -->
2824
<hr class="my-4" ng-show="ctrl.localenabled">
2925

3026
<a ng-href="/{{model.id}}" ng-repeat="model in ctrl.providers" class="btn btn-lg btn-block text-uppercase">
31-
<i class="fab {{model.logo}} mr-2"></i><span translate lib="web">{{model.name}}</span>
27+
<em class="fab {{model.logo}} mr-2"></em><span translate lib="web">{{model.name}}</span>
3228
</a>
3329

3430
<a href ng-click="ctrl.Scan()" ng-show="ctrl.qrcodescan" class="btn btn-lg btn-block text-uppercase">
35-
<i class="fas fa-qrcode mr-2"></i><span translate lib="web">QRCode Scan</span>
31+
<em class="fas fa-qrcode mr-2"></em><span translate lib="web">QRCode Scan</span>
3632
</a>
3733
<div class="card-body" ng-show="ctrl.allow_user_registration==true">
38-
<small><i>
34+
<small><em>
3935
Select a provider or login using a local username and password.
4036
A new user will automaticly be created if username is unknown.
41-
Email validation will be requered to use the core functions.</i></small>
37+
Email validation will be requered to use the core functions.</em></small>
4238
</div>
4339
</form>
4440
</div>
@@ -48,5 +44,5 @@ <h5 class="card-title text-center"><span translate lib="web">signin</span> {{ctr
4844
</div>
4945
<div class="cameraView" ng-show="ctrl.scanning==true">
5046
<a href ng-click="ctrl.Scan()" ng-show="ctrl.scanning==true" class="btn btn-lg btn-block text-uppercase">
51-
<i class="fas fa-qrcode mr-2"></i><span translate lib="web">QRCode Scan</span>
47+
<em class="fas fa-qrcode mr-2"></em><span translate lib="web">QRCode Scan</span>
5248
</div>

‎OpenFlow/src/public/Nodered.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ <h1 translate lib="web">nodered</h1>
161161
</section>
162162
<br />
163163
<br />
164-
<small ng-show="menuctrl.WebSocketClientService.stripe_api_key != ''"><i style="color: gray;">
164+
<small ng-show="menuctrl.WebSocketClientService.stripe_api_key != ''"><em style="color: gray;">
165165
Free nodered instances will be shutdown after 24hours.
166-
</i></small>
166+
</em></small>
167167
<br />
168168
<br />

‎OpenFlow/src/public/PassiveLogin.html‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<link rel="preload" href="/vendor/fortawesome/fontawesome-free/webfonts/fa-brands-400.woff2" as="font"
99
type="font/woff2" crossorigin>
1010
<link rel="stylesheet" href="bundle.css">
11+
<title>Login</title>
1112
<script src="bundle.js"></script>
1213
<script src="angular-localization.min.js"></script>
1314
</head>
@@ -128,14 +129,8 @@
128129
this.formioRender.submission = { data: this.user };
129130
this.formioRender.on('submit', async submission => {
130131
console.debug('onsubmit', submission);
131-
// $(".alert-success").hide();
132-
// setTimeout(() => {
133-
// // just to be safe
134-
// $(".alert-success").hide();
135-
// }, 200);
136132
postJSON("/validateuserform", submission, (err, data) => {
137133
location.reload();
138-
// location.reload(true);
139134
})
140135
});
141136
if (!$scope.$$phase) { $scope.$apply(); }
@@ -159,7 +154,6 @@
159154
if (data._id) {
160155
this.user = data;
161156
this.jwt.bind(this)(null, null);
162-
// getJSON("/jwt", this.jwt.bind(this));
163157
}
164158
getJSON("/loginproviders", this.process.bind(this));
165159
});
@@ -203,14 +197,14 @@ <h5 class="card-title text-center"><span translate lib="web">signin</span> {{ctr
203197

204198
<a ng-href="/{{model.id}}" ng-repeat="model in ctrl.providers track by $index"
205199
class="btn btn-lg btn-block text-uppercase">
206-
<i class="fab {{model.logo}}"></i><span translate lib="web">{{model.name}}</span>
200+
<em class="fab {{model.logo}}"></em><span translate lib="web">{{model.name}}</span>
207201
</a>
208202

209203
<div class="card-body" ng-show="ctrl.allow_user_registration==true">
210-
<small><i>
204+
<small><em>
211205
Select a provider or login using a local username and password.
212206
A new user will automaticly be created if username is unknown.
213-
Email validation will be requered to use the core functions.</i></small>
207+
Email validation will be requered to use the core functions.</em></small>
214208
</div>
215209
</form>
216210
</div>
@@ -227,7 +221,7 @@ <h5 class="card-title text-center"><span translate lib="web">signin</span> {{ctr
227221
<div id='formio' ng-show="ctrl.form!=null">
228222
</div>
229223
<a tabindex="-1" ng-href="/Signout" class="btn btn-lg btn-block text-uppercase">
230-
<i class="fas fa-sign-out-alt"></i>
224+
<em class="fas fa-sign-out-alt"></em>
231225
Singout
232226
</a>
233227

‎OpenFlow/src/public/Payment.html‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@
33
width: 350px;
44
}
55
</style>
6-
<!-- <script src="https://js.stripe.com/v3/"></script> -->
7-
8-
<!-- <section ng-show="ctrl.WebSocketClientService.stripe_api_key != ''" ng-show="ctrl.allowpayment">
9-
<label for="card-element">Card</label>
10-
<div id="card-element"></div>
11-
</section>
12-
<a href ng-click="ctrl.Test()" class="button">Test</a> -->
136
<form>
147
<div id="customer-info" ng-hide="ctrl.loading==true">
158
<div class="row">
@@ -387,8 +380,8 @@
387380
{{ ctrl.nextbill.dtperiod_end.toDateString() }} ) </div>
388381
<div class="row">
389382
<div class="col-sm-1"></div>
390-
<div class="col-sm-6"><b>description</b></div>
391-
<div class="col-sm-2"><b>price</b></div>
383+
<div class="col-sm-6"><strong>description</strong></div>
384+
<div class="col-sm-2"><strong>price</strong></div>
392385
</div>
393386
<div class="row" ng-repeat="line in ctrl.nextbill.lines.data">
394387
<div class="col-sm-1"></div>
@@ -397,25 +390,25 @@
397390
</div>
398391
<div class="row" ng-show="ctrl.nextbill.discount != null && ctrl.nextbill.discount.coupon != null">
399392
<div class="col-sm-1"></div>
400-
<div class="col-sm-1"><b>discount</b></div>
393+
<div class="col-sm-1"><strong>discount</strong></div>
401394
<div class="col-sm-5"></div>
402395
<div class="col-sm-2">{{ ctrl.nextbill.discount.coupon.percent_off }}%</div>
403396
</div>
404397
<div class="row" ng-show="ctrl.nextbill.tax > 0">
405398
<div class="col-sm-1"></div>
406-
<div class="col-sm-1"><b>subtotal</b></div>
399+
<div class="col-sm-1"><strong>subtotal</strong></div>
407400
<div class="col-sm-5"></div>
408401
<div class="col-sm-2">{{ ctrl.nextbill.subtotal / 100 }}</div>
409402
</div>
410403
<div class="row">
411404
<div class="col-sm-1"></div>
412-
<div class="col-sm-1"><b>tax</b></div>
405+
<div class="col-sm-1"><strong>tax</strong></div>
413406
<div class="col-sm-5"></div>
414407
<div class="col-sm-2">{{ ctrl.nextbill.tax / 100 }}</div>
415408
</div>
416409
<div class="row">
417410
<div class="col-sm-1"></div>
418-
<div class="col-sm-1"><b>total</b></div>
411+
<div class="col-sm-1"><strong>total</strong></div>
419412
<div class="col-sm-5"></div>
420413
<div class="col-sm-2">{{ ctrl.nextbill.total / 100 }}</div>
421414
</div>
@@ -426,7 +419,7 @@
426419
</div>
427420
<div class="row">
428421
<div class="col-sm-1"></div>
429-
<div class="col-sm-6"><b>Amount due</b></div>
422+
<div class="col-sm-6"><strong>Amount due</strong></div>
430423
<div class="col-sm-2">{{ (ctrl.nextbill.starting_balance + ctrl.nextbill.total) / 100 }}</div>
431424
</div>
432425

@@ -478,10 +471,10 @@ <h6 class="card-subtitle mb-2 text-muted">{{(model.subplan.amount / 100)*ctrl.mo
478471
</div>
479472
<br />
480473
<br />
481-
<small><i style="color: gray;">
474+
<small><em style="color: gray;">
482475
All plans include a fair usage of database space/queries, and network trafic.
483476
All plans are covered by our <a href="https://www.openrpa.dk/terms" target="_blank">terms</a>.
484-
</i></small>
477+
</em></small>
485478
<br />
486479
<br />
487480
</form>

0 commit comments

Comments
 (0)