Add files via upload

styles/styles.min.css

@@ -563,6 +563,7 @@ body {
     left: 0 !important;
 }
 
+.attachmentslistics:before,
 .attach_fullsizeM:before,
 .zipdownloadicon:before,
 #divscale_default:before,
@@ -972,6 +973,7 @@ margin-top:-25px;
 
 #mailtoolbar a{
 display:inline-block;
+border-radius:2px;
 }
 
 
@@ -4620,17 +4622,45 @@ background-repeat: no-repeat;
 
 .attachmentslistics{
 position:absolute;
-width:36px;
+width:42px;
 height:100%;
-right:0px;
 top:0;
+right:0;
+
 z-index:10;
-background-color: var(--backgroundhoverlight);
+
+font-weight: bold;
+font-size: 20px;
+text-align: center;
+padding-top: 0px;
+border-radius: 4px;
 }
+
 .attachmentslistics:hover{
-  filter: brightness(30%);
+  background-color: #D7F2FF;
 }
 
+.attachmentslistics:hover:before{
+opacity: 1;
+}
+
+html.dark-mode .attachmentslistics:hover{
+  background-color: #52676D;
+}
+
+
+
+.attachmentslistics:before{
+content: "\f0fe";
+font-weight: 400;
+font-size:18px;
+margin: 10px;
+color: var(--font);
+opacity: .7;
+}
+
+
+
 
 .attachmentslist .dropdown{
 display:none;
@@ -4779,7 +4809,7 @@ background-color: var(--backgroundhover);
 
 .attachmentslist li a.filename:after {
   content: "";
-  background: #aaa;
+  background-color: rgba(0, 0, 0, 0.3);
   filter: brightness(30%);
   display: block;
   position: absolute;

templates/message.html

@@ -145,6 +145,13 @@
 	</ul>
 </div>
 
+<div id="popupcalendarchoice" class="popupmenu">
+	<ul class="menu listing" role="menu">
+		<li role="menuitem"><a class="calendar" role="button" tabindex="-1" aria-disabled="true" href="#">AAAAA</a></li>
+		<li role="menuitem"><a class="calendar" role="button" tabindex="-1" aria-disabled="true" href="#">BBBBB</a></li>
+	</ul>
+</div>
+
 
 
 

ui.min.js

@@ -5395,10 +5395,12 @@ if(typeof rcube_calendar ==="function") // rcube_calendar exist ?
 	var hovertxt = $('#attachmentsavecal').text()
 		
 	$('.attachmentslist .ics').each(function() {
-		jQuery(this).find(".filename").append( "<div class='attachmentslistics' title='"+hovertxt+"'onclick='click_add_calendar(event,this)'>Add<br>Cal</div>" );
+		jQuery(this).find(".filename").append( "<div class='attachmentslistics' title='"+hovertxt+"'onclick='click_add_calendar(event,this)'></div>" );
 		})
 	}
-if($('.zipdownload').length ) // zipdownload plugin
+	
+// zipdownload plugin
+if($('.zipdownload').length )
 	{
 	var zd = $('.zipdownload')[0]
 	$('.tdzipdownload').css( "display","table-cell")
@@ -5412,7 +5414,7 @@ if($('.zipdownload').length ) // zipdownload plugin
 $('.attachmentslist .filename').off()
 $('.attachmentslist .filename').removeAttr("onclick")
 $('.attachmentslist .filename').attr('target','_blank');
-$('.attachmentslist li:not(.pdf, .image) .filename').attr("download", "") // open image & pdf in browser, download everything else (bug for pdf is forced download :/)
+$('.attachmentslist li:not(.pdf, .image) .filename').attr("download", "") // open image & pdf in browser, download everything else
 
 // add button if more than 2 files
 if($('.attachmentslist li').length > 2)
@@ -5426,15 +5428,58 @@ function click_add_calendar(e,p)
 {
 var attachid = p.closest("li").id.replace('attach',''); 
 
-rcmail.http_post('calendar/mailimportattach', {
+
+// only way i found to get the calendar number + name
+var stupid_request = $.ajax({      type: "GET", url: "?_task=calendar&_action=print",async: false,  }).responseText
+
+var start_rcmailenv =    stupid_request.indexOf("rcmail.set_env({") + 15
+var end_rcmailenv	=    stupid_request.indexOf("\n",start_rcmailenv)-2
+
+var rcmailenvline = stupid_request.substring(    start_rcmailenv,     end_rcmailenv);
+var rcmailenv = JSON.parse(rcmailenvline)
+
+var nb_calendar=Object.keys(rcmailenv.calendars).length
+
+
+if(nb_calendar==1)
+	{
+	rcmail.http_post('calendar/mailimportattach', {
 				 _uid: rcmail.env.uid,
 				 _mbox: rcmail.env.mailbox,
 				 _part: attachid
 			   }, rcmail.set_busy(true, 'itip.savingdata'));
+	}
+else // show menu to choose calendar
+	{
+	rcmail.command('menu-open', {menu: 'popupcalendarchoice', link: p}, p, e);
+	
+	//create menu
+	$('#popupcalendarchoice ul').empty()
+
+	$.each(rcmailenv.calendars, function(index, value) {
+			var calendarname = value.name
+			var calendarid = value.calendar_id
+			$('#popupcalendarchoice ul').append($('<li role="menuitem" onclick="click_add_calendarid('+calendarid+',\''+attachid+'\')"><a class="calendar" role="button" tabindex="-1" aria-disabled="true" href="#">'+calendarname+'</a></li>'))
+			});
+	}
 
 e.preventDefault();
 }
 
+
+function click_add_calendarid(calendarid,attachid)
+{
+rcmail.http_post('calendar/mailimportattach', {
+			 _uid: rcmail.env.uid,
+			 _mbox: rcmail.env.mailbox,
+			 _part: attachid,
+			 _calendar:calendarid
+		   }, rcmail.set_busy(true, 'itip.savingdata'));
+}
+
+
+
+
 function attach_fullsize()
 {
 $('.attachmentslist').css('max-height','unset');