Commits

dianmora committed ff3a6d1 Merge

Merge branch 'development' of git://github.com/encuestame/encuestame into development

Comments (0)

Files changed (8)

encuestame-utils/src/main/java/org/encuestame/utils/web/frontEnd/WebMessage.java

  */
 package org.encuestame.utils.web.frontEnd;
 
+import java.io.Serializable;
+
 /**
  * WebMessage.
  * @author Picado, Juan juanATencuestame.org
  * @since
  */
-public final class WebMessage {
+public final class WebMessage implements Serializable{
+
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = -7442678263773715275L;
 
-    private final WebInfoType infoType;
+	private final WebInfoType infoType;
 
     private final String message;
 

encuestame-war/src/main/webapp/WEB-INF/layouts/standard/page.jsp

 		    <c:forEach items="${i18n}" var="entry"> 
                   <input type="hidden" name="${entry.key}" value="${entry.value}"/>   
             </c:forEach> 
+            <input type="hidden" name="not_view_all" value="<spring:message code="not_view_all" />"/>
 			<tiles:insertAttribute name="header" ignore="true" />
 			<tiles:insertAttribute name="menu" ignore="true" />
 		</header>

encuestame-war/src/main/webapp/WEB-INF/messages/messages_en_US.properties

 # Notification Messages
 #######################
 
+not_view_all = View All
 notification.tweetpoll.publish = TweetPoll published successfully
 notification.tweetpoll.created = TweetPoll created
 notification.tweetpoll.removed = TweetPoll {0} was removed
 notification.tweetpoll.unlike = {0} persons unlike your tweet
 notification.tweetpoll.finished = Your TweetPoll was finished. Check your results here.
 notification.social.tweet.published = Your tweet has been published successfully.
-
+notification.poll.publish = Your poll has been published 
 
 #########################
 # Relative Time Messages
 ###############################
 commons_captcha = CAPTCHA
 loading_message = Loading
-commons_success = SUCCESS
+commons_success = Gracias, tu configuraci\u00F3n ha sido guardada.
 commons_failure = FAILURE
 commons_filter = Filter
 commons_created_date = Created Date
 commons_detail_total_votes = Total Votes
 commons_detail_percent = % (Percent)
 commons_no_results = No results
-commons_success = Gracias, tu configuraci�n ha sido guardada.
 commons_favourite = Saved on your favorites list
 commons_unfavourite = Removed from your favorites list
 
 ## Survey
 ###############################
 survey.section.name.default = Section by default
-survey.section.name.description.default  
+survey.section.name.description.default  

encuestame-war/src/main/webapp/WEB-INF/messages/messages_es_ES.properties

 # Notification Messages
 #######################
 
+not_view_all = Ver todas
 notification.tweetpoll.publish = TweetPoll publicado satisfactoriamente
 notification.tweetpoll.created = TweetPoll ha sido creado
 notification.tweetpoll.removed = TweetPoll {0} fue eliminado
 notification.tweetpoll.unlike = {0} personas no le gusta tu tweetPoll
 notification.tweetpoll.finished = El tweetPoll ha finalizado, revisa tus resultados aqu�
 notification.social.tweet.published = Tu tweet ha sido publicado satisfactoriamente
+notification.poll.publish = Tu sondeo ha sido publicado
 
 #########################
 # Relative Time Messages
 ###############################
 commons_captcha = CAPTCHA
 loading_message = Cargando
-commons_success = PUBLICADO
+commons_success = Gracias, tu configuraci\u00F3n ha sido guardada.
 commons_failure = FALLO
 commons_filter = Filtrar
 commons_cancel = Cancelar
 commons_detail_total_votes = Votos Totales
 commons_detail_percent = Porcentaje
 commons_no_results = No hay datos
-commons_success = Gracias, tu configuraci�n ha sido guardada.
 commons_favourite = Guardado en tu lista de favoritos
 commons_unfavourite = Eliminado de tu lista de favoritos
 

encuestame-war/src/main/webapp/resource/css-compile/web/public.css

     -moz-box-shadow: 1px 4px 3px 0px #888888;
     -webkit-box-shadow: 1px 4px 3px 0px #888888;
     box-shadow: 1px 4px 3px 0px #888888;
+    background-color: white;
 }
 
 div.web-setup-wrapper div.web-setup-header-into {

encuestame-war/src/main/webapp/resource/js/encuestame.profile.js

                 "encuestame.org.core.commons.results.answers.ResultSupport",
                 "encuestame.org.core.commons.chart.AbstractChartVoteSupport",
                 "encuestame.org.core.commons.poll.detail.PollChartDetail",
+                "encuestame.org.core.shared.utils.SettingsMenuSwitch",
                 "encuestame.org.core.commons.support.OrderMenu",
                 "encuestame.org.core.commons.poll.vote.PollVote",
                 "encuestame.org.core.commons.support.SocialFilterMenu",
                 "encuestame.org.core.commons.tweetPoll.TweetPollCore",
                 "encuestame.org.core.commons.poll.vote.AnswerVote",
                 "encuestame.org.core.commons.support.VotesFilterMenu",
+                "encuestame.org.core.shared.utils.Toaster",
                 "encuestame.org.core.shared.utils.SocialAccountsSupport",
                 "encuestame.org.core.commons.support.AbstractFilterSupport",
                 "encuestame.org.core.commons.support.ItemsFilterSupport",

encuestame-war/src/main/webapp/resource/js/encuestame/org/core/commons/notifications/Notification.js

 dojo.require("dijit._Widget");
 dojo.require("dijit.layout.ContentPane");
 dojo.require('encuestame.org.core.commons');
+dojo.require('encuestame.org.main.EnmeMainLayoutWidget');
 dojo.require('encuestame.org.core.commons.notifications.NotificationItem');
 
 dojo.declare(
     "encuestame.org.core.commons.notifications.Notification",
-    [dijit._Widget, dijit._Templated],{
+    [encuestame.org.main.EnmeMainLayoutWidget],{
         templatePath: dojo.moduleUrl("encuestame.org.core.commons.notifications", "template/notification.html"),
 
-        widgetsInTemplate: true,
-
         /*
          * delay to retrieve new notification.
          */
          * limit of notifications.
          */
         limit: ENME.config('notification_limit'),
-
+        
+        i18nMessage : {
+        	not_view_all : ENME.getMessage("not_view_all"),
+        },
+        
+        /*
+         * 
+         */
         notifications : null,
 
+        /*
+         * 
+         */
         totalNot : 0,
 
+        /*
+         * 
+         */
         timer: null,
 
+        /*
+         * 
+         */
         _updateNotifications : true,
 
+        /*
+         * 
+         */
         openNot : false,
 
+        /*
+         * 
+         */
         _originalTitle : null,
 
         /*
               }));
             }));
             dojo.addOnUnload(function() {
-                if(subscriptionNotification != null){
+                if (subscriptionNotification != null) {
                     encuestame.activity.cometd.unsubscribe(subscriptionNotification);
                 }
             });
         /*
          * Load Timer.
          */
-        loadTimer : function(){
+        loadTimer : function() {
             var father = this;
             this.timer = new dojox.timing.Timer(this.delay);
             this.timer.onTick = function() {

encuestame-war/src/main/webapp/resource/js/encuestame/org/core/commons/notifications/template/notification.html

     <div class="livePanel" dojoAttachPoint="_panel">
         <div dojoAttachPoint="_not" class="panelItems"></div>
         <div class="final">
-            <a href="#" dojoAttachEvent="onclick:_viewAll">View All</a>
+            <a href="#" dojoAttachEvent="onclick:_viewAll">
+                ${i18nMessage.not_view_all}
+            </a>
         </div>
     </div>
     <div dojoAttachPoint="_count" class="counter" dojoAttachEvent="onclick:open"></div>
-    <div dojoType="dojox.widget.Dialog" id="allNot" dimensions="[1030,310]">
-         <div dojoType="dijit.layout.ContentPane" title="Add User Directly" selected="true">
-            Dialog with All notifications
-         </div>
-    </div>
 </div>