TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature-refactor-webapp-styles' into 'develop'

Browse Source 
Feature refactor webapp styles

See merge request vtmk/web2.0!94
This commit is contained in:
Henri Varjotie
2017-10-31 21:07:13 +02:00
parent 4221be8c64 6d18e40431
commit 4ba830217e
15 changed files with 97 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webapp/templates/base.html → templates/base.html
+3 -32
View File
@@ -4,13 +4,12 @@
{% load static %}
{% load staticfiles %}
<html lang="en">
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Aalto-yliopiston Sähköinsinöörikilta ry">
<meta name="author" content="Aalto-yliopiston Sähköinsinöörikilta ry">
<link rel="stylesheet" href="{% static "css/webapp.css" %}">
<title>{% trans "Aalto-yliopiston Sähköinsinöörikilta ry" %}</title>
@@ -30,36 +29,8 @@
})
</script>
</head>
<body>
<div class="container">
<div class="row">
<div class="col">
{% block header %}
{% include "sik_header.html" %}
{% endblock %}
</div>
</div>
<div class="row">
<div class="col">
{% block navigation %}
{% include "navigation.html" %}
{% endblock %}
</div>
</div>
<div class="row">
<div class="col">
{% block content %}
{% endblock %}
</div>
</div>
<div class="row">
<div class="col">
{% block footer %}
{% include "footer.html" %}
{% endblock footer %}
</div>
</div>
</div>
{% block body %}
{% endblock %}
</body>
</html>
templates/login.html
+24 -28
View File
@@ -2,34 +2,30 @@
{% load i18n %}
{% block content %}
<h1>SIK Admin</h1>
<form method="POST" class="form-horizontal" action=""> {% csrf_token %}
<div class="form-group row">
<label for="input-username" class="col-sm-2 col-form-label">{% trans "Username" %}</label>
<div class="col-sm-10">
<input type="text" name="username" id="input-username" class="form-control" placeholder="{% trans "Username" %}"></input>
</div>
<div class="container">
<div class="d-flex justify-content-center">
<h1>SIK Admin</h1>
</div>
<div class="form-group row">
<label for="input-password" class="col-sm-2 col-form-label">{% trans "Password" %}</label>
<div class="col-sm-10">
<input type="password" name="passwd" id="input-passwd" class="form-control" placeholder="{% trans "Password" %}"></input>
</div>
<div class="d-flex justify-content-center">
<form method="POST" class="form-horizontal" action=""> {% csrf_token %}
<div class="form-group">
<label for="input-username" class="col-sm-2 col-form-label">{% trans "Username" %}</label>
<input type="text" name="username" id="input-username" class="form-control" placeholder="{% trans "Username" %}"></input>
</div>
<div class="form-group">
<label for="input-password" class="col-sm-2 col-form-label">{% trans "Password" %}</label>
<input type="password" name="passwd" id="input-passwd" class="form-control" placeholder="{% trans "Password" %}"></input>
</div>
<div class="form-group">
<a href={% url "password_reset_recover" %}>{% trans "Forgot password?" %}</a>
</div>
<div class="form-group">
<div class="text-danger">{{ error }}</div>
</div>
<div class="form-group" id="login-button">
<button type="submit" class="btn btn-primary">{% trans "Log in" %}</button>
</div>
</form>
</div>
<div class="form-group row">
<div class="col-sm-10">
<a href={% url "password_reset_recover" %}>Forgot password?</a>
</div>
</div>
<div class="form-group row">
<div class="col-sm-offset-2 col-sm-10">
<div class="text-danger">{{ error }}</div>
</div>
</div>
<div class="form-group row" id="login-button">
<div class="col-sm-2">
<button type="submit" class="btn btn-primary">{% trans "Log in" %}</button>
</div>
</div>
</form>
</div>
{% endblock content %}
templates/login_base.html
+17 -33
View File
@@ -1,38 +1,22 @@
<!DOCTYPE html>
{% extends "base.html" %}
{% load i18n %}
{% load static %}
<html>
<head>
<title>SIK - Login</title>
<meta name="viewport" charset="utf-8" content="width=device-width" />
{% block body %}
{% block header %}
<div class="header">
{% include "sik_header.html" %}
</div>
{% endblock %}
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="{% static "js/lib/jquery-3.1.0.min.js" %}"></script>
<script src="{% static "js/lib/bootstrap.min.js" %}"></script>
<link rel="stylesheet" href="{% static "css/lib/bootstrap.min.css" %}">
<link rel="stylesheet" href="{% static "css/base.css" %}">
<link rel="stylesheet" href="{% static "css/login.css" %}">
</head>
<body>
{% block header %}
<div class="header">
{% include "sik_header.html" %}
</div>
{% endblock %}
<div class="page-content">
{% block content %}
{% endblock %}
</div>
<div class="footer">
{% block footer %}
{% include "footer.html" %}
{% endblock footer %}
</div>
</body>
</html>
<div class="page-content">
{% block content %}
{% endblock %}
</div>
<div class="footer">
{% block footer %}
{% include "footer.html" %}
{% endblock footer %}
</div>
{% endblock %}
webapp/templates/admin_index.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "webapp_base.html" %}
{% load i18n %}
{% block content %}
webapp/templates/contact.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "webapp_base.html" %}
{% block content %}
{% load i18n %}
webapp/templates/event_calendar.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "webapp_base.html" %}
{% block content %}
{% load i18n %}
webapp/templates/freshmen.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "webapp_base.html" %}
{% block content %}
{% load i18n %}
webapp/templates/guild.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "webapp_base.html" %}
{% block content %}
{% load i18n %}
webapp/templates/international.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "webapp_base.html" %}
{% block content %}
{% load i18n %}
webapp/templates/jobs.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "webapp_base.html" %}
{% block content %}
{% load i18n %}
webapp/templates/main_index.html
+5 -3
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "webapp_base.html" %}
{% load i18n %}
{% block content %}
@@ -6,11 +6,13 @@
<div class="container">
<div class="row">
<div class="col">
<h3>{% trans "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" %}</h3>
<h3>{% trans "Aalto-yliopiston Sähköinsinöörikilta ry" %}</h3>
</div>
</div>
<div class="row">
<h5>Lisää vain vesi</h5>
<div class="col">
<h5>Lisää vain vesi</h5>
</div>
</div>
</div>
</div>
webapp/templates/ohlhafv.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "webapp_base.html" %}
{% load bootstrap3 %}
{% load i18n %}
webapp/templates/ohlhafv_list.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "webapp_base.html" %}
{% load static %}
{% load i18n %}
webapp/templates/sosso.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "webapp_base.html" %}
{% block content %}
{% load i18n %}
webapp/templates/webapp_base.html
+38
View File
@@ -0,0 +1,38 @@
{% extends "base.html" %}
{% load i18n %}
{% load static %}
{% load staticfiles %}
{% block body %}
<link rel="stylesheet" href="{% static "css/webapp.css" %}">
<div class="container">
<div class="row">
<div class="col">
{% block header %}
{% include "sik_header.html" %}
{% endblock %}
</div>
</div>
<div class="row">
<div class="col">
{% block navigation %}
{% include "navigation.html" %}
{% endblock %}
</div>
</div>
<div class="row">
<div class="col">
{% block content %}
{% endblock %}
</div>
</div>
<div class="row">
<div class="col">
{% block footer %}
{% include "footer.html" %}
{% endblock footer %}
</div>
</div>
</div>
{% endblock %}