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

Merge pull request #7 from emanuelschuetze/master

Browse Source 
Dashboard drag'n'drop fix.
This commit is contained in:
Oskar Hahn 2012-08-22 01:59:47 -07:00
commit 72f82454ec
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
openslides/projector/static/javascript/projector-control.js → openslides/projector/static/javascript/dashboard.js
View File

2
openslides/projector/static/styles/projector-control.css → openslides/projector/static/styles/dashboard.css
View File

@ -9,7 +9,7 @@
.column { .column {
width: 50%; width: 50%;
float: left; float: left;
padding-bottom: 0px; padding-bottom: 100px;
} }
.portlet { .portlet {
margin: 0 10px 10px 0; margin: 0 10px 10px 0;

6
openslides/projector/templates/projector/dashboard.html
View File

@ -6,9 +6,9 @@
{% block header %} {% block header %}
<link type="text/css" href="{% static 'styles/humanity/jquery-ui-1.8.18.custom.css' %}" rel="stylesheet" /> <link type="text/css" href="{% static 'styles/humanity/jquery-ui-1.8.18.custom.css' %}" rel="stylesheet" />
<link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/projector-control.css' %}" /> <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/dashboard.css' %}" />
<script type="text/javascript" src="{% static 'javascript/jquery-ui-1.8.18.custom.min.js' %}"></script> <script type="text/javascript" src="{% static 'javascript/jquery-ui-1.8.18.custom.min.js' %}"></script>
<script type="text/javascript" src="{% static 'javascript/projector-control.js' %}"></script> <script type="text/javascript" src="{% static 'javascript/dashboard.js' %}"></script>
<script type="text/javascript" src="{% static 'javascript/jquery.cookie.js' %}"></script> <script type="text/javascript" src="{% static 'javascript/jquery.cookie.js' %}"></script>
<script type="text/javascript" src="{% static 'javascript/jquery.form.js' %}"></script> <script type="text/javascript" src="{% static 'javascript/jquery.form.js' %}"></script>
{% endblock %} {% endblock %}
@ -17,7 +17,7 @@
<h1>{% trans 'Dashboard' %}</h1> <h1>{% trans 'Dashboard' %}</h1>
{% if perms.projector.can_manage_projector %} {% if perms.projector.can_manage_projector %}
<div style="text-align: right; padding: 0 10px 5px 0; margin-top:-20px;"> <div style="text-align: right; padding: 0 10px 5px 0; margin-top:-20px;">
<!-- projector control --> <!-- control projector view -->
{% trans "Adjust projector view" %}: {% trans "Adjust projector view" %}:
<a class="projector_edit" href="{% url projector_bigger %}" title="{% trans 'Zoom in' %}"> <a class="projector_edit" href="{% url projector_bigger %}" title="{% trans 'Zoom in' %}">
<img src="{% static 'images/icons/zoom-in.png' %}" /> <img src="{% static 'images/icons/zoom-in.png' %}" />