Skip to content
This repository has been archived by the owner on Apr 22, 2024. It is now read-only.

Commit

Permalink
Merge b73d9ec into 781855c
Browse files Browse the repository at this point in the history
  • Loading branch information
valessiobrito committed Jun 13, 2017
2 parents 781855c + b73d9ec commit 39c5951
Show file tree
Hide file tree
Showing 16 changed files with 352 additions and 184 deletions.
279 changes: 143 additions & 136 deletions kytos/web-ui/index.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion kytos/web-ui/static/js/kytos-helper.js
Expand Up @@ -23,7 +23,7 @@ function scrollBehavior(){
}

;(function() {
api_led = $('.nav.sidebar .api-status');
api_led = $('#statusicons .api-status');
function update_api_status(){
$.get(api_status)
.done(function() {
Expand Down
2 changes: 1 addition & 1 deletion kytos/web-ui/static/js/kytos-logs.js
Expand Up @@ -50,7 +50,7 @@
}
})

var ws_led = $('.nav.sidebar .websocket-status')
var ws_led = $('#statusicons .websocket-status')

function turn_on_led(){
ws_led.addClass('status-online');
Expand Down
10 changes: 7 additions & 3 deletions kytos/web-ui/static/js/kytos-sidebar.js
@@ -1,9 +1,13 @@
;(function(){
$(".left-nav-toggle").click(function(e){
$(".right-nav-toggle").click(function(e){
e.stopPropagation();
e.preventDefault();
$('.nav.sidebar').toggleClass('hidden');
$('.navbar-header').toggleClass('hidden');
$('#sidebar-right').toggleClass('hidden');
// $('.navbar-header').toggleClass('hidden');
$('#terminal').toggleClass('with-out-left-bar')
});
}());

$(function () {
$('[data-top="tooltip"]').tooltip()
})
2 changes: 1 addition & 1 deletion kytos/web-ui/static/js/main.js
Expand Up @@ -12,7 +12,7 @@ function update_tabs_sizes(){

$(".terminal").kterminal();

$("[type='checkbox'], [type='radio']").bootstrapSwitch();
$("[data-type='checkbox'], [type='radio']").bootstrapSwitch();

$("a,div").focus(function(){
$(this).blur();
Expand Down
Expand Up @@ -31,7 +31,7 @@
.dropdown-menu {
position: absolute;
top: 100%;
left: 0;
// left: 0;
z-index: $zindex-dropdown;
display: none; // none by default, but block on "open" of the menu
float: left;
Expand Down
Expand Up @@ -230,7 +230,7 @@ input[type="search"] {

label {
min-height: $line-height-computed; // Ensure the input doesn't jump when there is no text
padding-left: 20px;
padding-left: 5px;
margin-bottom: 0;
font-weight: normal;
cursor: pointer;
Expand All @@ -255,7 +255,7 @@ input[type="search"] {
.checkbox-inline {
position: relative;
display: inline-block;
padding-left: 20px;
margin-left: 20px;
margin-bottom: 0;
vertical-align: middle;
font-weight: normal;
Expand Down
Expand Up @@ -13,6 +13,7 @@
min-height: $navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)
margin-bottom: $navbar-margin-bottom;
border: 1px solid transparent;
box-shadow: none;

// Prevent floats from breaking the navbar
@include clearfix;
Expand Down
Expand Up @@ -362,7 +362,7 @@ $container-lg: $container-large-desktop !default;
//##

// Basics of a navbar
$navbar-height: 50px !default;
$navbar-height: 20px !default;
$navbar-margin-bottom: $line-height-computed !default;
$navbar-border-radius: $border-radius-base !default;
$navbar-padding-horizontal: floor(($grid-gutter-width / 2)) !default;
Expand Down
5 changes: 3 additions & 2 deletions web-ui-src/sass/kytos/stylesheets/_content.scss
@@ -1,11 +1,12 @@
.content{
@include kytos-anim-easing(300ms);
margin-top: 0;
margin-left: 200px;
// margin-left: 200px;
position: relative;
padding: 0;
color : #fff;
@media (max-width: $screen-sm-max) {
margin-left: 100px;
// margin-left: 100px;
}
}

124 changes: 124 additions & 0 deletions web-ui-src/sass/kytos/stylesheets/_controls.scss
@@ -0,0 +1,124 @@

#controlsKytos {
color: #DFDFDF;

.help {
display: none;
}

label {
color: #545454;
}

.btn-kytos-default {
height: 25px;
width: 25px;
padding: 0px;
font-size: 1em;
color: #EEE;
border: 1px solid #554077;
border-radius: 0px;
background: #554077;
}

.checkbox { display: inline; }

.checkbox input[type="checkbox"] {
opacity: 0;
z-index: 1;
cursor: pointer;
}

.checkbox label::before {
height: 25px;
width: 25px;
padding: 5px;
font-size: 1em;
border: 1px solid #554077;
color: #EEE;
background: #554077;
}

.checkbox label:hover::before {
border-color: #FFF;
color: #FFF;
background: #554077;
}

.checkbox input[checked="checked"] + label::before {
border-color: #DFDFDF;
color: #554077;
background: #DFDFDF !important;
}

/* Icons to Control Kytos */
#f06e::before { font-family: "FontAwesome"; content: "\f06e"; }
#f071::before { font-family: "FontAwesome"; content: "\f071"; }
#f1e6::before { font-family: "FontAwesome"; content: "\f1e6"; }
#f279::before { font-family: "FontAwesome"; content: "\f279"; }

} /* end #controlsKytos */

#settingsLayouts .right {
float: left;
margin: 0;
}

#savedLayouts {
margin-left: 40px;
}

.ui-tooltip,
#settingsLayouts:hover p.help {
display: block;
position: absolute;
color: #FFF;
background: #000;
padding: 0.5em;
margin: 0.5em;
text-align: center;
opacity: 0.5;
border-radius: 3px;
}

#settingsLayouts .btn-kytos-default:hover {
border-color: #FFF;
color: #FFF;
}

#settingsLayouts .btn-kytos-default:active {
border-color: #FFF;
color: #554077;
background-color: #FFF;
}

.input-kytos-default {
color: #DFDFDF;
background: #191A1A;
border: 1px solid #554077;
min-width: 110px;
min-height: 25px;
}

.input-kytos-default:focus,
.input-kytos-default:active,
.input-kytos-default:hover {
color: #DFDFDF;
background: #000;
border: 1px solid #DFDFDF;
}

.ui-helper-hidden-accessible {
display: none;
}

.group-kytos {
background: rgba(0, 0, 0, 0.5);
width: auto;
float: left;
padding: 4px;
}

#settingsMaps .group-kytos {
padding-right: 20px;
}
7 changes: 4 additions & 3 deletions web-ui-src/sass/kytos/stylesheets/_sidebar.scss
@@ -1,9 +1,10 @@
.sidebar {
width: 200px;
position: fixed;
top: 51px;
bottom: 0;
left: 0;
top: 30px;
bottom: auto;
max-height: 400px;
right: 0;
z-index: 1000;
display: block;
padding: 20px;
Expand Down
50 changes: 45 additions & 5 deletions web-ui-src/sass/kytos/stylesheets/_terminal.scss
Expand Up @@ -3,26 +3,49 @@
font-size: 11px;
border: 0;
margin-top: 0;
margin-left: 200px;
padding: 0;
width: calc(100% - 200px);
width: 100%;
position: fixed;
bottom: 0;
right: 0;
height: 280px;
color: #adadad;
z-index: 100;
@media (max-width: $screen-sm-max) {
margin-left: 100px;
width: calc(100% - 102px);
// margin-left: 100px;
// width: calc(100% - 102px);
}

#statusicons {
position: absolute;
top: -50px;
right: 0px;
padding-right: 20px;
}

.api-status,
.websocket-status {
padding: 10px;
height: 20px;
}

.status-online {
color: rgba(171,255,0,0.9);
text-shadow: 1px 1px 2px black, 0 0 1em rgba(171,255,0,0.5), 0 0 0.2em rgba(171,255,0,0.5);
}

.status-offline {
color: rgba(255,0,0,0.9);
text-shadow: 1px 1px 2px black, 0 0 1em rgba(255,0,0,0.5), 0 0 0.2em rgba(255,0,0,0.5);
}

&.closed {
display: none;
}

&.maximized {
height: calc(100vh - 61px);
height: calc(100vh);
z-index: 9999;
#tab_logs {
height: 600px;
max-height: 600px;
Expand All @@ -33,6 +56,11 @@
&.minimized {
height: 30px;

#statusicons {
background: #111;
padding-bottom: 10px;
}

.terminal-actions {
a.terminal-max,
a.terminal-min {
Expand All @@ -53,6 +81,17 @@
height: 245px;
padding-bottom : 20px;
overflow-y: scroll;

#button_log {
display: block;
position: absolute;
right: 30px;
bottom: 0px;
line-height: 2em;
background: #000;
padding: 0.5em;
padding-left: 25px;
}
}

.terminal-header {
Expand Down Expand Up @@ -162,3 +201,4 @@
align-items: center;
align-self: center;
}

0 comments on commit 39c5951

Please sign in to comment.