Commit 2ef74b7e authored by Mathieu Courcelles's avatar Mathieu Courcelles

Updates base.html template (jquery issue)

parent 391de2ce
Pipeline #14905477 passed with stage
in 1 minute and 7 seconds
This diff is collapsed.
{% load admin_static %}{% load i18n grp_tags %}
{% load mytemplatetags %}
{% load static %}
<!DOCTYPE html>
{% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %}
<html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
<head>
<title>{% block title %}{% endblock %}</title>
<meta charset="utf-8" />
<link rel="apple-touch-icon" sizes="180x180" href="{% static 'icons/apple-touch-icon.png' %}">
<link rel="icon" type="image/png" sizes="32x32" href="{% static 'icons/favicon-32x32.png' %}">
<link rel="icon" type="image/png" sizes="16x16" href="{% static 'icons/favicon-16x16.png' %}">
......@@ -23,8 +21,8 @@
{% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE" />{% endblock %}
<!-- STYLESHEETS -->
{% block stylesheets %}
<link href="{% static "grappelli/jquery/ui/css/custom-theme/jquery-ui-1.10.3.custom.min.css" %}" rel="stylesheet" type="text/css" media="screen" />
<link href="{% static "grappelli/stylesheets/screen.css" %}" rel="stylesheet" type="text/css" media="screen" />
<link href="{% static "grappelli/jquery/ui/jquery-ui.min.css" %}" rel="stylesheet" type="text/css" media="screen" />
<link href="{% static "grappelli/stylesheets/screen.css" %}" rel="stylesheet" type="text/css" media="all" />
{% if LANGUAGE_BIDI %}
<link href="{% static "grappelli/stylesheets/mueller/grid/output-rtl.css" %}" rel="stylesheet" type="text/css" media="screen" />
<link href="{% block stylesheet_rtl %}{% static "grappelli/stylesheets/rtl.css" %}{% endblock %}" rel="stylesheet" type="text/css" media="screen" />
......@@ -47,12 +45,9 @@
TIME_FORMAT = "{% get_time_format %}",
DATETIME_FORMAT = "{% get_datetime_format %}";
</script>
<!-- Font Awesome -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
<!-- jQuery, jQuery-UI -->
<script src="{% static "grappelli/jquery/jquery-1.9.1.min.js" %}" type="text/javascript"></script>
<script src="{% static "grappelli/jquery/ui/js/jquery-ui-1.10.3.custom.min.js" %}" type="text/javascript"></script>
<script src="{% static "grappelli/jquery/jquery.min.js" %}" type="text/javascript"></script>
<script src="{% static "grappelli/jquery/ui/jquery-ui.min.js" %}" type="text/javascript"></script>
{% if debug %}
<!-- Grappelli Main JS -->
<script src="{% static "grappelli/js/grappelli.js" %}" type="text/javascript"></script>
......@@ -100,18 +95,20 @@
<noscript><p><img src="{{ settings.PIWIK_URL }}piwik.php?idsite={{ settings.PIWIK_SITEID }}&rec=1" style="border:0;" alt="" /></p></noscript>
<!-- End Piwik Code -->
{% endif %}
</head>
<body class="{% if is_popup %}grp-popup {% endif %}{% block bodyclass %}{% endblock %}{% if LANGUAGE_BIDI %} rtl{% endif %}">
<div id="grp-container">
<div id="container" class="grp-container">
{% block header %}
<!-- HEADER -->
<header id="grp-header" class="{% block header-class %}{% endblock %}">
{% if not is_popup %}
{% block navigation %}
<!-- NAVIGATION -->
<div id="grp-navigation">
{% block admin_title %}<h1 id="grp-admin-title">{% if grappelli_admin_title %}{{ grappelli_admin_title }}{% else %}{% get_admin_title %}{% endif %}</h1>{% endblock %}
{% block user-tools %}
{% if user.is_authenticated and user.is_staff %}
<ul id="grp-user-tools">
<!-- Userlinks -->
......@@ -130,6 +127,10 @@
{% switch_user_dropdown %}
</ul>
</li>
<!-- Site URL -->
{% if site_url %}
<li><a href="{{ site_url }}">{% trans 'View site' %}</a></li>
{% endif %}
<!-- Documentation -->
{% url 'django-admindocs-docroot' as docsroot %}
{% if docsroot %}
......@@ -138,10 +139,13 @@
{% endblock %}
</ul>
{% endif %}
{% endblock %}
<!-- Nav-Global -->
{% block nav-global %}{% endblock %}
</div>
{% endblock %}
{% block context-navigation %}
<!-- CONTEXT NAVIGATION -->
<div id="grp-context-navigation">
<nav id="grp-breadcrumbs" class="{% block breadcrumbs-class %}{% endblock %}">
......@@ -160,8 +164,11 @@
{% block page-tools %}{% endblock %}
</nav>
</div>
{% endblock %}
{% endif %}
</header>
{% endblock %}
<!-- CONTENT -->
<article id="grp-content" class="{% block content-class %}{% endblock %}">
......@@ -191,8 +198,6 @@
{{ content }}
{% block filters %}{% endblock %}
{% endblock %}
</div>
</article>
......@@ -200,12 +205,12 @@
<!-- FOOTER -->
{% block footer %}{% endblock %}
</div>
&nbsp;<br /><br /><br /><br /><br /><br /><br /><br /><br />
<div id="ftr" align="center"><a rel="license" href="http://creativecommons.org/licenses/by-nc/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc/4.0/80x15.png" /></a>&nbsp;&nbsp;&nbsp;&nbsp;<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">CLMSVault</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://democlmsvault.tyerslab.com" property="cc:attributionName" rel="cc:attributionURL">Mathieu Courcelles</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc/4.0/">Creative Commons Attribution-NonCommercial 4.0 International License</a>. Copyright &#169; 2012-2017 <a href="http://www.iric.ca/en/">IRIC</a> - <a href="http://www.iric.ca/en/research/principal-investigators/michael-tyers/">Mike Tyers lab</a>.</div>
<br />
</body>
</html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment