mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-11-10 08:33:53 +01:00
Using bower to manage javascript dependencies.
This commit is contained in:
Antoine Nguyen
@@ -1,4 +0,0 @@
|
||||
{% extends "nlayout.html" %}
|
||||
{% block content %}
|
||||
<div id="fixed_content" class="container-fluid">{% block fixed_content %}{% endblock %}</div>
|
||||
{% endblock %}
|
||||
@@ -1,13 +1,14 @@
|
||||
<!DOCTYPE html>{% load url from future %}
|
||||
<!DOCTYPE html>
|
||||
{% load url from future %}
|
||||
{% load static %}
|
||||
<html lang="{{ LANGUAGE_CODE }}">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<title>{% block pagetitle %}{% endblock %}</title>
|
||||
<link rel="icon" type="image/png" href="{{ STATIC_URL }}css/logo-icon.png" />
|
||||
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/bootstrap.css" />
|
||||
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/bootstrap-responsive.css" />
|
||||
<script src="{{ STATIC_URL }}js/bootstrap.js" type="text/javascript"></script>
|
||||
<script src="{{ STATIC_URL }}js/bootstrap-datetimepicker.js" type="text/javascript"></script>
|
||||
<link rel="icon" type="image/png" href="{% static 'css/logo-icon.png' %}" />
|
||||
<link rel="stylesheet" type="text/css" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}" />
|
||||
<script src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}" type="text/javascript"></script>
|
||||
<script src="{% static 'eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js' %}" type="text/javascript"></script>
|
||||
{% url "django.views.i18n.javascript_catalog" as catalog_url %}
|
||||
<script type="text/javascript" src="{{ catalog_url }}"></script>
|
||||
<style>
|
||||
|
||||
@@ -1,28 +1,34 @@
|
||||
<!DOCTYPE html>{% load i18n core_tags lib_tags %}{% load url from future %}
|
||||
<!DOCTYPE html>
|
||||
{% load static %}
|
||||
{% load i18n core_tags lib_tags %}{% load url from future %}
|
||||
<html lang="{{ LANGUAGE_CODE }}">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
|
||||
<title>{% block pagetitle %}{% endblock %}</title>
|
||||
<link rel="icon" type="image/png" href="{{ STATIC_URL }}css/logo-icon.png" />
|
||||
<link rel="stylesheet" href="{{ STATIC_URL }}css/font-awesome/css/font-awesome.min.css">
|
||||
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/bootstrap.css" />
|
||||
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/bootstrap-datetimepicker.css" />
|
||||
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/bootstrap-select.min.css" />
|
||||
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/custom.css" />
|
||||
<script src="{{ STATIC_URL }}js/jquery.js" type="text/javascript"></script>
|
||||
<script src="{{ STATIC_URL }}js/bootstrap.js" type="text/javascript"></script>
|
||||
<script src="{{ STATIC_URL }}js/bootstrap-datetimepicker.js" type="text/javascript"></script>
|
||||
<script src="{{ STATIC_URL }}js/bootstrap-select.min.js" type="text/javascript"></script>
|
||||
{% if LANGUAGE_CODE != "en" %}<script src="{{ STATIC_URL }}js/locales/bootstrap-datetimepicker.{{ LANGUAGE_CODE }}.js" type="text/javascript"></script>{% endif %}
|
||||
<link rel="icon" type="image/png" href="{% static 'css/logo-icon.png' %}" />
|
||||
<link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css' %}">
|
||||
<link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}" />
|
||||
<link rel="stylesheet" href="{% static 'eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css' %}" />
|
||||
<link rel="stylesheet" href="{% static 'bootstrap-select/bootstrap-select.min.css' %}" />
|
||||
<link rel="stylesheet" type="text/css" href="{% static 'css/custom.css' %}" />
|
||||
|
||||
<script src="{% static 'jquery/jquery.js' %}" type="text/javascript"></script>
|
||||
<script src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}" type="text/javascript"></script>
|
||||
<script type="text/javascript" src="{% static 'moment/min/moment.min.js' %}"></script>
|
||||
<script src="{% static 'eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js' %}" type="text/javascript"></script>
|
||||
<script src="{% static 'bootstrap-select/bootstrap-select.min.js' %}" type="text/javascript"></script>
|
||||
{% if LANGUAGE_CODE != "en" %}<script src="{% static 'moment/locale/{{ LANGUAGE_CODE }}.js' %}" type="text/javascript"></script>{% endif %}
|
||||
{% if TEMPLATE_DEBUG %}
|
||||
<script src="//maxcdn.bootstrapcdn.com/bootlint/0.4.0/bootlint.min.js"></script>
|
||||
<script src="{{ STATIC_URL }}js/global.js" type="text/javascript"></script>
|
||||
<script src="{{ STATIC_URL }}js/csrf.js" type="text/javascript"></script>
|
||||
<script src="{{ STATIC_URL }}js/confirmation.js" type="text/javascript"></script>
|
||||
<script src="{{ STATIC_URL }}js/notify.js" type="text/javascript"></script>
|
||||
<script src="{{ STATIC_URL }}js/poller.js" type="text/javascript"></script>
|
||||
<script src="{{ STATIC_URL }}js/top_notifications.js" type="text/javascript"></script>
|
||||
{% endif %}
|
||||
<script src="{% static 'js/global.js' %}" type="text/javascript"></script>
|
||||
<script src="{% static 'js/csrf.js' %}" type="text/javascript"></script>
|
||||
<script src="{% static 'js/confirmation.js' %}" type="text/javascript"></script>
|
||||
<script src="{% static 'js/notify.js' %}" type="text/javascript"></script>
|
||||
<script src="{% static 'js/poller.js' %}" type="text/javascript"></script>
|
||||
<script src="{% static 'js/top_notifications.js' %}" type="text/javascript"></script>
|
||||
{% url "django.views.i18n.javascript_catalog" as catalog_url %}
|
||||
<script type="text/javascript" src="{{ catalog_url }}"></script>
|
||||
<script type="text/javascript">
|
||||
|
||||
@@ -1,16 +1,20 @@
|
||||
<!DOCTYPE html>{% load i18n core_tags lib_tags form_tags %}{% load url from future %}
|
||||
<!DOCTYPE html>
|
||||
{% load i18n core_tags lib_tags form_tags %}
|
||||
{% load static %}
|
||||
{% load url from future %}
|
||||
<html lang="{{ LANGUAGE_CODE }}">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<title>{% trans "Welcome to Modoboa" %}</title>
|
||||
<link rel="icon" type="image/png" href="{{ STATIC_URL }}css/logo-icon.png" />
|
||||
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/bootstrap.css" />
|
||||
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/bootstrap-responsive.css" />
|
||||
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/login.css" />
|
||||
<script type="text/javascript" src="{{ STATIC_URL }}js/jquery.js"></script>
|
||||
<script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap.js"></script>
|
||||
{% url "django.views.i18n.javascript_catalog" as catalog_url %}
|
||||
<script type="text/javascript" src="{{ catalog_url }}"></script>
|
||||
<link rel="icon" type="image/png" href="{% static 'css/logo-icon.png' %}" />
|
||||
<link rel="stylesheet" type="text/css" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}" />
|
||||
<link rel="stylesheet" type="text/css" href="{% static 'css/login.css' %}" />
|
||||
<script type="text/javascript" src="{% static 'jquery/jquery.js' %}"></script>
|
||||
<script type="text/javascript" src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}"></script>
|
||||
{% if TEMPLATE_DEBUG %}
|
||||
<script src="//maxcdn.bootstrapcdn.com/bootlint/0.4.0/bootlint.min.js"></script>
|
||||
{% endif %}
|
||||
<script type="text/javascript" src="{% url 'django.views.i18n.javascript_catalog' %}"></script>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
$('#id_username').focus();
|
||||
@@ -20,43 +24,43 @@
|
||||
<body>
|
||||
<div class="container">
|
||||
<div id="box" class="col-lg-9 col-lg-offset-1">
|
||||
<div id="logo" class="row">
|
||||
<div id="logo" class="row">
|
||||
<ul class="thumbnails">
|
||||
<li>
|
||||
<div class="col-lg-offset-4 col-lg-5 col-md-offset-4 col-md-5 col-sm-offset-4 col-sm-5">
|
||||
<a href="#" class="thumbnail">
|
||||
<img src="{% get_modoboa_logo %}" />
|
||||
</a>
|
||||
</div>
|
||||
</li>
|
||||
<li>
|
||||
<div class="col-lg-offset-4 col-lg-5 col-md-offset-4 col-md-5 col-sm-offset-4 col-sm-5">
|
||||
<a href="#" class="thumbnail">
|
||||
<img src="{% get_modoboa_logo %}" />
|
||||
</a>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class=" divider"></div>
|
||||
<form method="post" action="{% url 'core:login' %}" class="login-form form-horizontal">
|
||||
{% csrf_token %}
|
||||
{% render_field form.username %}
|
||||
{% render_field form.password %}
|
||||
<input type="hidden" name="next" value="{{ next }}" />
|
||||
<div class="form-group">
|
||||
</div>
|
||||
<div class=" divider"></div>
|
||||
<form method="post" action="{% url 'core:login' %}" class="login-form form-horizontal">
|
||||
{% csrf_token %}
|
||||
{% render_field form.username %}
|
||||
{% render_field form.password %}
|
||||
<input type="hidden" name="next" value="{{ next }}" />
|
||||
<div class="form-group">
|
||||
<div class="control-label col-lg-4 col-md-4 col-sm-4 ">
|
||||
</div>
|
||||
<div class="col-lg-5 col-md-5 col-sm-5">
|
||||
<div class="checkbox">
|
||||
<label class="checkbox" for="id_rememberme">
|
||||
<div class="checkbox">
|
||||
<label class="checkbox" for="id_rememberme">
|
||||
<input type="checkbox" id="id_rememberme" name="rememberme" />{% trans "Remember me" %}
|
||||
</label>
|
||||
|
||||
</label>
|
||||
|
||||
<button class="btn btn-primary col-lg-12" type="submit">{% trans "Log in" %}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
<div class="login-error">
|
||||
{% if error %}{% alert error "danger" %}{% endif %}
|
||||
</div>
|
||||
</form>
|
||||
<div class="login-error">
|
||||
{% if error %}{% alert error "danger" %}{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
{% for annoucement in annoucements %}
|
||||
<div class="col-lg-offset-3 col-lg-5 well">{{ annoucement|safe }}</div>
|
||||
{% endfor %}
|
||||
</body>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user