Updated js and css libraries (twitter bootstrap to 2.2.2 and jquery to 1.9.0).
This commit is contained in:
parent
a4592ec849
commit
da4ed365bc
@ -31,7 +31,7 @@ URL_SETS = {
|
||||
"/jsi18n/",
|
||||
"/static/styles/base.css",
|
||||
"/static/javascript/utils.js",
|
||||
"/static/javascript/jquery.js",
|
||||
"/static/javascript/jquery.min.js",
|
||||
"/static/images/bg-submenu.gif",
|
||||
"/static/images/bg-header.gif",
|
||||
"/static/images/logo.png",
|
||||
@ -44,7 +44,7 @@ URL_SETS = {
|
||||
"/static/styles/tabledrag.css",
|
||||
"/static/javascript/utils.js",
|
||||
"/static/styles/agenda.css",
|
||||
"/static/javascript/jquery.js",
|
||||
"/static/javascript/jquery.min.js",
|
||||
"/jsi18n/",
|
||||
"/static/images/bg-header.gif",
|
||||
"/static/images/bg-submenu.gif",
|
||||
@ -56,7 +56,7 @@ URL_SETS = {
|
||||
"/application/",
|
||||
"/static/styles/base.css",
|
||||
"/static/javascript/utils.js",
|
||||
"/static/javascript/jquery.js",
|
||||
"/static/javascript/jquery.min.js",
|
||||
"/jsi18n/",
|
||||
"/static/images/bg-header.gif",
|
||||
"/static/images/bg-submenu.gif",
|
||||
|
@ -16,6 +16,7 @@
|
||||
{% block content %}
|
||||
<h1>
|
||||
{{ version.title }}
|
||||
<br>
|
||||
<small>
|
||||
{% if motion.number != None %}
|
||||
{% trans "Motion" %} {{ motion.number }},
|
||||
@ -67,7 +68,7 @@
|
||||
</h1>
|
||||
|
||||
<div class="row-fluid">
|
||||
<div class="span9">
|
||||
<div class="span8">
|
||||
{% if motion.public_version != motion.last_version %}
|
||||
⋅
|
||||
{% if version == motion.public_version %}
|
||||
@ -156,7 +157,7 @@
|
||||
</div> <!--/span-->
|
||||
|
||||
|
||||
<div class="span3">
|
||||
<div class="span4">
|
||||
<div class="well">
|
||||
<!-- Submitter -->
|
||||
<h5>{% trans "Submitter" %}:</h5>
|
||||
|
@ -8,7 +8,7 @@
|
||||
<head>
|
||||
<link type="text/css" rel="stylesheet" href="{% static 'styles/projector.css' %}">
|
||||
<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>
|
||||
<title>XX{% block title %} {% get_config 'event_name' %} {% endblock %}</title>
|
||||
{% block header %}
|
||||
|
File diff suppressed because one or more lines are too long
4
openslides/static/javascript/jquery.js
vendored
4
openslides/static/javascript/jquery.js
vendored
File diff suppressed because one or more lines are too long
4
openslides/static/javascript/jquery.min.js
vendored
Normal file
4
openslides/static/javascript/jquery.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1040
openslides/static/styles/bootstrap-responsive.css
vendored
1040
openslides/static/styles/bootstrap-responsive.css
vendored
File diff suppressed because it is too large
Load Diff
9
openslides/static/styles/bootstrap-responsive.min.css
vendored
Normal file
9
openslides/static/styles/bootstrap-responsive.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
5624
openslides/static/styles/bootstrap.css
vendored
5624
openslides/static/styles/bootstrap.css
vendored
File diff suppressed because it is too large
Load Diff
9
openslides/static/styles/bootstrap.min.css
vendored
Normal file
9
openslides/static/styles/bootstrap.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
@ -12,8 +12,8 @@
|
||||
<title>{% block title %}{% get_config 'event_name' %}{% endblock %}</title>
|
||||
|
||||
<!-- styles -->
|
||||
<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.min.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 'img/favicon.png' %}" type="image/png" rel="shortcut icon" />
|
||||
|
||||
@ -107,7 +107,7 @@
|
||||
{% endblock %}<!--/body-->
|
||||
|
||||
<!-- 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/bootstrap.min.js' %}" type="text/javascript"></script>
|
||||
<script type="text/javascript" src="{% url 'django.views.i18n.javascript_catalog' %}"></script>
|
||||
|
Loading…
Reference in New Issue
Block a user