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

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source 
Conflicts:
	admin-dev/themes/default/css/admin-theme.css
This commit is contained in:
Kevin Granger
2013-10-24 17:53:30 +02:00
parent 32d146d880 f6dd4a9ee4
commit a02c31f106
12 changed files with 236 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+99 -107
View File
@@ -1,5 +1,5 @@
@import url(http://fonts.googleapis.com/css?family=Josefin+Sans:200,400,700);
/*!
/*
* Bootstrap v3.0.0
*
* Copyright 2013 Twitter, Inc
@@ -8,7 +8,7 @@
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
/*! normalize.css v2.1.0 | MIT License | git.io/normalize */
/* normalize.css v2.1.0 | MIT License | git.io/normalize */
/* line 22, ../bower_components/sass-bootstrap/lib/_normalize.scss */
article, aside, details, figcaption, figure, footer, header, hgroup, main, nav, section, summary {
display: block; }
@@ -5718,7 +5718,7 @@ th.visible-print, td.visible-print {
/* line 523, ../bower_components/sass-bootstrap/lib/_mixins.scss */
th.hidden-print, td.hidden-print {
display: none !important; } }
/*!
/*
* Font Awesome 3.2.1
* the iconic font designed for Bootstrap
* ------------------------------------------------------------------------------
@@ -7647,28 +7647,18 @@ html, body {
#nobootstrap {
float: left; }
/* line 90, admin-theme.sass */
.data-focus.data-focus-primary {
background-color: #1ba6e5;
color: white;
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
-ms-border-radius: 10px;
-o-border-radius: 10px;
border-radius: 10px; }
/* line 98, admin-theme.sass */
/* line 91, admin-theme.sass */
#customer_part .customerCard.selected-customer .panel, #customer_part .customerCard.selected-customer #header_notifs_icon_wrapper .notifs_panel, #header_notifs_icon_wrapper #customer_part .customerCard.selected-customer .notifs_panel, #customer_part .customerCard.selected-customer #dash_version {
color: #5cb85c;
border: solid 2px #5cb85c; }
/* line 104, admin-theme.sass */
/* line 97, admin-theme.sass */
body.display-modal #content, body.display-modal #main {
margin: 0;
padding: 0;
background: #f8f8f8; }
/* line 114, admin-theme.sass */
/* line 107, admin-theme.sass */
*:focus {
outline: none !important;
-moz-outline: none !important;
@@ -8492,41 +8482,38 @@ select.input-tiny, input[type="text"].input-tiny, input[type="password"].input-t
textarea {
resize: none; }
/* line 35, admin-theme/_admin-forms.sass */
/* line 36, admin-theme/_admin-forms.sass */
textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[type="datetime"]:focus, input[type="datetime-local"]:focus, input[type="date"]:focus, input[type="month"]:focus, input[type="time"]:focus, input[type="week"]:focus, input[type="number"]:focus, input[type="email"]:focus, input[type="url"]:focus, input[type="search"]:focus, input[type="tel"]:focus, input[type="color"]:focus, .uneditable-input:focus {
background-color: #fefbe2;
-webkit-box-shadow: none;
box-shadow: none; }
/* line 40, admin-theme/_admin-forms.sass */
/* line 41, admin-theme/_admin-forms.sass */
.btn {
text-transform: uppercase; }
/* line 42, admin-theme/_admin-forms.sass */
/* line 43, admin-theme/_admin-forms.sass */
.btn .caret {
border-top-color: #333333 !important; }
/* line 45, admin-theme/_admin-forms.sass */
/* line 46, admin-theme/_admin-forms.sass */
.btn:hover .caret, .btn:focus .caret {
border-top-color: white !important; }
/* line 47, admin-theme/_admin-forms.sass */
/* line 48, admin-theme/_admin-forms.sass */
.btn.btn-default {
-webkit-box-shadow: #e6e6e6 0 -2px 0 inset;
box-shadow: #e6e6e6 0 -2px 0 inset; }
/* line 49, admin-theme/_admin-forms.sass */
/* line 50, admin-theme/_admin-forms.sass */
.btn.btn-default:hover {
-webkit-box-shadow: none;
box-shadow: none;
background-color: #1ba6e5;
color: white;
border-color: #1585b8; }
/* line 54, admin-theme/_admin-forms.sass */
.btn.btn-default:hover i {
color: white; }
/* line 57, admin-theme/_admin-forms.sass */
.btn.btn-primary {
background-color: #1ba6e5;
color: white;
border-color: #1585b8; }
/* line 62, admin-theme/_admin-forms.sass */
/* line 63, admin-theme/_admin-forms.sass */
.btn.btn-default[disabled] {
border-color: #999999;
color: #999999;
@@ -8534,46 +8521,46 @@ textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[ty
-webkit-box-shadow: #cccccc 0 -2px 0 inset;
box-shadow: #cccccc 0 -2px 0 inset; }
/* line 67, admin-theme/_admin-forms.sass */
/* line 68, admin-theme/_admin-forms.sass */
.dropdown-menu {
text-align: left; }
/* line 69, admin-theme/_admin-forms.sass */
/* line 70, admin-theme/_admin-forms.sass */
.btn-group-action {
float: right; }
/* line 71, admin-theme/_admin-forms.sass */
/* line 72, admin-theme/_admin-forms.sass */
.btn-group-action a {
text-decoration: none; }
/* line 75, admin-theme/_admin-forms.sass */
/* line 76, admin-theme/_admin-forms.sass */
.tt-query {
border-bottom-right-radius: 3px !important;
border-top-right-radius: 3px !important; }
/* line 77, admin-theme/_admin-forms.sass */
/* line 78, admin-theme/_admin-forms.sass */
.tt-dropdown-menu {
background-color: white;
border: solid 1px #cccccc;
font-size: 0.9em;
text-transform: none; }
/* line 82, admin-theme/_admin-forms.sass */
/* line 83, admin-theme/_admin-forms.sass */
.tt-suggestions {
padding: 0 6px;
-webkit-box-shadow: rgba(0, 0, 0, 0.25) 0 1px 4px;
box-shadow: rgba(0, 0, 0, 0.25) 0 1px 4px; }
/* line 85, admin-theme/_admin-forms.sass */
/* line 86, admin-theme/_admin-forms.sass */
.tt-suggestion p {
border-bottom: solid 1px #cccccc;
margin: 0 !important;
padding: 0 !important; }
/* line 89, admin-theme/_admin-forms.sass */
/* line 90, admin-theme/_admin-forms.sass */
.tt-suggestion:last-child p {
border-bottom: none; }
/* line 93, admin-theme/_admin-forms.sass */
/* line 94, admin-theme/_admin-forms.sass */
.tagify-container {
background-color: white;
padding: 2px 6px;
@@ -8587,10 +8574,10 @@ textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[ty
border: solid 1px #cccccc;
-webkit-box-shadow: rgba(0, 0, 0, 0.075) 0 1px 1px inset;
box-shadow: rgba(0, 0, 0, 0.075) 0 1px 1px inset; }
/* line 101, admin-theme/_admin-forms.sass */
/* line 102, admin-theme/_admin-forms.sass */
.tagify-container span {
float: left; }
/* line 103, admin-theme/_admin-forms.sass */
/* line 104, admin-theme/_admin-forms.sass */
.tagify-container > span {
display: inline-block;
padding: 3px 5px;
@@ -8599,20 +8586,20 @@ textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[ty
border: 1px solid #1ba6e5;
background-color: #60c1ed;
color: white; }
/* line 111, admin-theme/_admin-forms.sass */
/* line 112, admin-theme/_admin-forms.sass */
.tagify-container > span > a {
padding-left: 5px;
color: #1ba6e5;
text-decoration: none;
font-weight: bold; }
/* line 116, admin-theme/_admin-forms.sass */
/* line 117, admin-theme/_admin-forms.sass */
.tagify-container > input {
margin-top: 2px;
border: 0 none;
width: 100px;
-webkit-box-shadow: none;
box-shadow: none; }
/* line 121, admin-theme/_admin-forms.sass */
/* line 122, admin-theme/_admin-forms.sass */
.tagify-container > input:focus {
outline: 0;
-webkit-box-shadow: none;
@@ -9336,8 +9323,7 @@ textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[ty
-webkit-box-shadow: #00a4e7 0 0 0 inset;
box-shadow: #00a4e7 0 0 0 inset; } }
/*!
* Ladda
/* Ladda
* http://lab.hakim.se/ladda
* MIT licensed
*
@@ -10146,133 +10132,139 @@ li.sortable-placeholder {
-o-border-radius: 5px;
border-radius: 5px; }
/* line 2, admin-theme/_admin-dashboard.sass */
/* line 3, admin-theme/_admin-dashboard.sass */
.size_s, .size_md, .size_l, .size_xl, .size_xxl {
font-family: "Ubuntu", sans-serif; }
font-family: "Ubuntu", sans-serif;
color: #515561; }
/* line 4, admin-theme/_admin-dashboard.sass */
/* line 6, admin-theme/_admin-dashboard.sass */
.size_s {
font-size: 1.1em; }
/* line 6, admin-theme/_admin-dashboard.sass */
/* line 8, admin-theme/_admin-dashboard.sass */
.size_md {
font-size: 1.3em; }
/* line 8, admin-theme/_admin-dashboard.sass */
/* line 10, admin-theme/_admin-dashboard.sass */
.size_l {
font-size: 1.7em; }
/* line 10, admin-theme/_admin-dashboard.sass */
/* line 12, admin-theme/_admin-dashboard.sass */
.size_xl {
font-size: 2em; }
/* line 12, admin-theme/_admin-dashboard.sass */
/* line 14, admin-theme/_admin-dashboard.sass */
.size_xxl {
font-size: 2.3em; }
/* line 15, admin-theme/_admin-dashboard.sass */
/* line 16, admin-theme/_admin-dashboard.sass */
.color_success {
color: #5cb85c; }
/* line 17, admin-theme/_admin-dashboard.sass */
/* line 18, admin-theme/_admin-dashboard.sass */
.color_danger {
color: #d9534f; }
/* line 20, admin-theme/_admin-dashboard.sass */
/* line 21, admin-theme/_admin-dashboard.sass */
.dash_trend_down {
color: red; }
/* line 22, admin-theme/_admin-dashboard.sass */
/* line 23, admin-theme/_admin-dashboard.sass */
.dash_trend_down:before {
margin-right: 4px;
font-family: FontAwesome;
content: "\f0ab"; }
/* line 26, admin-theme/_admin-dashboard.sass */
/* line 27, admin-theme/_admin-dashboard.sass */
.dash_trend_up {
color: green; }
/* line 28, admin-theme/_admin-dashboard.sass */
/* line 29, admin-theme/_admin-dashboard.sass */
.dash_trend_up:before {
margin-right: 4px;
font-family: FontAwesome;
content: "\f0aa"; }
/* line 32, admin-theme/_admin-dashboard.sass */
/* line 33, admin-theme/_admin-dashboard.sass */
.dash_trend_right {
color: darkblue; }
/* line 34, admin-theme/_admin-dashboard.sass */
/* line 35, admin-theme/_admin-dashboard.sass */
.dash_trend_right:before {
margin-right: 4px;
font-family: FontAwesome;
content: "\f0a9"; }
/* line 39, admin-theme/_admin-dashboard.sass */
/* line 40, admin-theme/_admin-dashboard.sass */
.box-stats {
height: 70px; }
/* line 44, admin-theme/_admin-dashboard.sass */
/* line 45, admin-theme/_admin-dashboard.sass */
#dashboard section header {
padding: 3px 8px;
margin: 0 0 3px 0;
color: white;
font-size: 1.2em;
background-color: #1ba6e5; }
/* line 50, admin-theme/_admin-dashboard.sass */
/* line 51, admin-theme/_admin-dashboard.sass */
#dashboard section header .small {
font-variant: small-cap;
text-transform: uppercase;
font-size: 0.7em; }
/* line 55, admin-theme/_admin-dashboard.sass */
#dashboard section header.panel-heading, #dashboard section #header_notifs_icon_wrapper .notifs_panel header.notifs_panel_header, #header_notifs_icon_wrapper .notifs_panel #dashboard section header.notifs_panel_header {
color: #555555; }
/* line 53, admin-theme/_admin-dashboard.sass */
/* line 58, admin-theme/_admin-dashboard.sass */
#dashboard .data_list {
margin: 0 0 10px 0;
padding: 0; }
/* line 57, admin-theme/_admin-dashboard.sass */
/* line 62, admin-theme/_admin-dashboard.sass */
#dashboard .data_list li {
position: relative; }
/* line 62, admin-theme/_admin-dashboard.sass */
/* line 67, admin-theme/_admin-dashboard.sass */
#dashboard .data_list .data_value {
line-height: 39px;
position: absolute;
top: 0;
right: 0;
padding: 0 10px 0 0; }
/* line 69, admin-theme/_admin-dashboard.sass */
/* line 74, admin-theme/_admin-dashboard.sass */
#dashboard .data_list_small {
margin: 8px 0 10px 0;
padding: 0 0 0 0;
border-top: solid 1px #dddddd; }
/* line 73, admin-theme/_admin-dashboard.sass */
/* line 78, admin-theme/_admin-dashboard.sass */
#dashboard .data_list_small li {
padding: 3px 0;
position: relative;
border: none;
margin: 0;
border-bottom: dashed 1px #dddddd; }
/* line 79, admin-theme/_admin-dashboard.sass */
/* line 84, admin-theme/_admin-dashboard.sass */
#dashboard .data_list_small .data_label {
text-transform: uppercase;
color: #bbbbbb; }
/* line 82, admin-theme/_admin-dashboard.sass */
/* line 87, admin-theme/_admin-dashboard.sass */
#dashboard .data_list_small .data_value {
line-height: 25px;
position: absolute;
top: 0;
right: 0;
padding: 0; }
/* line 89, admin-theme/_admin-dashboard.sass */
/* line 94, admin-theme/_admin-dashboard.sass */
#dashboard .data_list_large {
margin: 8px 0 10px 0;
padding: 0; }
/* line 93, admin-theme/_admin-dashboard.sass */
/* line 98, admin-theme/_admin-dashboard.sass */
#dashboard .data_list_large li {
padding: 6px 0;
position: relative;
border: none;
margin: 0; }
/* line 98, admin-theme/_admin-dashboard.sass */
/* line 103, admin-theme/_admin-dashboard.sass */
#dashboard .data_list_large .data_label {
line-height: 0.8em; }
/* line 100, admin-theme/_admin-dashboard.sass */
/* line 105, admin-theme/_admin-dashboard.sass */
#dashboard .data_list_large .data_label small {
font-size: 0.6em; }
/* line 102, admin-theme/_admin-dashboard.sass */
/* line 107, admin-theme/_admin-dashboard.sass */
#dashboard .data_list_large .data_value {
text-align: right;
line-height: 0.6em;
@@ -10280,10 +10272,10 @@ li.sortable-placeholder {
top: 0;
right: 0;
padding: 8px 0 0 0; }
/* line 109, admin-theme/_admin-dashboard.sass */
/* line 114, admin-theme/_admin-dashboard.sass */
#dashboard .data_list_large .data_value small {
font-size: 0.5em; }
/* line 112, admin-theme/_admin-dashboard.sass */
/* line 117, admin-theme/_admin-dashboard.sass */
#dashboard .data_list_vertical {
padding: 0;
margin: 0 0 10px 0;
@@ -10293,30 +10285,30 @@ li.sortable-placeholder {
-ms-border-radius: 3px;
-o-border-radius: 3px;
border-radius: 3px; }
/* line 119, admin-theme/_admin-dashboard.sass */
/* line 124, admin-theme/_admin-dashboard.sass */
#dashboard .data_list_vertical li {
border-left: solid 1px #dddddd;
padding: 6px; }
/* line 123, admin-theme/_admin-dashboard.sass */
/* line 128, admin-theme/_admin-dashboard.sass */
#dashboard .data_list_vertical li:first-child {
border: none; }
/* line 125, admin-theme/_admin-dashboard.sass */
/* line 130, admin-theme/_admin-dashboard.sass */
#dashboard .data_list_vertical .data_label {
min-height: 32px;
display: block;
line-height: 1em;
text-align: center; }
/* line 130, admin-theme/_admin-dashboard.sass */
/* line 135, admin-theme/_admin-dashboard.sass */
#dashboard .data_list_vertical .data_value {
display: block;
text-align: center; }
/* line 135, admin-theme/_admin-dashboard.sass */
/* line 140, admin-theme/_admin-dashboard.sass */
#dashboard #dashtrends header {
margin-bottom: 0; }
/* line 137, admin-theme/_admin-dashboard.sass */
/* line 142, admin-theme/_admin-dashboard.sass */
#dashboard #dashtrends #dashtrends_toolbar {
margin: 4px -16px; }
/* line 139, admin-theme/_admin-dashboard.sass */
/* line 144, admin-theme/_admin-dashboard.sass */
#dashboard #dashtrends dl {
cursor: pointer;
margin: 0;
@@ -10326,25 +10318,25 @@ li.sortable-placeholder {
padding: 10px;
border-left: 1px solid #dddddd;
border-bottom: 1px solid #dddddd; }
/* line 148, admin-theme/_admin-dashboard.sass */
/* line 153, admin-theme/_admin-dashboard.sass */
#dashboard #dashtrends dl:first-child {
border-left: none; }
/* line 150, admin-theme/_admin-dashboard.sass */
/* line 155, admin-theme/_admin-dashboard.sass */
#dashboard #dashtrends dl.active {
background-color: #eeeeee; }
/* line 152, admin-theme/_admin-dashboard.sass */
/* line 157, admin-theme/_admin-dashboard.sass */
#dashboard #dashtrends dt {
text-align: center;
height: 37px;
line-height: 1em;
font: 300 1.1em/120% "Ubuntu", sans-serif; }
/* line 157, admin-theme/_admin-dashboard.sass */
/* line 162, admin-theme/_admin-dashboard.sass */
#dashboard #dashtrends svg {
height: 350px; }
/* line 161, admin-theme/_admin-dashboard.sass */
/* line 166, admin-theme/_admin-dashboard.sass */
#dashboard #dashgoals svg {
height: 250px; }
/* line 166, admin-theme/_admin-dashboard.sass */
/* line 171, admin-theme/_admin-dashboard.sass */
#dashboard #dashaddons {
background-color: white;
border: 1px dashed #dfdfdf;
@@ -10354,33 +10346,33 @@ li.sortable-placeholder {
-o-border-radius: 3px;
border-radius: 3px;
padding: 10px 20px; }
/* line 170, admin-theme/_admin-dashboard.sass */
/* line 175, admin-theme/_admin-dashboard.sass */
#dashboard #dashaddons a {
display: block; }
/* line 172, admin-theme/_admin-dashboard.sass */
/* line 177, admin-theme/_admin-dashboard.sass */
#dashboard #dashaddons a:hover {
text-decoration: none; }
/* line 177, admin-theme/_admin-dashboard.sass */
/* line 182, admin-theme/_admin-dashboard.sass */
#dashboard #dashactivity svg {
height: 150px; }
/* line 184, admin-theme/_admin-dashboard.sass */
/* line 189, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_value {
min-width: 30px;
text-align: center; }
/* line 187, admin-theme/_admin-dashboard.sass */
/* line 192, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_value:before {
font-size: 0.7em;
font-family: FontAwesome;
content: "\f021";
color: #cccccc; }
/* line 193, admin-theme/_admin-dashboard.sass */
/* line 198, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_value span, #dashboard .loading .data_value small {
display: none; }
/* line 195, admin-theme/_admin-dashboard.sass */
/* line 200, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_trend {
display: none; }
/* line 220, admin-theme/_admin-dashboard.sass */
/* line 225, admin-theme/_admin-dashboard.sass */
.data_loading, #dashboard .data_value span, #dashboard .data_value .dash_trend {
opacity: 1;
-webkit-animation-name: bounceG;
@@ -10394,7 +10386,7 @@ li.sortable-placeholder {
transform: scale(0.7); }
@-webkit-keyframes bounceG {
/* line 228, admin-theme/_admin-dashboard.sass */
/* line 233, admin-theme/_admin-dashboard.sass */
0% {
opacity: 0;
filter: alpha(opacity=0);
@@ -10402,7 +10394,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1);
transform: scale(0.1); }
/* line 231, admin-theme/_admin-dashboard.sass */
/* line 236, admin-theme/_admin-dashboard.sass */
100% {
opacity: 1;
filter: alpha(opacity=100);
@@ -10411,7 +10403,7 @@ li.sortable-placeholder {
transform: scale(1); } }
@-moz-keyframes bounceG {
/* line 228, admin-theme/_admin-dashboard.sass */
/* line 233, admin-theme/_admin-dashboard.sass */
0% {
opacity: 0;
filter: alpha(opacity=0);
@@ -10419,7 +10411,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1);
transform: scale(0.1); }
/* line 231, admin-theme/_admin-dashboard.sass */
/* line 236, admin-theme/_admin-dashboard.sass */
100% {
opacity: 1;
filter: alpha(opacity=100);
@@ -10428,7 +10420,7 @@ li.sortable-placeholder {
transform: scale(1); } }
@-ms-keyframes bounceG {
/* line 228, admin-theme/_admin-dashboard.sass */
/* line 233, admin-theme/_admin-dashboard.sass */
0% {
opacity: 0;
filter: alpha(opacity=0);
@@ -10436,7 +10428,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1);
transform: scale(0.1); }
/* line 231, admin-theme/_admin-dashboard.sass */
/* line 236, admin-theme/_admin-dashboard.sass */
100% {
opacity: 1;
filter: alpha(opacity=100);
@@ -10445,7 +10437,7 @@ li.sortable-placeholder {
transform: scale(1); } }
@-o-keyframes bounceG {
/* line 228, admin-theme/_admin-dashboard.sass */
/* line 233, admin-theme/_admin-dashboard.sass */
0% {
opacity: 0;
filter: alpha(opacity=0);
@@ -10453,7 +10445,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1);
transform: scale(0.1); }
/* line 231, admin-theme/_admin-dashboard.sass */
/* line 236, admin-theme/_admin-dashboard.sass */
100% {
opacity: 1;
filter: alpha(opacity=100);
@@ -10462,7 +10454,7 @@ li.sortable-placeholder {
transform: scale(1); } }
@keyframes bounceG {
/* line 228, admin-theme/_admin-dashboard.sass */
/* line 233, admin-theme/_admin-dashboard.sass */
0% {
opacity: 0;
filter: alpha(opacity=0);
@@ -10470,7 +10462,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1);
transform: scale(0.1); }
/* line 231, admin-theme/_admin-dashboard.sass */
/* line 236, admin-theme/_admin-dashboard.sass */
100% {
opacity: 1;
filter: alpha(opacity=100);
@@ -10478,11 +10470,11 @@ li.sortable-placeholder {
-ms-transform: scale(1);
transform: scale(1); } }
/* line 235, admin-theme/_admin-dashboard.sass */
/* line 240, admin-theme/_admin-dashboard.sass */
#dash_version {
padding: 0 !important;
overflow: hidden; }
/* line 239, admin-theme/_admin-dashboard.sass */
/* line 244, admin-theme/_admin-dashboard.sass */
#dash_version iframe {
height: 80px;
width: 100%; }
admin-dev/themes/default/css/admin-theme/_admin-dashboard.sass
+4
View File
@@ -47,6 +47,10 @@
color: white
font-size: 1.2em
background-color: $brand-primary
.small
font-variant: small-cap
text-transform: uppercase
font-size: 0.7em
header.panel-heading
color: #555
modules/blockwishlist/mails/en/src/footer.php
+15
View File
@@ -0,0 +1,15 @@
<tr>
<td class="space_footer">&nbsp;</td>
</tr>
<tr>
<td class="footer">
<span><?php echo t('<a href="{shop_url}">{shop_name}</a> powered by <a href="http://www.prestashop.com/">PrestaShop&trade;</a>'); ?></span>
</td>
</tr>
</table>
</td>
<td class="space">&nbsp;</td>
</tr>
</table>
</body>
</html>
modules/blockwishlist/mails/en/src/header.php
+54
View File
@@ -0,0 +1,54 @@
<?php
if(!function_exists('t'))
{
function t($str)
{
return $str;
}
}
if(!function_exists('findRelativePathToAdminDir'))
{
function findRelativePathToAdminDir($maxDepth=6)
{
$path = '';
for($i=0; $i<$maxDepth; $i++)
{
foreach(scandir(dirname(__FILE__).'/'.$path) as $dir)
{
$candidate = $path.$dir.'/';
if(is_dir(dirname(__FILE__).'/'.$candidate.'tabs'))
{
return $candidate;
}
}
$path .= '../';
}
return false;
}
}
$admin = findRelativePathToAdminDir();
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title><?php echo t('Message from {shop_name}'); ?></title>
<link rel="stylesheet" type="text/css" href="<?php echo $admin ?>themes/default/css/admin-theme/email.css">
</head>
<body>
<table class="table table-mail">
<tr>
<td class="space">&nbsp;</td>
<td align="center">
<table class="table">
<tr>
<td align="center" class="logo">
<a title="{shop_name}" href="{shop_url}">
<img src="{shop_logo}" alt="{shop_name}" />
</a>
</td>
</tr>
modules/blockwishlist/mails/en/src/wishlink.php
+23
View File
@@ -0,0 +1,23 @@
<?php include ('header.php'); ?>
<tr>
<td align="center">
<span class="title"><?php echo t('Hi,'); ?></span>
</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td class="box">
<p>
<?php echo t('Message from {shop_name}'); ?>
</p>
<span>
<span><strong>{shop_name}</strong></span> <?php echo t('invites you to send this link to your friends, so they can see your wishlist:'); ?> <span><strong>{wishlist}</strong></span><br /><br />
<a title="WishList" href="{message}">{message}</a>
</span>
</td>
</tr>
<?php include ('footer.php'); ?>
modules/blockwishlist/mails/en/src/wishlist.php
+23
View File
@@ -0,0 +1,23 @@
<?php include ('header.php'); ?>
<tr>
<td align="center">
<span class="title"><?php echo t('Hi,'); ?></span>
</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td class="box">
<p>
<?php echo t('Message from {shop_name}'); ?>
</p>
<span>
<span><strong>{firstname} {lastname}</strong></span> <?php echo t('indicated you may want to see his/her wishlist:'); ?> <span><strong>{wishlist}</strong></span><br /><br />
<a title="WishList" href="{message}">{wishlist}</a>
</span>
</td>
</tr>
<?php include ('footer.php'); ?>
modules/dashactivity/dashactivity.php
+1 -1
View File
@@ -86,7 +86,7 @@ class Dashactivity extends Module
$this->context->smarty->assign(array_merge(array(
'gapi_mode' => $gapi_mode,
'dashactivity_config_form' => $this->renderConfigForm(),
'date_subtitle' => $this->l('from %s to %s'),
'date_subtitle' => $this->l('(from %s to %s)'),
'date_format' => $this->context->language->date_format_lite
), $this->getConfigFieldsValues()));
return $this->display(__FILE__, 'dashboard_zone_one.tpl');
modules/dashactivity/views/js/dashactivity.js
+1 -1
View File
@@ -103,7 +103,7 @@ Date.prototype.format = function(format) {
$(document).ready(function() {
if (date_subtitle === undefined)
date_subtitle = 'From %s to %s';
date_subtitle = '(from %s to %s)';
if (date_format === undefined)
date_format = 'Y-m-d';
modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl
+1 -1
View File
@@ -158,7 +158,7 @@
{if $gapi_mode}
<li>
<span class="data_label">
<a href="{$link->getAdminLink('AdminModules')}&{$gapi_mode}=gapi"><img src="../modules/gapi/logo.gif" width="16" height="16" /> {l s="Connect to Google Analytics API" mod="dashactivity"}</a>
<a href="{$link->getAdminLink('AdminModules')}&{$gapi_mode}=gapi"><img src="../modules/gapi/logo.gif" width="16" height="16" /> {l s="Link to your Google Analytics account" mod="dashactivity"}</a>
</span>
</li>
{/if}
modules/dashgoals/dashgoals.php
+1 -1
View File
@@ -103,7 +103,7 @@ class Dashgoals extends Module
$month_row['values'][$type] = ConfigurationKPI::get(strtoupper($key));
}
$this->context->smarty->assign('currency_code', $this->context->currency->iso_code);
$this->context->smarty->assign('currency', $this->context->currency);
$this->context->smarty->assign('goals_year', $year);
$this->context->smarty->assign('goals_months', $months);
return $this->display(__FILE__, 'dashboard_zone_two.tpl');
modules/dashgoals/views/js/dashgoals.js
+2 -2
View File
@@ -22,9 +22,9 @@ function dashgoals_calc_sales()
var key = $(this).attr('id').substr(16);
var sales = parseFloat($('#dashgoals_traffic_' + key).val()) * parseFloat($('#dashgoals_avg_cart_value_' + key).val()) * parseFloat($('#dashgoals_conversion_' + key).val()) / 100;
if (isNaN(sales))
$(this).text('0');
$(this).text(formatCurrency(0, currency_format, currency_sign, currency_blank));
else
$(this).text(parseInt(sales));
$(this).text(formatCurrency(parseInt(sales), currency_format, currency_sign, currency_blank));
});
}
modules/dashgoals/views/templates/hook/dashboard_zone_two.tpl
+12 -3
View File
@@ -23,6 +23,13 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<script>
var currency_format = {$currency->format|intval};
var currency_sign = '{$currency->sign|addslashes}';
var currency_blank = {$currency->blank|intval};
var priceDisplayPrecision = 0;
</script>
<section id="dashgoals" class="panel widget">
<header class="panel-heading">
<i class="icon-bar-chart"></i> {l s='Goals' mod='dashgoals'}
@@ -55,8 +62,10 @@
{$month.label}
</td>
<td>
<input id="dashgoals_traffic_{$month@key}" name="dashgoals_traffic_{$month@key}" class="dashgoals_config_input form-control"
value="{$month.values.traffic|intval}" />
<div class="input-group">
<input id="dashgoals_traffic_{$month@key}" name="dashgoals_traffic_{$month@key}" class="dashgoals_config_input form-control"
value="{$month.values.traffic|intval}" />
</div>
</td>
<td>
<div class="input-group">
@@ -67,7 +76,7 @@
</td>
<td>
<div class="input-group">
<span class="input-group-addon">{$currency_code|escape}</span>
<span class="input-group-addon">{$currency->iso_code|escape}</span>
<input id="dashgoals_avg_cart_value_{$month@key}" name="dashgoals_avg_cart_value_{$month@key}" class="dashgoals_config_input form-control"
value="{$month.values.avg_cart_value|intval}" />
</div>