diff views/Extractapp/TaggingText.php @ 65:f9ae94a9b041 extractapp

New: adding topic names: name_en, name_ch, name_pinyin
author Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date Thu, 02 Apr 2015 11:45:09 +0200
parents 3395385476d1
children e71a437ae49f
line wrap: on
line diff
--- a/views/Extractapp/TaggingText.php	Wed Apr 01 15:13:37 2015 +0200
+++ b/views/Extractapp/TaggingText.php	Thu Apr 02 11:45:09 2015 +0200
@@ -6,7 +6,7 @@
 $section_id = $viewmodel['section_id'];
 $topiclistArray = $viewmodel['topiclistArray'];
 $default_topic_id = $viewmodel['default_topic_id'];
-$topic_name = $viewmodel['topic_name'];
+$topic_name = $viewmodel['topic_name']; // array of names
 $topic_tag = $viewmodel['topic_tag'];
 $info = $viewmodel['info']; 
 $messages = $viewmodel['messages'];
@@ -236,10 +236,8 @@
     	var newdiv = document.createElement("div");
         newdiv.id = "tagItemDivId";
         newdiv.setAttribute("class", "tagItemDivClass");
-        newdiv.style.cssText = 'top:'+e.pageY+'; left:'+e.pageX+'; position:absolute; background-color: white; border:1px solid black; padding: 5px';
+        newdiv.style.cssText = 'top:'+e.pageY+'; left:'+e.pageX+'; position:absolute; background-color: white; border:1px solid black; padding: 5px; z-index:4';
         
-        newdiv.style.backgroundColor = "white";
-        newdiv.style.zIndex = "3";
 
         //console.log(selection.getRangeAt(0).cloneContents());
         if ( container.innerHTML.indexOf( "br" ) != -1 ) {
@@ -671,10 +669,10 @@
     
     $('#load_topic_div').css("border", "1px solid black");
     $('#load_topic_div').css("background-color", "White");
-    $('#load_topic_div').css("width", "150px");
+    $('#load_topic_div').css("width", "200px");
     $('#load_topic_div').css("height", "50px");
     $('#load_topic_div').css("top", "20px");
-    $('#load_topic_div').css("left", "-150px");
+    $('#load_topic_div').css("left", "-200px");
     
 
     var topic_select = document.createElement("select");
@@ -709,10 +707,10 @@
 
     //Create and append the options
 	for (var i = 0; i < t.length; i++) {
-		console.log(t[i]['id']+","+t[i]['name']);
+		console.log(t[i]['id']+","+t[i]['name_ch']+","+t[i]['name_pinyin']+","+t[i]['name_en']);
     	var option = document.createElement("option");
     	option.value = t[i]['id'];
-	    option.text = t[i]['name'];
+	    option.text = t[i]['name_en']+" ("+t[i]['name_ch']+", "+t[i]['name_pinyin']+")";
 	    if (option.value == default_topic_id) {
 	    	option.selected = true;
 	    };
@@ -865,15 +863,15 @@
 </div>
 
 <div class="info-board">
-    <p class="bg-danger"><strong><?php echo $messages['error']; ?> </strong></p>
-    <p class="bg-warning"> <?php echo $messages['warning']; ?> 
+    <div class="bg-danger"><strong><?php echo $messages['error']; ?> </strong></div>
+    <div class="bg-warning"> <?php echo $messages['warning']; ?> 
         <button id="reloadTextButton" onclick="reloadText(<?php echo $default_topic_id; ?>)" style="display:none;">Load Latest Version</button>
-    </p>
-    <p class="bg-info"> <?php echo $messages['info']; ?> </p>
-    <p class="bg-default"> <?php echo $messages['debug']; ?> </p>
+    </div>
+    <div class="bg-info"> <?php echo $messages['info']; ?> </div>
+    <div class="bg-default"> <?php echo $messages['debug']; ?> </div>
 </div>
 
-<table width="1270" border="1" style="margin:10 30 10 30;">
+<table width="1270" border="1" style="margin:10 30 30 30;">
     <tr>
         <td width="980" style="padding:0 5 0 5; margin: 0 5 0 5;">
             <div id="editable-area" class="area" style="max-width: 980"><?php echo $stringInput; ?></div>
@@ -919,7 +917,8 @@
                 <form action="javascript:void(0);">   
                     <fieldset>
                         <legend><h5 class="text-success"> Config Topic: </h5></legend>
-                        <div> current topic is <?php echo $topic_name; ?> 
+                        <div> current topic is: <?php echo $topic_name['name_en']; ?> <br>
+                            (<?php echo $topic_name['name_ch']; ?>, <?php echo $topic_name['name_pinyin']; ?>)
                             <button onclick="chooseTopic(<?php echo $default_topic_id;?>)" class="btn btn-xs btn-default">Change</button>
                         </div>
                         <button onclick="configTagsInTopic(<?php echo $default_topic_id;?>)" class="btn btn-sm btn-default" style="">Manage Tags in topic</button></br>