From 2236d2f25424b3441466d4a4a7e4fa5de9c30bdd Mon Sep 17 00:00:00 2001 From: Paulo Henrique Date: Sat, 14 Feb 2015 23:18:20 -0300 Subject: [PATCH] =?UTF-8?q?Corre=C3=A7=C3=B5es=20na=20contribui=C3=A7?= =?UTF-8?q?=C3=A3o=20de=20MEDEIROS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/js/messenger.js | 4 +- WebContent/js/twittertool.js | 4 +- .../messenger/viewAllMessengerMessages.jsp | 2 +- WebContent/jsp/twittertool/userTwitter.jsp | 2 +- .../viewSocialNetworkMonitoring.jsp | 4 +- .../jsp/user/integrationSocialNetworks.jsp | 4 +- WebContent/themes/default/css/messenger.css | 20 +++++++--- WebContent/themes/default/css/twittertool.css | 20 +++++++--- .../themes/default/img/twitter_icon.jpg | Bin 13042 -> 0 bytes WebContent/themes/default/imgs/facebook.png | Bin 19196 -> 1632 bytes WebContent/themes/default/imgs/twitter.png | Bin 4414 -> 3537 bytes .../struts/action/TwitterActions.java | 36 +++++++++--------- 12 files changed, 57 insertions(+), 39 deletions(-) delete mode 100755 WebContent/themes/default/img/twitter_icon.jpg diff --git a/WebContent/js/messenger.js b/WebContent/js/messenger.js index 4fa9779..a3b73d6 100755 --- a/WebContent/js/messenger.js +++ b/WebContent/js/messenger.js @@ -13,7 +13,7 @@ $(document).ready(function(){ function checkStatus(){ $('ul.all-participants li').each(function(index,element){ if( $(this).hasClass('participant-name') ) - $.get('/amadeuslms/user.do?method=userStatus&accessInfoId='+ element.id, function(data){ + $.get('user.do?method=userStatus&accessInfoId='+ element.id, function(data){ if(data == 1){ $(element).removeClass('offlineUser').addClass('onlineUser'); } else { @@ -243,7 +243,7 @@ $(document).ready(function(){ //Funcao que exibe o dialog de resposta function showReplyDialog(title,href){ - $('#form-reply-to').load('/amadeuslms/jsp/messenger/form-reply.jsp', function(){ + $('#form-reply-to').load('jsp/messenger/form-reply.jsp', function(){ if($('#reply-assunto').length){ $('#reply-assunto').val(title); $('#reply-content').focus(); diff --git a/WebContent/js/twittertool.js b/WebContent/js/twittertool.js index 3a365ff..b98abb8 100755 --- a/WebContent/js/twittertool.js +++ b/WebContent/js/twittertool.js @@ -62,9 +62,9 @@ $(document).ready(function(){ $('#hash-alert').html(''); }); - + var ctx = "${pageContext.request.contextPath}"; // Controle do monitoramento do twitter - var urlToCheck = 'http://localhost:8080/amadeuslms/social.do?method=showViewSocialNetworkMonitoring&courseId=18'; + var urlToCheck = ctx + 'social.do?method=showViewSocialNetworkMonitoring&courseId=18'; if(window.location == urlToCheck){ $(window).bind('beforeunload', function(){ if($('#monitoring-start').attr('disabled') == 'disabled'){ diff --git a/WebContent/jsp/messenger/viewAllMessengerMessages.jsp b/WebContent/jsp/messenger/viewAllMessengerMessages.jsp index 7098441..3922a56 100755 --- a/WebContent/jsp/messenger/viewAllMessengerMessages.jsp +++ b/WebContent/jsp/messenger/viewAllMessengerMessages.jsp @@ -39,7 +39,7 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
-

+

Mensagens