ded/record
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Исправлены конфликты

Browse Source
This commit is contained in:
Anastasia
2015-06-16 18:33:18 +05:00
parent 5d944c0c89 4afb92cecc
commit 49b67af7b7
5 changed files with 104 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
templates/asuzr/base.html
View File

@@ -7,6 +7,7 @@
<script src="{{ STATIC_URL }}admin/js/jquery.min.js" type="text/javascript"></script>
{% inplace_static %}
<link rel="stylesheet" href="{{ STATIC_URL }}django_tables2/themes/paleblue/css/screen.css" />
<link rel="stylesheet" href="{{ STATIC_URL }}admin/css/base.css" />
<style>
#menu {
margin: 0; /* Обнуляем значение отступов */
@@ -16,6 +17,7 @@
display: inline; /* Отображать как строчный элемент */
margin-right: 5px; /* Отступ слева */
border: 1px solid #000; /* Рамка вокруг текста */
border-radius: 4px;
padding: 3px; /* Поля вокруг текста */
}
#user {
@@ -25,9 +27,13 @@
#menu, #user {
display: inline;
}
table.paleblue tr.weekend {
background-color: #FFE4E1
}
</style>
</head>
<body>
<body>
<div class="breadcrumbs">
{% block menu %}
<ul id="menu" class="hr">
<li><a href={% url 'asuzr-main' %}>Таблица посещаемости</a></li>
@@ -38,17 +44,22 @@
{% if request.user.is_staff %}<li><a href={% url 'admin:index' %}>Администрирование</a></li>{% endif %}
</ul>
<div id="user">
{% if request.user.is_authenticated %} Добро пожаловать, {{ request.user.first_name }}
{% else %}<a href="{% url 'django.contrib.auth.views.login' %}">Вход</a>{% endif %}
<br><a href="{% url 'django.contrib.auth.views.logout' %}">Выход</a>
{% if request.user.is_authenticated %}
Добро пожаловать, {{ request.user.first_name }}
(<a href="{% url 'django.contrib.auth.views.logout' %}">Выход</a>)
{% else %}
(<a href="{% url 'django.contrib.auth.views.login' %}">Вход</a>){% endif %}
</div>
</div>
{% endblock %}
<div id='content'>
<H1>{% block title %}{{ title }}{% endblock %}</H1>
{% block page %}
Тело страницы
{% endblock %}
</div>
{% block footer %}
<hr>
{% endblock %}

60
templates/asuzr/weekend_table.html Normal file
View File

@@ -0,0 +1,60 @@
{% spaceless %}
{% load django_tables2 %}
{% load i18n %}
{% if table.page %}
<div class="table-container">
{% endif %}
{% block table %}
<table{% if table.attrs %} {{ table.attrs.as_html }}{% endif %}>
{% nospaceless %}
{% block table.thead %}
<thead>
<tr>
{% for column in table.columns %}
{% if column.orderable %}
<th {{ column.attrs.th.as_html }}><a href="{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}">{{ column.header }}</a></th>
{% else %}
<th {{ column.attrs.th.as_html }}>{{ column.header }}</th>
{% endif %}
{% endfor %}
</tr>
</thead>
{% endblock table.thead %}
{% block table.tbody %}
<tbody>
{% for row in table.page.object_list|default:table.rows %} {# support pagination #}
{% block table.tbody.row %}
<tr class="
{% if row.date.is_weekend %}weekend{% else %}
{{ forloop.counter|divisibleby:2|yesno:"even,odd" }}{% endif %}
"> {# avoid cycle for Django 1.2-1.6 compatibility #}
{% for column, cell in row.items %}
<td {{ column.attrs.td.as_html }}>{% if column.localize == None %}{{ cell }}{% else %}{% if column.localize %}{{ cell|localize }}{% else %}{{ cell|unlocalize }}{% endif %}{% endif %}</td>
{% endfor %}
</tr>
{% endblock table.tbody.row %}
{% empty %}
{% if table.empty_text %}
{% block table.tbody.empty_text %}
<tr><td colspan="{{ table.columns|length }}">{{ table.empty_text }}</td></tr>
{% endblock table.tbody.empty_text %}
{% endif %}
{% endfor %}
</tbody>
{% endblock table.tbody %}
{% block table.tfoot %}
<tfoot>
{% if table.summary %}
<tr>
{% for summary in table.summary %}
<td> {{ summary }} </td>
{% endfor %}
</tr>
{% endif %}
</tfoot>
{% endblock table.tfoot %}
{% endnospaceless %}
</table>
{% endblock table %}
{% endspaceless %}