- Fix some issues regarding to cancel icon on attachments list, improve del...

alecpl

2012-04-06 85fd2921f4bcc102be4b031cc726e5055808deb6

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

 program/js/app.js

@@ -959,7 +959,7 @@
      case 'send-attachment':
        // Reset the auto-save timer
        self.clearTimeout(this.save_timer);
        

        this.upload_file(props || this.gui_objects.uploadform);
        break;

@@ -3443,8 +3443,9 @@

      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 });

      // upload progress support

 skins/default/common.css

@@ -556,6 +556,11 @@
  background-position: -74px 0;
}

img.uploading
{
  width: 16px;
  height: 16px;
}

/***** common table settings ******/


 skins/default/images/messageicons.gif

 skins/default/images/messageicons.png

 skins/default/mail.css

@@ -204,7 +204,8 @@
  background-position: 7px -71px;
}

#markmessagemenu li a
#markmessagemenu li a,
#compose-attachments li a
{
  background: url(images/messageicons.png) no-repeat;
}
@@ -1469,9 +1470,29 @@
  -o-text-overflow: ellipsis;
}

#compose-attachments ul li img
#compose-attachments li a
{
  padding-right: 2px;
  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;
}


 skins/default/templates/compose.html

@@ -43,7 +43,7 @@
<div id="compose-attachments">
<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">
  <roundcube:button name="uploadmenulink" id="uploadmenulink" type="link" title="addattachment" class="button addgroup" onclick="rcmail_ui.show_popup('uploadmenu', true);return false" content=" " />

 skins/larry/templates/compose.html

@@ -155,7 +155,7 @@
        <div style="text-align:center; margin-bottom:20px">
            <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>