Changeset 3525

Timestamp:

11/19/10 16:41:32 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #1189 - Assunto truncado exibe HTML entity. Ajuste na visualizacao do titulo das abas.

Location:

branches/2.2/expressoMail1_2

Files:

• js/abas.js (modified) (3 diffs)
• templates/default/main.css (modified) (1 diff)

branches/2.2/expressoMail1_2/js/abas.js

@@ -144 +144 @@
                 borderTitle = borderTitle.substring(0, resize*0.08);
 
-        td.innerHTML = "<table width=100% border=0 cellspacing=0 cellpadding=0><tr><td id=font_border_id_" + ID+" class='font-menu' width=*>" + borderTitle + "</td><td width=1px><img onmousedown='javascript:return false' style='cursor:pointer' onclick=delete_border('" + ID + "','false') src='templates/"+template+"/images/close_button.gif'></td></tr></table>";
+        td.innerHTML = "<div style='width:100%;border:0;padding:0;'>\n\
+                            <div id='font_border_id_" + ID+"' class='font-menu' style='width:*;'>" +
+                                borderTitle +
+                            "</div>\n\
+                            <div style='width:1px;float:left;clear:right;'>\n\
+                                <img onmousedown='javascript:return false' style='cursor:pointer' onclick=delete_border('" + ID + "','false') src='templates/"+template+"/images/close_button.gif'/>\n\
+                            </div>\n\
+                        </div>";
 
         bb = document.getElementById("border_blank");
@@ -199 +206 @@
                 if ((children[i].nodeName === 'TD') && (children[i].id!=='border_id_0') && (children[i].id!=='border_blank')){
                         children[i].style.width = newWidthTD;
-                        set_border_caption(children[i].id, children[i].title);
+                        set_border_caption(children[i].id, children[i].title, newWidthTD);
                 }
         }
@@ -205 +212 @@
 }
 
-function set_border_caption(border_id, title)
-{
-        var border = document.getElementById(border_id);
-        var border_width = border.clientWidth;
+function set_border_caption(border_id, title, border_width)
+{
+        var border = document.getElementById(border_id);
+        if (border_width == null)
+        {
+            border_width = border.clientWidth;
+        }
         var caption = "";
-        if (title.substring(0, (border_width-44)*0.14).length < title.length)
-                title = title.substring(0, (border_width-44)*0.14) + "...";
+        Element("font_"+border.id).style.width = (border_width - 25)+'px';
         Element("font_"+border.id).innerHTML = title;
         return(title);

branches/2.2/expressoMail1_2/templates/default/main.css

@@ -118 +118 @@
 .font-menu
 {
+    color: #000;
+}
+
+.font-menu-sel
+{
+        color:#0000FF;
+}
+
+.font-menu, .font-menu-sel {
+    float: left;
+    clear: left;
+    overflow: hidden;
+    white-space: nowrap;
+    padding-left: 5px;
+    margin-right: 5px;
     text-decoration: none;
     text-align: center;
-    color: #000;
-}
-
-.font-menu-sel
-{
-    text-decoration: none;
-    text-align: center;
-        color:#0000FF;
 }