diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc
index 80ab527..2d8dda0 100644
Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ
diff --git a/digitaleagentur/__pycache__/urls.cpython-38.pyc b/digitaleagentur/__pycache__/urls.cpython-38.pyc
index b9fca1e..f6a7c33 100644
Binary files a/digitaleagentur/__pycache__/urls.cpython-38.pyc and b/digitaleagentur/__pycache__/urls.cpython-38.pyc differ
diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py
index bab2927..f3ec7b5 100644
--- a/digitaleagentur/settings.py
+++ b/digitaleagentur/settings.py
@@ -32,6 +32,7 @@ ALLOWED_HOSTS = ['digitale-agentur.com', 'www.digitale-agentur.com', 'localhost'
# Application definition
INSTALLED_APPS = [
'users.apps.UsersConfig',
+ 'settings.apps.SettingsConfig',
'areas.apps.AreasConfig',
'orga.apps.OrgaConfig',
'cloud.apps.CloudConfig',
diff --git a/digitaleagentur/urls.py b/digitaleagentur/urls.py
index f996bc3..bd96753 100644
--- a/digitaleagentur/urls.py
+++ b/digitaleagentur/urls.py
@@ -27,6 +27,7 @@ urlpatterns = [
path('login/', auth_views.LoginView.as_view(template_name='users/login.html'), name='login'),
path('', include('users.urls'), name="dashboard-first"),
path('admin/', admin.site.urls),
+ path('settings/', include('settings.urls'), name="settings"),
path('dashboard/', include('users.urls'), name="dashboard"),
path('areas/', include('areas.urls'), name="areas-management"),
path('tasks/', include('tasks.urls'), name="tasks-management"),
diff --git a/standards/__pycache__/views.cpython-38.pyc b/standards/__pycache__/views.cpython-38.pyc
index 504f2af..a2913bf 100644
Binary files a/standards/__pycache__/views.cpython-38.pyc and b/standards/__pycache__/views.cpython-38.pyc differ
diff --git a/users/static/users/css/custom.css b/users/static/users/css/custom.css
index 8794599..f9fe106 100644
--- a/users/static/users/css/custom.css
+++ b/users/static/users/css/custom.css
@@ -59,6 +59,20 @@ body{
width: 200px;
height: 200px;
}
+
+ .navbar{
+ min-height: 50px;
+ margin-bottom: 20px;
+ }
+
+ body {
+ padding-top: 70px;
+ }
+
+.default_content_style {
+ margin-left: 212px !important;
+}
+
/*
PAGINATION
*/
@@ -67,6 +81,9 @@ body{
font-size: 2em;
}
+
+
+
/*
FOR TREE ORGA
@@ -176,4 +193,5 @@ right connector from last child*/
}
/*Thats all. I hope you enjoyed it.
-Thanks :)*/
\ No newline at end of file
+Thanks :)*/
+
diff --git a/users/static/users/css/dashboard.css b/users/static/users/css/dashboard.css
index 4bec01c..e75d73e 100644
--- a/users/static/users/css/dashboard.css
+++ b/users/static/users/css/dashboard.css
@@ -91,4 +91,4 @@ body {
*/
.border-top { border-top: 1px solid #e5e5e5; }
-.border-bottom { border-bottom: 1px solid #e5e5e5; }
\ No newline at end of file
+.border-bottom { border-bottom: 1px solid #e5e5e5; }
diff --git a/users/static/users/css/sb-admin-2.css b/users/static/users/css/sb-admin-2.css
index c1197e6..c4f10de 100644
--- a/users/static/users/css/sb-admin-2.css
+++ b/users/static/users/css/sb-admin-2.css
@@ -9571,6 +9571,7 @@ a:focus {
background-color: #f8f9fc;
width: 100%;
overflow-x: hidden;
+
}
#wrapper #content-wrapper #content {
@@ -10996,3 +10997,10 @@ footer.sticky-footer .copyright {
body.sidebar-toggled footer.sticky-footer {
width: 100%;
}
+
+
+.navbar-default{
+ position: fixed;
+ width: 100%;
+ margin: 0 0 405px 0;
+}
\ No newline at end of file
diff --git a/users/static/users/js/sb-admin-2.js b/users/static/users/js/sb-admin-2.js
index 9e96613..f25cf6c 100644
--- a/users/static/users/js/sb-admin-2.js
+++ b/users/static/users/js/sb-admin-2.js
@@ -5,7 +5,7 @@
$("#sidebarToggle, #sidebarToggleTop").on('click', function(e) {
$("body").toggleClass("sidebar-toggled");
$(".sidebar").toggleClass("toggled");
- if ($(".sidebar").hasClass("toggled")) {
+ if ($(".sidebar").hasClass("toggled")) {
$('.sidebar .collapse').collapse('hide');
};
});
@@ -28,7 +28,7 @@
});
// Scroll to top button appear
- $(document).on('scroll', function() {
+ $(document).on('scroll', function() {
var scrollDistance = $(this).scrollTop();
if (scrollDistance > 100) {
$('.scroll-to-top').fadeIn();
@@ -38,11 +38,8 @@
});
// Smooth scrolling using jQuery easing
- $(document).on('click', 'a.scroll-to-top', function(e) {
- var $anchor = $(this);
- $('html, body').stop().animate({
- scrollTop: ($($anchor.attr('href')).offset().top)
- }, 1000, 'easeInOutExpo');
+ $(document).on('click', 'a.scroll-to-top', function(e) {
+ window.scrollTo({top: 0, behavior: 'smooth'});
e.preventDefault();
});
diff --git a/users/templates/users/base.html b/users/templates/users/base.html
index 67919b1..e1c12ed 100644
--- a/users/templates/users/base.html
+++ b/users/templates/users/base.html
@@ -46,12 +46,13 @@
-
+
-
-
-
+
+
@@ -348,21 +360,14 @@
-
-
-
-
-
-
+
-
-
@@ -372,10 +377,8 @@
-
-
diff --git a/users/templates/users/publicbase.html b/users/templates/users/publicbase.html
index 3f7f0bb..16ad0b9 100644
--- a/users/templates/users/publicbase.html
+++ b/users/templates/users/publicbase.html
@@ -35,7 +35,7 @@
-