diff --git a/html/admin/css/layout.css b/html/admin/css/layout.css index 02e72f2c92..f7c4152c98 100644 --- a/html/admin/css/layout.css +++ b/html/admin/css/layout.css @@ -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; diff --git a/html/admin/index.html b/html/admin/index.html index 55cb1db114..cdf92832d1 100644 --- a/html/admin/index.html +++ b/html/admin/index.html @@ -60,11 +60,11 @@
- - @@ -85,11 +85,11 @@
@@ -300,10 +300,10 @@
- - - - + + + + Showing
@@ -318,10 +318,10 @@
- - - - + + + + Showing
@@ -366,11 +366,11 @@
Welcome Guest! - +
diff --git a/html/admin/js/master.js b/html/admin/js/master.js index 34114fc83c..78eebf34d8 100644 --- a/html/admin/js/master.js +++ b/html/admin/js/master.js @@ -416,10 +416,11 @@ var logTable = $('#logTableID').dataTable({ documentEditTable.fnAddData(["", key, value2html(val), JSON.stringify(val)]); } else if (key != '_rev' && key != '_id') { - documentEditTable.fnAddData(['',key, value2html(val), JSON.stringify(val)]); + documentEditTable.fnAddData(['',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(['', v._id, v._rev, '
' + cutByResolution(JSON.stringify(v)) + '
']); + documentsTable.fnAddData(['', v._id, v._rev, '
' + cutByResolution(JSON.stringify(v)) + '
']); }); $(".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('
' + data + '
'); + $('#configContent').append('
' + data + '
'); $.each(content[data], function(key, val) { if (switcher == "primary") { $('#configContent').append('' + key + '' + val + '
'); @@ -702,8 +704,9 @@ var logTable = $('#logTableID').dataTable({ $('#addEditedDocRowButton').live('click', function () { if (tableView == true) { - documentEditTable.fnAddData(['', "somevalue", value2html("editme"), JSON.stringify("editme")]); + documentEditTable.fnAddData(['', "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(['', "somevalue", value2html("editme"), JSON.stringify("editme")]); + newDocumentTable.fnAddData(['', "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(['', v._id, v._rev, '
' + cutByResolution(JSON.stringify(v)) + '
']); + $('#documentsTableID').dataTable().fnAddData(['', v._id, v._rev, '
' + cutByResolution(JSON.stringify(v)) + '
']); }); $(".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(['', v._id, v._rev, '
' + cutByResolution(JSON.stringify(v)) + '
']); + $("#documentsTableID").dataTable().fnAddData(['', v._id, v._rev, '
' + cutByResolution(JSON.stringify(v)) + '
']); }); $(".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(['', v._id, v._rev, '
' + cutByResolution(JSON.stringify(v)) + '
' ]); + $('#documentsTableID').dataTable().fnAddData(['', v._id, v._rev, '
' + cutByResolution(JSON.stringify(v)) + '
' ]); }); $(".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(['', v._id, v._rev, '
' + cutByResolution(JSON.stringify(v)) + '
' ]); + $('#documentsTableID').dataTable().fnAddData(['', v._id, v._rev, '
' + cutByResolution(JSON.stringify(v)) + '
' ]); }); $(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false}); collectionCurrentPage = totalCollectionCount; diff --git a/html/admin/media/images/sliderButton.png b/html/admin/media/images/sliderButton.png index c0ad950f88..cda2551cf0 100644 Binary files a/html/admin/media/images/sliderButton.png and b/html/admin/media/images/sliderButton.png differ