mythic-insight/calcom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Bugfix/minor email fix (#1644)

Browse source 
* added new line fix, minor email validation

* fix: reorder controls hidden on more than 1 events #1452

Signed-off-by: arnabtarwani <arnab.tarwani@gmail.com>

Co-authored-by: Alex van Andel <me@alexvanandel.com>
This commit is contained in:
Arnab Tarwani 2022-01-29 19:22:02 +00:00 committed by GitHub
parent 811f4351a5
commit 509e0b0a39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/emails/templates/attendee-scheduled-email.ts
View file

@ -289,7 +289,9 @@ ${getRichDescription(this.calEvent)}
<p style="height: 6px"></p> <p style="height: 6px"></p>
<div style="line-height: 6px;"> <div style="line-height: 6px;">
<p style="color: #494949;">${this.calEvent.attendees[0].language.translate("additional_notes")}</p> <p style="color: #494949;">${this.calEvent.attendees[0].language.translate("additional_notes")}</p>
<p style="color: #494949; font-weight: 400; line-height: 24px;">${this.calEvent.description}</p> <p style="color: #494949; font-weight: 400; line-height: 24px; white-space: pre-wrap;">${
this.calEvent.description
}</p>
</div> </div>
`; `;
} }

4
lib/emails/templates/organizer-scheduled-email.ts
View file

@ -290,7 +290,9 @@ ${getRichDescription(this.calEvent)}
<p style="height: 6px"></p> <p style="height: 6px"></p>
<div style="line-height: 6px;"> <div style="line-height: 6px;">
<p style="color: #494949;">${this.calEvent.organizer.language.translate("additional_notes")}</p> <p style="color: #494949;">${this.calEvent.organizer.language.translate("additional_notes")}</p>
<p style="color: #494949; font-weight: 400; line-height: 24px;">${this.calEvent.description}</p> <p style="color: #494949; font-weight: 400; line-height: 24px; white-space: pre-wrap;">${
this.calEvent.description
}</p>
</div> </div>
`; `;
} }

25
pages/event-types/index.tsx
View file

@ -108,16 +108,21 @@ const EventTypeList = ({ readOnly, types, profile }: EventTypeListProps): JSX.El
type.$disabled && "pointer-events-none" type.$disabled && "pointer-events-none"
)}> )}>
<div className="flex items-center justify-between w-full px-4 py-4 group sm:px-6 hover:bg-neutral-50"> <div className="flex items-center justify-between w-full px-4 py-4 group sm:px-6 hover:bg-neutral-50">
<button {sortableTypes.length > 1 && (
className="hidden sm:block absolute -mt-4 mb-4 left-1/2 -ml-4 sm:ml-0 sm:left-[19px] border hover:border-transparent text-gray-400 transition-all hover:text-black hover:shadow group-hover:scale-100 scale-0 w-7 h-7 p-1 invisible group-hover:visible bg-white rounded-full" <>
onClick={() => moveEventType(index, -1)}> <button
<ArrowUpIcon /> className="hidden sm:block absolute -mt-4 mb-4 left-1/2 -ml-4 sm:ml-0 sm:left-[19px] border hover:border-transparent text-gray-400 transition-all hover:text-black hover:shadow group-hover:scale-100 scale-0 w-7 h-7 p-1 invisible group-hover:visible bg-white rounded-full"
</button> onClick={() => moveEventType(index, -1)}>
<button <ArrowUpIcon />
className="hidden sm:block absolute mt-4 left-1/2 -ml-4 sm:ml-0 sm:left-[19px] border hover:border-transparent text-gray-400 transition-all hover:text-black hover:shadow group-hover:scale-100 scale-0 w-7 h-7 p-1 invisible group-hover:visible bg-white rounded-full" </button>
onClick={() => moveEventType(index, 1)}>
<ArrowDownIcon /> <button
</button> className="hidden sm:block absolute mt-4 left-1/2 -ml-4 sm:ml-0 sm:left-[19px] border hover:border-transparent text-gray-400 transition-all hover:text-black hover:shadow group-hover:scale-100 scale-0 w-7 h-7 p-1 invisible group-hover:visible bg-white rounded-full"
onClick={() => moveEventType(index, 1)}>
<ArrowDownIcon />
</button>
</>
)}
<Link href={"/event-types/" + type.id}> <Link href={"/event-types/" + type.id}>
<a <a
className="flex-grow text-sm truncate" className="flex-grow text-sm truncate"

2
pages/settings/profile.tsx
View file

@ -250,7 +250,7 @@ function SettingsView(props: ComponentProps<typeof Settings> & { localeProp: str
</label> </label>
<input <input
ref={emailRef} ref={emailRef}
type="text" type="email"
name="email" name="email"
id="email" id="email"
placeholder={t("your_email")} placeholder={t("your_email")}