1
0
mirror of https://github.com/dkmstr/openuds.git synced 2024-12-22 13:34:04 +03:00

Updating look&feel of admin dashboard

This commit is contained in:
Adolfo Gómez García 2015-09-22 04:13:15 +02:00
parent 1187c0aa5e
commit 9804678a30
14 changed files with 499 additions and 292 deletions

0
server/src/uds/static/adm/css/TableTools.css Executable file → Normal file
View File

View File

@ -27,13 +27,13 @@
.bootstrap-touchspin .input-group-btn-vertical .bootstrap-touchspin-up {
border-radius: 0;
border-top-right-radius: 4px;
border-top-right-radius: 0px;
}
.bootstrap-touchspin .input-group-btn-vertical .bootstrap-touchspin-down {
margin-top: -2px;
border-radius: 0;
border-bottom-right-radius: 4px;
border-bottom-right-radius: 0px;
}
.bootstrap-touchspin .input-group-btn-vertical i {

File diff suppressed because one or more lines are too long

View File

@ -264,27 +264,27 @@
sel = @fnGetSelectedData()
enable = (if sel.length is 1 then onCheck("edit", sel) else false)
if enable
$(btn).removeClass("disabled").addClass "btn3d-success"
$(btn).removeClass("disabled").addClass "btn-success"
else
$(btn).removeClass("btn3d-success").addClass "disabled"
$(btn).removeClass("btn-success").addClass "disabled"
return
deleteSelected = (btn, obj, node) ->
sel = @fnGetSelectedData()
enable = (if sel.length is 1 then onCheck("delete", sel) else false)
if enable
$(btn).removeClass("disabled").addClass "btn3d-danger"
$(btn).removeClass("disabled").addClass "btn-danger"
else
$(btn).removeClass("btn3d-danger").addClass "disabled"
$(btn).removeClass("btn-danger").addClass "disabled"
return
permissionsSelected = (btn, obj, node) ->
sel = @fnGetSelectedData()
enable = (if sel.length is 1 then onCheck("delete", sel) else false)
if enable
$(btn).removeClass("disabled").addClass "btn3d-success"
$(btn).removeClass("disabled").addClass "btn-success"
else
$(btn).removeClass("btn3d-success").addClass "disabled"
$(btn).removeClass("btn-success").addClass "disabled"
return
$.each tblParams.buttons, (index, value) -> # Iterate through button definition

View File

@ -36,27 +36,27 @@
gui.config.dataTableButtons =
new:
text: "<span class=\"fa fa-pencil\"></span> <span class=\"label-tbl-button\">" + gettext("New") + "</span>"
css: "btn btn3d btn3d-primary btn3d-tables"
css: "btn btn-primary btn3d-tables"
edit:
text: "<span class=\"fa fa-edit\"></span> <span class=\"label-tbl-button\">" + gettext("Edit") + "</span>"
css: "btn disabled btn3d-default btn3d btn3d-tables"
css: "btn disabled btn-default btn3d-tables"
delete:
text: "<span class=\"fa fa-trash-o\"></span> <span class=\"label-tbl-button\">" + gettext("Delete") + "</span>"
css: "btn disabled btn3d-default btn3d btn3d-tables"
css: "btn disabled btn-default btn3d-tables"
permissions:
text: "<span class=\"fa fa-save\"></span> <span class=\"label-tbl-button\">" + gettext("Permissions") + "</span>"
css: "btn disabled btn3d-default btn3d btn3d-tables"
css: "btn disabled btn-default btn3d-tables"
xls:
text: "<span class=\"fa fa-save\"></span> <span class=\"label-tbl-button\">" + gettext("Xls") + "</span>"
css: "btn btn3d-info btn3d btn3d-tables"
css: "btn btn-info btn3d-tables"
custom:
text: null
css: "btn btn3d-default btn3d btn3d-tables"
css: "btn btn-default btn3d-tables"
gui.genRamdonId = (prefix) ->
prefix = prefix or ""

View File

@ -22,9 +22,9 @@
<link href="{% get_static_prefix %}adm/css/bootstrap-datepicker3.css" rel="stylesheet" media="screen">
<link href="{% get_static_prefix %}adm/css/bootstrap-timepicker.css" rel="stylesheet" media="screen">
<link href="{% get_static_prefix %}adm/css/jquery.dataTables.css" rel="stylesheet" media="screen">
<!-- <link href="{% get_static_prefix %}adm/css/jquery.dataTables.css" rel="stylesheet" media="screen">
<link href="{% get_static_prefix %}adm/css/TableTools.css" rel="stylesheet" media="screen">
<link href="{% get_static_prefix %}adm/css/dataTables.bootstrap.css" rel="stylesheet" media="screen">
<link href="{% get_static_prefix %}adm/css/dataTables.bootstrap.css" rel="stylesheet" media="screen"> -->
<link href="{% get_static_prefix %}adm/css/jasny-bootstrap.min.css" rel="stylesheet" media="screen">
{% endcompress %}
@ -133,7 +133,17 @@
<!-- base64 encoding -->
<script src="{% get_static_prefix %}adm/js/base64.js"></script>
<script>
<script type="text/javascript">
// HOver on dropdown menus
function toggleNavbarMethod() {
if ($(window).width() > 768) {
$('.navbar .dropdown').on('mouseover', function(){
$('.dropdown-toggle', this).trigger('click');
}).on('mouseout', function(){
$('.dropdown-toggle', this).trigger('click').blur();
});
}
}
$(function() {
// set default error function
api.defaultFail = gui.failRequestModalFnc(gettext('Error on request'));
@ -145,6 +155,8 @@
$.fn.datepicker.defaults.autoclose = true;
$.fn.datepicker.defaults.language = "{{ LANGUAGE_CODE }}";
toggleNavbarMethod();
});
</script>
{% block js %}{% endblock %}

View File

@ -10,7 +10,7 @@
</button>
<a class ="navbar-brand lnk-dashboard" href="#">
<img alt="Universal Desktop Services" src="{% get_static_prefix %}img/udsicon.png" class="navbar-img pull-left">
<span>Universal Desktop Services</span>
<!-- <span>Universal Desktop Services</span> -->
</a>
</div>

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,339 @@
div {
&.dataTables_length {
label {
font-weight: normal;
float: left;
text-align: left;
}
select {
width: 75px;
}
}
&.dataTables_filter {
label {
font-weight: normal;
float: right;
}
input {
width: 8em;
}
}
&.dataTables_info {
padding-top: 8px;
}
&.dataTables_paginate {
float: right;
margin: 0;
ul.pagination {
margin: 2px;
}
}
}
table.dataTable {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
td, th {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
}
clear: both;
margin-top: 6px !important;
margin-bottom: 6px !important;
max-width: none !important;
thead {
.sorting, .sorting_asc, .sorting_desc, .sorting_asc_disabled, .sorting_desc_disabled {
cursor: pointer;
}
.sorting {
background: url('../img/sort_both.png') no-repeat center right;
}
.sorting_asc {
background: url('../img/sort_asc.png') no-repeat center right;
}
.sorting_desc {
background: url('../img/sort_desc.png') no-repeat center right;
}
.sorting_asc_disabled {
background: url('../img/sort_asc_disabled.png') no-repeat center right;
}
.sorting_desc_disabled {
background: url('../img/sort_desc_disabled.png') no-repeat center right;
}
}
th:active {
outline: none;
}
}
/* Scrolling */
div {
&.dataTables_scrollHead table {
margin-bottom: 0 !important;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
thead tr:last-child {
th:first-child, td:first-child {
border-bottom-left-radius: 0 !important;
border-bottom-right-radius: 0 !important;
}
}
}
&.dataTables_scrollBody {
table {
border-top: none;
margin-bottom: 0 !important;
}
tbody tr:first-child {
th, td {
border-top: none;
}
}
}
&.dataTables_scrollFoot table {
border-top: none;
}
}
.DTTT_nonbutton {
display: inline-block;
}
/*
* TableTools styles
*/
.table tbody tr.active {
td, th {
background-color: #08C;
color: white;
}
}
.table-striped > tbody > tr {
&:nth-child(2n+1) > td {
background-color: #606060;
color: #F0F0F0;
}
&:nth-child(2n) > td {
background-color: white;
color: #000000;
}
&:nth-child(2n+1) > td.sorting_1 {
background-color: #505050;
color: #FFFFFF;
}
&:nth-child(2n) > td.sorting_1 {
background-color: #F5F5F5;
}
}
/*table.dataTable tr.odd td.sorting_1 { background-color: #E5E5E5; }
table.dataTable tr.even td.sorting_1 { background-color: #F5F5F5; }*/
.table tbody tr {
&:hover {
td, th {
background-color: #08C !important;
color: white;
}
}
&.active a {
color: white;
}
}
.table-striped tbody tr.active:nth-child(odd) {
td, th {
background-color: #017ebc;
}
}
table.DTTT_selectable tbody tr {
cursor: pointer;
}
div.DTTT .btn {
color: #333 !important;
font-size: 12px;
&:hover {
text-decoration: none !important;
}
}
ul.DTTT_dropdown.dropdown-menu {
z-index: 2013;
a {
color: #333 !important;
/* needed only when demo_page.css is included */
}
li {
position: relative;
&:hover a {
background-color: #0088cc;
color: white !important;
cursor: pointer;
}
}
}
div {
&.DTTT_collection_background {
z-index: 2009;
}
&.DTTT_print_info {
&.modal {
height: 150px;
margin-top: -75px;
text-align: center;
}
h6 {
font-weight: normal;
font-size: 28px;
line-height: 28px;
margin: 1em;
}
p {
font-size: 14px;
line-height: 20px;
}
}
&.DTFC_LeftHeadWrapper table, &.DTFC_LeftFootWrapper table, &.DTFC_RightHeadWrapper table, &.DTFC_RightFootWrapper table {
background-color: white;
}
}
/* TableTools information display */
/*
* FixedColumns styles
*/
table.DTFC_Cloned tr.even {
background-color: white;
}
div {
&.DTFC_RightHeadWrapper table, &.DTFC_LeftHeadWrapper table {
margin-bottom: 0 !important;
border-top-right-radius: 0 !important;
border-bottom-left-radius: 0 !important;
border-bottom-right-radius: 0 !important;
}
&.DTFC_RightHeadWrapper table thead tr:last-child {
th:first-child, td:first-child {
border-bottom-left-radius: 0 !important;
border-bottom-right-radius: 0 !important;
}
}
&.DTFC_LeftHeadWrapper table thead tr:last-child {
th:first-child, td:first-child {
border-bottom-left-radius: 0 !important;
border-bottom-right-radius: 0 !important;
}
}
&.DTFC_RightBodyWrapper table, &.DTFC_LeftBodyWrapper table {
border-top: none;
margin-bottom: 0 !important;
}
&.DTFC_RightBodyWrapper tbody tr:first-child {
th, td {
border-top: none;
}
}
&.DTFC_LeftBodyWrapper tbody tr:first-child {
th, td {
border-top: none;
}
}
&.DTFC_RightFootWrapper table, &.DTFC_LeftFootWrapper table {
border-top: none;
}
}
/*
This states displays as default
tr.row-state-A > td, tr.row-state-F > td, tr.row-state-U > td, tr.row-state-W > td {
}
*/
tr {
&.row-state-B:nth-child(2n) > td, &.row-state-C:nth-child(2n) > td, &.row-state-E:nth-child(2n) > td, &.row-state-Y:nth-child(2n) > td, &.row-state-B:nth-child(2n+1) > td, &.row-state-C:nth-child(2n+1) > td, &.row-state-E:nth-child(2n+1) > td, &.row-state-Y:nth-child(2n+1) > td {
color: #FF6600 !important;
}
&.row-state-M:nth-child(2n+1) > td, &.row-state-R:nth-child(2n+1) > td, &.row-state-I:nth-child(2n+1) > td, &.row-state-S > td:nth-child(2n+1) {
color: #9A9A9A !important;
}
&.row-state-M:nth-child(2n) > td, &.row-state-R:nth-child(2n) > td, &.row-state-I:nth-child(2n) > td, &.row-state-S > td:nth-child(2n) {
color: #858585 !important;
}
&.row-maintenance-true > td {
color: #FF6600 !important;
}
&.log-WARN {
color: blue;
}
&.log-DEBUG {
color: green;
}
&.log-INFO, &.log-OTHER {
color: black;
}
&.log-ERROR, &.log-FATAL {
color: red;
}
}
.dataTables_wrapper {
overflow-x: hidden;
min-height: 300px;
}

View File

@ -1,7 +1,7 @@
// Widgets
.widget {
background: #fff;
border: 1px solid #c1c1c1;
border: 1px solid $uds-background-color-light;
margin: 0 auto 20px;
position: static;
@ -10,20 +10,20 @@
}
.widget-head {
background-color: #f8f8f8;
background-image: linear-gradient(to bottom, #f8f8f8, #ededed);
background-image: -moz-linear-gradient(top, #f8f8f8, #ededed);
background-image: -o-linear-gradient(top, #f8f8f8, #ededed);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f8f8f8), to(#ededed));
background-image: -webkit-linear-gradient(top, #f8f8f8, #ededed);
background-color: $uds-background-color;
background-image: linear-gradient(to bottom, $uds-background-color, $uds-background-color);
background-image: -moz-linear-gradient(top, $uds-background-color, $uds-background-color);
background-image: -o-linear-gradient(top, $uds-background-color, $uds-background-color);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from($uds-background-color), to($uds-background-color));
background-image: -webkit-linear-gradient(top, $uds-background-color, $uds-background-color);
background-repeat: repeat-x;
border-bottom: 1px solid #c1c1c1;
color: #000;
border-bottom: 1px solid #434857;
color: $uds-foreground-color;
height: 40px;
line-height: 40px;
padding: 0 15px 0 0;
position: relative;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
// text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
&.progress {
border-radius: 0 0 0 0;
@ -49,7 +49,7 @@
}
.heading {
color: #45484d;
color: $uds-foreground-color;
float: left;
font-size: 14px;
height: 40px;
@ -85,36 +85,37 @@
.dropdown-menu li > a {
&:hover, &:focus {
background-color: #47759e;
background-image: linear-gradient(to bottom, #47759e, #d24343);
background-image: -moz-linear-gradient(top, #47759e, #d24343);
background-image: -o-linear-gradient(top, #47759e, #d24343);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#47759e), to(#d24343));
background-image: -webkit-linear-gradient(top, #47759e, #d24343);
background-color: $uds-background-color;
background-image: linear-gradient(to bottom, $uds-background-color, #d24343);
background-image: -moz-linear-gradient(top, $uds-background-color, #d24343);
background-image: -o-linear-gradient(top, $uds-background-color, #d24343);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from($uds-background-color), to(#d24343));
background-image: -webkit-linear-gradient(top, $uds-background-color, #d24343);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffda4c4c', endColorstr='#ffd24343', GradientType=0);
}
}
.dropdown-submenu:hover > a {
background-color: #47759e;
background-image: linear-gradient(to bottom, #47759e, #d24343);
background-image: -moz-linear-gradient(top, #47759e, #d24343);
background-image: -o-linear-gradient(top, #47759e, #d24343);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#47759e), to(#d24343));
background-image: -webkit-linear-gradient(top, #47759e, #d24343);
background-color: $uds-background-color;
background-image: linear-gradient(to bottom, $uds-background-color, #d24343);
background-image: -moz-linear-gradient(top, $uds-background-color, #d24343);
background-image: -o-linear-gradient(top, $uds-background-color, #d24343);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from($uds-background-color), to(#d24343));
background-image: -webkit-linear-gradient(top, $uds-background-color, #d24343);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffda4c4c', endColorstr='#ffd24343', GradientType=0);
}
}
.details {
color: #45484d;
color: $uds-foreground-color;
font-size: 8pt;
}
.widget-body {
padding: 20px 15px;
background-color: $uds-background-color;
form {
margin: 0;
@ -154,7 +155,7 @@
}
.count {
color: #47759e;
color: $uds-background-color;
float: right;
}
@ -220,14 +221,14 @@
border-color: #dddddd;
i:before {
background: #47759e;
background: $uds-background-color;
color: #fff;
font-weight: normal;
text-shadow: none;
}
a {
color: #47759e;
color: $uds-background-color;
}
}
@ -285,9 +286,9 @@
}
.widget-footer {
background: #f7f7f7;
border-bottom: 1px solid #ffffff;
border-top: 1px solid #e6e6e6;
background: $uds-background-color;
border-bottom: 1px solid $uds-background-color-light;
border-top: 1px solid $uds-background-color-light;
height: 25px;
line-height: 25px;
@ -342,7 +343,7 @@
}
&.widget-body-white .widget-body {
background: #fff;
background: $uds-background-color;
}
}

View File

@ -1,15 +1,64 @@
// Own variables
$sidebar-size: 225px;
$sidebar-size-collapsed: 40px;
$sidebar-top: 50px;
$uds-background-color: #252830;
$uds-background-color-light: #434857;
$uds-background-color-lighter: #444444;
$uds-foreground-color: #ffffff;
$uds-color: #1CA8DD;
// Bootstrap
$icon-font-path: "../bower_components/bootstrap-sass/assets/fonts/bootstrap/";
$breadcrumb-separator: ' -> ';
$text-color: $uds-foreground-color;
$body-bg: $uds-background-color;
$headings-color: $uds-foreground-color;
$border-radius-base: 0px !default;
$border-radius-large: 0px !default;
$border-radius-small: 0px !default;
$navbar-inverse-bg: $uds-background-color;
$navbar-inverse-border: $uds-background-color;
$navbar-inverse-link-hover-bg: $uds-background-color-light;
$navbar-inverse-link-active-bg: $uds-background-color-light;
$modal-content-bg: $uds-background-color-light;
$btn-default-color: $uds-foreground-color;
$btn-default-bg: $uds-background-color;
$btn-default-border: $uds-background-color-light;
$pagination-color: $uds-color;
$pagination-hover-color: $uds-foreground-color;
$pagination-disabled-color: $uds-foreground-color;
$pagination-bg: $uds-background-color;
$pagination-hover-bg: $uds-background-color;
$pagination-disabled-bg: $uds-background-color;
$pagination-border: $uds-color;
$pagination-disabled-border: $uds-background-color-light;
$pagination-hover-border: $uds-color;
$pagination-diabled-border: $uds-color;
$breadcrumb-separator: ' -> ';
$breadcrumb-bg: $uds-background-color;
// bower:scss
@import "bower_components/bootstrap-sass/assets/stylesheets/_bootstrap.scss";
// endbower
@font-face {
font-family: 'Droid Sans Mono';
font-style: normal;
@ -26,6 +75,7 @@ $border-radius-small: 0px !default;
body {
font-family: 'Droid Sans Mono', sans-serif;
background-color: $uds-background-color;
margin-top: 50px;
}
@ -119,55 +169,6 @@ body {
/* Tables */
/* Tables "styling" */
.dataTables_wrapper {
overflow-x: hidden;
min-height: 300px;
}
/* States */
/*
This states displays as default
tr.row-state-A > td, tr.row-state-F > td, tr.row-state-U > td, tr.row-state-W > td {
}
*/
tr {
&.row-state-B:nth-child(2n) > td, &.row-state-C:nth-child(2n) > td, &.row-state-E:nth-child(2n) > td, &.row-state-Y:nth-child(2n) > td, &.row-state-B:nth-child(2n+1) > td, &.row-state-C:nth-child(2n+1) > td, &.row-state-E:nth-child(2n+1) > td, &.row-state-Y:nth-child(2n+1) > td {
color: #FF6600 !important;
}
&.row-state-M:nth-child(2n+1) > td, &.row-state-R:nth-child(2n+1) > td, &.row-state-I:nth-child(2n+1) > td, &.row-state-S > td:nth-child(2n+1) {
color: #9A9A9A !important;
}
&.row-state-M:nth-child(2n) > td, &.row-state-R:nth-child(2n) > td, &.row-state-I:nth-child(2n) > td, &.row-state-S > td:nth-child(2n) {
color: #858585 !important;
}
&.row-maintenance-true > td {
color: #FF6600 !important;
}
&.log-WARN {
color: blue;
}
&.log-DEBUG {
color: green;
}
&.log-INFO, &.log-OTHER {
color: black;
}
&.log-ERROR, &.log-FATAL {
color: red;
}
}
/* Logs */
.chart-big {
@ -208,28 +209,28 @@ tr {
/* Side Nav */
.side-nav {
margin-left: -180px;
left: 180px;
width: 40px;
margin-left: -$sidebar-size;
left: $sidebar-size;
width: $sidebar-size-collapsed;
position: fixed;
top: 50px;
top: $sidebar-top;
height: 100%;
border-radius: 0;
border: none;
background-color: #222222;
background-color: $uds-background-color;
overflow-y: auto;
-webkit-transition: width 0.3s; /* For Safari 3.1 to 6.0 */
transition: width 0.3s;
&:hover {
width: 225px;
width: $sidebar-size;
}
> li {
&.dropdown > ul.dropdown-menu {
position: relative;
min-width: 225px;
min-width: $sidebar-size;
margin: 0;
padding: 0;
border: none;
@ -250,18 +251,18 @@ tr {
}
> a {
width: 225px;
width: $sidebar-size;
}
}
}
/* Bootstrap Default Overrides - Customized Dropdowns for the Side Nav */
.navbar-inverse .navbar-nav > li > a {
/*.navbar-inverse .navbar-nav > li > a {
&:hover, &:focus {
background-color: #080808;
}
}
}*/
.label-tbl-button {
display: inline-block;
@ -276,7 +277,7 @@ tr {
/* theme */
@import "theme.scss";
@import "buttons.scss";
@import "widgets.scss";
@import "tables.scss";
@import "_theme";
@import "_widgets";
@import "_data-tables";
@import "_tables";