diff --git a/html/admin/css/layout.css b/html/admin/css/layout.css
index b91263ac17..02e72f2c92 100644
--- a/html/admin/css/layout.css
+++ b/html/admin/css/layout.css
@@ -62,11 +62,6 @@ td {
font-size: 1.2em ;
}
-.nofunction {
- padding-left: 4px;
- padding-right: 1px;
-}
-
pre ul li span{
font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif;
font-size: 1em;
@@ -84,7 +79,26 @@ pre ul li span{
#logToolbar a, #documentsToolbar a {
font-size: 0.85em;
}
-#logToolbar, #documentsToolbar{
+
+.toolbar_primary {
+ background-color: #e4e9d2;
+}
+
+.toolbar_secondary {
+ background-color: white;
+}
+
+.toolbar_left {
+ float:left;
+ width:30%;
+}
+
+.toolbar_right {
+ float:right;
+ width:70%;
+}
+
+#logToolbar, #documentsToolbar, .customToolbar{
height:24px;
border: 1px solid #AAAAAA;
padding-left: 3px;
diff --git a/html/admin/index.html b/html/admin/index.html
index 32b730efe0..55cb1db114 100644
--- a/html/admin/index.html
+++ b/html/admin/index.html
@@ -43,7 +43,6 @@
diff --git a/html/admin/js/master.js b/html/admin/js/master.js
index 19d0260205..34114fc83c 100644
--- a/html/admin/js/master.js
+++ b/html/admin/js/master.js
@@ -11,13 +11,13 @@ var globalCollectionName;
var globalCollectionID;
var globalCollectionRev;
+var open = false;
$(document).ready(function() {
showCursor();
///////////////////////////////////////////////////////////////////////////////
/// global variables
///////////////////////////////////////////////////////////////////////////////
-var open = false;
var tableView = true;
var sid = ($.cookie("sid"));
var currentUser;
@@ -95,6 +95,10 @@ $("#tabs").tabs({
}
});
+///////////////////////////////////////////////////////////////////////////////
+/// disable grey'd out buttons
+///////////////////////////////////////////////////////////////////////////////
+ $(".nofunction").attr("disabled", "true");
///////////////////////////////////////////////////////////////////////////////
/// checks for a login user cookie, creates new sessions if null
@@ -548,16 +552,24 @@ var logTable = $('#logTableID').dataTable({
hideAllSubDivs();
$('#collectionsView').hide();
$('#configView').show();
- createnav ("Config");
+ createnav ("Configuration");
+ var switcher = "primary";
var content={"Menue":{"Haha":"wert1", "ahha":"wert2"}, "Favoriten":{"top10":"content"},"Test":{"testing":"hallo 123 test"}};
- $("#configView").empty();
+ $("#configContent").empty();
$.each(content, function(data) {
- $('#configView').append('
' + data + '
');
+ $('#configContent').append('
' + data + '
');
$.each(content[data], function(key, val) {
- $('#configView').append('
' + key + ":" + val + '');
+ if (switcher == "primary") {
+ $('#configContent').append('
' + key + '' + val + '');
+ switcher = "secondary";
+ }
+ else if (switcher == "secondary") {
+ $('#configContent').append('
' + key + '' + val + '');
+ switcher = "primary";
+ }
});
- //$('#configView').append('
' + menues + '');
+ //$('#configContent').append('
' + menues + '');
});
}
@@ -1357,7 +1369,7 @@ function drawCollectionsTable () {
}
else if (tempStatus == 2) {
tempStatus = "unloaded";
- items.push(['


',
+ items.push(['
',
val.id, val.name, tempStatus, "", ""]);
}
else if (tempStatus == 3) {
@@ -1379,7 +1391,7 @@ function drawCollectionsTable () {
}
});
- items.push(['
',
+ items.push(['
',
val.id, val.name, tempStatus, bytesToSize(size*1024), alive]);
}
else if (tempStatus == 4) {
@@ -1745,7 +1757,7 @@ function createNextPagination(checked) {
}
function showCursor() {
- $(':button').mouseover(function () {
+ $('.enabled').mouseover(function () {
$(this).css('cursor', 'pointer');
});
}