diff views/Extractapp/TaggingText.php @ 59:6e44605eb4f6 extractapp

New: 1.display messages 2.handle saving conflict:up-to-date or reload text
author Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date Tue, 31 Mar 2015 11:32:25 +0200
parents a11f9103b8db
children 3239979f6673
line wrap: on
line diff
--- a/views/Extractapp/TaggingText.php	Tue Mar 31 10:59:52 2015 +0200
+++ b/views/Extractapp/TaggingText.php	Tue Mar 31 11:32:25 2015 +0200
@@ -933,9 +933,10 @@
 
 <div style="margin:10 30 10 30; max-width:1250">
     <p class="bg-info" style=""> <?php echo $messages['info']; ?> </p>
-    <p class="bg-warning" style=""> <?php echo $messages['warning']; ?> </p>
+    <p class="bg-warning" style=""> <?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-danger" style=""> <?php echo $messages['error']; ?> </p>
-    <button id="reloadTextButton" onclick="reloadText(<?php echo $default_topic_id; ?>)" style="display:none;">Reload</button>
 
     <p class="bg-default" style=""> <?php echo $messages['debug']; ?> </p>
 </div>
@@ -987,7 +988,7 @@
                     <fieldset>
                         <legend><h5 class="text-success"> Config Topic: </h5></legend>
                         <div> current topic is <?php echo $topic_name; ?> 
-                            <button onclick="chooseTopic()" class="btn btn-xs btn-default">Change</button>
+                            <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>
                     </fieldset>