email fixes, tweaks

src/public/js/eventlineup.js

@@ -138,17 +138,15 @@ function emailModal(el, url) {
       email_modal_node.classList.add('is-open')
       body.appendChild(email_modal_node)
       tinymce.init({
-        selector:`#lineup-email-data-${data.get('event_lineup_id')} #email-editor`, 
+        selector:`textarea#email-editor`, 
         content_css:"/css/application.css", 
         plugins: 'image',
         menubar: false,
         toolbar: 'undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | outdent indent | image',
         paste_data_images: true,
         statusbar:false})
-      // tinymce.activeEditor.setContent("Team,")
+      tinymce.remove();
-      // lineup_table_div.innerHTML = lineup_table
+   
-      // email_modal.classList.add("is-open");
-  // email_modal.querySelector(".Modal-body").innerHTML = html;
   });
 }
 
@@ -386,24 +384,11 @@ function initPage (){
   }
 }
 
-function mailToLink(el, protocol='mailto') {
+function mailToLink(el, protocol) {
-  console.log(el)
+  const {to, bcc} = el.dataset
-  console.log(el.dataset)
+  const subject = document.getElementById('email-subject').value
-  const {to, bcc, subject} = el.dataset
+  const email_body = document.getElementById('email-editor').value
-  const params = new URLSearchParams({
+  const url = `${protocol}://compose?recipient=${to}&bcc=${bcc}&subject=${encodeURIComponent(subject)}&body=${encodeURIComponent(email_body)}`
-    bcc, subject: encodeURIComponent(subject),
-  })
-  const url = `${protocol}:${to}?${params}`
-  console.log(url)
-  // location.href=`mailto:${to}${params}`
-  const windowRef = window.open(url, '_blank');
-  windowRef.focus();
-}
-
-function sparkMailToLink(el) {
-  const protocol = 'readdle-spark'
-  const {to, bcc, subject} = el.dataset
-  const url = `${protocol}://compose?recipient=${to}&bcc=${bcc}&subject=${encodeURIComponent(subject)}`
   console.log(url)
   // location.href=`mailto:${to}${params}`
   const windowRef = window.open(url, '_blank');

src/views/eventlineup/partials/email_modal.hbs

@@ -8,32 +8,37 @@
 			<form>
 				<div class="FieldGroup">
 					<label class="FieldGroup-label">Subject</label>
-					<input class="Input" type="text" value="{{dateFormat event.startDate "ddd, MMM D, YYYY h:mm A" }}, {{ event.locationName }}, ({{#if (isAway event) }}@{{/if}}{{ event.opponentName }})">
+					<input class="Input" id="email-subject" type="text" value="{{dateFormat event.startDate "ddd, MMM D, YYYY h:mm A" }}, {{ event.locationName }}, ({{#if (isAway event) }}@{{/if}}{{ event.opponentName }})">
 				</div>
 				<div class="FieldGroup">
 					<label class="FieldGroup-label">Body</label>
 					<textarea id="email-editor" class="Input"></textarea>
 				</div>
 				<div class="FieldGroup">
-					<label class="FieldGroup-label">Lineup</label>
+					<label class="FieldGroup-label">
+						Lineup
+						<button class="Button Button--smallSquare" role="button" type="button" onclick="copyEmailTable(this)">
+							{{{embeddedSvgFromPath "/bootstrap-icons/clipboard-fill.svg"}}}
+						</button>
+					</label>
 					<div class="lineup-email lineup-table">{{>email_table}}</div>
 				</div>
-				<div class="FieldGroup">
+					
-					<button class="Button" role="button" type="button" onclick="copyEmailTable(this)">
-						{{{embeddedSvgFromPath "/bootstrap-icons/clipboard-fill.svg"}}}
-						{{{embeddedSvgFromPath "/bootstrap-icons/table.svg"}}}
-						Copy Table
-					</button>
-					<button class="Button" role="button" type="button" onclick="sparkMailToLink(this);",
-					data-to="{{user.email}}" 
-					data-bcc="{{joinMemberEmailAddresses (filterNonPlayers members)}}" 
-					data-subject="{{dateFormat event.startDate "ddd, MMM D, YYYY h:mm A" }}, {{ event.locationName }}, ({{#if (isAway event) }}@{{/if}}{{ event.opponentName }})">
-						{{{embeddedSvgFromPath "/teamsnap-ui/assets/icons/mail.svg"}}}
-						Spark Mail
-					</button>
-				</div>
 			</form>
 		</div>
+		<div class="Modal-footer">
+			<button class="Button" role="button" type="button" onclick="mailToLink(this, 'readdle-spark');",
+					data-to="{{user.email}}" 
+					data-bcc="{{joinMemberEmailAddresses (filterNonPlayers members)}}">
+						{{{embeddedSvgFromPath "/teamsnap-ui/assets/icons/mail.svg"}}}
+						Spark Mail
+			</button>
+			<button class="Button" role="button" type="button" onclick="mailToLink(this, 'mailto');",
+					data-to="{{user.email}}" 
+					data-bcc="{{joinMemberEmailAddresses (filterNonPlayers members)}}">
+						{{{embeddedSvgFromPath "/teamsnap-ui/assets/icons/mail.svg"}}}
+						Mail
+			</button>
+		</div>
   </div>
-</div>
+</div>
-</script>

src/views/eventlineup/partials/email_table.hbs

@@ -1,4 +1,4 @@
-<table>
+<table class="lineup-table">
 				<thead>
 					<tr>
 						<th class="title-cell" colSpan=3>