Tsumanu/bitque
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix email content type. Style lists

Browse Source
This commit is contained in:
Adrian Woźniak 2021-10-15 15:58:15 +02:00
parent d49c92cd53
commit 36bbaefb23
No known key found for this signature in database
GPG Key ID: DE43476F72AD3F6C
4 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actors/mail-actor/src/invite.rs
View File

@ -1,4 +1,5 @@
use actix::{Handler, Message}; use actix::{Handler, Message};
use lettre::message::header::ContentType;
use lettre::message::Mailbox; use lettre::message::Mailbox;
use uuid::Uuid; use uuid::Uuid;
@ -49,6 +50,7 @@ impl Handler<Invite> for MailExecutor {
.to(Mailbox::new(None, to)) .to(Mailbox::new(None, to))
.from(Mailbox::new(None, from)) .from(Mailbox::new(None, from))
.subject("Invitation to JIRS project") .subject("Invitation to JIRS project")
.header(ContentType::TEXT_HTML)
.body(html) .body(html)
.map_err(|e| { .map_err(|e| {
log::error!("{:?}", e); log::error!("{:?}", e);

2
actors/mail-actor/src/welcome.rs
View File

@ -1,4 +1,5 @@
use actix::{Handler, Message}; use actix::{Handler, Message};
use lettre::message::header::ContentType;
use lettre::message::Mailbox; use lettre::message::Mailbox;
use uuid::Uuid; use uuid::Uuid;
@ -51,6 +52,7 @@ impl Handler<Welcome> for MailExecutor {
.to(Mailbox::new(None, to)) .to(Mailbox::new(None, to))
.from(Mailbox::new(None, from)) .from(Mailbox::new(None, from))
.subject("Welcome to JIRS") .subject("Welcome to JIRS")
.header(ContentType::TEXT_HTML)
.body(html) .body(html)
.map_err(|e| { .map_err(|e| {
log::error!("{:?}", e); log::error!("{:?}", e);

14
web/js/css/styledEditor.scss
View File

@ -61,6 +61,20 @@
display: none; display: none;
min-height: 40px; min-height: 40px;
padding-top: 15px; padding-top: 15px;
ul {
> li {
list-style: disc;
margin-left: 20px;
}
}
ol {
> li {
list-style: decimal;
margin-left: 28px;
}
}
} }
> input.editorRadio { > input.editorRadio {

12
web/src/model.rs
View File

@ -302,20 +302,20 @@ impl Model {
messages_tooltip_visible: false, messages_tooltip_visible: false,
issue_ids: vec![], issue_ids: vec![],
user_ids: vec![], user_ids: vec![],
users_by_id: HashMap::with_capacity(1_000), users_by_id: Default::default(),
user_settings: None, user_settings: None,
comment_ids: vec![], comment_ids: vec![],
comments_by_id: HashMap::with_capacity(1_000), comments_by_id: Default::default(),
issues_by_id: Default::default(),
issue_status_ids: vec![], issue_status_ids: vec![],
issue_statuses_by_id: HashMap::with_capacity(1_000), issue_statuses_by_id: Default::default(),
issue_statuses_by_name: HashMap::with_capacity(1_000), issue_statuses_by_name: Default::default(),
messages: vec![], messages: vec![],
user_projects: vec![], user_projects: vec![],
projects: vec![], projects: vec![],
epic_ids: vec![], epic_ids: vec![],
issues_by_id: HashMap::with_capacity(1_000), epics_by_id: Default::default(),
show_extras: false, show_extras: false,
epics_by_id: HashMap::with_capacity(1_000),
modals_stack: vec![], modals_stack: vec![],
modals: Modals::default(), modals: Modals::default(),
key_triggers: std::rc::Rc::new(std::cell::RefCell::new(HashMap::with_capacity(20))), key_triggers: std::rc::Rc::new(std::cell::RefCell::new(HashMap::with_capacity(20))),