mirror of https://gitee.com/bigwinds/arangodb
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
This commit is contained in:
Jan Steemann
commit
9dfb1f6ade
|
|
@ -64,6 +64,7 @@ examples:
|
|||
|
||||
python @srcdir@/Documentation/Scripts/generateExamples.py \
|
||||
--output-dir @builddir@/Documentation/Examples \
|
||||
--only-thisone "$(FILTER_EXAMPLE)" \
|
||||
--arangosh-setup @srcdir@/Documentation/Examples/setup-arangosh.js \
|
||||
@srcdir@/js/actions \
|
||||
@srcdir@/js/client \
|
||||
|
|
|
|||
|
|
@ -113,6 +113,12 @@ ArangoshCases = [ ]
|
|||
|
||||
ArangoshSetup = ""
|
||||
|
||||
################################################################################
|
||||
### @brief filter to only output this one:
|
||||
################################################################################
|
||||
|
||||
FilterForTestcase = ""
|
||||
|
||||
################################################################################
|
||||
### @brief states
|
||||
################################################################################
|
||||
|
|
@ -128,6 +134,7 @@ STATE_ARANGOSH_RUN = 2
|
|||
OPTION_NORMAL = 0
|
||||
OPTION_ARANGOSH_SETUP = 1
|
||||
OPTION_OUTPUT_DIR = 2
|
||||
OPTION_FILTER = 3
|
||||
|
||||
fstate = OPTION_NORMAL
|
||||
|
||||
|
|
@ -292,7 +299,7 @@ regularStartLine = re.compile(r'^(/// )?@EXAMPLE_ARANGOSH_OUTPUT{([^}]*)}')
|
|||
runLine = re.compile(r'^(/// )?@EXAMPLE_ARANGOSH_RUN{([^}]*)}')
|
||||
|
||||
def matchStartLine(line, filename):
|
||||
global regularStartLine, errorStartLine, runLine
|
||||
global regularStartLine, errorStartLine, runLine, FilterForTestcase
|
||||
errorName = ""
|
||||
m = regularStartLine.match(line)
|
||||
|
||||
|
|
@ -304,6 +311,10 @@ def matchStartLine(line, filename):
|
|||
if name in ArangoshFiles:
|
||||
print >> sys.stderr, "%s\nduplicate test name '%s' in file %s!\n%s\n" % ('#' * 80, name, filename, '#' * 80)
|
||||
sys.exit(1)
|
||||
# if we match for filters, only output these!
|
||||
if ((len(FilterForTestcase) != 0) and (FilterForTestcase != name)):
|
||||
print >> sys.stderr, "filtering test case %s" %name
|
||||
return("", STATE_BEGIN);
|
||||
|
||||
ArangoshFiles[name] = True
|
||||
ArangoshOutput[name] = []
|
||||
|
|
@ -319,6 +330,11 @@ def matchStartLine(line, filename):
|
|||
print >> sys.stderr, "%s\nduplicate test name '%s' in file %s!\n%s\n" % ('#' * 80, name, filename, '#' * 80)
|
||||
sys.exit(1)
|
||||
|
||||
# if we match for filters, only output these!
|
||||
if ((len(FilterForTestcase) != 0) and (FilterForTestcase != name)):
|
||||
print >> sys.stderr, "filtering test case %s" %name
|
||||
return("", STATE_BEGIN);
|
||||
|
||||
ArangoshCases.append(name)
|
||||
ArangoshFiles[name] = True
|
||||
ArangoshRun[name] = ""
|
||||
|
|
@ -540,7 +556,7 @@ if (allErrors.length > 0) {
|
|||
### @brief get file names
|
||||
################################################################################
|
||||
def loopDirectories():
|
||||
global ArangoshSetup, OutputDir
|
||||
global ArangoshSetup, OutputDir, FilterForTestcase
|
||||
argv = sys.argv
|
||||
argv.pop(0)
|
||||
filenames = []
|
||||
|
|
@ -549,7 +565,9 @@ def loopDirectories():
|
|||
if filename == "--arangosh-setup":
|
||||
fstate = OPTION_ARANGOSH_SETUP
|
||||
continue
|
||||
|
||||
if filename == "--only-thisone":
|
||||
fstate = OPTION_FILTER
|
||||
continue
|
||||
if filename == "--output-dir":
|
||||
fstate = OPTION_OUTPUT_DIR
|
||||
continue
|
||||
|
|
@ -563,6 +581,9 @@ def loopDirectories():
|
|||
else:
|
||||
filenames.append(filename)
|
||||
|
||||
elif fstate == OPTION_FILTER:
|
||||
fstate = OPTION_NORMAL
|
||||
FilterForTestcase = filename;
|
||||
elif fstate == OPTION_ARANGOSH_SETUP:
|
||||
fstate = OPTION_NORMAL
|
||||
f = open(filename, "r")
|
||||
|
|
|
|||
|
|
@ -351,6 +351,7 @@ Where...
|
|||
generate
|
||||
--------
|
||||
- make examples - on toplevel to generate Documentation/Examples
|
||||
- make examples FILTER_EXAMPLE=geoIndexSelect will only produce one example - *geoIndexSelect*
|
||||
- make swagger - on toplevel to generate the documentation interactively with the server
|
||||
- cd Documentation/Books; make - to generate the HTML documentation
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Binary file not shown.
|
|
@ -4600,6 +4600,13 @@ div.dropdownInner {
|
|||
div.dropdownInner ul label {
|
||||
color: #000;
|
||||
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 {
|
||||
color: #000;
|
||||
|
|
@ -4866,7 +4873,33 @@ div.headerBar > div.headerButtonBar {
|
|||
font-size: 14px;
|
||||
font-weight: 300; }
|
||||
.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 {
|
||||
margin-top: 15px; }
|
||||
.modal-body input, .modal-body select, .modal-body textarea {
|
||||
|
|
@ -5410,8 +5443,8 @@ div .bigtile {
|
|||
padding-top: 5px; }
|
||||
.dashboard-small-chart .dashboard-small-chart-inner .dashboard-interior-chart .nv-bar rect {
|
||||
fill-opacity: .15;
|
||||
stroke-opacity: 1;
|
||||
stroke-width: 1px; }
|
||||
stroke-opacity: 0.8;
|
||||
stroke-width: 0.5px; }
|
||||
|
||||
.dashboard-medium-chart-outer {
|
||||
border: 1px solid rgba(104, 103, 102, 0.1);
|
||||
|
|
@ -5496,8 +5529,8 @@ div .bigtile {
|
|||
text-align: right; }
|
||||
.dashboard-bar-chart-container .dashboard-bar-chart .dashboard-bar-chart-chart .nv-bar rect {
|
||||
fill-opacity: .15;
|
||||
stroke-opacity: 1;
|
||||
stroke-width: 1px; }
|
||||
stroke-opacity: .8;
|
||||
stroke-width: 0.5px; }
|
||||
|
||||
.dashboard-legend .dashboard-legend-inner {
|
||||
padding: 0 5px 5px 0; }
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -30,23 +30,28 @@
|
|||
<li><a>
|
||||
<label class="checkbox checkboxLabel">
|
||||
<input class="css-checkbox checkSystemCollections" type="checkbox">
|
||||
<label class="css-label"></label>System
|
||||
<i class="fa"></i>
|
||||
System
|
||||
</label>
|
||||
</a></li>
|
||||
|
||||
<li><a>
|
||||
<label class="checkbox checkboxLabel">
|
||||
<input class="css-checkbox" type="checkbox" id="checkDocument">
|
||||
<label class="css-label" id="checkDocument"></label>Document
|
||||
<i class="fa"></i>
|
||||
Document
|
||||
</label>
|
||||
</a></li>
|
||||
|
||||
<li><a>
|
||||
<label class="checkbox checkboxLabel">
|
||||
<input class="css-checkbox" type="checkbox" id="checkEdge">
|
||||
<label class="css-label" id="checkEdge"></label>Edge
|
||||
<i class="fa"></i>
|
||||
Edge
|
||||
</label>
|
||||
</a></li>
|
||||
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<ul>
|
||||
|
|
@ -55,14 +60,16 @@
|
|||
<li><a href="#">
|
||||
<label class="checkbox checkboxLabel">
|
||||
<input class="css-checkbox" type="checkbox" id="checkLoaded">
|
||||
<label class="css-label"></label>Loaded
|
||||
<i class="fa"></i>
|
||||
Loaded
|
||||
</label>
|
||||
</a></li>
|
||||
|
||||
<li><a href="#">
|
||||
<label class="checkbox checkboxLabel">
|
||||
<input class="css-checkbox" type="checkbox" id="checkUnloaded">
|
||||
<label class="css-label"></label>Unloaded
|
||||
<i class="fa"></i>
|
||||
Unloaded
|
||||
</label>
|
||||
</a></li>
|
||||
|
||||
|
|
@ -73,21 +80,24 @@
|
|||
<li><a href="#">
|
||||
<label class="checkbox checkboxLabel">
|
||||
<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>
|
||||
</a></li>
|
||||
|
||||
<li><a href="#">
|
||||
<label class="checkbox checkboxLabel">
|
||||
<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>
|
||||
</a></li>
|
||||
|
||||
<li><a href="#">
|
||||
<label class="checkbox checkboxLabel">
|
||||
<input class="css-checkbox" type="checkbox" id="sortOrder">
|
||||
<label class="css-label"></label>Sort descending
|
||||
<i class="fa"></i>
|
||||
Sort descending
|
||||
</label>
|
||||
</a></li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@
|
|||
}
|
||||
|
||||
var length;
|
||||
this.setCheckboxStatus("#collectionsDropdown");
|
||||
|
||||
try {
|
||||
length = searchOptions.searchPhrase.length;
|
||||
|
|
@ -57,11 +58,35 @@
|
|||
$('#searchInput').focus();
|
||||
$('#searchInput')[0].setSelectionRange(length, length);
|
||||
|
||||
|
||||
arangoHelper.fixTooltips(".icon_arangodb, .arangoicon", "left");
|
||||
|
||||
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: {
|
||||
"click #createCollection" : "createCollection",
|
||||
"keydown #searchInput" : "restrictToSearchPhraseKey",
|
||||
|
|
@ -98,6 +123,7 @@
|
|||
//chrome bugfix
|
||||
var clicked = e.currentTarget.id;
|
||||
$('#'+clicked).click();
|
||||
console.log(e);
|
||||
},
|
||||
|
||||
checkSystem: function () {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -43,6 +43,44 @@
|
|||
|
||||
.select2-choices {
|
||||
border-radius: 3px;
|
||||
border: 1px solid #aaa;
|
||||
box-shadow: none;
|
||||
-webkit-box-shadow: none;
|
||||
background-image: none !important;
|
||||
|
||||
input {
|
||||
box-shadow: none;
|
||||
-webkit-box-shadow: none;
|
||||
outline: transparent !important;
|
||||
}
|
||||
|
||||
input:active {
|
||||
box-shadow: none;
|
||||
-webkit-box-shadow: none;
|
||||
outline: none !important;
|
||||
}
|
||||
|
||||
.select2-search-choice {
|
||||
margin: 5px 0 3px 5px !important;
|
||||
}
|
||||
|
||||
li {
|
||||
color: $c-black;
|
||||
background-color: $c-white !important;
|
||||
background-image: none !important;
|
||||
a {
|
||||
margin-top: -1px;
|
||||
margin-left: 1px;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.select2-choices:active {
|
||||
outline: transparent !important;
|
||||
border: 1px solid #aaa;
|
||||
box-shadow: none !important;
|
||||
-webkit-box-shadow: none !important;
|
||||
}
|
||||
|
||||
.nav-tabs {
|
||||
|
|
|
|||
|
|
@ -83,8 +83,8 @@
|
|||
|
||||
.nv-bar rect {
|
||||
fill-opacity: .15;
|
||||
stroke-opacity: 1;
|
||||
stroke-width: 1px;
|
||||
stroke-opacity: 0.8;
|
||||
stroke-width: 0.5px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -231,8 +231,8 @@
|
|||
|
||||
.nv-bar rect {
|
||||
fill-opacity: .15;
|
||||
stroke-opacity: 1;
|
||||
stroke-width: 1px;
|
||||
stroke-opacity: .8;
|
||||
stroke-width: 0.5px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue