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

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

This commit is contained in:
Jan Steemann 2014-01-31 02:02:49 +01:00
parent ea7772295b fadb568728
commit d17e049ed7
9 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/apps/system/aardvark/frontend/css/buttons.css
View File

@ -6,16 +6,15 @@
.addButton { .addButton {
position: relative; position: relative;
margin-right: 7px; margin-right: 7px;
font-size: 20px; font-size: 22px;
color: #8AA050; color: #8AA050;
margin-top: 2px; margin-top: 2px;
cursor: pointer; cursor: pointer;
} }
.deleteButton { .deleteButton {
/*color: #B30000;*/
color: #DA4F49; color: #DA4F49;
font-size: 20px; font-size: 22px;
padding-right: 3px; padding-right: 3px;
top: 3px; top: 3px;
position: relative; position: relative;
@ -45,13 +44,16 @@ a.headerButton {
margin-left: 5px; margin-left: 5px;
margin-right: 5px; margin-right: 5px;
min-height: 19px; min-height: 19px;
border-radius: 2px; border-radius: 3px;
position: relative; position: relative;
box-shadow: none; box-shadow: none;
background: #8AA051 !important;
/*
background: #8f8d8c !important; background: #8f8d8c !important;
*/
color:#FFFFFF !important; color:#FFFFFF !important;
height:20px; height:20px;
width:14px; width:13px;
padding: 5px 11px 2px 9px; padding: 5px 11px 2px 9px;
} }

2
js/apps/system/aardvark/frontend/css/databaseView.css
View File

@ -44,7 +44,7 @@
#databaseTable td span { #databaseTable td span {
float: right; float: right;
color: #B30000; color: #B30000;
font-size: 18px; font-size: 22px;
} }
#databaseTable td { #databaseTable td {

2
js/apps/system/aardvark/frontend/css/documentView.css
View File

@ -100,7 +100,7 @@
} }
.addAttribute, .deleteAttribute { .addAttribute, .deleteAttribute {
font-size: 27px; font-size: 22px;
float:right; float:right;
padding-top: 2px; padding-top: 2px;
} }

5
js/apps/system/aardvark/frontend/css/documentsView.css
View File

@ -120,7 +120,7 @@
.snippet-no-num { .snippet-no-num {
font-size: 1em; font-size: 1em;
font-weight: 300; font-weight: 400;
font-family: 'Open Sans', sans-serif; font-family: 'Open Sans', sans-serif;
margin-bottom:0px; margin-bottom:0px;
} }
@ -184,7 +184,10 @@
} }
.pagination ul > li > a:hover, .pagination ul > .active > a, .pagination ul > .active > span { .pagination ul > li > a:hover, .pagination ul > .active > a, .pagination ul > .active > span {
/*
background-color: #8aa050; background-color: #8aa050;
*/
background-color: #8f8d8c;
color:#FFFFFF; color:#FFFFFF;
} }

12
js/apps/system/aardvark/frontend/css/general.css
View File

@ -1,8 +1,7 @@
/* Sets the default values shared for content views*/ /* Sets the default values shared for content views*/
#content #content {
{
background-color: rgba(0, 0, 0, 0.15); background-color: rgba(0, 0, 0, 0.15);
margin-top: 30px; margin-top: 25px;
margin-bottom: 33px; margin-bottom: 33px;
min-height: 80px; min-height: 80px;
height: 100%; height: 100%;
@ -10,6 +9,13 @@
margin-left: 20px; margin-left: 20px;
margin-left: 0; margin-left: 0;
} }
div.content {
padding-top: 13px;
padding-left: 5px;
padding-right: 5px;
padding-bottom: 5px;
}
/* layout.css /* layout.css
#aboutDiv { #aboutDiv {
padding-bottom: 5px; padding-bottom: 5px;

6
js/apps/system/aardvark/frontend/css/layout.css
View File

@ -259,10 +259,10 @@ button {
} }
li a [class^="icon_arangodb"], li a [class*=" icon_arangodb"] { li a [class^="icon_arangodb"], li a [class*=" icon_arangodb"] {
font-size: 26px; font-size: 22px;
position: absolute; position: absolute;
right: 4px; right: 5px;
top: 0px; top: 2px;
} }
.modal-body .icon_arangodb_info { .modal-body .icon_arangodb_info {

7
js/apps/system/aardvark/frontend/js/collections/arangoDatabase.js
View File

@ -2,13 +2,15 @@
/*global window, Backbone, $, window, _*/ /*global window, Backbone, $, window, _*/
(function() { (function() {
'use strict';
window.ArangoDatabase = Backbone.Collection.extend({ window.ArangoDatabase = Backbone.Collection.extend({
model: window.Database, model: window.Database,
comparator: "name", comparator: "name",
sync: function(method, model, options) { sync: function(method, model, options) {
'use strict';
if (method === "read") { if (method === "read") {
options.url = model.url() + "user"; options.url = model.url() + "user";
} }
@ -20,6 +22,9 @@
}, },
parse: function(response) { parse: function(response) {
if (!response) {
return;
}
return _.map(response.result, function(v) { return _.map(response.result, function(v) {
return {name:v}; return {name:v};
}); });

1
js/apps/system/aardvark/frontend/js/graphViewer/graph/arangoAdapter.js
View File

@ -153,7 +153,6 @@ function ArangoAdapter(nodes, edges, viewer, config) {
throw "[" + data.errorNum + "] " + data.errorMessage; throw "[" + data.errorNum + "] " + data.errorMessage;
} }
catch (e) { catch (e) {
console.log(e);
throw "Undefined ERROR"; throw "Undefined ERROR";
} }
} }

4
js/apps/system/aardvark/frontend/js/templates/graphView.ejs
View File

@ -24,7 +24,7 @@ gs = _.sortBy(gs, sortF);
</div> </div>
</ul> </ul>
<ul class="thumbnails"> <div class="content">
<form action="javascript:void(0);" autocomplete="on" class="form-horizontal" id="creationDialog"> <form action="javascript:void(0);" autocomplete="on" class="form-horizontal" id="creationDialog">
<fieldset> <fieldset>
<div class="control-group"> <div class="control-group">
@ -172,5 +172,5 @@ gs = _.sortBy(gs, sortF);
</div> </div>
</fieldset> </fieldset>
</form> </form>
</ul> </div>
</div> </div>