Fixed #57: <button> inside <a> tag not working in IE.; Added new icon for anonymous login.

This commit is contained in:
Emanuel Schuetze 2011-11-14 19:33:45 +01:00
parent 9f50863439
commit eb35289e4e
19 changed files with 111 additions and 108 deletions

View File

@ -23,14 +23,14 @@
<form action="" method="post">{% csrf_token %}
{{ form.as_p }}
<button type="submit">
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
</button>
<button type="submit" name="apply">
<button class="button" type="submit" name="apply">
<span class="icon apply">{%trans 'Apply' %}</span>
</button>
<a href='{% url item_overview %}'>
<button type="button">
<button class="button" type="button" onclick="window.location='{% url item_overview %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
</button>
</a>

View File

@ -13,14 +13,14 @@
{{ managerform.as_p }}
<small>* {%trans "required" %}</small>
<p>
<button type="submit">
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
</button>
<button type="submit" name="apply">
<button class="button" type="submit" name="apply">
<span class="icon apply">{%trans 'Apply' %}</span>
</button>
<a href='{% url application_overview %}'>
<button type="button">
<button class="button" type="button" onclick="window.location='{% url application_overview %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
</button>
</a>

View File

@ -8,11 +8,11 @@
<p>{% trans '(Required comma separated values: <code>number, title, text, reason, first_name, last_name</code> - <code>number</code> and <code>reason</code> are optional and may be empty)' %} </p>
<form enctype="multipart/form-data" action="" method="post">{% csrf_token %}
{{ form.as_p }}
<button type="submit">
<button class="button" type="submit">
<span class="icon import">{%trans 'Import' %}</span>
</button>
<a href="{% url application_overview%}">
<button type="button">
<button class="button" type="button" onclick="window.location='{% url application_overview %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
</button>
</a>

View File

@ -46,14 +46,14 @@
</tr>
</table>
<p>
<button type="submit">
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
</button>
<button type="submit" name="apply">
<button class="button" type="submit" name="apply">
<span class="icon apply">{%trans 'Apply' %}</span>
</button>
<a href='{% url application_view poll.application.id %}'>
<button type="button">
<button class="button" type="button" onclick="window.location='{% url application_view poll.application.id %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
</button>
</a>

View File

@ -48,7 +48,7 @@
{% if perms.application.can_manage_application %}
{% if "genpoll" in actions %}
<a href='{% url application_gen_poll application.id %}'>
<button><span class="icon poll">{%trans 'New vote' %}</span></button>
<span class="button"><span class="icon poll">{%trans 'New vote' %}</span></span>
</a>
{% else %}
-
@ -83,7 +83,7 @@
{% if forloop.last %}
{% if "genpoll" in actions %}
<a href='{% url application_gen_poll application.id %}'>
<button><span class="icon poll">{%trans 'New vote' %}</span></button>
<span class="button"><span class="icon poll">{%trans 'New vote' %}</span></span>
</a>
{% endif %}
{% endif %}
@ -105,13 +105,13 @@
<p></p>
{% if "edit" in actions %}
<a href="{% url application_edit application.id %}">
<button><span class="icon edit">{%trans 'Edit' %}</span></button>
<span class="button"><span class="icon edit">{%trans 'Edit' %}</span></span>
</a>
{% endif %}
{% if "wit" in actions and user == application.submitter %}
<p></p>
<a href='{% url application_set_status application.id 'wit' %}'>
<button><span class="icon revert">{%trans 'Withdraw' %}</span></button>
<span class="button"><span class="icon revert">{%trans 'Withdraw' %}</span></span>
</a>
{% endif %}
@ -119,13 +119,13 @@
{% if "unsupport" in actions %}
<p></p>
<a href='{% url application_unsupport application.id %}'>
<button><span class="icon remove">{% trans 'Unsupport' %}</span></button>
<span class="button"><span class="icon remove">{% trans 'Unsupport' %}</span></span>
</a>
{% endif %}
{% if "support" in actions %}
<p></p>
<a href='{% url application_support application.id %}'>
<button><span class="icon add">{% trans 'Support' %}</span></button>
<span class="button"><span class="icon add">{% trans 'Support' %}</span></span>
</a>
{% endif %}
{% endif %}
@ -143,13 +143,13 @@
{% if "per" in actions or "nop" in actions or "setnumber" in actions %}
<h4>{% trans "Formal validation" %}:</h4>
{% if "per" in actions %}
<a href='{% url application_permit application.id %}'><button><span class="icon ok-blue">{% trans 'Permit' %}</span></button></a>
<a href='{% url application_permit application.id %}'><span class="button"><span class="icon ok-blue">{% trans 'Permit' %}</span></span></a>
{% endif %}
{% if "nop" in actions %}
<a href='{% url application_notpermit application.id %}'><button><span class="icon stop">{% trans 'Not permit (reject)' %}</span></button></a>
<a href='{% url application_notpermit application.id %}'><span class="button"><span class="icon stop">{% trans 'Not permit (reject)' %}</span></span></a>
{% endif %}
{% if "setnumber" in actions %}
<a href='{% url application_set_number application.id %}'><button><span class="icon number">{% trans 'Set Number' %}</span></button></a>
<a href='{% url application_set_number application.id %}'><span class="button"><span class="icon number">{% trans 'Set Number' %}</span></span></a>
{% endif %}
</p>
{% endif %}
@ -157,14 +157,14 @@
{% if "createitem" in actions %}
<h4></h4>
<a href='{% url item_new_default 'ItemApplication' application.id %}'>
<button><span class="icon item">{%trans 'New agenda item' %}</span></button>
<span class="button"><span class="icon item">{%trans 'New agenda item' %}</span></span>
</a>
{% endif %}
{% if "activateitem" in actions %}
<h4></h4>
<a href='{% url application_activate_item application.id %}'>
<button><span class="icon projector">{%trans 'Show agenda item' %}</span></button>
<span class="button"><span class="icon projector">{%trans 'Show agenda item' %}</span></span>
</a>
{% endif %}
@ -172,12 +172,12 @@
<h4>{% trans "Result after vote" %}:</h4>
{% if "acc" in actions %}
<a href='{% url application_set_status application.id 'acc' %}'>
<button><span class="icon accept">{%trans 'Accepted' %}</span></button>
<span class="button"><span class="icon accept">{%trans 'Accepted' %}</span></span>
</a>
{% endif %}
{% if "rej" in actions %}
<a href='{% url application_set_status application.id 'rej' %}'>
<button><span class="icon reject">{%trans 'Rejected' %}</span></button>
<span class="button"><span class="icon reject">{%trans 'Rejected' %}</span></span>
</a>
{% endif %}
{% endif %}
@ -185,16 +185,16 @@
{% if "adj" in actions or "noc" in actions or "com" in actions or "wit" in actions %}
<h4>{% trans 'Result after debate' %}:</h4>
{% if "adj" in actions %}
<a href='{% url application_set_status application.id 'adj' %}'><button>{% trans 'Adjourned' %}</button></a><br>
<a href='{% url application_set_status application.id 'adj' %}'><span class="button">{% trans 'Adjourned' %}</span></a><br>
{% endif %}
{% if "noc" in actions %}
<a href='{% url application_set_status application.id 'noc' %}'><button>{% trans 'Not Concerned' %}</button></a><br>
<a href='{% url application_set_status application.id 'noc' %}'><span class="button">{% trans 'Not Concerned' %}</span></a><br>
{% endif %}
{% if "com" in actions %}
<a href='{% url application_set_status application.id 'com' %}'><button>{% trans 'Commited a bill' %}</button></a><br>
<a href='{% url application_set_status application.id 'com' %}'><span class="button">{% trans 'Commited a bill' %}</span></a><br>
{% endif %}
{% if "wit" in actions %}
<a href='{% url application_set_status application.id 'wit' %}'><button>{% trans 'Withdrawed by Submitter' %}</button></a>
<a href='{% url application_set_status application.id 'wit' %}'><span class="button">{% trans 'Withdrawed by Submitter' %}</span></a>
{% endif %}
{% endif %}
@ -202,7 +202,7 @@
<hr>
<h4>{%trans "For Administration only:" %}</h4>
<a href='{% url application_reset application.id %}'>
<button><span class="icon undo">{%trans 'Reset' %}</span></button>
<span class="button"><span class="icon undo">{%trans 'Reset' %}</span></span>
</a>
</div>
{% endif %} {# end perms.application.can_support_application #}

View File

@ -10,15 +10,14 @@
<form action="" method="post">{% csrf_token %}
{{ form.as_p }}
<button type="submit">
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
</button>
<button type="submit" name="apply">
<button class="button" type="submit" name="apply">
<span class="icon apply">{%trans 'Apply' %}</span>
</button>
<a href='{% url assignment_overview %}'>
<button type="button">
<button class="button" type="button" onclick="window.location='{% url assignment_overview %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
</button>
</a>

View File

@ -42,24 +42,23 @@
</tr>
</table>
<p>
<a href='{% url print_assignment_poll poll.id %}'>
<button type="button">
<span class="button">
<span class="icon pdf">{%trans 'Print ballot' %}</span>
</button>
</span>
</a>
</p>
<p>
<button type="submit">
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
</button>
<button type="submit" name="apply">
<button class="button" type="submit" name="apply">
<span class="icon apply">{%trans 'Apply' %}</span>
</button>
<a href='{% url assignment_view poll.assignment.id %}'>
<button type="button">
<button class="button" type="button" onclick="window.location='{% url assignment_view poll.assignment.id %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
</button>
</a>

View File

@ -31,22 +31,24 @@
<h4></h4>
<a href="{% url assignment_edit assignment.id %}">
<button><span class="icon edit">{%trans 'Edit' %}</span></button>
<span class="button">
<span class="icon edit">{%trans 'Edit' %}</span>
</span>
</a>
{% if not assignment.itemassignment_set.all %}
<h4></h4>
<a href='{% url item_new_default 'ItemAssignment' assignment.id %}'>
<button type="button">
<span class="button">
<span class="icon item">{%trans 'New agenda item' %}</span>
</button>
</span>
</a>
{% else %}
<h4></h4>
<a href='{% url assignment_activate_item assignment.id %}'>
<button>
<span class="button">
<span class="icon projector">{%trans 'Show agenda item' %}</span>
</button>
</span>
</a>
{% endif %}
</div>
@ -82,16 +84,16 @@
{% if user.profile in assignment.profile.all %}
<a href='{% url assignment_delrun assignment.id %}'>
<button type="button">
<span class="button">
<span class="icon removeuser">{%trans 'Withdraw self candidature' %}</span>
</button>
</span>
</a>
{% else %}
{% if user.profile %}
<a href='{% url assignment_run assignment.id %}'>
<button type="button">
<span class="button">
<span class="icon adduser">{%trans 'Self candidature' %}</span>
</button>
</span>
</a>
{% endif %}
{% endif %}
@ -107,7 +109,7 @@
</nobr>
{% endfor %}
<p>
<button type="submit">
<button class="button" type="submit">
<span class="icon ok">{%trans 'Apply' %}</span>
</button>
</p>
@ -154,9 +156,9 @@
{% if assignment.profile.count > 0 and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
<th>
<a href='{% url assignment_gen_poll assignment.id %}'>
<button type="button">
<span class="button">
<span class="icon poll">{%trans 'New ballot' %}</span>
</button>
</span>
</a>
</th>
{% endif %}
@ -228,9 +230,9 @@
{% if assignment.profile.count > 0 and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
<p><a href='{% url assignment_gen_poll assignment.id %}'>
<button type="button">
<span class="button">
<span class="icon poll">{%trans 'New ballot' %}</span>
</button>
</span>
</a></p>
{% endif %}

View File

@ -14,14 +14,14 @@
{% if edituser %}
<a href="{% url user_reset_passwords edituser.id %}">{% trans 'Reset Password' %}</a>
{% endif %}
<button type="submit">
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
</button>
<button type="submit" name="apply">
<button class="button" type="submit" name="apply">
<span class="icon apply">{%trans 'Apply' %}</span>
</button>
<a href='{% url user_overview %}'>
<button type="button">
<button class="button" type="button" onclick="window.location='{% url user_overview %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
</button>
</a>

View File

@ -10,14 +10,14 @@
<form action="" method="post">{% csrf_token %}
{{ form.as_p }}
<button type="submit">
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
</button>
<button type="submit" name="apply">
<button class="button" type="submit" name="apply">
<span class="icon apply">{%trans 'Apply' %}</span>
</button>
<a href='{% url user_group_overview %}'>
<button type="button">
<button class="button" type="button" onclick="window.location='{% url user_group_overview %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
</button>
</a>

View File

@ -8,11 +8,11 @@
<p>{% trans '(Required comma separated values: <code>first_name, last_name, gender, group, type, committee</code>)' %} </p>
<form enctype="multipart/form-data" action="" method="post">{% csrf_token %}
{{ form.as_p }}
<button type="submit">
<button class="button" type="submit">
<span class="icon import">{%trans 'Import' %}</span>
</button>
<a href="{% url user_overview%}">
<button type="button">
<button class="button" type="button" onclick="window.location='{% url user_overview %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
</button>
</a>

View File

@ -38,12 +38,12 @@
</tr>
</table>
<p>
<button type="submit">
<button class="button" type="submit">
<span class="icon ok">{%trans 'Login' %}</span>
</button>
{% if os_enable_anonymous_login %}
<button id="anonymous_login">
<span class="icon ok">{%trans 'Continue as guest' %}</span>
<button class="button" id="anonymous_login">
<span class="icon guest">{%trans 'Continue as guest' %}</span>
</button>
{% endif %}
<input type="hidden" name="next" value="{{ next }}" />

View File

@ -11,11 +11,11 @@
{{ form_user.as_p }}
{{ form_password.as_p }}
<button type="submit">
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
</button>
<a href='{% url item_overview %}'>
<button type="button">
<button class="button" type="button" onclick="window.location='{% url item_overview %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
</button>
</a>

Binary file not shown.

After

Width:  |  Height:  |  Size: 636 B

View File

@ -314,7 +314,7 @@ input[type="submit"], input[type="button"] {
padding:4px 10px !important;
margin: 2px 0 2px 0;
}
button {
.button {
border: 1px solid #D3D3D3;
border-radius: 4px 4px 4px 4px;
display: inline-block;
@ -329,17 +329,17 @@ button {
color: #555555;
cursor: pointer;
}
button:hover {
.button:hover {
border: 1px solid #999999;
background:#f9f9f9 -webkit-gradient(linear,0% 0%,0% 100%,from(rgba(255,255,255,.55)),to(rgba(0,0,0,0)));
background:#f9f9f9 -moz-linear-gradient( top,rgba(255,255,255,.55),rgba(0,0,0,0));
}
button:active {
.button:active {
-webkit-box-shadow:inset 0 100% 0 0 rgba(0,0,0,0.2);
background:#f9f9f9 -webkit-gradient(linear,0% 0%,0% 100%,from(rgba(0,0,0,.3)),to(rgba(0,0,0,0)));
background:#f9f9f9 -moz-linear-gradient( top,rgba(0,0,0,.1),rgba(0,0,0,0));
}
button .icon {
.button .icon {
height: 16px;
text-indent:20px;
padding-top: 1px;
@ -347,69 +347,72 @@ button .icon {
text-transform:none;
white-space:nowrap;
}
button .cancel{
.button .cancel{
background:url(../images/icons/dialog-cancel.png) no-repeat 0px 0px;
}
button .ok{
.button .ok{
background:url(../images/icons/dialog-ok-apply.png) no-repeat 0px 0px;
}
button .ok-blue, button .apply{
.button .ok-blue, .button .apply{
background:url(../images/icons/dialog-ok.png) no-repeat 0px 0px;
}
button .edit{
.button .edit{
background:url(../images/icons/document-edit.png) no-repeat 0px 0px;
}
button .revert{
.button .revert{
background:url(../images/icons/document-revert.png) no-repeat 0px 0px;
}
button .undo{
.button .undo{
background:url(../images/icons/edit-undo.png) no-repeat 0px 0px;
}
button .item{
.button .item{
background:url(../images/icons/view-list-details.png) no-repeat 0px 0px;
}
button .projector{
.button .projector{
background:url(../images/icons/video-projector.png) no-repeat 0px 0px;
}
button .accept{
.button .accept{
background:url(../images/icons/task-complete.png) no-repeat 0px 0px;
}
button .reject{
.button .reject{
background:url(../images/icons/task-reject.png) no-repeat 0px 0px;
}
button .poll{
.button .poll{
background:url(../images/icons/view-statistics.png) no-repeat 0px 0px;
}
button .previous{
.button .previous{
background:url(../images/icons/go-previous.png) no-repeat 0px 0px;
}
button .pdf{
.button .pdf{
background:url(../images/icons/application-pdf.png) no-repeat 0px 0px;
}
button .adduser{
.button .adduser{
background:url(../images/icons/list-add-user.png) no-repeat 0px 0px;
}
button .removeuser{
.button .removeuser{
background:url(../images/icons/list-remove-user.png) no-repeat 0px 0px;
}
button .export{
.button .export{
background:url(../images/icons/document-export.png) no-repeat 0px 0px;
}
button .import{
.button .import{
background:url(../images/icons/document-import.png) no-repeat 0px 0px;
}
button .add{
.button .add{
background:url(../images/icons/list-add.png) no-repeat 0px 0px;
}
button .remove{
.button .remove{
background:url(../images/icons/list-remove.png) no-repeat 0px 0px;
}
button .number{
.button .number{
background:url(../images/icons/milestone.png) no-repeat 0px 0px;
}
button .stop{
.button .stop{
background:url(../images/icons/process-stop.png) no-repeat 0px 0px;
}
.button .guest{
background:url(../images/icons/user-identity.png) no-repeat 0px 0px;
}
.small-input {
width: 40px !important;

View File

@ -24,11 +24,11 @@
{{ form_assignment.as_p }}
</fieldset>
<p>
<button type="submit">
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
</button>
<a href='{% url config_general %}'>
<button type="button">
<button class="button" type="button" onclick="window.location='{% url config_general %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
</button>
</a>

View File

@ -7,11 +7,11 @@
{{ form.as_p }}
<p>
<button type="submit">
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
</button>
<a href='{% url config_general %}'>
<button type="button">
<button class="button" type="button" onclick="window.location='{% url config_general %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
</button>
</a>

View File

@ -1,6 +1,7 @@
{% extends "base.html" %}
{% load tags %}
{% block submenu %}
{% endblock %}

View File

@ -2,7 +2,6 @@
{% load tags %}
{% block submenu %}
{% endblock %}