Commit 1ceadc43 authored by Clément Damiens's avatar Clément Damiens
Browse files

Merged branch master into master

parents f2f3a170 5445cdaa
......@@ -26,6 +26,7 @@
"See the community"=>"Voir la communauté",
"Result of invitations sent"=>"Résultat des invitations envoyées",
"Not found ? Launch an invitation to join your network"=>"Pas trouvé ? Lancer une invitation à rejoindre votre réseau",
"Close invite" => "Fermer l'invitation",
);
?>
\ No newline at end of file
<?php
$this->renderPartial('webroot.themes.'.Yii::app()->theme->name.'.views.layouts.mail.header');
$url = (!empty($url)) ? Yii::app()->getRequest()->getBaseUrl(true).$url : Yii::app()->getRequest()->getBaseUrl(true) ;
$this->renderPartial('webroot.themes.'.Yii::app()->theme->name.'.views.layouts.mail.header',
array("logo" => @$logo,
"url" => $url));
//Yii::app()->language = $language;
?>
<table class="row" style="border-spacing: 0;border-collapse: collapse;padding: 0;vertical-align: top;text-align: left;width: 100%;position: relative;display: table;">
<tbody>
<tr style="padding: 0;vertical-align: top;text-align: left;"> <!-- Horizontal Digest Content -->
......@@ -49,7 +53,10 @@ $this->renderPartial('webroot.themes.'.Yii::app()->theme->name.'.views.layouts.m
<tr style="padding: 0;vertical-align: top;text-align: left;">
<td style="color: #3c5665;font-family: Helvetica, Arial, sans-serif;font-weight: normal;padding: 0;margin: 0;text-align: left;line-height: 19px;font-size: 15px;">
<?php $this->renderPartial('webroot.themes.'.Yii::app()->theme->name.'.views.layouts.mail.footer'); ?>
<?php $this->renderPartial('webroot.themes.'.Yii::app()->theme->name.'.views.layouts.mail.footer',
array("logo" => @$logo,
"url" => $url,
"name" => @$title) ); ?>
</td>
......
......@@ -2140,9 +2140,15 @@ margin-right: 5px;
}
#modal-preview-coop{
left:15%;
left:0%;
right:0%;
}
#modal-preview-coop #amendement-container{
bottom:0px;
top:0px;
width: 100%;
}
}
@media (max-width: 767px) {
......
......@@ -181,7 +181,7 @@
}
#modal-preview-coop{
left:15%;
left:0%;
right:0%;
}
}
......
......@@ -1458,7 +1458,7 @@
<tr style="padding: 0;vertical-align: top;text-align: left;">
<th style="color: #3c5665;font-family: Helvetica, Arial, sans-serif;font-weight: normal;padding: 0;margin: 0;text-align: left;line-height: 19px;font-size: 15px;">
<center style="width: 100%;min-width: 532px;">
<a href="<?php echo Yii::app()->getRequest()->getBaseUrl(true) ?>" align="center" class="text-center" style="color: #e33551;font-family: Helvetica, Arial, sans-serif;font-weight: normal;padding: 0;margin: 0;text-align: left;line-height: 1.3;text-decoration: none;">
<a href="<?php echo $urlRedirect ?>" align="center" class="text-center" style="color: #e33551;font-family: Helvetica, Arial, sans-serif;font-weight: normal;padding: 0;margin: 0;text-align: left;line-height: 1.3;text-decoration: none;">
<!--http://localhost:8888/ph/images/logo-communecter.png-->
<img src="<?php echo $logoUrl ?>" class="swu-logo" alt="Logo Image" style="outline: none;text-decoration: none;-ms-interpolation-mode: bicubic;width: 170px;max-width: 100%;clear: both;display: block;border: none;height: auto;padding: 15px 0px 0px 0px;">
</a>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment