Commit 0177eede by Andy Armstrong

Add the UI Toolkit to edx-platform

UITK-75
parent 33327219
../../common/static/edx-pattern-library
\ No newline at end of file
../../common/static/edx-ui-toolkit
\ No newline at end of file
......@@ -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.
......
......@@ -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:
......
../../../node_modules/edx-pattern-library/pattern-library/fonts
\ No newline at end of file
../../../node_modules/edx-pattern-library/pattern-library/js
\ No newline at end of file
../../../node_modules/edx-ui-toolkit/src/js
\ No newline at end of file
......@@ -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:
......
../../../node_modules/edx-pattern-library/pattern-library/fonts
\ No newline at end of file
../../../node_modules/edx-pattern-library/pattern-library/js
\ No newline at end of file
......@@ -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
),
......
......@@ -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);
......
../../common/static/edx-pattern-library
\ No newline at end of file
../../common/static/edx-ui-toolkit
\ No newline at end of file
......@@ -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:
......
......@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment