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

The general layout is now moved to a single class and the dropdowns have bin unified to one class

This commit is contained in:
Michael Hackstein 2014-02-19 14:36:51 +01:00
parent 5bd7dce8d5
commit a7d0b59aee
31 changed files with 263 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
js/apps/system/aardvark/frontend/css/collectionsView.css
View File

@ -26,33 +26,6 @@
margin-bottom:0;
}
.thumbnails {
margin-left:0px;
padding-left: 0px;
padding-right: 0px;
padding-bottom: 5px;
padding-top: 13px;
}
.thumbnails li {
background-color: rgba(0, 0, 0, 0.05);
/* #f4f3f3; */
}
.thumbnails a.add {
padding:40px 0;
display:block;
font-weight: 400;
text-align:left;
}
.thumbnails .icon {
padding-right:5px;
padding-left: 5px;
padding-top: 10px;
cursor: pointer;
}
.btn-group {
border-radius: 2px 2px 2px 2px !important;
}
@ -101,23 +74,6 @@ input.searchInput {
border-radius: 0 !important;
}
div.headerDropdown {
background-color: white;
position:relative;
display:none;
margin-left: 5px;
margin-right: 5px;
padding-bottom: 15px;
width: auto;
}
div.headerDropdown > div.dropdownInner {
position: relative;
min-height: 125px;
width: auto;
box-shadow: 0 !important;
}
div.dropdownInner > .nav-header {
font-size: 13px;
font-weight: 400;
@ -226,11 +182,6 @@ div.dropdownInner ul li label {
margin-bottom: 30px;
}
#collectionsThumbnailsIn {
background-color: none;
margin-left: -7px;
}
#arangoCollectionsContainer {
padding-bottom: 0 !important;
}

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

@ -71,7 +71,8 @@
width: 300px;
}
.statSingleClient {
li.statSingleClient {
float: none !important;
height: 400px;
padding-bottom: 8px;
width: auto !important;
@ -239,7 +240,6 @@ li:hover h6, li.hover h6 {
/*Dashboard Checkbox*/
.dropdownOut input[type=checkbox].css-checkbox,
.headerDropdown input[type=checkbox].css-checkbox,
#dashboardDropdownOut input[type=checkbox].css-checkbox,
#transparentHeader input[type=checkbox].css-checkbox,
#collectionsDropdown input[type=checkbox].css-checkbox {
@ -247,7 +247,6 @@ li:hover h6, li.hover h6 {
}
.dropdownOut input[type=checkbox].css-checkbox + label.css-label,
.headerDropdown input[type=checkbox].css-checkbox + label.css-label,
#dashboardDropdownOut input[type=checkbox].css-checkbox + label.css-label,
#transparentHeader input[type=checkbox].css-checkbox + label.css-label,
#collectionsDropdown input[type=checkbox].css-checkbox + label.css-label {
@ -263,7 +262,6 @@ li:hover h6, li.hover h6 {
}
.dropdownOut input[type=checkbox].css-checkbox:checked + label.css-label,
.headerDropdown input[type=checkbox].css-checkbox:checked + label.css-label,
#dashboardDropdownOut input[type=checkbox].css-checkbox:checked + label.css-label,
#transparentHeader input[type=checkbox].css-checkbox:checked + label.css-label,
#collectionsDropdown input[type=checkbox].css-checkbox:checked + label.css-label {

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

@ -50,12 +50,6 @@
#tableDiv, #logContent, #documentsDiv, #sourceDiv, #graphManagementDiv {
padding-top: 13px;
padding-right: 5px;
padding-left: 5px;
}
#tableDiv, #logContent {
padding-bottom: 10px;
}
#logContent .tab-content {

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

@ -33,13 +33,10 @@
margin-top: -54px !important;
}
#filterHeader, .arangoDropdownIn, #indexHeaderContent {
.arangoDropdownIn {
margin-left: 5px;
margin-right: 5px;
background-color: white;
}
#filterHeader, .arangoDropdownIn {
padding-top: 10px;
padding-left: 10px;
padding-right: 10px;
@ -47,26 +44,13 @@
position:relative;
}
#confirmDocImport {
margin-right: 0px;
margin-bottom: 11px;
height: 30px;
}
#filterHeader #sendFilter{
margin-right: 0px;
margin-left: 0px;
background-color:#686766;
border-bottom: 1px solid #a0a0a0;
color:#FFF;
padding:0 20px;
position:relative;
float: right;
}
#filterHeader select {
width: 100px;
}
#documentsStatus {
padding-top: 10px;
float:left;
@ -301,12 +285,6 @@
cursor: pointer !important;
}
#filterHeader button {
float: right;
margin-top: 1px;
margin-left: 10px !important;
}
#addFilterItem {
margin-left: 5px;
}
@ -315,15 +293,6 @@
margin-top: 0px !important;
}
#filterHeader input, #filterHeader select, #filterHeader button {
}
#filterHeader select {
margin-left: 10px !important;
margin-right: 10px !important;
}
.readOnlyClass a {
color: black !important;
}

16
js/apps/system/aardvark/frontend/css/dropdowns.css
View File

@ -1,16 +0,0 @@
.dropdownImport {
margin-left: 5px;
margin-right: 5px;
background-color: white;
padding-top: 10px;
padding-left: 10px;
padding-right: 10px;
padding-bottom: 5px;
position:relative;
}
.dropdownImport input {
line-height: 0px;
margin-top: 5px;
margin-bottom: -15px;
}

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

@ -1,13 +1,3 @@
/* Sets the default values shared for content views*/
#content {
/*background-color: rgba(0, 0, 0, 0.0675);*/
background-color: #D6D6D6;
min-height: 80px;
height: 100%;
width: 100%;
margin-left: 0;
}
div.content {
padding-top: 13px;
padding-left: 5px;

1
js/apps/system/aardvark/frontend/css/graphlayout.css
View File

@ -38,7 +38,6 @@ img.searchSubmit {
.toolbox {
position: absolute;
left: 5px;
margin-right: 5px;
border-radius: 0px !important;
-webkit-border-radius: 0px !important;

3
js/apps/system/aardvark/frontend/css/headerBar.css
View File

@ -1,9 +1,6 @@
/* The bar on top of each page */
div.headerBar {
position: relative;
margin-top: 5px;
margin-left: 5px;
margin-right: 5px;
margin-bottom: 5px;
background-color: #686766;
color: #FFFFFF;

9
js/apps/system/aardvark/frontend/css/queryView.css
View File

@ -51,15 +51,6 @@
margin-bottom: 5px;
}
#queryDiv {
margin-top: 0px !important;
padding-top: 6px !important;
padding-left: 5px;
padding-right: 5px;
padding-bottom: 20px !important;
background-color: transparent;
}
#outputToolbar span, #editorToolbar span {
position: relative;
margin-right: 5px;

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

@ -6,13 +6,7 @@
}
#shell_workspace {
width: auto;
margin-top: 13px;
margin-left: 5px;
margin-right: 5px !important;
margin-bottom: -25px;
height: 400px;
background-color: black;
}
.vsplitbar {

2
js/apps/system/aardvark/frontend/html/body.html.part
View File

@ -14,7 +14,7 @@
</nav>
<div class="centralRow resizecontainer">
<div id="content" class="span12"></div>
<div id="content" class="centralContent"></div>
</div>
<div id="modalPlaceholder">

2
js/apps/system/aardvark/frontend/js/graphViewer/ui/graphViewerUI.js
View File

@ -434,7 +434,7 @@ function GraphViewerUI(container, adapterConfig, optWidth, optHeight, viewerConf
};
container.appendChild(menubar);
container.appendChild(background);
background.className = "thumbnails gv_background ";
background.className = "contentDiv gv_background ";
background.id = "background";
viewerConfig = viewerConfig || {};

32
js/apps/system/aardvark/frontend/js/templates/applicationsView.ejs
View File

@ -1,8 +1,6 @@
<ul class="thumbnails2">
<div class="headerBar">
<div class="pull-left">
<a class="arangoHeader">Applications</a>
</div>
<a class="arangoHeader">Applications</a>
<div class="headerButtonBar pull-right">
<ul class="headerButtonList">
@ -63,19 +61,19 @@
</ul>
<ul class="thumbnails foxxList">
<li id="installed" class="span12 applicationList">
<div class="boxHeader applicationListHeader">
<i id="toggleInstalled" class="pull-right icon-minus icon-white toggle-icon"></i>
<h5>Active or Installed</h5>
<div class="contentDiv">
<div id="installed">
<div class="headerBar">
<!-- <i id="toggleInstalled" class="pull-right icon-minus icon-white toggle-icon"></i> -->
<a class="arangoHeader">Active</a>
</div>
<div id="installedList"></div>
</li>
<li id="available" class="span12 applicationList">
<div class="boxHeader applicationListHeader">
<i id="toggleAvailable" class="pull-right icon-minus icon-white toggle-icon"></i>
<h5>Available</h5>
<ul id="installedList" class="tileList"></ul>
</div>
<div id="available">
<div class="headerBar">
<!-- <i id="toggleAvailable" class="pull-right icon-minus icon-white toggle-icon"></i> -->
<a class="arangoHeader">Available</a>
</div>
<div id="availableList"></div>
</li>
</ul>
<ul id="availableList" class="tileList"></ul>
</div>
</div>

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

@ -94,8 +94,8 @@
</ul>
<div class="thumbnails" id="arangoCollectionsContainer">
<div class="contentDiv" id="arangoCollectionsContainer">
<div class="containerdivNewLine"/>
<div id="collectionsThumbnailsIn"/>
<ul id="collectionsThumbnailsIn" class="tileList" />
</div>

2
js/apps/system/aardvark/frontend/js/templates/dashboardView.ejs
View File

@ -45,7 +45,7 @@
<!--<div id="clearDashboard" class="containerdivNewLine"></div>--!>
</ul>
<ul class="thumbnails dashboardContent">
<ul class="contentDiv">
<ul class="nav nav-tabs arangoTab">
<li class="active dashSwitch" id="statSwitch"><a>Statistics</a></li>

2
js/apps/system/aardvark/frontend/js/templates/databaseView.ejs
View File

@ -4,7 +4,7 @@
</div>
</ul>
<div class="thumbnails contentDiv">
<div class="contentDiv">
<table id="databaseTable" class="arangoDataTable contentTables">
<thead>
<tr>

8
js/apps/system/aardvark/frontend/js/templates/documentsView.ejs
View File

@ -37,9 +37,9 @@
</ul>
<div class="arangoDropdown">
<div id="filterHeader" style="display:none">
<div id="filterHeader" class="headerDropdown">
<div class="queryline">
<input id="attribute_name0" type="text" placeholder="Attribute name"><select name="operator" id="operator0">
<input id="attribute_name0" type="text" placeholder="Attribute name"><select name="operator" id="operator0" class="filterSelect">
<option value="==">==</option>
<option value="!=">!=</option>
<option value="&lt;">&lt;</option>
@ -53,7 +53,7 @@
</div>
</div>
<div id="importHeader" class="dropdownImport" style="display:none">
<div id="importHeader" class="dropdownImport">
<div class="queryline">
<input id="importDocuments" name="importDocuments" type="file" accept="application/json" />
<button id="confirmDocImport" class="btn btn-success btn-old-padding" style="float:right">
@ -62,7 +62,7 @@
</div>
</div>
<div id="indexHeader"class="dropdownIn" style="display:none">
<div id="indexHeader" class="headerDropdown">
<div class="contentIn" id="indexHeaderContent">
<div id="indexEditView">
<a>Indexes:</a>

2
js/apps/system/aardvark/frontend/js/templates/foxxListView.ejs
View File

@ -12,5 +12,5 @@
</ul>
<ul class="thumbnails foxxList" id="foxxList">
<ul class="contentDiv" id="foxxList">
</ul>

2
js/apps/system/aardvark/frontend/js/templates/manageGraphsView.ejs
View File

@ -27,7 +27,7 @@
</div>
</div>
<div id="graphManagementDiv" class="thumbnails">
<div id="graphManagementDiv" class="contentDiv">
<div id="graphTable_wrapper" class="dataTables_wrapper" role="grid">
<table cellpadding="0" cellspacing="0" border="0" class="display arangoDataTable dataTable noPointer" id="graphsTable">

2
js/apps/system/aardvark/frontend/js/templates/queryView.ejs
View File

@ -66,7 +66,7 @@
<span class="icon_arangodb icon_arangodb_trash queryTooltips" title="Clear" id="clearOutput"></span>
<span class="icon_arangodb icon_arangodb_arrow1 queryTooltips" title="Unfold" id="bigOutput"></span>
</div>
<div id="queryOutput" class="thumbnail">
<div id="queryOutput" class="contentDiv">
</div>
<div id="shortcutDiv">
<b>Submit:</b> CTRL/CMD + Return ; <b>Undo:</b> CTRL/CMD + Z ; <b>Redo:</b> CTRL/CMD + SHIFT + Z ;

2
js/apps/system/aardvark/frontend/js/templates/userManagementView.ejs
View File

@ -4,7 +4,7 @@
</div>
</ul>
<div class="thumbnails contentDiv">
<div class="contentDiv">
<table id="userManagementTable" class="arangoDataTable contentTables">
<thead>
<tr>

1
js/apps/system/aardvark/frontend/js/views/collectionsView.js
View File

@ -5,7 +5,6 @@
"use strict";
window.CollectionsView = Backbone.View.extend({
el: '#content',
/*el2: '.thumbnails',*/
el2: '#collectionsThumbnailsIn',
searchTimeout: null,

2
js/apps/system/aardvark/frontend/js/views/documentsView.js
View File

@ -290,7 +290,7 @@
$('#filterHeader').append(' <div class="queryline querylineAdd">'+
'<input id="attribute_name' + num +
'" type="text" placeholder="Attribute name">'+
'<select name="operator" id="operator' + num + '">'+
'<select name="operator" id="operator' + num + '" class="filterSelect">'+
' <option value="==">==</option>'+
' <option value="!=">!=</option>'+
' <option value="&lt;">&lt;</option>'+

11
js/apps/system/aardvark/frontend/scss/_abstracts.scss
View File

@ -6,6 +6,17 @@
float: right;
}
%clear-float {
&:after {
clear: both;
content: ".";
display: block;
font-size: 0px;
height: 0px;
visibility: hidden;
}
}
%clickable {
cursor: pointer;
}

5
js/apps/system/aardvark/frontend/scss/_contentTables.scss
View File

@ -1,8 +1,3 @@
//#databaseDiv => .contentDiv
.contentDiv {
padding: 13px 5px 0px 5px;
}
//.databaseButtons => .contentButtons
.contentButtons {
clear:both;

64
js/apps/system/aardvark/frontend/scss/_dropdowns.scss Normal file
View File

@ -0,0 +1,64 @@
div.headerDropdown {
background-color: $c_white;
position:relative;
display:none;
padding: 10px;
width: auto;
& > div.dropdownInner {
position: relative;
min-height: 125px;
width: auto;
box-shadow: 0;
}
&.headerDropdown input[type=checkbox].css-checkbox {
display:none;
& + label.css-label {
@extend %clickable;
padding-left:20px;
margin-top: 0px;
height:15px;
display:inline-block;
background-repeat:no-repeat;
background-position: 0 0;
font-size:15px;
vertical-align:middle;
}
&:checked + label.css-label {
background-position: 0 -15px;
}
}
}
div.dropdownImport {
display:none;
background-color: $c_white;
padding-top: 10px;
padding-left: 10px;
padding-right: 10px;
padding-bottom: 5px;
position:relative;
input {
line-height: 0px;
margin-top: 5px;
margin-bottom: -15px;
}
}
select.filterSelect {
width: 100px;
margin-left: 10px;
margin-right: 10px;
}
//TODO Le fix
#filterHeader button {
float: right;
margin-top: 1px;
margin-left: 10px !important;
}

3
js/apps/system/aardvark/frontend/scss/_headerBar.scss
View File

@ -1,9 +1,6 @@
// The bar on top of each page
div.headerBar {
position: relative;
margin-top: 5px;
margin-left: 5px;
margin-right: 5px;
margin-bottom: 5px;
background-color: $c_bar_bg;
color: $c_white;

66
js/apps/system/aardvark/frontend/scss/_resizing.scss
View File

@ -1,14 +1,6 @@
div.resizecontainer {
@extend %clear-float;
margin: 0px auto;
&:after {
clear: both;
content: ".";
display: block;
font-size: 0px;
height: 0px;
visibility: hidden;
}
}
@media (max-width: 798px) {
@ -51,3 +43,59 @@ div.centralRow {
bottom: 65px;
}
}
div.centralContent {
padding: 5px;
width: 100%;
height: 100%;
background-color: $c_content_transp;
min-height: 80px;
float: left;
}
//#databaseDiv => .contentDiv
.contentDiv {
// margin-left:0px;
// margin-left: -20px;
// padding-bottom: 5px;
padding: 13px 0px 0px 0px;
list-style: none;
*zoom: 1;
li {
background-color: rgba(0, 0, 0, 0.05);
// #f4f3f3;
// From Bootstrap thumbnails
float: left;
// margin-bottom: 20px;
// margin-left: 20px;
}
a.add {
padding: 40px 0;
display: block;
font-weight: 400;
text-align: left;
}
.icon {
@extend %clickable;
padding: {
right:5px;
left: 5px;
top: 10px;
}
}
&:after {
clear: both;
}
&:after, &:before {
display: table;
line-height: 0;
content: "";
}
}

7
js/apps/system/aardvark/frontend/scss/_tiles.scss
View File

@ -1,8 +1,9 @@
div#collectionsThumbnailsIn {
margin-left: 0px;
ul.tileList {
@extend %clear-float;
margin-left: -6px;
margin-right: -6px;
}
li.tile {
@extend %pull-left;
position:relative;

104
js/apps/system/aardvark/frontend/scss/generated.css
View File

@ -9,7 +9,15 @@ ul.link-dropdown-menu, ul.user-dropdown-menu, div.navlogo, ul.navlist li, div.fo
div.navmenu, div.footer-right, li.tile div.iconSet span {
float: right; }
li.tile div.iconSet span, .contentTables tr.contentRowInactive a {
div.resizecontainer:after, ul.tileList:after {
clear: both;
content: ".";
display: block;
font-size: 0px;
height: 0px;
visibility: hidden; }
.contentDiv .icon, li.tile div.iconSet span, .contentTables tr.contentRowInactive a, div.headerDropdown.headerDropdown input[type=checkbox].css-checkbox + label.css-label {
cursor: pointer; }
nav.navbar, footer.footer {
@ -90,13 +98,6 @@ ul.link-dropdown-menu, ul.user-dropdown-menu {
div.resizecontainer {
margin: 0px auto; }
div.resizecontainer:after {
clear: both;
content: ".";
display: block;
font-size: 0px;
height: 0px;
visibility: hidden; }
@media (max-width: 798px) {
#arangoCollectionUl {
@ -154,6 +155,37 @@ div.centralRow {
margin-top: 65px;
margin-bottom: 65px; }
div.centralContent {
padding: 5px;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.0675);
min-height: 80px;
float: left; }
.contentDiv {
padding: 13px 0px 0px 0px;
list-style: none;
*zoom: 1; }
.contentDiv li {
background-color: rgba(0, 0, 0, 0.05);
float: left; }
.contentDiv a.add {
padding: 40px 0;
display: block;
font-weight: 400;
text-align: left; }
.contentDiv .icon {
padding-right: 5px;
padding-left: 5px;
padding-top: 10px; }
.contentDiv:after {
clear: both; }
.contentDiv:after, .contentDiv:before {
display: table;
line-height: 0;
content: ""; }
nav.navbar {
top: 0px;
height: 34px;
@ -191,8 +223,9 @@ footer.footer {
padding-bottom: 10px;
margin-bottom: 0; }
div#collectionsThumbnailsIn {
margin-left: 0px; }
ul.tileList {
margin-left: -6px;
margin-right: -6px; }
li.tile {
position: relative;
@ -323,9 +356,6 @@ li.tile {
color: white;
margin-left: 5px; }
.contentDiv {
padding: 13px 5px 0px 5px; }
.contentButtons {
clear: both;
width: 100%;
@ -372,3 +402,51 @@ li.tile {
.createModalDialog table {
width: 100%; }
div.headerDropdown {
background-color: white;
position: relative;
display: none;
padding: 10px;
width: auto; }
div.headerDropdown > div.dropdownInner {
position: relative;
min-height: 125px;
width: auto;
box-shadow: 0; }
div.headerDropdown.headerDropdown input[type=checkbox].css-checkbox {
display: none; }
div.headerDropdown.headerDropdown input[type=checkbox].css-checkbox + label.css-label {
padding-left: 20px;
margin-top: 0px;
height: 15px;
display: inline-block;
background-repeat: no-repeat;
background-position: 0 0;
font-size: 15px;
vertical-align: middle; }
div.headerDropdown.headerDropdown input[type=checkbox].css-checkbox:checked + label.css-label {
background-position: 0 -15px; }
div.dropdownImport {
display: none;
background-color: white;
padding-top: 10px;
padding-left: 10px;
padding-right: 10px;
padding-bottom: 5px;
position: relative; }
div.dropdownImport input {
line-height: 0px;
margin-top: 5px;
margin-bottom: -15px; }
select.filterSelect {
width: 100px;
margin-left: 10px;
margin-right: 10px; }
#filterHeader button {
float: right;
margin-top: 1px;
margin-left: 10px !important; }

2
js/apps/system/aardvark/frontend/scss/style.scss
View File

@ -22,3 +22,5 @@
@import "notification";
//contentTables
@import "contentTables";
// Dropdown menu
@import "dropdowns";