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:
Heiko Kernbach 2013-02-28 13:57:31 +01:00
parent 637c266478 991d93d8bb
commit 6b6731e619
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/css/collectionsView.css
View File

@ -6,9 +6,6 @@
margin-right: 10px; margin-right: 10px;
} }
.add {
font-size: 16px !important;
}
.thumbnail, .navbar-inner, .btn, .btn-primary { .thumbnail, .navbar-inner, .btn, .btn-primary {
border-radius:0; border-radius:0;

7
frontend/css/documentView.css
View File

@ -26,10 +26,9 @@
cursor: pointer; cursor: pointer;
} }
#deleteRow { #deleteRow, #addRow {
border: medium none; border: medium none;
margin-top: -4px; margin-top: -4px;
padding-left: 10px;
background-color: transparent; background-color: transparent;
} }
@ -77,9 +76,9 @@
border:1px solid #c1bdba; border:1px solid #c1bdba;
} }
#documentTableID.dataTable td { /*#documentTableID.dataTable td {
padding: 13px 10px; padding: 13px 10px;
} }*/
#documentTableID .odd, #documentTableID .odd,
#documentTableID .even { #documentTableID .even {
-webkit-box-shadow: none; -webkit-box-shadow: none;

6
frontend/js/views/documentView.js
View File

@ -96,12 +96,12 @@ var documentView = Backbone.View.extend({
drawTable: function () { drawTable: function () {
var self = this; var self = this;
$(self.table).dataTable().fnAddData([ $(self.table).dataTable().fnAddData([
'<div class="notwriteable"></div>',
'<div class="notwriteable"></div>',
'<a class="add" class="notwriteable" id="addDocumentLine"> Add data</a>', '<a class="add" class="notwriteable" id="addDocumentLine"> Add data</a>',
'<div class="notwriteable"></div>', '<div class="notwriteable"></div>',
'<div class="notwriteable"></div>', '<div class="notwriteable"></div>',
'<div class="notwriteable"></div>', '<button class="enabled" id="addRow"><img id="addDocumentLine" class="plusIcon" src="/_admin/html/img/plus_icon.png"></button>'
'<div class="notwriteable"></div>',
'<img id="addDocumentLine" class="plusIcon" src="/_admin/html/img/plus_icon.png">'
]); ]);
$.each(window.arangoDocumentStore.models[0].attributes, function(key, value) { $.each(window.arangoDocumentStore.models[0].attributes, function(key, value) {
if (arangoHelper.isSystemAttribute(key)) { if (arangoHelper.isSystemAttribute(key)) {