Skip to content
Snippets Groups Projects
Commit 963afa38 authored by Ben Adida's avatar Ben Adida
Browse files

layout and login bar

parent 81dcc732
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
auth @ d0cda7cc
Compare 59396dfc...d0cda7cc
Subproject commit 59396dfc62952f4995981c06143a7c727b0626e4 Subproject commit d0cda7ccd20551d134b7e1cdec657f5de0d417b5
helios @ d7e20746
Compare 825cbb91...d7e20746
Subproject commit 825cbb9198a787f7d432365467c9d4e3f753a04a Subproject commit d7e20746a289a57def46920c108931ecba7bae0b
single-election/media/main.css
+ 24
− 5
View file @ 963afa38
...@@ -8,15 +8,19 @@ body { ...@@ -8,15 +8,19 @@ body {
#content { #content {
position: absolute; position: absolute;
padding: 20px 30px 20px 30px;
top: 0px; top: 0px;
margin-left: 100px; margin-left: 100px;
margin-top: 20px; margin-top: 20px;
width: 860px; width: 1100px;
background: white; background: white;
padding: 0px;
border: 1px solid #666; border: 1px solid #666;
} }
#contentbody {
padding: 20px 30px 20px 30px;
}
#header { #header {
padding-top: 0px; padding-top: 0px;
text-align: center; text-align: center;
...@@ -25,9 +29,11 @@ body { ...@@ -25,9 +29,11 @@ body {
#footer { #footer {
bottom: 0px; bottom: 0px;
margin: auto; background: #ddd;
width: 860px; width: 1060px;
text-align: center; padding: 8px 20px 8px 20px;
border-top: 1px solid #bbb;
text-align: left;
color: #666; color: #666;
clear: both; clear: both;
} }
...@@ -64,3 +70,16 @@ table.pretty th, td { ...@@ -64,3 +70,16 @@ table.pretty th, td {
vertical-align: top; vertical-align: top;
} }
.highlight-box {
background:#ccc;
padding: 10px;
color:#eee;
border: 1px solid #888;
}
.round {
-moz-border-radius-bottomleft:5px;
-moz-border-radius-bottomright:5px;
-moz-border-radius-topleft:5px;
-moz-border-radius-topright:5px;
}
single-election/templates/base.html
+ 12
− 2
View file @ 963afa38
...@@ -30,10 +30,11 @@ ...@@ -30,10 +30,11 @@
<body> <body>
<div id="content"> <div id="content">
<div id="header"> <div id="header">
<img src="/static/logo.gif" /><br /> <a href="/"><img border="0" src="/static/logo.gif" /></a><br />
{% block header %} {% block header %}
{% endblock %} {% endblock %}
</div> </div>
<div id="contentbody">
{% if admin_p %} {% if admin_p %}
<div style="float:right; border-left: 1px dashed black; padding: 0px 20px 5px 20px;"> <div style="float:right; border-left: 1px dashed black; padding: 0px 20px 5px 20px;">
<h3>Administration</h3> <h3>Administration</h3>
...@@ -41,8 +42,17 @@ ...@@ -41,8 +42,17 @@
</div> </div>
{% endif %} {% endif %}
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div>
<div id="footer"> <div id="footer">
<br /><br /> <span style="float:right;">
{% if user %}
logged in as {{user.user_id}}@{{user.user_type}} [<a href="{% url auth.views.logout %}">logout</a>]
{% else %}
{% endif %}
</span>
<a href="http://heliosvoting.org">About Helios</a> |
<br clear="right" />
</div> </div>
</div> </div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment

Pirátský GitLab - Home of the CopyLeft