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

Added side menu entries, logout links, profile display

pull/8/head
Piero Toffanin 2016-08-13 19:08:58 -05:00
rodzic dee7900831
commit d1be418407
8 zmienionych plików z 57 dodań i 94 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
app/static/app/css/main.css
Wyświetl plik

@ -21,6 +21,11 @@
background-color: #2c3e50; }
#navbar-top .navbar-top-links li a.dropdown-toggle {
height: 50px; }
#navbar-top .user-profile {
padding: 0 8px; }
#navbar-top .user-profile .email {
font-size: 90%;
color: gray; }
ul#side-menu.nav a {
color: #111; }

2
app/static/app/css/main.css.map
Wyświetl plik

@ -1,6 +1,6 @@
{
"version": 3,
"mappings": "AAAA,WAAW;EACP,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,IAAI;EAChB,gBAAgB,EAAE,OAAO;EAEzB,yBAAa;IACT,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,GAAG;EAEhB,wBAAY;IACR,UAAU,EAAE,IAAI;IAChB,WAAW,EAAE,GAAG;EAGpB,8BAAkB;IACd,KAAK,EAAE,KAAK;IACZ,eAAe,EAAE,IAAI;EAIrB,+CAAiB;IACb,KAAK,EAAE,KAAK;EAGhB,qHAAyB;IACrB,gBAAgB,EAAE,OAAO;EAM7B,kEAAgB;IACZ,KAAK,EAAE,KAAK;IACZ,eAAe,EAAE,IAAI;IACrB,gBAAgB,EAAE,OAAO;EAIjC,kDAAsC;IAClC,MAAM,EAAE,IAAI;;AAKhB,kBAAC;EACG,KAAK,EAAE,IAAI;;AAInB,QAAQ;EACJ,KAAK,EAAE,IAAI;;AAGf,WAAY;EACR,UAAU,EAAE,IAAI;;AAGpB,eAAe;EACX,gBAAgB,EAAE,KAAK",
"mappings": "AAAA,WAAW;EACP,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,IAAI;EAChB,gBAAgB,EAAE,OAAO;EAEzB,yBAAa;IACT,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,GAAG;EAEhB,wBAAY;IACR,UAAU,EAAE,IAAI;IAChB,WAAW,EAAE,GAAG;EAGpB,8BAAkB;IACd,KAAK,EAAE,KAAK;IACZ,eAAe,EAAE,IAAI;EAIrB,+CAAiB;IACb,KAAK,EAAE,KAAK;EAGhB,qHAAyB;IACrB,gBAAgB,EAAE,OAAO;EAM7B,kEAAgB;IACZ,KAAK,EAAE,KAAK;IACZ,eAAe,EAAE,IAAI;IACrB,gBAAgB,EAAE,OAAO;EAIjC,kDAAsC;IAClC,MAAM,EAAE,IAAI;EAGhB,yBAAa;IACT,OAAO,EAAE,KAAK;IAEd,gCAAM;MACF,SAAS,EAAE,GAAG;MACd,KAAK,EAAE,IAAI;;AAMnB,kBAAC;EACG,KAAK,EAAE,IAAI;;AAInB,QAAQ;EACJ,KAAK,EAAE,IAAI;;AAGf,WAAY;EACR,UAAU,EAAE,IAAI;;AAGpB,eAAe;EACX,gBAAgB,EAAE,KAAK",
"sources": ["main.scss"],
"names": [],
"file": "main.css"

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

@ -39,6 +39,15 @@
.navbar-top-links li a.dropdown-toggle{
height: 50px;
}
.user-profile{
padding: 0 8px;
.email{
font-size: 90%;
color: gray;
}
}
}
ul#side-menu.nav{

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

@ -5,7 +5,7 @@
*/
body {
background-color: #f8f8f8;
background-color: white;
}
#wrapper {
@ -22,7 +22,6 @@ body {
#page-wrapper {
position: inherit;
margin: 0 0 0 250px;
padding: 0 30px;
border-left: 1px solid #e7e7e7;
}
}

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

@ -15,7 +15,7 @@
<link href="{% static 'app/css/sb-admin-2.css' %}" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="{% static 'app/css/main.css' %}" />
<script src="{% static 'app/js/vendor/modernizr-2.8.3.min.js' %}"></script>
<title>{{ title|default:"Web Open Drone Map"}}</title>
<title>{{ title|default:"Web OpenDroneMap"}}</title>
</head>
<body>
<!--[if lt IE 8]>
@ -48,20 +48,14 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/"><img src="{% static 'app/img/logo36.png' %}" alt="WebODM" /></a>
<a class="navbar-link" href="/"><p class="navbar-text navbar-right">Open Drone Map</a></p>
<a class="navbar-link" href="/"><p class="navbar-text navbar-right">OpenDroneMap</a></p>
</div>
{% block navbar-top-links %}{% endblock %}
{% block navbar-sidebar %}{% endblock %}
</nav>
<div id="page-wrapper">
<section class="main">
<div class="content">
{% block content %}{% endblock %}
</div>
</section>
</div>
{% block page-wrapper %}{% endblock %}
</div>
</body>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>

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

@ -1,4 +1,4 @@
{% extends "app/base.html" %}
{% extends "app/logged_in_base.html" %}
{% block content %}
<div class="test">Hello dashboard</div>

106
app/templates/app/logged_in_base.html
Wyświetl plik

@ -1,4 +1,4 @@
{% extends "app/base.html" }
{% extends "app/base.html" %}
{% load i18n static %}
<!--{% if request.user.is_authenticated %}
{% if user.is_superuser %}
@ -213,12 +213,12 @@
<i class="fa fa-user fa-fw"></i> <i class="fa fa-caret-down"></i>
</a>
<ul class="dropdown-menu dropdown-user">
<li><a href="#"><i class="fa fa-user fa-fw"></i> User Profile</a>
</li>
<li><a href="#"><i class="fa fa-gear fa-fw"></i> Settings</a>
<li class="user-profile">
Hello, {{ user.username }}<br/>
<span class="email">{{ user.email }}</span>
</li>
<li class="divider"></li>
<li><a href="login.html"><i class="fa fa-sign-out fa-fw"></i> Logout</a>
<li><a href="/logout/"><i class="fa fa-sign-out fa-fw"></i> Logout</a>
</li>
</ul>
<!-- /.dropdown-user -->
@ -241,91 +241,33 @@
</div>
</li>-->
<li>
<a href="index.html"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a>
<a href="/dashboard/"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a>
</li>
<li>
<a href="#"><i class="fa fa-bar-chart-o fa-fw"></i> Charts<span class="fa arrow"></span></a>
<a href="#"><i class="fa fa-plane fa-fw"></i> Mission Planner</a>
</li>
<li>
<a href="#"><i class="fa fa-wrench fa-fw"></i> Clusters<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li>
<a href="flot.html">Flot Charts</a>
<a href="#">Server #1</a>
</li>
<li>
<a href="morris.html">Morris.js Charts</a>
<a href="#">Server #2</a>
</li>
<li>
<a href="#">Server #3</a>
</li>
</ul>
<!-- /.nav-second-level -->
</li>
{% if user.is_superuser %}
<li>
<a href="tables.html"><i class="fa fa-table fa-fw"></i> Tables</a>
<a href="/admin/"><i class="fa fa-gears fa-fw"></i> Admin Panel</a>
</li>
{% endif %}
<li>
<a href="forms.html"><i class="fa fa-edit fa-fw"></i> Forms</a>
</li>
<li>
<a href="#"><i class="fa fa-wrench fa-fw"></i> UI Elements<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li>
<a href="panels-wells.html">Panels and Wells</a>
</li>
<li>
<a href="buttons.html">Buttons</a>
</li>
<li>
<a href="notifications.html">Notifications</a>
</li>
<li>
<a href="typography.html">Typography</a>
</li>
<li>
<a href="icons.html"> Icons</a>
</li>
<li>
<a href="grid.html">Grid</a>
</li>
</ul>
<!-- /.nav-second-level -->
</li>
<li>
<a href="#"><i class="fa fa-sitemap fa-fw"></i> Multi-Level Dropdown<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li>
<a href="#">Second Level Item</a>
</li>
<li>
<a href="#">Second Level Item</a>
</li>
<li>
<a href="#">Third Level <span class="fa arrow"></span></a>
<ul class="nav nav-third-level">
<li>
<a href="#">Third Level Item</a>
</li>
<li>
<a href="#">Third Level Item</a>
</li>
<li>
<a href="#">Third Level Item</a>
</li>
<li>
<a href="#">Third Level Item</a>
</li>
</ul>
<!-- /.nav-third-level -->
</li>
</ul>
<!-- /.nav-second-level -->
</li>
<li>
<a href="#"><i class="fa fa-files-o fa-fw"></i> Sample Pages<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li>
<a href="blank.html">Blank Page</a>
</li>
<li>
<a href="login.html">Login Page</a>
</li>
</ul>
<!-- /.nav-second-level -->
<a href="#"><i class="fa fa-life-saver fa-fw"></i> Documentation</a>
</li>
</ul>
</div>
@ -333,4 +275,14 @@
</div>
<!-- /.navbar-static-side -->
</nav>
{% endblock %}
{% block page-wrapper %}
<div id="page-wrapper">
<section class="main">
<div class="content">
{% block content %}{% endblock %}
</div>
</section>
</div>
{% endblock %}

12
app/templates/app/registration/registration_base.html
Wyświetl plik

@ -1,7 +1,11 @@
{% extends 'base.html' %}
{% block content %}
<div class="col-sm-12 col-md-6 col-md-offset-3 top-buffer">
{% block registration_content %}{% endblock %}
</div>
{% block page-wrapper %}
<section class="main">
<div class="content">
<div class="col-sm-12 col-md-6 col-md-offset-3 top-buffer">
{% block registration_content %}{% endblock %}
</div>
</div>
</section>
{% endblock %}