1
0
Fork 0
This commit is contained in:
Heiko Kernbach 2013-08-09 19:17:19 +02:00
parent 2924d49d60
commit 46d6f249f3
11 changed files with 83 additions and 99 deletions

View File

@ -23,7 +23,7 @@
.thumbnails2 {
padding-top: 1px !important;
background-color: rgba(0, 0, 0, 0.07);
background-color: rgba(0, 0, 0, 0.025);
margin-left:0;
margin-bottom:0;
}
@ -34,12 +34,12 @@
padding-right: 20px;
padding-bottom: 10px;
padding-top: 10px;
background-color: rgba(0, 0, 0, 0.05);
background-color: rgba(0, 0, 0, 0.025);
}
.thumbnails li {
background-color: #f4f3f3;
border: 2px solid #FFF;
border: 2px solid rgba(0, 0, 0, 0.1);
}
.thumbnails a.add {
@ -72,7 +72,7 @@
margin-top: 3px;
padding: 2px;
vertical-align: middle;
width:220px;
width:218px !important;
border-radius: 0px 0px 0px 0px !important;
}
@ -101,7 +101,10 @@
border-top: 1px solid #a0a0a0;
border-bottom: 1px solid #a0a0a0;
color:#FFF;
padding:0 20px;
margin-left: 15px;
margin-right: 15px;
padding-left: 5px;
padding-right: 5px;
position:relative;
}

View File

@ -153,16 +153,17 @@
}
#dashboardHeader {
padding-left: 5px;
margin-left: 15px;
margin-right: 15px;
padding-right: 5px;
background-color: #686766;
border-bottom: 1px solid #A0A0A0;
border-top: 1px solid #A0A0A0;
color: #FFFFFF;
height: 36px;
margin-bottom: 0px !important;
margin-left: 0;
margin-right: 0;
margin-top: 20px !important;
padding: 0 20px;
position: relative;
}

View File

@ -20,7 +20,7 @@
}
#sourceDiv {
margin-top: -40px;
margin-top: 0px;
padding: 20px 20px 20px 20px;
min-height: 400px;
}

View File

@ -29,16 +29,15 @@
#tableDiv,
#logContent {
margin-top: -40px;
margin-top: 0px;
padding: 20px 20px 20px 20px;
/* background-color: rgba(0, 0, 0, 0.05);*/
}
#tableDiv .nav-tabs > li,
#sourceDiv .nav-tabs > li,
#logContent .nav-tabs > li {
.arangoTab > li {
position: relative;
z-index: 900;
margin-left: 2px;
}
#addDocumentLine {
@ -118,31 +117,42 @@
background:#F1F0EE;/* #fdf6df*/
}
#tableDiv .nav-tabs > .active > a, #tableDiv .nav-tabs > .active > a:hover {
border:none;
.arangoTab {
margin-bottom:-1px;
margin-right: 20px;
}
#tableDiv .nav-tabs,
#sourceDiv .nav-tabs {
margin-bottom:-1px; border-bottom:#FFFFFF solid 1px;
.arangoTab > li > a,
.arangoTab > li:hover > a {
border-radius: 0 !important;
background-color: #F1F0EE;
border-top: 1px solid #C1BDBA;
border-left: 1px solid #C1BDBA;
border-right: 1px solid #C1BDBA;
border-bottom: 1px solid #C1BDBA;
font-size: 13px !important;
padding-top: 4px;
padding-bottom: 4px;
padding-left: 4px;
padding-right: 4px;
}
#tableDiv .nav-tabs > li > a,
#tableDiv .nav-tabs > li:hover > a,
#sourceDiv .nav-tabs > li > a,
#sourceDiv .nav-tabs > li:hover > a {
border-top: 1px solid #F3EFEC;
border-left: 1px solid #F3EFEC;
border-right: 1px solid #F3EFEC;
border-bottom: 1px solid #F3EFEC;
.arangoTab > li.active {
width: auto;
}
#tableDiv .nav-tabs > li.active > a,
#tableDiv .nav-tabs > li:hover.active > a,
#sourceDiv .nav-tabs > li.active > a,
#sourceDiv .nav-tabs > li:hover.active > a {
background: #FFF;
border: 1px solid #FFF;
.arangoTab > li > a {
background-color: none;
}
.arangoTab > li.active > a,
.arangoTab > li:hover.active > a {
background: #FFF;
border-left: 1px solid #C1BDBA;
border-right: 1px solid #C1BDBA;
border-top: 1px solid #C1BDBA;
border-bottom: 1px solid #FFFFFF;
}
.rightCell{
@ -165,7 +175,14 @@
resize: vertical;
}
#tableDiv .nav-tabs li {
background-color: #F2EEEB !important;
.arangoTab {
margin-bottom: -5px !important;
}
.arangoTab .nav-tabs li {
margin-left: 2px;
}
#logContent .tab-content {
margin-top: 5px;
}

View File

@ -68,10 +68,6 @@ background-color: none !important;
/*border-bottom: 1px solid #C1BDBA;*/
}
.nav-tabs > li > a, .nav-tabs > li > a:hover {
border-radius: 0 0 0 0;
}
#logTableID .firstcol, #infoTableID .firstcol, #debugTableID .firstcol, #critTableID .firstcol, #warnTableID .firstcol {
background-color: #F4F4F4 !important;
width: 80px !important;
@ -107,56 +103,12 @@ background-color: none !important;
#logTableID_wrapper, #infoTableID_wrapper, #debugTableID_wrapper, #critTableID_wrapper, #warnTableID_wrapper{
}
#logNav li a {
margin-left: 10px !important;
}
#logNav li a {
background-color: #686766 !important;
}
#logNav li a {
background-color: #BFBDBC !important;
border: 0px solid #FFFFFF !important;
background-image: none !important;
color: white !important;
padding: 0;
background-color: #686766;
/*border-radius: 4px 4px 4px 4px;*/
}
#logNav .active a {
background-color: #EEEAE6 !important;
color: black !important;
}
#logContent .dataTable {
table-layout:fixed !important;
border-collapse:separate;
border-spacing:0 5px;
}
#logNav li a {
width: 65px;
text-align: center;
margin-top: -20px;
background-color: #686766 !important;
}
#logNav .active a {
background-color: #8F8D8C !important;
color: #FFFFFF !important;
margin-top: -10px !important;
}
#logNav li a:hover {
background-color: #8F8D8C !important;
}
#logNav .active h6 {
margin-top: 0px !important;
margin-bottom: 0px !important;
}
#logtestdiv a {
border-radius: 0 !important;
}

View File

@ -11,6 +11,9 @@
<div class="btn-group pull-right">
<button data-toggle="dropdown" class="btn btn-inverse btn-small dropdown-toggle">Filter <span class="caret"></span></button>
<!--<div id="menuGroups" class="dropdown-menu" role="menu">
</div>--!>
<ul class="dropdown-menu dashboard-dropdown" id="menuGroups">
</ul>
</div>
@ -35,6 +38,13 @@
</ul>
<ul class="thumbnails marginRight10">
<ul class="nav nav-tabs arangoTab">
<li class="pull-right active"><a>Statistics</a></li>
<li class="pull-right"><a>Replication</a></li>
</ul>
<li id="detailReplication" class="statSingleClient" style="margin-bottom: 13px !important; display:none;">
<div id="detailReplicationDiv" class="statChart">
<div id="leftReplicationDiv">

View File

@ -4,7 +4,7 @@
</div>
<div id="sourceDiv">
<ul class="nav nav-tabs">
<ul class="nav nav-tabs arangoTab">
<li class="active pull-right"><a>Source</a></li>
<li class="pull-right">
<a id="tableView">Listview</a>
@ -20,4 +20,4 @@
</div>
</div>
</div>

View File

@ -6,8 +6,8 @@
<div id="tableDiv">
<ul class="nav nav-tabs">
<li class="pull-right" style:margin-right:0px;><a id="sourceView">Source</a></li>
<ul class="nav nav-tabs arangoTab">
<li class="pull-right" ><a id="sourceView">Source</a></li>
<li class="active pull-right">
<a>Listview</a>
</li>

View File

@ -5,12 +5,12 @@
<div id="logContent">
<ul id="logNav" class="nav nav-tabs" style="margin-left: 55px">
<li class="pull-left"><a href="#all" data-toggle="pill" id="all-switch"><h6>All</h6></a></li>
<li class="pull-left"><a href="#info" data-toggle="pill" id="info-switch"><h6>Info</h6></a></li>
<li class="pull-left"><a href="#error" data-toggle="tab" id="error-switch"><h6>Error</h6></a></li>
<li class="pull-left"><a href="#warning" data-toggle="tab" id="warning-switch"><h6>Warning</h6></a></li>
<li class="pull-left"><a href="#debug" data-toggle="tab" id="debug-switch"><h6>Debug</h6></a></li>
<ul class="nav nav-tabs arangoTab">
<li class="pull-right"><a href="#all" data-toggle="pill" id="all-switch">All</a></li>
<li class="pull-right"><a href="#info" data-toggle="pill" id="info-switch">Info</a></li>
<li class="pull-right"><a href="#error" data-toggle="tab" id="error-switch">Error</a></li>
<li class="pull-right"><a href="#warning" data-toggle="tab" id="warning-switch">Warning</a></li>
<li class="pull-right"><a href="#debug" data-toggle="tab" id="debug-switch">Debug</a></li>
</ul>
<div class="tab-content">

View File

@ -215,15 +215,15 @@ var dashboardView = Backbone.View.extend({
'</ul>');
//group
//$('#menuGroups').append('<li class="nav-header">' + this.name + '</li>');
//$('#menuGroups').append('<li class="divider" id="' + this.group + 'Divider"></li>');
$('#menuGroups').append('<li class="nav-header">' + this.name + '</li>');
$('#menuGroups').append('<li class="divider" id="' + this.group + 'Divider"></li>');
//TEST
/*TEST
$('#menuGroups').append(
'<li class="dropdown-submenu pull-left"><a tabindex="-1" href="#">'+this.name+'</a>'+
'<ul id="' + this.group + 'Divider" class="dropdown-menu graphDropdown"></ul>'
);
//TEST
*/
//group entries
@ -641,7 +641,8 @@ var dashboardView = Backbone.View.extend({
'</li>'
);
$('#' + figure.group + 'Divider').append(
console.log(figure.group);
$('#' + figure.group + 'Divider').after(
'<li><a><label class="checkbox checkboxLabel">'+
'<input class="css-checkbox" type="checkbox" id='+figure.identifier+'Checkbox checked/>'+
'<label class="css-label"/>' +

View File

@ -35,8 +35,8 @@ var navigationView = Backbone.View.extend({
$('#content').width(newWidth);
$('#content').css('margin-left', marginWidth);
$('#content').css('margin-right', marginWidth);
$('.arango-logo').css('margin-left', marginWidth -20);
$('.nav-collapse').css('margin-right', marginWidth -20);
$('.arango-logo').css('margin-left', marginWidth -15);
$('.nav-collapse').css('margin-right', marginWidth -15);
},
selectMenuItem: function (menuItem) {