Changeset 7064 for sandbox

Timestamp:

08/17/12 16:48:33 (12 years ago)

Author:

gustavo

Message:

Ticket #2911 - Melhoria na disposição e exibição das abas

Location:

sandbox/newExpressoMail/expressoMail1_2

Files:

• index.php (modified) (2 diffs)
• js/abas.js (modified) (4 diffs)
• js/draw_api.js (modified) (1 diff)
• js/main.js (modified) (4 diffs)

sandbox/newExpressoMail/expressoMail1_2/index.php

@@ -48 +48 @@
                 <script src="../library/ckeditor/adapters/jquery.js" language="javascript"></script> 
                 <script src="../prototype/plugins/lazy/jquery.lazy.js" language="javascript"></script> 
-                
+                <link rel="stylesheet" type="text/css" href="../prototype/plugins/fgmenu/fg.menu.css" media="screen">
                 <link rel="Stylesheet" type="text/css" href="../prototype/plugins/jquery/jquery-ui.css" />                                      
                 
@@ -70 +70 @@
                 <script type="text/javascript" src="../prototype/plugins/scrollable-tabs/jquery.scrollabletab.js"></script>
                 <script type="text/javascript" src="../prototype/plugins/qtip/jquery.qtip-1.0.0-rc3.min.js"></script>
+                <script type="text/javascript" src="../prototype/plugins/fgmenu/fg.menu.js"></script>
                 <script type="text/javascript" src="../prototype/plugins/contextmenu/jquery.contextMenu.js"></script>
                 <!-- <script type="text/javascript" src="../prototype/plugins/contextmenu/jquery.ui.position.js"></script> -->

sandbox/newExpressoMail/expressoMail1_2/js/abas.js

@@ -11 +11 @@
 
 var ptabs = $("#ptabs").tabs({ 
-        tabTemplate: "<li role='tab'><a href='#{href}'>#{label}</a> <span class='ui-icon ui-icon-close' title='Fechar Aba'>Fechar Aba</span></li>", 
+        tabTemplate: "<li role='tab' style='cursor: pointer;'><a href='#{href}'>#{label}</a> <span class='ui-icon ui-icon-close' title='Fechar Aba'>Fechar Aba</span></li>", 
         add: function( event, ui ) { 
                 countID++; 
@@ -25 +25 @@
         },
         select: function(event, ui) { 
-                console.log(ui.index);
                 lastIndexSelected = ui.index;
         }
-}); 
+});
 
 //$(ptabs).find(".ui-tabs-nav").wrap("<div class='scroll-tabs'></div>");
@@ -58 +57 @@
 }
 
-
 /* 
         method : removeTab
@@ -83 +81 @@
 }
 
-
 /* 
         method : indexTab

sandbox/newExpressoMail/expressoMail1_2/js/draw_api.js

@@ -924 +924 @@
 function syncColumns() {
         var thisCell;
-        var tbl = (document.getElementById("content_id_"+numBox)==null ? 1 : 0);
+        var tbl = (document.getElementById("ui-tabs-"+numBox)==null ? 1 : 0);
         if (objCell)
                 thisCell = objCell;

sandbox/newExpressoMail/expressoMail1_2/js/main.js

@@ -101 +101 @@
                 $( "#ptabs").find( ".ui-tabs-nav" ).sortable({ 
                         items: "li:not(.ui-tab-disabled)", 
-                        helper : function(a, b){
-                                console.log(a);
-                                console.log(b);
-                                var oi = $(b).clone();
-                                oi.addClass("ui-corner-all").css("width", "auto").find("span.ui-icon-close").hide().end().find("a").html("Mover "+oi.find("a").html());
-                                return oi;
-                        }
+                        helper : function(e, drag){
+                                var helper = $(drag).clone();
+                                helper.addClass("ui-corner-all").css("width", "auto").find("span.ui-icon-close").hide().end().find("a").html("Mover "+helper.find("a").html());
+                                return helper;
+                        },
+                        placeholder: 'ui-state-highlight',
+                        forcePlaceholderSize: true
                 }).disableSelection();
 
@@ -569 +569 @@
                 else {
                         var sbj = msg_info.subject.length < 21 ? msg_info.subject : msg_info.subject.substr(0,21) + "...";
-                        var content = $(DataLayer.render("../prototype/modules/mail/templates/email.ejs", {info : msg_info}));
+                        var content = $(DataLayer.render("../prototype/modules/mail/templates/email.ejs", {info : msg_info, ID : id_msg_read}));
 
                         createTab(sbj, content.html(), id_msg_read, function(content){
+                content.find(".message-flags").find(".message-important-flag").button({
+                        icons: {
+                                primary: "ui-icon-notice"
+                        },
+                    text: false
+                }).end().find(".message-unread-flag").button({
+                        icons: {
+                                primary: "ui-icon-mail-closed"
+                        },
+                    text: false
+                }).end().find(".message-spam-flag").button({
+                        icons: {
+                                primary: "ui-icon-alert"
+                        },
+                    text: false 
+                }).end().find(".message-followup-flag").button({
+                        icons: {
+                                primary: "ui-icon-flag"
+                        },
+                    text: false
+                });
                 content.find(".message-flags").buttonset();
+
+                content.find(".messages-controll").find(".message-prev").button({
+                        icons: {
+                                primary: "ui-icon-carat-1-w"
+                        },
+                    text: false
+                }).next().button({
+                        icons: {
+                                primary: "ui-icon-carat-1-e"
+                        },
+                    text: false
+                });
+                content.find(".messages-controll").buttonset();
                 content.find(".message-tags").button({
                     icons: {
@@ -589 +623 @@
                     },
                     text: false
-                }).next().button({
+                });
+                content.find(".messages-preferences").button({
                     icons: {
                         primary: "ui-icon-gear",
@@ -595 +630 @@
                     },
                     text: false
-                });
+                }).css("width", "45px");
             });