Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Jan Steemann 2013-07-12 15:07:18 +02:00
parent 0266e2339a a932182f12
commit a2bf5a94b0
3 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
html/admin/css/footerView.css
View File

@ -10,6 +10,7 @@
left: 0; left: 0;
right: 0; right: 0;
bottom: 0px; bottom: 0px;
z-index: 9999;
} }
.footerExtra { .footerExtra {
@ -75,3 +76,24 @@
background: none repeat scroll 0 0 #383434; background: none repeat scroll 0 0 #383434;
color: #FFFFFF; color: #FFFFFF;
} }
.footer-left {
background: none repeat scroll 0 0 #383434;
color: #FFFFFF;
width: 33.3%;
float: left;
}
.footer-mid {
background: none repeat scroll 0 0 #383434;
color: #FFFFFF;
width: 33.3%;
float: left;
}
.footer-right {
background: none repeat scroll 0 0 #383434;
color: #383434;
width: 33.3%;
float: left;
}

10
html/admin/js/templates/footerView.ejs
View File

@ -1,2 +1,10 @@
<div class="copy"><p>Copyright (c) triAGENS GmbH | <a href="#about">About</a></p></div>
<div class="footer-left">
<p>Welcome <a id="currentUser" style="color:#FFFFFF"> Guest </a><a id="loginLink"> Login</a></p>
</div>
<div class="copy footer-mid">
<p>Copyright (c) triAGENS GmbH | <a href="#about">About</a></p>
</div>
<div class="footer-right"><p>.</p></div>

14
html/admin/js/views/queryView.js
View File

@ -19,7 +19,7 @@ var queryView = Backbone.View.extend({
template: new EJS({url: 'js/templates/queryView.ejs'}), template: new EJS({url: 'js/templates/queryView.ejs'}),
render: function() { render: function() {
var self = this;
$(this.el).html(this.template.text); $(this.el).html(this.template.text);
var editor = ace.edit("aqlEditor"); var editor = ace.edit("aqlEditor");
var editor2 = ace.edit("queryOutput"); var editor2 = ace.edit("queryOutput");
@ -36,8 +36,10 @@ var queryView = Backbone.View.extend({
handles: "s", handles: "s",
ghost: true, ghost: true,
stop: function () { stop: function () {
var editor2 = ace.edit("queryOutput"); setTimeout(function (){
editor2.resize(); var editor2 = ace.edit("queryOutput");
editor2.resize();
},200);
} }
}); });
$('#aqlEditor').resizable({ $('#aqlEditor').resizable({
@ -45,8 +47,10 @@ var queryView = Backbone.View.extend({
ghost: true, ghost: true,
//helper: "resizable-helper", //helper: "resizable-helper",
stop: function () { stop: function () {
var editor = ace.edit("aqlEditor"); setTimeout(function (){
editor.resize(); var editor = ace.edit("aqlEditor");
editor.resize();
},200);
} }
}); });