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
Social Network Monitoring
+
diff --git a/WebContent/jsp/user/integrationSocialNetworks.jsp b/WebContent/jsp/user/integrationSocialNetworks.jsp index da8a690..f5836f3 100755 --- a/WebContent/jsp/user/integrationSocialNetworks.jsp +++ b/WebContent/jsp/user/integrationSocialNetworks.jsp @@ -36,7 +36,7 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o tÃtulo
+Integração com Redes Sociais
@@ -76,7 +76,7 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o tÃtulo
- 
:
+ 
:
diff --git a/WebContent/themes/default/css/messenger.css b/WebContent/themes/default/css/messenger.css
index 5c55c47..c990137 100755
--- a/WebContent/themes/default/css/messenger.css
+++ b/WebContent/themes/default/css/messenger.css
@@ -34,6 +34,10 @@ div#seemessages{
padding: 5px;
}
+h1 {
+ margin-bottom: 10px;
+}
+
div#seemessages h2{
margin: 9px 0;
font-size: 12px;
@@ -126,7 +130,7 @@ p.the-message-content a.message-delete-link{
p.the-message-content a.message-reply-link,
p.the-message-content a.message-delete-link,
p.the-message-content a.reply-to-all-link{
- color: #00f;
+ color: #000;
}
p.the-message-content a.reply-to-all-link{
@@ -149,9 +153,9 @@ div.the-message .message-date, div.the-message .from-user{
div#all-messages-unread,
p.the-message-content
{
- -webkit-border-radius: 5px;
+ /*-webkit-border-radius: 5px;
-moz-border-radius: 5px;
- border-radius: 5px;
+ border-radius: 5px;*/
}
p.the-message-content{
@@ -171,7 +175,7 @@ h3.the-message-title{
}
h3.the-message-title a{
- color: #00f;
+ color: #000;
}
h3.the-message-title a.lida, h3.the-message-title a.lida-true{
@@ -184,7 +188,7 @@ h3.the-message-title:HOVER {
.reply-assunto{
width: 232px;
- margin-left: 11px;
+ margin-left: 16px;
margin-bottom: 10px;
}
@@ -201,10 +205,14 @@ h3.the-message-title:HOVER {
}
a.link-see-all-messages{
- color: #00f;
+ color: #000;
}
div#div-link-see-all-messages{
text-align: center;
margin-top: 10px;
+}
+
+fieldset {
+ border: none;
}
\ No newline at end of file
diff --git a/WebContent/themes/default/css/twittertool.css b/WebContent/themes/default/css/twittertool.css
index 4e9a792..d092691 100755
--- a/WebContent/themes/default/css/twittertool.css
+++ b/WebContent/themes/default/css/twittertool.css
@@ -73,12 +73,12 @@
*/
div#social-network-monitoring{
- border: 1px solid black;
+ border: none;
background: #edf5ea;
}
div#social-network-monitoring h2{
- border-bottom: 1px solid black;
+ border-bottom: none;
padding: 7px 0 7px 15px;
background: #b6d7a8;
font-size: 12px;
@@ -105,8 +105,18 @@ div#social-network-monitoring-content .monitoring-start-disabled{
border: 0;
}
-div##waiting {
- align:center;
+div.social-icon {
+ height: 80px;
+ float: left;
+ margin-right: 10px;
+}
+
+div.social-icon img {
+ width: 30px;
+}
+
+div#waiting {
+ text-align: center;
}
p.no-user-twitter{
@@ -116,5 +126,5 @@ p.no-user-twitter{
}
p.no-user-twitter a{
- color: #00f;
+ color: #000;
}
\ No newline at end of file
diff --git a/WebContent/themes/default/img/twitter_icon.jpg b/WebContent/themes/default/img/twitter_icon.jpg
deleted file mode 100755
index d9adbb4..0000000
Binary files a/WebContent/themes/default/img/twitter_icon.jpg and /dev/null differ
diff --git a/WebContent/themes/default/imgs/facebook.png b/WebContent/themes/default/imgs/facebook.png
index 53eff67..dc29f10 100755
Binary files a/WebContent/themes/default/imgs/facebook.png and b/WebContent/themes/default/imgs/facebook.png differ
diff --git a/WebContent/themes/default/imgs/twitter.png b/WebContent/themes/default/imgs/twitter.png
index f7dcc35..7ef328b 100755
Binary files a/WebContent/themes/default/imgs/twitter.png and b/WebContent/themes/default/imgs/twitter.png differ
diff --git a/src/br/ufpe/cin/amadeus/amadeus_web/struts/action/TwitterActions.java b/src/br/ufpe/cin/amadeus/amadeus_web/struts/action/TwitterActions.java
index 8c34b79..8bb3034 100755
--- a/src/br/ufpe/cin/amadeus/amadeus_web/struts/action/TwitterActions.java
+++ b/src/br/ufpe/cin/amadeus/amadeus_web/struts/action/TwitterActions.java
@@ -37,7 +37,7 @@ import br.ufpe.cin.amadeus.amadeus_web.util.SocialInteractions;
import br.ufpe.cin.amadeus.amadeus_web.util.TweetInteractionType;
/**
- * Classe responsável por centralizar as ações referentes ao monitoramento da
+ * Classe respons�vel por centralizar as a��es referentes ao monitoramento da
* ferramenta do twitter
*
* @author Nailson Cunha
@@ -48,10 +48,10 @@ public class TwitterActions extends SystemActions {
private final String FORWARD_SHOW_VIEW_SOCIAL_NETWORK_MONITORING = "fshowViewSocialNetworkMonitoring";
private final String FORWARD_SHOW_VIEW_SOCIAL_TEST_TOOLS = "fshowViewTestTools";
- private final String CONSUMER_KEY = "lZJGjiuAdYjiRvuNqBp5kg";
- private final String CONSUMER_SECRET = "ygeVV2WVXjYMyL8HkH065WmVC985RtSufYUpSA";
- private final String ACESS_TOKEN = "248676552-gaRX2FU7IGcqXxLoGZfFROQ9jTymfYWySoWtHhBG";
- private final String ACESS_TOKEN_SECRET = "7MxIfOc2lfn9NP2TaIQaIDl9A6kEqtc3J5myLgJfRY";
+ private final String CONSUMER_KEY = "ERHBlUYrxgYCrWxAWWMq7COtv";
+ private final String CONSUMER_SECRET = "XmbsO9aOXPaA0j7gcB9arCYMXsNbDZDjJthxuUgJiyQP8Yba5d";
+ private final String ACESS_TOKEN = "37861885-wdk6sIq38Yy5VlJshAQgwbf2Q41mrOvEF8B1eGCBi";
+ private final String ACESS_TOKEN_SECRET = "FJ38O1JA9GU32CxyhiBnSdtIZcUqqRx3WDuyfiD9jZGEC";
private final String ACESS_TOKEN_URL = "https://api.twitter.com/oauth/access_token";
private final String ACESS_TOKEN_AUTHORIZATION = "https://api.twitter.com/oauth/authorize";
@@ -72,8 +72,8 @@ public class TwitterActions extends SystemActions {
}
/**
- * Action que retorna a visualização da página de Monitoramento de
- * Interações Sociais do Twitter.
+ * Action que retorna a visualiza��o da p�gina de Monitoramento de
+ * Intera��es Sociais do Twitter.
*
* @param mapping
* @param form
@@ -143,7 +143,7 @@ public class TwitterActions extends SystemActions {
}
/**
- * Método que inicia o monitoramento do twitter
+ * M�todo que inicia o monitoramento do twitter
*
* @param mapping
* @param form
@@ -218,7 +218,7 @@ public class TwitterActions extends SystemActions {
}
/**
- * Método que para as threads que estão monitorando alguma hashtag no twitter.
+ * M�todo que para as threads que est�o monitorando alguma hashtag no twitter.
* @param mapping
* @param form
* @param request
@@ -250,17 +250,17 @@ public class TwitterActions extends SystemActions {
}
/**
- * Método que salva os tweets como retweet
+ * M�todo que salva os tweets como retweet
* @param status
*/
private void saveAsRetweet(Status status) {
JdbcDAO jd = new JdbcDAO();
- // Se o dono do tweet não estiver cadastrado
+ // Se o dono do tweet n�o estiver cadastrado
if (!jd.userTwitterExists(status.getUser().getScreenName()))
return;
- // Se o usuario retweetado não estiver cadastrado
+ // Se o usuario retweetado n�o estiver cadastrado
int idUserRetweeted = jd.getUserIdByScreenName(status
.getRetweetedStatus().getUser().getScreenName());
if (idUserRetweeted == 0)
@@ -278,7 +278,7 @@ public class TwitterActions extends SystemActions {
}
/**
- * Método que salva os tweets como reply
+ * M�todo que salva os tweets como reply
* @param status
*/
private void saveAsReply(Status status) {
@@ -316,7 +316,7 @@ public class TwitterActions extends SystemActions {
}
/**
- * Método que salva os tweets como mention
+ * M�todo que salva os tweets como mention
* @param status
*/
private void saveAsMention(Status status) {
@@ -346,9 +346,9 @@ public class TwitterActions extends SystemActions {
}
- //Métodos de testes das ferramentas de Interações Sociais
+ //M�todos de testes das ferramentas de Intera��es Sociais
/**
- * Redireciona para a página de teste das ferramentas.
+ * Redireciona para a p�gina de teste das ferramentas.
*/
public ActionForward showViewTestTools(ActionMapping mapping,
ActionForm form, HttpServletRequest request,
@@ -365,7 +365,7 @@ public class TwitterActions extends SystemActions {
}
/**
- * Método criado pra teste do método getSocialInteractions da ferramenta de mensagens
+ * M�todo criado pra teste do m�todo getSocialInteractions da ferramenta de mensagens
* @param mapping
* @param form
* @param request
@@ -396,7 +396,7 @@ public class TwitterActions extends SystemActions {
/**
- * Método criado pra teste do método getSocialInteractions da ferramenta do twitter
+ * M�todo criado pra teste do m�todo getSocialInteractions da ferramenta do twitter
* @param mapping
* @param form
* @param request