From 3c4e7562715eb3fd37eab8027642b6b3ad3f6fdd Mon Sep 17 00:00:00 2001 From: seb1k <64972483+seb1k@users.noreply.github.com> Date: Sun, 6 Oct 2024 22:54:23 +0200 Subject: [PATCH] Add files via upload --- styles/styles.min.css | 37 ++++++++++++++++++++++++++-------- templates/message.html | 2 +- ui.min.js | 45 ++++++++++++++++++------------------------ 3 files changed, 49 insertions(+), 35 deletions(-) diff --git a/styles/styles.min.css b/styles/styles.min.css index e04bfe0..cb72b6c 100644 --- a/styles/styles.min.css +++ b/styles/styles.min.css @@ -20,6 +20,15 @@ html.dark-mode { } +.header-headers .from .adr{ +font-size:medium; +line-height:1.5; +} +.header-headers{ +line-height:1.3; +} + + .action-show .header{ justify-content: unset !important; } @@ -91,7 +100,7 @@ color: var(--font); .replacecontactpic{ text-align : center; display : inline-block !important; -margin: 0 8px 0 4px !important; +margin: 0px 8px 0 0px !important; } @@ -155,11 +164,11 @@ color: #000; -html.layout-small .sel_circle { +#message-header .sel_circle { width:36px; height:36px; border-radius:18px; -padding-top: .1rem; +padding-top: 2px; } @@ -784,6 +793,15 @@ html.iframe body { margin: 0 -20rem; } +.header-title{ +padding-right: 8px; +opacity:.7; +} + +.header-headers .adr a:link{ +color:var(--font); +} + #layout > div > .header a.toolbar-list-button, #layout > div > .header a.toolbar-menu-button { order: 99; @@ -968,7 +986,7 @@ float:initial !important; } #mailtoolbar{ -margin-top:-25px; +margin-top:-10px; } #mailtoolbar a{ @@ -980,7 +998,6 @@ border-radius:2px; .tddatemovetoright{ position:absolute; right:20px; -margin-top: -15px; } html.layout-normal #mailtoolbar span, @@ -4601,7 +4618,6 @@ html.layout-phone a.refresh { .attachmentslist { padding: 0; margin: 0; - max-height:100px; overflow: auto; list-style-type: none; scrollbar-width: thin; @@ -5357,13 +5373,16 @@ html.layout-small .formcontainer .formbuttons { .formcontent .row .col, .formcontent .row .col-10, +.formcontent .row .col-11, .formcontent .row .col-12, +.formcontent .row .col-1, .formcontent .row .col-2, .formcontent .row .col-4, .formcontent .row .col-6, .formcontent .row .col-8, .formcontent .row .col-sm, .formcontent .row .col-sm-10, +.formcontent .row .col-sm-11, .formcontent .row .col-sm-12, .formcontent .row .col-sm-2, .formcontent .row .col-sm-4, @@ -5469,6 +5488,7 @@ html.layout-small .formcontainer .formbuttons { @media screen and (max-width: 320px) { .formcontent .col-10, + .formcontent .col-11, .formcontent .col-6, .formcontent .col-8, .formcontent .col-form-label { @@ -6924,7 +6944,8 @@ body.task-error-login #layout #layout-content > .header{ #message-header { - margin-bottom: .1rem; + margin-left:4px; + margin-bottom: 16px; } #message-header > .subject { @@ -6957,7 +6978,7 @@ body.task-error-login #layout #layout-content > .header{ } #message-header > .header img.contactphoto { - margin: 0 1rem 0 0; + margin: 0 8px 0 0; border-radius: 50%; width: 36px; height: 36px; diff --git a/templates/message.html b/templates/message.html index e3311a2..cd1503d 100644 --- a/templates/message.html +++ b/templates/message.html @@ -50,7 +50,7 @@
-
+
diff --git a/ui.min.js b/ui.min.js index f725fa7..608ba97 100644 --- a/ui.min.js +++ b/ui.min.js @@ -5343,31 +5343,24 @@ trdate.parentElement.appendChild(trdate); // move date to last line //ugly safari fix $('.header-headers .date')[0].innerHTML=""+$('.header-headers .date').text()+"" -var fromhref = $('.header-headers .from .adr a')[0].href -var replyto = $('.header-headers .replyto') -if(replyto.length) // delete replyTo if same as "from" - { - var replytohref = replyto[0].querySelector('a').href +$('.header-headers .replyto').parent().remove() - if(replytohref==fromhref) - { - replyto.parent().hide() - } - } - -var sender = $('.header-headers .sender') -if(replyto.length && sender.length) // delete sender if same as "from" - { - var senderhrefhref = replyto[0].querySelector('a').href - - if(senderhrefhref==fromhref) - { - sender.parent().hide() - } - } +// delete sender if same as "from" +$('.header-headers .sender').each(function() { + var fromhref = $('.header-headers .from .adr a')[0].href + var senderaddr=jQuery(this).find('.rcmContactAddress')[0].href + log(fromhref+'---'+senderaddr) + if(fromhref==senderaddr) + this.parentElement.remove() + }) + + +$('.header-headers .header-title').first().remove() +$('.header-headers .header.from').attr('colspan',2); +$('.header-headers .header-title').last().text("").width(0) } function elastic2022_change_attachmentslist() @@ -5378,7 +5371,7 @@ $('.attachment-size').each(function() { this.innerText=this.innerText.replace(/[ $('.attachmentslist .filename').off() $('.attachmentslist .filename').removeAttr("onclick") $('.attachmentslist .filename').attr('target','_blank'); -$('.attachmentslist li:not(.rfc822, .pdf, .image) .filename').attr("download", "") // open image & pdf in browser, download everything else (bug for pdf is forced download :/) +$('.attachmentslist li:not(.rfc822, .pdf, .image) .filename').attr("download", "") // open selected attachement in browser // add thumbail for .image $('.attachmentslist .image').each(function() { @@ -5421,11 +5414,11 @@ if($('.zipdownload').length ) } -// add button if more than 2 files -if($('.attachmentslist li').length > 2) +// add button if more than 3 files +if($('.attachmentslist li').length > 3) { - $('#attach_fullsize').show(); setTimeout(function() {$('#attach_fullsize').show();}, 100); // again because of a bug on small layout + $('.attachmentslist').css('max-height','100px'); } } @@ -5435,7 +5428,7 @@ var attachid = p.closest("li").id.replace('attach',''); // 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 stupid_request = $.ajax("?_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