Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

This commit is contained in:
Frank Celler 2013-08-07 13:30:38 +02:00
parent 487af3bc0d debe6e88fa
commit 280676b8ef
9 changed files with 155 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
html/admin/css/collectionsItemView.css
View File

@ -1,6 +1,6 @@
.span3 { .span3 {
min-height:100px; min-height:100px;
width: 280px; width: 230px;
margin-left: 8px !important; margin-left: 8px !important;
margin-bottom: 8px !important; margin-bottom: 8px !important;
border: 0px; border: 0px;
@ -20,7 +20,7 @@
white-space: nowrap !important; white-space: nowrap !important;
overflow: hidden !important; overflow: hidden !important;
text-overflow: ellipsis !important; text-overflow: ellipsis !important;
width: 264px; width: 214px;
color: #fff; color: #fff;
border: 0; border: 0;
background:#676665; background:#676665;

47
html/admin/css/dashboardView.css
View File

@ -22,8 +22,8 @@
.group-close, .group-open { .group-close, .group-open {
float:right; float:right;
margin-top: 17px !important; margin-top: 18px !important;
margin-right: 7px !important; margin-right: 25px !important;
} }
.db-zoom, .db-minimize, .db-hide, .db-info, #detailReplicationMinimize{ .db-zoom, .db-minimize, .db-hide, .db-info, #detailReplicationMinimize{
@ -42,9 +42,10 @@
} }
.statGroups { .statGroups {
margin-top: 10px !important;
margin-left: 0px; margin-left: 0px;
float:left; float:left;
width: 100%; width: 100% !important;
margin-bottom: -15px !important; margin-bottom: -15px !important;
} }
@ -61,21 +62,20 @@
.statSingleClient { .statSingleClient {
height: 300px; height: 300px;
width: 99.7%; width: 100% !important;
margin-top: 10px; margin-top: 10px;
margin-left: 10px !important; margin-left: 10px !important;
margin-right: 11px; margin-right: 11px !important;
margin-bottom: 0px !important; margin-bottom: 0px !important;
border: 1px solid black;
background-color: #F4F3F3; background-color: #F4F3F3;
} }
.statClient { .statClient {
float: left; float: left;
height: 70px; height: 70px;
width: 203px; width: 230px;
margin-left: 9px; margin-left: 8px !important;
margin-bottom: 12px; margin-bottom: 4px !important;
border: 1px solid black; border: 1px solid black;
background-color: #F4F3F3; background-color: #F4F3F3;
} }
@ -106,8 +106,7 @@
margin-top: 0 !important; margin-top: 0 !important;
padding-top: 0 !important; padding-top: 0 !important;
height: 140px; height: 140px;
/*width: 255px;*/ width: 300px;
width: 272px;
} }
.svgDetailClass { .svgDetailClass {
@ -136,16 +135,23 @@
margin-bottom: -15px !important; margin-bottom: -15px !important;
} }
.statsHeader { #statsHeaderDiv {
margin-bottom: 16px;
margin-top: 12px; margin-top: 12px;
margin-left: 10px; margin-right: 20px !important;
margin-right: 10px; margin-left: 8px !important;
width: 100%; padding: 0 !important;
background-color: #686766; height: 24px !important;
width: auto !important;
color: white; color: white;
height: 36px; height: 36px;
} }
.statsHeader {
width: 100%;
background-color: #686766 !important;
}
#dashboardHeader { #dashboardHeader {
background-color: #686766; background-color: #686766;
border-bottom: 1px solid #A0A0A0; border-bottom: 1px solid #A0A0A0;
@ -278,6 +284,7 @@
#detailReplicationDiv { #detailReplicationDiv {
padding-top: 26px; padding-top: 26px;
padding-right: 20px;
} }
#detailReplicationDiv table { #detailReplicationDiv table {
@ -319,6 +326,7 @@
#leftReplicationDiv table, #rightReplicationDiv table { #leftReplicationDiv table, #rightReplicationDiv table {
width: 100%; width: 100%;
padding-right: 10px !important;
} }
#leftReplicationDiv table tr, #rightReplicationDiv table tr{ #leftReplicationDiv table tr, #rightReplicationDiv table tr{
@ -335,6 +343,7 @@
width: 100%; width: 100%;
min-height: 150px; min-height: 150px;
margin-bottom: 8px; margin-bottom: 8px;
margin-right: 10px;
margin-top: -20px; margin-top: -20px;
} }
@ -405,7 +414,11 @@
} }
#detailReplication { #detailReplication {
background-color: #D9D5D1 !important; margin-right: 20px;
background-color: transparent !important;
border: 0 !important; border: 0 !important;
} }
#detailGraphPadding {
padding-right: 33px !important;
}

5
html/admin/css/layout.css
View File

@ -242,7 +242,10 @@ table .sorting {
} }
.marginRight10 { .marginRight10 {
padding-right: 33px !important; padding-left: 10px !important;
padding-top: 10px !important;
padding-bottom: 10px !important;
padding-right: 0px !important;
} }
.form-actions { .form-actions {

9
html/admin/css/shellView.css
View File

@ -29,9 +29,14 @@
.vsplitbar { .vsplitbar {
border: 0; border: 0;
width: 10px; width: 10px;
background-color: #686766; background-color: #F0F0F0;
border-bottom: 1px solid black;
border-top: 1px solid black; border-top: 1px solid black;
border-bottom: 1px solid black;
border-left: 1px solid #A0A0A0;
border-right: 1px solid #A0A0A0;
background-image: url(../img/stripes90.gif);
background-repeat:no-repeat;
background-position: 50% 50%;
} }
.vsplitbar:hover { .vsplitbar:hover {

BIN
html/admin/img/stripes90.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 99 B

2
html/admin/js/templates/dashboardView.ejs
View File

@ -127,6 +127,7 @@
<h4 class="">Detail Chart</h4> <h4 class="">Detail Chart</h4>
</li> </li>
<div id="detailGraphPadding">
<li id="detailGraph" class="statSingleClient"> <li id="detailGraph" class="statSingleClient">
<div class="boxHeader"> <div class="boxHeader">
<h6 id="detailGraphHeader" class="dashboardH6">User Time</h6> <h6 id="detailGraphHeader" class="dashboardH6">User Time</h6>
@ -135,5 +136,6 @@
<svg class="svgDetailClass"/> <svg class="svgDetailClass"/>
</div> </div>
</li> </li>
</div>
</ul> </ul>

206
html/admin/js/templates/graphView.ejs
View File

@ -17,122 +17,128 @@ ds = _.sortBy(ds, sortF);
es = _.sortBy(es, sortF); es = _.sortBy(es, sortF);
gs = _.sortBy(gs, sortF); gs = _.sortBy(gs, sortF);
%> %>
<div class="thumbnails" id="background"> <div id="background">
<form action="javascript:void(0);" autocomplete="on" class="form-horizontal" id="creationDialog"> <ul class="thumbnails2">
<fieldset> <div id="transparentHeader">
<legend>Configuration</legend> <h4>Graph Viewer Configuration</h4>
</div>
</ul>
<div class="control-group"> <ul class="thumbnails">
<form action="javascript:void(0);" autocomplete="on" class="form-horizontal" id="creationDialog">
<fieldset id="datasoure"> <fieldset>
<legend class="gv_inner">Datasource:</legend> <div class="control-group">
<div class="controls"> <fieldset id="datasoure">
<label class="radio"> <legend class="gv_inner">Datasource:</legend>
<input type="radio" name="loadtype" id="collections" checked>
Select existing collections
</label>
</div>
<div id="collection_config">
<label for="nodeCollection" class="control-label">Vertex collection</label>
<div class="controls"> <div class="controls">
<select id="nodeCollection" name="nodeCollection"> <label class="radio">
<%_.each(ds, function(d) {%> <input type="radio" name="loadtype" id="collections" checked>
<option value="<%= d %>"><%= d %></option> Select existing collections
<%}); %> </label>
</select>
</div> </div>
<label for="edgeCollection" class="control-label">Edge collection</label>
<div id="collection_config">
<label for="nodeCollection" class="control-label">Vertex collection</label>
<div class="controls">
<select id="nodeCollection" name="nodeCollection">
<%_.each(ds, function(d) {%>
<option value="<%= d %>"><%= d %></option>
<%}); %>
</select>
</div>
<label for="edgeCollection" class="control-label">Edge collection</label>
<div class="controls">
<select id="edgeCollection" name="edgeCollection">
<%_.each(es, function(e) {%>
<option value="<%= e %>"><%= e %></option>
<%}); %>
</select>
</div>
</div>
<div class="controls"> <div class="controls">
<select id="edgeCollection" name="edgeCollection"> <label class="radio">
<%_.each(es, function(e) {%> <input type="radio" name="loadtype" id="graphs">
<option value="<%= e %>"><%= e %></option> Select an existing graph
<%}); %> </label>
</select> </div>
<div id="graph_config" style="display:none">
<label for="graph" class="control-label">Graph-Name</label>
<div class="controls">
<select id="graph" name="graph">
<%_.each(gs, function(g) {%>
<option value="<%= g %>"><%= g %></option>
<%}); %>
</select>
</div>
</div> </div>
</div> </div>
<div class="controls"> </fieldset>
<label class="radio">
<input type="radio" name="loadtype" id="graphs"> <div class="accordion" id="advancedGraphOptions">
Select an existing graph
</label> <div class="accordion-group">
</div> <div class="accordion-heading">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#advancedGraphOptions" href="#advancedOptions">
<div id="graph_config" style="display:none"> Advanced
<label for="graph" class="control-label">Graph-Name</label> </a>
<div class="controls">
<select id="graph" name="graph">
<%_.each(gs, function(g) {%>
<option value="<%= g %>"><%= g %></option>
<%}); %>
</select>
</div> </div>
</div>
</div>
</fieldset> <div id="advancedOptions" class="accordion-body collapse out">
<div class="accordion-inner">
<div class="accordion" id="advancedGraphOptions">
<div class="accordion-group">
<div class="accordion-heading">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#advancedGraphOptions" href="#advancedOptions">
Advanced
</a>
</div>
<div id="advancedOptions" class="accordion-body collapse out">
<div class="accordion-inner">
<div class="control-group">
<label for="undirected" class="control-label">Treat graph as undirected</label>
<div class="controls">
<input id="undirected" type="checkbox" name="undirected" class="input-xlarge">
</div>
</div>
<div class="control-group">
<label for="randomStart" class="control-label">Display random vertex at start</label>
<div class="controls">
<input id="randomStart" type="checkbox" name="randomStart" class="input-xlarge">
</div>
</div>
<div class="control-group">
<label for="nodeLabel" class="control-label">Vertex label attribute (e.g. "name")</label>
<div class="controls">
<input id="nodeLabel" type="text" name="nodeLabel" placeholder="Attribute" maxlength="75" class="input-xlarge">
</div>
</div>
<fieldset id="group_by_list">
<legend class="gv_inner">Grouping of vertices:</legend>
<div class="control-group"> <div class="control-group">
<label for="group_by_1" class="control-label">Attribute 1</label> <label for="undirected" class="control-label">Treat graph as undirected</label>
<div class="controls"> <div class="controls">
<input id="group_by_1" type="text" name="group_by_1" placeholder="Attribute" maxlength="75" class="input-xlarge"> <input id="undirected" type="checkbox" name="undirected" class="input-xlarge">
<button id="add_group_by" class="graphViewer-icon-button gv-icon-small add">
</button>
</div> </div>
</div> </div>
</fieldset> <div class="control-group">
<label for="randomStart" class="control-label">Display random vertex at start</label>
<div class="controls">
<input id="randomStart" type="checkbox" name="randomStart" class="input-xlarge">
</div>
</div>
<div class="control-group">
<label for="nodeLabel" class="control-label">Vertex label attribute (e.g. "name")</label>
<div class="controls">
<input id="nodeLabel" type="text" name="nodeLabel" placeholder="Attribute" maxlength="75" class="input-xlarge">
</div>
</div>
<fieldset id="group_by_list">
<legend class="gv_inner">Grouping of vertices:</legend>
<div class="control-group">
<label for="group_by_1" class="control-label">Attribute 1</label>
<div class="controls">
<input id="group_by_1" type="text" name="group_by_1" placeholder="Attribute" maxlength="75" class="input-xlarge">
<button id="add_group_by" class="graphViewer-icon-button gv-icon-small add">
</button>
</div>
</div>
</fieldset>
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="control-group">
<div class="control-group"> <div class="controls">
<div class="controls"> <button type="submit" class="btn btn-primary" id="createViewer" >Start</button>
<button type="submit" class="btn btn-primary" id="createViewer" >Start</button> </div>
</div> </div>
</div> </fieldset>
</fieldset> </form>
</form> </ul>
</div> </div>

2
html/admin/js/views/dashboardView.js
View File

@ -211,7 +211,7 @@ var dashboardView = Backbone.View.extend({
$('.thumbnails').append( $('.thumbnails').append(
'<ul class="statGroups" id="' + this.group + '">' + '<ul class="statGroups" id="' + this.group + '">' +
'<i class="group-close icon-minus icon-white"></i>' + '<i class="group-close icon-minus icon-white"></i>' +
'<h4 class="statsHeader">' + this.name + '</h4>' + '<div id="statsHeaderDiv"><h4 class="statsHeader">' + this.name + '</h4></div>' +
'</ul>'); '</ul>');
//group //group

4
html/admin/js/views/navigationView.js
View File

@ -24,7 +24,9 @@ var navigationView = Backbone.View.extend({
//padding row 40px //padding row 40px
var containerWidth = $(window).width() - 70; var containerWidth = $(window).width() - 70;
//var spanWidth = $('.span3').outerWidth(true); //var spanWidth = $('.span3').outerWidth(true);
var spanWidth = 292; var test = $('.span3').outerWidth(true);
console.log(test);
var spanWidth = 242;
var divider = containerWidth / spanWidth; var divider = containerWidth / spanWidth;
var roundDiv = parseInt(divider, 10); var roundDiv = parseInt(divider, 10);