1. Juan Carlos Picado Herrera
  2. encuestame

Commits

Juan Carlos Picado Herrera  committed ce7ffdd

Reorder release page content, Notification add view all dialog, Profile Dialog

  • Participants
  • Parent commits bd33fc2
  • Branches master

Comments (0)

Files changed (10)

File encuestame-war/src/main/webapp/WEB-INF/jsp/includes/headerLogged.jsp

View file
  • Ignore whitespace
                          </span>
                         <span class="link">
                          <span id="navbar">
-                               <div dojoType="encuestame.org.core.commons.profile.ProfileMenu"></div>
+                               <div dojoType="encuestame.org.core.commons.profile.ProfileMenu"
+                                    contextPath="<%=request.getContextPath()%>"></div>
                          </span>
                         </span>
                     <span class="search">
                         <div dojoType="encuestame.org.core.commons.search.SearchMenu"></div>
                     </span>
-                        <span class="link">
-                               <a href="<%=request.getContextPath()%>/user/logout">Log out</a>
-                        </span>
                 </form>
         </div>
         <div id="profile_menu" style="display:none; right: 0px;">

File encuestame-war/src/main/webapp/resource/css/livePanel.css

View file
  • Ignore whitespace
 div.livePanel{
     display: none;
     position: absolute;
-    min-height: 200px;
+    min-height: 5px;
     width: 400px;
-    border: 1px solid #000;
     background-color: #FFF;
-    right: 200px;
+    right: 220px;
     top: 75px;
+    -moz-box-shadow: 0px 2px 2px #888;
+    -webkit-box-shadow: 0px 2px 2px #888;
+    box-shadow: 10px 10px 5px #888;
+    -webkit-border-radius: 0px 0px 5px 5px;
+    -moz-border-radius: 0px 0px 5px 5px;
+     border-radius: 0px 0px 5px 5px;
+     min-width: 345px;
+     max-width: 345px;
+}
+
+div.livePanel .panelItems{
+    min-height: 100%;
 }
 
 div.livePanel .final{
     font-weight: bold;
     background-color: #E8E8E8;
 }
+div.livePanel .final a:link{
+    color: "#000";
+}
 
 div.openLivePanel{
      display: block;

File encuestame-war/src/main/webapp/resource/css/menu.css

View file
  • Ignore whitespace
+div.menuWrapper{
+    font-weight: bold;
+    -moz-box-shadow: 0px 2px 2px #888;
+    -webkit-box-shadow: 0px 2px 2px #888;
+    box-shadow: 10px 10px 5px #888;
+    -webkit-border-radius: 0px 0px 5px 5px;
+    -moz-border-radius: 0px 0px 5px 5px;
+     border-radius: 0px 0px 5px 5px;
+}
+
 .menuWrapper ul {
     margin: 0;
     padding: 0;
 .menuWrapper ul li.item a:hover,.menuWrapper ul li .current {
     color: #444444;
     background-color: #E8E8E8;
+    -moz-box-shadow: 0px 2px 2px #888;
+    -webkit-box-shadow: 0px 2px 2px #888;
+    box-shadow: 10px 10px 5px #888;
 }
 
 .menuWrapper {

File encuestame-war/src/main/webapp/resource/css/profile.css

View file
  • Ignore whitespace
-#profileWrapper{
-    margin: 70px;
+.profileWrapper{
+
+}
+
+div.profilePanel{
+    display: none;
+    position: absolute;
+    min-height: 120px;
+    min-width: 245px;
+    background-color: #444444;
+    right: 220px;
+    top: 37px;
+    z-index: 5px;
+    zoom: 1;
+    -moz-box-shadow: 0px 2px 2px #888;
+    -webkit-box-shadow: 0px 2px 2px #888;
+    box-shadow: 10px 10px 5px #888;
+    -webkit-border-radius: 0px 0px 5px 5px;
+    -moz-border-radius: 0px 0px 5px 5px;
+     border-radius: 0px 0px 5px 5px;
+
+}
+
+div.profileOpenPanel{
+    display: block;
+}
+div.profilePanel ul{
+    max-height: 350px;
+    overflow: hidden;
+}
+
+div.profilePanel li{
+    background-image: none;
+    clear: both;
+    display: block;
+    width: 215px;
+    float: left;
+    text-align: left;
+    list-style: none;
+    margin: 0px;
+    padding: 6px 15px;
+}
+div.profilePanel li:hover{
+    background-color: "#5F5F5F";
+}
+
+div.profilePanel li a:link{
+   color: #BABABA !important;
+   font-weight: normal;
+}
+
+div.profilePanel li a{
+    padding: 10px;
+    color: #BABABA !important;
+    font-weight: normal;
 }

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

View file
  • Ignore whitespace
 dojo.provide("encuestame.org.core.commons.notifications.Notification");
 
 dojo.require('dojox.timing');
+dojo.require("dojox.widget.Dialog");
 dojo.require("dijit._Templated");
 dojo.require("dijit._Widget");
+dojo.require("dijit.layout.ContentPane");
 dojo.require('encuestame.org.core.commons');
 
 dojo.declare(
             this.timer.start();
         },
 
+        /*
+         * open dialog notification.
+         */
         open: function(event){
+            dojo.stopEvent(event);
             if(!this.openNot){
                 dojo.addClass(this._panel, "openLivePanel");
                 if(!this.notifications){
             this.openNot = !this.openNot;
         },
 
-     // load notifications
+        /*
+         * view all.
+         */
+        _viewAll : function(event){
+             dojo.stopEvent(event);
+             dijit.byId("allNot").show();
+        },
+
+        /*
+         * load notifications
+         */
         loadStatus : function() {
             var load = dojo.hitch(this, function(data){
                 var total = data.success.t;
                 console.debug("item", this.item);
             },
 
-
             /*
              * Remove Notification
              */
                 var url = '/encuestame/api/remove-notification.json';
             }
 
-
         });

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

View file
  • Ignore whitespace
 <div class="notificationWrapper">
     <div class="livePanel" dojoAttachPoint="_panel">
-        <div dojoAttachPoint="_not"></div>
+        <div dojoAttachPoint="_not" class="panelItems"></div>
         <div class="final">
-            <a href="#">View All</a>
+            <a href="#" dojoAttachEvent="onclick:_viewAll">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>

File encuestame-war/src/main/webapp/resource/js/encuestame/org/core/commons/profile/ProfileMenu.js

View file
  • Ignore whitespace
     [dijit._Widget, dijit._Templated],{
         templatePath: dojo.moduleUrl("encuestame.org.core.commons.profile", "templates/profileMenu.inc"),
 
-        widgetsInTemplate: true
+        widgetsInTemplate: true,
+
+        _openBox : false,
+
+        contextPath : "",
+
+        _open: function(event){
+            dojo.stopEvent(event);
+            if(this._openBox){
+                dojo.removeClass(this._profileBox, "profileOpenPanel");
+                this._openBox = false;
+            } else {
+                dojo.addClass(this._profileBox, "profileOpenPanel");
+                this._openBox = true;
+            }
+        }
 
 });

File encuestame-war/src/main/webapp/resource/js/encuestame/org/core/commons/profile/templates/profileMenu.inc

View file
  • Ignore whitespace
 <span>
-    <a href="#" >Profile</a>
+    <a href="#" dojoAttachEvent="onclick:_open">Profile</a>
+    <div class="profilePanel" dojoAttachPoint="_profileBox">
+        <ul class="user-dropdown">
+            <li><a href="${contextPath}/settings/account">Configuration</a></li>
+            <li><a href="${contextPath}/settings/social">Social Accounts</a></li>
+            <li><a href="${contextPath}/help">Help</a></li>
+            <li>
+              <a href="${contextPath}/user/logout">Log out</a>
+            </li>
+          </ul>
+    </div>
 </span>

File encuestame-war/src/main/webapp/resource/js/encuestame/org/core/commons/tweetPoll/TweetPoll.js

View file
  • Ignore whitespace
                     "hashtags" : tags,
                     "answers" : answers
             };
-
+            console.debug("params", params);
             var load = dojo.hitch(this, function(data){
                 console.debug(data);
             });

File src/site/apt/releases.apt

View file
  • Ignore whitespace
+release v1.1.33
+
+        * Validation features in SignUp.
+
+        * Pictures thumbnail generator.
+
+        * Update user profile enhancement.
+
+        * Upgraded Spring Security 3.0.5.RELEASE version.
+
+release v1.1.32
+
+        * Upload pictures.
+
+        * Sign up User Improvement, wizard feature
+
 release v1.1.31  
 
 	* Replaced config xml by spring annotations.
 	
 	* Upload pictures.
 
-	* Sign up User Improvement, wizard feature
-
-  	
-
-release v1.1.33
- 
-	* Validation features in SignUp.
-
-	* Pictures thumbnail generator.
-   
-	* Update user profile enhancement.
- 
-	* Upgraded Spring Security 3.0.5.RELEASE version.
-	   
+	* Sign up User Improvement, wizard feature