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 2012-05-24 11:26:01 +02:00
parent e67d7da686 76b78d1727
commit 4f6dbce708
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
html/admin/index.html
View File

@ -47,6 +47,7 @@
<button class="minimal" id="AvocSH">Shell</button>
<button class="minimal" id="Logs">Logs</button>
<button class="minimal" id="Configuration">Configuration</button>
<a href="http://www.arangodb.org/manuals/" target="_blank"><button class="minimal" id="Documentation">Documentation</button></a>
</div>
</div>
@ -396,15 +397,14 @@
/ _` | '__/ _` | '_ \ / _` |/ _ \/ __| '_ \
| (_| | | | (_| | | | | (_| | (_) \__ \ | | |
\__,_|_| \__,_|_| |_|\__, |\___/|___/_| |_|
|___/
|___/
Welcome to arangosh 0.5.1. Copyright (c) 2012 triAGENS GmbH.
</pre><br><br>
Welcome to arangosh 0.5.1. Copyright (c) 2012 triAGENS GmbH.</pre><br><br>
</div>
<form>
<input type="text" class="editBox" id="avocshContent"></input><button class="minimal" id="submitAvoc">Ok</button>
</form>
<a href="http://www.arangodb.org/manuals/UserManual.html">ArangoDB Shell - click for more information</a>
<a href="http://www.arangodb.org/manuals/UserManual.html" target="_blank">ArangoDB Shell - click for more information</a>
</div>
<div id="queryView" style="display: none">
@ -414,7 +414,7 @@
<form id="queryForm" method="post" onsubmit="return false">
<textarea placeholder="Type in your query..." class="editBox" id="queryContent"></textarea><br>
<button class="minimal" id="submitQuery">Execute</button>
<a href="http://www.arangodb.org/manuals/Aql.html">ArangoDB Query Language - click for more information</a>
<a href="http://www.arangodb.org/manuals/Aql.html" target="_blank">ArangoDB Query Language - click for more information</a>
<br></br>
</form>

3
html/admin/js/master.js
View File

@ -1268,6 +1268,9 @@ var logTable = $('#logTableID').dataTable({
if (this.id == "Configuration") {
window.location.href = "#config";
}
if (this.id == "Documentation") {
return 0;
}
if (this.id == "Query") {
window.location.href = "#query";
}