Merge branch 'master' of github.com:torchbox/wagtail

pull/812/head
Matt Westcott 2014-11-13 13:03:07 +00:00
commit e1cc80f7eb
2 zmienionych plików z 7 dodań i 6 usunięć

Wyświetl plik

@ -38,15 +38,15 @@ body{
}
}
.browsermessage{
.capabilitymessage{
display:block;
background-color:$color-red;
color:white;
padding:1em 2em;
margin:0;
position:relative;
left:0;
top:0;
right:0;
width:100%;
text-align:center;
a{
color:white;

Wyświetl plik

@ -1,5 +1,5 @@
<!doctype html>
{% load compress %}
{% load compress i18n %}
<html class="no-js" lang="{{ LANGUAGE_CODE|default:"en-gb" }}">
<head>
<meta charset="utf-8" />
@ -18,8 +18,9 @@
</head>
<body class="{% block bodyclass %}{% endblock %} {% if messages %}has-messages{% endif %}">
<!--[if lt IE 9]>
<p class="browsermessage">You are using an <strong>outdated</strong> browser not supported by this software. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a>.</p>
<p class="capabilitymessage">{% blocktrans %}You are using an <strong>outdated</strong> browser not supported by this software. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a>.{% endblocktrans %}</p>
<![endif]-->
<noscript class="capabilitymessage">{% trans 'Javascript is required to use Wagtail, but it is currently disabled' %}</noscript>
{% block js %}{% endblock %}