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

Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding

This commit is contained in:
Max Neunhoeffer 2014-02-28 15:38:51 +01:00
parent 7544adcc8d 0ec595162f
commit 75890f183a
4 changed files with 97 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/apps/system/aardvark/clusterFrontend/js/templates/clusterDown.ejs
View File

@ -5,7 +5,19 @@
</div>
</ul>
<div id="relaunchCluster">relaunchCluster</div>
<div id="editPlan">editPlan</div>
<div id="deletePlan">deletePlan</div>
<div class="clusterDownBtn">
<button class="green" id="relaunchCluster">
Relaunch Cluster
</button>
</div>
<div class="clusterDownBtn">
<button id="editPlan">
Edit Cluster Plan
</button>
</div>
<div class="clusterDownBtn">
<button id="deletePlan">
Delete Cluster Plan
</button>
</div>
</script>

9
js/apps/system/aardvark/frontend/js/routers/startApp.js
View File

@ -4,15 +4,6 @@
(function() {
"use strict";
$.get("cluster/amIDispatcher", function(data) {
if (data) {
var url = window.location.origin;
url += window.location.pathname;
url = url.replace("index", "cluster");
window.location.replace(url);
}
});
$(document).ready(function() {
window.App = new window.Router();
Backbone.history.start();

36
js/apps/system/aardvark/frontend/scss/_buttons.scss
View File

@ -322,3 +322,39 @@ button.btn-server {
width: 120px;
}
.clusterDownBtn {
padding-top: 10px;
padding-bottom: 10px;
text-align: center;
button {
background-color: #f1f1f1;
color: #333333;
padding: 12px 18px;
margin: 0px;
border: 1px solid rgba(0,0,0,0.1875);
border-radius: 3px;
text-decoration: none !important;
font-size: 20px;
font-weight: 300;
width: 250px;
text-align: center;
cursor: auto;
&:hover{
color: #4a6c30;
background-color: #e8e8e8;
-webkit-transition-delay: 0s;
-webkit-transition-duration: 0.2s;
-webkit-transition-property: all;
-webkit-transition-timing-function: ease-in;
}
}
button.green {
@extend button;
color: $c_white;
background-color: #617e2b;
&:hover{
background-color: #8ba142;
}
}
;
}

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

@ -327,7 +327,7 @@ h6.gv_icon_icon {
h6.gv_button_title {
bottom: 1px; }
button.graphViewer-icon-button {
button.graphViewer-icon-button, .clusterDownBtn button.graphViewer-icon-button.green {
border: medium none;
width: 20px;
height: 20px;
@ -336,24 +336,24 @@ button.graphViewer-icon-button {
padding: 0px;
background-color: transparent; }
button.graphViewer-icon-button > img {
button.graphViewer-icon-button > img, .clusterDownBtn button.graphViewer-icon-button.green > img {
width: 20px;
height: 20px;
padding-bottom: 10px; }
button.gv_dropdown_entry {
button.gv_dropdown_entry, .clusterDownBtn button.gv_dropdown_entry.green {
width: 160px;
height: 30px;
margin: 4px 4px 4px 30px; }
button.gv_context_button {
button.gv_context_button, .clusterDownBtn button.gv_context_button.green {
width: 65px; }
.btn-icon {
padding: 4px 4px;
background-color: #383434; }
button.gv-icon-small {
button.gv-icon-small, .clusterDownBtn button.gv-icon-small.green {
background-size: 16px 16px;
width: 16px;
height: 16px; }
@ -364,7 +364,7 @@ button.gv-icon-small.delete {
button.gv-icon-small.add {
background-image: url("../img/plus_icon.png"); }
button.gv-icon-btn {
button.gv-icon-btn, .clusterDownBtn button.gv-icon-btn.green {
width: 36px;
height: 36px;
background-size: 36px 36px;
@ -378,7 +378,7 @@ button.gv-icon-btn.active {
button.btn-zoom:hover {
background: inherit; }
button.btn-zoom {
button.btn-zoom, .clusterDownBtn button.btn-zoom.green {
width: 16px;
height: 16px;
padding: 0px;
@ -386,23 +386,23 @@ button.btn-zoom {
position: absolute;
background: none; }
button.btn-zoom-top {
button.btn-zoom-top, .clusterDownBtn button.btn-zoom-top.green {
left: 13px;
top: 0px; }
button.btn-zoom-left {
button.btn-zoom-left, .clusterDownBtn button.btn-zoom-left.green {
left: 0px;
top: 12px; }
button.btn-zoom-bottom {
button.btn-zoom-bottom, .clusterDownBtn button.btn-zoom-bottom.green {
left: 13px;
top: 24px; }
button.btn-zoom-right {
button.btn-zoom-right, .clusterDownBtn button.btn-zoom-right.green {
right: 0px;
top: 12px; }
button.gv-zoom-btn {
button.gv-zoom-btn, .clusterDownBtn button.gv-zoom-btn.green {
width: 14px;
height: 14px;
background-size: 14px 14px;
@ -440,7 +440,7 @@ ul.arangoPagination a {
.modal-body th.actionCell > button {
margin-top: -12px; }
button {
button, .clusterDownBtn button.green {
font-family: 'Open Sans', sans-serif !important; }
.btn-old-padding {
@ -451,12 +451,42 @@ button {
background-color: #736b68; }
/* Cluster View */
button.btn-overview, button.btn-server {
button.btn-overview, .clusterDownBtn button.btn-overview.green, button.btn-server, .clusterDownBtn button.btn-server.green {
margin: 5px; }
button.btn-server {
button.btn-server, .clusterDownBtn button.btn-server.green {
width: 120px; }
.clusterDownBtn {
padding-top: 10px;
padding-bottom: 10px;
text-align: center; }
.clusterDownBtn button, .clusterDownBtn button.green {
background-color: #f1f1f1;
color: #333333;
padding: 12px 18px;
margin: 0px;
border: 1px solid rgba(0, 0, 0, 0.1875);
border-radius: 3px;
text-decoration: none !important;
font-size: 20px;
font-weight: 300;
width: 250px;
text-align: center;
cursor: auto; }
.clusterDownBtn button:hover {
color: #4a6c30;
background-color: #e8e8e8;
-webkit-transition-delay: 0s;
-webkit-transition-duration: 0.2s;
-webkit-transition-property: all;
-webkit-transition-timing-function: ease-in; }
.clusterDownBtn button.green {
color: white;
background-color: #617e2b; }
.clusterDownBtn button.green:hover {
background-color: #8ba142; }
ul.tileList {
margin-left: -6px;
margin-right: -6px; }
@ -816,7 +846,7 @@ select.filterSelect {
white-space: normal;
word-wrap: break-word; }
.fixedDropdown button {
.fixedDropdown button, .fixedDropdown .clusterDownBtn button.green, .clusterDownBtn .fixedDropdown button.green {
float: right;
margin-right: 5px; }