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

Merge pull request #875 from edx/db/translate-hellip

Browse Source 
Translate …
This commit is contained in:
David Baumgold
2013-09-10 06:58:47 -07:00
parent 0958a2757a fd8b375f3a
commit 543438816d
9 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cms/static/coffee/src/views/module_edit.coffee
View File

@@ -60,8 +60,8 @@ class CMS.Views.ModuleEdit extends Backbone.View
payload.parent_location = parent
$.post(
"/create_item"
payload
(data) =>
payload
(data) =>
@model.set(id: data.id)
@$el.data('id', data.id)
@render()
@@ -85,7 +85,7 @@ class CMS.Views.ModuleEdit extends Backbone.View
data.metadata = _.extend(data.metadata || {}, @changedMetadata())
@hideModal()
saving = new CMS.Views.Notification.Mini
title: gettext('Saving') + '…'
title: gettext('Saving…')
saving.show()
@model.save(data).done( =>
# # showToastMessage("Your changes have been saved.", null, 3)

6
cms/static/coffee/src/views/tabs.coffee
View File

@@ -21,7 +21,7 @@ class CMS.Views.TabsEdit extends Backbone.View
forcePlaceholderSize: true
axis: 'y'
items: '> .component'
)
)
tabMoved: (event, ui) =>
tabs = []
@@ -34,7 +34,7 @@ class CMS.Views.TabsEdit extends Backbone.View
$.ajax({
type:'POST',
url: '/reorder_static_tabs',
url: '/reorder_static_tabs',
data: JSON.stringify({
tabs : tabs
}),
@@ -78,7 +78,7 @@ class CMS.Views.TabsEdit extends Backbone.View
course: course_location_analytics
id: $component.data('id')
deleting = new CMS.Views.Notification.Mini
title: gettext('Deleting') + '…'
title: gettext('Deleting…')
deleting.show()
$.post('/delete_item', {
id: $component.data('id')

4
cms/static/coffee/src/views/unit.coffee
View File

@@ -42,7 +42,7 @@ class CMS.Views.UnitEdit extends Backbone.View
payload = children : @components()
saving = new CMS.Views.Notification.Mini
title: gettext('Saving') + '…'
title: gettext('Saving…')
saving.show()
options = success : =>
@model.unset('children')
@@ -130,7 +130,7 @@ class CMS.Views.UnitEdit extends Backbone.View
click: (view) =>
view.hide()
deleting = new CMS.Views.Notification.Mini
title: gettext('Deleting') + '…',
title: gettext('Deleting…'),
deleting.show()
$component = $(event.currentTarget).parents('.component')
$.post('/delete_item', {

4
cms/static/js/base.js
View File

@@ -395,7 +395,7 @@ function _deleteItem($el, type) {
});
var deleting = new CMS.Views.Notification.Mini({
title: gettext('Deleting') + '…'
title: gettext('Deleting…')
});
deleting.show();
@@ -840,7 +840,7 @@ function saveSetSectionScheduleDate(e) {
});
var saving = new CMS.Views.Notification.Mini({
title: gettext("Saving") + "…"
title: gettext("Saving…")
});
saving.show();
// call into server to commit the new order

2
cms/static/js/models/section.js
View File

@@ -23,7 +23,7 @@ CMS.Models.Section = Backbone.Model.extend({
showNotification: function() {
if(!this.msg) {
this.msg = new CMS.Views.Notification.Mini({
title: gettext("Saving") + "…"
title: gettext("Saving…")
});
}
this.msg.show();

6
cms/static/js/views/course_info_edit.js
View File

@@ -118,7 +118,7 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({
targetModel.set({ date : this.dateEntry(event).val(), content : this.$codeMirror.getValue() });
// push change to display, hide the editor, submit the change
var saving = new CMS.Views.Notification.Mini({
title: gettext('Saving') + '…'
title: gettext('Saving…')
});
saving.show();
var ele = this.modelDom(event);
@@ -183,7 +183,7 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({
});
self.modelDom(event).remove();
var deleting = new CMS.Views.Notification.Mini({
title: gettext('Deleting') + '…'
title: gettext('Deleting…')
});
deleting.show();
targetModel.destroy({
@@ -327,7 +327,7 @@ CMS.Views.ClassInfoHandoutsView = Backbone.View.extend({
onSave: function(event) {
this.model.set('data', this.$codeMirror.getValue());
var saving = new CMS.Views.Notification.Mini({
title: gettext('Saving') + '…'
title: gettext('Saving…')
});
saving.show();
this.model.save({}, {

168
cms/static/js/views/grader-select-view.js
View File

@@ -1,99 +1,99 @@
CMS.Models.AssignmentGrade = Backbone.Model.extend({
defaults : {
graderType : null, // the type label (string). May be "Not Graded" which implies None. I'd like to use id but that's ephemeral
location : null // A location object
},
initialize : function(attrs) {
if (attrs['assignmentUrl']) {
this.set('location', new CMS.Models.Location(attrs['assignmentUrl'], {parse: true}));
}
},
parse : function(attrs) {
if (attrs && attrs['location']) {
attrs.location = new CMS.Models.Location(attrs['location'], {parse: true});
}
},
urlRoot : function() {
if (this.has('location')) {
var location = this.get('location');
return '/' + location.get('org') + "/" + location.get('course') + '/' + location.get('category') + '/'
+ location.get('name') + '/gradeas/';
}
else return "";
}
defaults : {
graderType : null, // the type label (string). May be "Not Graded" which implies None. I'd like to use id but that's ephemeral
location : null // A location object
},
initialize : function(attrs) {
if (attrs['assignmentUrl']) {
this.set('location', new CMS.Models.Location(attrs['assignmentUrl'], {parse: true}));
}
},
parse : function(attrs) {
if (attrs && attrs['location']) {
attrs.location = new CMS.Models.Location(attrs['location'], {parse: true});
}
},
urlRoot : function() {
if (this.has('location')) {
var location = this.get('location');
return '/' + location.get('org') + "/" + location.get('course') + '/' + location.get('category') + '/'
+ location.get('name') + '/gradeas/';
}
else return "";
}
});
CMS.Views.OverviewAssignmentGrader = Backbone.View.extend({
// instantiate w/ { graders : CourseGraderCollection, el : <the gradable-status div> }
events : {
"click .menu-toggle" : "showGradeMenu",
"click .menu li" : "selectGradeType"
},
initialize : function() {
// call template w/ {assignmentType : formatname, graders : CourseGraderCollection instance }
this.template = _.template(
// TODO move to a template file
'<h4 class="status-label"><%= assignmentType %></h4>' +
'<a data-tooltip="Mark/unmark this subsection as graded" class="menu-toggle" href="#">' +
'<% if (!hideSymbol) {%><i class="icon-ok"></i><%};%>' +
'</a>' +
'<ul class="menu">' +
'<% graders.each(function(option) { %>' +
'<li><a <% if (option.get("type") == assignmentType) {%>class="is-selected" <%}%> href="#"><%= option.get("type") %></a></li>' +
'<% }) %>' +
'<li><a class="gradable-status-notgraded" href="#">Not Graded</a></li>' +
'</ul>');
this.assignmentGrade = new CMS.Models.AssignmentGrade({
assignmentUrl : this.$el.closest('.id-holder').data('id'),
graderType : this.$el.data('initial-status')});
// TODO throw exception if graders is null
this.graders = this.options['graders'];
var cachethis = this;
// defining here to get closure around this
this.removeMenu = function(e) {
e.preventDefault();
cachethis.$el.removeClass('is-active');
$(document).off('click', cachethis.removeMenu);
}
this.hideSymbol = this.options['hideSymbol'];
this.render();
},
render : function() {
this.$el.html(this.template({ assignmentType : this.assignmentGrade.get('graderType'), graders : this.graders,
hideSymbol : this.hideSymbol }));
if (this.assignmentGrade.has('graderType') && this.assignmentGrade.get('graderType') != "Not Graded") {
this.$el.addClass('is-set');
}
else {
this.$el.removeClass('is-set');
}
},
showGradeMenu : function(e) {
e.preventDefault();
// I sure hope this doesn't break anything but it's needed to keep the removeMenu from activating
e.stopPropagation();
// nasty global event trap :-(
$(document).on('click', this.removeMenu);
this.$el.addClass('is-active');
},
selectGradeType : function(e) {
e.preventDefault();
// instantiate w/ { graders : CourseGraderCollection, el : <the gradable-status div> }
events : {
"click .menu-toggle" : "showGradeMenu",
"click .menu li" : "selectGradeType"
},
initialize : function() {
// call template w/ {assignmentType : formatname, graders : CourseGraderCollection instance }
this.template = _.template(
// TODO move to a template file
'<h4 class="status-label"><%= assignmentType %></h4>' +
'<a data-tooltip="Mark/unmark this subsection as graded" class="menu-toggle" href="#">' +
'<% if (!hideSymbol) {%><i class="icon-ok"></i><%};%>' +
'</a>' +
'<ul class="menu">' +
'<% graders.each(function(option) { %>' +
'<li><a <% if (option.get("type") == assignmentType) {%>class="is-selected" <%}%> href="#"><%= option.get("type") %></a></li>' +
'<% }) %>' +
'<li><a class="gradable-status-notgraded" href="#">Not Graded</a></li>' +
'</ul>');
this.assignmentGrade = new CMS.Models.AssignmentGrade({
assignmentUrl : this.$el.closest('.id-holder').data('id'),
graderType : this.$el.data('initial-status')});
// TODO throw exception if graders is null
this.graders = this.options['graders'];
var cachethis = this;
// defining here to get closure around this
this.removeMenu = function(e) {
e.preventDefault();
cachethis.$el.removeClass('is-active');
$(document).off('click', cachethis.removeMenu);
};
this.hideSymbol = this.options['hideSymbol'];
this.render();
},
render : function() {
this.$el.html(this.template({ assignmentType : this.assignmentGrade.get('graderType'), graders : this.graders,
hideSymbol : this.hideSymbol }));
if (this.assignmentGrade.has('graderType') && this.assignmentGrade.get('graderType') != "Not Graded") {
this.$el.addClass('is-set');
}
else {
this.$el.removeClass('is-set');
}
},
showGradeMenu : function(e) {
e.preventDefault();
// I sure hope this doesn't break anything but it's needed to keep the removeMenu from activating
e.stopPropagation();
// nasty global event trap :-(
$(document).on('click', this.removeMenu);
this.$el.addClass('is-active');
},
selectGradeType : function(e) {
e.preventDefault();
this.removeMenu(e);
this.removeMenu(e);
var saving = new CMS.Views.Notification.Mini({
title: gettext('Saving') + '&hellip;'
title: gettext('Saving&hellip;')
});
saving.show();
// TODO I'm not happy with this string fetch via the html for what should be an id. I'd rather use the id attr
// of the CourseGradingPolicy model or null for Not Graded (NOTE, change template's if check for is-selected accordingly)
this.assignmentGrade.save(
// TODO I'm not happy with this string fetch via the html for what should be an id. I'd rather use the id attr
// of the CourseGradingPolicy model or null for Not Graded (NOTE, change template's if check for is-selected accordingly)
this.assignmentGrade.save(
'graderType',
$(e.target).text(),
{success: function () { saving.hide(); }}
);
this.render();
}
})
this.render();
}
});

2
cms/static/js/views/overview.js
View File

@@ -226,7 +226,7 @@ function _handleReorder(event, ui, parentIdField, childrenSelector) {
children.push(ui.draggable.data('id'));
}
var saving = new CMS.Views.Notification.Mini({
title: gettext('Saving') + '&hellip;'
title: gettext('Saving&hellip;')
});
saving.show();
$.ajax({

4
cms/static/js/views/textbook.js
View File

@@ -35,7 +35,7 @@ CMS.Views.ShowTextbook = Backbone.View.extend({
click: function(view) {
view.hide();
var delmsg = new CMS.Views.Notification.Mini({
title: gettext("Deleting") + "&hellip;"
title: gettext("Deleting&hellip;")
}).show();
textbook.destroy({
complete: function() {
@@ -122,7 +122,7 @@ CMS.Views.EditTextbook = Backbone.View.extend({
this.setValues();
if(!this.model.isValid()) { return; }
var saving = new CMS.Views.Notification.Mini({
title: gettext("Saving") + "&hellip;"
title: gettext("Saving&hellip;")
}).show();
var that = this;
this.model.save({}, {