dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Merge -> revision 8014

Browse Source
This commit is contained in:
rMalie
2011-08-11 12:00:05 +00:00
parent 2bb147128b
commit d0dbb5c185
137 changed files with 717 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/img/bg_field.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 126 B

install-dev/img/bg_li_stepList.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

install-dev/index.php
+8 -8
View File
@@ -433,13 +433,13 @@ if ($lm->getIncludeTradFilename())
<h3 id="resultConfig"></h3>
<ul id="required">
<li class="title"><?php echo lang('PHP parameters:')?></li>
<li class="required"><?php echo lang('PHP 5.0 or later installed')?></li>
<li class="required first"><?php echo lang('PHP 5.0 or later installed')?></li>
<li class="required"><?php echo lang('File upload allowed')?></li>
<li class="required"><?php echo lang('Create new files and folders allowed')?></li>
<li class="required"><?php echo lang('GD Library installed')?></li>
<li class="required"><?php echo lang('MySQL support is on')?></li>
<li class="title"><?php echo lang('Write permissions on files and folders:')?></li>
<li class="required">/config</li>
<li class="required first">/config</li>
<li class="required">/tools/smarty/compile</li>
<li class="required">/tools/smarty/cache</li>
<li class="required">/tools/smarty_v2/compile</li>
@@ -447,7 +447,7 @@ if ($lm->getIncludeTradFilename())
<li class="required">/sitemap.xml</li>
<li class="required">/log</li>
<li class="title"><?php echo lang('Write permissions on folders (and subfolders):')?></li>
<li class="required">/img</li>
<li class="required first">/img</li>
<li class="required">/mails</li>
<li class="required">/modules</li>
<li class="required">/themes/prestashop/lang</li>
@@ -519,7 +519,7 @@ if ($lm->getIncludeTradFilename())
<p class="aligned">
<input id="btTestDB" class="button" type="submit" value="<?php echo lang('Verify now!')?>"/>
</p>
<p id="dbResultCheck"></p>
<p id="dbResultCheck" style="display:none;"></p>
</form>
</div>
@@ -802,7 +802,7 @@ if ($lm->getIncludeTradFilename())
echo '
<table cellpadding="0" callspacing="0" border="0" class="moduleTable">
<tr>
<td valign="top" style="text-align: center; padding-top:10px; width: 30px; background: #FFF;">
<td valign="top" style="text-align: center; padding-top:10px; width: 30px;">
<span style="padding: 12px 4px 6px 2px;">
<input type="checkbox" id="preInstallModules_'.$country_iso_code.'_'.$module.'" value="'.$module.'" class="'.$module.' preInstallModules_'.$country_iso_code.'" style="vertical-align: middle;" />
</span>
@@ -1214,13 +1214,13 @@ if ($lm->getIncludeTradFilename())
<h3 id="resultConfig_update"></h3>
<ul id="required_update">
<li class="title"><?php echo lang('PHP parameters:')?></li>
<li class="required"><?php echo lang('PHP 5.0 or later installed')?></li>
<li class="required first"><?php echo lang('PHP 5.0 or later installed')?></li>
<li class="required"><?php echo lang('File upload allowed')?></li>
<li class="required"><?php echo lang('Create new files and folders allowed')?></li>
<li class="required"><?php echo lang('GD Library installed')?></li>
<li class="required"><?php echo lang('MySQL support is on')?></li>
<li class="title"><?php echo lang('Write permissions on folders:')?></li>
<li class="required">/config</li>
<li class="required first">/config</li>
<li class="required">/tools/smarty/compile</li>
<li class="required">/tools/smarty/cache</li>
<li class="required">/tools/smarty_v2/compile</li>
@@ -1228,7 +1228,7 @@ if ($lm->getIncludeTradFilename())
<li class="required">/sitemap.xml</li>
<li class="required">/log</li>
<li class="title"><?php echo lang('Write permissions on folders (and subfolders):')?></li>
<li class="required">/img</li>
<li class="required first">/img</li>
<li class="required">/mails</li>
<li class="required">/modules</li>
<li class="required">/themes/prestashop/lang</li>
install-dev/view.css
+27 -11
View File
@@ -203,7 +203,7 @@ select {
div.field {
padding:10px 0;
border-bottom:1px solid #ccc;
background:url(img/bg_field.png) repeat-x 0 100% transparent;
}
div.field label {
display:inline-block;
@@ -220,10 +220,13 @@ div.field {
display:inline-block;
width:200px;
font-size:11px;
font-family:Georgia;
font-style:italic;
color:#999;
}
#uploadedImage {border:1px solid #ccc;}
.okBlock {
padding:20px 20px 20px 38px;
background:#b7e2a7 url(img/pict_ok.png) no-repeat 15px 21px;
@@ -376,11 +379,13 @@ ul#footer a:link, ul#footer a:active, ul#footer a:visited {
}
.sheet .contentTitle .stepList li {
float:left;
margin:0 0 0 5px;
height:42px;
width:42px;
text-indent:-5000px;
background:transparent url(img/bg_li_stepList.png) no-repeat 0 0;
}
.sheet .contentTitle .stepList li.ok {background-position:0 -50px;}
.sheet .contentTitle .stepList li.ko {background-position:0 -100px;}
.sheet .contentTitle h1 {text-shadow:0 1px 0 #fff;}
@@ -409,16 +414,21 @@ ul#langList {list-style-type:none;}
}*/
ul#required,
ul#optional {list-style-type:none;}
ul#optional {
list-style-type: none;
margin: 0;
}
ul#required li,
ul#optional li {
padding:6px 8px 4px 8px;
font-size:12px;
background:#f8f8f8;
}
ul#required li.title,
ul#optional li.title {
margin-top: 20px;
padding:4px 8px;
font-size:13px;
background:#f8f8f8 url(img/bg_li_title.png) repeat-x 0 0;
}
ul#required li.required ,
@@ -428,11 +438,11 @@ ul#optional {list-style-type:none;}
}
ul#required li.ok,
ul#optional li.ok{
background:#f8f8f8 url(img/pict_ok.png) no-repeat 100% 10px;
background:#f8f8f8 url(img/pict_ok.png) no-repeat 99% 10px
}
ul#required li.fail,
ul#optional li.fail {
background:#f8f8f8 url(img/pict_error.png) no-repeat 100% 8px;
background:#f8f8f8 url(img/pict_error.png) no-repeat 99% 8px;
}
/* ETAPE 3 - DB ************************************************************* */
@@ -443,15 +453,22 @@ ul#optional {list-style-type:none;}
#formCheckSQL p,
#mailSMTPParam p {
/*
USELESS
padding:10px 0;
border-top:1px solid #fff;
border-bottom:1px solid #ccc;*/
background:url(img/bg_field.png) repeat-x 0 100% transparent;
}
#formCheckSQL p.first {border-top:none;}
#formCheckSQL p.last {border-bottom:none;}
/*USELESS #formCheckSQL p#dbResultCheck {border:none;}*/
#formCheckSQL p#dbResultCheck {background:none;}
#formCheckSQL p#dbResultCheck.errorBlock {
background: url("img/pict_error.png") no-repeat scroll 15px 21px #FFEBE8;
border: 1px solid #CC0000;
padding: 20px 20px 20px 38px;
}
#formCheckSQL p#dbResultCheck.okBlock {
padding:20px 20px 20px 38px;
background:#b7e2a7 url(img/pict_ok.png) no-repeat 15px 21px;
border:1px solid #85c10c;
}
#formCheckSQL p label,
#mailSMTPParam p label {
display:inline-block;
@@ -477,7 +494,7 @@ ul#optional {list-style-type:none;}
#mailPart .userInfos {
padding-left:18px;
font: 11px Georgia, Arial, Sans-serif italic;
font:italic 11px Georgia, Arial, Sans-serif italic;
color:#999;
}
@@ -509,7 +526,6 @@ ul#optional {list-style-type:none;}
.moduleTable {
padding: 5px;
width: 650px;
background:#fff;
border: 1px solid #CCC;
border-bottom:none;
}