Changeset 6045 in subversion

Timestamp:

Apr 6, 2012 7:26:04 AM (14 months ago)

Author:

alec

Message:

• Fix some issues regarding to cancel icon on attachments list, improve delete icon handling

Location:

trunk/roundcubemail

Files:

• program/js/app.js (modified) (2 diffs)
• skins/default/common.css (modified) (1 diff)
• skins/default/images/messageicons.gif (modified) (previous)
• skins/default/images/messageicons.png (modified) (previous)
• skins/default/mail.css (modified) (2 diffs)
• skins/default/templates/compose.html (modified) (1 diff)
• skins/larry/templates/compose.html (modified) (1 diff)

trunk/roundcubemail/program/js/app.js

@@ -960 +960 @@
         // Reset the auto-save timer
         self.clearTimeout(this.save_timer);
-        
+
         this.upload_file(props || this.gui_objects.uploadform);
         break;
@@ -3444 +3444 @@
       if (this.env.loadingicon)
         content = '<img src="'+this.env.loadingicon+'" alt="" class="uploading" />'+content;
-      if (this.env.cancelicon)
-        content = '<a title="'+this.get_label('cancel')+'" onclick="return rcmail.cancel_attachment_upload(\''+ts+'\', \''+frame_name+'\');" href="#cancelupload" class="cancelupload"><img src="'+this.env.cancelicon+'" alt="" /></a>'+content;
+      content = '<a title="'+this.get_label('cancel')+'" onclick="return rcmail.cancel_attachment_upload(\''+ts+'\', \''+frame_name+'\');" href="#cancelupload" class="cancelupload">'
+        + (this.env.cancelicon ? '<img src="'+this.env.cancelicon+'" alt="" />' : this.get_label('cancel')) + '</a>' + content;
+
       this.add2attachment_list(ts, { name:'', html:content, classname:'uploading', complete:false });
 

trunk/roundcubemail/skins/default/common.css

@@ -557 +557 @@
 }
 
+img.uploading
+{
+  width: 16px;
+  height: 16px;
+}
 
 /***** common table settings ******/

trunk/roundcubemail/skins/default/mail.css

@@ -205 +205 @@
 }
 
-#markmessagemenu li a
+#markmessagemenu li a,
+#compose-attachments li a
 {
   background: url(images/messageicons.png) no-repeat;
@@ -1470 +1471 @@
 }
 
-#compose-attachments ul li img
-{
-  padding-right: 2px;
+#compose-attachments li a
+{
+  text-indent: -1000px;
+  width: 17px;
+  display: block;
+  float: left;
+  text-decoration: none;
+}
+
+#compose-attachments li img
+{
+  vertical-align: middle;
+}
+
+#compose-attachments li a.delete,
+#compose-attachments li a.cancelupload
+{
+  background-position: 0px -392px;
+}
+
+#compose-attachments li span
+{
+  line-height: 18px;
   vertical-align: middle;
 }

trunk/roundcubemail/skins/default/templates/compose.html

@@ -44 +44 @@
 <div class="boxtitle"><roundcube:label name="attachments" /></div>
 <div class="boxlistcontent">
-    <roundcube:object name="composeAttachmentList" deleteIcon="/images/icons/delete.png" cancelIcon="/images/icons/delete.png" loadingIcon="/images/display/loading_blue.gif" />
+    <roundcube:object name="composeAttachmentList" id="attachmentslist" loadingIcon="/images/display/loading_blue.gif" />
 </div>
 <div class="boxfooter">

trunk/roundcubemail/skins/larry/templates/compose.html

@@ -156 +156 @@
                         <roundcube:button name="addattachment" type="input" class="button" classSel="button pressed" label="addattachment" onclick="UI.show_uploadform();return false" tabindex="10" />
                 </div>
-                <roundcube:object name="composeAttachmentList" id="attachment-list" class="attachmentslist" cancelIcon="/images/0.gif" />
+                <roundcube:object name="composeAttachmentList" id="attachment-list" class="attachmentslist" />
         </div>
 </div>