mitri4
/
proekton.com
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

something else

Browse Source
remotes/origin/PR-39
PekopT 9 years ago
parent 182fc9b779
commit da3793495d
2 changed files with 87 additions and 77 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      templates/partials/base.html
  2. 3
      users/models.py

15
templates/partials/base.html
Unescape View File

@ -1,6 +1,6 @@
<!doctype html>{% load staticfiles %} <!doctype html>{% load staticfiles %}
{#{% load compress %}#} {#{% load compress %}#}
<html> <html lang="ru">
<head> <head>
<meta charset='utf-8'> <meta charset='utf-8'>
<meta http-equiv='X-UA-Compatible' content='IE=edge, chrome=1'> <meta http-equiv='X-UA-Compatible' content='IE=edge, chrome=1'>
@ -30,7 +30,17 @@
{% if TEMPLATE_DEBUG %} {% if TEMPLATE_DEBUG %}
<link rel='stylesheet' href='{% static "css/dev-colors.css" %}'> <!-- Dev-time only, temporary!!! --> <link rel='stylesheet' href='{% static "css/dev-colors.css" %}'> <!-- Dev-time only, temporary!!! -->
{% endif %} {% endif %}
<link rel="icon" href="{% static 'img/favicon.jpg' %}" type="image/x-icon">
<link rel="shortcut icon" href="{% static 'img/favicon50.jpg' %}" type="image/x-icon">
<link rel="apple-touch-icon" href="{% static 'img/favicon128.jpg' %}" sizes="128x128" >
<link rel="icon" type="image/png" href="{% static 'img/favicon50.jpg' %}" sizes="32x32">
<link rel="icon" type="image/png" href="{% static 'img/favicon18.jpg' %}" sizes="16x16">
{# {% endcompress %}#} {# {% endcompress %}#}
<meta name="keywords" content="">
<meta name="description" content="_TEXT_">
<link rel="canonical" href="_URL_">
</head> </head>
<body> <body>
@ -42,7 +52,8 @@
{% endif %} {% endif %}
{% if TEMPLATE_DEBUG %} {% if TEMPLATE_DEBUG %}
<div ondblclick="$(this).css('display', 'none')" style="position: absolute; left: 0; bottom: 0; padding: 6px; color: black; background-color: {% if request.user.is_contractor %}#BADA55{% else %}#C0FFEE{% endif %}; z-index: 50"> <div ondblclick="$(this).css('display', 'none')"
style="position: absolute; left: 0; bottom: 0; padding: 6px; color: black; background-color: {% if request.user.is_contractor %}#BADA55{% else %}#C0FFEE{% endif %}; z-index: 50">
{{ request.user }}<br> {{ request.user }}<br>
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}

3
users/models.py
Unescape View File

@ -160,8 +160,7 @@ class User(AbstractBaseUser, PermissionsMixin):
@property @property
def is_staff(self): def is_staff(self):
# return self.is_superuser return self.is_superuser
return True
def __str__(self): def __str__(self):
return self.email return self.email

Write Preview
Loading…
Cancel
Save