# HG changeset patch
# User Zoe Hong <zhong@mpiwg-berlin.mpg.de>
# Date 1427798097 -7200
# Node ID c6fa7f83c5bf50782dbd9c66c30652cbda38f014
# Parent  3239979f667373016a1497b94341b479a5df9f88
New: 1.display messages(style) 2.handle saving conflict:up-to-date or reload text

diff -r 3239979f6673 -r c6fa7f83c5bf models/extractapp.php
--- a/models/extractapp.php	Tue Mar 31 11:58:26 2015 +0200
+++ b/models/extractapp.php	Tue Mar 31 12:34:57 2015 +0200
@@ -342,7 +342,7 @@
 
         } else if ($status == "error") {
             // saving not success
-            $this->messages['warning'] .= "[Warning] Saving Failed! ".(string)$response["message"]."<br>";
+            $this->messages['error'] .= "[Error] Saving Failed! ".(string)$response["message"]."<br>";
             $this->messages['warning'] .= "[Warning] Please check branch ".$this->branch_id." in LGService, and modify from the latest version. <br>";
 
             /*
diff -r 3239979f6673 -r c6fa7f83c5bf views/Extractapp/TaggingText.php
--- a/views/Extractapp/TaggingText.php	Tue Mar 31 11:58:26 2015 +0200
+++ b/views/Extractapp/TaggingText.php	Tue Mar 31 12:34:57 2015 +0200
@@ -916,12 +916,12 @@
 </div>
 
 
-<div style="margin:10 30 10 30;max-width:1270;height:70px;overflow:scroll;overflow-x:hidden;">
-    <p class="bg-info" style=""> <?php echo $messages['info']; ?> </p>
+<div class="" style="margin:10 30 10 30;max-width:1270;height:70px;overflow:scroll;overflow-x:hidden;">
+    <p class="bg-danger" style=""> <?php echo $messages['error']; ?> </p>
     <p class="bg-warning" style=""> <?php echo $messages['warning']; ?> 
         <button id="reloadTextButton" onclick="reloadText(<?php echo $default_topic_id; ?>)" class="btn btn-xs btn-default" style="display:none;">Load Latest Version</button>
     </p>
-    <p class="bg-danger" style=""> <?php echo $messages['error']; ?> </p>
+    <p class="bg-info" style=""> <?php echo $messages['info']; ?> </p>
     <p class="bg-default" style=""> <?php echo $messages['debug']; ?> </p>
 </div>
 
@@ -967,7 +967,7 @@
                 </div>
             </div>
 
-            <div id="follow-scroll" style="position:absolute; height:680px; overflow:scroll; margin:0 5 15 5; max-width:270px">
+            <div id="follow-scroll" style="position:absolute; height:680px; overflow:scroll; margin:0 5 15 5; max-width:280px">
                 <form action="javascript:void(0);">   
                     <fieldset>
                         <legend><h5 class="text-success"> Config Topic: </h5></legend>
diff -r 3239979f6673 -r c6fa7f83c5bf views/maintemplate.php
--- a/views/maintemplate.php	Tue Mar 31 11:58:26 2015 +0200
+++ b/views/maintemplate.php	Tue Mar 31 12:34:57 2015 +0200
@@ -7,10 +7,10 @@
 
 <!-- Bootstrap -->
 <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
 <link href="../css/bootstrap.min.css" rel="stylesheet">
 <script src="../js/bootstrap.min.js"></script>
-<!--
 <script src="../js/bootstrap.js"></script>
 -->
 </head>
diff -r 3239979f6673 -r c6fa7f83c5bf views/maintemplate_local.php
--- a/views/maintemplate_local.php	Tue Mar 31 11:58:26 2015 +0200
+++ b/views/maintemplate_local.php	Tue Mar 31 12:34:57 2015 +0200
@@ -7,10 +7,10 @@
 
 <!-- Bootstrap -->
 <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!--
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
 <link href="../../css/bootstrap.min.css" rel="stylesheet">
 <script src="../../js/bootstrap.min.js"></script>
-<!--
 <script src="../../js/bootstrap.js"></script>
 -->
 </head>