fnp
/
fnpeditor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
88afe90
)
editor: Missing names of exercises on a canvas
author
Aleksander Łukasz
<aleksander.lukasz@nowoczesnapolska.org.pl>
Wed, 6 Aug 2014 12:30:29 +0000
(14:30 +0200)
committer
Aleksander Łukasz
<aleksander.lukasz@nowoczesnapolska.org.pl>
Thu, 14 Aug 2014 14:26:14 +0000
(16:26 +0200)
src/editor/plugins/core/edumed/choice/choiceBase.js
patch
|
blob
|
history
src/editor/plugins/core/edumed/choice/choiceMulti.js
patch
|
blob
|
history
src/editor/plugins/core/edumed/choice/choiceSingle.js
patch
|
blob
|
history
src/editor/plugins/core/edumed/choice/choiceTrueOrFalse.js
patch
|
blob
|
history
src/editor/plugins/core/edumed/choice/element.html
patch
|
blob
|
history
src/editor/plugins/core/edumed/gaps/view.html
patch
|
blob
|
history
src/editor/plugins/core/edumed/order/view.html
patch
|
blob
|
history
src/editor/plugins/core/edumed/replace/view.html
patch
|
blob
|
history
diff --git
a/src/editor/plugins/core/edumed/choice/choiceBase.js
b/src/editor/plugins/core/edumed/choice/choiceBase.js
index
3bd6ed5
..
eaf1c7c
100644
(file)
--- a/
src/editor/plugins/core/edumed/choice/choiceBase.js
+++ b/
src/editor/plugins/core/edumed/choice/choiceBase.js
@@
-12,7
+12,7
@@
var choiceBase = Object.create(elementBase);
_.extend(choiceBase, {
init: function() {
elementBase.init.call(this);
_.extend(choiceBase, {
init: function() {
elementBase.init.call(this);
- this.view = $(_.template(template)({type: this.type}));
+ this.view = $(_.template(template)({type: this.type
, name: this.name
}));
this._container().append(this.view);
this.createContainer(this.wlxmlNode.contents().filter(function(n) {return !n.is('list');}), {
this._container().append(this.view);
this.createContainer(this.wlxmlNode.contents().filter(function(n) {return !n.is('list');}), {
diff --git
a/src/editor/plugins/core/edumed/choice/choiceMulti.js
b/src/editor/plugins/core/edumed/choice/choiceMulti.js
index
a05346c
..
0983930
100644
(file)
--- a/
src/editor/plugins/core/edumed/choice/choiceMulti.js
+++ b/
src/editor/plugins/core/edumed/choice/choiceMulti.js
@@
-13,6
+13,7
@@
var $ = require('libs/jquery'),
var choiceMulti = Object.create(choiceBase);
_.extend(choiceMulti, {
type: 'multi',
var choiceMulti = Object.create(choiceBase);
_.extend(choiceMulti, {
type: 'multi',
+ name: gettext('Multiple Choice'),
createListView: function(listNode) {
return new ListView(this, listNode, {
onItemViewAdded: function(itemView) {
createListView: function(listNode) {
return new ListView(this, listNode, {
onItemViewAdded: function(itemView) {
diff --git
a/src/editor/plugins/core/edumed/choice/choiceSingle.js
b/src/editor/plugins/core/edumed/choice/choiceSingle.js
index
9346363
..
6824d44
100644
(file)
--- a/
src/editor/plugins/core/edumed/choice/choiceSingle.js
+++ b/
src/editor/plugins/core/edumed/choice/choiceSingle.js
@@
-13,6
+13,7
@@
var $ = require('libs/jquery'),
var choiceSingle = Object.create(choiceBase);
_.extend(choiceSingle, {
type: 'single',
var choiceSingle = Object.create(choiceBase);
_.extend(choiceSingle, {
type: 'single',
+ name: gettext('Single Choice'),
init: function() {
this._comboName = _.uniqueId('edumed_exercise_hash_');
choiceBase.init.call(this);
init: function() {
this._comboName = _.uniqueId('edumed_exercise_hash_');
choiceBase.init.call(this);
diff --git
a/src/editor/plugins/core/edumed/choice/choiceTrueOrFalse.js
b/src/editor/plugins/core/edumed/choice/choiceTrueOrFalse.js
index
7ac0470
..
86fe809
100644
(file)
--- a/
src/editor/plugins/core/edumed/choice/choiceTrueOrFalse.js
+++ b/
src/editor/plugins/core/edumed/choice/choiceTrueOrFalse.js
@@
-14,6
+14,7
@@
var $ = require('libs/jquery'),
var trueOrFalse = Object.create(choiceBase);
_.extend(trueOrFalse, {
type: 'true-or-false',
var trueOrFalse = Object.create(choiceBase);
_.extend(trueOrFalse, {
type: 'true-or-false',
+ name: 'True or False',
createListView: function(listNode) {
return new ListView(this, listNode, {
onItemViewAdded: function(itemView) {
createListView: function(listNode) {
return new ListView(this, listNode, {
onItemViewAdded: function(itemView) {
diff --git
a/src/editor/plugins/core/edumed/choice/element.html
b/src/editor/plugins/core/edumed/choice/element.html
index
ba4bdd0
..
665d957
100644
(file)
--- a/
src/editor/plugins/core/edumed/choice/element.html
+++ b/
src/editor/plugins/core/edumed/choice/element.html
@@
-1,5
+1,5
@@
<div class="edumed-exercise exercise-<%= type %>">
<div class="edumed-exercise exercise-<%= type %>">
- <div class="header"><%= gettext('Exercise') %>: <%=
typ
e %></div>
+ <div class="header"><%= gettext('Exercise') %>: <%=
nam
e %></div>
<div class="description"></div>
<div class="list"></div>
</div>
\ No newline at end of file
<div class="description"></div>
<div class="list"></div>
</div>
\ No newline at end of file
diff --git
a/src/editor/plugins/core/edumed/gaps/view.html
b/src/editor/plugins/core/edumed/gaps/view.html
index
bd1552e
..
7d4210b
100644
(file)
--- a/
src/editor/plugins/core/edumed/gaps/view.html
+++ b/
src/editor/plugins/core/edumed/gaps/view.html
@@
-1,4
+1,4
@@
<div class="edumed-exercise exercise-gaps">
<div class="edumed-exercise exercise-gaps">
- <div class="header"><%= gettext('Exercise') %></div>
+ <div class="header"><%= gettext('Exercise') %>
: <%= gettext('Gaps') %>
</div>
<div class="content"></div>
</div>
\ No newline at end of file
<div class="content"></div>
</div>
\ No newline at end of file
diff --git
a/src/editor/plugins/core/edumed/order/view.html
b/src/editor/plugins/core/edumed/order/view.html
index
492b8f4
..
561de89
100644
(file)
--- a/
src/editor/plugins/core/edumed/order/view.html
+++ b/
src/editor/plugins/core/edumed/order/view.html
@@
-1,5
+1,5
@@
<div class="edumed-exercise exercise-order">
<div class="edumed-exercise exercise-order">
- <div class="header"><%= gettext('Exercise') %></div>
+ <div class="header"><%= gettext('Exercise') %>
: <%= gettext('Order') %>
</div>
<div class="description"></div>
<ul class="nav nav-tabs modePills">
<li class="active" mode="initial"><a href="#"><%= gettext('Initial') %></a></li>
<div class="description"></div>
<ul class="nav nav-tabs modePills">
<li class="active" mode="initial"><a href="#"><%= gettext('Initial') %></a></li>
diff --git
a/src/editor/plugins/core/edumed/replace/view.html
b/src/editor/plugins/core/edumed/replace/view.html
index
2378d40
..
d427539
100644
(file)
--- a/
src/editor/plugins/core/edumed/replace/view.html
+++ b/
src/editor/plugins/core/edumed/replace/view.html
@@
-1,4
+1,4
@@
<div class="edumed-exercise exercise-replace">
<div class="edumed-exercise exercise-replace">
- <div class="header"><%= gettext('Exercise') %></div>
+ <div class="header"><%= gettext('Exercise') %>
: <%= gettext('Replace') %>
</div>
<div class="content"></div>
</div>
\ No newline at end of file
<div class="content"></div>
</div>
\ No newline at end of file