From 42faa8af1b98bfa1fa9c26cccf6b18381f84e7d7 Mon Sep 17 00:00:00 2001 From: Heiko Kernbach Date: Tue, 3 Jun 2014 11:59:33 +0200 Subject: [PATCH] shortcut style and position changed --- js/apps/system/aardvark/frontend/js/arango/arango.js | 11 ++++------- .../aardvark/frontend/js/templates/documentView.ejs | 1 - .../aardvark/frontend/js/templates/footerView.ejs | 4 ++++ .../aardvark/frontend/js/templates/queryView.ejs | 1 - .../system/aardvark/frontend/js/views/documentView.js | 7 +------ .../system/aardvark/frontend/js/views/footerView.js | 10 +++++++++- .../system/aardvark/frontend/js/views/queryView.js | 8 +------- js/apps/system/aardvark/frontend/scss/_footer.scss | 11 +++++++++++ js/apps/system/aardvark/frontend/scss/generated.css | 9 ++++++++- 9 files changed, 38 insertions(+), 24 deletions(-) diff --git a/js/apps/system/aardvark/frontend/js/arango/arango.js b/js/apps/system/aardvark/frontend/js/arango/arango.js index a99237610a..768a91e1bf 100644 --- a/js/apps/system/aardvark/frontend/js/arango/arango.js +++ b/js/apps/system/aardvark/frontend/js/arango/arango.js @@ -90,25 +90,22 @@ },{ label: "scroll down", letter: "k" - },{ - label: "shortcuts help", - letter: "?" }] }, jsoneditor: { name: "AQL editor", content: [{ label: "Submit", - letter: "Ctrl/Cmd + Return" + letter: "Ctrl + Return" },{ label: "Toggle comments", - letter: "Ctrl/Cmd + Shift + C" + letter: "Ctrl + Shift + C" },{ label: "Undo", - letter: "Ctrl/Cmd + Z" + letter: "Ctrl + Z" },{ label: "Redo", - letter: "Ctrl/Cmd + Shift + Z" + letter: "Ctrl + Shift + Z" }] }, doceditor: { diff --git a/js/apps/system/aardvark/frontend/js/templates/documentView.ejs b/js/apps/system/aardvark/frontend/js/templates/documentView.ejs index e4e95ebc45..4f56a52dd9 100644 --- a/js/apps/system/aardvark/frontend/js/templates/documentView.ejs +++ b/js/apps/system/aardvark/frontend/js/templates/documentView.ejs @@ -8,7 +8,6 @@
- Show Help
Saved...
diff --git a/js/apps/system/aardvark/frontend/js/templates/footerView.ejs b/js/apps/system/aardvark/frontend/js/templates/footerView.ejs index cd8104b113..e8341d5842 100644 --- a/js/apps/system/aardvark/frontend/js/templates/footerView.ejs +++ b/js/apps/system/aardvark/frontend/js/templates/footerView.ejs @@ -10,6 +10,10 @@

Copyright (c) triAGENS GmbH

+
+

Show Help

+
+

<% if(n) { %><%=n%> <%=v%> <% } %>

diff --git a/js/apps/system/aardvark/frontend/js/templates/queryView.ejs b/js/apps/system/aardvark/frontend/js/templates/queryView.ejs index a900c115ff..144cb397a3 100644 --- a/js/apps/system/aardvark/frontend/js/templates/queryView.ejs +++ b/js/apps/system/aardvark/frontend/js/templates/queryView.ejs @@ -34,7 +34,6 @@
- Show Help
diff --git a/js/apps/system/aardvark/frontend/js/views/documentView.js b/js/apps/system/aardvark/frontend/js/views/documentView.js index b71e66a8b8..d1273ffabb 100644 --- a/js/apps/system/aardvark/frontend/js/views/documentView.js +++ b/js/apps/system/aardvark/frontend/js/views/documentView.js @@ -13,8 +13,7 @@ events: { "click #saveDocumentButton" : "saveDocument", - "dblclick #documentEditor tr" : "addProperty", - "click #tableDiv .showHotkeyHelp" : "shortcutModal" + "dblclick #documentEditor tr" : "addProperty" }, editor: 0, @@ -137,10 +136,6 @@ ); }, - shortcutModal: function() { - window.arangoHelper.hotkeysFunctions.showHotkeysModal(); - }, - escaped: function (value) { return value.replace(/&/g, "&").replace(//g, ">") .replace(/"/g, """).replace(/'/g, "'"); diff --git a/js/apps/system/aardvark/frontend/js/views/footerView.js b/js/apps/system/aardvark/frontend/js/views/footerView.js index 859a4d8667..28158e95df 100644 --- a/js/apps/system/aardvark/frontend/js/views/footerView.js +++ b/js/apps/system/aardvark/frontend/js/views/footerView.js @@ -10,6 +10,10 @@ isOfflineCounter: 0, firstLogin: true, + events: { + 'click .footer-center p' : 'showShortcutModal' + }, + initialize: function () { //also server online check var self = this; @@ -34,6 +38,10 @@ } }, + showShortcutModal: function() { + window.arangoHelper.hotkeysFunctions.showHotkeysModal(); + }, + getVersion: function () { var self = this; @@ -134,4 +142,4 @@ } }); -}()); \ No newline at end of file +}()); diff --git a/js/apps/system/aardvark/frontend/js/views/queryView.js b/js/apps/system/aardvark/frontend/js/views/queryView.js index 2c7e256d4e..afb527755f 100644 --- a/js/apps/system/aardvark/frontend/js/views/queryView.js +++ b/js/apps/system/aardvark/frontend/js/views/queryView.js @@ -38,13 +38,7 @@ 'keypress #aqlEditor': 'aqlShortcuts', 'click #arangoQueryTable .table-cell0': 'editCustomQuery', 'click #arangoQueryTable .table-cell1': 'editCustomQuery', - 'click #arangoQueryTable .table-cell2 a': 'deleteAQL', - 'click #queryDiv .showHotkeyHelp' : 'shortcutModal' - - }, - - shortcutModal: function() { - window.arangoHelper.hotkeysFunctions.showHotkeysModal(); + 'click #arangoQueryTable .table-cell2 a': 'deleteAQL' }, createCustomQueryModal: function(){ diff --git a/js/apps/system/aardvark/frontend/scss/_footer.scss b/js/apps/system/aardvark/frontend/scss/_footer.scss index eb8a372438..b792098e24 100644 --- a/js/apps/system/aardvark/frontend/scss/_footer.scss +++ b/js/apps/system/aardvark/frontend/scss/_footer.scss @@ -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 { @extend %pull-right; background: none repeat scroll 0 0 $c-nav-bg; diff --git a/js/apps/system/aardvark/frontend/scss/generated.css b/js/apps/system/aardvark/frontend/scss/generated.css index eb4fc1f284..90000397e2 100644 --- a/js/apps/system/aardvark/frontend/scss/generated.css +++ b/js/apps/system/aardvark/frontend/scss/generated.css @@ -1369,7 +1369,7 @@ textarea, .fa-plus-square-o:before { 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; } 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; 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 { background: none repeat scroll 0 0 #333232; color: #333232;