# HG changeset patch
# User Zoe Hong <zhong@mpiwg-berlin.mpg.de>
# Date 1434112890 -7200
# Node ID 94ad33739fa42c99d9e0666b38db2c8ed6d09d7c
# Parent  e681d693240e0f67eaf2105b1692bc7efb34e418
modify the position of buttons in sidebar

diff -r e681d693240e -r 94ad33739fa4 config/config.php
--- a/config/config.php	Wed Jun 03 16:54:09 2015 +0200
+++ b/config/config.php	Fri Jun 12 14:41:30 2015 +0200
@@ -32,7 +32,7 @@
 			$mysql_user = "root";
 			$mysql_password = "root";
 			$server_host = "http://localhost:1080/localgazetteers-dev/";
-			$lgserver_url = "http://localgazetteers/LGServices/";
+			$lgserver_url = "http://localhost:8080/LGServices/";
 		}
 
 		$systemNAME = "interface";
diff -r e681d693240e -r 94ad33739fa4 css/taggingtext.css
--- a/css/taggingtext.css	Wed Jun 03 16:54:09 2015 +0200
+++ b/css/taggingtext.css	Fri Jun 12 14:41:30 2015 +0200
@@ -47,8 +47,9 @@
 }
 
 .btn:hover {
-	border: 2px solid #A1A1A1;
+	border: 1px solid #A1A1A1;
     border-radius: 4px;
+
 }
 
 
@@ -83,9 +84,6 @@
 	background-color: #E7F3FF;
 	border-radius: 3px;
 }
-.tool-topic:hover{
-	border: 2px solid #E7F3FF;
-}
 
 .popup-frame {
 	position: absolute;
diff -r e681d693240e -r 94ad33739fa4 models/extractapp.php
--- a/models/extractapp.php	Wed Jun 03 16:54:09 2015 +0200
+++ b/models/extractapp.php	Fri Jun 12 14:41:30 2015 +0200
@@ -533,10 +533,10 @@
             'Content-type: multipart/form-data;charset=utf-8'                                                          
         ));       
 
-        if (!$AT_LOCAL) {
-            // execute the request
-            $output = curl_exec($ch);
-        }
+        //if (!$AT_LOCAL) {
+        // execute the request
+        $output = curl_exec($ch);
+        //}
 
 
         // output the profile information - includes the header
diff -r e681d693240e -r 94ad33739fa4 views/Extractapp/TaggingText.php
--- a/views/Extractapp/TaggingText.php	Wed Jun 03 16:54:09 2015 +0200
+++ b/views/Extractapp/TaggingText.php	Fri Jun 12 14:41:30 2015 +0200
@@ -1020,7 +1020,8 @@
                             <!-- <button onclick="replaceSmartRunSpace()" class="btn-lg">Run(Allow space between Group)</button></br>
                             -->
                             <button onclick="replaceSmartRunSpace()" class="btn btn-default">Run(Allow space between block)</button></br>
-                            <button onclick="Undo()" class="btn btn-default btn-block" id="buttonUndo" disabled="true">Undo</button>
+
+                            <button onclick="window.open('./EditWordlist')" class="btn btn-default btn-block">Edit WordList</button>
 
                             <!-- developing...-->
                             <button onclick="genRegexWindowOpen()" id="gen_regex_window_open_id" class="btn btn-default">Open GenRegex(test)</button></br>
@@ -1050,15 +1051,15 @@
                         <!-- 
                         <button onclick="saveText(<?php echo $section_id; ?>)" style="height: 30px; width: 220px">Save the text</button></br>
                         -->
-                        <div class="collapse out" id="tool_edit">
+                        <div class="collapse in" id="tool_edit">
                             <button onclick="editText()" id="editTextId" class="btn btn-default btn-block">Edit the text</button>
-                            <button onclick="window.open('./EditWordlist')" class="btn btn-default btn-block">Edit WordList</button>
+                            <button onclick="Undo()" class="btn btn-default btn-block" id="buttonUndo" disabled="true">Undo</button>
                         </div>
                     </fieldset>
                     
                     <fieldset class="tool-frame">
                         <legend><h5 class="tool-topic" data-toggle="collapse" data-target="#tool_save"> Save and Export: <span class="caret"></span></h5></legend>
-                        <div class="collapse in" id="tool_save">
+                        <div class="collapse out" id="tool_save">
                             <button onclick="saveTextToLGService()" id="save_text_to_LGService_id" class="btn btn-default btn-block">Save to LGService</button>
                             <button onclick="exportAll(<?php echo $default_topic_id;?>)" class="btn btn-default btn-block">Export All</button>
                             Page: <input type="text" size="5" id="exportPageStart">to<input type="text" size="5" id="exportPageEnd">