template style and new icons

This commit is contained in:
Emanuel Schuetze 2013-02-05 17:05:40 +01:00
parent 80b0ab5252
commit 8f05ada6a1
8 changed files with 16 additions and 8 deletions

View File

@ -10,7 +10,7 @@
<link rel="shortcut icon" href="{% static 'images/favicon.png' %}" type="image/png" /> <link rel="shortcut icon" href="{% static 'images/favicon.png' %}" type="image/png" />
<script type="text/javascript" src="{% static 'javascript/jquery.min.js' %}"></script> <script type="text/javascript" src="{% static 'javascript/jquery.min.js' %}"></script>
<script type="text/javascript" src="{% static 'javascript/projector.js' %}"></script> <script type="text/javascript" src="{% static 'javascript/projector.js' %}"></script>
<title>XX{% block title %} {% get_config 'event_name' %} {% endblock %}</title> <title>{% block title %} {% get_config 'event_name' %} {% endblock %}</title>
{% block header %} {% block header %}
{% endblock %} {% endblock %}
</head> </head>

View File

@ -6,15 +6,15 @@
<li> <li>
<a id="{{ overlay.def_name }}_active" <a id="{{ overlay.def_name }}_active"
href="{% url 'projector_overlay_deactivate' overlay.def_name %}" href="{% url 'projector_overlay_deactivate' overlay.def_name %}"
class="overlay_activate_link btn btn-mini btn-success" class="overlay_activate_link btn btn-mini btn-primary"
style="{% if not overlay.active %}display:none;{% endif %}"> style="{% if not overlay.active %}display:none;{% endif %}">
<i class="active icon-checked-new"></i> <i class="icon-checked-new_white"></i>
</a> </a>
<a id="{{ overlay.def_name }}_inactive" <a id="{{ overlay.def_name }}_inactive"
href="{% url 'projector_overlay_activate' overlay.def_name %}" href="{% url 'projector_overlay_activate' overlay.def_name %}"
class="overlay_activate_link btn btn-mini" class="overlay_activate_link btn btn-mini"
style="{% if overlay.active %}display:none;{% endif %}"> style="{% if overlay.active %}display:none;{% endif %}">
<i class="inactive icon-unchecked-new"></i> <i class="icon-unchecked-new"></i>
</a> </a>
{# TODO: Call the html via overlay.html #} {# TODO: Call the html via overlay.html #}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 452 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 341 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 333 B

View File

@ -233,14 +233,17 @@ legend + .control-group {
background-image: url("../img/glyphicons_045_calendar.png"); background-image: url("../img/glyphicons_045_calendar.png");
} }
.leftmenu ul li.active a span.ico i.icon-agenda { .leftmenu ul li.active a span.ico i.icon-agenda {
background-position: 0;
background-image: url("../img/glyphicons_045_calendar_white.png"); background-image: url("../img/glyphicons_045_calendar_white.png");
} }
.icon-motion, .icon-motions { .icon-motion, .icon-motions {
background-position: -24px -24px; background-position: -24px -24px;
} }
.icon-assignment, .icon-assignments { .icon-assignment, .icon-assignments {
background-position: -144px -72px; background-image: url("../img/glyphicons_041_charts.png");
background-position: 0;
}
.leftmenu ul li.active a span.ico i.icon-assignment {
background-image: url("../img/glyphicons_041_charts_white.png");
} }
.icon-participant, .icon-participants { .icon-participant, .icon-participants {
background-position: -168px 0; background-position: -168px 0;
@ -260,14 +263,19 @@ legend + .control-group {
.icon-custom_slide { .icon-custom_slide {
background-position: -120px 0px; background-position: -120px 0px;
} }
.icon-personal_info {
background-position: -312px -24px;
}
/** More glyphicons free icons **/ /** More glyphicons free icons **/
.status_link .icon-on, .icon-checked-new { .status_link .icon-on, .icon-checked-new {
background-image: url("../img/glyphicons_152_check.png"); background-image: url("../img/glyphicons_152_check.png");
background-position: 0; background-position: 0;
} }
.icon-checked-new_white {
background-image: url("../img/glyphicons_152_check_white.png");
background-position: 0;
}
.status_link .icon-off, .icon-unchecked-new { .status_link .icon-off, .icon-unchecked-new {
background-image: url("../img/glyphicons_153_unchecked.png"); background-image: url("../img/glyphicons_153_unchecked.png");
background-position: 0; background-position: 0;