Some style work.

This commit is contained in:
Emanuel Schuetze 2013-02-11 23:01:48 +01:00
parent e101fb8212
commit e3428d3e83
6 changed files with 32 additions and 27 deletions

View File

@ -15,9 +15,10 @@ table#agendatime {
float: right; float: right;
width: auto; width: auto;
margin-bottom: 1em; margin-bottom: 1em;
font-size: 12px;
} }
table#agendatime td { table#agendatime td {
padding: 5px; padding: 3px;
white-space: nowrap; white-space: nowrap;
} }

View File

@ -8,6 +8,9 @@
{% block header %} {% block header %}
<link rel="stylesheet" media="all" type="text/css" href="http://code.jquery.com/ui/1.10.0/themes/smoothness/jquery-ui.css" /> <link rel="stylesheet" media="all" type="text/css" href="http://code.jquery.com/ui/1.10.0/themes/smoothness/jquery-ui.css" />
<link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/timepicker.css' %}" /> <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/timepicker.css' %}" />
{% endblock %}
{% block javascript %}
<script type="text/javascript" src="{% static 'javascript/ui/jquery-ui-1.10.0.min.js' %}"></script> <script type="text/javascript" src="{% static 'javascript/ui/jquery-ui-1.10.0.min.js' %}"></script>
<script type="text/javascript" src="{% static 'javascript/ui/jquery-ui-timepicker-addon.js' %}"></script> <script type="text/javascript" src="{% static 'javascript/ui/jquery-ui-timepicker-addon.js' %}"></script>
<script type="text/javascript" src="{% static 'javascript/ui/jquery-ui-sliderAccess.js' %}"></script> <script type="text/javascript" src="{% static 'javascript/ui/jquery-ui-sliderAccess.js' %}"></script>
@ -63,22 +66,20 @@
{% block title %}{{ block.super }} {% trans "Agenda settings" %}{% endblock %} {% block title %}{{ block.super }} {% trans "Agenda settings" %}{% endblock %}
{% block content %} {% block content %}
<h1>{% trans "Configuration" %}: {% trans "Agenda" %} <h1>
{% trans "Configuration" %}
<small>{% trans "Agenda" %}</small>
{% block config_submenu %}{{ block.super }}{% endblock %} {% block config_submenu %}{{ block.super }}{% endblock %}
</h1> </h1>
<form action="" method="post">{% csrf_token %} <form action="" method="post">{% csrf_token %}
{{ form.as_p }} {% include "form.html" %}
<p> <p>
<button class="button" type="submit"> {% include "formbuttons_save.html" %}
<span class="icon ok">{% trans 'Save' %}</span> <a href="{% url 'config_agenda' %}" class="btn">
</button> {% trans 'Cancel' %}
<a href="{% url 'config_agenda' %}"> </a>
<button class="button" type="button" onclick="window.location='{% url 'config_agenda' %}'"> </p>
<span class="icon cancel">{% trans 'Cancel' %}</span> <small>* {% trans "required" %}</small>
</button>
</a>
</p>
</form> </form>
{% endblock %} {% endblock %}

View File

@ -29,9 +29,9 @@
</td> </td>
{% endif %} {% endif %}
{% if perms.agenda.can_see_orga_items %} {% if perms.agenda.can_see_orga_items %}
<td {% if item.tooltip %}title="{% trans 'End' %}: {{ item.tooltip|date:"DATETIME_FORMAT" }}"{% endif %}> <td>
{% if item.duration %} {% if item.duration %}
{{ item.duration }}h {{ item.duration }}h <i class="icon-clock" {% if item.tooltip %}title="{% trans 'End' %}: {{ item.tooltip|date:"DATETIME_FORMAT" }}"{% endif %}></i>
{% endif %} {% endif %}
</td> </td>
{% endif %} {% endif %}

View File

@ -53,9 +53,17 @@
{% endif %} {% endif %}
<h1>{% trans "Agenda" %} <h1>{% trans "Agenda" %}
<small class="pull-right">
{% 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>
{% 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>
</small>
</h1>
{% if perms.agenda.can_see_orga_items %} {% if perms.agenda.can_see_orga_items %}
{% if start and end %} {% if start and end %}
<table id="agendatime"> <table id="agendatime" class="table table-bordered">
<tr> <tr>
<td>{% trans "Start of event" %}:</td> <td>{% trans "Start of event" %}:</td>
<td>{{ start|date:"DATETIME_FORMAT" }}</td> <td>{{ start|date:"DATETIME_FORMAT" }}</td>
@ -67,14 +75,6 @@
</table> </table>
{% endif %} {% endif %}
{% endif %} {% endif %}
<small class="pull-right">
{% 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>
{% 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>
</small>
</h1>
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" id="hide_closed_items"> {% trans "Hide closed items" %} <input type="checkbox" id="hide_closed_items"> {% trans "Hide closed items" %}
</label> </label>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@ -311,7 +311,10 @@ legend + .control-group {
background-image: url("../img/glyphicons_006_user_add.png"); background-image: url("../img/glyphicons_006_user_add.png");
background-position: 0; background-position: 0;
} }
.icon-clock {
background-image: url("../img/glyphicons_054_clock.png");
background-position: 0;
}
/** Responsive **/ /** Responsive **/