ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup template code and style.

Browse Source
This commit is contained in:
Emanuel Schuetze 2012-09-06 23:59:03 +02:00
parent ae51d9e7da
commit 6a3bead5f6
6 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openslides/agenda/templates/agenda/edit.html
View File

@ -13,14 +13,14 @@
{% block content %} {% block content %}
<h1> <h1>
{% if item %} {% if item %}
{% trans "Edit item" %} {% trans "Edit item" %}
{% else %} {% else %}
{% trans "New item" %} {% trans "New item" %}
{% endif %} {% endif %}
<small class="pull-right"> <small class="pull-right">
<a href="{% url item_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a> <a href="{% url item_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
</small> </small>
</h1> </h1>
<form action="" method="post">{% csrf_token %} <form action="" method="post">{% csrf_token %}
{% for field in form %} {% for field in form %}

12
openslides/agenda/templates/agenda/overview.html
View File

@ -54,12 +54,12 @@
{% endif %} {% endif %}
<h1>{% trans "Agenda" %} <h1>{% trans "Agenda" %}
<small class="pull-right"> <small class="pull-right">
{% if perms.agenda.can_manage_agenda %} {% if perms.agenda.can_manage_agenda %}
<a href="{% url item_new %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New item' %}"><i class="icon-plus"></i> {% trans "New" %}</a> <a href="{% url item_new %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New item' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
{% endif %} {% endif %}
<a href="{% url print_agenda %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print agenda as PDF' %}"><i class="icon-print"></i> PDF</a> <a href="{% url print_agenda %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print agenda as PDF' %}"><i class="icon-print"></i> PDF</a>
</small> </small>
</h1> </h1>
<label class="checkbox"> <label class="checkbox">

6
openslides/application/templates/application/import.html
View File

@ -6,9 +6,9 @@
{% block content %} {% block content %}
<h1>{% trans "Import motions" %} <h1>{% trans "Import motions" %}
<small class="pull-right"> <small class="pull-right">
<a href="{% url application_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a> <a href="{% url application_overview %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
</small> </small>
</h1> </h1>
<p>{% trans 'Select a CSV file to import motions!' %}</p> <p>{% trans 'Select a CSV file to import motions!' %}</p>

5
openslides/application/templates/application/overview.html
View File

@ -7,8 +7,9 @@
{% block title %}{{ block.super }} – {% trans "Motions" %}{% endblock %} {% block title %}{{ block.super }} – {% trans "Motions" %}{% endblock %}
{% block content %} {% block content %}
<h1>{% trans "Motions" %} <h1>
<small class="pull-right"> {% trans "Motions" %}
<small class="pull-right">
{% if perms.application.can_manage_application %} {% if perms.application.can_manage_application %}
<a href="{% url application_new %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New motion' %}"><i class="icon-plus"></i> {% trans "New" %}</a> <a href="{% url application_new %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New motion' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
<a href="{% url application_import %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import motions' %}"><i class="icon-share-alt"></i> {% trans 'Import' %}</a> <a href="{% url application_import %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import motions' %}"><i class="icon-share-alt"></i> {% trans 'Import' %}</a>

20
openslides/static/styles/base.css
View File

@ -30,18 +30,6 @@ h1 {
h5 { h5 {
margin-bottom: 0px; margin-bottom: 0px;
} }
/*h1 small a {
background: none repeat scroll 0 0 #F1F1F1;
border: 0 none;
font-family: sans-serif;
font-size: 14px;
margin-left: 4px;
padding: 3px 8px;
position: relative;
text-decoration: none;
top: -7px;
}*/
a:hover { a:hover {
text-decoration: none; text-decoration: none;
@ -151,7 +139,7 @@ a:hover {
background-position: -24px -24px; background-position: -24px -24px;
} }
.icon-assignment { .icon-assignment {
background-position: -408px 0; background-position: -144px -72px;
} }
.icon-participant { .icon-participant {
background-position: -168px 0; background-position: -168px 0;
@ -167,6 +155,12 @@ a:hover {
.alert form { .alert form {
margin-bottom: 0; margin-bottom: 0;
} }
tr.total td {
border-top: 1px solid #333333;
}
.nobr {
white-space: nowrap;
}
/** Forms **/ /** Forms **/
.errorlist{ .errorlist{

1
openslides/templates/base.html
View File

@ -15,7 +15,6 @@
<link href="{% static 'styles/bootstrap.css' %}" type="text/css" rel="stylesheet"> <link href="{% static 'styles/bootstrap.css' %}" type="text/css" rel="stylesheet">
<link href="{% static 'styles/bootstrap-responsive.css' %}" type="text/css" rel="stylesheet"> <link href="{% static 'styles/bootstrap-responsive.css' %}" type="text/css" rel="stylesheet">
<link href="{% static 'styles/base.css' %}" type="text/css" rel="stylesheet"> <link href="{% static 'styles/base.css' %}" type="text/css" rel="stylesheet">
<link href="{% static 'img/favicon.png' %}" type="image/png" rel="shortcut icon" /> <link href="{% static 'img/favicon.png' %}" type="image/png" rel="shortcut icon" />
{% block header %} {% block header %}
{% endblock %} {% endblock %}