altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Merged in [9524] from lars@netapp.com:

Browse source 
Add some shim js libraries for IE8 and earlier
(see http://getbootstrap.com/getting-started/#template)
Fix HTML structural errors in the template.
Wrap some HTML comments into Django comments, so they don't get sent to the
client.
 - Legacy-Id: 9539
Note: SVN reference [9524] has been migrated to Git commit 6f2e9f7c25
This commit is contained in:
Henrik Levkowetz 2015-04-21 20:28:13 +00:00
parent d30981ddbd 6f2e9f7c25
commit 6deac8e06e
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ietf/templates/base.html
View file

@ -9,9 +9,11 @@
<link href="/fonts/PTMono/stylesheet.css" rel='stylesheet' type='text/css'>
<link href="/fonts/PTSans/stylesheet.css" rel='stylesheet' type='text/css'>
<link href="/fonts/PTSerif/stylesheet.css" rel='stylesheet' type='text/css'>
{% comment %}
<!-- Halloween
<link href='http://fonts.googleapis.com/css?family=IM+Fell+English+SC|IM+Fell+DW+Pica:400,400italic|Nova+Mono|IM+Fell+English:400,400italic&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
-->
{% endcomment %}
<link rel="stylesheet" href="/css/bootstrap.min.css">
<link rel="stylesheet" href="/css/bootstrap-theme.min.css">
@ -21,6 +23,10 @@
{% block morecss %}{% endblock %}
</style>
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
{% block pagehead %}{% endblock %}
{% if server_mode and server_mode == "production" %}
@ -32,7 +38,6 @@
</head>
<body {% block bodyAttrs %}{%endblock%} data-group-menu-data-url="{% url "group_menu_data" %}">
<!-- Removing the amp|smartypants filter as it increases the rendering time with about 50% -->
<nav class="navbar {% if server_mode and server_mode == "production" %}navbar-inverse{% else %}navbar-default{% endif %} navbar-fixed-top" role="navigation">
<div class="container-fluid">
<div class="navbar-header">
@ -43,10 +48,10 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">
<img alt="IETF Logo" src="/images/ietflogo-small-transparent.png"></img>
<img alt="IETF Logo" src="/images/ietflogo-small-transparent.png">
{% if not user.is_authenticated %}
<div style="display: inline; vertical-align: top; padding-left: 1em;">
{% if server_mode and server_mode == "production" %}
{% if server_mode and server_mode == "production" %}
Datatracker
{% else %}
<b><i>Development mode</i></b>
@ -125,7 +130,6 @@
<a href="//www.iana.org/" class="padded">IANA</a>
</div>
</div>
</footer>
<footer class="row">
<div class="col-md-12">
@ -152,8 +156,10 @@
</div>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="/js/lib/jquery-1.11.2.min.js"><\/script>')</script>
{% comment %}
<!-- Remove the *-nojs attributes if we are running js. This depends on jQuery's removeClass(): -->
<!-- Do this as early as possible (after loading the page and jQuery) to avoid rendering changes -->
{% endcomment %}
<script>$(".visible-nojs").removeClass("visible-nojs");</script>
<script>$(".hidden-nojs").removeClass("hidden-nojs");</script>
<script src="/js/lib/jquery.cookie.min.js"></script>

4
ready-for-merge
View file

@ -7,7 +7,9 @@
# --- Add entries at the top ---
personal/lars/6.0.2.dev0@9523:9526
personal/lars/6.0.2.dev0@9526
personal/lars/6.0.2.dev0@9525
personal/lars/6.0.2.dev0@9524
personal/willem/v5.12.4.dev0@9316
branch/iola/facelift-r8876@8970 Test crawler speed-up
branch/iola/facelift-r8510@8733