Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit b32cb60c authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch 'main' into dev/auto-deploy-pipe

parents 2e684d06 32cb5756

appinfo/info.xml

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
    <name>/e/ Cloud Theme Helper</name>

    <summary>/e/ Theme Helper App</summary>

    <description><![CDATA[Theme Helper App]]></description>

    <version>1.2.0</version>

    <version>1.3.0</version>

    <licence>ECORP SAS</licence>

	<author mail="dev@e.email" >ECORP SAS</author>

    <namespace>EcloudThemeHelper</namespace>
@@ -16,10 +16,10 @@ 
    </dependencies>

    <repair-steps>

		<install>

			<step>OCA\eCloudThemeHelper\Migration\SetEmailTemplate</step>

			<step>OCA\EcloudThemeHelper\Migration\SetEmailTemplate</step>

		</install>

		<uninstall>

			<step>OCA\eCloudThemeHelper\Migration\UnsetEmailTemplate</step>

			<step>OCA\EcloudThemeHelper\Migration\UnsetEmailTemplate</step>

		</uninstall>

	</repair-steps>

</info>

lib/Mail/EMailTemplate.php

+5 −5
Original line number Diff line number Diff line 
<?php



namespace OCA\eCloudThemeHelper\Mail;

namespace OCA\ECloudThemeHelper\Mail;



use OC\Mail\EMailTemplate as ParentTemplate;
@@ -15,11 +15,11 @@ class EMailTemplate extends ParentTemplate { 
<tbody>

<tr style="padding:0;text-align:left;vertical-align:top">

    <td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word">

        <img class="logo float-center" src="%s" alt="%s" align="center" style="-ms-interpolation-mode:bicubic;clear:both;display:block;float:left;margin:0 auto;outline:0;text-align:center;text-decoration:none;max-height:105px;max-width:105px;width:auto;height:32px;margin-left:10px;">

        <img class="logo float-center" src="%s" alt="%s" align="center" style="-ms-interpolation-mode:bicubic;clear:both;display:block;float:left;margin:0 auto;outline:0;text-align:center;text-decoration:none;max-height:105px;max-width:105px;width:auto;padding-top:9px;margin-left:10px;">

EOF;



protected $heading = <<<EOF

<h1 class="text-center" style="Margin:0;Margin-bottom:10px;color:inherit;font-family:arial;font-size:24px;font-weight:bold;color:#000000;line-height:1.3;margin:0;padding:0;text-align:center;word-wrap:normal;padding-right:42px;">%s</h1>

<h1 class="text-center" style="Margin:0;Margin-bottom:10px;color:inherit;font-family:arial;font-size:24px;font-weight:bold;color:#000000;line-height:1.3;margin:0;padding:0;text-align:center;word-wrap:normal;padding-right:105px;">%s</h1>

    </td>

</tr>

</tbody>
@@ -158,7 +158,7 @@ EOF; 
			$htmlText = '<span style="color:#777;font-weight:bold;">' . $metaInfo . ' </span>  '. $htmlText;

		}

		if ($icon !== '') {

			$icon = '<img src="' . htmlspecialchars($icon) . '" alt="&bull;">';

			$icon = '<img style="padding-top: 3px;" src="' . htmlspecialchars($icon) . '" alt="&bull;">';

		} else {

			$icon = '&bull;';

		}

lib/Migration/SetEmailTemplate.php

+2 −2
Original line number Diff line number Diff line 
<?php



namespace OCA\eCloudThemeHelper\Migration;

namespace OCA\EcloudThemeHelper\Migration;



use OCA\eCloudThemeHelper\Mail\EMailTemplate;

use OCA\EcloudThemeHelper\Mail\EMailTemplate;

use OCP\IConfig;

use OCP\Migration\IOutput;

use OCP\Migration\IRepairStep;

lib/Migration/UnsetEmailTemplate.php

+2 −2
Original line number Diff line number Diff line 
<?php



namespace OCA\eCloudThemeHelper\Migration;

namespace OCA\EcloudThemeHelper\Migration;



use OCA\eCloudThemeHelper\Mail\EMailTemplate;

use OCA\EcloudThemeHelper\Mail\EMailTemplate;

use OCP\IConfig;

use OCP\Migration\IOutput;

use OCP\Migration\IRepairStep;