Mercurial > hg > extraction-interface

comparison views/Extractapp/TaggingText.php @ 60:3239979f6673 extractapp

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New: 1.display messages(style) 2.handle saving conflict:up-to-date or reload text
author Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date Tue, 31 Mar 2015 11:58:26 +0200
parents 6e44605eb4f6
children c6fa7f83c5bf
comparison
equal deleted inserted replaced
59:6e44605eb4f6 60:3239979f6673
163 var windowpos = $(window).scrollTop(); 163 var windowpos = $(window).scrollTop();
164 var finaldestination = windowpos+originalelpos; 164 var finaldestination = windowpos+originalelpos;
165 //el.stop().animate({'top':finaldestination},500); 165 //el.stop().animate({'top':finaldestination},500);
166 el.stop().animate({'top':finaldestination},0); 166 el.stop().animate({'top':finaldestination},0);
167 }); 167 });
168
168 169
169 // --- handle old version taglist --- 170 // --- handle old version taglist ---
170 var _GET = JSON.parse('<?php echo json_encode($_GET) ?>'); 171 var _GET = JSON.parse('<?php echo json_encode($_GET) ?>');
171 if (_GET['id']) { 172 if (_GET['id']) {
172 // === This case should only be possible for developing on local machine ==== 173 // === This case should only be possible for developing on local machine ====
209 if (info['file_id'] == 0) { // or info['branch_id'] == 0, means new file 210 if (info['file_id'] == 0) { // or info['branch_id'] == 0, means new file
210 $( "#saveTextToLGService_id").text( "Create(Save) Branch to LGService" ); 211 $( "#saveTextToLGService_id").text( "Create(Save) Branch to LGService" );
211 212
212 } 213 }
213 214
214
215 handleFileVersionConflict(); 215 handleFileVersionConflict();
216
217
218 /*
219 // Popup choosing topic if first time to this section. without branch_id
220 if (info['file_id'] == 0) { // or info['branch_id'] == 0, means new file
221 // ask to choose topic
222 $.ajax({
223
224 });
225 var popup = document.getElementById('popup-window');
226
227 // alert('choose topic!');
228 }
229 */
230
231 216
232 217
233 }); 218 });
234 $(document).on("click", "name", function (e) { 219 $(document).on("click", "name", function (e) {
235 220
929 914
930 <div id="dialog-form" title="config tags for topic" style="position:fixed; top: 30px; "> 915 <div id="dialog-form" title="config tags for topic" style="position:fixed; top: 30px; ">
931 </div> 916 </div>
932 917
933 918
934 <div style="margin:10 30 10 30; max-width:1250"> 919 <div style="margin:10 30 10 30;max-width:1270;height:70px;overflow:scroll;overflow-x:hidden;">
935 <p class="bg-info" style=""> <?php echo $messages['info']; ?> </p> 920 <p class="bg-info" style=""> <?php echo $messages['info']; ?> </p>
936 <p class="bg-warning" style=""> <?php echo $messages['warning']; ?> 921 <p class="bg-warning" style=""> <?php echo $messages['warning']; ?>
937 <button id="reloadTextButton" onclick="reloadText(<?php echo $default_topic_id; ?>)" style="display:none;">Load Latest Version</button> 922 <button id="reloadTextButton" onclick="reloadText(<?php echo $default_topic_id; ?>)" class="btn btn-xs btn-default" style="display:none;">Load Latest Version</button>
938 </p> 923 </p>
939 <p class="bg-danger" style=""> <?php echo $messages['error']; ?> </p> 924 <p class="bg-danger" style=""> <?php echo $messages['error']; ?> </p>
940
941 <p class="bg-default" style=""> <?php echo $messages['debug']; ?> </p> 925 <p class="bg-default" style=""> <?php echo $messages['debug']; ?> </p>
942 </div> 926 </div>
943 927
944 <table width="1270" border="1" style="margin:10 30 10 30;"> 928 <table width="1270" border="1" style="margin:10 30 10 30;">
945 <tr> 929 <tr>