Merge branch 'ticket-15629-new-landing' into develop
This commit is contained in:
commit
e10b13392d
@ -352,8 +352,8 @@ class AdminLandingPages extends AdminTab {
|
||||
<input type="file" name="img1_'.$language['id_lang'].'" />
|
||||
<p>'.$this->l('Size:').' '.$this->l('img1 size').'</p>';
|
||||
if($this->curlp && file_exists(_PS_ROOT_DIR_.'/modules/landingpages/img/'.$this->curlp['id_landing_page'].'_1_'.$language['id_lang'].'.jpg')) {
|
||||
echo '<img src="'.__PS_BASE_URI__.'modules/landingpages/img/'.$this->curlp['id_landing_page'].'_1_'.$language['id_lang'].'.jpg" width="350" /><br>
|
||||
<p><a href="'.__PS_BASE_URI__.'modules/landingpages/img/'.$this->curlp['id_landing_page'].'_1_'.$language['id_lang'].'.jpg" onclick="window.open(this.href); return false;"> '.$this->l('Preview').'</a></p>';
|
||||
echo '<img src="'.__PS_BASE_URI__.'modules/landingpages/img/'.$this->curlp['id_landing_page'].'_1_'.$language['id_lang'].'.jpg?v='.time().'" width="350" /><br>
|
||||
<p><a href="'.__PS_BASE_URI__.'modules/landingpages/img/'.$this->curlp['id_landing_page'].'_1_'.$language['id_lang'].'.jpg?v='.time().'" onclick="window.open(this.href); return false;"> '.$this->l('Preview').'</a></p>';
|
||||
}
|
||||
echo '
|
||||
</div>';
|
||||
@ -369,8 +369,8 @@ class AdminLandingPages extends AdminTab {
|
||||
<input type="file" name="img2_'.$language['id_lang'].'" />
|
||||
<p>'.$this->l('Size:').' '.$this->l('img2 size').'</p>';
|
||||
if($this->curlp && file_exists(_PS_ROOT_DIR_.'/modules/landingpages/img/'.$this->curlp['id_landing_page'].'_2_'.$language['id_lang'].'.jpg')) {
|
||||
echo '<img src="'.__PS_BASE_URI__.'modules/landingpages/img/'.$this->curlp['id_landing_page'].'_2_'.$language['id_lang'].'.jpg" width="350" /><br>
|
||||
<p><a href="'.__PS_BASE_URI__.'modules/landingpages/img/'.$this->curlp['id_landing_page'].'_2_'.$language['id_lang'].'.jpg" onclick="window.open(this.href); return false;"> '.$this->l('Preview').'</a></p>';
|
||||
echo '<img src="'.__PS_BASE_URI__.'modules/landingpages/img/'.$this->curlp['id_landing_page'].'_2_'.$language['id_lang'].'.jpg?v='.time().'" width="350" /><br>
|
||||
<p><a href="'.__PS_BASE_URI__.'modules/landingpages/img/'.$this->curlp['id_landing_page'].'_2_'.$language['id_lang'].'.jpg?v='.time().'" onclick="window.open(this.href); return false;"> '.$this->l('Preview').'</a></p>';
|
||||
}
|
||||
echo '
|
||||
</div>';
|
||||
|
@ -1120,6 +1120,9 @@ div#page #header .content .top #header_user ul li {
|
||||
float:left;
|
||||
padding: 3px 10px;
|
||||
}
|
||||
#authentication div#page #header .content .top #header_user ul li {
|
||||
display: none;
|
||||
}
|
||||
div#page #header .content .top #header_user ul li a {
|
||||
line-height: auto;
|
||||
height: auto;
|
||||
|
Loading…
Reference in New Issue
Block a user