summaryrefslogtreecommitdiff
path: root/ishtar_common/templates/base.html
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar_common/templates/base.html')
-rw-r--r--ishtar_common/templates/base.html84
1 files changed, 34 insertions, 50 deletions
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index 75e0e3740..ce383ba6c 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -1,35 +1,25 @@
-{% load i18n %}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{{LANGUAGE_CODE}}" lang="{{LANGUAGE_CODE}}">
-
+{% load i18n compress %}<!doctype html>
+<html lang="{{LANGUAGE_CODE}}">
<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="shortcut icon" href="{{STATIC_URL}}/media/images/favicon.png"/>
- <title>{% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %}
- </title>
+ <title>{% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %}</title>
+ {% compress js %}
<script language="javascript" type="text/javascript">
var url_path = "{{URL_PATH}}";
</script>
<script language="javascript" type="text/javascript" src="{{JQUERY_URL}}?ver={{VERSION}}"></script>
+ <script language="javascript" type="text/javascript" src="{{STATIC_URL}}popper.min.js?ver={{VERSION}}"></script>
+ <script language="javascript" type="text/javascript" src="{{STATIC_URL}}bootstrap/bootstrap.js?ver={{VERSION}}"></script>
<script language="javascript" type="text/javascript" src="{{JQUERY_UI_URL}}jquery-ui.js?ver={{VERSION}}"></script>
<script language="javascript" type="text/javascript" src="{{JQUERY_UI_URL}}ui/i18n/jquery.ui.datepicker-{{COUNTRY}}.js?ver={{VERSION}}"></script>
<script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/chosen/chosen.jquery.min.js?ver={{VERSION}}"></script>
- <script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/prettyPhoto/js/jquery.prettyPhoto.js?ver={{VERSION}}"></script>
+ {# <script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/prettyPhoto/js/jquery.prettyPhoto.js?ver={{VERSION}}"></script> #}
<script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/i18n/grid.locale-{{COUNTRY}}.js?ver={{VERSION}}"></script>
<script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/jquery.jqGrid.min.js?ver={{VERSION}}"></script>
<script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/grid.tbltogrid.js?ver={{VERSION}}"></script>
<script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/ishtar.js?ver={{VERSION}}"></script>
- <link type="text/css" href="{{JQUERY_UI_URL}}jquery-ui.css?ver={{VERSION}}" rel="stylesheet" />
- <link type="text/css" href="{{STATIC_URL}}js/chosen/chosen.min.css?ver={{VERSION}}" rel="stylesheet" />
- <link rel="stylesheet" href="{{STATIC_URL}}font-awesome/css/font-awesome.min.css?ver={{VERSION}}" />
- <link rel="stylesheet" href="{{STATIC_URL}}js/prettyPhoto/css/prettyPhoto.css?ver={{VERSION}}" />
- <link rel="stylesheet" href="{{STATIC_URL}}media/ui.jqgrid.css?ver={{VERSION}}" />
- <link rel="stylesheet" href="{{STATIC_URL}}media/style.css?ver={{VERSION}}" />
- {% for url_css in JQGRID_CSS %}<link rel="stylesheet" href="{{url_css}}?ver={{VERSION}}" />{% endfor %}
- {% include "blocks/extra_head.html" %}
- {% block extra_head %}
- {% endblock %}
- {% if raw_css %}<style media="screen" type="text/css">{{raw_css|safe}}
- </style>{% endif %}
<script type='text/javascript'>
var shortcut_url = '{% url "shortcut-menu" %}';
var get_file_url = '{% url "get-file-shortcut" %}';
@@ -41,32 +31,24 @@
var activate_all_search_msg = "{% trans 'Searches in the shortcut menu deal with all items.' %}";
var activate_own_search_msg = "{% trans 'Searches in the shortcut menu deal with only your items.' %}";
</script>
+ {% endcompress %}
+ {% compress css %}
+ <link rel="stylesheet" href="{{STATIC_URL}}bootstrap/bootstrap.css?ver={{VERSION}}">
+ <link rel="stylesheet" href="{{STATIC_URL}}js/chosen/chosen.min.css?ver={{VERSION}}">
+ <link rel="stylesheet" href="{{STATIC_URL}}font-awesome/css/font-awesome.min.css?ver={{VERSION}}">
+ <link rel="stylesheet" href="{{STATIC_URL}}js/prettyPhoto/css/prettyPhoto.css?ver={{VERSION}}">
+ <link rel="stylesheet" href="{{STATIC_URL}}media/ui.jqgrid.css?ver={{VERSION}}">
+ <link rel="stylesheet" href="{{STATIC_URL}}media/styles.css?ver={{VERSION}}">
+ {% for url_css in JQGRID_CSS %}<link rel="stylesheet" href="{{url_css}}?ver={{VERSION}}">{% endfor %}
+ <link rel="stylesheet" href="{{STATIC_URL}}pdl/styles.css?ver={{VERSION}}" />
+ {% endcompress %}
+ {% block extra_head %}
+ {% endblock %}
+ {% comment %}{% if raw_css %}<style media="screen" type="text/css">
+ {{raw_css |safe}}</style>{% endif %}{% endcomment %}
</head>
<body{% if current_theme%} id='{{current_theme}}'{%endif%}>
- <div id="header">
- {% block header %}
- {% if user.is_authenticated %}
- {% trans "Logged in" %}: {{ user.username }}
- (<a href="{% url 'auth_logout' %}">{% trans "Log out" %}</a> |
- <a href="{% url 'auth_password_change' %}">{% trans "Change password" %}</a>)
- {% else %}
- <strong><a href="{% url 'auth_login' %}">{% trans "Log in" %}</a></strong>
- {% endif %}
- {% if LANGUAGES|length > 1 %}
- <div id="language_form_div">
- <form action="/i18n/setlang/" method="post" id='language_form'>
- {% csrf_token %}
- {% comment %}<label for='language_selector'>{% trans "Lang" %}{% trans ":"%} </label>{% endcomment %}
- <select name="language" id='language_selector'>
- <option value="">----------</option>
- {% for lang in LANGUAGES %}
- <option value="{{ lang.0 }}"{% ifequal LANGUAGE_CODE lang.0 %} selected='selected'{% endifequal %}>{{ lang.1 }}</option>
- {% endfor %}
- </select>
- </form>
- </div>{% endif %}
- {% endblock %}
- </div>
+ {% include "navbar.html" %}
<div class="nav-button ui-state-default ui-corner-all" id="to_bottom_arrow">
<i class="fa fa-arrow-circle-down" aria-hidden="true"></i>
</div>
@@ -75,7 +57,6 @@
</div>
<div id="window"></div>
<a href='{% url "start" %}' id="logo">
-{% if APP_NAME %}<p id="app_name">{{APP_NAME}}</p>{%endif%}
</a>
{% if not reminders %}<div id="context_menu"></div>
{% else %}<fieldset id='reminder'><legend>{% trans "Current items" %}</legend>
@@ -108,12 +89,15 @@
{% endfor %}
</ul>
</div>
- <div id="content">
- {% if warnings %}
- <ul class="alert">{% for warning in warnings %}
- <li>{{warning}}</li>{% endfor %}
- </ul>
- {% endif %}
+ <div class="container">
+ {% if warnings %}{% for warning in warnings %}
+ <div class="alert alert-warning alert-dismissible fade show" role="alert">
+ {{warning}}
+ <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+ <span aria-hidden="true">&times;</span>
+ </button>
+ </div>
+ {% endfor %}{% endif %}
{% block content %}{% endblock %}
</div>
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-17 18:27:47 +0000