mirror of https://gitee.com/bigwinds/arangodb
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
This commit is contained in:
Jan Steemann
commit
239bd687f7
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,194 +0,0 @@
|
|||
.sorting_1 textarea {
|
||||
display: inline !important;
|
||||
max-width: 120px !important;
|
||||
max-height: 20px !important;
|
||||
resize: none !important;
|
||||
}
|
||||
|
||||
.textInline {
|
||||
display:inline !important;
|
||||
}
|
||||
|
||||
.validateError {
|
||||
border: 2px solid red !important;
|
||||
}
|
||||
|
||||
.disabledBtn {
|
||||
opacity: 0.4 !important;
|
||||
cursor: default !important;
|
||||
}
|
||||
|
||||
#collectionPrev, #collectionNext{
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.disabledPag, .disabledPag a{
|
||||
opacity: 0.5 !important;
|
||||
cursor: default !important;
|
||||
}
|
||||
|
||||
#tableDiv, #logContent{
|
||||
margin-top: 0px;
|
||||
padding: 20px 20px 20px 20px;
|
||||
}
|
||||
|
||||
#logContent .tab-content {
|
||||
margin-top: 1px !important;
|
||||
}
|
||||
|
||||
.arangoTab a {
|
||||
color: black !important;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.arangoTab > li {
|
||||
background-color: transparent !important;
|
||||
border: 0 !important;
|
||||
position: relative;
|
||||
z-index: 900;
|
||||
margin-left: 2px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#addDocumentLine {
|
||||
color: black;
|
||||
}
|
||||
|
||||
#addDocumentLine:hover,
|
||||
#sourceView:hover {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#deleteRow, #addRow {
|
||||
border: medium none;
|
||||
margin-top: -8px;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
#documentTableID {
|
||||
font-weight: 500;
|
||||
border-collapse:separate;
|
||||
border-spacing:0 2px;
|
||||
padding:20px;
|
||||
margin-bottom: 5px;
|
||||
border:1px solid #c1bdba;
|
||||
background-color: #FFFFFF;
|
||||
}
|
||||
|
||||
#documentTableID thead {
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
#documentTableID .writeable {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.read_only {
|
||||
cursor: default !important;
|
||||
}
|
||||
|
||||
#editSecondRow {
|
||||
float:right;
|
||||
text-align:right;
|
||||
margin-right: -5px !important;
|
||||
}
|
||||
|
||||
#documentTableID .icon-edit {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
#documentTableID .icon-edit:hover {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#documentTableID.dataTable thead tr {
|
||||
background-color: #F1F0EE;
|
||||
}
|
||||
|
||||
#documentTableID .odd,
|
||||
#documentTableID .even {
|
||||
-webkit-box-shadow: none;
|
||||
-moz-box-shadow: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
#documentTableID .odd {
|
||||
background:#FFFFFF;
|
||||
}
|
||||
#documentTableID .even {
|
||||
background:#F1F0EE;
|
||||
}
|
||||
|
||||
#documentTableID tr.odd td.sorting_1 {
|
||||
background:#FFFFFF; /*#fdfaec*/
|
||||
}
|
||||
|
||||
#documentTableID tr.even td.sorting_1 {
|
||||
background:#F1F0EE;/* #fdf6df*/
|
||||
}
|
||||
|
||||
.arangoTab > li > a,
|
||||
.arangoTab > li:hover > a {
|
||||
border-radius: 0 !important;
|
||||
background-color: #F1F0EE;
|
||||
border-top: 1px solid #C1BDBA;
|
||||
border-left: 1px solid #C1BDBA;
|
||||
border-right: 1px solid #C1BDBA;
|
||||
border-bottom: 1px solid #C1BDBA;
|
||||
font-size: 13px !important;
|
||||
padding-top: 4px;
|
||||
padding-bottom: 4px;
|
||||
padding-left: 4px;
|
||||
padding-right: 4px;
|
||||
}
|
||||
|
||||
.arangoTab > li.active {
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.arangoTab > li > a {
|
||||
background-color: none;
|
||||
}
|
||||
|
||||
.arangoTab > li.active > a,
|
||||
.arangoTab > li:hover.active > a {
|
||||
background: #FFF;
|
||||
border-left: 1px solid #C1BDBA;
|
||||
border-right: 1px solid #C1BDBA;
|
||||
border-top: 1px solid #C1BDBA;
|
||||
border-bottom: 1px solid #FFFFFF;
|
||||
}
|
||||
|
||||
.rightCell{
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
-o-text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
max-width: 600px !important;
|
||||
}
|
||||
|
||||
.rightCell form {
|
||||
max-width: 600px;
|
||||
min-width: 300px;
|
||||
width: 100% !important;
|
||||
}
|
||||
|
||||
.rightCell textarea {
|
||||
max-width: 580px;
|
||||
min-width: 580px;
|
||||
resize: vertical;
|
||||
}
|
||||
|
||||
.arangoTab {
|
||||
padding-bottom: 0 !important;
|
||||
margin-bottom: -1px !important;
|
||||
margin-right: 20px;
|
||||
}
|
||||
|
||||
.arangoTab .nav-tabs li {
|
||||
margin-left: 2px;
|
||||
}
|
||||
|
||||
#logContent .tab-content {
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
|
@ -273,14 +273,11 @@ var documentView = Backbone.View.extend({
|
|||
var row;
|
||||
|
||||
for (row in data) {
|
||||
//Exclude "add-collection" row
|
||||
if (row !== '0') {
|
||||
var row_data = data[row];
|
||||
var key = row_data[0];
|
||||
var value = row_data[3];
|
||||
|
||||
result[key] = JSON.parse(value);
|
||||
}
|
||||
}
|
||||
window.arangoDocumentStore.updateLocalDocument(result);
|
||||
//then sent to server
|
||||
|
|
|
|||
Loading…
Reference in New Issue