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

Move vendored js files into js/vendor/

Browse Source
This commit is contained in:
Prem Sichanugrist
2012-07-06 12:07:21 -04:00
parent 07aae06d30
commit 9dc5cddeb7
37 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cms/templates/base.html
View File

@@ -11,8 +11,8 @@
% else:
<link rel="stylesheet" href="${ STATIC_URL }/css/base-style.css">
% endif
<link rel="stylesheet" type="text/css" href="${ STATIC_URL }/js/markitup/skins/simple/style.css" />
<link rel="stylesheet" type="text/css" href="${ STATIC_URL }/js/markitup/sets/wiki/style.css" />
<link rel="stylesheet" type="text/css" href="${ STATIC_URL }/js/vendor/markitup/skins/simple/style.css" />
<link rel="stylesheet" type="text/css" href="${ STATIC_URL }/js/vendor/markitup/sets/wiki/style.css" />
<title><%block name="title"></%block></title>
<meta name="viewport" content="width=device-width,initial-scale=1">
</head>
@@ -23,12 +23,12 @@
<%block name="content"></%block>
<script type="text/javascript" src="${ STATIC_URL}/js/jquery.min.js"></script>
<script type="text/javascript" src="${ STATIC_URL}/js/json2.js"></script>
<script type="text/javascript" src="${ STATIC_URL}/js/underscore-min.js"></script>
<script type="text/javascript" src="${ STATIC_URL}/js/backbone-min.js"></script>
<script type="text/javascript" src="${ STATIC_URL }/js/markitup/jquery.markitup.js"></script>
<script type="text/javascript" src="${ STATIC_URL }/js/markitup/sets/wiki/set.js"></script>
<script type="text/javascript" src="${ STATIC_URL}/js/vendor/jquery.min.js"></script>
<script type="text/javascript" src="${ STATIC_URL}/js/vendor/json2.js"></script>
<script type="text/javascript" src="${ STATIC_URL}/js/vendor/underscore-min.js"></script>
<script type="text/javascript" src="${ STATIC_URL}/js/vendor/backbone-min.js"></script>
<script type="text/javascript" src="${ STATIC_URL }/js/vendor/markitup/jquery.markitup.js"></script>
<script type="text/javascript" src="${ STATIC_URL }/js/vendor/markitup/sets/wiki/set.js"></script>
% if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
<%static:js group='main'/>
% else:
@@ -36,10 +36,10 @@
% endif
<%static:js group='module-js'/>
<script src="${ STATIC_URL }/js/jquery.inlineedit.js"></script>
<script src="${ STATIC_URL }/js/jquery.cookie.js"></script>
<script src="${ STATIC_URL }/js/jquery.leanModal.min.js"></script>
<script src="${ STATIC_URL }/js/jquery.tablednd.js"></script>
<script src="${ STATIC_URL }/js/vendor/jquery.inlineedit.js"></script>
<script src="${ STATIC_URL }/js/vendor/jquery.cookie.js"></script>
<script src="${ STATIC_URL }/js/vendor/jquery.leanModal.min.js"></script>
<script src="${ STATIC_URL }/js/vendor/jquery.tablednd.js"></script>
</body>
</html>

2
cms/templates/jasmine/base.html
View File

@@ -10,7 +10,7 @@
{# core files #}
<script src="{% static 'jasmine-latest/jasmine.js' %}"></script>
<script src="{% static 'jasmine-latest/jasmine-html.js' %}"></script>
<script src="{% static 'js/jasmine-jquery.js' %}"></script>
<script src="{% static 'js/vendor/jasmine-jquery.js' %}"></script>
{# source files #}
{% for url in suite.js_files %}