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/AvocadoDB into devel

This commit is contained in:
Jan Steemann 2012-05-08 16:49:32 +02:00
parent d2d1cdfd93 1ac35825e4
commit 1816a56fb2
4 changed files with 59 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
html/admin/css/layout.css
View File

@ -38,6 +38,13 @@ html.busy, html.busy * {
padding: 0;
}
.snippet-no-num {
font-size: 1em;
font-weight: normal;
font-;
font-family: Verdana, Arial, sans-serif;
}
html {
font-family: Verdana,Arial,sans-serif;
font-size: 1em;

76
html/admin/index.html
View File

@ -60,11 +60,11 @@
<div id="centerView" class="ui-layout-center" class="ui-layout-content">
<div id="collectionsView">
<button class="toolbar" id="createCollection">
<button class="toolbar enabled" id="createCollection">
<img src="/_admin/html/media/icons/round_plus_icon16.png" width="16" height="16">
<a>New Collection</a>
</button>
<button class="toolbar" id="refreshCollections">
<button class="toolbar enabled" id="refreshCollections">
<img src="/_admin/html/media/icons/refresh_icon16.png" width="16" height="16">
<a>Refresh</a>
</button>
@ -85,11 +85,11 @@
<div id="subCenterView">
<div id="createCollectionView" style="display: none">
<button class="minimal" id="saveNewCollection">
<button class="minimal enabled" id="saveNewCollection">
<img src="/_admin/html/media/icons/save_icon16.png" width="16" height="16">
<a>Save Collection</a>
</button>
<button class="minimal" id="cancelNewCollection">
<button class="minimal enabled" id="cancelNewCollection">
<img src="/_admin/html/media/icons/cancel_icon16.png" width="16" height="16">
<a>Cancel</a>
</button>
@ -111,7 +111,7 @@
</div>
<div id="editCollectionView" style="display: none">
<button class="minimal" id="saveEditedCollection">
<button class="minimal enabled" id="saveEditedCollection">
<img src="/_admin/html/media/icons/doc_plus_icon16.png" width="16" height="16">
<a>Save Collection</a>
</button>
@ -133,7 +133,7 @@
</div>
<div id="documentsView" style="display: none">
<button class="minimal" id="addDocumentButton">
<button class="minimal enabled" id="addDocumentButton">
<img src="/_admin/html/media/icons/doc_plus_icon16.png" width="16" height="16">
<a>Add Document</a>
</button>
@ -149,25 +149,25 @@
</table>
<div id="documentsToolbar">
<button id="documents_last"><img src="/_admin/html/media/icons/rnd_br_first_icon16.png"></button>
<button id="documents_next"><img src="/_admin/html/media/icons/rnd_br_prev_icon16.png"></button>
<button id="documents_prev"><img src="/_admin/html/media/icons/rnd_br_next_icon16.png"></button>
<button id="documents_first"><img src="/_admin/html/media/icons/rnd_br_last_icon16.png"></button>
<button class="enabled" id="documents_last"><img src="/_admin/html/media/icons/rnd_br_first_icon16.png"></button>
<button class="enabled" id="documents_next"><img src="/_admin/html/media/icons/rnd_br_prev_icon16.png"></button>
<button class="enabled" id="documents_prev"><img src="/_admin/html/media/icons/rnd_br_next_icon16.png"></button>
<button class="enabled" id="documents_first"><img src="/_admin/html/media/icons/rnd_br_last_icon16.png"></button>
<a id="documents_status">Showing</a>
</div>
</div>
<div id="documentEditView" style="display: none">
<button class="minimal" id="saveEditedDocButton">
<button class="minimal enabled" id="saveEditedDocButton">
<img src="/_admin/html/media/icons/save_icon16.png" width="16" height="16">
<a>Save Document</a>
</button>
<button class="minimal" id="addEditedDocRowButton">
<button class="minimal enabled" id="addEditedDocRowButton">
<img src="/_admin/html/media/icons/round_plus_icon16.png" width="16" height="16">
<a>Add row</a>
</button>
<button class="minimal" id="toggleEditedDocButton">
<button class="minimal enabled" id="toggleEditedDocButton">
<a>Source</a>
<img src="/_admin/html/media/icons/off_icon16.png" width="16" height="16">
</button>
@ -193,15 +193,15 @@
<div id="newDocumentView" style="display: none">
<div id="newDocumentTableView">
<button class="minimal" id="saveNewDocButton">
<button class="minimal enabled" id="saveNewDocButton">
<img src="/_admin/html/media/icons/save_icon16.png" width="16" height="16">
<a>Save Document</a>
</button>
<button class="minimal" id="addNewDocButton">
<button class="minimal enabled" id="addNewDocButton">
<img src="/_admin/html/media/icons/round_plus_icon16.png" width="16" height="16">
<a>Add row</a>
</button>
<button class="minimal" id="toggleNewDocButton">
<button class="minimal enabled" id="toggleNewDocButton">
<a>Source</a>
<img src="/_admin/html/media/icons/off_icon16.png" width="16" height="16">
</button>
@ -246,10 +246,10 @@
</thead>
</table>
<div id="logToolbar">
<button id="logTableID_first"><img src="/_admin/html/media/icons/rnd_br_first_icon16.png"></button>
<button id="logTableID_prev"><img src="/_admin/html/media/icons/rnd_br_prev_icon16.png"></button>
<button id="logTableID_next"><img src="/_admin/html/media/icons/rnd_br_next_icon16.png"></button>
<button id="logTableID_last"><img src="/_admin/html/media/icons/rnd_br_last_icon16.png"></button>
<button class="enabled" id="logTableID_first"><img src="/_admin/html/media/icons/rnd_br_first_icon16.png"></button>
<button class="enabled" id="logTableID_prev"><img src="/_admin/html/media/icons/rnd_br_prev_icon16.png"></button>
<button class="enabled" id="logTableID_next"><img src="/_admin/html/media/icons/rnd_br_next_icon16.png"></button>
<button class="enabled" id="logTableID_last"><img src="/_admin/html/media/icons/rnd_br_last_icon16.png"></button>
<a id="logTableID_status">Showing</a>
</div>
</div>
@ -264,10 +264,10 @@
</thead>
</table>
<div id="logToolbar">
<button id="critLogTableID_first"><img src="/_admin/html/media/icons/rnd_br_first_icon16.png"></button>
<button id="critLogTableID_prev"><img src="/_admin/html/media/icons/rnd_br_prev_icon16.png"></button>
<button id="critLogTableID_next"><img src="/_admin/html/media/icons/rnd_br_next_icon16.png"></button>
<button id="critLogTableID_last"><img src="/_admin/html/media/icons/rnd_br_last_icon16.png"></button>
<button class="enabled" id="critLogTableID_first"><img src="/_admin/html/media/icons/rnd_br_first_icon16.png"></button>
<button class="enabled" id="critLogTableID_prev"><img src="/_admin/html/media/icons/rnd_br_prev_icon16.png"></button>
<button class="enabled" id="critLogTableID_next"><img src="/_admin/html/media/icons/rnd_br_next_icon16.png"></button>
<button class="enabled" id="critLogTableID_last"><img src="/_admin/html/media/icons/rnd_br_last_icon16.png"></button>
<a id="critLogTableID_status">Showing</a>
</div>
</div>
@ -282,10 +282,10 @@
</thead>
</table>
<div id="logToolbar">
<button id="warnLogTableID_first"><img src="/_admin/html/media/icons/rnd_br_first_icon16.png"></button>
<button id="warnLogTableID_prev"><img src="/_admin/html/media/icons/rnd_br_prev_icon16.png"></button>
<button id="warnLogTableID_next"><img src="/_admin/html/media/icons/rnd_br_next_icon16.png"></button>
<button id="warnLogTableID_last"><img src="/_admin/html/media/icons/rnd_br_last_icon16.png"></button>
<button class="enabled" id="warnLogTableID_first"><img src="/_admin/html/media/icons/rnd_br_first_icon16.png"></button>
<button class="enabled" id="warnLogTableID_prev"><img src="/_admin/html/media/icons/rnd_br_prev_icon16.png"></button>
<button class="enabled" id="warnLogTableID_next"><img src="/_admin/html/media/icons/rnd_br_next_icon16.png"></button>
<button class="enabled" id="warnLogTableID_last"><img src="/_admin/html/media/icons/rnd_br_last_icon16.png"></button>
<a id="warnLogTableID_status">Showing</a>
</div>
</div>
@ -300,10 +300,10 @@
</thead>
</table>
<div id="logToolbar">
<button id="infoLogTableID_first"><img src="/_admin/html/media/icons/rnd_br_first_icon16.png"></button>
<button id="infoLogTableID_prev"><img src="/_admin/html/media/icons/rnd_br_prev_icon16.png"></button>
<button id="infoLogTableID_next"><img src="/_admin/html/media/icons/rnd_br_next_icon16.png"></button>
<button id="infoLogTableID_last"><img src="/_admin/html/media/icons/rnd_br_last_icon16.png"></button>
<button class="enabled" id="infoLogTableID_first"><img src="/_admin/html/media/icons/rnd_br_first_icon16.png"></button>
<button class="enabled" id="infoLogTableID_prev"><img src="/_admin/html/media/icons/rnd_br_prev_icon16.png"></button>
<button class="enabled" id="infoLogTableID_next"><img src="/_admin/html/media/icons/rnd_br_next_icon16.png"></button>
<button class="enabled" id="infoLogTableID_last"><img src="/_admin/html/media/icons/rnd_br_last_icon16.png"></button>
<a id="infoLogTableID_status">Showing</a>
</div>
</div>
@ -318,10 +318,10 @@
</thead>
</table>
<div id="logToolbar">
<button id="debugLogTableID_first"><img src="/_admin/html/media/icons/rnd_br_first_icon16.png"></button>
<button id="debugLogTableID_prev"><img src="/_admin/html/media/icons/rnd_br_prev_icon16.png"></button>
<button id="debugLogTableID_next"><img src="/_admin/html/media/icons/rnd_br_next_icon16.png"></button>
<button id="debugLogTableID_last"><img src="/_admin/html/media/icons/rnd_br_last_icon16.png"></button>
<button class="enabled" id="debugLogTableID_first"><img src="/_admin/html/media/icons/rnd_br_first_icon16.png"></button>
<button class="enabled" id="debugLogTableID_prev"><img src="/_admin/html/media/icons/rnd_br_prev_icon16.png"></button>
<button class="enabled" id="debugLogTableID_next"><img src="/_admin/html/media/icons/rnd_br_next_icon16.png"></button>
<button class="enabled" id="debugLogTableID_last"><img src="/_admin/html/media/icons/rnd_br_last_icon16.png"></button>
<a id="debugLogTableID_status">Showing</a>
</div>
</div>
@ -366,11 +366,11 @@
<div id="footerLeft">
<a>Welcome </a><a id="activeUser" class="loggedout">Guest!</a>
<button class="minimal" id="movetologinButton">Login</button><button class="minimal" id="logoutButton">Logout</button>
<button class="minimal enabled" id="movetologinButton">Login</button><button class="minimal" id="logoutButton">Logout</button>
<form class="login-form" id="loginWindow" action="#">
<input type="text" name="username" id="usernameField" placeholder="username">
<input type="password" name="password" id="passwordField" placeholder="password">
<button class="minimal" value="log in" id="loginButton">Login</button>
<button class="minimal enabled" value="log in" id="loginButton">Login</button>
</form>
</div>

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

@ -416,10 +416,11 @@ var logTable = $('#logTableID').dataTable({
documentEditTable.fnAddData(["", key, value2html(val), JSON.stringify(val)]);
}
else if (key != '_rev' && key != '_id') {
documentEditTable.fnAddData(['<button id="deleteEditedDocButton"><img src="/_admin/html/media/icons/delete_icon16.png" width="16" height="16"></button>',key, value2html(val), JSON.stringify(val)]);
documentEditTable.fnAddData(['<button class="enabled" id="deleteEditedDocButton"><img src="/_admin/html/media/icons/delete_icon16.png" width="16" height="16"></button>',key, value2html(val), JSON.stringify(val)]);
}
});
documentTableMakeEditable('#documentEditTableID');
showCursor();
},
error: function(data) {
}
@ -462,9 +463,10 @@ var logTable = $('#logTableID').dataTable({
contentType: "application/json",
success: function(data) {
$.each(data.result, function(k, v) {
documentsTable.fnAddData(['<button id="deleteDoc"><img src="/_admin/html/media/icons/doc_delete_icon16.png" width="16" height="16"></button><button id="editDoc"><img src="/_admin/html/media/icons/doc_edit_icon16.png" width="16" height="16"></button>', v._id, v._rev, '<pre class=prettify>' + cutByResolution(JSON.stringify(v)) + '</pre>']);
documentsTable.fnAddData(['<button class="enabled" id="deleteDoc"><img src="/_admin/html/media/icons/doc_delete_icon16.png" width="16" height="16"></button><button class="enabled" id="editDoc"><img src="/_admin/html/media/icons/doc_edit_icon16.png" width="16" height="16"></button>', v._id, v._rev, '<pre class=prettify>' + cutByResolution(JSON.stringify(v)) + '</pre>']);
});
$(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false});
showCursor();
},
error: function(data) {
@ -558,7 +560,7 @@ var logTable = $('#logTableID').dataTable({
$("#configContent").empty();
$.each(content, function(data) {
$('#configContent').append('<div class="customToolbar"><b>' + data + '</b></div>');
$('#configContent').append('<div class="customToolbar">' + data + '</div>');
$.each(content[data], function(key, val) {
if (switcher == "primary") {
$('#configContent').append('<a class="toolbar_left toolbar_primary">' + key + '</a><a class="toolbar_right toolbar_primary">' + val + '</a><br>');
@ -702,8 +704,9 @@ var logTable = $('#logTableID').dataTable({
$('#addEditedDocRowButton').live('click', function () {
if (tableView == true) {
documentEditTable.fnAddData(['<button id="deleteEditedDocButton"><img src="/_admin/html/media/icons/delete_icon16.png" width="16" height="16"></button>', "somevalue", value2html("editme"), JSON.stringify("editme")]);
documentEditTable.fnAddData(['<button class="enabled" id="deleteEditedDocButton"><img src="/_admin/html/media/icons/delete_icon16.png" width="16" height="16"></button>', "somevalue", value2html("editme"), JSON.stringify("editme")]);
documentTableMakeEditable('#documentEditTableID');
showCursor();
}
else {
}
@ -775,8 +778,9 @@ var logTable = $('#logTableID').dataTable({
$('#addNewDocButton').live('click', function () {
if (tableView == true) {
newDocumentTable.fnAddData(['<button id="deleteEditedDocButton"><img src="/_admin/html/media/icons/delete_icon16.png" width="16" height="16"></button>', "somevalue", value2html("editme"), JSON.stringify("editme")]);
newDocumentTable.fnAddData(['<button class="enabled" id="deleteEditedDocButton"><img src="/_admin/html/media/icons/delete_icon16.png" width="16" height="16"></button>', "somevalue", value2html("editme"), JSON.stringify("editme")]);
documentTableMakeEditable('#NewDocumentTableID');
showCursor();
}
else {
}
@ -817,7 +821,7 @@ var logTable = $('#logTableID').dataTable({
documentEditTable.fnClearTable();
$.each(parsedContent, function(key, val) {
documentEditTable.fnAddData(['<button id="deleteEditedDocButton"><img src="/_admin/html/media/icons/delete_icon16.png" width="16" height="16"</button>',key, value2html(val), JSON.stringify(val)]);
documentEditTable.fnAddData(['<button class="enabled" id="deleteEditedDocButton"><img src="/_admin/html/media/icons/delete_icon16.png" width="16" height="16"</button>',key, value2html(val), JSON.stringify(val)]);
});
documentEditTable.fnAddData(['', "_id", globalCollectionID, JSON.stringify(globalCollectionID)]);
documentEditTable.fnAddData(['', "_rev", globalCollectionRev, JSON.stringify(globalCollectionRev)]);
@ -1666,7 +1670,7 @@ function createPrevDocPagination() {
contentType: "application/json",
success: function(data) {
$.each(data.result, function(k, v) {
$('#documentsTableID').dataTable().fnAddData(['<button id="deleteDoc"><img src="/_admin/html/media/icons/doc_delete_icon16.png" width="16" height="16"></button><button id="editDoc"><img src="/_admin/html/media/icons/doc_edit_icon16.png" width="16" height="16"></button>', v._id, v._rev, '<pre class=prettify>' + cutByResolution(JSON.stringify(v)) + '</pre>']);
$('#documentsTableID').dataTable().fnAddData(['<button class="enabled" id="deleteDoc"><img src="/_admin/html/media/icons/doc_delete_icon16.png" width="16" height="16"></button><button class="enabled" id="editDoc"><img src="/_admin/html/media/icons/doc_edit_icon16.png" width="16" height="16"></button>', v._id, v._rev, '<pre class=prettify>' + cutByResolution(JSON.stringify(v)) + '</pre>']);
});
$(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false});
},
@ -1693,7 +1697,7 @@ function createNextDocPagination () {
contentType: "application/json",
success: function(data) {
$.each(data.result, function(k, v) {
$("#documentsTableID").dataTable().fnAddData(['<button id="deleteDoc"><img src="/_admin/html/media/icons/doc_delete_icon16.png" width="16" height="16"></button><button id="editDoc"><img src="/_admin/html/media/icons/doc_edit_icon16.png" width="16" height="16"></button>', v._id, v._rev, '<pre class=prettify>' + cutByResolution(JSON.stringify(v)) + '</pre>']);
$("#documentsTableID").dataTable().fnAddData(['<button class="enabled" id="deleteDoc"><img src="/_admin/html/media/icons/doc_delete_icon16.png" width="16" height="16"></button><button class="enabled" id="editDoc"><img src="/_admin/html/media/icons/doc_edit_icon16.png" width="16" height="16"></button>', v._id, v._rev, '<pre class=prettify>' + cutByResolution(JSON.stringify(v)) + '</pre>']);
});
$(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false});
},
@ -1802,7 +1806,7 @@ function createFirstPagination () {
contentType: "application/json",
success: function(data) {
$.each(data.result, function(k, v) {
$('#documentsTableID').dataTable().fnAddData(['<button id="deleteDoc"><img src="/_admin/html/media/icons/doc_delete_icon16.png" width="16" height="16"></button><button id="editDoc"><img src="/_admin/html/media/icons/doc_edit_icon16.png" width="16" height="16"></button>', v._id, v._rev, '<pre class=prettify>' + cutByResolution(JSON.stringify(v)) + '</pre>' ]);
$('#documentsTableID').dataTable().fnAddData(['<button class="enabled" id="deleteDoc"><img src="/_admin/html/media/icons/doc_delete_icon16.png" width="16" height="16"></button><button class="enabled" id="editDoc"><img src="/_admin/html/media/icons/doc_edit_icon16.png" width="16" height="16"></button>', v._id, v._rev, '<pre class=prettify>' + cutByResolution(JSON.stringify(v)) + '</pre>' ]);
});
$(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false});
collectionCurrentPage = 1;
@ -1855,7 +1859,7 @@ function createLastPagination () {
contentType: "application/json",
success: function(data) {
$.each(data.result, function(k, v) {
$('#documentsTableID').dataTable().fnAddData(['<button id="deleteDoc"><img src="/_admin/html/media/icons/doc_delete_icon16.png" width="16" height="16"></button><button id="editDoc"><img src="/_admin/html/media/icons/doc_edit_icon16.png" width="16" height="16"></button>', v._id, v._rev, '<pre class=prettify>' + cutByResolution(JSON.stringify(v)) + '</pre>' ]);
$('#documentsTableID').dataTable().fnAddData(['<button class="enabled" id="deleteDoc"><img src="/_admin/html/media/icons/doc_delete_icon16.png" width="16" height="16"></button><button class="enabled" id="editDoc"><img src="/_admin/html/media/icons/doc_edit_icon16.png" width="16" height="16"></button>', v._id, v._rev, '<pre class=prettify>' + cutByResolution(JSON.stringify(v)) + '</pre>' ]);
});
$(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false});
collectionCurrentPage = totalCollectionCount;

BIN
html/admin/media/images/sliderButton.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB