Browse Source

Merge branch 'dev'

master
Guillaume Bourgeois 4 years ago
parent
commit
6b684e452d
4 changed files with 31 additions and 21 deletions
  1. +3
    -1
      backend/views/document/download.php
  2. +19
    -19
      backend/web/css/document/download.css
  3. +3
    -0
      backend/web/sass/document/download.scss
  4. +6
    -1
      common/models/Producer.php

+ 3
- 1
backend/views/document/download.php View File

<div id="block-addresses"> <div id="block-addresses">
<div class="producer"> <div class="producer">
<?php if(strlen($producer->logo)) : ?> <?php if(strlen($producer->logo)) : ?>
<div class="logo"><?= $producer->getHtmlLogo() ; ?></div>
<div class="logo">
<img style="max-height: 80px;" src="<?= $producer->getUrlLogo() ?>" />
</div>
<?php endif; ?> <?php endif; ?>
<div class="address"><?= $producer->getFullAddress(true) ; ?></div> <div class="address"><?= $producer->getFullAddress(true) ; ?></div>
</div> </div>

+ 19
- 19
backend/web/css/document/download.css View File

.document-download { .document-download {
font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
} }
/* line 9, ../../sass/document/download.scss */
/* line 10, ../../sass/document/download.scss */
.document-download #block-addresses .producer { .document-download #block-addresses .producer {
text-align: left; text-align: left;
margin-bottom: 20px; margin-bottom: 20px;
} }
/* line 13, ../../sass/document/download.scss */
/* line 15, ../../sass/document/download.scss */
.document-download #block-addresses .producer .logo { .document-download #block-addresses .producer .logo {
margin-bottom: 20px; margin-bottom: 20px;
} }
/* line 20, ../../sass/document/download.scss */
/* line 23, ../../sass/document/download.scss */
.document-download #block-addresses .user { .document-download #block-addresses .user {
text-align: right; text-align: right;
} }
/* line 25, ../../sass/document/download.scss */
/* line 28, ../../sass/document/download.scss */
.document-download #block-infos-document { .document-download #block-infos-document {
padding-top: 30px; padding-top: 30px;
} }
/* line 28, ../../sass/document/download.scss */
/* line 31, ../../sass/document/download.scss */
.document-download #block-infos-document .date { .document-download #block-infos-document .date {
padding-bottom: 10px; padding-bottom: 10px;
} }
/* line 31, ../../sass/document/download.scss */
/* line 34, ../../sass/document/download.scss */
.document-download #block-infos-document .reference { .document-download #block-infos-document .reference {
padding-bottom: 10px; padding-bottom: 10px;
font-size: 15px; font-size: 15px;
font-weight: bold; font-weight: bold;
} }
/* line 36, ../../sass/document/download.scss */
/* line 39, ../../sass/document/download.scss */
.document-download #block-infos-document .reference .block-is-draft { .document-download #block-infos-document .reference .block-is-draft {
border: solid 2px black; border: solid 2px black;
padding: 10px; padding: 10px;
text-transform: uppercase; text-transform: uppercase;
} }
/* line 47, ../../sass/document/download.scss */
/* line 50, ../../sass/document/download.scss */
.document-download #block-no-product { .document-download #block-no-product {
font-weight: bold; font-weight: bold;
border: solid 2px black; border: solid 2px black;
text-transform: uppercase; text-transform: uppercase;
padding: 10px; padding: 10px;
} }
/* line 54, ../../sass/document/download.scss */
/* line 57, ../../sass/document/download.scss */
.document-download #block-products { .document-download #block-products {
padding-top: 20px; padding-top: 20px;
} }
/* line 57, ../../sass/document/download.scss */
/* line 60, ../../sass/document/download.scss */
.document-download #block-products table { .document-download #block-products table {
width: 100%; width: 100%;
padding: 0px; padding: 0px;
border-right: solid 1px #c0c0c0; border-right: solid 1px #c0c0c0;
border-collapse: collapse; border-collapse: collapse;
} }
/* line 65, ../../sass/document/download.scss */
/* line 68, ../../sass/document/download.scss */
.document-download #block-products table td, .document-download #block-products table th { .document-download #block-products table td, .document-download #block-products table th {
padding: 5px; padding: 5px;
border-top: solid 1px #c0c0c0; border-top: solid 1px #c0c0c0;
border-left: solid 1px #c0c0c0; border-left: solid 1px #c0c0c0;
font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
} }
/* line 71, ../../sass/document/download.scss */
/* line 74, ../../sass/document/download.scss */
.document-download #block-products table td.align-left, .document-download #block-products table th.align-left { .document-download #block-products table td.align-left, .document-download #block-products table th.align-left {
text-align: left; text-align: left;
} }
/* line 74, ../../sass/document/download.scss */
/* line 77, ../../sass/document/download.scss */
.document-download #block-products table td.align-center, .document-download #block-products table th.align-center { .document-download #block-products table td.align-center, .document-download #block-products table th.align-center {
text-align: center; text-align: center;
} }
/* line 77, ../../sass/document/download.scss */
/* line 80, ../../sass/document/download.scss */
.document-download #block-products table td.align-right, .document-download #block-products table th.align-right { .document-download #block-products table td.align-right, .document-download #block-products table th.align-right {
text-align: right; text-align: right;
} }
/* line 84, ../../sass/document/download.scss */
/* line 87, ../../sass/document/download.scss */
.document-download .block-infos { .document-download .block-infos {
margin-top: 20px; margin-top: 20px;
padding: 10px; padding: 10px;
border: solid 1px #c0c0c0; border: solid 1px #c0c0c0;
} }
/* line 89, ../../sass/document/download.scss */
/* line 92, ../../sass/document/download.scss */
.document-download .block-infos strong { .document-download .block-infos strong {
font-size: 12px; font-size: 12px;
} }


/* line 95, ../../sass/document/download.scss */
/* line 98, ../../sass/document/download.scss */
#footer { #footer {
font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
text-align: center; text-align: center;
padding-top: 20px; padding-top: 20px;
border-top: solid 1px gray; border-top: solid 1px gray;
} }
/* line 101, ../../sass/document/download.scss */
/* line 104, ../../sass/document/download.scss */
#footer .infos-bottom { #footer .infos-bottom {
padding-bottom: 20px; padding-bottom: 20px;
margin-bottom: 40px; margin-bottom: 40px;
font-size: 12px; font-size: 12px;
line-height: 18px; line-height: 18px;
} }
/* line 107, ../../sass/document/download.scss */
/* line 110, ../../sass/document/download.scss */
#footer .reference-document { #footer .reference-document {
font-weight: bold; font-weight: bold;
} }

+ 3
- 0
backend/web/sass/document/download.scss View File

font-family: $font-family ; font-family: $font-family ;


#block-addresses { #block-addresses {

.producer { .producer {

text-align: left ; text-align: left ;
margin-bottom: 20px ; margin-bottom: 20px ;


.logo { .logo {
margin-bottom: 20px ; margin-bottom: 20px ;

} }
.address { .address {



+ 6
- 1
common/models/Producer.php View File

$html = '' ; $html = '' ;


if(strlen($this->logo)) { if(strlen($this->logo)) {
$html = '<img src="'.Yii::$app->urlManagerProducer->getHostInfo().'/'.Yii::$app->urlManagerProducer->baseUrl.'/uploads/'.$this->logo.'" class="producer-logo" />' ;
$html = '<img src="'.$this->getUrlLogo().'" class="producer-logo" />' ;
} }


return $html ; return $html ;
} }


public function getUrlLogo()
{
return Yii::$app->urlManagerProducer->getHostInfo().'/'.Yii::$app->urlManagerProducer->baseUrl.'/uploads/'.$this->logo ;
}

public function getEmailOpendistrib() public function getEmailOpendistrib()
{ {
return $this->slug.'@opendistrib.net' ; return $this->slug.'@opendistrib.net' ;

Loading…
Cancel
Save