client: show node titles, not internal node types. fix #537

4 files changed, 11 insertions, 6 deletions

diff --git a/src/client/model/types.js b/src/client/model/types.js
index bb534d00..531d9236 100644
--- a/src/client/model/types.js
+++ b/src/client/model/types.js
@@ -5,7 +5,8 @@ function(_,            util,   domain_types)
 var all_attributes,
     type_attributes = _.object(domain_types.type_attributes),
     nodetypes = _.map(domain_types.type_attributes, 0),
-    attribute_titles = domain_types.attribute_titles;
+    attribute_titles = domain_types.attribute_titles,
+    node_titles = _.object(nodetypes, _.map(domain_types.type_attributes, function(v) { return v[1].title; }));
 
 if (undefined === type_attributes['_defaults']) {
     type_attributes['_defaults'] = {
@@ -31,6 +32,7 @@ return (
         },
         all_attributes: all_attributes,
         attribute_titles: attribute_titles,
+        node_titles: node_titles,
     });
 }
 )
diff --git a/src/client/textanalysis.js b/src/client/textanalysis.js
index 1a98f765..354ac760 100644
--- a/src/client/textanalysis.js
+++ b/src/client/textanalysis.js
@@ -642,6 +642,7 @@ return {
     selected_type_prev: function() {
         typeindex = (typeindex + nodetypes_count - 1) % nodetypes_count;
         return selectedType();
-    }
+    },
+    selected_type: selectedType,
 };
 });
diff --git a/src/client/textanalysis.ui.js b/src/client/textanalysis.ui.js
index 2dae7397..0e126d9b 100644
--- a/src/client/textanalysis.ui.js
+++ b/src/client/textanalysis.ui.js
@@ -1,7 +1,7 @@
 "use strict"
 
-define(['jquery', 'Bacon', 'consts', 'rz_bus', 'rz_core', 'textanalysis', 'util', 'view/textanalyser_input'],
-function($,        Bacon         ,  consts ,  rz_bus ,  rz_core ,  textanalysis ,  util,        textanalyser_input) {
+define(['jquery', 'Bacon', 'consts', 'rz_bus', 'rz_core', 'textanalysis', 'util', 'view/textanalyser_input', 'model/types'],
+function($,        Bacon ,  consts ,  rz_bus ,  rz_core ,  textanalysis ,  util,        textanalyser_input,   model_types) {
 
 var element_name = '#textanalyser',
     input = textanalyser_input({
@@ -53,6 +53,7 @@ var typeselection = function TypeSelectionDialog() {
         e_intro.show();
         e_label.show();
         e_desc.show();
+        e_name.html(model_types.node_titles[textanalysis.selected_type()]);
         e.show();
     }
     typeselection.hide = function() {
@@ -67,7 +68,7 @@ var typeselection = function TypeSelectionDialog() {
         attach_to(node_id);
         e_intro.hide();
         e_label.show();
-        e_name.html(nodetype);
+        e_name.html(model_types.node_titles[nodetype]);
         if (desc) {
             e_desc.html(description[nodetype]);
             e_desc.show();
diff --git a/src/client/view/item_info.js b/src/client/view/item_info.js
index 1dc1062d..7e71e95b 100644
--- a/src/client/view/item_info.js
+++ b/src/client/view/item_info.js
@@ -306,7 +306,8 @@ function first_time_init() {
     var root = info_container.find('#edittype');
 
     model_types.nodetypes.forEach(function (nodetype) {
-        root.append($('<option value="' + nodetype + '">' + util.capitalize(nodetype) + '</option>'));
+        root.append($('<option value="' + nodetype + '">' +
+                    util.capitalize(model_types.node_titles[nodetype]) + '</option>'));
     });
 }