Skip to content
This repository was archived by the owner on May 7, 2024. It is now read-only.

Commit 62f9be7

Browse files
committed
UI ref
1 parent 8e0d93c commit 62f9be7

File tree

9 files changed

+106
-12
lines changed

9 files changed

+106
-12
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,5 @@ All notable changes to this project will be documented in this file.
6565
* Implemented data polling in the dashboard page (issue #61).
6666
* Demo user can now define default connection although permissions are not fully implemented yet. It's best that you only use admin users for now (issue #60).
6767
* Better error handling on profile updates (issue #59).
68+
* Various minor fixes and improvements
6869

assets/js/app/apis/add-api-modal.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h4 class="modal-title" id="modal-title">
1818
<div data-ng-include="'js/app/apis/partials/form-api-' + Gateway.version.split('.').slice(0, -1).join('') + '.html'"></div>
1919
<div class="form-group">
2020
<div class="col-sm-offset-4 col-sm-7">
21-
<button type="submit" class="btn btn-primary" ng-click="submit()">
21+
<button type="submit" class="btn btn-primary btn-block" ng-click="submit()">
2222
<i class="material-icons">&#xE876;</i>
2323
Submit API
2424
</button>

assets/js/app/apis/api-details.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<div ng-if="Gateway" data-ng-include="'js/app/apis/partials/form-api-' + Gateway.version.split('.').slice(0, -1).join('') + '.html'"></div>
1212
<div class="form-group">
1313
<div class="col-sm-offset-4 col-sm-7">
14-
<button type="submit" class="btn btn-primary" ng-click="updateApi()">
14+
<button type="submit" class="btn btn-primary btn-block" ng-click="updateApi()">
1515
<i class="material-icons">&#xE876;</i>
1616
Submit changes
1717
</button>

assets/js/app/apis/api-plugins.html

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,19 @@
3131
<tr
3232
dir-paginate="item in plugins.data | orderBy:'created_at':true | itemsPerPage: 25 | filter : search">
3333
<td>
34+
<!--<input-->
35+
<!--uib-tooltip="{{item.enabled ? 'Enabled' : 'Disabled'}}"-->
36+
<!--ng-change="updatePlugin(item)"-->
37+
<!--ng-model="item.enabled"-->
38+
<!--type="checkbox"/>-->
39+
3440
<input
35-
uib-tooltip="{{item.enabled ? 'Enabled' : 'Disabled'}}"
41+
bs-switch
42+
switch-on-color="primary"
3643
ng-change="updatePlugin(item)"
3744
ng-model="item.enabled"
38-
type="checkbox"/>
45+
type="checkbox"
46+
switch-size="mini">
3947
</td>
4048
<td>
4149
<raw-view data-item="item"></raw-view>

assets/js/app/core/services/NodesService.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
if($localStorage.credentials.user.node){
3434
defer.resolve($localStorage.credentials.user.node.id)
3535
}else{
36-
$state.go('settings')
36+
$state.go('settings.connections')
3737
defer.reject("No active nodes found")
3838

3939
}

assets/js/app/plugins/plugins.html

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,18 @@
3333
<tr
3434
dir-paginate="item in plugins.data | orderBy:'created_at':true | itemsPerPage: 25 | filter : search">
3535
<td>
36+
<!--<input-->
37+
<!--uib-tooltip="{{item.enabled ? 'Enabled' : 'Disabled'}}"-->
38+
<!--ng-change="updatePlugin(item)"-->
39+
<!--ng-model="item.enabled"-->
40+
<!--type="checkbox"/>-->
3641
<input
37-
uib-tooltip="{{item.enabled ? 'Enabled' : 'Disabled'}}"
42+
bs-switch
43+
switch-on-color="primary"
3844
ng-change="updatePlugin(item)"
3945
ng-model="item.enabled"
40-
type="checkbox"/>
46+
type="checkbox"
47+
switch-size="mini">
4148
</td>
4249
<td>
4350
<raw-view data-item="item"></raw-view>

assets/js/app/settings/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<ul class="nav nav-tabs">
1818
<li ui-sref=".connections" ui-sref-active="active"><a>Connections</a></li>
1919
<li ui-sref=".snapshots" ui-sref-active="active"><a>Snapshots <span class="badge">Beta</span></a></li>
20+
<!--<li ui-sref=".application" ui-sref-active="active"><a>Application</a></li>-->
2021
</ul>
2122
</div>
2223

assets/styles/_bootstrap_over.scss

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,15 +230,25 @@ input.form-control, select.form-control{
230230
}
231231

232232

233-
.modal-dialog{
234-
margin: 0 auto;
235-
padding:0;
233+
.modal {
234+
text-align: center;
235+
}
236236

237-
.modal-content {
238-
border-radius: 0 0 3px 3px;
237+
@media screen and (min-width: 768px) {
238+
.modal:before {
239+
display: inline-block;
240+
vertical-align: middle;
241+
content: " ";
242+
height: 100%;
239243
}
240244
}
241245

246+
.modal-dialog {
247+
display: inline-block;
248+
text-align: left;
249+
vertical-align: middle;
250+
}
251+
242252
.bootbox {
243253
.modal-content {
244254
width: 300px;

assets/styles/importer.scss

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -605,4 +605,71 @@ pre {
605605

606606
.table-align-top > thead > tr > th, .table-align-top > tbody > tr > th, .table-align-top > tfoot > tr > th, .table-align-top > thead > tr > td, .table-align-top > tbody > tr > td, .table-align-top > tfoot > tr > td {
607607
vertical-align: top !important;
608+
}
609+
610+
.mdi::before {
611+
font-size: 24px;
612+
line-height: 14px;
613+
}
614+
.btn .mdi::before {
615+
position: relative;
616+
top: 4px;
617+
}
618+
.btn-xs .mdi::before {
619+
font-size: 18px;
620+
top: 3px;
621+
}
622+
.btn-sm .mdi::before {
623+
font-size: 18px;
624+
top: 3px;
625+
}
626+
.dropdown-menu .mdi {
627+
width: 18px;
628+
}
629+
.dropdown-menu .mdi::before {
630+
position: relative;
631+
top: 4px;
632+
left: -8px;
633+
}
634+
.nav .mdi::before {
635+
position: relative;
636+
top: 4px;
637+
}
638+
.navbar .navbar-toggle .mdi::before {
639+
position: relative;
640+
top: 4px;
641+
color: #FFF;
642+
}
643+
.breadcrumb .mdi::before {
644+
position: relative;
645+
top: 4px;
646+
}
647+
.breadcrumb a:hover {
648+
text-decoration: none;
649+
}
650+
.breadcrumb a:hover span {
651+
text-decoration: underline;
652+
}
653+
.alert .mdi::before {
654+
position: relative;
655+
top: 4px;
656+
margin-right: 2px;
657+
}
658+
.input-group-addon .mdi::before {
659+
position: relative;
660+
top: 3px;
661+
}
662+
.navbar-brand .mdi::before {
663+
position: relative;
664+
top: 2px;
665+
margin-right: 2px;
666+
}
667+
.list-group-item .mdi::before {
668+
position: relative;
669+
top: 3px;
670+
left: -3px
671+
}
672+
673+
.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary, .bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-primary{
674+
background: $brand-primary;
608675
}

0 commit comments

Comments
 (0)