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

// admin import

Browse Source
This commit is contained in:
Kevin Granger
2013-11-25 17:55:59 +01:00
parent 0e3504f3b3
commit 4c8c48f441
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+2 -2
View File
@@ -3172,14 +3172,14 @@ a.link-social:hover { text-decoration: none; }
.bootstrap .table thead > tr > th span.title_box.active { font-weight: bold; }
.bootstrap .table thead > tr > th span.title_box a { text-decoration: none; }
.bootstrap .table thead > tr > th span.title_box a.active { color: black; }
.bootstrap .table thead > tr.filter > th { background-color: #dfeff8; }
.bootstrap .table thead > tr.filter > th input[type="text"].filter, .bootstrap .table thead > tr.filter > th input[type="password"].filter, .bootstrap .table thead > tr.filter > th select.filter { font-size: 12px; border-color: #a0d0eb; }
.bootstrap .table input, .bootstrap .table select { margin: 0; }
.bootstrap .table tbody > tr > td { border-top: none; background-color: white; padding: 3px 7px; vertical-align: middle; word-wrap: nowrap; font-size: 12px; border-bottom: solid 1px #eeeeee; }
.bootstrap .table tbody > tr.odd > td { background-color: #f9f9f9; }
.bootstrap .table tbody > tr:hover > td { background-color: #e6e8e3; }
.bootstrap .table td.center, .bootstrap .table th.center { text-align: center; }
.bootstrap .table td.pointer { cursor: pointer; }
.bootstrap tr.filter { background-color: #dfeff8; }
.bootstrap tr.filter input[type="text"].filter, .bootstrap tr.filter input[type="password"].filter, .bootstrap tr.filter select.filter { font-size: 12px; border-color: #a0d0eb; }
.bootstrap tr.highlighted td { background-color: #1ba6e5 !important; color: white; }
.bootstrap td.actions { min-width: 200px; }
.bootstrap .bulk-actions { margin: 17px 0 0 0; }
admin-dev/themes/default/scss/admin-theme/_admin-tables.sass
+5 -6
View File
@@ -21,6 +21,11 @@
text-decoration: none
a.active
color: black
thead > tr.filter > th
background-color: lighten(#CAE5F4,5%)
input[type="text"].filter, input[type="password"].filter, select.filter
font-size: 12px
border-color: darken(#CAE5F4,10%)
input, select
margin: 0
tbody
@@ -42,12 +47,6 @@
td.pointer
cursor: pointer
tr.filter
background-color: lighten(#CAE5F4,5%)
input[type="text"].filter, input[type="password"].filter, select.filter
font-size: 12px
border-color: darken(#CAE5F4,10%)
tr.highlighted td
background-color: $brand-primary!important
color: white
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+7 -3
View File
@@ -73,7 +73,7 @@
<div class="panel">
<h3>
<i class="icon-download"></i>
<i class="icon-upload"></i>
{l s='Import'}
</h3>
<div class="form-group">
@@ -297,8 +297,12 @@
<div class="alert alert-warning">
<p>{l s='There is no CSV file available. Please upload one using the \'Upload\' button above.'}</p>
<ul>
<li>{l s='You can read information on CSV import at:'} <a href="http://doc.prestashop.com/display/PS14/Troubleshooting#Troubleshooting-HowtocorrectlyimportaccentuatedcontentusingaCSVfile%3F" target="_blank">http://doc.prestashop.com/display/PS14/Troubleshooting</a>
<li>{l s='Read more about CSV format at:'} <a href="http://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">http://en.wikipedia.org/wiki/Comma-separated_values</a>
<li>{l s='You can read information on CSV import at:'}
<a href="http://doc.prestashop.com/display/PS16/CSV+Import+Parameters" target="_blank">http://doc.prestashop.com/display/PS16/CSV+Import+Parameters</a>
</li>
<li>{l s='Read more about CSV format at:'}
<a href="http://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">http://en.wikipedia.org/wiki/Comma-separated_values</a>
</li>
</ul>
</div>
{/if}