From 0177eeded4b2358f414db1820ea246ea92cada1d Mon Sep 17 00:00:00 2001
From: Andy Armstrong <andya@edx.org>
Date: Tue, 22 Mar 2016 11:24:35 -0400
Subject: [PATCH] Add the UI Toolkit to edx-platform
UITK-75
---
cms/static/edx-pattern-library | 1 +
cms/static/edx-ui-toolkit | 1 +
cms/static/js_test.yml | 2 ++
cms/static/js_test_squire.yml | 2 ++
.../static/{pattern-library => edx-pattern-library}/fonts | 0
common/static/{pattern-library => edx-pattern-library}/js | 0
common/static/edx-ui-toolkit/js | 1 +
common/static/js_test_requirejs.yml | 2 ++
.../teams/static/teams/js/views/instructor_tools.js | 7 ++++---
lms/static/certificates/sass/_config.scss | 2 +-
lms/static/edx-pattern-library | 1 +
lms/static/edx-ui-toolkit | 1 +
lms/static/js_test.yml | 4 +++-
package.json | 1 +
14 files changed, 20 insertions(+), 5 deletions(-)
create mode 120000 cms/static/edx-pattern-library
create mode 120000 cms/static/edx-ui-toolkit
rename common/static/{pattern-library => edx-pattern-library}/fonts (100%)
rename common/static/{pattern-library => edx-pattern-library}/js (100%)
create mode 120000 common/static/edx-ui-toolkit/js
create mode 120000 lms/static/edx-pattern-library
create mode 120000 lms/static/edx-ui-toolkit
diff --git a/cms/static/edx-pattern-library b/cms/static/edx-pattern-library
new file mode 120000
index 00000000000..0d3ed215eec
--- /dev/null
+++ b/cms/static/edx-pattern-library
@@ -0,0 +1 @@
+../../common/static/edx-pattern-library
\ No newline at end of file
diff --git a/cms/static/edx-ui-toolkit b/cms/static/edx-ui-toolkit
new file mode 120000
index 00000000000..32e7d34a2c4
--- /dev/null
+++ b/cms/static/edx-ui-toolkit
@@ -0,0 +1 @@
+../../common/static/edx-ui-toolkit
\ No newline at end of file
diff --git a/cms/static/js_test.yml b/cms/static/js_test.yml
index 25f2adc05c8..41006cc7647 100644
--- a/cms/static/js_test.yml
+++ b/cms/static/js_test.yml
@@ -78,6 +78,8 @@ src_paths:
- js/certificates
- js/factories
- common/js
+ - edx-pattern-library/js
+ - edx-ui-toolkit/js
# Paths to spec (test) JavaScript files
# We should define the custom path mapping in /coffee/spec/main.coffee as well e.g. certificates etc.
diff --git a/cms/static/js_test_squire.yml b/cms/static/js_test_squire.yml
index 122505d0730..29a812f7388 100644
--- a/cms/static/js_test_squire.yml
+++ b/cms/static/js_test_squire.yml
@@ -73,6 +73,8 @@ src_paths:
- js/utils
- js/views
- common/js
+ - edx-pattern-library/js
+ - edx-ui-toolkit/js
# Paths to spec (test) JavaScript files
spec_paths:
diff --git a/common/static/pattern-library/fonts b/common/static/edx-pattern-library/fonts
similarity index 100%
rename from common/static/pattern-library/fonts
rename to common/static/edx-pattern-library/fonts
diff --git a/common/static/pattern-library/js b/common/static/edx-pattern-library/js
similarity index 100%
rename from common/static/pattern-library/js
rename to common/static/edx-pattern-library/js
diff --git a/common/static/edx-ui-toolkit/js b/common/static/edx-ui-toolkit/js
new file mode 120000
index 00000000000..0e607da1cd9
--- /dev/null
+++ b/common/static/edx-ui-toolkit/js
@@ -0,0 +1 @@
+../../../node_modules/edx-ui-toolkit/src/js
\ No newline at end of file
diff --git a/common/static/js_test_requirejs.yml b/common/static/js_test_requirejs.yml
index c6724e32c7b..c0802739478 100644
--- a/common/static/js_test_requirejs.yml
+++ b/common/static/js_test_requirejs.yml
@@ -50,6 +50,8 @@ lib_paths:
# Paths to source JavaScript files
src_paths:
- common/js
+ - edx-pattern-library/js
+ - edx-ui-toolkit/js
# Paths to spec (test) JavaScript files
spec_paths:
diff --git a/lms/djangoapps/teams/static/teams/js/views/instructor_tools.js b/lms/djangoapps/teams/static/teams/js/views/instructor_tools.js
index b760b209a1b..212f9048049 100644
--- a/lms/djangoapps/teams/static/teams/js/views/instructor_tools.js
+++ b/lms/djangoapps/teams/static/teams/js/views/instructor_tools.js
@@ -4,10 +4,11 @@
define(['backbone',
'underscore',
'gettext',
+ 'edx-ui-toolkit/js/utils/string-utils',
'teams/js/views/team_utils',
'common/js/components/utils/view_utils',
'text!teams/templates/instructor-tools.underscore'],
- function (Backbone, _, gettext, TeamUtils, ViewUtils, instructorToolbarTemplate) {
+ function (Backbone, _, gettext, StringUtils, TeamUtils, ViewUtils, instructorToolbarTemplate) {
return Backbone.View.extend({
events: {
@@ -53,8 +54,8 @@
});
Backbone.history.navigate('topics/' + self.team.get('topic_id'), {trigger: true});
TeamUtils.showMessage(
- interpolate(
- gettext('Team "%(team)s" successfully deleted.'),
+ StringUtils.interpolate(
+ gettext('Team "{team}" successfully deleted.'),
{team: self.team.get('name')},
true
),
diff --git a/lms/static/certificates/sass/_config.scss b/lms/static/certificates/sass/_config.scss
index 99bf24e3d90..d8e3a022d50 100644
--- a/lms/static/certificates/sass/_config.scss
+++ b/lms/static/certificates/sass/_config.scss
@@ -8,7 +8,7 @@
// ------------------------------
// #VARIABLES
// ------------------------------
-$pattern-library-path: '../../pattern-library' !default;
+$pattern-library-path: '../../edx-pattern-library' !default;
// certificate characteristics
$cert-base-color: palette(grayscale-cool, dark);
diff --git a/lms/static/edx-pattern-library b/lms/static/edx-pattern-library
new file mode 120000
index 00000000000..0d3ed215eec
--- /dev/null
+++ b/lms/static/edx-pattern-library
@@ -0,0 +1 @@
+../../common/static/edx-pattern-library
\ No newline at end of file
diff --git a/lms/static/edx-ui-toolkit b/lms/static/edx-ui-toolkit
new file mode 120000
index 00000000000..32e7d34a2c4
--- /dev/null
+++ b/lms/static/edx-ui-toolkit
@@ -0,0 +1 @@
+../../common/static/edx-ui-toolkit
\ No newline at end of file
diff --git a/lms/static/js_test.yml b/lms/static/js_test.yml
index 5f892b11223..4bf01e4b79f 100644
--- a/lms/static/js_test.yml
+++ b/lms/static/js_test.yml
@@ -75,9 +75,11 @@ src_paths:
- js
- coffee/src
- common/js
+ - edx-pattern-library/js
+ - edx-ui-toolkit/js
+ - support/js
- teams/js
- xmodule_js/common_static/coffee
- - support/js
# Paths to spec (test) JavaScript files
spec_paths:
diff --git a/package.json b/package.json
index 3b2cad384ea..ba4272a9874 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
"dependencies": {
"coffee-script": "1.6.1",
"edx-pattern-library": "0.10.4",
+ "edx-ui-toolkit": "~0.8.0",
"requirejs": "~2.1.22",
"uglify-js": "2.4.24",
"underscore": "~1.8.3"
--
GitLab