Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8057 from edx/db/reorg-main-html-imports

Browse Source 
Reorganize imports in main HTML templates for Studio and LMS
This commit is contained in:
David Baumgold
2015-05-15 15:00:34 -04:00
parent b147117d22 85839b5801
commit 90daffe33d
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cms/templates/base.html
View File

@@ -1,19 +1,16 @@
## -*- coding: utf-8 -*-
## coding=utf-8
<%namespace name='static' file='static_content.html'/>
<%!
from django.utils.translation import ugettext as _
from django.utils.translation import get_language_bidi
from django.template.defaultfilters import escapejs
import json
%>
<%namespace name='static' file='static_content.html'/>
dir_rtl = 'rtl' if get_language_bidi() else 'ltr'
%>
<!doctype html>
<!--[if lte IE 9]><html class="ie9 lte9" lang="${LANGUAGE_CODE}"><![endif]-->
<!--[if !IE]><<!--><html lang="${LANGUAGE_CODE}"><!--<![endif]-->
<%
# set doc language direction
from django.utils.translation import get_language_bidi
dir_rtl = 'rtl' if get_language_bidi() else 'ltr'
%>
<head dir="${dir_rtl}">
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

22
lms/templates/main.html
View File

@@ -1,23 +1,23 @@
## coding=utf-8
<%namespace name='static' file='static_content.html'/>
<%!
from django.utils.http import urlquote_plus
from django.utils.translation import ugettext as _
from django.utils.translation import get_language_bidi
from microsite_configuration import microsite
from microsite_configuration import page_title_breadcrumbs
dir_rtl = 'rtl' if get_language_bidi() else 'ltr'
%>
<!DOCTYPE html>
<!--[if lte IE 9]><html class="ie ie9 lte9" lang="${LANGUAGE_CODE}"><![endif]-->
<!--[if !IE]><!--><html lang="${LANGUAGE_CODE}"><!--<![endif]-->
<%
# set doc language direction
from django.utils.translation import get_language_bidi
dir_rtl = 'rtl' if get_language_bidi() else 'ltr'
%>
<head dir="${dir_rtl}">
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
% if responsive:
<meta name="viewport" content="width=device-width, initial-scale=1">
% endif
<%! from django.utils.translation import ugettext as _ %>
<%! from microsite_configuration import microsite %>
<%! from microsite_configuration import page_title_breadcrumbs %>
<%namespace name='static' file='static_content.html'/>
<%! from django.utils.http import urlquote_plus %>
## Define a couple of helper functions to make life easier when
## embedding theme conditionals into templates. All inheriting