Mercurial > hg > extraction-interface
diff views/Extractapp/TaggingText.php @ 61:c6fa7f83c5bf extractapp
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 12:34:57 +0200 |
| parents | 3239979f6673 |
| children | 3fb9e3884401 |
line wrap: on
line diff
--- 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>