This commit is contained in:
Dmitry Belyaev 2019-08-19 19:24:07 +03:00
parent 80ee37c2ee
commit 0bea76eac7
Signed by: b4tman
GPG Key ID: 41A00BF15EA7E5F3
6 changed files with 124 additions and 69 deletions

7
static/bootstrap.min.css vendored Normal file

File diff suppressed because one or more lines are too long

View File

@ -9,3 +9,17 @@ body {
.content-block-inner {
margin: auto;
}
.footer {
widows: 100%;
text-align: center;
z-index: -1;
}
details {
text-align: center;
}
#details {
text-align: justify;
}

View File

@ -1,12 +1,13 @@
{% extends "base.html" %} {% block title %} Ответ {% endblock title %}
{% block content %}
{% extends "base.html" %} {% block title %} Ответ {% endblock title %} {% block nav %}
<li class="nav-item"><a class="nav-link text-primary" href="/q/{{ next }}">Ещё</a></li>
{% endblock nav %} {% block content %}
<!-- <h1>{{ id }}</h1> -->
<div class="content-block">
<div id="question" class="content-block-inner">
<p><font color="#544669">
<h4> {{ description }} </h4>
</font>
<p>
<font color="#544669">
<h4> {{ description }} </h4>
</font>
</p>
</div>
</div><br />
@ -15,46 +16,33 @@
<hr/>
<p>
<!-- <h2> Ответ: </h2> -->
<h1>{{ answer }}</h1>
<h1 class="d-flex justify-content-center text-center">{{ answer }}</h1>
</p>
<hr/><br><br/><details>
<div id="details">
{% if comment | length or comment1 | length %}
<p><span>Комментарии:</span>
{% if comment | length %}
{{ comment }}
<hr/><br><br/>
<details>
<div id="details">
{% if comment | length or comment1 | length %}
<p><span>Комментарии:</span> {% if comment | length %} {{ comment }} {% endif %} {% if comment1 | length %}
<br/> {{ comment1 }} {% endif %}
</p>
{% endif %} {% if author | length %}
<p><span>Автор: </span> {{ author }}</p>
{% endif %} {% if copyright | length %}
<p><span>Копирайт: </span> {{ copyright }}</p>
{% endif %} {% if source | length %}
<p><span>Источник: </span> {{ source }}</p>
{% endif %} {% if theme | length %}
<p><span>Тема: </span> {{ theme }}</p>
{% endif %} {% if rating | length %}
<p><span>Рейтинг: </span> {{ author }}</p>
{% endif %} {% if batch_info.description | length %}
<p><span>Чемпионат: </span> {{ batch_info.description }}</p>
{% endif %} {% if tour | length %}
<p><span>Тур: </span> {{ tour }}</p>
{% endif %} {% if id | length %}
<p><span>Номер: </span> {{ id }}</p>
{% endif %}
{% if comment1 | length %}
<br/>
{{ comment1 }}
{% endif %}
</p>
{% endif %}
{% if author | length %}
<p><span>Автор: </span> {{ author }}</p>
{% endif %}
{% if copyright | length %}
<p><span>Копирайт: </span> {{ copyright }}</p>
{% endif %}
{% if source | length %}
<p><span>Источник: </span> {{ source }}</p>
{% endif %}
{% if theme | length %}
<p><span>Тема: </span> {{ theme }}</p>
{% endif %}
{% if rating | length %}
<p><span>Рейтинг: </span> {{ author }}</p>
{% endif %}
{% if batch_info.description | length %}
<p><span>Чемпионат: </span> {{ batch_info.description }}</p>
{% endif %}
{% if tour | length %}
<p><span>Тур: </span> {{ tour }}</p>
{% endif %}
{% if id | length %}
<p><span>Номер: </span> {{ id }}</p>
{% endif %}
</div></details>
</div>
</details>
</div>
<br />
{% endblock content %}
<br /> {% endblock content %}

View File

@ -1,15 +1,60 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<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" type="text/css" href="/q/static/style.css" />
<title>{% block title %}{% endblock title %}</title>
<meta charset="utf-8" />
<link rel="stylesheet" type="text/css" href="/q/static/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="/q/static/style.css" />
<title>{% block title %}{% endblock title %}</title>
</head>
<body>
{% include "nav.html" %}
<div id="content" class="container">{% block content %}{% endblock content %}</div>
<!-- Yandex.Metrika counter --> <script type="text/javascript" > (function (d, w, c) { (w[c] = w[c] || []).push(function() { try { w.yaCounter48214757 = new Ya.Metrika2({ id:48214757, clickmap:true, trackLinks:true, accurateTrackBounce:true, trackHash:true, ut:"noindex" }); } catch(e) { } }); var n = d.getElementsByTagName("script")[0], s = d.createElement("script"), f = function () { n.parentNode.insertBefore(s, n); }; s.type = "text/javascript"; s.async = true; s.src = "https://mc.yandex.ru/metrika/tag.js"; if (w.opera == "[object Opera]") { d.addEventListener("DOMContentLoaded", f, false); } else { f(); } })(document, window, "yandex_metrika_callbacks2"); </script> <noscript><div><img src="https://mc.yandex.ru/watch/48214757?ut=noindex" style="position:absolute; left:-9999px;" alt="" /></div></noscript> <!-- /Yandex.Metrika counter -->
<header>
<nav class="navbar navbar-expand-sm container sticky-top navbar-light justify-content-center">
<ul class="nav navbar-nav">
{% include "nav.html" %} {% block nav %}{% endblock nav %}
</ul>
</nav>
<hr/>
</header>
<article>
<div id="content" class="container">{% block content %}{% endblock content %}</div>
</article>
<footer class="footer fixed-bottom">
<hr/>
<p class="text-secondary">Источник: <a class="text-secondary" href="https://db.chgk.info/">db.chgk.info</a></p>
</footer>
<!-- Yandex.Metrika counter -->
<script type="text/javascript">
(function(d, w, c) {
(w[c] = w[c] || []).push(function() {
try {
w.yaCounter48214757 = new Ya.Metrika2({
id: 48214757,
clickmap: true,
trackLinks: true,
accurateTrackBounce: true,
trackHash: true,
ut: "noindex"
});
} catch (e) {}
});
var n = d.getElementsByTagName("script")[0],
s = d.createElement("script"),
f = function() {
n.parentNode.insertBefore(s, n);
};
s.type = "text/javascript";
s.async = true;
s.src = "https://mc.yandex.ru/metrika/tag.js";
if (w.opera == "[object Opera]") {
d.addEventListener("DOMContentLoaded", f, false);
} else {
f();
}
})(document, window, "yandex_metrika_callbacks2");
</script> <noscript><div><img src="https://mc.yandex.ru/watch/48214757?ut=noindex" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
<!-- /Yandex.Metrika counter -->
</body>
</html>

View File

@ -1,3 +1 @@
<nav class="nav nav-pills container justify-content-center">
<a class="nav-link" href="/q/">Ещё</a>
</nav>
<li class="nav-item"><a class="nav-link text-info" href="/">Главная</a></li>

View File

@ -1,17 +1,20 @@
{% extends "base.html" %} {% block title %} Вопрос {% endblock title %}
{% block content %}
{% extends "base.html" %} {% block title %} Вопрос {% endblock title %} {% block nav %}
<li class="nav-item"><a class="nav-link text-primary" href="/q/{{ next }}">Ещё</a></li>
{% endblock nav %} {% block content %}
<!-- <h1>{{ id }}</h1> -->
<div class="content-block"><div id="question" class="content-block-inner">
<p>
<h3> {{ description }} </h3>
</p>
</div></div>
<div class="content-block">
<div id="question" class="content-block-inner">
<p>
<h3> {{ description }} </h3>
</p>
</div>
</div>
<br/>
<br/>
<br/><details>
<nav class="nav nav-pills container justify-content-center">
<a class="nav-link" href="/q/{{ num }}/a/">Ответ</a>
</nav></details>
<br/>
<details>
<summary>Ответ</summary><br/>
<a class="btn btn-dark" href="/q/{{ num }}/a/">Показать ответ</a>
</details>
{% endblock content %}