Merge pull request #1 from minicstudio/development

Development
This commit is contained in:
minic studio committed 2013-03-03 01:49:15 -08:00
commit 204db8be75
5 files changed
+40 -78

No files matched your search

+1
View File
@@ -0,0 +1 @@
GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USAEveryone is permitted to copy and distribute verbatim copiesof this license document, but changing it is not allowed.Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all thirLine truncated
-61
View File
@@ -1,61 +0,0 @@
h2{
font-weight: normal;
font-size: 22px;
letter-spacing: -0.025em;
}
.mail-center{
text-align: center;
font-style: italic;
}
.subscription-holder{
height: 40px;
}
.subscription-holder p{
display: inline-block;
margin-left: 44%;
cursor: pointer;
}
.email{
border: solid 1px #b0b0b0;
height: 30px;
background: #f8f8f8;
-webkit-box-shadow: inset 0 0 0 1px #fff;
-moz-box-shadow: inset 0 0 0 1px #fff;
box-shadow: inset 0 0 0 1px #fff;
color: #666666;
font-size: 16px;
width: 260px;
margin-right: 10px;
padding: 0 5px;
}
#mc-embedded-subscribe{
height: 32px;
}
.email:hover,
.email:active,
.email:focus{
background: #fff;
outline: none;
}
.inline{
float: left;
}
.mail-input{
margin: 0 auto;
width: 420px;
height: 0px;
display: none;
opacity: 0;
-webkit-transition: all 300ms ease-in-out;
-moz-transition: all 300ms ease-in-out;
-ms-transition: all 300ms ease-in-out;
-o-transition: all 300ms ease-in-out;
transition: all 300ms ease-in-out;
}
.mail-active{
height: 40px;
opacity: 1;
display: block;
}
+14 -17
View File
@@ -18,10 +18,9 @@
* versions in the future. If you wish to customize PrestaShop for your * versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information. * needs please refer to http://www.prestashop.com for more information.
* *
* @author PrestaShop SA <contact@prestashop.com> * @author Minic Studio <office@minic.ro>
* @copyright 2007-2012 PrestaShop SA * @copyright 2013 S.C. Minic Studio S.R.L.
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/ */
if (!defined('_PS_VERSION_')) if (!defined('_PS_VERSION_'))
@@ -35,15 +34,15 @@ class MinicMailchimp extends Module
{ {
$this->name = 'minicmailchimp'; $this->name = 'minicmailchimp';
$this->tab = 'front_office_features'; $this->tab = 'front_office_features';
$this->version = '0.0.0'; $this->version = '0.1';
$this->author = 'minic studio'; $this->author = 'minic studio';
$this->need_instance = 0; $this->need_instance = 0;
$this->secure_key = Tools::encrypt($this->name); $this->secure_key = Tools::encrypt($this->name);
parent::__construct(); parent::__construct();
$this->displayName = $this->l('Mailchimp subscriber module.'); $this->displayName = $this->l('Minic mailchimp sync');
$this->description = $this->l('Displays a subscriber form.'); $this->description = $this->l('Displays the Mailchimp subscriber form.');
} }
/** /**
@@ -51,7 +50,7 @@ class MinicMailchimp extends Module
*/ */
public function install() public function install()
{ {
if (!parent::install() || !$this->registerHook('displayHome') || !$this->registerHook('displayHeader')) if (!parent::install() || !$this->registerHook('displayFooter') || !$this->registerHook('displayHeader'))
return false; return false;
return true; return true;
} }
@@ -63,20 +62,18 @@ class MinicMailchimp extends Module
return true; return true;
} }
public function getContent()
{
}
public function hookDisplayHeader() public function hookDisplayHeader()
{ {
$this->context->controller->addCSS($this->_path.$this->name.'.css'); // $this->context->controller->addCSS($this->_path.$this->name.'.css');
} }
public function hookDisplayHome() public function hookDisplayFooter()
{ {
return $this->display(__FILE__, 'minicmailchimp.tpl'); // return $this->display(__FILE__, '');
} }
public function hookDisplayFooterProduct()
{
return $this->display(__FILE__, 'minicmailchimp.tpl');
}
} }
+1
View File
@@ -0,0 +1 @@
/* */
@@ -1,3 +1,27 @@
{*
* 2007-2012 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author Minic Studio <office@minic.ro>
* @copyright 2013 S.C. Minic Studio S.R.L.
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*}
<!-- Begin MailChimp Signup Form --> <!-- Begin MailChimp Signup Form -->
<div id="mc_embed_signup" class="content-separator"> <div id="mc_embed_signup" class="content-separator">
<form action="http://minic.us6.list-manage.com/subscribe/post?u=7c9480b10caf70408b459694e&amp;id=ee4b05e9de" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate> <form action="http://minic.us6.list-manage.com/subscribe/post?u=7c9480b10caf70408b459694e&amp;id=ee4b05e9de" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>