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-04 15:47:27 +02:00
parent 9f360652b9 013d8159a4
commit 301c2c4ce1
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
html/admin/css/jquery.snippet.css
View File

@ -29,11 +29,11 @@
} }
.sh_object { .sh_object {
color: red; color: blue;
} }
.sh_array { .sh_array {
color: yellow; color: blue;
} }
//<form action="localhost:9999/_api/import/?collection=...&createCollection=false" method="post"> //<form action="localhost:9999/_api/import/?collection=...&createCollection=false" method="post">

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

@ -40,6 +40,15 @@ th {
font-size: 1.1em; font-size: 1.1em;
} }
#editCollectionView td {
font-size: 1.2em ;
}
pre ul li span{
font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif;
font-size: 1em;
}
#documentsToolbar a { #documentsToolbar a {
font-size: 0.8em !important; font-size: 0.8em !important;
} }

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

@ -456,7 +456,7 @@ var logTable = $('#logTableID').dataTable({
data: '{"collection":"' + globalCollectionName + '","skip":0,"limit":10}', data: '{"collection":"' + globalCollectionName + '","skip":0,"limit":10}',
contentType: "application/json", contentType: "application/json",
success: function(data) { success: function(data) {
$.each(data, function(k, v) { $.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 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>']);
}); });
$(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false}); $(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false});
@ -1652,7 +1652,7 @@ function createPrevDocPagination() {
data: '{"collection":"' + globalCollectionName + '","skip":' + offset + ',"limit":10}', data: '{"collection":"' + globalCollectionName + '","skip":' + offset + ',"limit":10}',
contentType: "application/json", contentType: "application/json",
success: function(data) { success: function(data) {
$.each(data, function(k, v) { $.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 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>']);
}); });
$(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false}); $(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false});
@ -1679,7 +1679,7 @@ function createNextDocPagination () {
data: '{"collection":"' + globalCollectionName + '","skip":' + offset + ',"limit":10}', data: '{"collection":"' + globalCollectionName + '","skip":' + offset + ',"limit":10}',
contentType: "application/json", contentType: "application/json",
success: function(data) { success: function(data) {
$.each(data, function(k, v) { $.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 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>']);
}); });
$(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false}); $(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false});
@ -1788,7 +1788,7 @@ function createFirstPagination () {
data: '{"collection":"' + globalCollectionName + '","skip":0,"limit":10}', data: '{"collection":"' + globalCollectionName + '","skip":0,"limit":10}',
contentType: "application/json", contentType: "application/json",
success: function(data) { success: function(data) {
$.each(data, function(k, v) { $.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 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>' ]);
}); });
$(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false}); $(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false});
@ -1841,7 +1841,7 @@ function createLastPagination () {
data: '{"collection":"' + globalCollectionName + '","skip":' + offset + ',"limit":10}', data: '{"collection":"' + globalCollectionName + '","skip":' + offset + ',"limit":10}',
contentType: "application/json", contentType: "application/json",
success: function(data) { success: function(data) {
$.each(data, function(k, v) { $.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 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>' ]);
}); });
$(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false}); $(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false});