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 

Conflicts:
	frontend/js/views/collectionsView.js
This commit is contained in:
Jan Steemann 2013-02-26 13:54:15 +01:00
parent 58b6cd601b 22fde46f62
commit 5660f007b6
10 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/css/collectionsItemView.css
View File

@ -20,7 +20,6 @@
}
.span3 a {
color: black;
border: 0;
box-shadow: 0 0 0 !important;
}

6
frontend/css/collectionsView.css
View File

@ -59,7 +59,7 @@
margin-top: 3px;
padding: 2px;
vertical-align: middle;
width:280px;
}
#searchSubmit {
@ -106,6 +106,10 @@
margin:5px 0;
}
#transparentHeader .pagination ul > li > a {
font-size:1.8em;
}
#transparentHeader .btn-group {
margin-top:4px;
}

5
frontend/css/documentSourceView.css
View File

@ -22,9 +22,12 @@
}
#sourceDiv {
margin-top: 10px;
margin-top: -40px;
padding: 20px 20px 20px 20px;
min-height: 400px;
position: relative;
z-index: 900;
/* background-color: rgba(0, 0, 0, 0.05);*/
}

10
frontend/css/documentView.css
View File

@ -1,17 +1,13 @@
#tableDiv {
margin-top: 10px;
margin-top: -40px;
padding: 20px 20px 20px 20px;
background-color: rgba(0, 0, 0, 0.05);
position: relative;
z-index: 900;
}
#addDocumentLine, #sourceView {
margin-right: 10px;
margin-right: 22px;
opacity: 0.3;
}
#addDocumentLine:hover, #sourceView:hover{
opacity: 0.8;
cursor: pointer;
}

5
frontend/css/layout.css
View File

@ -34,6 +34,11 @@ body {
width: 100%;
}
.form-actions {
background-color: #FFFFFF;
border:none;
}
/* ICONS */
.icon-info-sign:hover {
cursor: pointer;

BIN
frontend/img/icons_arango.psd Normal file
View File

Binary file not shown.

BIN
frontend/img/plus_icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

23
frontend/js/templates/collectionsItemView.ejs
View File

@ -1,14 +1,17 @@
<a href="#collection/<%= attributes.name %>/documents/1" class="thumbnail plain">
<img src="<%= attributes.picture %>" height="60" width="60" alt="" class="icon">
<span class="badge badge-success <%= attributes.status %>"><div class="cornered"><%= attributes.status %></div></span>
<h5 class="collectionName">
<a href="#collection/<%= attributes.id %>" class="pull-right" style="width:14px; height:14px;">
<i class="icon-info-sign icon-white"></i>
</a>
<div class="pull-left"><%= attributes.name %></div>
</h5>
<div class="pull-right">
<a href="#collection/<%= attributes.id %>">
<i class="icon-info-sign"></i>
</a>
</div>
<a href="#collection/<%= attributes.name %>/documents/1" class="plain">
<img src="img/icon_arango.png" height="60" width="60" alt="" class="icon">
<span class="badge badge-success"><div class="cornered"><%= attributes.status %></div></span>
<h5 class="collectionName">
<div class="pull-left"><%= attributes.name %></div>
</h5>
</a>
</a>

6
frontend/js/templates/collectionsView.ejs
View File

@ -3,8 +3,8 @@
<!-- /btn-group -->
<div class="btn-group pull-right">
<button class="btn btn-small">Filter:</button>
<button data-toggle="dropdown" class="btn btn-small dropdown-toggle"><span class="caret"></span></button>
<button class="btn btn-inverse btn-small">Filter:</button>
<button data-toggle="dropdown" class="btn btn-inverse btn-small dropdown-toggle"><span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="#"><label class="checkbox"><input type="checkbox" id="checkSystem">System</label></a></li>
@ -16,7 +16,7 @@
<div id="transparentPlaceholder">
<input type="text" id="searchInput" class="searchInput" placeholder="Search..."><img id="searchSubmit" width="16" height="16" src="/_admin/html/img/enter_icon.png" style="padding:0;">
<input type="text" id="searchInput" class="searchInput" placeholder="Search..."><img id="searchSubmit" width="16" height="16" src="/_admin/html/img/enter_icon.png">
</div>

5
frontend/js/templates/documentSourceView.ejs
View File

@ -12,8 +12,11 @@
</ul>
<div id="sourceEditor">
</div>
<div class="form-actions">
<a href="#" class="btn btn-primary pull-right">Save</a>
</div>
</div>