Skip to content
This repository has been archived by the owner on May 30, 2019. It is now read-only.

Commit

Permalink
Templates and plugins improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@tonipinel @rogergros
tonipinel authored and rogergros committed Jun 13, 2015
1 parent e761b31 commit 14186ed
Show file tree
Hide file tree
Showing 57 changed files with 231 additions and 3,905 deletions.
Binary file added src/Elcodi/Plugin/CustomShippingBundle/Resources/public/images/icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/Elcodi/Plugin/CustomShippingBundle/plugin.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ plugin:
name: elcodi_plugin.custom_shipping.name
description: elcodi_plugin.custom_shipping.description
fa_icon: truck
visible: false
Binary file modified src/Elcodi/Plugin/FreePaymentBundle/Resources/public/images/icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions src/Elcodi/Plugin/PaypalWebCheckoutBundle/EventListener/PaymentCollectEventListener.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,7 @@ public function addPaypalPaymentMethod(PaymentCollectionEvent $event)
if ($this
->plugin
->isUsable([
'private_key',
'public_key',
'business',
])
) {
$paypal = new PaymentMethod(
Expand Down
Binary file modified src/Elcodi/Plugin/PaypalWebCheckoutBundle/Resources/public/images/icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/Elcodi/Plugin/StoreTemplateBundle/Resources/public/css/main.css
View file

Large diffs are not rendered by default.

184 changes: 3 additions & 181 deletions src/Elcodi/Plugin/StoreTemplateBundle/Resources/public/preview/address-edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>store name</title>
<title>My Awesome Store</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script type="text/javascript">document.documentElement.className = document.documentElement.className.replace(/\bno-js\b/,'js');</script>
<link href="favicon.ico" rel="icon" type="image/vnd.microsoft.icon">
<link href="favicon.ico" rel="shortcut icon" type="image/x-icon">

<link rel="stylesheet" type="text/css" media="all" href="../css/main.css" />


<!-- External Font assets -->
<link href="//fonts.googleapis.com/css?family=Bree+Serif" rel="stylesheet" type="text/css" />
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
Expand Down Expand Up @@ -54,90 +53,8 @@
<!--[if lt IE 8]>
<!-- should warn for outdated browser -->
<![endif]-->


<header class="header" >
<nav class="currency-nav">
<div class="grid">
<ul>
<li>
<a href="#" >
EUR
</a>
</li>
<li>
<a href="#" >
GBP
</a>
</li>
<li>
<a href="#" >
JPY
</a>
</li>
<li>
<a href="#" >
USD
</a>
</li>
</ul>
</div>
</nav>
<div class="grid">
<div class="col-1-2">
<a href="#" class="logo">
My Awesome Store
</a>
</div>
<div class="col-1-2">
<ul class="user-nav">
<li>
<a href="#"><i class="fa fa-sign-in"></i> Login</a>
</li>
<li>
<a href="#"><strong><i class="fa fa-user"></i> Create new account</strong></a>
</li>
</ul>
<ul class="cart-nav">
<li>
<small>Amount</small>
<strong>$0.00</strong>
</li>
<li>
<small>Items</small>
<strong>0</strong>
</li>
<li>
<a href="#" class="fa fa-shopping-cart fa-2x"></a>
</li>
</ul>
</div>
</div>
</header>
<div class="grid desktop">
<ul class="category-nav" data-test="category-nav">
<li>
<a href="#" class="active">New</a>
</li>
<li >
<a href="#"
>
Women's
</a>
</li>
<li >
<a href="#"
>
Men's
</a>
</li>
</ul>
</div>
<a href="#mobile-menu" class="button mobile"><i class="fa fa-arrow-down"></i> Menu</a>





<div class="grid message-grid">
<div class="col-1-1">

Expand All @@ -157,111 +74,16 @@

<h2>Add new address</h2>

<div class="form form-address">
<form>
<div class="grid">
<div class="col-1-1">
<div class="form-row">[object Object] ) }}</div>
<hr class="rule" />
</div>
</div>
<div class="grid">
<div class="col-1-2 form-row">
[object Object]) }}
</div>
<div class="col-1-2 form-row">
[object Object]) }}
</div>
</div>
<div class="grid">
<div class="col-1-1 form-row">
[object Object]) }}
</div>
</div>
<div class="grid">
<div class="col-2-3 form-row">
[object Object] ) }}
</div>
<div class="col-1-3 form-row">
[object Object] ) }}
</div>
</div>



undefined
<div class="grid">
<div class="col-1-2 form-row">
[object Object]) }}
</div>
<div class="col-1-2 form-row">
[object Object]) }}
</div>
</div>
<div class="grid">
<div class="col-1-1 form-row">
[object Object]) }}
</div>
</div>
<div class="form-row">
<button type="submit" class="button button-primary">Send</button>
<a href="#" class="button">Cancel</a>
</div>
</form>
</div>




<script src=""></script>

</div>
</div>

<div id="mobile-menu" class="grid mobile">
<ul class="category-nav" data-test="category-nav">
<li>
<a href="#" class="active">New</a>
</li>
<li >
<a href="#"
>
Women's
</a>
</li>
<li >
<a href="#"
>
Men's
</a>
</li>
</ul>
</div>
<footer class="footer">
<div class="grid">
<div class="col-1-1">
<a href="#" class="logo">
My Awesome Store
</a>
<p class="leitmotiv"><strong></strong></p>
</div>
</div>
<div class="grid">
<div class="col-1-3">
<h5>Quick links</h5>
<ul>

</ul>
</div>
<div class="col-1-3">
<h5>Follow us</h5>
<ul>

</ul>
</div>
</div>
</footer>



<script>
_etc.push(["", 'page_view']);
Expand Down
132 changes: 3 additions & 129 deletions src/Elcodi/Plugin/StoreTemplateBundle/Resources/public/preview/address-list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>store name</title>
<title>My Awesome Store</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script type="text/javascript">document.documentElement.className = document.documentElement.className.replace(/\bno-js\b/,'js');</script>
<link href="favicon.ico" rel="icon" type="image/vnd.microsoft.icon">
<link href="favicon.ico" rel="shortcut icon" type="image/x-icon">

<link rel="stylesheet" type="text/css" media="all" href="../css/main.css" />


<!-- External Font assets -->
<link href="//fonts.googleapis.com/css?family=Bree+Serif" rel="stylesheet" type="text/css" />
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
Expand Down Expand Up @@ -54,90 +53,8 @@
<!--[if lt IE 8]>
<!-- should warn for outdated browser -->
<![endif]-->


<header class="header" >
<nav class="currency-nav">
<div class="grid">
<ul>
<li>
<a href="#" >
EUR
</a>
</li>
<li>
<a href="#" >
GBP
</a>
</li>
<li>
<a href="#" >
JPY
</a>
</li>
<li>
<a href="#" >
USD
</a>
</li>
</ul>
</div>
</nav>
<div class="grid">
<div class="col-1-2">
<a href="#" class="logo">
My Awesome Store
</a>
</div>
<div class="col-1-2">
<ul class="user-nav">
<li>
<a href="#"><i class="fa fa-sign-in"></i> Login</a>
</li>
<li>
<a href="#"><strong><i class="fa fa-user"></i> Create new account</strong></a>
</li>
</ul>
<ul class="cart-nav">
<li>
<small>Amount</small>
<strong>$0.00</strong>
</li>
<li>
<small>Items</small>
<strong>0</strong>
</li>
<li>
<a href="#" class="fa fa-shopping-cart fa-2x"></a>
</li>
</ul>
</div>
</div>
</header>
<div class="grid desktop">
<ul class="category-nav" data-test="category-nav">
<li>
<a href="#" class="active">New</a>
</li>
<li >
<a href="#"
>
Women's
</a>
</li>
<li >
<a href="#"
>
Men's
</a>
</li>
</ul>
</div>
<a href="#mobile-menu" class="button mobile"><i class="fa fa-arrow-down"></i> Menu</a>





<div class="grid message-grid">
<div class="col-1-1">

Expand Down Expand Up @@ -262,50 +179,7 @@ <h2>Addresses</h2>
</div>
</div>

<div id="mobile-menu" class="grid mobile">
<ul class="category-nav" data-test="category-nav">
<li>
<a href="#" class="active">New</a>
</li>
<li >
<a href="#"
>
Women's
</a>
</li>
<li >
<a href="#"
>
Men's
</a>
</li>
</ul>
</div>
<footer class="footer">
<div class="grid">
<div class="col-1-1">
<a href="#" class="logo">
My Awesome Store
</a>
<p class="leitmotiv"><strong></strong></p>
</div>
</div>
<div class="grid">
<div class="col-1-3">
<h5>Quick links</h5>
<ul>

</ul>
</div>
<div class="col-1-3">
<h5>Follow us</h5>
<ul>

</ul>
</div>
</div>
</footer>



<script>
_etc.push(["", 'page_view']);
Expand Down
Loading

0 comments on commit 14186ed

Please sign in to comment.