Skip to content

E
ecommerce-ui
Commit 85f372b3 authored by Sven Franck's avatar Sven Franck
Browse files
Options

app: updated to changes made by Thierry

parent 3206350c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 452 additions and 98 deletions
css/css.css
View file @ 85f372b3
......@@ -568,7 +568,7 @@ tbody .large {
background-color: #A3ED24;
}
.rose.background {
background: url("../img/bg-offre02.png") no-repeat scroll center 90px / 60% auto #B01B99;
background: url("../img/bg-offre02.png") no-repeat scroll center 40px / 70px auto #B01B99;
}
.rose {
background-color: #B01B99 !important;
......@@ -577,7 +577,7 @@ tbody .large {
background-color: #E156CC;
}
.bleu.background {
background: url("../img/bg-offre03.png") no-repeat scroll center 90px / 60% auto #2296C9;
background: url("../img/bg-offre03.png") no-repeat scroll center 40px / 80px auto #2296C9;
}
.bleu {
background-color: #2296C9 !important;
......@@ -586,7 +586,7 @@ tbody .large {
background-color: #5FC2EF;
}
.violet.background {
background: url("../img/bg-offre01.png") no-repeat scroll center 90px / 60% auto #7B40B8;
background: url("../img/bg-offre01.png") no-repeat scroll center 35px / 50px auto #7B40B8;
}
.violet {
background-color: #7B40B8 !important;
......@@ -603,7 +603,7 @@ tbody .large {
background-color: #B184E0;
}
.rouge.background {
background: url("../img/website-bg-libert-vacances.png") no-repeat scroll center 30px / 200px auto #EB5757;
background: url("../img/website-bg-libert-vacances.png") no-repeat scroll center 30px / 70px auto #EB5757;
}
.rouge {
background-color: #EB5757 !important;
......@@ -618,8 +618,8 @@ tbody .large {
}
.offer {
width: 100%;
min-height: 300px;
max-height: 300px;
min-height: 320px;
max-height: 320px;
border-radius: .6em;
-webkit-border-radius: .6em;
text-align: center;
......@@ -629,7 +629,14 @@ tbody .large {
}
.offer_tag {
font-size: 150%;
margin: 0.75em 0;
margin: 2.5em 0 0.75em;
font-weight: bold;
color: #FFFFFF;
line-height: 1em;
}
.offer_price {
font-size: 150%;
margin: 0 0 0.75em;
font-weight: bold;
color: #FFFFFF;
line-height: 1em;
......@@ -651,7 +658,7 @@ span.offer_tag {
line-height: .5em;
}
.ui-header .ui-first-wrap ~ .ui-title-logo {
margin-left: 5em;
margin-left: 6em;
}
/* logo in header */
@media (max-width: 24em) {
......@@ -673,7 +680,7 @@ span.offer_tag {
display: block;
}
.rouge.background {
background: url("../img/website-bg-libert-vacances.png") no-repeat scroll center 90px / 200px auto #EB5757;
background: url("../img/website-bg-libert-vacances.png") no-repeat scroll center 40px / 80px auto #EB5757;
}
.offer.custom_offer {
max-height: 300px;
......
data/getNumbers.json
View file @ 85f372b3
......@@ -2,6 +2,5 @@
{"text": "1", "value":"1"},
{"text": "2", "value":"2"},
{"text": "3", "value":"3"},
{"text": "4", "value":"4"},
{"text": "5", "value":"5"}
{"text": "4", "value":"4"}
]
\ No newline at end of file
data/getTitles.json
View file @ 85f372b3
[
{"text_i18n":"portal_type_dict.sales_order_dict.text_dict.mrs", "class":"translate", "value":"madame"},
{"text_i18n":"portal_type_dict.sales_order_dict.text_dict.ms", "class":"translate", "value":"monsieur"},
{"text_i18n":"portal_type_dict.sales_order_dict.text_dict.mr", "class":"translate", "value":"mademoiselle"}
{"text_i18n":"portal_type_dict.sales_order_dict.text_dict.miss", "class":"translate", "value":"mademoiselle"},
{"text_i18n":"portal_type_dict.sales_order_dict.text_dict.mr", "class":"translate", "value":"monsieur"}
]
\ No newline at end of file
data/global.json
View file @ 85f372b3
......@@ -146,6 +146,95 @@
]
}
]
}, {
"generate": "widget",
"type": "collapsible",
"property_dict": {
"text_i18n": "global_dict.electronic_tolling",
"title_i18n": "global_dict.click",
"collapsed_icon": "caret-down",
"expanded_icon": "caret-up"
},
"children": [
{
"generate": "widget",
"type": "listview",
"property_dict": {
"theme": "slapos-white",
"map_children": "listItem"
},
"children": [
{"type": "item", "href": "#", "center": [{"type": "h3", "text_i18n":"global_dict.how-it-works"}]},
{"type": "item", "href": "#", "center": [{"type": "h3", "text_i18n": "global_dict.tips-and-tricks"}]},
{"type": "item", "href": "#", "center": [{"type": "h3", "text_i18n": "global_dict.faq"}]}
]
}
]
}, {
"generate": "widget",
"type": "collapsible",
"property_dict": {
"text_i18n": "global_dict.news",
"title_i18n": "global_dict.click",
"collapsed_icon": "caret-down",
"expanded_icon": "caret-up"
},
"children": [
{
"generate": "widget",
"type": "listview",
"property_dict": {
"theme": "slapos-white",
"map_children": "listItem"
},
"children": [
]
}
]
}, {
"generate": "widget",
"type": "collapsible",
"property_dict": {
"text_i18n": "global_dict.about-us",
"title_i18n": "global_dict.click",
"collapsed_icon": "caret-down",
"expanded_icon": "caret-up"
},
"children": [
{
"generate": "widget",
"type": "listview",
"property_dict": {
"theme": "slapos-white",
"map_children": "listItem"
},
"children": [
{"type": "item", "href": "#", "center": [{"type": "h3", "text_i18n":"global_dict.where-we-are"}]},
{"type": "item", "href": "#", "center": [{"type": "h3", "text_i18n": "global_dict.our-partners"}]}
]
}
]
}, {
"generate": "widget",
"type": "collapsible",
"property_dict": {
"text_i18n": "global_dict.help",
"title_i18n": "global_dict.click",
"collapsed_icon": "caret-down",
"expanded_icon": "caret-up"
},
"children": [
{
"generate": "widget",
"type": "listview",
"property_dict": {
"theme": "slapos-white",
"map_children": "listItem"
},
"children": [
]
}
]
}
]
},
......@@ -169,17 +258,44 @@
"title_i18n": "global_dict.login"
},
"children":[{
"type": "a",
"direct": {
"href": "#",
"className": "ui-panel-close ui-icon-remove ui-btn ui-btn-icon-notext ui-shadow ui-corner-all"
"type": "a",
"direct": {
"href": "#",
"className": "ui-panel-close ui-icon-remove ui-btn ui-btn-icon-notext ui-shadow ui-corner-all"
},
"attributes": {
"data-enhanced": true,
"data-rel": "close"
}
}]
}, {
"generate": "widget",
"type": "collapsible",
"property_dict": {
"text_i18n": "global_dict.my-account",
"title_i18n": "global_dict.click",
"collapsed_icon": "caret-down",
"expanded_icon": "caret-up"
},
"attributes": {
"data-enhanced": true,
"data-rel": "close"
}
}]
}]
"children": [
{
"generate": "widget",
"type": "listview",
"property_dict": {
"theme": "slapos-black",
"map_children": "listItem"
},
"children": [
{"type": "item", "href": "#", "center": [{"type": "h3", "text_i18n":"global_dict.situation"}]},
{"type": "item", "href": "#", "center": [{"type": "h3", "text_i18n": "global_dict.order-tag"}]},
{"type": "item", "href": "#", "center": [{"type": "h3", "text_i18n": "global_dict.declare-lost-tag"}]},
{"type": "item", "href": "#", "center": [{"type": "h3", "text_i18n": "global_dict.replace-defective-tag"}]},
{"type": "item", "href": "#", "center": [{"type": "h3", "text_i18n": "global_dict.update-personal-data"}]}
]
}
]
}
]
},
{
"generate":"widget",
......
data/home.json
View file @ 85f372b3
......@@ -15,21 +15,7 @@
"property_dict": {
"class_list": "span_1 responsive"
},
"children": [
{
"generate": "widget",
"type": "carousel",
"property_dict": {
"handles": true,
"map_children": "listItem"
},
"children": [
{"type": "item", "href": "#", "center": [{"type": "image", "src": "img/website-Bleu.png", "alt": ""}]},
{"type": "item", "href": "#", "center": [{"type": "image", "src": "img/website-Pub.png", "alt": ""}]},
{"type": "item", "href": "#", "center": [{"type": "image", "src": "img/website-Vert.png", "alt": ""}]}
]
}
]
"children": [ ]
},
{
"generate": "widget",
......@@ -57,15 +43,15 @@
"direct": {"href": "#", "className": "ui-link"},
"logic": {"plain_link":true},
"children": [{
"type": "span",
"type": "p",
"direct": {"className": "translate"},
"attributes": {"data-i18n": "global_dict.once_a_month"}
}, {
"type": "span",
"direct": {"className": "translate offer_tag"},
"type": "p",
"direct": {"className": "translate offer_price"},
"attributes": {"data-i18n": "global_dict.once_price"}
}, {
"type": "span",
"type": "p",
"direct": {"className": "translate"},
"attributes": {"data-i18n": "global_dict.find_out_more"}
}]
......@@ -95,15 +81,15 @@
"direct": {"href": "#", "className": "ui-link"},
"logic": {"plain_link":true},
"children": [{
"type": "span",
"type": "p",
"direct": {"className": "translate"},
"attributes": {"data-i18n": "global_dict.view_info"}
}, {
"type": "span",
"direct": {"className": "translate offer_tag"},
"type": "p",
"direct": {"className": "translate offer_price"},
"attributes": {"data-i18n": "global_dict.view_times"}
}, {
"type": "span",
"type": "p",
"direct": {"className": "translate"},
"attributes": {"data-i18n": "global_dict.find_out_more"}
}]
......@@ -132,15 +118,15 @@
"direct": {"href": "#", "className": "ui-link"},
"logic": {"plain_link":true},
"children": [{
"type": "span",
"type": "p",
"direct": {"className": "translate"},
"attributes": {"data-i18n": "global_dict.enterprise"}
}, {
"type": "span",
"direct": {"className": "translate offer_tag"},
"type": "p",
"direct": {"className": "translate offer_price"},
"attributes": {"data-i18n": "global_dict.enterprise_price"}
}, {
"type": "span",
"type": "p",
"direct": {"className": "translate"},
"attributes": {"data-i18n": "global_dict.find_out_more"}
}]
......@@ -156,7 +142,7 @@
"direct": {"className": "span_1 custom_side_by_side"},
"children":[{
"type": "div",
"direct": {"className": "offer custom_offer rouge background ui-corner-all"},
"direct": {"className": "custom_offer offer rouge background ui-corner-all"},
"children": [{
"type": "img",
"direct": {"src": "img/website-Logo-offre.png", "alt": "Bip&Go"}
......@@ -169,11 +155,11 @@
"direct": {"href": "#", "className": "ui-link"},
"logic": {"plain_link":true},
"children": [{
"type": "span",
"direct": {"className": "translate offer_tag"},
"type": "p",
"direct": {"className": "translate"},
"attributes": {"data-i18n": "global_dict.holiday"}
}, {
"type": "span",
"type": "p",
"direct": {"className": "translate custom_find_out"},
"attributes": {"data-i18n": "global_dict.find_out_more"}
}]
......
data/home.json.old2 0 → 100644
View file @ 85f372b3
This diff is collapsed.
data/order.json
View file @ 85f372b3
......@@ -92,23 +92,23 @@
"direct": {"className": "translate"},
"attributes": {"data-i18n": "portal_type_dict.sales_order_dict.text_dict.advantages"}
}, {
"type": "p",
"type": "li",
"direct": {"className": "translate"},
"attributes": {"data-i18n": "portal_type_dict.sales_order_dict.text_dict.waiting"}
}, {
"type": "p",
"type": "li",
"direct": {"className": "translate"},
"attributes": {"data-i18n": "portal_type_dict.sales_order_dict.text_dict.valid"}
}, {
"type": "p",
"type": "li",
"direct": {"className": "translate"},
"attributes": {"data-i18n": "portal_type_dict.sales_order_dict.text_dict.strings"}
}, {
"type": "p",
"type": "li",
"direct": {"className": "translate"},
"attributes": {"data-i18n": "portal_type_dict.sales_order_dict.text_dict.secure"}
}, {
"type": "p",
"type": "li",
"direct": {"className": "translate"},
"attributes": {"data-i18n": "portal_type_dict.sales_order_dict.text_dict.delivery"}
}, {
......
data/personal_data.json
View file @ 85f372b3
......@@ -11,7 +11,6 @@
{
"position": "left",
"field_list": [
{"field": "type_of_sales_order"},
{"field": "title"},
{"field": "last_name"},
{"field": "first_name"},
......
img/logo.jpg
View replaced file @ 3206350c View file @ 85f372b3
img/logo.jpg

20.4 KB | W: | H:

img/logo.jpg

15.7 KB | W: | H:

img/logo.jpg
img/logo.jpg
img/logo.jpg
img/logo.jpg
  • 2-up
  • Swipe
  • Onion skin
lang/en-EN/dict.json
View file @ 85f372b3
......@@ -3,7 +3,7 @@
"home": "bip&go",
"select": "Select",
"personal": "Personal Data",
"proceed": "Continue with my order",
"proceed": "Continue",
"login": "Login",
"contact": "Contact",
"language": "Language",
......
lang/fr-FR/dict.json
View file @ 85f372b3
{
"global_dict": {
"home": "bip&go",
"select": "Selectioner",
"select": "Sélectionnez votre formule",
"personal": "Données personnelles",
"proceed": "Poursuivre",
"login": "Espace Abonné",
"contact": "Contact",
"language": "Langue",
"menu": "Menu",
"french": "Francaise",
"english": "English",
"info": "Info",
"info": "Menu",
"proceed": "Continue with my order",
"our_offers": "Nos Offres",
"click_to_open": "Cliquez pour ouvrir",
"fixed": "Au forfait",
"pay_as_you_go": "A la carte",
"vacances": "Liber-T Vacances",
"pro": "Pour Le Pro",
"pro": "Pour les pros",
"badges": "Le plus malin pour avoir un badge",
"comparison": "Comparatif",
"about": "Nous connaître",
......@@ -48,14 +49,29 @@
"go_telepage": "Passez au Télépéage avec vos Chèques-Vacances",
"once_a_month": "Vous empruntez l’autoroute au moins 1 fois par mois.",
"once_price": "1.25 € par mois",
"view_times": "Vous ne prenez l’autoroute que quelques fois par an.",
"view_info": "Vous ne prenez l’autoroute que quelques fois par an.",
"view_times": "1.6 € par mois",
"enterprise": "Vous représentez une entreprise.",
"enterprise_price": "Cliquez ici",
"holiday": "Passez au Télépéage avec vos Chèques-Vacances",
"subscription": "Forumle",
"subscription": "Formule",
"details": "Information",
"order": "Commande",
"electronic_tolling": "Le Télépéage",
"how-it-works": "Comment ça marche",
"tips-and-tricks": "Trucs et Astuces",
"faq": "Questions Fréquentes (FAQ)",
"news": "Actualités",
"about-us": "Nous connaître",
"where-we-are": "Qui sommes-nous ?",
"our-partners": "Nos partenaires",
"help": "Aide",
"my-account": "Mon compte",
"situation": "Situation du compte",
"order-tag": "Commander un badge",
"declare-lost-tag": "Déclarer un badge perdu/volé",
"replace-defective-tag": "Remplacer un badge défectueux",
"update-personal-data": "Modifier mes données personnelles",
"payment": "Paiement"
},
"status_dict": {
......@@ -77,18 +93,19 @@
"sales_order_dict": {
"text_dict": {
"electronic": "Facture électronique",
"paper": "Papier facture (0,85€ par mois)",
"paper": "Facture papier (0,85€ par mois)",
"choose_offer": "Choisissez votre offre",
"fixed_price": "A forfait 1,25€ par mois",
"fixed_details": "Bip&Go Au forfait est fait pour vous",
"carte_fixed": "A la carte 1,6€ par mois",
"carte_details":"Bip&Go A la carte est fait pour vous",
"details": "Plus d'informations sur les forfaits disponibles.",
"coupon_info": "Vous disposez d'un code promo, code jeu concours ou numéro de parrain, Saisissez le code correspondant ci-dessous",
"coupon_info": "Vous disposez d'un code promo, code jeu concours ou numéro de parrain. Saisissez le code correspondant ci-dessous",
"retour": "Retour",
"proceed": "Poursuivre",
"advantages": "Les avantages Bip&Go",
"waiting": "Plus d'attente au péage",
"valid": "Valable partout en France et dans plus de 250 parkings",
"valid": "Partout en France et dans plus de 250 parkings",
"strings": "Sans engagement",
"secure": "Paiement sécurisé par prélèvement mensuel",
"delivery": "Livraison sous 48 heures en France",
......@@ -96,8 +113,8 @@
"private": "Privé",
"profressional": "Professionel",
"mrs": "Mme",
"miss":"Mlle",
"mr": "M",
"miss": "Mlle",
"mr": "M.",
"dob": "Date de naissance (JJ/MM/AAAA)",
"belgium": "Belgique (+32)",
"france": "France (+33)",
......@@ -112,63 +129,63 @@
"nl": "Pays-Bas",
"ch": "Suisse",
"invoice_address": "À l'adresse de facturation",
"french":"Francaise",
"dutch":"Nederlands",
"german": "Allemandes",
"english": "Anglaise"
"french":"Français",
"dutch":"Néerlandais",
"german": "Allemand",
"english": "Anglais"
},
"field_dict": {
"number_of_badges": {
"title": "Nombre de badges BIP&Go souhaités",
"description": "Les nombre de badges BIP&Go souhaités "
"description": "Le nombre de badges BIP&Go souhaités "
},
"requested_invoice_method": {
"title": "Mode de facturation souhaité ",
"description": "La méthode de la facture demandée pour vos badges Bip & Go"
"description": "La méthode de facturation demandée."
},
"subscription_plan": {
"title": "Choisissez votre formule",
"description": "Le plan vous abonner."
"description": "L'offre à laquelle vous souhaiter vous abonner."
},
"additional_badge_holders": {
"title": "Nombre de supports de fixation en plus (facturés 2 € l'unité)",
"title": "Nombre de supports de fixation supplémentaires (facturés 2 € l'unité)",
"description": "Nombre de supports de fixation en plus de celui livré pour pouvoir utiliser mon badge dans plusieurs véhicules (facturés 2 € l'unité)."
},
"coupon_code": {
"title": "Code Promo",
"description": "Un code de coupon, l'utilisateur peut entrer à racheter une réduction."
"description": "Un code de coupon à saisir pour bénéficier d'une réduction."
},
"_id": {
"title": "ID",
"description": "L'identifiant de l'ordre de vente"
"description": "L'identifiant de la souscription"
},
"type_of_sales_order": {
"title": "Type d'abonnement",
"description": "Indicateur s'il s'agit d'une souscription privée ou professionnelle."
"description": "S'agit-il d'une souscription privée ou professionnelle."
},
"title": {
"title": "Titre",
"description": "Le titre de cette personne"
},
"last_name": {
"title": "Last name",
"description": "The last name of this person."
"title": "Nom",
"description": "Le nom de la personne."
},
"first_name": {
"title": "First name",
"description": "The first name of this person."
"title": "Prénom",
"description": "Le prénom de la personne."
},
"dob_year": {
"title": "Annee",
"description":"L'année, cette personne est née."
"description":"L'année de naissance de cette personne."
},
"dob_month": {
"title": "Mois",
"description":"Le mois, cette personne est née"
"description":"Le mois de naissance de cette personne."
},
"dob_day": {
"title": "Jour",
"description":"Le jour, cette personne est née."
"description":"Le jour de naissance de cette personne."
},
"default_email_text": {
"title": "Adresse email ",
......@@ -179,15 +196,15 @@
"description":"L'adresse e-mail confirmée de cette personne"
},
"country_code": {
"title": "Code pays mobile (pour valide votre souscription)",
"description": "Mh"
"title": "Indicatif pays mobile (pour valide votre souscription)",
"description": "Indicatif téléphonique de la ligne fixe."
},
"cell_phone": {
"title": "N° de téléphone mobile (vous permettra de valider votre souscription) ",
"description": "Mh"
"description": "Indicatif téléphonique de la ligne mobile."
},
"country_code_fix": {
"title": "Code pays fixe ",
"title": "Indicatif pays fixe ",
"description": "Le code du téléphone fixe de la personne de pays"
},
"fix_phone": {
......@@ -203,7 +220,7 @@
"description":"Mh."
},
"address_appendix_2": {
"title": "Immeuble/Bâtiment/Résidence) ",
"title": "Immeuble/Bâtiment/Résidence",
"description":"Mh"
},
"address_appendix_3": {
......@@ -212,15 +229,15 @@
},
"country": {
"title": "Pays",
"description": "Le pays vit la personne."
"description": "Le pays où habite la personne."
},
"postcode": {
"title": "Code Postal",
"description":"Le code postal de la ville la personne vit."
"description":"Le code postal de la ville où habite la personne."
},
"city": {
"title": "Ville",
"description":"La ville cette personne vit"
"description":"La ville où habite la personne."
},
"delivery_method":{
"title":"Mode de livraison",
......@@ -228,7 +245,7 @@
},
"delivery_address": {
"title": "A quelle adresse souhaitez-vous être livré(e) ?",
"description":"L'adresse de livraison sélectionné pour cet ordre de vente"
"description":"L'adresse de livraison sélectionnée pour cette souscription."
},
"notification_language":{
"title": "Sélectionnez la langue des messages de notifications ",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7