Merge pull request #19 from nextmcloud/nmc/2726-missing-logo-image

new image path

Author: memurats

htmls/activity.html

@@ -85,7 +85,7 @@
               <tr>
                 <td class="content-block" style="background: #e20074;font-family: sans-serif; vertical-align: top; padding-bottom: 16px; padding-top: 16px; padding-left:24px; font-size: 12px; color: #999999; text-align: left;
 ">
-                <img src="https://dev1.next.magentacloud.de/themes/nextmagentacloud21/core/img/logo.svg" width="72px" height="35px"/>
+                <img src="/customapps/nmctheme/img/telekom/tlogocarrier.svg" style="width: 35px;" />
               <span style="color: #fff; font-size: 16px; text-align: left;font-weight:bold;line-height: 40px;padding-left: 24px;vertical-align: top;"> Life is for sharing.</span>
                 </td>
               </tr>
@@ -117,7 +117,7 @@
                                   <tbody>
                                     <tr>
                                       <td>
-                                        <img src="https://dev1.next.magentacloud.de//themes/nextmagentacloud21/core/img/email/add.svg">
+                                        <img src="/customapps/nmctheme/img/email/add.svg" style="width: 35px;">
                                       </td>
                                       <td style="font-family: sans-serif; font-size: 16px;padding-top:16px;padding-left: 8px;">
                                         <span style="color: #666;">Today at 3:47PM</span>
@@ -129,7 +129,7 @@
                                     </tr>
                                     <tr>
                                       <td>
-                                        <img src="https://dev1.next.magentacloud.de//themes/nextmagentacloud21/core/img/email/edit.svg">
+                                        <img src="/customapps/nmctheme/img/email/edit.svg" style="width: 35px;">
                                       </td>
                                       <td style="font-family: sans-serif; font-size: 16px;padding-top:16px;padding-left: 8px;"> 
                                         <span style="color: #666;">Today at 3:47PM</span>
@@ -140,7 +140,7 @@
                                     </tr>
                                     <tr>
                                       <td>
-                                        <img src="https://dev1.next.magentacloud.de//themes/nextmagentacloud21/core/img/email/image.svg">
+                                        <img src="/customapps/nmctheme/img/email/image.svg" style="width: 35px;">
                                       </td>
                                       <td style="font-family: sans-serif; font-size: 16px;padding-top:16px;padding-left: 8px;"> 
                                         <span style="color: #666;">Today at 3:47PM</span>   

htmls/email.html

@@ -109,7 +109,7 @@
   <table role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
   	<tbody><tr style="background: #e20074;">
 	  <td class="content-block" style="padding: 16px 24px;">
-	  <img src="http://master.nextmagentacloud.com/themes/nextmagentacloud21/core/img/logo-new.png" width="72px" height="35px">
+		<img src="/customapps/nmctheme/img/telekom/tlogocarrier.svg" style="width: 35px;" />
 	  </td>
 	  <td style="width: 100%; padding: 16px 0;text-align: left;">
 	  <span style="color: #fff;font-size: 16px;font-weight:bold;">Life is for sharing.</span>

htmls/montly-status.html

@@ -115,7 +115,7 @@
               <tr>
                 <td class="content-block" style="background: #e20074;font-family: sans-serif; vertical-align: top; padding-bottom: 16px; padding-top: 16px; padding-left:24px; font-size: 12px; color: #999999; text-align: left;
 ">
-                <img src="https://dev1.next.magentacloud.de/themes/nextmagentacloud21/core/img/logo.svg" width="72" height="35"/>
+                <img src="/customapps/nmctheme/img/telekom/tlogocarrier.svg" style="width: 35px;" />
               <span style="color: #fff; font-size: 16px; text-align: left;font-weight:bold;line-height: 40px;padding-left: 24px;vertical-align: top;"> Life is for sharing.</span>
                 </td>
               </tr>
@@ -151,7 +151,7 @@
                         </td>
                         <td class="monthly-storage" style="text-align: center;font-family: sans-serif; font-size: 14px; vertical-align: top;padding-left: 12px;width: 50%;">
                           <div style="background: #f1f1f1;border-top: 48px solid #f1f1f1;border-right: 24px solid #f1f1f1;border-left: 24px solid #f1f1f1;border-bottom: 24px solid #f1f1f1;">
-                            <img src="https://dev1.next.magentacloud.de/themes/nextmagentacloud21/core/img/email/add.svg" height="48" width="48">
+                            <img src="/customapps/nmctheme/img/email/add.svg" style="width: 48px;">
                             <div style="border-top: 8px solid #f1f1f1;border-bottom: 8px solid #f1f1f1;"><span style="font-size: 25px;"><span style="color: #e20074;">47</span>  Shares</span></div>
                             <br>
                             <span style="font-weight: bold;">Shares</span>

htmls/quota-warning.html

@@ -115,7 +115,7 @@
               <tr>
                 <td class="content-block" style="background: #e20074;font-family: sans-serif; vertical-align: top; padding-bottom: 16px; padding-top: 16px; padding-left:24px; font-size: 12px; color: #999999; text-align: left;
 ">
-                <img src="https://dev1.next.magentacloud.de/themes/nextmagentacloud21/core/img/logo.svg" width="72px" height="35px"/>
+                <img src="/customapps/nmctheme/img/telekom/tlogocarrier.svg" style="width: 35px;" />
               <span style="color: #fff; font-size: 16px; text-align: left;font-weight:bold;line-height: 40px;padding-left: 24px;vertical-align: top;"> Life is for sharing.</span>
                 </td>
               </tr>

htmls/welcome.html

@@ -96,13 +96,13 @@
               <tr>
                 <td class="content-block" style="background: #e20074;font-family: sans-serif; vertical-align: top; padding-bottom: 16px; padding-top: 16px; padding-left:24px; font-size: 12px; color: #999999; text-align: left;
 ">
-                <img src="https://dev1.next.magentacloud.de/themes/nextmagentacloud21/core/img/logo.svg" width="72px" height="35px"/>
+                <img src="/customapps/nmctheme/img/telekom/tlogocarrier.svg" style="width: 35px;" />
               <span style="color: #fff; font-size: 16px; text-align: left;font-weight:bold;line-height: 40px;padding-left: 24px;vertical-align: top;"> Life is for sharing.</span>
                 </td>
               </tr>
               <tr>
                 <td class="content-block" style="font-family: sans-serif; vertical-align: top;">
-                <img src="./welcome-banner.png" width="100%" style="margin-top: 16px;"/>             
+                <img src="../img/welcome-banner.png" width="100%" style="margin-top: 16px;"/>             
                 </td>
               </tr>
             </table>

htmls/welcome-banner.png img/welcome-banner.pnghtmls/welcome-banner.png renamed to img/welcome-banner.png

@@ -181,7 +181,7 @@ class EMailTemplate extends ParentTemplate {
   <table role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
   	<tr style="background: #e20074;">
 	  <td class="content-block" style="padding: 16px 24px;">
-	  <img src="host_namethemes/nextmagentacloud21/core/img/logo-new-updated.png" height="35px" />
+	  <img src="host_namecustomapps/nmctheme/img/telekom/tlogocarrier.svg" style="width: 35px;" />
 	  </td>
 	  <td style="width: 100%; padding: 16px 0;text-align: left;">
 	  <span style="color: #fff;font-size: 16px;font-weight:bold;"></span>

lib/EMailTemplate.php

@@ -378,7 +378,7 @@ public function writeShareMessage(IEMailTemplate $emailTemplate, int $shareCount
 					</td>
 					<td class="monthly-storage" style="text-align: center;font-family: sans-serif; font-size: 14px; vertical-align: top;padding-left: 12px;width: 50%;">
 						<div style="background: #f1f1f1;border-top: 48px solid #f1f1f1;border-right: 24px solid #f1f1f1;border-left: 24px solid #f1f1f1;border-bottom: 24px solid #f1f1f1;">
-							<img src="$home/themes/nextmagentacloud21/core/img/email/user-share.png" height="48" width="48">
+							<img src="$home/customapps/nmctheme/img/email/user-share.svn" style="width: 48px;">
 							<div style="border-top: 8px solid #f1f1f1;border-bottom: 8px solid #f1f1f1;"><span style="font-size: 25px;"><span style="color: #e20074;">$shareCount</span> </span></div>
 							<br>
 								<span style="font-weight: bold;">$share</span>

lib/MessageProvider.php

@@ -95,7 +95,7 @@
 		<table role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
 			<tr style="background: #e20074;">
 			<td class="content-block" style="padding: 16px 24px;">
-			<img src="'.$this->urlPath.'themes/nextmagentacloud21/core/img/logo-new-updated.png" height="35px"/>
+			<img src="'.$this->urlPath.'customapps/nmctheme/img/telekom/tlogocarrier.svg" style="width: 35px;" />
 			</td>
 			<td style="width: 100%; padding: 16px 0;text-align: left;">
 			<span style="color: #fff;font-size: 16px;font-weight:bold;"></span>
@@ -107,7 +107,7 @@
 			<tbody>
 			<tr>
 			<td class="content-block" style="font-family: sans-serif; vertical-align: top;">
-			<img src="'.$this->urlPath.'themes/nextmagentacloud21/core/img/email/welcome-banner.png" width="100%" style="margin-top: 16px;"/>
+			<img src="'.$this->urlPath.'customapps/nmc_email_template/img/welcome-banner.png" width="100%" style="margin-top: 16px;"/>
 			</td>
 			</tr>
 		</table>
@@ -135,7 +135,7 @@
 				<tr style="background-color: #f1f1f1;">
 					<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;padding-right: 12px;">
 					<div style="Width: 100%;padding-top: 32px;padding-bottom: 24px;padding-left: 24px;box-sizing: border-box;">
-						<img src="'.$this->urlPath.'themes/nextmagentacloud21/core/img/email/mobile.png" width="48px" height="48px">
+						<img src="'.$this->urlPath.'customapps/nmctheme/img/email/mobile.svg" style="margin-right: 8px; width: 48px;" />
 						<div style="display: inline-block;vertical-align: top;padding-top: 2px;">
 						<span style="font-size: 16px;color:#191919">'.$this->l10n->t('Software & Apps').':</span>
 						<br/>
@@ -145,7 +145,7 @@
 					</td>
 					<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;padding-right: 12px;">
 						<div style="width: 100%;padding-top: 32px;padding-bottom: 24px;padding-right: 24px;box-sizing: border-box;">
-						<img src="'.$this->urlPath.'themes/nextmagentacloud21/core/img/email/computer.png" width="48px" height="48px" style="margin-right: 8px;">
+						<img src="'.$this->urlPath.'customapps/nmctheme/img/email/computer.svg" style="margin-right: 8px; width: 48px;" />
 						<div style="display: inline-block;vertical-align: super;padding-top: 2px;">
 							<span style="font-size: 16px;color:#191919">'.$this->l10n->t('Online Information').':</span>
 							<br/>
@@ -161,10 +161,10 @@
 					<div style="">
 						<span style="font-family: sans-serif; font-size: 14px;font-weight: bold;">'.$this->l10n->t('The advantages of the MagentaCLOUD at a glance').':</span>
 						<ul style="margin-top: 16px;margin-bottom: 32px;list-style: none;padding: 0;">
-						<li style="margin-bottom: 8px;background: url('.$this->urlPath.'themes/nextmagentacloud21/core/img/email/checkmark.png); background-repeat: no-repeat;text-indent: 32px;">'.$this->l10n->t('Keep memories safe').'</li>
-						<li style="margin-bottom: 8px;background: url('.$this->urlPath.'themes/nextmagentacloud21/core/img/email/checkmark.png); background-repeat: no-repeat;text-indent: 32px;">'.$this->l10n->t('Share special moments with family').'</li>
-						<li style="margin-bottom: 8px;background: url('.$this->urlPath.'themes/nextmagentacloud21/core/img/email/checkmark.png); background-repeat: no-repeat;text-indent: 32px;">'.$this->l10n->t('Keep all files in overview').'</li>
-						<li style="margin-bottom: 0px;background: url('.$this->urlPath.'themes/nextmagentacloud21/core/img/email/checkmark.png); background-repeat: no-repeat;text-indent: 32px;">'.$this->l10n->t('Expand device memory free of charge').'</li>
+						<li style="margin-bottom: 8px;background: url('.$this->urlPath.'customapps/nmctheme/img/email/checkmark.svg); background-repeat: no-repeat;text-indent: 32px;">'.$this->l10n->t('Keep memories safe').'</li>
+						<li style="margin-bottom: 8px;background: url('.$this->urlPath.'customapps/nmctheme/img/email/checkmark.svg); background-repeat: no-repeat;text-indent: 32px;">'.$this->l10n->t('Share special moments with family').'</li>
+						<li style="margin-bottom: 8px;background: url('.$this->urlPath.'customapps/nmctheme/img/email/checkmark.svg); background-repeat: no-repeat;text-indent: 32px;">'.$this->l10n->t('Keep all files in overview').'</li>
+						<li style="margin-bottom: 0px;background: url('.$this->urlPath.'customapps/nmctheme/img/email/checkmark.svg); background-repeat: no-repeat;text-indent: 32px;">'.$this->l10n->t('Expand device memory free of charge').'</li>
 						</ul>
 						<p style="margin:0"> '.$this->l10n->t('You can find more information as well as frequently asked questions and answers about MagentaCLOUD at').'</p>
 						<a href="www.telekom.de/magentacloud" style="text-decoration: none;">www.telekom.de/magentacloud</a>

template/welcome_mail.php

@@ -148,7 +148,7 @@ public function testEMailTemplateDefaultHeader() {
 		<table role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
 			<tr>
 				<td class="content-block" style="background: #e20074;font-family: sans-serif; vertical-align: top; padding-bottom: 16px; padding-top: 16px; padding-left:24px; font-size: 12px; color: #999999; text-align: left;">
-					<img src="host_namethemes/nextmagentacloud21/core/img/logo-new.png" width="72px" height="35px"/>
+					<img src="host_namecustomapps/nmctheme/img/telekom/tlogocarrier.svg" style="width: 35px;" />
 					<span style="color: #fff; font-size: 16px; text-align: left;font-weight:bold;line-height: 40px;padding-left: 24px;vertical-align: top;">Life is for sharing.</span>
 				</td>
 			</tr>