mirror
/
OpenDroneMap-WebODM
kopia lustrzana https://github.com/OpenDroneMap/WebODM
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Finalizado o dashboard

pull/1488/head
Fabioomega 2024-03-07 19:28:07 -03:00
rodzic bfe699eb4b
commit 7f1220dae7
16 zmienionych plików z 154 dodań i 41 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

42
app/static/app/css/main.scss
Wyświetl plik

@ -1,3 +1,5 @@
$navbar-size: 60px;
html, body, section.main, .content, #wrapper, #page-wrapper{
height: auto;
}
@ -37,8 +39,8 @@ html, body, section.main, .content, #wrapper, #page-wrapper{
}
#navbar-top{
height: 50px;
min-height: 50px;
height: $navbar-size;
min-height: $navbar-size;
background-color: #18bc9c;
z-index: 99999;
@ -216,12 +218,12 @@ button i.glyphicon{
}
.navbar-header {
height: 50px;
height: $navbar-size;
}
.navbar-right {
clear: none !important;
height: 50px;
height: $navbar-size;
}
.dropdown {
@ -234,7 +236,7 @@ button i.glyphicon{
left: 15px;
}
.navbar-brand img {
height: 35px;
height: 45px;
}
.navbar-text {
@ -260,8 +262,10 @@ footer{
$padding-size: 20px;
padding-bottom: $padding-size;
padding-top: $padding-size;
padding-left: 30px;
padding-right: 20px;
$list-item-bar-size: 98%;
$list-item-bar-size: 100%;
&::after {
content: " ";
@ -274,11 +278,11 @@ footer{
}
&:first-child {
padding-top: 30px;
padding-top: 40px;
}
&:last-child {
padding-bottom: 30px;
padding-bottom: 20px;
&::after {
border-bottom: none;
@ -334,4 +338,24 @@ footer{
.force-rounded {
border-radius: 50%!important;
}
}
// .content-upload-glyphicon {
// -webkit-mask-size: cover;
// mask-size: cover;
// -webkit-mask-image: url("../fonts/upload.svg");
// mask-image: url("../fonts/upload.svg");
// background-color: white;
// width: 1em;
// height: 1em;
// }
// .content-import-glyphicon {
// -webkit-mask-size: cover;
// mask-size: cover;
// -webkit-mask-image: url("../fonts/box-arrow-in-down.svg");
// mask-image: url("../fonts/box-arrow-in-down.svg");
// background-color: white;
// width: 1em;
// height: 1em;
// }

7
app/static/app/css/sb-admin-2.css
Wyświetl plik

@ -37,7 +37,8 @@ body {
.navbar-top-links li a {
padding: 15px;
min-height: 50px;
padding-top: 20px;
min-height: 60px;
}
.navbar-top-links .dropdown-menu li {
@ -166,10 +167,10 @@ body {
@media (min-width: 768px) {
.white-screen {
position: absolute;
top: 50px;
top: 60px;
z-index: -1;
width: 452px;
height: calc(100vh - 50px);
height: calc(100vh - 60px);
background-color: #fff;
box-shadow: 9px 0 5px -5px rgba(0, 0, 0, 0.1);
}

2
app/static/app/css/sb-admin-2.css.map
Wyświetl plik

@ -1 +1 @@
{"version":3,"sourceRoot":"","sources":["sb-admin-2.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AAAA;AAOA;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;IACI;IACA;;;AAIR;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;;;AAIJ;EACI;;;AAGJ;AAAA;AAAA;EAGI;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAOA;AAAA;EACI;EACA;EACA;EACA;EACA;EACA,aARW;;AAWf;AAAA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;AAAA;EACI;;;AAIR;EAGQ;AAAA;IACI;;;AAKZ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;AAAA;EAEI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;IACI;IACA;IACA;IACA,OAhLM;IAiLN;IACA;IACA;;;AAIR;EACI;IACI;IACA;IACA,OA3LM;IA4LN;;EAGJ;AAAA;AAAA;IAGI;;;AAIR;EACI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;AAAA;AAAA;AAAA;AAAA;EAKI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;AAAA;EAEI;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;AAAA;AAAA;AAAA;AAAA;EAKI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI","file":"sb-admin-2.css"}
{"version":3,"sourceRoot":"","sources":["sb-admin-2.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AAAA;AAOA;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;IACI;IACA;;;AAIR;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;;;AAIJ;EACI;;;AAGJ;AAAA;AAAA;EAGI;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAOA;AAAA;EACI;EACA;EACA;EACA;EACA;EACA,aARW;;AAWf;AAAA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;AAAA;EACI;;;AAIR;EAGQ;AAAA;IACI;;;AAKZ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;AAAA;EAEI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EAEI;IACI;IACA,KAHE;IAIF;IACA,OAlLM;IAmLN;IACA;IACA;;;AAIR;EACI;IACI;IACA;IACA,OA7LM;IA8LN;;EAGJ;AAAA;AAAA;IAGI;;;AAIR;EACI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;AAAA;AAAA;AAAA;AAAA;EAKI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;AAAA;EAEI;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;AAAA;AAAA;AAAA;AAAA;EAKI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI","file":"sb-admin-2.css"}

8
app/static/app/css/sb-admin-2.scss
Wyświetl plik

@ -40,7 +40,8 @@ body {
.navbar-top-links li a {
padding: 15px;
min-height: 50px;
padding-top: 20px;
min-height: 60px;
}
.navbar-top-links .dropdown-menu li {
@ -175,12 +176,13 @@ body {
}
@media(min-width: 768px) {
$top: 60px;
.white-screen {
position: absolute;
top: 50px;
top: $top;
z-index: -1;
width: $navbar-size;
height: calc(100vh - 50px);
height: calc(100vh - $top);
background-color: #fff;
box-shadow: 9px 0 5px -5px rgba(0, 0, 0, 0.1);
}

BIN
app/static/app/fonts/glypgicons-icomoon.eot 100644
Wyświetl plik

Plik binarny nie jest wyświetlany.

12
app/static/app/fonts/glypgicons-icomoon.svg 100644
Wyświetl plik

@ -0,0 +1,12 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>Generated by IcoMoon</metadata>
<defs>
<font id="icomoon" horiz-adv-x="1024">
<font-face units-per-em="1024" ascent="960" descent="-64" />
<missing-glyph horiz-adv-x="1024" />
<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
<glyph unicode="&#xe900;" glyph-name="box-arrow-in-down" d="M224 576c-17.673 0-32-14.327-32-32v0-512c0-17.673 14.327-32 32-32v0h576c17.673 0 32 14.327 32 32v0 512c0 17.673-14.327 32-32 32v0h-128c-17.673 0-32 14.327-32 32s14.327 32 32 32v0h128c53.019 0 96-42.981 96-96v0-512c0-53.019-42.981-96-96-96v0h-576c-53.019 0-96 42.981-96 96v0 512c0 53.019 42.981 96 96 96v0h128c17.673 0 32-14.327 32-32s-14.327-32-32-32v0zM489.344 201.344c5.794-5.808 13.805-9.401 22.656-9.401s16.862 3.593 22.655 9.401l192.001 192.001c5.798 5.798 9.384 13.808 9.384 22.656 0 17.695-14.345 32.040-32.040 32.040-8.848 0-16.858-3.586-22.656-9.384v0l-137.344-137.408v562.752c0 17.673-14.327 32-32 32s-32-14.327-32-32v0-562.752l-137.344 137.408c-5.798 5.798-13.808 9.384-22.656 9.384-17.695 0-32.040-14.345-32.040-32.040 0-8.848 3.586-16.858 9.384-22.656v0z" />
<glyph unicode="&#xe901;" glyph-name="upload" d="M32 326.4c17.673 0 32-14.327 32-32v0-160c0-35.346 28.654-64 64-64v0h768c35.346 0 64 28.654 64 64v0 160c0 17.673 14.327 32 32 32s32-14.327 32-32v0-160c0-70.692-57.308-128-128-128v0h-768c-70.692 0-128 57.308-128 128v0 160c0 17.673 14.327 32 32 32v0zM489.344 886.656c5.794 5.808 13.805 9.401 22.656 9.401s16.862-3.593 22.655-9.401l192.001-192.001c5.798-5.798 9.384-13.808 9.384-22.656 0-17.695-14.345-32.040-32.040-32.040-8.848 0-16.858 3.586-22.656 9.384v0l-137.344 137.408v-562.752c0-17.673-14.327-32-32-32s-32 14.327-32 32v0 562.752l-137.344-137.408c-5.798-5.798-13.808-9.384-22.656-9.384-17.695 0-32.040 14.345-32.040 32.040 0 8.848 3.586 16.858 9.384 22.656v0z" />
</font></defs></svg>
Side by Side

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 1.9 KiB

BIN
app/static/app/fonts/glypgicons-icomoon.ttf 100644
Wyświetl plik

Plik binarny nie jest wyświetlany.

BIN
app/static/app/fonts/glypgicons-icomoon.woff 100644
Wyświetl plik

Plik binarny nie jest wyświetlany.

BIN
app/static/app/img/logo-global-white.png
Wyświetl plik

Plik binarny nie jest wyświetlany.
Side by Side Swipe Nakładka

Przed

Szerokość:  |  Wysokość:  |  Rozmiar: 4.4 KiB

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 141 KiB

10
app/static/app/js/components/ImgButton.jsx
Wyświetl plik

@ -1,10 +0,0 @@
import React from 'react';
function ImgButton( {src, props, textNode} ) {
return (<div {...props}>
<img src={{src}} id="btn-img"></img>
{textNode}
</div>)
}
export default ImgButton;

16
app/static/app/js/components/ProjectListItem.jsx
Wyświetl plik

@ -633,18 +633,18 @@ class ProjectListItem extends React.Component {
<ErrorMessage bind={[this, 'error']} />
<div className="btn-group project-buttons">
{this.hasPermission("add") ?
<div className={"asset-download-buttons btn-group " + (this.state.upload.uploading ? "hide" : "")}>
<div className={"asset-download-buttons " + (this.state.upload.uploading ? "hide" : "")}>
<button type="button"
className="btn btn-primary btn-sm"
className="btn btn-sm rounded-corners upload-file"
onClick={this.handleUpload}
ref={this.setRef("uploadButton")}>
<i className="glyphicon glyphicon-upload"></i>
{_("Select Images and GCP")}
<i className="content-upload-glyphicon" aria-hidden="true"></i>
{_("Selecionar imagens e Ponto de Controle")}
</button>
<button type="button"
className="btn btn-default btn-sm"
className="btn btn-sm rounded-corners import-file"
onClick={this.handleImportTask}>
<i className="glyphicon glyphicon-import"></i> {_("Import")}
<i className="content-import-glyphicon"></i> {_("Importar")}
</button>
{this.state.buttons.map((button, i) => <React.Fragment key={i}>{button}</React.Fragment>)}
</div>
@ -673,7 +673,7 @@ class ProjectListItem extends React.Component {
<span>
<i className='fa fa-tasks'></i>
<a href="javascript:void(0);" onClick={this.toggleTaskList}>
{interpolate(_("%(count)s Tasks"), { count: numTasks})} <i className={'fa fa-caret-' + (this.state.showTaskList ? 'down' : 'right')}></i>
{interpolate(_("%(count)s Tarefas"), { count: numTasks})} <i className={'fa fa-caret-' + (this.state.showTaskList ? 'down' : 'right')}></i>
</a>
</span>
: ""}
@ -686,7 +686,7 @@ class ProjectListItem extends React.Component {
: ""}
<i className='fa fa-filter'></i>
<a href="javascript:void(0);" onClick={this.onOpenFilter} className="dropdown-toggle" data-toggle-outside data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{_("Filter")}
{_("Filtrar")}
</a>
<ul className="dropdown-menu dropdown-menu-right filter-dropdown">
<li className="filter-text-container">

9
app/static/app/js/css/AssetDownloadButtons.scss
Wyświetl plik

@ -1,9 +1,12 @@
.asset-download-buttons{
display: inline-block;
button{
margin-right: 0 !important;
i{
left: 2px;
color: #fff;
i {
position: relative;
margin-right: 5px;
}
}

1
app/static/app/js/css/Dashboard.scss
Wyświetl plik

@ -18,6 +18,7 @@
.list-group {
margin-top: 10px;
margin-bottom: 8px;
}
.add-button {
#btn-text {

52
app/static/app/js/css/ProjectListItem.scss
Wyświetl plik

@ -60,6 +60,8 @@
.project-links{
margin-top: 10px;
margin-bottom: 10px;
margin-left: 10px !important;
font-size: 90%;
i{
margin-right: 4px;
@ -168,4 +170,54 @@
.quick-clear-filter{
margin-right: 6px !important;
}
.upload-file {
$font-size: 10px;
color: #fff;
background-color: #52994c;
font-size: $font-size;
padding: 5px 13px 10px;
margin-right: 10px;
i {
font-size: $font-size + 6px;
margin-right: 10px;
top: 4px;
}
&:hover {
background-color: #4b8b45;
}
}
.import-file {
$font-size: 10px;
color: #fff;
background-color: #82b076;
font-size: $font-size;
padding: 5px 15px 10px;
margin-right: 10px;
i {
font-size: $font-size + 8px;
top: 2px;
}
&:hover {
background-color: #6b9262;
}
}
.project-links
{
a {
color: #707070 !important;
}
.fa, .far {
color: #4ca2a1;
}
}
}

2
app/templates/app/base.html
Wyświetl plik

@ -130,7 +130,7 @@ $(function(){
{% if desktop_mode %}
var topOffset = 0;
{% else %}
var topOffset = 50;
var topOffset = 60;
{% endif %}
var width = (this.window.innerWidth > 0) ? this.window.innerWidth : this.screen.width;

34
app/templates/app/theme.css
Wyświetl plik

@ -335,6 +335,34 @@ pre.prettyprint:focus,
font-weight: 800;
}
/* a.active {
box-shadow: ;
} */
@font-face {
font-family: 'Custom Glyph';
src: url('{% static 'app/fonts/glypgicons-icomoon.eot' %}?gc93mw');
src: url('{% static 'app/fonts/glypgicons-icomoon.eot?gc93mw#iefix' %}') format('embedded-opentype'),
url('{% static 'app/fonts/glypgicons-icomoon.ttf' %}?gc93mw') format('truetype'),
url('{% static 'app/fonts/glypgicons-icomoon.woff?gc93mw' %}') format('woff'),
url('{% static 'app/fonts/glypgicons-icomoon.svg?gc93mw#icomoon' %}') format('svg');
font-weight: normal;
font-style: normal;
font-display: block;
}
.content-upload-glyphicon, .content-import-glyphicon {
font-family: 'Custom Glyph' !important;
font-style: normal;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;
/* Better Font Rendering =========== */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.content-import-glyphicon:before {
content: "\e900";
}
.content-upload-glyphicon:before {
content: "\e901";
}