diff --git a/main.py b/main.py index a9ddb3b..51361f5 100644 --- a/main.py +++ b/main.py @@ -239,7 +239,8 @@ def edit_project(id_project): staff = data_session.query(StaffProjects).filter(StaffProjects.project == current_project.id).all() if current_user.id == current_project.creator: list_users = list( - map(lambda x: get_user_data(x), data_session.query(User).filter(User.id != current_user.id, User.activated == 1).all())) + map(lambda x: get_user_data(x), + data_session.query(User).filter(User.id != current_user.id, User.activated == 1).all())) staff = list(map(lambda x: get_user_data(x), data_session.query(User).filter( User.id.in_(list(map(lambda x: x.user, staff)))).all())) if staff else [] form = ProjectForm() @@ -406,7 +407,9 @@ def user_view(_login): StaffProjects.project).filter( StaffProjects.user == user.id).all()))))).all() resp = list(map(lambda x: get_projects_data(x), current_projects)) - return render_template('user_view.html', title=user.name + ' ' + user.surname, user=user, + return render_template('user_view.html', + title=user.name if user.name else '' + ' ' + user.surname if user.surname else '', + user=user, list_projects=resp) else: abort(404) diff --git a/static/css/base.css b/static/css/base.css index 439c0e8..0c4bcdc 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -69,7 +69,6 @@ body { } .nav_chapter_text { height: 100%; - font-family: Georgia, 'Times New Roman', Times, serif; font-style: bold; color: #946137; font-size: 2vw; diff --git a/static/css/projects.css b/static/css/projects.css index 784bb2d..f9f1896 100644 --- a/static/css/projects.css +++ b/static/css/projects.css @@ -4,7 +4,7 @@ } .header_block { width: 100%; - height: 50vw; + height: 20vw; background-position: center; display: flex; flex-direction: column; @@ -19,7 +19,6 @@ .header_title_2 { color: #ffffff; text-align: center; - margin-top: 50px; font-size: 1.5vw; width: 50vw; } @@ -61,11 +60,12 @@ width: 94%; height: 45vw; overflow-y: auto; + padding-top: 2vw; } .list_project { width: 95%; margin-left: 2.5%; - margin-top: 2vw; + margin-top: 0.5vw; overflow-y: hidden; overflow-x: hidden; } diff --git a/templates/projects.html b/templates/projects.html index bec3761..03f5940 100644 --- a/templates/projects.html +++ b/templates/projects.html @@ -2,7 +2,7 @@ {% extends "base.html" %} {% block content %}