1
0
Fork 0
This commit is contained in:
Heiko Kernbach 2015-07-31 15:34:53 +02:00
parent 5aed4c7f55
commit 7678d29ac8
7 changed files with 101 additions and 14 deletions

File diff suppressed because one or more lines are too long

View File

@ -4600,6 +4600,13 @@ div.dropdownInner {
div.dropdownInner ul label { div.dropdownInner ul label {
color: #000; color: #000;
padding-left: 35px; } padding-left: 35px; }
div.dropdownInner ul li .fa {
margin-right: 5px;
color: #8c8a89; }
div.dropdownInner ul li .fa.fa-square-0 {
margin-left: 1px; }
div.dropdownInner ul li .fa.fa-check-square-o, div.dropdownInner ul li .fa.fa-check-circle-o {
color: #8aa051; }
div.queryline { div.queryline {
color: #000; color: #000;
@ -4866,7 +4873,33 @@ div.headerBar > div.headerButtonBar {
font-size: 14px; font-size: 14px;
font-weight: 300; } font-weight: 300; }
.modal-body .select2-choices { .modal-body .select2-choices {
border-radius: 3px; } border-radius: 3px;
border: 1px solid #aaa;
box-shadow: none;
-webkit-box-shadow: none;
background-image: none !important; }
.modal-body .select2-choices input {
box-shadow: none;
-webkit-box-shadow: none;
outline: transparent !important; }
.modal-body .select2-choices input:active {
box-shadow: none;
-webkit-box-shadow: none;
outline: none !important; }
.modal-body .select2-choices .select2-search-choice {
margin: 5px 0 3px 5px !important; }
.modal-body .select2-choices li {
color: #000;
background-color: #fff !important;
background-image: none !important; }
.modal-body .select2-choices li a {
margin-top: -1px;
margin-left: 1px; }
.modal-body .select2-choices:active {
outline: transparent !important;
border: 1px solid #aaa;
box-shadow: none !important;
-webkit-box-shadow: none !important; }
.modal-body .nav-tabs { .modal-body .nav-tabs {
margin-top: 15px; } margin-top: 15px; }
.modal-body input, .modal-body select, .modal-body textarea { .modal-body input, .modal-body select, .modal-body textarea {
@ -5410,8 +5443,8 @@ div .bigtile {
padding-top: 5px; } padding-top: 5px; }
.dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart .nv-bar rect { .dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart .nv-bar rect {
fill-opacity: .15; fill-opacity: .15;
stroke-opacity: 1; stroke-opacity: 0.8;
stroke-width: 1px; } stroke-width: 0.5px; }
.dashboard-medium-chart-outer { .dashboard-medium-chart-outer {
border: 1px solid rgba(104, 103, 102, 0.1); border: 1px solid rgba(104, 103, 102, 0.1);
@ -5496,8 +5529,8 @@ div .bigtile {
text-align: right; } text-align: right; }
.dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-chart .nv-bar rect { .dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-chart .nv-bar rect {
fill-opacity: .15; fill-opacity: .15;
stroke-opacity: 1; stroke-opacity: .8;
stroke-width: 1px; } stroke-width: 0.5px; }
.dashboard-legend .dashboard-legend-inner { .dashboard-legend .dashboard-legend-inner {
padding: 0 5px 5px 0; } padding: 0 5px 5px 0; }

View File

@ -30,23 +30,28 @@
<li><a> <li><a>
<label class="checkbox checkboxLabel"> <label class="checkbox checkboxLabel">
<input class="css-checkbox checkSystemCollections" type="checkbox"> <input class="css-checkbox checkSystemCollections" type="checkbox">
<label class="css-label"></label>System <i class="fa"></i>
System
</label> </label>
</a></li> </a></li>
<li><a> <li><a>
<label class="checkbox checkboxLabel"> <label class="checkbox checkboxLabel">
<input class="css-checkbox" type="checkbox" id="checkDocument"> <input class="css-checkbox" type="checkbox" id="checkDocument">
<label class="css-label" id="checkDocument"></label>Document <i class="fa"></i>
Document
</label> </label>
</a></li> </a></li>
<li><a> <li><a>
<label class="checkbox checkboxLabel"> <label class="checkbox checkboxLabel">
<input class="css-checkbox" type="checkbox" id="checkEdge"> <input class="css-checkbox" type="checkbox" id="checkEdge">
<label class="css-label" id="checkEdge"></label>Edge <i class="fa"></i>
Edge
</label> </label>
</a></li> </a></li>
</li>
</ul> </ul>
<ul> <ul>
@ -55,14 +60,16 @@
<li><a href="#"> <li><a href="#">
<label class="checkbox checkboxLabel"> <label class="checkbox checkboxLabel">
<input class="css-checkbox" type="checkbox" id="checkLoaded"> <input class="css-checkbox" type="checkbox" id="checkLoaded">
<label class="css-label"></label>Loaded <i class="fa"></i>
Loaded
</label> </label>
</a></li> </a></li>
<li><a href="#"> <li><a href="#">
<label class="checkbox checkboxLabel"> <label class="checkbox checkboxLabel">
<input class="css-checkbox" type="checkbox" id="checkUnloaded"> <input class="css-checkbox" type="checkbox" id="checkUnloaded">
<label class="css-label"></label>Unloaded <i class="fa"></i>
Unloaded
</label> </label>
</a></li> </a></li>
@ -73,21 +80,24 @@
<li><a href="#"> <li><a href="#">
<label class="checkbox checkboxLabel"> <label class="checkbox checkboxLabel">
<input class="css-checkbox" type="checkbox" id="sortName"> <input class="css-checkbox" type="checkbox" id="sortName">
<label class="css-label css-label-round"></label>Sort by name <i class="fa css-round-label"></i>
Sort by name
</label> </label>
</a></li> </a></li>
<li><a href="#"> <li><a href="#">
<label class="checkbox checkboxLabel"> <label class="checkbox checkboxLabel">
<input class="css-checkbox" type="checkbox" id="sortType"> <input class="css-checkbox" type="checkbox" id="sortType">
<label class="css-label css-label-round"></label>Sort by type <i class="fa css-round-label"></i>
Sort by type
</label> </label>
</a></li> </a></li>
<li><a href="#"> <li><a href="#">
<label class="checkbox checkboxLabel"> <label class="checkbox checkboxLabel">
<input class="css-checkbox" type="checkbox" id="sortOrder"> <input class="css-checkbox" type="checkbox" id="sortOrder">
<label class="css-label"></label>Sort descending <i class="fa"></i>
Sort descending
</label> </label>
</a></li> </a></li>
</ul> </ul>

View File

@ -47,6 +47,7 @@
} }
var length; var length;
this.setCheckboxStatus("#collectionsDropdown");
try { try {
length = searchOptions.searchPhrase.length; length = searchOptions.searchPhrase.length;
@ -57,11 +58,35 @@
$('#searchInput').focus(); $('#searchInput').focus();
$('#searchInput')[0].setSelectionRange(length, length); $('#searchInput')[0].setSelectionRange(length, length);
arangoHelper.fixTooltips(".icon_arangodb, .arangoicon", "left"); arangoHelper.fixTooltips(".icon_arangodb, .arangoicon", "left");
return this; return this;
}, },
setCheckboxStatus: function(id) {
$.each($(id).find('ul').find('li'), function(key, element) {
if (!$(element).hasClass("nav-header")) {
if ($(element).find('input').attr('checked')) {
if ($(element).find('i').hasClass('css-round-label')) {
$(element).find('i').addClass('fa-dot-circle-o');
}
else {
$(element).find('i').addClass('fa-check-circle-o');
}
}
else {
if ($(element).find('i').hasClass('css-round-label')) {
$(element).find('i').addClass('fa-circle-o');
}
else {
$(element).find('i').addClass('fa-circle-o');
}
}
}
});
},
events: { events: {
"click #createCollection" : "createCollection", "click #createCollection" : "createCollection",
"keydown #searchInput" : "restrictToSearchPhraseKey", "keydown #searchInput" : "restrictToSearchPhraseKey",
@ -98,6 +123,7 @@
//chrome bugfix //chrome bugfix
var clicked = e.currentTarget.id; var clicked = e.currentTarget.id;
$('#'+clicked).click(); $('#'+clicked).click();
console.log(e);
}, },
checkSystem: function () { checkSystem: function () {

View File

@ -68,6 +68,24 @@ div.dropdownInner {
} }
} }
ul {
li {
.fa {
margin-right: 5px;
color: #8c8a89;
&.fa-square-0 {
margin-left: 1px;
}
&.fa-check-square-o,
&.fa-check-circle-o {
color: $c-positive;
}
}
}
}
} }
div.queryline { div.queryline {