DigitaleAgentur___ALT
/
digitaleagenturnc
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed Navbar und Neuer Dev-Branch

This commit is contained in:
holger.trampe 2020-02-02 21:47:38 +01:00
parent 281dc1cb54
commit c0a8925eec
11 changed files with 146 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
digitaleagentur/__pycache__/settings.cpython-38.pyc
View File

Binary file not shown.

BIN
digitaleagentur/__pycache__/urls.cpython-38.pyc
View File

Binary file not shown.

1
digitaleagentur/settings.py
View File

@ -32,6 +32,7 @@ ALLOWED_HOSTS = ['digitale-agentur.com', 'www.digitale-agentur.com', 'localhost'
# Application definition # Application definition
INSTALLED_APPS = [ INSTALLED_APPS = [
'users.apps.UsersConfig', 'users.apps.UsersConfig',
'settings.apps.SettingsConfig',
'areas.apps.AreasConfig', 'areas.apps.AreasConfig',
'orga.apps.OrgaConfig', 'orga.apps.OrgaConfig',
'cloud.apps.CloudConfig', 'cloud.apps.CloudConfig',

1
digitaleagentur/urls.py
View File

@ -27,6 +27,7 @@ urlpatterns = [
path('login/', auth_views.LoginView.as_view(template_name='users/login.html'), name='login'), path('login/', auth_views.LoginView.as_view(template_name='users/login.html'), name='login'),
path('', include('users.urls'), name="dashboard-first"), path('', include('users.urls'), name="dashboard-first"),
path('admin/', admin.site.urls), path('admin/', admin.site.urls),
path('settings/', include('settings.urls'), name="settings"),
path('dashboard/', include('users.urls'), name="dashboard"), path('dashboard/', include('users.urls'), name="dashboard"),
path('areas/', include('areas.urls'), name="areas-management"), path('areas/', include('areas.urls'), name="areas-management"),
path('tasks/', include('tasks.urls'), name="tasks-management"), path('tasks/', include('tasks.urls'), name="tasks-management"),

BIN
standards/__pycache__/views.cpython-38.pyc
View File

Binary file not shown.

18
users/static/users/css/custom.css
View File

@ -59,6 +59,20 @@ body{
width: 200px; width: 200px;
height: 200px; height: 200px;
} }
.navbar{
min-height: 50px;
margin-bottom: 20px;
}
body {
padding-top: 70px;
}
.default_content_style {
margin-left: 212px !important;
}
/* /*
PAGINATION PAGINATION
*/ */
@ -67,6 +81,9 @@ body{
font-size: 2em; font-size: 2em;
} }
/* /*
FOR TREE ORGA FOR TREE ORGA
@ -177,3 +194,4 @@ right connector from last child*/
/*Thats all. I hope you enjoyed it. /*Thats all. I hope you enjoyed it.
Thanks :)*/ Thanks :)*/

8
users/static/users/css/sb-admin-2.css
View File

@ -9571,6 +9571,7 @@ a:focus {
background-color: #f8f9fc; background-color: #f8f9fc;
width: 100%; width: 100%;
overflow-x: hidden; overflow-x: hidden;
} }
#wrapper #content-wrapper #content { #wrapper #content-wrapper #content {
@ -10996,3 +10997,10 @@ footer.sticky-footer .copyright {
body.sidebar-toggled footer.sticky-footer { body.sidebar-toggled footer.sticky-footer {
width: 100%; width: 100%;
} }
.navbar-default{
position: fixed;
width: 100%;
margin: 0 0 405px 0;
}

5
users/static/users/js/sb-admin-2.js
View File

@ -39,10 +39,7 @@
// Smooth scrolling using jQuery easing // Smooth scrolling using jQuery easing
$(document).on('click', 'a.scroll-to-top', function(e) { $(document).on('click', 'a.scroll-to-top', function(e) {
var $anchor = $(this); window.scrollTo({top: 0, behavior: 'smooth'});
$('html, body').stop().animate({
scrollTop: ($($anchor.attr('href')).offset().top)
}, 1000, 'easeInOutExpo');
e.preventDefault(); e.preventDefault();
}); });

148
users/templates/users/base.html
View File

@ -46,11 +46,12 @@
</head> </head>
<body id="page-top"> <body>
<!-- Page Wrapper --> <!-- Page Wrapper -->
<div id="wrapper"> <div id="wrapper">
<!-- Sidebar --> <!-- Sidebar -->
<ul class="navbar-nav bg-gray-900 sidebar sidebar-dark accordion" id="accordionSidebar">
<ul class=" bg-gray-900 sidebar sidebar-dark accordion fixed-top" id="accordionSidebar">
<!-- Sidebar - Brand --> <!-- Sidebar - Brand -->
<a class="sidebar-brand d-flex align-items-center justify-content-center" href="{% url 'users-dashboard' %}"> <a class="sidebar-brand d-flex align-items-center justify-content-center" href="{% url 'users-dashboard' %}">
@ -198,43 +199,73 @@
</li> </li>
{%endif%} {%endif%}
<!-- Divider --> <!-- Divider -->
<!-- Sidebar Toggler (Sidebar) -->
<!--
<div class="text-center d-none d-md-inline">
<button class="rounded-circle border-0" id="sidebarToggle"></button>
</div>
-->
<style scoped>
#bottom_info {
position: absolute;
bottom: 0;
}
</style>
<div id="bottom_info">
<hr class="sidebar-divider d-none d-md-block"> <hr class="sidebar-divider d-none d-md-block">
{% if active_link == 'settings' %}
<li class="nav-item active">
{% else%}
<li class="nav-item">
{%endif%}
<a class="nav-link " href="{% url 'settings' %}" aria-expanded="true" style="margin-top: -15px">
<i class="fas fa-cog"></i>
<span>Einstellungen</span>
</a>
</li>
{% if active_link == 'support' %} {% if active_link == 'support' %}
<li class="nav-item active"> <li class="nav-item active">
{% else%} {% else%}
<li class="nav-item"> <li class="nav-item">
{%endif%} {%endif%}
<a class="nav-link " href="{% url 'supportda' %}" aria-expanded="true"> <a class="nav-link " href="{% url 'supportda' %}" aria-expanded="true" style="margin-top: -15px">
<i class="fas fa-question"></i> <i class="fas fa-question"></i>
<span>Support</span> <span>Support</span>
</a> </a>
</li> </li>
<!-- Sidebar Toggler (Sidebar) --> <div style="" class="sidebar-heading">
<div class="text-center d-none d-md-inline">
<button class="rounded-circle border-0" id="sidebarToggle"></button>
</div>
<div style="bottom: 10px; position: absolute;" class="sidebar-heading">
Version 0.7.4
</div>
<div style="bottom: 40px; position: absolute;" class="sidebar-heading">
<a style="color: #999; text-decoration: none;" href="{% url 'datenschutzda' %}">Datenschutz</a><br /> <a style="color: #999; text-decoration: none;" href="{% url 'datenschutzda' %}">Datenschutz</a><br />
<a style="color: #999; text-decoration: none;" href="{% url 'impressumda' %}">Impressum</a> <a style="color: #999; text-decoration: none;" href="{% url 'impressumda' %}">Impressum</a>
</div> </div>
<div style="margin-top: 10px; margin-bottom: 5px;" class="sidebar-heading">
Version 0.7.4
</div>
</div>
</ul> </ul>
<!-- End of Sidebar --> <!-- End of Sidebar -->
<!-- Content Wrapper --> <!-- Content Wrapper -->
<div id="content-wrapper" class="d-flex flex-column "> <style scoped>
#content-wrapper {
margin-left: 212px;
margin-top: -72px;
}
@media screen and (max-width: 768px) {
#content-wrapper {
margin-left: 105px;
}
}
</style>
<div id="content-wrapper">
<!-- Main Content --> <!-- Main Content -->
<div id="content">
<!-- Topbar --> <!-- Topbar -->
<nav class="navbar navbar-expand navbar-light bg-white topbar mb-4 static-top shadow"> <nav class="navbar navbar-expand navbar-light bg-white topbar mb-4 static-top shadow">
<!-- Sidebar Toggle (Topbar) --> <!-- Sidebar Toggle (Topbar) -->
<button id="sidebarToggleTop" class="btn btn-link d-md-none rounded-circle mr-3"> <button id="sidebarToggleTop" class="btn btn-link d-md-none rounded-circle mr-3" onclick="javascript:toggleSidebar()">
<i class="fa fa-bars"></i> <i class="fa fa-bars"></i>
</button> </button>
@ -250,17 +281,12 @@
<i class="fas fa-times fa-sm"></i> <i class="fas fa-times fa-sm"></i>
</button> </button>
</div> </div>
</div> </div>
</form> </form>
<!-- Topbar Navbar --> <!-- Topbar Navbar -->
<ul class="navbar-nav ml-auto "> <ul class="navbar-nav ml-auto ">
<div class="topbar-divider d-none d-sm-block"></div> <div class="topbar-divider d-none d-sm-block"></div>
<!-- Nav Item - User Information --> <!-- Nav Item - User Information -->
<li class="nav-item dropdown no-arrow"> <li class="nav-item dropdown no-arrow">
<a class="nav-link dropdown-toggle" href="#" id="userDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="nav-link dropdown-toggle" href="#" id="userDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@ -284,15 +310,11 @@
</a> </a>
</div> </div>
</li> </li>
</ul> </ul>
</nav> </nav>
<!-- End of Topbar --> <!-- End of Topbar -->
<!-- Begin Page Content --> <!-- Begin Page Content -->
<div class="container-fluid"> <div class="container-fluid" >
<!-- MESSAGES --> <!-- MESSAGES -->
{% if messages %} {% if messages %}
{% for message in messages %} {% for message in messages %}
@ -311,19 +333,10 @@
{% endblock %} {% endblock %}
</div> </div>
</div> </div> <!-- End of Main Content CONTAINER FLUID-->
<!-- End of Main Content -->
<!-- Footer -->
<!-- End of Footer -->
<br /><br />
</div>
<!-- End of Content Wrapper --> <!-- End of Content Wrapper -->
</div>
</div> </div>
<!-- End of Page Wrapper --> <!-- End of Page Wrapper -->
<!-- <!--
<footer class="sticky-footer bg-white" style="width: 86.2%;position: absolute; <footer class="sticky-footer bg-white" style="width: 86.2%;position: absolute;
@ -340,7 +353,6 @@
<a class="scroll-to-top rounded" href="#page-top"> <a class="scroll-to-top rounded" href="#page-top">
<i class="fas fa-angle-up"></i> <i class="fas fa-angle-up"></i>
</a> </a>
<!-- Bootstrap core JavaScript--> <!-- Bootstrap core JavaScript-->
<!--<script src="{%static 'users/vendor/jquery/jquery.min.js' %}"></script>--> <!--<script src="{%static 'users/vendor/jquery/jquery.min.js' %}"></script>-->
<script src="{%static 'users/vendor/bootstrap/js/bootstrap.bundle.min.js' %}"></script> <script src="{%static 'users/vendor/bootstrap/js/bootstrap.bundle.min.js' %}"></script>
@ -348,21 +360,14 @@
<!-- Core plugin JavaScript--> <!-- Core plugin JavaScript-->
<script src="{%static 'users/vendor/jquery-easing/jquery.easing.min.js' %}"></script> <script src="{%static 'users/vendor/jquery-easing/jquery.easing.min.js' %}"></script>
<!-- DATABLES JS --> <!-- DATABLES JS -->
<script src="https://cdn.datatables.net/1.10.20/js/jquery.dataTables.min.js"></script> <script src="https://cdn.datatables.net/1.10.20/js/jquery.dataTables.min.js"></script>
<script src="https://cdn.datatables.net/1.10.20/js/dataTables.bootstrap4.min.js"></script> <script src="https://cdn.datatables.net/1.10.20/js/dataTables.bootstrap4.min.js"></script>
<!-- Custom scripts for all pages--> <!-- Custom scripts for all pages-->
<script src="{%static 'users/js/sb-admin-2.min.js' %}"></script> <script src="{%static 'users/js/sb-admin-2.js' %}"></script>
<!-- CUSTOM FONT --> <!-- CUSTOM FONT -->
<link href="{% static 'users/css/custom.css' %}" rel="stylesheet"> <link href="{% static 'users/css/custom.css' %}" rel="stylesheet">
<!-- TABLE SORT --> <!-- TABLE SORT -->
<!--<script src="https://cdn.datatables.net/1.10.20/js/jquery.dataTables.min.js"></script>--> <!--<script src="https://cdn.datatables.net/1.10.20/js/jquery.dataTables.min.js"></script>-->
@ -372,10 +377,8 @@
<!-- Page level custom scripts --> <!-- Page level custom scripts -->
<!--<script src="js/demo/chart-area-demo.js"></script>--> <!--<script src="js/demo/chart-area-demo.js"></script>-->
<!--<script src="js/demo/chart-pie-demo.js"></script>--> <!--<script src="js/demo/chart-pie-demo.js"></script>-->
</body> </body>
</html> </html>
<script type="text/javascript"> <script type="text/javascript">
function clearSF(){ function clearSF(){
@ -385,10 +388,7 @@ function clearSF(){
$("#search_string").val(""); $("#search_string").val("");
} }
function startSearch(searchstring){ function startSearch(searchstring){
console.log(searchstring);
if(searchstring.length > 2){ if(searchstring.length > 2){
$.ajax( $.ajax(
{ {
@ -411,4 +411,48 @@ function clearSF(){
$("#maincontent").show(); $("#maincontent").show();
} }
} }
sidebar_toggled = false;
// Toggle the side navigation
function toggleSidebar(){
$("#accordionSidebar").toggleClass("sidebar-toggled");
if($("#accordionSidebar").hasClass("sidebar-toggled"))
{
$("#content-wrapper").css("margin-left" , "0px");
sidebar_toggled = true;
}
else{
$("#content-wrapper").css("margin-left" , "105px");
sidebar_toggled = false;
}
}
delay = 250;
throttled = false;
function getDimensions() {
width = window.innerWidth;
if(width >= 768){
$("#content-wrapper").css("margin-left" , "212px");
}
else{
$("#content-wrapper").css("margin-left" , "105px");
}
}
// window.resize event listener
window.addEventListener('resize', function() {
if (!throttled) { // nur wenn throttled nicht gesetzt ist
getDimensions(); // Callback-Aktion
throttled = true; // Jetzt wird wieder ausgebremst
setTimeout(function() { // Timeout
throttled = false;
}, delay);
}
});
getDimensions();
</script> </script>

15
users/templates/users/publicbase.html
View File

@ -35,7 +35,7 @@
<!-- Sidebar --> <!-- Sidebar -->
<!--<ul class="navbar-nav bg-gradient-primary sidebar sidebar-dark accordion" id="accordionSidebar">--> <!--<ul class="navbar-nav bg-gradient-primary sidebar sidebar-dark accordion" id="accordionSidebar">-->
<ul class="navbar-nav bg-gray-900 sidebar sidebar-dark accordion" id="accordionSidebar"> <ul class=" bg-gray-900 sidebar sidebar-dark accordion fixed-top" id="accordionSidebar">
<!-- Sidebar - Brand --> <!-- Sidebar - Brand -->
<a class="sidebar-brand d-flex align-items-center justify-content-center" href="{% url 'users-dashboard' %}"> <a class="sidebar-brand d-flex align-items-center justify-content-center" href="{% url 'users-dashboard' %}">
<i class="fas fa-laptop"></i> <i class="fas fa-laptop"></i>
@ -55,7 +55,18 @@
<!-- End of Sidebar --> <!-- End of Sidebar -->
<!-- Content Wrapper --> <!-- Content Wrapper -->
<div id="content-wrapper" class="d-flex flex-column"> <style scoped>
#content-wrapper {
margin-left: 212px;
margin-top: -72px;
}
@media screen and (max-width: 768px) {
#content-wrapper {
margin-left: 105px;
}
}
</style>
<div id="content-wrapper">
<!-- Main Content --> <!-- Main Content -->
<div id="content"> <div id="content">