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

Refactor member register

Browse Source
This commit is contained in:
Jan Tuomi
2018-01-28 20:59:15 +02:00
parent 509b157d65
commit 37ab278086
25 changed files with 41 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
members/static/html/tommy.html
-4
View File
@@ -1,4 +0,0 @@
<h1> Tommyn jäsenlista </h1>
<div>
<img src="/static/tommy.jpg" style="width:800px;height:300px;"></img>
</div>
members/static/css/application.css → members/static/members/css/application.css
+1 -1
View File
@@ -1,7 +1,7 @@
body {
background-color: #fcfcfc;
max-width: 750px;
margin: auto;
margin: 2rem auto 0;
}
h3 {
text-align: center;
members/static/css/members.css → members/static/members/css/members.css
+1
View File
@@ -1,6 +1,7 @@
html, body {
font-size: 14px;
width: 100%;
position: absolute;
}
div {
static/css/lib/simple-sidebar.css → members/static/members/css/simple-sidebar.css
View File
members/static/img/excel_csv_save_example.PNG → members/static/members/img/excel_csv_save_example.PNG
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

members/static/img/excel_csv_save_tutorial.PNG → members/static/members/img/excel_csv_save_tutorial.PNG
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

members/static/img/members_example.png → members/static/members/img/members_example.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

members/templates/application_delete_confirm.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members_base.html" %}
{% extends "members:base.html" %}
{% load i18n %}
{% load bootstrap3 %}
members/templates/application_edit.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members_base.html" %}
{% extends "members:base.html" %}
{% load i18n %}
{% load bootstrap3 %}
members/templates/application_form_base.html
+13 -7
View File
@@ -1,5 +1,6 @@
{% load staticfiles %}
{% load static %}
{% load i18n %}
<!DOCTYPE html>
<html lang="en" ng-app="applicationApp">
<head>
@@ -11,18 +12,23 @@
<title>Jäsenhakemus</title>
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.css" rel = "stylesheet">
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.js"></script>
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
<!-- reCaptcha -->
<script src="/static/js/angular-recaptcha.js"></script>
<script src="{% static "members/static/js/angular-recaptcha.js" %}"></script>
<script src="https://www.google.com/recaptcha/api.js?onload=vcRecaptchaApiLoaded&render=explicit" async defer></script>
<script src="/static/js/jquery.noty.packaged.js"></script>
<script src="/static/js/moment.js"></script>
<link href="/static/css/simple-sidebar.css" rel="stylesheet">
<script src="{% static "members/static/css/jquery.noty.packaged.js" %}"></script>
<script src="{% static "members/static/js/moment.js" %}"></script>
<link href="{% static "members/static/css/simple-sidebar.css" %}" rel="stylesheet">
<link rel="stylesheet" href="{% static "members/css/application.css" %}">
</head>
<body>
members/templates/application_index.html
-1
View File
@@ -4,7 +4,6 @@
{% load i18n %}
{% block content %}
<link rel="stylesheet" href="{% static "css/application.css" %}">
<h3>{% trans "Killan jäseneksi liittyminen on helppoa ja hauskaa!" %}</h3>
<h3>{% trans "Täytä vain alla oleva lomake" %}</h3>
<h4>{% trans "Muista myös maksaa jäsenmaksusi!" %}</h4>
members/templates/application_list.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members_base.html" %}
{% extends "members:base.html" %}
{% load i18n %}
members/templates/members_base.html → members/templates/base.html
+9 -13
View File
@@ -14,14 +14,14 @@
<title>{% trans "Member register" %}</title>
<!-- 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>
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
<link rel="stylesheet" href="{% static "css/lib/bootstrap.min.css" %}">
<link rel="stylesheet" href="{% static "css/lib/simple-sidebar.css" %}">
<link rel="stylesheet" href="{% static "css/base.css" %}">
<link rel="stylesheet" href="{% static "css/members.css" %}">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<link rel="stylesheet" href="{% static "members/css/simple-sidebar.css" %}">
<link rel="stylesheet" href="{% static "members/css/members.css" %}">
<link rel="stylesheet" href="{% static "webapp/css/footer.css" %}">
</head>
<body>
@@ -84,17 +84,13 @@
</div>
<!-- /#sidebar-wrapper -->
<div class="page-content-container">
<!-- Page Content -->
{% block content %}
{% endblock content %}
</div>
</div>
{% include "footer.html" %}
</div>
{% include "webapp:footer.html" %}
</body>
</html>
members/templates/member_add.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members_base.html" %}
{% extends "members:base.html" %}
{% load bootstrap3 %}
{% load i18n %}
members/templates/member_add_many.html
+3 -3
View File
@@ -1,4 +1,4 @@
{% extends "members_base.html" %}
{% extends "members:base.html" %}
{% load i18n %}
{% load static %}
@@ -20,13 +20,13 @@
<div>
<label>{% trans "Format the member table like this:" %}</label>
<div>
<img src="{% static "img/excel_csv_save_example.png" %}">
<img src="{% static "members/img/excel_csv_save_example.png" %}">
</div>
<p>{% blocktrans %}Columns: First name, last name, email address, place of origin, AYY member, JAS recipient{% endblocktrans %}</p>
</div>
<div>
<label>{% trans "Save the file as CSV" %}</label>
<div><img src="{% static "img/excel_csv_save_tutorial.png" %}"></div>
<div><img src="{% static "members/img/excel_csv_save_tutorial.png" %}"></div>
</div>
<form name="memberTextForm" action="/members/import_csv" enctype="multipart/form-data" method="POST">{% csrf_token %}
members/templates/member_add_many_confirm.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members_base.html" %}
{% extends "members:base.html" %}
{% load i18n %}
members/templates/member_delete_confirm.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members_base.html" %}
{% extends "members:base.html" %}
{% load i18n %}
{% load bootstrap3 %}
members/templates/member_edit.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members_base.html" %}
{% extends "members:base.html" %}
{% load i18n %}
{% load bootstrap3 %}
members/templates/member_list.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members_base.html" %}
{% extends "members:base.html" %}
{% load static %}
{% load i18n %}
members/templates/payment_add.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members_base.html" %}
{% extends "members:base.html" %}
{% load bootstrap3 %}
{% load i18n %}
members/templates/payment_delete_confirm.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members_base.html" %}
{% extends "members:base.html" %}
{% load i18n %}
{% load bootstrap3 %}
members/templates/payment_edit.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members_base.html" %}
{% extends "members:base.html" %}
{% load i18n %}
{% load bootstrap3 %}
members/templates/payment_list.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members_base.html" %}
{% extends "members:base.html" %}
{% load static %}
{% load i18n %}
members/templates/settings.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members_base.html" %}
{% extends "members:base.html" %}
{% load static %}
{% load i18n %}
members/templates/upload_form.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "members_base.html" %}
{% extends "members:base.html" %}
{% block content %}
<h1>{{ title }}</h1>