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:
Michael Hackstein 2013-08-16 15:02:33 +02:00
parent 6cd29a99b3 b393dd8c29
commit 1f95ea61f5
20 changed files with 95 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
.span3 {
min-height:100px;
width: 233px;
width: 237px;
margin-left: 5px !important;
margin-bottom: 5px !important;
border: 0px;
@ -20,7 +20,7 @@
white-space: nowrap !important;
overflow: hidden !important;
text-overflow: ellipsis !important;
width: 217px;
width: 221px;
color: #fff;
border: 0;
background:#676665;
@ -30,6 +30,7 @@
.collectionName {
text-align:left;
font-weight: 300 !important;
position:absolute;
bottom:0px;
}
@ -41,12 +42,15 @@
.span3 .ICON {
position: absolute;
margin-top: 3px;
margin-top: 5px;
margin-right: 5px;
opacity: 0.5;
cursor: pointer;
font-size: 20px;
}
.span3 .glyphicon-edit {
margin-top: 4px !important;
}
.span3 .ICON{
right: 0px;
@ -69,3 +73,7 @@
opacity: 0.2 !important;
cursor: default !important;
}
.badge, .label, .btn {
text-shadow: none !important;
}

16
html/admin/css/collectionsView.css
View File

@ -39,7 +39,7 @@
.thumbnails li {
background-color: #f4f3f3;
border: 2px solid rgba(0, 0, 0, 0.1);
/*border: 2px solid rgba(0, 0, 0, 0.1);*/
}
.thumbnails a.add {
@ -133,13 +133,13 @@
.arangoHeaderA {
width: 14px !important;
height: 20px !important;
margin-right: 7px !important;
margin-right: 5px !important;
margin-top: -2px !important;
padding-bottom: 2px !important;
padding-left: 10px !important;
padding-right: 10px !important;
padding-left: 9px !important;
padding-right: 11px !important;
padding-top: 5px !important;
font-size: 16px !important;
font-size: 17px !important;
}
#transparentHeader ul, #transparentHeader li, #transparentHeader a {
@ -231,11 +231,11 @@ border-top: 0;
#collectionsDropdown .nav-header, #dashboardDropdown .nav-header{
font-size: 13px;
color: white;
color: black;
}
#collectionsDropdown label, #dashboardDropdown label{
color: white;
color: black;
}
#collectionsDropdown ul, #dashboardDropdown ul {
@ -263,7 +263,7 @@ border-top: 0;
#collectionsDropdown ul li label, #dashboardDropdown ul li label {
padding-left: 35px;
color: white;
color: black;
}
.containerdivNewLine {

12
html/admin/css/documentView.css
View File

@ -72,9 +72,12 @@
#editSecondRow, #editFirstRow {
color: #444444;
font-size: 16px;
float:right;
padding-top: 4px;
}
#addRow, #deleteRow, #editSecondRow, #editFirstRow {
#addRow, #deleteRow {
font-size: 20px;
float:right;
padding-top: 2px;
@ -82,6 +85,7 @@
#documentTableID {
font-weight: 300;
font-size: 15px !important;
border-collapse:separate;
border-spacing:0 0px;
border-top: 1px solid #888;
@ -171,7 +175,7 @@ table.dataTable thead th {
}
.arangoTab > li > a {
min-width: 40px;
min-width: 50px;
text-align: center;
background-color: none;
}
@ -230,3 +234,7 @@ table.dataTable thead th {
padding-top: 7px !important;
float: right;
}
#documentTableID.dataTable thead tr th {
border-bottom: 1px solid #888888;
}

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

@ -38,22 +38,22 @@ input {
box-shadow: 0;
}
.btn-close {
float:left;
}
.btn-margin {
margin-left: 15px !important;
/* margin-left: 15px !important;*/
}
#transparentHeader .arangoHeader, #dashboardHeader .arangoHeader{
color: #B1D375;
#transparentHeader .arangoHeader, #dashboardHeader .arangoHeader, .modal-header .arangoHeader{
color: white;
position: relative;
top: 7px;
left: 5px;
font-size: 16px;
}
.modal-header .arangoHeader {
color: black !important;
}
.navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle {
background: #788f3d;
}
@ -71,8 +71,8 @@ textarea, .alert {
background: #8f8d8c;
border: none;
color:#FFFFFF;
margin-left:4px;
padding-top: 6px !important;
margin-left:10px;
padding-top: 4px !important;
font-weight: 300 !important;
}

2
html/admin/css/logsView.css
View File

@ -98,6 +98,7 @@ background-color: none !important;
#logTableID, #infoTableID, #debugTableID, #critTableID, #warnTableID {
border-spacing: 0 0px;
margin-top: -5px !important;
font-size: 15px !important;
}
@ -134,5 +135,6 @@ background-color: none !important;
#logTableID thead th, #infoTableID thead th, #debugTableID thead th, #critTableID thead th, #warnTableID thead th {
border-top: 2px solid #888888;
border-bottom: 1px solid #888888;
background-color: #FFFFFF !important;
}

30
html/admin/css/modal.css
View File

@ -53,7 +53,7 @@
}
.modal-text {
font-weight: normal;
font-weight: 300;
padding-top: 3px;
padding-bottom: 3px;
}
@ -99,6 +99,11 @@
border-bottom: 1px solid #888888;
}
.figuresHeader th {
font-weight: 400 !important;
font-family: 'Lato', sans-serif !important;
}
#collectionIndexTable {
margin-left: 0;
width: 100%;
@ -118,7 +123,7 @@
}
#infoTab {
padding-right: 30px;
padding-right: 10px;
border-bottom: 0;
padding-bottom: 0;
margin-bottom: 1px;
@ -135,6 +140,9 @@
background-color: #F1F0EE;
border-bottom: 1px solid #888888;
border-radius: 0 !important;
height: 21px;
font-size: 13px !important;
padding: 4px !important;
}
#infoTab .active > a {
@ -151,11 +159,11 @@
}
.modal-footer {
border-top: 1px solid #888888 !important;
border-top: 0 !important;
}
.modal-header {
border-bottom: 1px solid #888888 !important;
border-bottom: 0 !important;
}
.modal-body .glyphicon-info-sign {
@ -172,3 +180,17 @@
#closeBtnInfoView {
margin-left: 0 !important;
}
.modal-body {
font-weight: 300;
font-family: 'Lato', sans-serif !important;
}
.collectionTh, .collectionInfoTh2 {
font-weight: 400 !important;
font-family: 'Lato', sans-serif !important;
}
#confirmCreateEdge {
margin-left: 20px;
}

2
html/admin/css/navigationView.css
View File

@ -25,7 +25,7 @@
body, input, textarea, .page-title span, .pingback a.url {
/*font-family: "Helvetica",sans-serif;*/
font-family: 'Lato', sans-serif;
font-family: 'Lato', sans-serif !important;
font-weight: 300;
}

2
html/admin/css/queryView.css
View File

@ -21,7 +21,7 @@
#editorToolbar {
width: auto;
margin-top: 10px !important;
margin-top: 20px !important;
margin-left: 0px;
margin-right: 0px;
border-top: 1px solid #A0A0A0;

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

@ -24,15 +24,15 @@
height: 400px;
background-color:white;
overflow: hidden;
border: 1px solid black;
border: 1px solid #A0A0A0;
}
.vsplitbar {
border: 0;
width: 10px;
background-color: #F0F0F0;
border-top: 1px solid black;
border-bottom: 1px solid black;
border-top: 1px solid #A0A0A0;
border-bottom: 1px solid #A0A0A0;
border-left: 1px solid #A0A0A0;
border-right: 1px solid #A0A0A0;
background-image: url(../img/stripes90.gif);
@ -54,6 +54,13 @@
height: 400px;
border-bottom: 2px solid black !important;
}
#replShell pre {
border-top: 1px solid #A0A0A0 !important;
border-right: 1px solid #A0A0A0 !important;
border-left: 0 !important;
border-bottom: 0 !important;
}
/* The inner console element. */
.jqconsole {
background-color: black;

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

@ -1,7 +1,7 @@
<div id="show-collection" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" style="display:none">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3 id="show-collection-name">Collection Info</h3>
<a class="arangoHeader" id="show-collection-name">Collection Info</a>
</div>
<div class="modal-body">

4
html/admin/js/templates/collectionView.ejs
View File

@ -1,7 +1,7 @@
<div id="change-collection" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" style="display:none">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3>Modify Collection</h3>
<a class="arangoHeader">Modify Collection</a>
</div>
<div class="modal-body">
<table>
@ -49,7 +49,7 @@
</table>
</div>
<div id="colFooter" class="modal-footer">
<button id="delete-modified-collection" class="btn btn-danger pull-left">Delete</button>
<button id="delete-modified-collection" class="btn btn-danger">Delete</button>
<button class="btn btn-close btn-margin" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="save-modified-collection" class="btn btn-success pull-right" style="margin-right:8px">Save</button>
</div>

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

@ -1,6 +1,6 @@
<div class="pull-right">
<span id="editCollection" class="ICON glyphicon glyphicon-cog" alt="Edit collection properties" title="Edit collection properties"></span>
<span id="editCollection" class="ICON glyphicon glyphicon-edit" alt="Edit collection properties" title="Edit collection properties"></span>
</div>
<div class="plain">

6
html/admin/js/templates/collectionsView.ejs
View File

@ -89,7 +89,7 @@
</ul>
<ul class="thumbnails">
<div class="containerdivNewLine"/>
</ul>
<div class="thumbnails">
<div class="containerdivNewLine"/>
</div>

4
html/admin/js/templates/documentSourceView.ejs
View File

@ -5,9 +5,9 @@
<div id="sourceDiv">
<ul class="nav nav-tabs arangoTab">
<li class="active pull-right"><a>Sourceview</a></li>
<li class="active pull-right"><a>Source</a></li>
<li class="pull-right">
<a id="tableView">Listview</a>
<a id="tableView">List</a>
</li>
</ul>

4
html/admin/js/templates/documentView.ejs
View File

@ -7,9 +7,9 @@
<div id="tableDiv">
<ul class="nav nav-tabs arangoTab">
<li class="pull-right" ><a id="sourceView">Sourceview</a></li>
<li class="pull-right" ><a id="sourceView">Source</a></li>
<li class="active pull-right">
<a>Listview</a>
<a>List</a>
</li>
</ul>

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

@ -44,7 +44,7 @@
</table>
</div>
<div id="colFooter" class="modal-footer">
<button id="uninstall" class="btn btn-danger pull-left">Uninstall</button>
<button id="uninstall" class="btn btn-danger">Uninstall</button>
<button id="change" class="btn btn-success pull-right" disabled>Save</button>
<%if (attributes.active) {%>
<button id="deactivate" class="btn btn-warning pull-right" style="margin-right:8px" disabled>Deactivate</button>

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

@ -67,7 +67,7 @@
</div>
<div id="colFooter" class="modal-footer">
<button id="save-edit-query" class="btn btn-success pull-right">Save</button>
<button id="delete-edit-query" class="btn btn-danger pull-left">Delete</button>
<button id="delete-edit-query" class="btn btn-danger">Delete</button>
<button class="btn btn-close btn-margin" data-dismiss="modal" aria-hidden="true">Close</button>
</div>
<div class="alert alert-error" style="display:none" id="reallyDeleteQueryDiv">

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

@ -71,7 +71,7 @@ var collectionsView = Backbone.View.extend({
},
toggleView: function() {
$('#collectionsDropdown2').slideToggle(70);
$('#collectionsDropdown2').slideToggle(200);
},
checkSystem: function () {

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

@ -86,7 +86,7 @@ var dashboardView = Backbone.View.extend({
template: new EJS({url: 'js/templates/dashboardView.ejs'}),
toggleEvent: function () {
$('#dashboardDropdownOut').slideToggle(70);
$('#dashboardDropdownOut').slideToggle(200);
},
countCollections: function() {

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

@ -194,7 +194,7 @@ var documentsView = Backbone.View.extend({
},
filterCollection : function () {
$('#filterHeader').slideToggle(70);
$('#filterHeader').slideToggle(200);
$('#importHeader').hide();
var i;
@ -207,7 +207,7 @@ var documentsView = Backbone.View.extend({
},
importCollection: function () {
$('#importHeader').slideToggle(70);
$('#importHeader').slideToggle(200);
$('#filterHeader').hide();
},