mirror of https://gitee.com/bigwinds/arangodb
shortcut style and position changed
This commit is contained in:
parent
5731d38f94
commit
42faa8af1b
|
@ -90,25 +90,22 @@
|
||||||
},{
|
},{
|
||||||
label: "scroll down",
|
label: "scroll down",
|
||||||
letter: "k"
|
letter: "k"
|
||||||
},{
|
|
||||||
label: "shortcuts help",
|
|
||||||
letter: "?"
|
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
jsoneditor: {
|
jsoneditor: {
|
||||||
name: "AQL editor",
|
name: "AQL editor",
|
||||||
content: [{
|
content: [{
|
||||||
label: "Submit",
|
label: "Submit",
|
||||||
letter: "Ctrl/Cmd + Return"
|
letter: "Ctrl + Return"
|
||||||
},{
|
},{
|
||||||
label: "Toggle comments",
|
label: "Toggle comments",
|
||||||
letter: "Ctrl/Cmd + Shift + C"
|
letter: "Ctrl + Shift + C"
|
||||||
},{
|
},{
|
||||||
label: "Undo",
|
label: "Undo",
|
||||||
letter: "Ctrl/Cmd + Z"
|
letter: "Ctrl + Z"
|
||||||
},{
|
},{
|
||||||
label: "Redo",
|
label: "Redo",
|
||||||
letter: "Ctrl/Cmd + Shift + Z"
|
letter: "Ctrl + Shift + Z"
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
doceditor: {
|
doceditor: {
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
<div id="documentEditor" class="document-editor"></div>
|
<div id="documentEditor" class="document-editor"></div>
|
||||||
<button id="saveDocumentButton" class="button-success pull-right">Save</button>
|
<button id="saveDocumentButton" class="button-success pull-right">Save</button>
|
||||||
<div class="pull-left shortcuts showHotkeyHelp">
|
<div class="pull-left shortcuts showHotkeyHelp">
|
||||||
Show Help <i class="fa fa-keyboard-o"></i>
|
|
||||||
</div>
|
</div>
|
||||||
<div id="showSaveState" class="show-save-state">Saved...</div>
|
<div id="showSaveState" class="show-save-state">Saved...</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -10,6 +10,10 @@
|
||||||
<p>Copyright (c) triAGENS GmbH</p>
|
<p>Copyright (c) triAGENS GmbH</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="footer-center">
|
||||||
|
<p>Show Help <i class="fa fa-keyboard-o"></i></p>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="footer-right">
|
<div class="footer-right">
|
||||||
<p><% if(n) { %><i class="isOnline fa fa-check-circle-o serverStatusIndicator"></i><a><%=n%> <%=v%> <% } %></a></i></p>
|
<p><% if(n) { %><i class="isOnline fa fa-check-circle-o serverStatusIndicator"></i><a><%=n%> <%=v%> <% } %></a></i></p>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -34,7 +34,6 @@
|
||||||
<div>
|
<div>
|
||||||
|
|
||||||
<div id="shortcutDiv" class="shortcuts shortcut-div showHotkeyHelp">
|
<div id="shortcutDiv" class="shortcuts shortcut-div showHotkeyHelp">
|
||||||
Show Help <i class="fa fa-keyboard-o"></i>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
|
|
|
@ -13,8 +13,7 @@
|
||||||
|
|
||||||
events: {
|
events: {
|
||||||
"click #saveDocumentButton" : "saveDocument",
|
"click #saveDocumentButton" : "saveDocument",
|
||||||
"dblclick #documentEditor tr" : "addProperty",
|
"dblclick #documentEditor tr" : "addProperty"
|
||||||
"click #tableDiv .showHotkeyHelp" : "shortcutModal"
|
|
||||||
},
|
},
|
||||||
|
|
||||||
editor: 0,
|
editor: 0,
|
||||||
|
@ -137,10 +136,6 @@
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|
||||||
shortcutModal: function() {
|
|
||||||
window.arangoHelper.hotkeysFunctions.showHotkeysModal();
|
|
||||||
},
|
|
||||||
|
|
||||||
escaped: function (value) {
|
escaped: function (value) {
|
||||||
return value.replace(/&/g, "&").replace(/</g, "<").replace(/>/g, ">")
|
return value.replace(/&/g, "&").replace(/</g, "<").replace(/>/g, ">")
|
||||||
.replace(/"/g, """).replace(/'/g, "'");
|
.replace(/"/g, """).replace(/'/g, "'");
|
||||||
|
|
|
@ -10,6 +10,10 @@
|
||||||
isOfflineCounter: 0,
|
isOfflineCounter: 0,
|
||||||
firstLogin: true,
|
firstLogin: true,
|
||||||
|
|
||||||
|
events: {
|
||||||
|
'click .footer-center p' : 'showShortcutModal'
|
||||||
|
},
|
||||||
|
|
||||||
initialize: function () {
|
initialize: function () {
|
||||||
//also server online check
|
//also server online check
|
||||||
var self = this;
|
var self = this;
|
||||||
|
@ -34,6 +38,10 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
showShortcutModal: function() {
|
||||||
|
window.arangoHelper.hotkeysFunctions.showHotkeysModal();
|
||||||
|
},
|
||||||
|
|
||||||
getVersion: function () {
|
getVersion: function () {
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
||||||
|
@ -134,4 +142,4 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
}());
|
}());
|
||||||
|
|
|
@ -38,13 +38,7 @@
|
||||||
'keypress #aqlEditor': 'aqlShortcuts',
|
'keypress #aqlEditor': 'aqlShortcuts',
|
||||||
'click #arangoQueryTable .table-cell0': 'editCustomQuery',
|
'click #arangoQueryTable .table-cell0': 'editCustomQuery',
|
||||||
'click #arangoQueryTable .table-cell1': 'editCustomQuery',
|
'click #arangoQueryTable .table-cell1': 'editCustomQuery',
|
||||||
'click #arangoQueryTable .table-cell2 a': 'deleteAQL',
|
'click #arangoQueryTable .table-cell2 a': 'deleteAQL'
|
||||||
'click #queryDiv .showHotkeyHelp' : 'shortcutModal'
|
|
||||||
|
|
||||||
},
|
|
||||||
|
|
||||||
shortcutModal: function() {
|
|
||||||
window.arangoHelper.hotkeysFunctions.showHotkeysModal();
|
|
||||||
},
|
},
|
||||||
|
|
||||||
createCustomQueryModal: function(){
|
createCustomQueryModal: function(){
|
||||||
|
|
|
@ -32,6 +32,17 @@ div.footer-left {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
div.footer-center {
|
||||||
|
@extend %pull-left;
|
||||||
|
background: none repeat scroll 0 0 $c-nav-bg;
|
||||||
|
color: $c-white;
|
||||||
|
width: 10%;
|
||||||
|
|
||||||
|
p:hover {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
div.footer-right {
|
div.footer-right {
|
||||||
@extend %pull-right;
|
@extend %pull-right;
|
||||||
background: none repeat scroll 0 0 $c-nav-bg;
|
background: none repeat scroll 0 0 $c-nav-bg;
|
||||||
|
|
|
@ -1369,7 +1369,7 @@ textarea,
|
||||||
.fa-plus-square-o:before {
|
.fa-plus-square-o:before {
|
||||||
content: "\f196"; }
|
content: "\f196"; }
|
||||||
|
|
||||||
ul.link-dropdown-menu, ul.user-dropdown-menu, ul.gv-dropdown-menu, div.navlogo, ul.navlist li, div.footer-left, div.footer-left p, a.headerButton, a.button-gui, div .tile, div .bigtile, div .tile a span.add-Icon, div .bigtile a span.add-Icon, div.centralContent, .contentDiv li, div.dropdownInner ul, .search-field, .fixedDropdown .notificationItemContent, .fixedDropdown .notificationItem i, .innerDropdownInnerUL, .dashboard-large-chart .dashboard-large-chart-inner, .dashboard-small-chart .dashboard-small-chart-inner, .dashboard-medium-chart, .dashboard-tendency-container, .dashboard-bar-chart-container, .dashboard-large-chart, .dashboard-small-chart, .dashboard-sub-bar .dashboard-sub-bar-title, .dashboard-large-chart .dashboard-large-chart-inner .dashboard-interior-chart, .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart, .dashboard-medium-chart .dashboard-interior-chart, .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency, .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency .dashboard-subtitle-bar, .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency .dashboard-figure, .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title, .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .percentage, .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .absolut, .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-chart, .dashboard-legend, .dashboard-sub-bar, .modal-chart-detail, .modal-chart-detail .modal-body, .modal-chart-detail .modal-dashboard-legend, .modal-chart-detail .modal-inner-detail, .dashboard-half-height-legend, .dashboard-title-bar .dashboard-half-title-bar, .dashboardModal, .pagination-line li a {
|
ul.link-dropdown-menu, ul.user-dropdown-menu, ul.gv-dropdown-menu, div.navlogo, ul.navlist li, div.footer-left, div.footer-left p, div.footer-center, a.headerButton, a.button-gui, div .tile, div .bigtile, div .tile a span.add-Icon, div .bigtile a span.add-Icon, div.centralContent, .contentDiv li, div.dropdownInner ul, .search-field, .fixedDropdown .notificationItemContent, .fixedDropdown .notificationItem i, .innerDropdownInnerUL, .dashboard-large-chart .dashboard-large-chart-inner, .dashboard-small-chart .dashboard-small-chart-inner, .dashboard-medium-chart, .dashboard-tendency-container, .dashboard-bar-chart-container, .dashboard-large-chart, .dashboard-small-chart, .dashboard-sub-bar .dashboard-sub-bar-title, .dashboard-large-chart .dashboard-large-chart-inner .dashboard-interior-chart, .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart, .dashboard-medium-chart .dashboard-interior-chart, .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency, .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency .dashboard-subtitle-bar, .dashboard-tendency-container .dashboard-tendency-chart .dashboard-tendency .dashboard-figure, .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title, .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .percentage, .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-title .absolut, .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-chart, .dashboard-legend, .dashboard-sub-bar, .modal-chart-detail, .modal-chart-detail .modal-body, .modal-chart-detail .modal-dashboard-legend, .modal-chart-detail .modal-inner-detail, .dashboard-half-height-legend, .dashboard-title-bar .dashboard-half-title-bar, .dashboardModal, .pagination-line li a {
|
||||||
float: left; }
|
float: left; }
|
||||||
|
|
||||||
div.navmenu, div.footer-right, div.footer-right p, ul.headerButtonList li, div .tile div.iconSet span, div .bigtile div.iconSet span, div.headerBar > div.headerButtonBar, .fixedDropdown button, .dashboard-sub-bar-menu, .query-button, .arango-tab li, .show-save-state, div.gv_colour_list, .docsThirdCol {
|
div.navmenu, div.footer-right, div.footer-right p, ul.headerButtonList li, div .tile div.iconSet span, div .bigtile div.iconSet span, div.headerBar > div.headerButtonBar, .fixedDropdown button, .dashboard-sub-bar-menu, .query-button, .arango-tab li, .show-save-state, div.gv_colour_list, .docsThirdCol {
|
||||||
|
@ -1650,6 +1650,13 @@ div.footer-left {
|
||||||
color: white;
|
color: white;
|
||||||
width: 45%; }
|
width: 45%; }
|
||||||
|
|
||||||
|
div.footer-center {
|
||||||
|
background: none repeat scroll 0 0 #333232;
|
||||||
|
color: white;
|
||||||
|
width: 10%; }
|
||||||
|
div.footer-center p:hover {
|
||||||
|
cursor: pointer; }
|
||||||
|
|
||||||
div.footer-right {
|
div.footer-right {
|
||||||
background: none repeat scroll 0 0 #333232;
|
background: none repeat scroll 0 0 #333232;
|
||||||
color: #333232;
|
color: #333232;
|
||||||
|
|
Loading…
Reference in New Issue