1
0
Fork 0

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2015-04-14 19:26:54 +02:00
commit 19471fcec4
3 changed files with 17 additions and 9 deletions

View File

@ -17,7 +17,7 @@
<a class="headerButton <%= app.get('scripts').length ? '' : 'disabled' %>" title="Scripts"> <a class="headerButton <%= app.get('scripts').length ? '' : 'disabled' %>" title="Scripts">
<i class="fa fa-cogs"></i> <i class="fa fa-cogs"></i>
</a> </a>
<ul class="script-dropdown-menu" id="scripts_dropdown"> <ul class="script-dropdown-menu dropdown-menu" id="scripts_dropdown">
<% app.get('scripts').forEach(function (script) { %> <% app.get('scripts').forEach(function (script) { %>
<li class="dropdown-item"> <li class="dropdown-item">
<a class="tab" data-script="<%= script.name %>"><%= script.title %></a> <a class="tab" data-script="<%= script.name %>"><%= script.title %></a>

View File

@ -13,11 +13,12 @@
'click .delete': 'deleteApp', 'click .delete': 'deleteApp',
'click #configure-app': 'showConfigureDialog', 'click #configure-app': 'showConfigureDialog',
'click #app-switch-mode': 'toggleDevelopment', 'click #app-switch-mode': 'toggleDevelopment',
"click #app-scripts": "toggleScripts",
"click #app-scripts [data-script]": "runScript", "click #app-scripts [data-script]": "runScript",
"click #app-tests": "runTests", "click #app-tests": "runTests",
"click #app-upgrade": "upgradeApp", "click #app-upgrade": "upgradeApp",
"click #download-app": "downloadApp" "click #download-app": "downloadApp",
"mouseenter #app-scripts": "showDropdown",
"mouseleave #app-scripts": "hideDropdown"
}, },
downloadApp: function() { downloadApp: function() {
@ -33,12 +34,6 @@
}); });
}, },
toggleScripts: function() {
if (this.model.get('scripts').length) {
$("#scripts_dropdown").toggle(200);
}
},
updateConfig: function() { updateConfig: function() {
this.model.getConfiguration(function(cfg) { this.model.getConfiguration(function(cfg) {
this._appConfig = cfg; this._appConfig = cfg;
@ -245,6 +240,16 @@
"modalTable.ejs", "Configure application", buttons, tableContent "modalTable.ejs", "Configure application", buttons, tableContent
); );
},
showDropdown: function () {
if (this.model.get('scripts').length) {
$("#scripts_dropdown").show(200);
}
},
hideDropdown: function () {
$("#scripts_dropdown").hide();
} }
}); });

View File

@ -97,12 +97,15 @@
} }
} }
&-spec { &-spec {
margin-bottom: 0;
&-suites { &-suites {
& & { & & {
margin-left: 20px; margin-left: 20px;
} }
dd { dd {
margin-left: 0; margin-left: 0;
margin-bottom: 20px;
} }
} }
&-tests { &-tests {