Commits

Juan Carlos Picado Herrera  committed 4500c52

toaster style and position

  • Participants
  • Parent commits 644c458

Comments (0)

Files changed (10)

File enme-core/src/main/resources/org/encuestame/core/config/encuestame-config.properties

 #    NOTIFICATION
 # ----------------------------------------------------------------------------
 
-not.toaster.duration = 10
+not.toaster.duration = 3
 not.toaster.topic = myMessages
 not.toaster.position = tr-right
 

File enme-war/src/main/webapp/WEB-INF/jsp/includes/web/menu.jsp

             </span>
         </div>
     </div>
-    <c:if test="${logged}">
-         <div data-dojo-type="me/web/widget/ui/Toaster"
-           duration="<%=EnMePlaceHolderConfigurer.getProperty("not.toaster.duration")%>"
-           messageTopic="/encuestame/message/publish"
-           positionDirection="<%=EnMePlaceHolderConfigurer.getProperty("not.toaster.position")%>"
-           id="toasted_message">
-    </div>
-    </c:if>
 </div>

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

     <tiles:insertAttribute name="menu" ignore="true" />
     <div id="content-container" class="enme-auto-center">
       <div id="enme-content" class="enme-auto-center">
+         <c:if test="${logged}">
+             <div data-dojo-type="me/web/widget/ui/Toaster"
+               duration="<%=EnMePlaceHolderConfigurer.getProperty("not.toaster.duration")%>"
+               messageTopic="/encuestame/message/publish"
+               positionDirection="<%=EnMePlaceHolderConfigurer.getProperty("not.toaster.position")%>"
+               id="toasted_message">
+            </div>
+        </c:if>
         <tiles:insertAttribute name="content" />
             <c:if test="${logged}">
             <!--
      <div id="modal-box"></div>
      <div id="loading"></div>
   </c:if>
-  <script>document.write('<script src="http://' + (location.host || 'localhost').split(':')[0] + ':35729/livereload.js?snipver=1"></' + 'script>')</script>
 </body>
 
 </html>

File enme-war/src/main/webapp/resource/css-compile/development.css

 @import url("web/table.css");
 @import url("web/user.css");
 @import url("web/components/front-aside.css");
+@import url("web/components/toaster.css");
 @import url("web/components/notification-list.css");
 @import url("web/components/front.css");
 @import url("web/components/profile.css");

File enme-war/src/main/webapp/resource/css-compile/layout.css

 
     #content-container #enme-content {
         min-height: 100%;
+        position: relative;
     }
 
     #content-container #enme-content a:link {

File enme-war/src/main/webapp/resource/css-compile/web/components/button.css

 
 .enme-web-context  .dijitMenuActive .dijitMenuItemHover, .enme-web-context .dijitMenuActive .dijitMenuItemSelected {
     background-color: none !important;
-}
-
-/** float messages window **/
-
-.enme-web-context .dijitToasterContent {
-    background: none repeat scroll 0 0 transparent !important;
-    padding: 0 !important;
-}
-
-.enme-web-context .dijitToasterContent .message_toaster {
-  border-radius: 5px 5px 5px 5px;
-  box-shadow: 1px 1px 1px 1px #C6C6C6;
-  color: black;
-  margin: 5px;
-  padding: 5px;
-  width: 200px;
-}
-
-.enme-web-context .dijitToasterContent .message_toaster > div {
-  color: white;
-  font-size: 13px;
-  font-weight: bold;
-}
-
-.enme-web-context .dijitToasterContent .message_toaster > div > p {
-  margin: 3px 0;
-}
-
-.enme-web-context  .dijitToasterContainer {
-    display: block;
-    font: 0.75em Tahoma,Helvetica,Verdana,Arial;
-    margin: 0;
-   width: 300px;
-}
-
-.enme-web-context  .dijitToasterFatal  .message_toaster {
-      background: none repeat scroll 0 0 red;
-      color: #FFFFFF;
-}
-
-.enme-web-context  .dijitToasterError  .message_toaster {
-      background: none repeat scroll 0 0 red;
-      color: #FFFFFF;
-}
-
-.enme-web-context  .dijitToasterMessage .message_toaster {
-      background: none repeat scroll 0 0 #ACEBAE;
-      color: #FFFFFF;
-}
-
-.enme-web-context  .dijitToasterWarning .message_toaster {
-      background: none repeat scroll 0 0 yellow;
-      color: black;
-
 }

File enme-war/src/main/webapp/resource/css-compile/web/components/menu-logged.css

   -webkit-border-radius: 0px 0px 5px 5px;
   -moz-border-radius: 0px 0px 5px 5px;
   border-radius: 0px 0px 5px 5px;
+  position: relative;
 }
 
 @media only screen and (max-width : 980px) {

File enme-war/src/main/webapp/resource/css-compile/web/components/toaster.css

+/** float messages window **/
+
+.enme-web-context .dijitToasterContent {
+    background: none repeat scroll 0 0 transparent !important;
+    padding: 0 !important;
+}
+
+.enme-web-context .dijitToasterContent .message_toaster {
+  padding: 15px 10px 15px 10px;
+  margin-bottom: 5px;
+}
+
+.enme-web-context .dijitToasterContent .message_toaster > div {
+  font-size: 12px;
+}
+
+.enme-web-context .dijitToasterContent .message_toaster > div > p {
+  margin: 3px 0;
+}
+
+.enme-web-context  .dijitToasterContainer {
+    display: block;
+    font: 0.75em Tahoma,Helvetica,Verdana,Arial;
+    margin: 0;
+    width: 300px;
+}
+
+.enme-web-context  .dijitToasterFatal  .message_toaster {
+     background: none repeat scroll 0 0 #FFBABA;
+      color: #D8000C;
+      border: 1px solid #FFBABA;
+}
+
+.enme-web-context  .dijitToasterError  .message_toaster {
+     background: none repeat scroll 0 0 #FFBABA;
+      color: #D8000C;
+      border: 1px solid #FFBABA;
+}
+
+.enme-web-context  .dijitToasterMessage .message_toaster {
+      background: none repeat scroll 0 0 #DFF2BF;
+      color: #4F8A10;
+      border: 1px solid #4F8A10;
+}
+
+.enme-web-context  .dijitToasterWarning .message_toaster {
+      background: none repeat scroll 0 0 #FEEFB3;
+      color: #9F6000;
+
+}

File enme-war/src/main/webapp/resource/js/me/core/main_widgets/WidgetServices.js

        * @method successMesage
        */
       successMesage : function(message, description) {
-          //console.info("Successfull message");
         _ENME.success(message, description);
       },
 
        * @method errorMessage
        */
       errorMessage : function(message, description) {
-        _ENME.success(message, description);
+        _ENME.error(message, description);
       },
 
      /**

File enme-war/src/main/webapp/resource/js/me/web/widget/tweetpoll/TweetPollList.js

                   }
               );
               // error handlers
+              var parent = this;
               var error = function(error) {
-                  console.error("error", error);
+                  _ENME.log("TweetPollList error : ", error);
+                  parent._loading.hide();
+                  parent.errorMessage(error);
               };
               //
               this._loading.show(this.i18nMessage.loading_message, _ENME.MESSAGES_TYPE.WARNING);