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

Updated js and css libraries (twitter bootstrap to 2.2.2 and jquery to 1.9.0).

Browse Source
This commit is contained in:
Emanuel Schuetze 2013-01-18 22:10:00 +01:00
parent a4592ec849
commit da4ed365bc
11 changed files with 33 additions and 6678 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extras/benchmark/bench.py
View File

@ -31,7 +31,7 @@ URL_SETS = {
"/jsi18n/", "/jsi18n/",
"/static/styles/base.css", "/static/styles/base.css",
"/static/javascript/utils.js", "/static/javascript/utils.js",
"/static/javascript/jquery.js", "/static/javascript/jquery.min.js",
"/static/images/bg-submenu.gif", "/static/images/bg-submenu.gif",
"/static/images/bg-header.gif", "/static/images/bg-header.gif",
"/static/images/logo.png", "/static/images/logo.png",
@ -44,7 +44,7 @@ URL_SETS = {
"/static/styles/tabledrag.css", "/static/styles/tabledrag.css",
"/static/javascript/utils.js", "/static/javascript/utils.js",
"/static/styles/agenda.css", "/static/styles/agenda.css",
"/static/javascript/jquery.js", "/static/javascript/jquery.min.js",
"/jsi18n/", "/jsi18n/",
"/static/images/bg-header.gif", "/static/images/bg-header.gif",
"/static/images/bg-submenu.gif", "/static/images/bg-submenu.gif",
@ -56,7 +56,7 @@ URL_SETS = {
"/application/", "/application/",
"/static/styles/base.css", "/static/styles/base.css",
"/static/javascript/utils.js", "/static/javascript/utils.js",
"/static/javascript/jquery.js", "/static/javascript/jquery.min.js",
"/jsi18n/", "/jsi18n/",
"/static/images/bg-header.gif", "/static/images/bg-header.gif",
"/static/images/bg-submenu.gif", "/static/images/bg-submenu.gif",

5
openslides/motion/templates/motion/view.html
View File

@ -16,6 +16,7 @@
{% block content %} {% block content %}
<h1> <h1>
{{ version.title }} {{ version.title }}
<br>
<small> <small>
{% if motion.number != None %} {% if motion.number != None %}
{% trans "Motion" %} {{ motion.number }}, {% trans "Motion" %} {{ motion.number }},
@ -67,7 +68,7 @@
</h1> </h1>
<div class="row-fluid"> <div class="row-fluid">
<div class="span9"> <div class="span8">
{% if motion.public_version != motion.last_version %} {% if motion.public_version != motion.last_version %}
&#8901; &#8901;
{% if version == motion.public_version %} {% if version == motion.public_version %}
@ -156,7 +157,7 @@
</div> <!--/span--> </div> <!--/span-->
<div class="span3"> <div class="span4">
<div class="well"> <div class="well">
<!-- Submitter --> <!-- Submitter -->
<h5>{% trans "Submitter" %}:</h5> <h5>{% trans "Submitter" %}:</h5>

2
openslides/projector/templates/base-projector.html
View File

@ -8,7 +8,7 @@
<head> <head>
<link type="text/css" rel="stylesheet" href="{% static 'styles/projector.css' %}"> <link type="text/css" rel="stylesheet" href="{% static 'styles/projector.css' %}">
<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.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>XX{% block title %} {% get_config 'event_name' %} {% endblock %}</title>
{% block header %} {% block header %}

2
openslides/static/javascript/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
openslides/static/javascript/jquery.js vendored
View File

File diff suppressed because one or more lines are too long

4
openslides/static/javascript/jquery.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1040
openslides/static/styles/bootstrap-responsive.css vendored
View File

File diff suppressed because it is too large Load Diff

9
openslides/static/styles/bootstrap-responsive.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

5624
openslides/static/styles/bootstrap.css vendored
View File

File diff suppressed because it is too large Load Diff

9
openslides/static/styles/bootstrap.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

6
openslides/templates/base.html
View File

@ -12,8 +12,8 @@
<title>{% block title %}{% get_config 'event_name' %}{% endblock %}</title> <title>{% block title %}{% get_config 'event_name' %}{% endblock %}</title>
<!-- styles --> <!-- styles -->
<link href="{% static 'styles/bootstrap.css' %}" type="text/css" rel="stylesheet"> <link href="{% static 'styles/bootstrap.min.css' %}" type="text/css" rel="stylesheet">
<link href="{% static 'styles/bootstrap-responsive.css' %}" type="text/css" rel="stylesheet"> <link href="{% static 'styles/bootstrap-responsive.min.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" />
@ -107,7 +107,7 @@
{% endblock %}<!--/body--> {% endblock %}<!--/body-->
<!-- JavaScript (Placed at the end of the document so the pages load faster) --> <!-- JavaScript (Placed at the end of the document so the pages load faster) -->
<script src="{% static 'javascript/jquery.js' %}" type="text/javascript"></script> <script src="{% static 'javascript/jquery.min.js' %}" type="text/javascript"></script>
<script src="{% static 'javascript/utils.js' %}" type="text/javascript"></script> <script src="{% static 'javascript/utils.js' %}" type="text/javascript"></script>
<script src="{% static 'javascript/bootstrap.min.js' %}" type="text/javascript"></script> <script src="{% static 'javascript/bootstrap.min.js' %}" type="text/javascript"></script>
<script type="text/javascript" src="{% url 'django.views.i18n.javascript_catalog' %}"></script> <script type="text/javascript" src="{% url 'django.views.i18n.javascript_catalog' %}"></script>