Merge remote-tracking branch 'origin/collection' into collection

# Conflicts:
#	data-dev.sqlite
merge-requests/3/head
Shenyuan Jin 3 years ago
commit 750cf1a14f

@ -185,6 +185,10 @@
Invite</a> Invite</a>
{% endif %} {% endif %}
</li> </li>
<li id="btn-4">
<a href="{{ url_for('.report', id=question_id,type='question') }}" class="glyphicon glyphicon-alert">
Report</a>
</li>
</ul> </ul>
</div> </div>
</div> </div>

@ -1,14 +1,59 @@
<!DOCTYPE html> {% extends "base.html" %}
<html lang="en">
<head>
<meta charset="UTF-8"> {% block title %}Report{% endblock %}
<title>Title</title>
</head> {% block head %}
<body> {{ super() }}
<style>
body {
padding-top: 60px;
background-color: #f5f5f5;
}
.background {
display: flex;
justify-content: center;
align-items: center;
position: fixed;
width: 100%;
height: 100%;
z-index: -1000;
}
</style>
<meta name="csrf-token" content="{{ csrf_token() }}">
<script type="application/javascript" src="{{ url_for('static',filename='js/jquery-3.6.0.js') }}"></script>
<script src="{{ url_for('static',filename='js/starback.js') }}"></script>
<script src="{{ url_for('static',filename='js/click_heart.js') }}"></script>
<script src="{{ url_for('static',filename='js/fireworks.js') }}"></script>
<style>
.form-text{
margin-top: 10px;
margin-bottom: 10px;
width: 100%;
resize: none;
height: 10em;
}
.form-submit{
width: 10em;
float: right;
font-size: 1.5em;
}
.container{
box-shadow: 10px 10px 5px #888888;
padding: 10px;
border: 1px solid #888888;
border-radius: 10px;
}
</style>
{% endblock %}
{% block body %}
<div class="container">
<h1>Report:</h1>
<form action="{{ url_for(".report",id=id,type=type) }}" method="post"> <form action="{{ url_for(".report",id=id,type=type) }}" method="post">
{{ form.csrf_token }} {{ form.csrf_token }}
{{ form.body }} {{ form.body(class="form-text") }}
{{ form.submit }} {{ form.submit(class="form-submit")}}
</form> </form></div>
</body> {% endblock %}
</html>

Binary file not shown.
Loading…
Cancel
Save