Commit e72b9a33 authored by Christophe Siraut's avatar Christophe Siraut

Bulles individuelles en css, et details des votes en fin de page

parent 8b0a2648
body {
font-size: 13px;
/* background: #fff url(/static/images/bg4c.gif); */
font-family:"Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif;
color: #222;
color: #333322;
margin: 0;
}
a:link, a:active, a:visited {
text-decoration:none;
color:#033591;
background-color: #fff;
color: #557;
ackground-color: #fff;
-moz-border-radius: 9px;
-webkit-border-radius: 9px;
padding: 3px;
border: 1px solid #fff;
padding: 2px 3px;
}
a:hover {
color:#044bcd;
background-color: #f7f7ff;
border: 1px solid #f1f1ff;
color: #222;
background-color: #c3d4e3;
}
h2, h3, h4 {color: #555;}
h1 {color: #665;}
h2, h3, h4 {color: #554;}
ul li {
font-size: 13px;
......@@ -46,20 +45,32 @@ form label {
}
#nheader {
background-color: #f2f1f0;
height: 5px;
/* height: 7px; */
padding-top: 6px;
border-bottom: 1px solid #efefff;
}
#nheader select {
border: 0;
border: 0px solid #111;
}
.menu {
width: 960px;
text-align: right;
}
.menu a {
border: 1px solid #fff;
padding: 3px 7px;
}
.menu a:hover {
border: 1px solid #c3d4e3;
}
#chapeau {
margin-top: 33px;
margin-top: 30px;
margin-left: 12%;
margin-bottom: 20px;
margin-bottom: 18px;
}
#content {
......@@ -67,87 +78,116 @@ form label {
margin-bottom: 64px;
}
.cell {
width: 34px;
}
.comment {
width: 26px;
width: 22px;
}
.comment:focus {
width: 150px;
}
input, textarea {
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
}
input:focus, textarea:focus {
background-color: #f2f1f0; /* #EDF8FA */
border: 1px solid #999;
background-color: #c3d4e3; /* #f2f1f0 */
border: 1px solid #93a4e3;
}
.adresse {
width: 230px;
color: #557;
padding: 2px;
color: #554;
padding: 2px 4px;
}
.bigtable td {
text-align: center;
/* border: 1px solid #efefef; */
}
.da {
font-weight: bold;
color: #555;
}
.subt {
width: 30px;
height: 6px;
}
.subt:hover {
color: #557;
}
.com {
position: relative;
left: 28px;
top: 18px;
display: none;
text-align: left;
-moz-border-radius: 7px;
-webkit-border-radius: 7px;
background-color: #fff;
color: #332;
padding: 8px;
border: 1px solid #bbf;
font-family:"Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif;
line-height: 16px;
width: 170px;
font-size: 12px;
}
.msg {
width: 3px;
height: 3px;
background-color: #f4f4ff;
border: 1px solid #999;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
}
.bigtable td:hover span {
display: block;
position: relative;
}
.bigtable td:hover div.msg, .bigtable td:hover div.subt {
background-color: #c3d4e3; /*bbf; */
}
.instructions {
margin-left: 14px;
margin-right: 50px;
color: #667;
background-color: #efefff;
-moz-border-radius: 9px;
-webkit-border-radius: 9px;
background-color: #f4f4f4;
color: #222;
-moz-border-radius: 7px;
-webkit-border-radius: 7px;
}
.instructions td {
font-size: 12px;
width:190px;
border: 0px;
padding: 12px;
-moz-border-radius: 9px;
-webkit-border-radius: 9px;
font-size: 13px;
width: 190px;
padding: 14px 18px;;
-moz-border-radius: 11px;
-webkit-border-radius: 11px;
line-height: 15px;
}
.menu {
width: 910px;
text-align: right;
}
.menu a {
border: 1px solid #efefff;
padding: 4px;
}
.notify {
color: #667;
font-size: 12px;
padding: 4px;
-moz-border-radius: 9px;
-webkit-border-radius: 9px;
background-color: #fff;
border: 1px solid #efefff;
ackground-color: #fff;
border: 1px solid #edeeef;
color: #554;
}
.blue {
color: #99a;
}
.helper {
width: 156px;
display: none;
position: absolute;
margin-left: 12%;
padding: 9px;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
background-color: #f4f4ff;
text-align: right;
font-size: 11px;
color: #668;
}
.hide {
......@@ -158,38 +198,35 @@ input:focus, textarea:focus {
.icone {
float: left;
text-align: center;
padding: 8px;
margin: 8px;
margin: 30px 20px;
-moz-border-radius: 13px;
-webkit-border-radius: 13px;
border: 1px solid #fff;
}
.icone a {
padding: 16px;
-moz-border-radius: 13px;
-webkit-border-radius: 13px;
border: 1px solid #fff;
padding: 16px 12px;
-moz-border-radius: 19px;
-webkit-border-radius: 19px;
}
.indent {
margin-left: 12px;
margin-left: 7px;
font-size: 12px;
}
.info {
float: none;
color: #335;
padding: 10px;
padding: 10px 15px;
width: 520px;
-moz-border-radius: 15px;
-webkit-border-radius: 15px;
background-color: #fff;
border: 1px solid #def;
border: 1px solid #cce;
line-height: 21px;
-moz-border-radius: 19px;
-webkit-border-radius: 19px;
}
.names {
width: 166px;
font-size: 12px;
}
.names input {
......@@ -198,17 +235,17 @@ input:focus, textarea:focus {
.False, .True {
margin: 0 auto;
background-color: #fbb;
background-color: #f4aaaa; /* #faa; */
width: 19px;
height: 19px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
color: #ccb;
text-align: right;
}
.True {
background-color: #bfb;
background-color: #adf3ad;
}
.left {
......
......@@ -51,10 +51,9 @@
{% block chapeau %}{% endblock %}
</div>
{% block helper %}{% endblock %}
<div id="content">
{% block content %}{% endblock %}
{% block helper %}{% endblock %}
</div>
<div class="menu">
......
......@@ -18,11 +18,10 @@
{% endblock %}
{% block content %}
<br />
<p class="icone"><a href='/new/' title='{% trans "Make an event" %}' alt='{% trans "Make an event" %}'><img width="24px" src="/static/images/view-calendar-day-2.png"> &nbsp; &nbsp; {% trans "Shedule an event" %}</a></p>
<p class="icone"><a href='/new/' title='{% trans "Make an event" %}' alt='{% trans "Make an event" %}'><img width="20px" src="/static/images/view-calendar-day-2.png"> &nbsp; &nbsp; {% trans "Shedule an event" %}</a></p>
<p class="icone"><a href='/nuages' title='{% trans "About nuages" %}' alt='{% trans "Learn more" %}'><img width="24px" src="/static/images/document-send.png"> &nbsp; {% trans "About nuages" %}</a></p>
<p class="icone"><a href='/nuages' title='{% trans "About nuages" %}' alt='{% trans "Learn more" %}'><img width="20px" src="/static/images/document-send.png"> &nbsp; {% trans "About nuages" %}</a></p>
<br /><div style="display:block;clear:both"></div> <br /><br />
......
......@@ -12,7 +12,7 @@
{% block chapeau %}
<h2>{{object}}</h2>
<p class="info">
{{object.description}} <br /> {% trans "Posted by" %} <code> {{object.author}} </code> {% trans "on" %} <code> {{object.pub_date|date:"d F"}} </code><br /> {% trans "Shared address" %} <input type="text" name="link" value="{{ current_site }}/" readonly="readonly" class='adresse' style="border: 1px solid #efefff;" />
{{object.description}} <br /> {% trans "Posted by" %} <code> {{object.author}} </code> {% trans "on" %} <code> {{object.pub_date|date:"d F"}}. </code><br /> {% trans "Shared address" %}: <input type="text" name="link" style="border:0;" value="{{ current_site }}/" readonly="readonly" class='adresse' />
</p>
{% endblock %}
......@@ -24,18 +24,18 @@
<tr><td class='names'></td>
{% for choice in object.choice_set.all %}
<td class='cell' title=" {{ choice.choice|date:"l d F"}} {{ choice.details }} " onmouseover="toggle_visibility('info-{{ choice }}');" onmouseout="toggle_visibility('info-{{ choice }}');"> {{ choice.choice|date:"d-m" }} </td>
<td class='subt'> {{ choice.choice|date:"d/m" }} <div class="subt"><span class="com"><b> {{ choice.choice|date:"l d F"}} </b> <br /><font class="blue">{{ choice.details }}</font></span></div></td>
{% endfor %}
<td></td>
</tr>
{% for bulletin in object.bulletin_set.all %}
<tr ><td class='names'>{{ bulletin.voter }}</td>
{% for vote in bulletin.vote_set.all|dictsort:'choice.choice' %}
<td class='cell' title=" {{ vote.comment }} " onmouseover="toggle_visibility('info-{{ vote.choice }}');" onmouseout="toggle_visibility('info-{{ vote.choice }}');"><div class="{{ vote.voice }}">{% if vote.comment %} ° {% endif %}</div></td>
<td class='cell'><div class="{{ vote.voice }}">{% if vote.comment %} <div class="msg"></div><span class="com"><font class="white">{{ vote.comment }}</font></span>{% endif %}</div></td>
{% endfor %}
</tr>
{% endfor %}
......@@ -45,7 +45,7 @@
{% for choice in object.choice_set.all %}
<td class='cell' title=" {{ choice }} "> {{ choice.votecount }} </td>
{% endfor %}
</tr>
<tr>
......@@ -53,16 +53,16 @@
<td class='names' title=" Fill in your name ">
<div class="blue">{% trans "Your name" %}</div>
<div class="blue">{% trans "Your name:" %}</div>
{{ form.as_p }}
</td>
{% for forms in vforms %}
{{ vforms.management_form }}
{% for form in forms %}
<td class='cell' title='{% trans "Check the boxes to add a positive answer, you may provide a comment for each choice." %}' />
<td class='cell' title='{% trans " Check the little boxes to add positive answers " %}' />
{{ form.voice }}
{{ form.voice }} <br />
{{ form.comment }}
<div class="hide">
{{ form.choice }}
......@@ -71,10 +71,10 @@
{{ field.errors }}
</td>
{% endfor %}
{% endfor %}
<td></td>
</tr>
......@@ -82,7 +82,7 @@
<br />
<h4>Instructions</h4>
<h3>Instructions</h3>
<table class="instructions">
<tr>
<td>1. {% trans "Point colums to see choice details and comments" %} </td>
......@@ -113,18 +113,24 @@
{% endif %}
<!--[if lt IE 8]>
<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
<![endif]-->
{% endblock %}
{% block helper %}
<br />
<h3>Details</h3>
{% for choice in object.choice_set.all %}
<p class='helper' id='info-{{ choice }}'>
<b> {{ choice.choice|date:"l d F"}} </b> <br /> <span class="blue">{{ choice.details }} </span> <br />
<p class="indent" id='info-{{ choice }}'>
<span class="da">{{ choice.choice|date:"l d F"}} </span> <span class="blue">{{ choice.details }} </span> ({{ choice.votecount }})<br />
{% for bulletin in object.bulletin_set.all %}
{% for vote in bulletin.vote_set.all %}
{% ifequal choice vote.choice %}
{% if vote.comment %}
<br /><span><code>{{ bulletin.voter }}</code>: {{ vote.comment }} &nbsp</span>
<span><code>{{ bulletin.voter }}</code>: {{ vote.comment }} &nbsp</span><br />
{% endif %}
{% endifequal %}
{% endfor %}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment