Version Notes
For changes, please see http://fishpig.co.uk/magento/extensions/ibanners/#changelog
Download this release
Release Info
Developer | fishpig |
Extension | Fishpigs_iBanners |
Version | 1.2.4.3 |
Comparing to | |
See all releases |
Code changes from version 1.2.4.2 to 1.2.4.3
- app/code/community/Fishpig/IBanners/Block/Adminhtml/Banner/Edit.php +15 -0
- app/code/community/Fishpig/IBanners/Block/Adminhtml/Banner/Edit/Tab/Form.php +20 -6
- app/code/community/Fishpig/IBanners/Block/Adminhtml/Dashboard.php +1 -9
- app/code/community/Fishpig/IBanners/Block/Adminhtml/Extend.php +0 -12
- app/code/community/Fishpig/IBanners/Controller/Adminhtml/Abstract.php +0 -1
- app/code/community/Fishpig/IBanners/FPAdmin/Block/Adminhtml/Extend.php +0 -458
- app/code/community/Fishpig/IBanners/FPAdmin/etc/config.xml +0 -113
- app/code/community/Fishpig/IBanners/FPAdmin/template/large.phtml +0 -41
- app/code/community/Fishpig/IBanners/FPAdmin/template/small.phtml +0 -39
- app/code/community/Fishpig/IBanners/Model/Banner.php +12 -0
- app/code/community/Fishpig/IBanners/controllers/Adminhtml/IBannersController.php +1 -31
- app/code/community/Fishpig/IBanners/etc/config.xml +1 -1
- app/code/community/Fishpig/IBanners/notes.txt +3 -0
- app/design/adminhtml/default/default/layout/ibanners.xml +4 -0
- package.xml +4 -4
app/code/community/Fishpig/IBanners/Block/Adminhtml/Banner/Edit.php
CHANGED
@@ -53,4 +53,19 @@ class Fishpig_iBanners_Block_Adminhtml_Banner_Edit extends Mage_Adminhtml_Block
|
|
53 |
|
54 |
return $this->__('Edit Banner');
|
55 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
56 |
}
|
53 |
|
54 |
return $this->__('Edit Banner');
|
55 |
}
|
56 |
+
|
57 |
+
/**
|
58 |
+
* Enable WYSIWYG editor
|
59 |
+
*
|
60 |
+
*/
|
61 |
+
protected function _prepareLayout()
|
62 |
+
{
|
63 |
+
parent::_prepareLayout();
|
64 |
+
|
65 |
+
if (Mage::getSingleton('cms/wysiwyg_config')->isEnabled()) {
|
66 |
+
$this->getLayout()->getBlock('head')->setCanLoadTinyMce(true);
|
67 |
+
}
|
68 |
+
|
69 |
+
return $this;
|
70 |
+
}
|
71 |
}
|
app/code/community/Fishpig/IBanners/Block/Adminhtml/Banner/Edit/Tab/Form.php
CHANGED
@@ -20,6 +20,11 @@ class Fishpig_iBanners_Block_Adminhtml_Banner_Edit_Tab_Form extends Mage_Adminht
|
|
20 |
);
|
21 |
}
|
22 |
|
|
|
|
|
|
|
|
|
|
|
23 |
protected function _prepareForm()
|
24 |
{
|
25 |
$form = new Varien_Data_Form();
|
@@ -29,7 +34,10 @@ class Fishpig_iBanners_Block_Adminhtml_Banner_Edit_Tab_Form extends Mage_Adminht
|
|
29 |
|
30 |
$this->setForm($form);
|
31 |
|
32 |
-
$fieldset = $form->addFieldset('banner_general', array(
|
|
|
|
|
|
|
33 |
|
34 |
$this->_addElementTypes($fieldset);
|
35 |
|
@@ -70,11 +78,17 @@ class Fishpig_iBanners_Block_Adminhtml_Banner_Edit_Tab_Form extends Mage_Adminht
|
|
70 |
));
|
71 |
|
72 |
$fieldset->addField('html', 'editor', array(
|
73 |
-
'name'
|
74 |
-
'label'
|
75 |
-
'title'
|
76 |
-
'style'
|
77 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
78 |
|
79 |
$fieldset->addField('image', 'image', array(
|
80 |
'name' => 'image',
|
20 |
);
|
21 |
}
|
22 |
|
23 |
+
/**
|
24 |
+
* Prepare the banner form
|
25 |
+
*
|
26 |
+
* @return $this
|
27 |
+
*/
|
28 |
protected function _prepareForm()
|
29 |
{
|
30 |
$form = new Varien_Data_Form();
|
34 |
|
35 |
$this->setForm($form);
|
36 |
|
37 |
+
$fieldset = $form->addFieldset('banner_general', array(
|
38 |
+
'legend'=> $this->__('General Information'),
|
39 |
+
'class' => 'fieldset-wide',
|
40 |
+
));
|
41 |
|
42 |
$this->_addElementTypes($fieldset);
|
43 |
|
78 |
));
|
79 |
|
80 |
$fieldset->addField('html', 'editor', array(
|
81 |
+
'name' => 'html',
|
82 |
+
'label' => $this->__('HTML'),
|
83 |
+
'title' => $this->__('HTML'),
|
84 |
+
'style' => 'height: 200px;',
|
85 |
+
'wysiwyg' => true,
|
86 |
+
'config' => Mage::getSingleton('cms/wysiwyg_config')->getConfig(array(
|
87 |
+
'add_widgets' => true,
|
88 |
+
'add_variables' => true,
|
89 |
+
'add_image' => true,
|
90 |
+
'files_browser_window_url' => $this->getUrl('adminhtml/cms_wysiwyg_images/index'))
|
91 |
+
)));
|
92 |
|
93 |
$fieldset->addField('image', 'image', array(
|
94 |
'name' => 'image',
|
app/code/community/Fishpig/IBanners/Block/Adminhtml/Dashboard.php
CHANGED
@@ -34,15 +34,7 @@ class Fishpig_IBanners_Block_Adminhtml_Dashboard extends Mage_Adminhtml_Block_Wi
|
|
34 |
'active' => $alias === 'banner',
|
35 |
));
|
36 |
}
|
37 |
-
|
38 |
-
if ($extend = $_layout->createBlock('ibanners/adminhtml_extend')) {
|
39 |
-
$extend->setNameInLayout('fishpig.extend')
|
40 |
-
->setTabLabel($this->__('Add-Ons'))
|
41 |
-
->setTabUrl('*/*/extend');
|
42 |
-
|
43 |
-
$this->addTab('extend', $extend);
|
44 |
-
}
|
45 |
-
|
46 |
return parent::_prepareLayout();
|
47 |
}
|
48 |
}
|
34 |
'active' => $alias === 'banner',
|
35 |
));
|
36 |
}
|
37 |
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
38 |
return parent::_prepareLayout();
|
39 |
}
|
40 |
}
|
app/code/community/Fishpig/IBanners/Block/Adminhtml/Extend.php
DELETED
@@ -1,12 +0,0 @@
|
|
1 |
-
<?php
|
2 |
-
/**
|
3 |
-
* @category Fishpig
|
4 |
-
* @package Fishpig_iBanners
|
5 |
-
* @license http://fishpig.co.uk/license.txt
|
6 |
-
* @author Ben Tideswell <help@fishpig.co.uk>
|
7 |
-
*/
|
8 |
-
|
9 |
-
// Include the FPAdmin Extend Block class
|
10 |
-
require_once(Mage::getModuleDir('', 'Fishpig_iBanners') . DS . implode(DS, array('FPAdmin', 'Block', 'Adminhtml', 'Extend.php')));
|
11 |
-
|
12 |
-
class Fishpig_iBanners_Block_Adminhtml_Extend extends Fishpig_FPAdmin_Block_Adminhtml_Extend {}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Fishpig/IBanners/Controller/Adminhtml/Abstract.php
CHANGED
@@ -17,5 +17,4 @@ abstract class Fishpig_iBanners_Controller_Adminhtml_Abstract extends Mage_Admin
|
|
17 |
{
|
18 |
return Mage::getSingleton('admin/session')->isAllowed('cms/ibanners');
|
19 |
}
|
20 |
-
|
21 |
}
|
17 |
{
|
18 |
return Mage::getSingleton('admin/session')->isAllowed('cms/ibanners');
|
19 |
}
|
|
|
20 |
}
|
app/code/community/Fishpig/IBanners/FPAdmin/Block/Adminhtml/Extend.php
DELETED
@@ -1,458 +0,0 @@
|
|
1 |
-
<?php
|
2 |
-
/**
|
3 |
-
* @category Fishpig
|
4 |
-
* @package Fishpig_FPAdmin
|
5 |
-
* @author Ben Tideswell <help@fishpig.co.uk>
|
6 |
-
*/
|
7 |
-
|
8 |
-
// Required for compiler as this is used in multiple modules
|
9 |
-
if (!defined('__fishpig_extend')) {
|
10 |
-
define('__fishpig_extend', true);
|
11 |
-
|
12 |
-
abstract class Fishpig_FPAdmin_Block_Adminhtml_Extend extends Mage_Core_Block_Template
|
13 |
-
implements Mage_Adminhtml_Block_Widget_Tab_Interface
|
14 |
-
{
|
15 |
-
/**
|
16 |
-
* Tracking string for GA
|
17 |
-
*
|
18 |
-
* @var const string
|
19 |
-
*/
|
20 |
-
const TRACKING_STRING = '?utm_source=%s&utm_medium=%s&utm_term=%s&utm_campaign=Extend';
|
21 |
-
|
22 |
-
/**
|
23 |
-
* Base URL for links
|
24 |
-
*
|
25 |
-
* @var const string
|
26 |
-
*/
|
27 |
-
const BASE_URL = 'http://fishpig.co.uk/';
|
28 |
-
|
29 |
-
/**
|
30 |
-
* The URL for the S3 bucket for images
|
31 |
-
*
|
32 |
-
* @var const string
|
33 |
-
*/
|
34 |
-
const S3_BUCKET_URL = 'https://s3.amazonaws.com/FishPig-Extend/image/';
|
35 |
-
|
36 |
-
/**
|
37 |
-
* Cache for all available extensions
|
38 |
-
*
|
39 |
-
* @var array
|
40 |
-
*/
|
41 |
-
static protected $_extensions = null;
|
42 |
-
|
43 |
-
protected function _construct()
|
44 |
-
{
|
45 |
-
$this->setTemplate('small.phtml');
|
46 |
-
|
47 |
-
return parent::_construct();
|
48 |
-
}
|
49 |
-
|
50 |
-
/**
|
51 |
-
* Retrieve extensions set via XML
|
52 |
-
*
|
53 |
-
* @return array
|
54 |
-
*/
|
55 |
-
public function getSelectedExtensions()
|
56 |
-
{
|
57 |
-
return $this->getExtensions($this->getLimit(), $this->getPreferred() ? ($this->getPreferred()) : null);
|
58 |
-
}
|
59 |
-
|
60 |
-
/**
|
61 |
-
* Retrieve the available extensions taking into account $count and $pref
|
62 |
-
*
|
63 |
-
* @param int $count = 0
|
64 |
-
* @param array $pref = array()
|
65 |
-
* @return false|array
|
66 |
-
*/
|
67 |
-
public function getExtensions($count = 0, array $pref = array(), $rand = false)
|
68 |
-
{
|
69 |
-
if (!isset($pref[0])) {
|
70 |
-
$pref = array_keys($pref);
|
71 |
-
}
|
72 |
-
|
73 |
-
if (($pool = $this->_getAllExtensions()) !== false) {
|
74 |
-
$winners = array();
|
75 |
-
|
76 |
-
foreach($pref as $code) {
|
77 |
-
if (isset($pool[$code])) {
|
78 |
-
$winners[$code] = $pool[$code];
|
79 |
-
unset($pool[$code]);
|
80 |
-
}
|
81 |
-
|
82 |
-
if (!$rand && $count > 0 && count($winners) >= $count) {
|
83 |
-
break;
|
84 |
-
}
|
85 |
-
}
|
86 |
-
|
87 |
-
if ($rand) {
|
88 |
-
$winners = $this->shuffleArray($winners);
|
89 |
-
|
90 |
-
if ($count > 0 && count($winners) > $count) {
|
91 |
-
$xcount = count($winners);
|
92 |
-
|
93 |
-
while($xcount-- > $count) {
|
94 |
-
array_pop($winners);
|
95 |
-
}
|
96 |
-
}
|
97 |
-
}
|
98 |
-
|
99 |
-
while(count($winners) < $count && count($pool) > 0) {
|
100 |
-
$code = key($pool);
|
101 |
-
|
102 |
-
$winners[$code] = $pool[$code];
|
103 |
-
unset($pool[$code]);
|
104 |
-
}
|
105 |
-
|
106 |
-
end($winners);
|
107 |
-
|
108 |
-
$winners[key($winners)]['last'] = true;
|
109 |
-
|
110 |
-
return $winners;
|
111 |
-
}
|
112 |
-
|
113 |
-
return false;
|
114 |
-
}
|
115 |
-
|
116 |
-
/**
|
117 |
-
* Retrieve all of the available extensions
|
118 |
-
*
|
119 |
-
* @return array
|
120 |
-
*/
|
121 |
-
protected function _getAllExtensions()
|
122 |
-
{
|
123 |
-
if (!is_null(self::$_extensions)) {
|
124 |
-
return self::$_extensions;
|
125 |
-
}
|
126 |
-
|
127 |
-
$installedModules = array_keys((array)$this->_getConfig()->getNode('modules'));
|
128 |
-
$config = (array)$this->_getConfig()->getNode('fishpig/extend')->asArray();
|
129 |
-
self::$_extensions = array();
|
130 |
-
|
131 |
-
foreach($config as $code => $extension) {
|
132 |
-
$extension['module'] = $code;
|
133 |
-
$reqMultistore = isset($extension['require_multistore']) ? (int)$extension['require_multistore'] : null;
|
134 |
-
|
135 |
-
if (!isset($_SERVER['IS_FISHPIG']) && in_array($code, $installedModules)) {
|
136 |
-
continue;
|
137 |
-
}
|
138 |
-
else if (!is_null($reqMultistore) && $reqMultistore === (int)Mage::app()->isSingleStoreMode()) {
|
139 |
-
continue;
|
140 |
-
}
|
141 |
-
else if (isset($extension['depends'])) {
|
142 |
-
$depends = array_keys((array)$extension['depends']);
|
143 |
-
|
144 |
-
if (count(array_diff($depends, $installedModules)) > 0) {
|
145 |
-
continue;
|
146 |
-
}
|
147 |
-
}
|
148 |
-
|
149 |
-
self::$_extensions[$code] = (array)$extension;
|
150 |
-
}
|
151 |
-
|
152 |
-
if (count(self::$_extensions) === 0) {
|
153 |
-
self::$_extensions = false;
|
154 |
-
}
|
155 |
-
|
156 |
-
return self::$_extensions;
|
157 |
-
}
|
158 |
-
|
159 |
-
/**
|
160 |
-
* Retrieve the title of the extension
|
161 |
-
*
|
162 |
-
* @param array $e
|
163 |
-
* @return string
|
164 |
-
*/
|
165 |
-
public function getTitle(array $e = null)
|
166 |
-
{
|
167 |
-
// Being called as a tab
|
168 |
-
if (is_null($e)) {
|
169 |
-
return $this->_getData('title');
|
170 |
-
}
|
171 |
-
|
172 |
-
return $this->_getField($e, 'title');
|
173 |
-
}
|
174 |
-
|
175 |
-
/**
|
176 |
-
* Retrieve the subtitle of the extension
|
177 |
-
*
|
178 |
-
* @param array $e
|
179 |
-
* @return string
|
180 |
-
*/
|
181 |
-
public function getSubTitle(array $e)
|
182 |
-
{
|
183 |
-
return $this->_getField($e, 'subtitle');
|
184 |
-
}
|
185 |
-
|
186 |
-
/**
|
187 |
-
* Rertrieve the URL for $e with the tracking code
|
188 |
-
*
|
189 |
-
* @param array $e
|
190 |
-
* @param string $campaign
|
191 |
-
* @param string $source
|
192 |
-
* @param string $medium
|
193 |
-
* @return string
|
194 |
-
*/
|
195 |
-
public function getTrackedUrl(array $e, $source, $content = null)
|
196 |
-
{
|
197 |
-
$term = $this->_getField($e, 'module');
|
198 |
-
|
199 |
-
$trackedUrl = sprintf(self::BASE_URL . $this->_getField($e, 'url') . self::TRACKING_STRING, $source, $this->getMedium(), $term);
|
200 |
-
|
201 |
-
if (!is_null($content)) {
|
202 |
-
$trackedUrl .= '&utm_content=' . $content;
|
203 |
-
}
|
204 |
-
|
205 |
-
return $trackedUrl;
|
206 |
-
}
|
207 |
-
|
208 |
-
/**
|
209 |
-
* Retrieve the utm_medium parameter
|
210 |
-
*
|
211 |
-
* @return string
|
212 |
-
*/
|
213 |
-
public function getMedium()
|
214 |
-
{
|
215 |
-
return $this->_getData('medium')
|
216 |
-
? $this->_getData('medium')
|
217 |
-
: 'Magento Admin';
|
218 |
-
}
|
219 |
-
|
220 |
-
/**
|
221 |
-
* Retrieve the short definition of the extension
|
222 |
-
*
|
223 |
-
* @param array $e
|
224 |
-
* @return string
|
225 |
-
*/
|
226 |
-
public function getShortDefinition(array $e)
|
227 |
-
{
|
228 |
-
return $this->_getField($e, 'short_definition');
|
229 |
-
}
|
230 |
-
|
231 |
-
/**
|
232 |
-
* Retrieve the image URL of the extension
|
233 |
-
*
|
234 |
-
* @param array $e
|
235 |
-
* @return string
|
236 |
-
*/
|
237 |
-
public function getImageUrl(array $e)
|
238 |
-
{
|
239 |
-
return self::S3_BUCKET_URL . $this->_getField($e, 'image');
|
240 |
-
}
|
241 |
-
|
242 |
-
/**
|
243 |
-
* Retrieve a field from the extension
|
244 |
-
*
|
245 |
-
* @param array $e
|
246 |
-
* @param string $field
|
247 |
-
* @return string
|
248 |
-
*/
|
249 |
-
protected function _getField(array $e, $field)
|
250 |
-
{
|
251 |
-
return $e && is_array($e) && isset($e[$field]) ? $e[$field] : '';
|
252 |
-
}
|
253 |
-
|
254 |
-
/**
|
255 |
-
* Determine wether $e is the last $e in the array
|
256 |
-
*
|
257 |
-
* @param array $e
|
258 |
-
* @return bool
|
259 |
-
*/
|
260 |
-
public function isLast(array $e)
|
261 |
-
{
|
262 |
-
return $this->_getField($e, 'last') === true;
|
263 |
-
}
|
264 |
-
|
265 |
-
/**
|
266 |
-
* Retrieve the Magento config model
|
267 |
-
*
|
268 |
-
* @return Mage_Core_Model_Config
|
269 |
-
*/
|
270 |
-
protected function _getConfig()
|
271 |
-
{
|
272 |
-
return Mage::app()->getConfig();
|
273 |
-
}
|
274 |
-
|
275 |
-
/**
|
276 |
-
* Retrieve the ID
|
277 |
-
*
|
278 |
-
* @return string
|
279 |
-
*/
|
280 |
-
public function getId()
|
281 |
-
{
|
282 |
-
if (!$this->_getData('id')) {
|
283 |
-
$this->setId('fp-extend-' . rand(1111, 9999));
|
284 |
-
}
|
285 |
-
|
286 |
-
return $this->_getData('id');
|
287 |
-
}
|
288 |
-
|
289 |
-
/**
|
290 |
-
* Retrieve the full path to the template
|
291 |
-
*
|
292 |
-
* @return string
|
293 |
-
*/
|
294 |
-
public function getTemplateFile()
|
295 |
-
{
|
296 |
-
if (($dir = $this->_getFPAdminDir()) !== false) {
|
297 |
-
return $dir . 'template' . DS . $this->getTemplate();
|
298 |
-
}
|
299 |
-
}
|
300 |
-
|
301 |
-
/**
|
302 |
-
* Set the template include path
|
303 |
-
*
|
304 |
-
* @param string $dir
|
305 |
-
* @return $this
|
306 |
-
*/
|
307 |
-
public function setScriptPath($dir)
|
308 |
-
{
|
309 |
-
$this->_viewDir = '';
|
310 |
-
|
311 |
-
return $this;
|
312 |
-
}
|
313 |
-
|
314 |
-
/**
|
315 |
-
* Retrieve any available FPAdmin directory
|
316 |
-
*
|
317 |
-
* @return false|string
|
318 |
-
*/
|
319 |
-
protected function _getFPAdminDir()
|
320 |
-
{
|
321 |
-
$candidates = array(
|
322 |
-
$this->getModule(),
|
323 |
-
'Fishpig_Wordpress',
|
324 |
-
'Fishpig_AttributeSplash',
|
325 |
-
'Fishpig_iBanners'
|
326 |
-
);
|
327 |
-
|
328 |
-
foreach(array_unique($candidates) as $candidate) {
|
329 |
-
if (!$candidate) {
|
330 |
-
continue;
|
331 |
-
}
|
332 |
-
|
333 |
-
$dir = Mage::getModuleDir('', $candidate) . DS . 'FPAdmin' . DS;
|
334 |
-
|
335 |
-
if (is_dir($dir)) {
|
336 |
-
return $dir;
|
337 |
-
}
|
338 |
-
}
|
339 |
-
|
340 |
-
return false;
|
341 |
-
}
|
342 |
-
|
343 |
-
/**
|
344 |
-
* If tab, always show
|
345 |
-
*
|
346 |
-
* @return bool
|
347 |
-
*/
|
348 |
-
public function canShowTab()
|
349 |
-
{
|
350 |
-
return true;
|
351 |
-
}
|
352 |
-
|
353 |
-
/**
|
354 |
-
* Don't hide if a tab
|
355 |
-
*
|
356 |
-
* @return bool
|
357 |
-
*/
|
358 |
-
public function isHidden()
|
359 |
-
{
|
360 |
-
return false;
|
361 |
-
}
|
362 |
-
|
363 |
-
/**
|
364 |
-
* Retrieve the tab title
|
365 |
-
*
|
366 |
-
* @return string
|
367 |
-
*/
|
368 |
-
public function getTabTitle()
|
369 |
-
{
|
370 |
-
return $this->getTabLabel();
|
371 |
-
}
|
372 |
-
|
373 |
-
/**
|
374 |
-
* Retrieve the tab label
|
375 |
-
*
|
376 |
-
* @return string
|
377 |
-
*/
|
378 |
-
public function getTabLabel()
|
379 |
-
{
|
380 |
-
return $this->_getData('tab_label');
|
381 |
-
}
|
382 |
-
|
383 |
-
/**
|
384 |
-
* Determine whether to skip generate content
|
385 |
-
*
|
386 |
-
* @return bool
|
387 |
-
*/
|
388 |
-
public function getSkipGenerateContent()
|
389 |
-
{
|
390 |
-
return true;
|
391 |
-
}
|
392 |
-
|
393 |
-
/**
|
394 |
-
* Retrieve the tab class name
|
395 |
-
*
|
396 |
-
* @return string
|
397 |
-
*/
|
398 |
-
public function getTabClass()
|
399 |
-
{
|
400 |
-
if ($this->getSkipGenerateContent()) {
|
401 |
-
return 'ajax';
|
402 |
-
}
|
403 |
-
|
404 |
-
return parent::getTabClass();
|
405 |
-
}
|
406 |
-
|
407 |
-
/**
|
408 |
-
* Retrieve the URL used to load the tab content
|
409 |
-
*
|
410 |
-
* @return string
|
411 |
-
*/
|
412 |
-
public function getTabUrl()
|
413 |
-
{
|
414 |
-
if ($tabUrl = $this->_getData('tab_url')) {
|
415 |
-
return $this->getUrl($tabUrl);
|
416 |
-
}
|
417 |
-
|
418 |
-
return '#';
|
419 |
-
}
|
420 |
-
|
421 |
-
/**
|
422 |
-
* Legacy fix that stops the HTML output from displaying
|
423 |
-
*
|
424 |
-
* @param string $fileName
|
425 |
-
* @return string
|
426 |
-
*/
|
427 |
-
public function fetchView($fileName)
|
428 |
-
{
|
429 |
-
return is_file($fileName)
|
430 |
-
? parent::fetchView($fileName)
|
431 |
-
: '';
|
432 |
-
}
|
433 |
-
|
434 |
-
/**
|
435 |
-
* Shuffle an array and preserve the keys
|
436 |
-
*
|
437 |
-
* @param array $a
|
438 |
-
* @return array
|
439 |
-
*/
|
440 |
-
public function shuffleArray(array $a)
|
441 |
-
{
|
442 |
-
$keys = array_keys($a);
|
443 |
-
|
444 |
-
shuffle($keys);
|
445 |
-
|
446 |
-
$random = array();
|
447 |
-
|
448 |
-
foreach ($keys as $key) {
|
449 |
-
$random[$key] = $a[$key];
|
450 |
-
}
|
451 |
-
|
452 |
-
return $random;
|
453 |
-
}
|
454 |
-
}
|
455 |
-
|
456 |
-
// End of compilation fix
|
457 |
-
}
|
458 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Fishpig/IBanners/FPAdmin/etc/config.xml
DELETED
@@ -1,113 +0,0 @@
|
|
1 |
-
<?xml version="1.0"?>
|
2 |
-
<config>
|
3 |
-
<fishpig>
|
4 |
-
<extend>
|
5 |
-
<Fishpig_Bolt>
|
6 |
-
<url><![CDATA[magento/extensions/full-page-cache/]]></url>
|
7 |
-
<image>bolt.png</image>
|
8 |
-
<title>Bolt</title>
|
9 |
-
<subtitle>Full Page Cache</subtitle>
|
10 |
-
<short_definition>Add enterprise level caching to Magento community with Bolt, Magento's fastest Full Page Cache extension.</short_definition>
|
11 |
-
</Fishpig_Bolt>
|
12 |
-
<Fishpig_Opti>
|
13 |
-
<url><![CDATA[magento/extensions/minify/]]></url>
|
14 |
-
<image>opti.png</image>
|
15 |
-
<title>Opti</title>
|
16 |
-
<subtitle>Minify Magento</subtitle>
|
17 |
-
<short_definition>Opti automatically minifies your HTML, CSS and Javascript and works on any server.</short_definition>
|
18 |
-
</Fishpig_Opti>
|
19 |
-
<Fishpig_NoBots>
|
20 |
-
<url><![CDATA[magento/extensions/block-robots-stop-spam/]]></url>
|
21 |
-
<image>nobots.png</image>
|
22 |
-
<title>NoBots</title>
|
23 |
-
<subtitle>Stop Magento Spam Bots</subtitle>
|
24 |
-
<short_definition>NoBots automatically blocks spam bots from your website giving you less spam and a faster server.</short_definition>
|
25 |
-
</Fishpig_NoBots>
|
26 |
-
<Fishpig_FSeo>
|
27 |
-
<url><![CDATA[magento/extensions/seo/]]></url>
|
28 |
-
<image>fseo.png</image>
|
29 |
-
<title>SEO</title>
|
30 |
-
<subtitle>Layered Navigation</subtitle>
|
31 |
-
<short_definition>Add SEO URLs to your layered navigation for Magento Categories and Splash Pages</short_definition>
|
32 |
-
</Fishpig_FSeo>
|
33 |
-
<Fishpig_CrossLink>
|
34 |
-
<url><![CDATA[magento/extensions/seo-internal-links/]]></url>
|
35 |
-
<image>crosslink.png</image>
|
36 |
-
<title>Crosslink</title>
|
37 |
-
<subtitle>SEO Internal Links</subtitle>
|
38 |
-
<short_definition>Automatically cross link your products, categories, splash pages, CMS pages, blog posts and categories using Crosslinks.</short_definition>
|
39 |
-
</Fishpig_CrossLink>
|
40 |
-
<Fishpig_AttributeSplashPro>
|
41 |
-
<url><![CDATA[magento/extensions/attribute-splash-pro/]]></url>
|
42 |
-
<image>splash-pro.png</image>
|
43 |
-
<title>AttributeSplash Pro</title>
|
44 |
-
<subtitle>SEO Landing Pages</subtitle>
|
45 |
-
<short_definition>Create SEO landing pages quickly and easily using AttributeSplash Pro. Decide which products you want to display based on multiple attribute filters, category filters and price filters.</short_definition>
|
46 |
-
</Fishpig_AttributeSplashPro>
|
47 |
-
<Fishpig_BasketShipping>
|
48 |
-
<url><![CDATA[magento/extensions/automatically-set-shipping-method/]]></url>
|
49 |
-
<image>basket-shipping.png</image>
|
50 |
-
<title>Basket Shipping</title>
|
51 |
-
<subtitle>Automatically set the Shipping Method</subtitle>
|
52 |
-
<short_definition>Automatically set the shipping method as soon as your customer hits your shopping cart.</short_definition>
|
53 |
-
</Fishpig_BasketShipping>
|
54 |
-
<Fishpig_Wordpress_Addon_Multisite>
|
55 |
-
<url><![CDATA[magento/wordpress-integration/multisite/]]></url>
|
56 |
-
<image>wordpress-multisite.png</image>
|
57 |
-
<title>WordPress Integration</title>
|
58 |
-
<subtitle>Multi-Store Blog Integration</subtitle>
|
59 |
-
<short_definition>Integrate a WordPress blog into your Magento theme in minutes with this free extension.</short_definition>
|
60 |
-
<require_multistore>1</require_multistore>
|
61 |
-
<depends><Fishpig_Wordpress /></depends>
|
62 |
-
</Fishpig_Wordpress_Addon_Multisite>
|
63 |
-
<Fishpig_Wordpress_Addon_Root>
|
64 |
-
<url><![CDATA[magento/wordpress-integration/root/]]></url>
|
65 |
-
<image>root.gif</image>
|
66 |
-
<title>Root</title>
|
67 |
-
<subtitle>Use WordPress to create your CMS pages</subtitle>
|
68 |
-
<short_definition>Remove the blog sub-directory from your integrated blog URLs.</short_definition>
|
69 |
-
<depends><Fishpig_Wordpress /></depends>
|
70 |
-
</Fishpig_Wordpress_Addon_Root>
|
71 |
-
<Fishpig_Wordpress>
|
72 |
-
<url><![CDATA[magento/wordpress-integration/]]></url>
|
73 |
-
<image>wordpress.png</image>
|
74 |
-
<title>WordPress Integration</title>
|
75 |
-
<subtitle>WordPress blog integration</subtitle>
|
76 |
-
<short_definition>Manage multiple blogs from a single WordPress Admin and integrate each blog with a different Magento store view</short_definition>
|
77 |
-
<require_multistore>0</require_multistore>
|
78 |
-
</Fishpig_Wordpress>
|
79 |
-
<Fishpig_Wordpress_Addon_CS>
|
80 |
-
<url><![CDATA[magento/wordpress-integration/customer-synchronisation/]]></url>
|
81 |
-
<image>cs.png</image>
|
82 |
-
<title>Customer Synchronisation</title>
|
83 |
-
<subtitle>Single Sign-on</subtitle>
|
84 |
-
<short_definition>Synchronise WordPress users and Magento customers and provide a single login for your customers.</short_definition>
|
85 |
-
<depends><Fishpig_Wordpress /></depends>
|
86 |
-
</Fishpig_Wordpress_Addon_CS>
|
87 |
-
<Fishpig_Wordpress_Addon_IntegratedSearch>
|
88 |
-
<url><![CDATA[magento/wordpress-integration/integrated-search/]]></url>
|
89 |
-
<image>integrated-search.png</image>
|
90 |
-
<title>Integrated Search</title>
|
91 |
-
<subtitle>Magento and WordPress search</subtitle>
|
92 |
-
<short_definition>Integrate your Magento and WordPress search systems automatically and make searching your site easier for your customers.</short_definition>
|
93 |
-
<depends><Fishpig_Wordpress /></depends>
|
94 |
-
</Fishpig_Wordpress_Addon_IntegratedSearch>
|
95 |
-
<Fishpig_AttributeSplash_Addon_XmlSitemap>
|
96 |
-
<url><![CDATA[magento/extensions/attribute-splash-pages/xml-sitemap/]]></url>
|
97 |
-
<image>splash-pages.png</image>
|
98 |
-
<title>Attribute AttributeSplash</title>
|
99 |
-
<subtitle>XML Sitemap</subtitle>
|
100 |
-
<short_definition>Add an XML sitemap for your AttributeSplash Pages and AttributeSplash Group so search engines can index your pages.</short_definition>
|
101 |
-
<depends><Fishpig_AttributeSplash /></depends>
|
102 |
-
</Fishpig_AttributeSplash_Addon_XmlSitemap>
|
103 |
-
<Fishpig_AttributeSplash_Addon_QuickCreate>
|
104 |
-
<url><![CDATA[magento/extensions/attribute-splash-pages/quick-create/]]></url>
|
105 |
-
<image>splash-pages.png</image>
|
106 |
-
<title>Attribute AttributeSplash</title>
|
107 |
-
<subtitle>Quick Create</subtitle>
|
108 |
-
<short_definition>Quickly create AttributeSplash Pages for any attributes with this extension and save yourself from hours of manual work.</short_definition>
|
109 |
-
<depends><Fishpig_AttributeSplash /></depends>
|
110 |
-
</Fishpig_AttributeSplash_Addon_QuickCreate>
|
111 |
-
</extend>
|
112 |
-
</fishpig>
|
113 |
-
</config>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Fishpig/IBanners/FPAdmin/template/large.phtml
DELETED
@@ -1,41 +0,0 @@
|
|
1 |
-
<?php
|
2 |
-
/**
|
3 |
-
*
|
4 |
-
*/
|
5 |
-
?>
|
6 |
-
<?php if ($extensions = $this->getSelectedExtensions()): ?>
|
7 |
-
<div id="<?php echo $this->getId() ?>">
|
8 |
-
<ul id="<?php echo $this->getId() ?>-list">
|
9 |
-
<?php foreach($extensions as $extension): ?>
|
10 |
-
<li class="item<?php if ($this->isLast($extension)): ?> last<?php endif; ?>">
|
11 |
-
<div class="pad">
|
12 |
-
<a href="<?php echo $this->getTrackedUrl($extension, $this->getModule(), 'image') ?>" class="image" target="_blank">
|
13 |
-
<img src="<?php echo $this->getImageUrl($extension) ?>" alt="<?php echo $this->escapeHtml($this->getTitle($extension)) ?>" />
|
14 |
-
</a>
|
15 |
-
<h2>
|
16 |
-
<a href="<?php echo $this->getTrackedUrl($extension, $this->getModule(), 'title') ?>" target="_blank">
|
17 |
-
<strong><?php echo $this->escapeHtml($this->getTitle($extension)) ?></strong>
|
18 |
-
<span><?php echo $this->escapeHtml($this->getSubTitle($extension)) ?></span>
|
19 |
-
</a>
|
20 |
-
</h2>
|
21 |
-
<p><?php echo $this->getShortDefinition($extension) ?></p>
|
22 |
-
<div><a href="<?php echo $this->getTrackedUrl($extension, $this->getModule(), 'view-more') ?>" target="_blank"><?php echo $this->__('View Add-On') ?></a></div>
|
23 |
-
</div>
|
24 |
-
</li>
|
25 |
-
<?php endforeach; ?>
|
26 |
-
</ul>
|
27 |
-
</div>
|
28 |
-
<script type="text/javascript">$('<?php echo $this->getId() ?>').select('a').invoke('writeAttribute', 'target', '_blank');</script>
|
29 |
-
<style type="text/css">
|
30 |
-
#<?php echo $this->getId() ?> { max-width: 1600px; margin: 50px auto 0; }
|
31 |
-
#<?php echo $this->getId() ?> ul { /*height: 1%; overflow: hidden; */text-align: center; }
|
32 |
-
#<?php echo $this->getId() ?> li.item { display: inline-block; width: 24.5%; }
|
33 |
-
#<?php echo $this->getId() ?> li.item .pad { padding: 10% 8%; border-right: 1px solid #ccc; }
|
34 |
-
#<?php echo $this->getId() ?> li.item.last .pad { border-right: 0px none; }
|
35 |
-
#<?php echo $this->getId() ?> li.item .image { display: block; margin-bottom: 10px; }
|
36 |
-
#<?php echo $this->getId() ?> h2 a { color: #000; text-decoration: none; font-family: Tahoma, Verdana, Arial;, }
|
37 |
-
#<?php echo $this->getId() ?> h2 strong { display: block; text-transform: uppercase; line-height: 1em; }
|
38 |
-
#<?php echo $this->getId() ?> h2 span { font-size: 70%; font-family: Georgia, 'Times New Roman'; font-style: italic; }
|
39 |
-
#<?php echo $this->getId() ?> p { min-height: 80px; }
|
40 |
-
</style>
|
41 |
-
<?php endif; ?>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Fishpig/IBanners/FPAdmin/template/small.phtml
DELETED
@@ -1,39 +0,0 @@
|
|
1 |
-
<?php
|
2 |
-
/**
|
3 |
-
*
|
4 |
-
*/
|
5 |
-
?>
|
6 |
-
<?php if ($extensions = $this->getSelectedExtensions()): ?>
|
7 |
-
<div id="<?php echo $this->getId() ?>">
|
8 |
-
<ul>
|
9 |
-
<?php foreach($extensions as $extension): ?>
|
10 |
-
<li class="item<?php if ($this->isLast($extension)): ?> last<?php endif; ?>">
|
11 |
-
<div class="pad">
|
12 |
-
<a href="<?php echo $this->getTrackedUrl($extension, $this->getModule(), 'image') ?>" class="image" target="_blank">
|
13 |
-
<img src="<?php echo $this->getImageUrl($extension) ?>" alt="" />
|
14 |
-
</a>
|
15 |
-
<h2>
|
16 |
-
<a href="<?php echo $this->getTrackedUrl($extension, $this->getModule(), 'title') ?>" target="_blank">
|
17 |
-
<strong><?php echo $this->escapeHtml($this->getTitle($extension)) ?></strong> <span><?php echo $this->escapeHtml($this->getSubTitle($extension)) ?></span>
|
18 |
-
</a>
|
19 |
-
</h2>
|
20 |
-
<p><?php echo $this->getShortDefinition($extension) ?> <a href="<?php echo $this->getTrackedUrl($extension, $this->getModule(), 'view-more') ?>" target="_blank">More info</a></p>
|
21 |
-
</div>
|
22 |
-
</li>
|
23 |
-
<?php endforeach; ?>
|
24 |
-
</ul>
|
25 |
-
</div>
|
26 |
-
<script type="text/javascript">decorateList($('<?php echo $this->getId() ?>').select('ul').first());</script>
|
27 |
-
<style type="text/css">
|
28 |
-
#<?php echo $this->getId() ?> { margin: 0; }
|
29 |
-
#<?php echo $this->getId() ?> ul { height: 1%; overflow: hidden; }
|
30 |
-
#<?php echo $this->getId() ?> li.item { margin: 0 0 10px; width: 50%; float: left; }
|
31 |
-
#<?php echo $this->getId() ?> li.item .pad {padding: 1%; height: 1%; overflow: hidden; border:1px solid #ddd; margin: 0 5px 0 0; }
|
32 |
-
#<?php echo $this->getId() ?> li.item.even .pad { margin: 0 0 0 5px; }
|
33 |
-
#<?php echo $this->getId() ?> a.image { float: left; display: block; margin-right: 10px; }
|
34 |
-
#<?php echo $this->getId() ?> a.image img { max-height: 60px; display: block; }
|
35 |
-
#<?php echo $this->getId() ?> h2 { font-size: 1.4em; font-family: Tahoma, Verdana, Arial; line-height: 1em; margin: 5px 0 2px; }
|
36 |
-
#<?php echo $this->getId() ?> h2 a { color: #000; text-decoration: none; }
|
37 |
-
#<?php echo $this->getId() ?> p { margin-bottom: 0; }
|
38 |
-
</style>
|
39 |
-
<?php endif; ?>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Fishpig/IBanners/Model/Banner.php
CHANGED
@@ -78,4 +78,16 @@ class Fishpig_iBanners_Model_Banner extends Mage_Core_Model_Abstract
|
|
78 |
|
79 |
return $this->_getData('url');
|
80 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
81 |
}
|
78 |
|
79 |
return $this->_getData('url');
|
80 |
}
|
81 |
+
|
82 |
+
/**
|
83 |
+
* Get the HTML field, process it and return it
|
84 |
+
*
|
85 |
+
* @return string
|
86 |
+
*/
|
87 |
+
public function getHtml()
|
88 |
+
{
|
89 |
+
return Mage::helper('cms')->getBlockTemplateProcessor()->filter(
|
90 |
+
$this->_getData('html')
|
91 |
+
);
|
92 |
+
}
|
93 |
}
|
app/code/community/Fishpig/IBanners/controllers/Adminhtml/IBannersController.php
CHANGED
@@ -25,8 +25,7 @@ class Fishpig_iBanners_Adminhtml_iBannersController extends Fishpig_iBanners_Con
|
|
25 |
$this->getResponse()
|
26 |
->setBody($this->getLayout()->createBlock('ibanners/adminhtml_group_grid')->toHtml());
|
27 |
}
|
28 |
-
|
29 |
-
|
30 |
/**
|
31 |
* Display the banner grid
|
32 |
*
|
@@ -37,35 +36,6 @@ class Fishpig_iBanners_Adminhtml_iBannersController extends Fishpig_iBanners_Con
|
|
37 |
->setBody($this->getLayout()->createBlock('ibanners/adminhtml_banner_grid')->toHtml());
|
38 |
}
|
39 |
|
40 |
-
/**
|
41 |
-
* Display the Extend tab
|
42 |
-
*
|
43 |
-
* @return void
|
44 |
-
*/
|
45 |
-
public function extendAction()
|
46 |
-
{
|
47 |
-
$block = $this->getLayout()
|
48 |
-
->createBlock('ibanners/adminhtml_extend')
|
49 |
-
->setModule('Fishpig_iBanners')
|
50 |
-
->setMedium('Add-On Tab')
|
51 |
-
->setTemplate('large.phtml')
|
52 |
-
->setLimit(4)
|
53 |
-
->setPreferred(array(
|
54 |
-
'Fishpig_Bolt',
|
55 |
-
'Fishpig_Opti',
|
56 |
-
'Fishpig_BasketShipping',
|
57 |
-
'Fishpig_Wordpress',
|
58 |
-
'Fishpig_CrossLink',
|
59 |
-
'Fishpig_AttributeSplashPro',
|
60 |
-
'Fishpig_NoBots'
|
61 |
-
));
|
62 |
-
|
63 |
-
$this->getResponse()
|
64 |
-
->setBody(
|
65 |
-
$block->toHtml()
|
66 |
-
);
|
67 |
-
}
|
68 |
-
|
69 |
/**
|
70 |
* Determine ACL permissions
|
71 |
*
|
25 |
$this->getResponse()
|
26 |
->setBody($this->getLayout()->createBlock('ibanners/adminhtml_group_grid')->toHtml());
|
27 |
}
|
28 |
+
|
|
|
29 |
/**
|
30 |
* Display the banner grid
|
31 |
*
|
36 |
->setBody($this->getLayout()->createBlock('ibanners/adminhtml_banner_grid')->toHtml());
|
37 |
}
|
38 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
39 |
/**
|
40 |
* Determine ACL permissions
|
41 |
*
|
app/code/community/Fishpig/IBanners/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Fishpig_iBanners>
|
5 |
-
<version>1.2.4.
|
6 |
</Fishpig_iBanners>
|
7 |
</modules>
|
8 |
<global>
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Fishpig_iBanners>
|
5 |
+
<version>1.2.4.3</version>
|
6 |
</Fishpig_iBanners>
|
7 |
</modules>
|
8 |
<global>
|
app/code/community/Fishpig/IBanners/notes.txt
CHANGED
@@ -10,6 +10,9 @@
|
|
10 |
TODO
|
11 |
- Convert animation and control values to serialised single columns
|
12 |
|
|
|
|
|
|
|
13 |
02/09/2015 - 1.2.4.2
|
14 |
- Added in url_target field.
|
15 |
|
10 |
TODO
|
11 |
- Convert animation and control values to serialised single columns
|
12 |
|
13 |
+
15/12/2015 - 1.2.4.3
|
14 |
+
- Added WYSIWYG editor the 'html' field for Banners.
|
15 |
+
|
16 |
02/09/2015 - 1.2.4.2
|
17 |
- Added in url_target field.
|
18 |
|
app/design/adminhtml/default/default/layout/ibanners.xml
CHANGED
@@ -38,7 +38,9 @@
|
|
38 |
</block>
|
39 |
</reference>
|
40 |
</adminhtml_ibanners_index>
|
|
|
41 |
<adminhtml_ibanners_group_edit>
|
|
|
42 |
<update handle="ibanners_default" />
|
43 |
<reference name="left">
|
44 |
<block type="ibanners/adminhtml_group_edit_tabs" name="group.tabs" />
|
@@ -47,7 +49,9 @@
|
|
47 |
<block type="ibanners/adminhtml_group_edit" name="groups" />
|
48 |
</reference>
|
49 |
</adminhtml_ibanners_group_edit>
|
|
|
50 |
<adminhtml_ibanners_banner_edit>
|
|
|
51 |
<update handle="ibanners_default" />
|
52 |
<reference name="left">
|
53 |
<block type="ibanners/adminhtml_banner_edit_tabs" name="banners.tabs" />
|
38 |
</block>
|
39 |
</reference>
|
40 |
</adminhtml_ibanners_index>
|
41 |
+
|
42 |
<adminhtml_ibanners_group_edit>
|
43 |
+
<update handle="editor" />
|
44 |
<update handle="ibanners_default" />
|
45 |
<reference name="left">
|
46 |
<block type="ibanners/adminhtml_group_edit_tabs" name="group.tabs" />
|
49 |
<block type="ibanners/adminhtml_group_edit" name="groups" />
|
50 |
</reference>
|
51 |
</adminhtml_ibanners_group_edit>
|
52 |
+
|
53 |
<adminhtml_ibanners_banner_edit>
|
54 |
+
<update handle="editor" />
|
55 |
<update handle="ibanners_default" />
|
56 |
<reference name="left">
|
57 |
<block type="ibanners/adminhtml_banner_edit_tabs" name="banners.tabs" />
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Fishpigs_iBanners</name>
|
4 |
-
<version>1.2.4.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://fishpig.co.uk/license.txt">FishPig EULA</license>
|
7 |
<channel>community</channel>
|
@@ -10,9 +10,9 @@
|
|
10 |
<description>Create multiple banner slideshows for your site.</description>
|
11 |
<notes>For changes, please see http://fishpig.co.uk/magento/extensions/ibanners/#changelog</notes>
|
12 |
<authors><author><name>fishpig</name><user>fishpig</user><email>ben@fishpig.co.uk</email></author></authors>
|
13 |
-
<date>2015-
|
14 |
-
<time>09:
|
15 |
-
<contents><target name="magecommunity"><dir name="Fishpig"><dir name="IBanners"><dir name="Block"><dir name="Adminhtml"><dir name="Banner"><dir name="Edit"><file name="Form.php" hash="e9cd0d7436d36048706bc474704d2b82"/><dir name="Tab"><file name="Form.php" hash="
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
18 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Fishpigs_iBanners</name>
|
4 |
+
<version>1.2.4.3</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://fishpig.co.uk/license.txt">FishPig EULA</license>
|
7 |
<channel>community</channel>
|
10 |
<description>Create multiple banner slideshows for your site.</description>
|
11 |
<notes>For changes, please see http://fishpig.co.uk/magento/extensions/ibanners/#changelog</notes>
|
12 |
<authors><author><name>fishpig</name><user>fishpig</user><email>ben@fishpig.co.uk</email></author></authors>
|
13 |
+
<date>2015-12-15</date>
|
14 |
+
<time>09:37:38</time>
|
15 |
+
<contents><target name="magecommunity"><dir name="Fishpig"><dir name="IBanners"><dir name="Block"><dir name="Adminhtml"><dir name="Banner"><dir name="Edit"><file name="Form.php" hash="e9cd0d7436d36048706bc474704d2b82"/><dir name="Tab"><file name="Form.php" hash="94a353109e8759b6bf64ed3477a8fe3a"/></dir><file name="Tabs.php" hash="60a82a390e8580594885bceb19a13460"/></dir><file name="Edit.php" hash="9dea2d655d5da6a850902ed6fc3cdee4"/><file name="Grid.php" hash="193cf462223dc0a24069c85001baf6d9"/><dir name="Helper"><file name="Image.php" hash="da1821e82b38af686705efb53f5a1ca9"/></dir></dir><file name="Banner.php" hash="181c9778d624e104ab3f8e729c58b3f7"/><file name="Dashboard.php" hash="fa629720c1f1cd1f7985d5477cf97613"/><dir name="Form"><dir name="Renderer"><file name="Useconfig.php" hash="df579ff6a4a783ed17d6c5bc6118e171"/></dir></dir><dir name="Group"><dir name="Edit"><file name="Form.php" hash="5b8f4f8649e974f80ea21de7f323788e"/><dir name="Tab"><file name="Banners.php" hash="f13f72d714e73ba5481fe488b369c879"/><file name="Form.php" hash="67ab47bbe207e41b7542cddc15401590"/></dir><file name="Tabs.php" hash="d57a68d75dde73b39127dc8a932b858e"/></dir><file name="Edit.php" hash="1f3ca94777f0eb8a3363d245d9c5bc9d"/><file name="Grid.php" hash="4f91dc562530e2713fe4bceed61bce46"/></dir><file name="Group.php" hash="6a6ea8ad3f9e1e25dcf0411fa5347b9c"/></dir><file name="View.php" hash="5dd113d04a13f11f4d267916313dc473"/></dir><dir name="Controller"><dir name="Adminhtml"><file name="Abstract.php" hash="957f54fae3c11c1981a26837365d331c"/></dir></dir><dir name="Helper"><file name="Data.php" hash="aeaa36a9c56477944b190b63442fc89d"/><file name="Image.php" hash="92a06beda3aefa58577dd91556001115"/></dir><dir name="Model"><file name="Banner.php" hash="fa6c2525df0541345d275f7e45841317"/><file name="Group.php" hash="095c22eb1f93aafb57effca8709f5338"/><dir name="Mysql4"><dir name="Banner"><file name="Collection.php" hash="511a3aceff96f430a5fa44a3a7ff2b05"/></dir><file name="Banner.php" hash="81752a0ab34bde996d9472ac67272472"/><dir name="Group"><file name="Collection.php" hash="ab6a49e01708c118052a696a0e09184c"/></dir><file name="Group.php" hash="65169f143695653cafa08a3aeca28904"/></dir><dir name="System"><dir name="Config"><dir name="Source"><dir name="Carousel"><file name="Effect.php" hash="b615ef28aa59aed914dd95a0242cfc9e"/><file name="Transition.php" hash="290f6abe41d0d44f72f8188a77f8e475"/></dir><dir name="Controls"><file name="Position.php" hash="fe9d0c6845fd0fc28603baee7b053c32"/></dir></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="IBanners"><file name="BannerController.php" hash="3cd9771b4d5d28af824e28ee39859884"/><file name="GroupController.php" hash="1883014cb46eec97e349ab1974568bd2"/></dir><file name="IBannersController.php" hash="4f166ab9cc957081e241afebc9d3d23c"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="2b7421933971edba033e7287580c3183"/><file name="config.xml" hash="c5e4d802268a99af96392f10138a58af"/><file name="system.xml" hash="e99f8867801b68adb8a0e0cd0e136685"/></dir><file name="license.txt" hash="257eae92a36bdaaf9584fbf8ba76d1c6"/><file name="notes.txt" hash="1d50aeb272a9fd02c7ebf66776de79c1"/><dir name="sql"><dir name="ibanners_setup"><file name="mysql4-install-0.1.0.php" hash="62e4961272f2d697595002b006e72731"/><file name="mysql4-upgrade-0.5.2-0.5.3.php" hash="2e85887fb121d988357a45785d9f06df"/><file name="mysql4-upgrade-0.5.4-0.5.5.php" hash="a16fd4c674ed65eed1c7cee851960d28"/><file name="mysql4-upgrade-0.5.5-0.5.6.php" hash="a002305ec4b958c7213309d874b349f8"/><file name="mysql4-upgrade-0.9.0-0.9.1.php" hash="b970018526e15b6fc938b1866c5bfd81"/><file name="mysql4-upgrade-0.9.1-0.9.2.php" hash="07ba18c243e573655e43c64ee1a0d876"/><file name="mysql4-upgrade-1.0.4-1.0.5.php" hash="7f1cb0ec0dca8a5a4cd07ea3e9444cf7"/><file name="mysql4-upgrade-1.0.5-1.0.6.php" hash="2a430094f423b90adead0fcc6defc26e"/><file name="mysql4-upgrade-1.2.4.1-1.2.4.2.php" hash="9920a17b0dd8411577f15ae37882bff2"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="ibanners.xml" hash="32e5afdb901b6cea280cc060a4724fb7"/></dir><dir name="template"><dir name="ibanners"><file name="getcode.phtml" hash="79cd6c31a32d21071fa5c7645f629053"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="ibanners.xml" hash="a68d69986eef07a540f3313cee0a0e7d"/></dir><dir name="template"><dir name="ibanners"><file name="default.phtml" hash="677f081bb8e40f62771abec88aac857c"/></dir></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="fishpig"><file name="carousel.min.js" hash="cfd7a8d08a6dca87e4211a400877716e"/></dir></dir><dir name="app"><dir name="etc"><dir name="modules"><file name="Fishpig_iBanners.xml" hash="0b9289cca030da9b13e84ab183f18892"/></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="ibanners.css" hash="f39554b3dcdaad686da4093e59b4efef"/></dir><dir name="images"><dir name="ibanners"><file name="arrow-left.png" hash="a587a6ef8ed482ce83b468b2f8b90008"/><file name="arrow-right.png" hash="001286015205ecf53766877a1d92a784"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><file name="ibanners.css" hash="328b9e66068670364e620f6e5b194ce5"/></dir></dir></dir></target></contents>
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
18 |
</package>
|