From 9dc5cddeb75b32069dfe789af687fc3071d6a66e Mon Sep 17 00:00:00 2001 From: Prem Sichanugrist Date: Fri, 6 Jul 2012 12:07:21 -0400 Subject: [PATCH] Move vendored js files into js/vendor/ --- cms/static/coffee/files.json | 8 +++--- cms/static/js/{ => vendor}/backbone-min.js | 0 cms/static/js/{ => vendor}/jasmine-jquery.js | 0 cms/static/js/{ => vendor}/jquery.cookie.js | 0 .../js/{ => vendor}/jquery.inlineedit.js | 0 .../js/{ => vendor}/jquery.leanModal.min.js | 0 cms/static/js/{ => vendor}/jquery.min.js | 0 cms/static/js/{ => vendor}/jquery.tablednd.js | 0 cms/static/js/{ => vendor}/json2.js | 0 .../{ => vendor}/markitup/jquery.markitup.js | 0 .../markitup/sets/wiki/images/bold.png | Bin .../markitup/sets/wiki/images/clean.png | Bin .../markitup/sets/wiki/images/code.png | Bin .../markitup/sets/wiki/images/h1.png | Bin .../markitup/sets/wiki/images/h2.png | Bin .../markitup/sets/wiki/images/h3.png | Bin .../markitup/sets/wiki/images/h4.png | Bin .../markitup/sets/wiki/images/h5.png | Bin .../markitup/sets/wiki/images/image.png | Bin .../markitup/sets/wiki/images/italic.png | Bin .../markitup/sets/wiki/images/link.png | Bin .../markitup/sets/wiki/images/list-bullet.png | Bin .../sets/wiki/images/list-numeric.png | Bin .../markitup/sets/wiki/images/picture.png | Bin .../markitup/sets/wiki/images/preview.png | Bin .../markitup/sets/wiki/images/quotes.png | Bin .../markitup/sets/wiki/images/stroke.png | Bin .../markitup/sets/wiki/images/url.png | Bin .../js/{ => vendor}/markitup/sets/wiki/set.js | 0 .../{ => vendor}/markitup/sets/wiki/style.css | 0 .../markitup/skins/simple/images/handle.png | Bin .../markitup/skins/simple/images/menu.png | Bin .../markitup/skins/simple/images/submenu.png | Bin .../markitup/skins/simple/style.css | 0 cms/static/js/{ => vendor}/underscore-min.js | 0 cms/templates/base.html | 24 +++++++++--------- cms/templates/jasmine/base.html | 2 +- 37 files changed, 17 insertions(+), 17 deletions(-) rename cms/static/js/{ => vendor}/backbone-min.js (100%) rename cms/static/js/{ => vendor}/jasmine-jquery.js (100%) rename cms/static/js/{ => vendor}/jquery.cookie.js (100%) rename cms/static/js/{ => vendor}/jquery.inlineedit.js (100%) rename cms/static/js/{ => vendor}/jquery.leanModal.min.js (100%) rename cms/static/js/{ => vendor}/jquery.min.js (100%) rename cms/static/js/{ => vendor}/jquery.tablednd.js (100%) rename cms/static/js/{ => vendor}/json2.js (100%) rename cms/static/js/{ => vendor}/markitup/jquery.markitup.js (100%) rename cms/static/js/{ => vendor}/markitup/sets/wiki/images/bold.png (100%) rename cms/static/js/{ => vendor}/markitup/sets/wiki/images/clean.png (100%) rename cms/static/js/{ => vendor}/markitup/sets/wiki/images/code.png (100%) rename cms/static/js/{ => vendor}/markitup/sets/wiki/images/h1.png (100%) rename cms/static/js/{ => vendor}/markitup/sets/wiki/images/h2.png (100%) rename cms/static/js/{ => vendor}/markitup/sets/wiki/images/h3.png (100%) rename cms/static/js/{ => vendor}/markitup/sets/wiki/images/h4.png (100%) rename cms/static/js/{ => vendor}/markitup/sets/wiki/images/h5.png (100%) rename cms/static/js/{ => vendor}/markitup/sets/wiki/images/image.png (100%) rename cms/static/js/{ => vendor}/markitup/sets/wiki/images/italic.png (100%) rename cms/static/js/{ => vendor}/markitup/sets/wiki/images/link.png (100%) rename cms/static/js/{ => vendor}/markitup/sets/wiki/images/list-bullet.png (100%) rename cms/static/js/{ => vendor}/markitup/sets/wiki/images/list-numeric.png (100%) rename cms/static/js/{ => vendor}/markitup/sets/wiki/images/picture.png (100%) rename cms/static/js/{ => vendor}/markitup/sets/wiki/images/preview.png (100%) rename cms/static/js/{ => vendor}/markitup/sets/wiki/images/quotes.png (100%) rename cms/static/js/{ => vendor}/markitup/sets/wiki/images/stroke.png (100%) rename cms/static/js/{ => vendor}/markitup/sets/wiki/images/url.png (100%) rename cms/static/js/{ => vendor}/markitup/sets/wiki/set.js (100%) rename cms/static/js/{ => vendor}/markitup/sets/wiki/style.css (100%) rename cms/static/js/{ => vendor}/markitup/skins/simple/images/handle.png (100%) rename cms/static/js/{ => vendor}/markitup/skins/simple/images/menu.png (100%) rename cms/static/js/{ => vendor}/markitup/skins/simple/images/submenu.png (100%) rename cms/static/js/{ => vendor}/markitup/skins/simple/style.css (100%) rename cms/static/js/{ => vendor}/underscore-min.js (100%) diff --git a/cms/static/coffee/files.json b/cms/static/coffee/files.json index d3a414edb4..b396bec944 100644 --- a/cms/static/coffee/files.json +++ b/cms/static/coffee/files.json @@ -1,8 +1,8 @@ { "js_files": [ - "/static/js/jquery.min.js", - "/static/js/json2.js", - "/static/js/underscore-min.js", - "/static/js/backbone-min.js" + "/static/js/vendor/jquery.min.js", + "/static/js/vendor/json2.js", + "/static/js/vendor/underscore-min.js", + "/static/js/vendor/backbone-min.js" ] } diff --git a/cms/static/js/backbone-min.js b/cms/static/js/vendor/backbone-min.js similarity index 100% rename from cms/static/js/backbone-min.js rename to cms/static/js/vendor/backbone-min.js diff --git a/cms/static/js/jasmine-jquery.js b/cms/static/js/vendor/jasmine-jquery.js similarity index 100% rename from cms/static/js/jasmine-jquery.js rename to cms/static/js/vendor/jasmine-jquery.js diff --git a/cms/static/js/jquery.cookie.js b/cms/static/js/vendor/jquery.cookie.js similarity index 100% rename from cms/static/js/jquery.cookie.js rename to cms/static/js/vendor/jquery.cookie.js diff --git a/cms/static/js/jquery.inlineedit.js b/cms/static/js/vendor/jquery.inlineedit.js similarity index 100% rename from cms/static/js/jquery.inlineedit.js rename to cms/static/js/vendor/jquery.inlineedit.js diff --git a/cms/static/js/jquery.leanModal.min.js b/cms/static/js/vendor/jquery.leanModal.min.js similarity index 100% rename from cms/static/js/jquery.leanModal.min.js rename to cms/static/js/vendor/jquery.leanModal.min.js diff --git a/cms/static/js/jquery.min.js b/cms/static/js/vendor/jquery.min.js similarity index 100% rename from cms/static/js/jquery.min.js rename to cms/static/js/vendor/jquery.min.js diff --git a/cms/static/js/jquery.tablednd.js b/cms/static/js/vendor/jquery.tablednd.js similarity index 100% rename from cms/static/js/jquery.tablednd.js rename to cms/static/js/vendor/jquery.tablednd.js diff --git a/cms/static/js/json2.js b/cms/static/js/vendor/json2.js similarity index 100% rename from cms/static/js/json2.js rename to cms/static/js/vendor/json2.js diff --git a/cms/static/js/markitup/jquery.markitup.js b/cms/static/js/vendor/markitup/jquery.markitup.js similarity index 100% rename from cms/static/js/markitup/jquery.markitup.js rename to cms/static/js/vendor/markitup/jquery.markitup.js diff --git a/cms/static/js/markitup/sets/wiki/images/bold.png b/cms/static/js/vendor/markitup/sets/wiki/images/bold.png similarity index 100% rename from cms/static/js/markitup/sets/wiki/images/bold.png rename to cms/static/js/vendor/markitup/sets/wiki/images/bold.png diff --git a/cms/static/js/markitup/sets/wiki/images/clean.png b/cms/static/js/vendor/markitup/sets/wiki/images/clean.png similarity index 100% rename from cms/static/js/markitup/sets/wiki/images/clean.png rename to cms/static/js/vendor/markitup/sets/wiki/images/clean.png diff --git a/cms/static/js/markitup/sets/wiki/images/code.png b/cms/static/js/vendor/markitup/sets/wiki/images/code.png similarity index 100% rename from cms/static/js/markitup/sets/wiki/images/code.png rename to cms/static/js/vendor/markitup/sets/wiki/images/code.png diff --git a/cms/static/js/markitup/sets/wiki/images/h1.png b/cms/static/js/vendor/markitup/sets/wiki/images/h1.png similarity index 100% rename from cms/static/js/markitup/sets/wiki/images/h1.png rename to cms/static/js/vendor/markitup/sets/wiki/images/h1.png diff --git a/cms/static/js/markitup/sets/wiki/images/h2.png b/cms/static/js/vendor/markitup/sets/wiki/images/h2.png similarity index 100% rename from cms/static/js/markitup/sets/wiki/images/h2.png rename to cms/static/js/vendor/markitup/sets/wiki/images/h2.png diff --git a/cms/static/js/markitup/sets/wiki/images/h3.png b/cms/static/js/vendor/markitup/sets/wiki/images/h3.png similarity index 100% rename from cms/static/js/markitup/sets/wiki/images/h3.png rename to cms/static/js/vendor/markitup/sets/wiki/images/h3.png diff --git a/cms/static/js/markitup/sets/wiki/images/h4.png b/cms/static/js/vendor/markitup/sets/wiki/images/h4.png similarity index 100% rename from cms/static/js/markitup/sets/wiki/images/h4.png rename to cms/static/js/vendor/markitup/sets/wiki/images/h4.png diff --git a/cms/static/js/markitup/sets/wiki/images/h5.png b/cms/static/js/vendor/markitup/sets/wiki/images/h5.png similarity index 100% rename from cms/static/js/markitup/sets/wiki/images/h5.png rename to cms/static/js/vendor/markitup/sets/wiki/images/h5.png diff --git a/cms/static/js/markitup/sets/wiki/images/image.png b/cms/static/js/vendor/markitup/sets/wiki/images/image.png similarity index 100% rename from cms/static/js/markitup/sets/wiki/images/image.png rename to cms/static/js/vendor/markitup/sets/wiki/images/image.png diff --git a/cms/static/js/markitup/sets/wiki/images/italic.png b/cms/static/js/vendor/markitup/sets/wiki/images/italic.png similarity index 100% rename from cms/static/js/markitup/sets/wiki/images/italic.png rename to cms/static/js/vendor/markitup/sets/wiki/images/italic.png diff --git a/cms/static/js/markitup/sets/wiki/images/link.png b/cms/static/js/vendor/markitup/sets/wiki/images/link.png similarity index 100% rename from cms/static/js/markitup/sets/wiki/images/link.png rename to cms/static/js/vendor/markitup/sets/wiki/images/link.png diff --git a/cms/static/js/markitup/sets/wiki/images/list-bullet.png b/cms/static/js/vendor/markitup/sets/wiki/images/list-bullet.png similarity index 100% rename from cms/static/js/markitup/sets/wiki/images/list-bullet.png rename to cms/static/js/vendor/markitup/sets/wiki/images/list-bullet.png diff --git a/cms/static/js/markitup/sets/wiki/images/list-numeric.png b/cms/static/js/vendor/markitup/sets/wiki/images/list-numeric.png similarity index 100% rename from cms/static/js/markitup/sets/wiki/images/list-numeric.png rename to cms/static/js/vendor/markitup/sets/wiki/images/list-numeric.png diff --git a/cms/static/js/markitup/sets/wiki/images/picture.png b/cms/static/js/vendor/markitup/sets/wiki/images/picture.png similarity index 100% rename from cms/static/js/markitup/sets/wiki/images/picture.png rename to cms/static/js/vendor/markitup/sets/wiki/images/picture.png diff --git a/cms/static/js/markitup/sets/wiki/images/preview.png b/cms/static/js/vendor/markitup/sets/wiki/images/preview.png similarity index 100% rename from cms/static/js/markitup/sets/wiki/images/preview.png rename to cms/static/js/vendor/markitup/sets/wiki/images/preview.png diff --git a/cms/static/js/markitup/sets/wiki/images/quotes.png b/cms/static/js/vendor/markitup/sets/wiki/images/quotes.png similarity index 100% rename from cms/static/js/markitup/sets/wiki/images/quotes.png rename to cms/static/js/vendor/markitup/sets/wiki/images/quotes.png diff --git a/cms/static/js/markitup/sets/wiki/images/stroke.png b/cms/static/js/vendor/markitup/sets/wiki/images/stroke.png similarity index 100% rename from cms/static/js/markitup/sets/wiki/images/stroke.png rename to cms/static/js/vendor/markitup/sets/wiki/images/stroke.png diff --git a/cms/static/js/markitup/sets/wiki/images/url.png b/cms/static/js/vendor/markitup/sets/wiki/images/url.png similarity index 100% rename from cms/static/js/markitup/sets/wiki/images/url.png rename to cms/static/js/vendor/markitup/sets/wiki/images/url.png diff --git a/cms/static/js/markitup/sets/wiki/set.js b/cms/static/js/vendor/markitup/sets/wiki/set.js similarity index 100% rename from cms/static/js/markitup/sets/wiki/set.js rename to cms/static/js/vendor/markitup/sets/wiki/set.js diff --git a/cms/static/js/markitup/sets/wiki/style.css b/cms/static/js/vendor/markitup/sets/wiki/style.css similarity index 100% rename from cms/static/js/markitup/sets/wiki/style.css rename to cms/static/js/vendor/markitup/sets/wiki/style.css diff --git a/cms/static/js/markitup/skins/simple/images/handle.png b/cms/static/js/vendor/markitup/skins/simple/images/handle.png similarity index 100% rename from cms/static/js/markitup/skins/simple/images/handle.png rename to cms/static/js/vendor/markitup/skins/simple/images/handle.png diff --git a/cms/static/js/markitup/skins/simple/images/menu.png b/cms/static/js/vendor/markitup/skins/simple/images/menu.png similarity index 100% rename from cms/static/js/markitup/skins/simple/images/menu.png rename to cms/static/js/vendor/markitup/skins/simple/images/menu.png diff --git a/cms/static/js/markitup/skins/simple/images/submenu.png b/cms/static/js/vendor/markitup/skins/simple/images/submenu.png similarity index 100% rename from cms/static/js/markitup/skins/simple/images/submenu.png rename to cms/static/js/vendor/markitup/skins/simple/images/submenu.png diff --git a/cms/static/js/markitup/skins/simple/style.css b/cms/static/js/vendor/markitup/skins/simple/style.css similarity index 100% rename from cms/static/js/markitup/skins/simple/style.css rename to cms/static/js/vendor/markitup/skins/simple/style.css diff --git a/cms/static/js/underscore-min.js b/cms/static/js/vendor/underscore-min.js similarity index 100% rename from cms/static/js/underscore-min.js rename to cms/static/js/vendor/underscore-min.js diff --git a/cms/templates/base.html b/cms/templates/base.html index 97e4aa8526..eaad889675 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -11,8 +11,8 @@ % else: % endif - - + + <%block name="title"></%block> @@ -23,12 +23,12 @@ <%block name="content"> - - - - - - + + + + + + % if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']: <%static:js group='main'/> % else: @@ -36,10 +36,10 @@ % endif <%static:js group='module-js'/> - - - - + + + + diff --git a/cms/templates/jasmine/base.html b/cms/templates/jasmine/base.html index 610beda824..0cbf63bb29 100644 --- a/cms/templates/jasmine/base.html +++ b/cms/templates/jasmine/base.html @@ -10,7 +10,7 @@ {# core files #} - + {# source files #} {% for url in suite.js_files %}