photoslurp_for_magento - Version 1.0.26

Version Notes

First stable release

Download this release

Release Info

Developer Ben Heinkel
Extension photoslurp_for_magento
Version 1.0.26
Comparing to
See all releases


Code changes from version 1.0.24 to 1.0.26

Files changed (6) hide show
  1. app/code/community/Photoslurp/PsWidget/Block/Adminhtml/Pswidget/Edit/Tab/Form3.php +8 -0
  2. app/code/community/Photoslurp/PsWidget/etc/config.xml +1 -1
  3. app/code/community/Photoslurp/PsWidget/sql/pswidget_setup/mysql4-upgrade-1.0.24-1.0.25.php +6 -0
  4. app/design/frontend/base/default/template/pswidget/tracking.phtml +1 -1
  5. app/design/frontend/base/default/template/pswidget/widget.phtml +3 -2
  6. package.xml +4 -4
app/code/community/Photoslurp/PsWidget/Block/Adminhtml/Pswidget/Edit/Tab/Form3.php CHANGED
@@ -191,6 +191,14 @@ class Photoslurp_PsWidget_Block_Adminhtml_Pswidget_Edit_Tab_Form3 extends Mage_A
191
  'after_element_html' => '<i>If specified all widget cookies will be set on given domain</i>'
192
  ));
193
 
 
 
 
 
 
 
 
 
194
  $fieldset2->addField("additional_params", "textarea", array(
195
  "label" => Mage::helper("pswidget")->__("Additional Params"),
196
  "name" => "additional_params"
191
  'after_element_html' => '<i>If specified all widget cookies will be set on given domain</i>'
192
  ));
193
 
194
+ $fieldset2->addField('bundled_jquery', 'select', array(
195
+ 'label' => Mage::helper('pswidget')->__('Bundled jQuery'),
196
+ 'values' => Photoslurp_PsWidget_Block_Adminhtml_Pswidget_Grid::getValueArrayYesNo(),
197
+ 'name' => 'bundled_jquery',
198
+ "value" => 0,
199
+ 'after_element_html' => '<i>Use the jQuery bundled version of our widget if you are not using jQuery or if we are unable to detect jQuery on your page</i>'
200
+ ));
201
+
202
  $fieldset2->addField("additional_params", "textarea", array(
203
  "label" => Mage::helper("pswidget")->__("Additional Params"),
204
  "name" => "additional_params"
app/code/community/Photoslurp/PsWidget/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Photoslurp_PsWidget>
5
- <version>1.0.24</version>
6
  </Photoslurp_PsWidget>
7
  </modules>
8
  <default>
2
  <config>
3
  <modules>
4
  <Photoslurp_PsWidget>
5
+ <version>1.0.26</version>
6
  </Photoslurp_PsWidget>
7
  </modules>
8
  <default>
app/code/community/Photoslurp/PsWidget/sql/pswidget_setup/mysql4-upgrade-1.0.24-1.0.25.php ADDED
@@ -0,0 +1,6 @@
 
 
 
 
 
 
1
+ <?php
2
+ $installer = $this;
3
+ $connection = $installer->getConnection();
4
+ $installer->startSetup();
5
+ $installer->getConnection()->addColumn($installer->getTable('pswidget/pswidget'), 'bundled_jquery', "tinyint(1) NULL");
6
+ $installer->endSetup();
app/design/frontend/base/default/template/pswidget/tracking.phtml CHANGED
@@ -20,7 +20,7 @@
20
  s=d.createElement('script');
21
  s.type='text/javascript';
22
  s.async=true;
23
- s.src='//static.photoslurp.com/widget/v1/tracking_notify.js';
24
  h.appendChild(s);
25
  }());
26
  </script>
20
  s=d.createElement('script');
21
  s.type='text/javascript';
22
  s.async=true;
23
+ s.src='//static.photoslurp.com/widget/v2/tracking_notify.js';
24
  h.appendChild(s);
25
  }());
26
  </script>
app/design/frontend/base/default/template/pswidget/widget.phtml CHANGED
@@ -222,11 +222,12 @@ foreach ($anvanced_enabled as $item){
222
  color: '<?php echo $_style_thumbnail_border_color ?>'
223
  }
224
  },
 
225
  carousel: {
226
  bg: {
227
  color: '<?php echo $_style_carousel_bg_color ?>'
228
  }
229
- },
230
  popup: {
231
  bg: {
232
  color: '<?php echo $_style_popup_bg_color ?>'
@@ -269,7 +270,7 @@ foreach ($anvanced_enabled as $item){
269
  };
270
  var script = document.createElement('script');
271
  script.async = true;
272
- script.src = '//www.photoslurp.com/static/widget/v2/widget_loader.js';
273
  var entry = document.getElementsByTagName('script')[0];
274
  entry.parentNode.insertBefore(script, entry);
275
  })();
222
  color: '<?php echo $_style_thumbnail_border_color ?>'
223
  }
224
  },
225
+ <?php if($_style_carousel_bg_color): ?>
226
  carousel: {
227
  bg: {
228
  color: '<?php echo $_style_carousel_bg_color ?>'
229
  }
230
+ },<?php endif; ?>
231
  popup: {
232
  bg: {
233
  color: '<?php echo $_style_popup_bg_color ?>'
270
  };
271
  var script = document.createElement('script');
272
  script.async = true;
273
+ script.src = '//static.photoslurp.com/widget/v2/<?php echo ($_widget -> getBundledJquery())?'widget_loader_jquery':'widget_loader';?>.js';
274
  var entry = document.getElementsByTagName('script')[0];
275
  entry.parentNode.insertBefore(script, entry);
276
  })();
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>photoslurp_for_magento</name>
4
- <version>1.0.24</version>
5
  <stability>stable</stability>
6
  <license>OSL-v3</license>
7
  <channel>community</channel>
@@ -25,9 +25,9 @@ Learn more about Photoslurp&#x2019;s visual commerce and marketing platform at w
25
  </description>
26
  <notes>First stable release</notes>
27
  <authors><author><name>Ben Heinkel</name><user>benheinkel</user><email>ben@photoslurp.com</email></author></authors>
28
- <date>2017-04-04</date>
29
- <time>13:49:18</time>
30
- <contents><target name="magecommunity"><dir name="Photoslurp"><dir name="PsWidget"><dir name="Block"><dir name="Adminhtml"><file name="PsWidgetbackend.php" hash="b0b408f4f1073b2aed8f39df3c0d9d7c"/><dir name="Pswidget"><dir name="Edit"><file name="Form.php" hash="07056712bfb2df959976073610745765"/><dir name="Tab"><file name="Form.php" hash="8a02818e2b8e28aea613e6c3d3b650f5"/><file name="Form1.php" hash="50898da40c8a990d8a5e619d6045f220"/><file name="Form2.php" hash="1e92b67f6378787f5e0065fa59596cae"/><file name="Form3.php" hash="b99ac02a6939bb42a8fbbc96ee5b5f90"/></dir><file name="Tabs.php" hash="5dbfd05fa55c50acbe54834c26dc97b1"/></dir><file name="Edit.php" hash="b333a1cf1ca6aaac74df4ef91cd51e75"/><file name="Grid.php" hash="a6776b5283ac806f3f520307b49886ee"/></dir><file name="Pswidget.php" hash="ae5c762b95a3620c863014ead2c51fa9"/></dir><file name="Widget.php" hash="cdb9316fb49a3b386dd8653ae9bab10d"/></dir><dir name="Helper"><file name="Data.php" hash="17803c49800b8107cfe0c9dde2dad7c8"/></dir><dir name="Model"><file name="Cron.php" hash="8634109090eb32142677af5b89a64fad"/><dir name="Mysql4"><dir name="Pswidget"><file name="Collection.php" hash="ee7e2a99a9e6c38ff163878514cac4b4"/></dir><file name="Pswidget.php" hash="547b6cc9aa1172d7671c0978cc48af0d"/><dir name="Pswidgetlang"><file name="Collection.php" hash="4570b57b1392c018f3bb22747eddd026"/></dir><file name="Pswidgetlang.php" hash="d1569f8430700adbc5489a4770d81672"/></dir><file name="Pswidget.php" hash="c963bd2ffa02f7e97894e3cadc974ad5"/><file name="Pswidgetlang.php" hash="9a40bda5f3695b8725283d3095558c2e"/><dir name="Source"><file name="Export.php" hash="203d9c552e3a0e8b829d13ca83b44fa6"/><file name="Store.php" hash="1f20d8f385d0fabaca4b3af5cd3924c6"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Pswidget"><file name="PswidgetController.php" hash="7f395e4e0238a72a11a107ff0433a93b"/><file name="PswidgetbackendController.php" hash="db19f4de2bba7974148df71f9461c031"/></dir></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="edcf078f0341d62edb7513350fd0c9a7"/><file name="config.xml" hash="a94331a5d8e471620b2389c982a973d8"/><file name="system.xml" hash="303d0134618b143e81ed8daa7171e911"/></dir><dir name="sql"><dir name="pswidget_setup"><file name="mysql4-install-1.0.0.php" hash="0a7842e9b9d63ca47b69e4fb838216f9"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="58a54f4673f2d3adaa99d257c5a12123"/><file name="mysql4-upgrade-1.0.1-1.0.2.php" hash="4f8d333b80208a1d2274b212d571ef13"/><file name="mysql4-upgrade-1.0.10-1.0.11.php" hash="27a8126cd27372a57d37342e9baff14e"/><file name="mysql4-upgrade-1.0.17-1.0.18.php" hash="adbb0ea0357d1a55d8004d18bf6b34d4"/><file name="mysql4-upgrade-1.0.2-1.0.3.php" hash="26da4479c7dd5c7438bb6493ed13bbc9"/><file name="mysql4-upgrade-1.0.21-1.0.22.php" hash="4eb1a7b1657bc66aeeaa447639582993"/><file name="mysql4-upgrade-1.0.23-1.0.24.php" hash="b86117d2db849466f666851bde50723c"/><file name="mysql4-upgrade-1.0.4-1.0.5.php" hash="974aeac2421feaf1875eff5202c01f71"/><file name="mysql4-upgrade-1.0.5-1.0.6.php" hash="76e05edf7eef2702df21ad463983d129"/><file name="mysql4-upgrade-1.0.6-1.0.7.php" hash="f41bf19ff684ba4cefbba479022d82cc"/><file name="mysql4-upgrade-1.0.8-1.0.9.php" hash="80469dfc31ac50b80c82264e3a5b21e8"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="pswidget.xml" hash="fcbd9b296b1a153c1cdbdc39cb79eeec"/></dir><dir name="template"><dir name="pswidget"><file name="pswidgetbackend.phtml" hash="384a53871152aa8495f83f940ecac9f7"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="pswidget.xml" hash="fb35c29a3fa177282a438f53ad8c377d"/></dir><dir name="template"><dir name="pswidget"><file name="style.phtml" hash="7fbdab2088119db02ebaa0d36d526b14"/><file name="tracking.phtml" hash="db0b2a3e0c7ce48dd0a348e1672e0559"/><file name="widget.phtml" hash="96b6c9c36cf8ee6d904bb66fa2467d74"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Photoslurp_PsWidget.xml" hash="d7596ef6fa89cd0424cdb8cae80a2910"/></dir></target><target name="mageweb"><dir name="js"><dir name="photoslurp"><file name="admin.js" hash="de32022ef0b9a76e3a0c76d3735f2d1c"/></dir></dir></target></contents>
31
  <compatible/>
32
  <dependencies><required><php><min>5.2.0</min><max>7.0.0</max></php></required></dependencies>
33
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>photoslurp_for_magento</name>
4
+ <version>1.0.26</version>
5
  <stability>stable</stability>
6
  <license>OSL-v3</license>
7
  <channel>community</channel>
25
  </description>
26
  <notes>First stable release</notes>
27
  <authors><author><name>Ben Heinkel</name><user>benheinkel</user><email>ben@photoslurp.com</email></author></authors>
28
+ <date>2017-04-13</date>
29
+ <time>20:40:03</time>
30
+ <contents><target name="magecommunity"><dir name="Photoslurp"><dir name="PsWidget"><dir name="Block"><dir name="Adminhtml"><file name="PsWidgetbackend.php" hash="b0b408f4f1073b2aed8f39df3c0d9d7c"/><dir name="Pswidget"><dir name="Edit"><file name="Form.php" hash="07056712bfb2df959976073610745765"/><dir name="Tab"><file name="Form.php" hash="8a02818e2b8e28aea613e6c3d3b650f5"/><file name="Form1.php" hash="50898da40c8a990d8a5e619d6045f220"/><file name="Form2.php" hash="1e92b67f6378787f5e0065fa59596cae"/><file name="Form3.php" hash="b6aa6d83c6fd44ff1d179b8fe5c99937"/></dir><file name="Tabs.php" hash="5dbfd05fa55c50acbe54834c26dc97b1"/></dir><file name="Edit.php" hash="b333a1cf1ca6aaac74df4ef91cd51e75"/><file name="Grid.php" hash="a6776b5283ac806f3f520307b49886ee"/></dir><file name="Pswidget.php" hash="ae5c762b95a3620c863014ead2c51fa9"/></dir><file name="Widget.php" hash="cdb9316fb49a3b386dd8653ae9bab10d"/></dir><dir name="Helper"><file name="Data.php" hash="17803c49800b8107cfe0c9dde2dad7c8"/></dir><dir name="Model"><file name="Cron.php" hash="8634109090eb32142677af5b89a64fad"/><dir name="Mysql4"><dir name="Pswidget"><file name="Collection.php" hash="ee7e2a99a9e6c38ff163878514cac4b4"/></dir><file name="Pswidget.php" hash="547b6cc9aa1172d7671c0978cc48af0d"/><dir name="Pswidgetlang"><file name="Collection.php" hash="4570b57b1392c018f3bb22747eddd026"/></dir><file name="Pswidgetlang.php" hash="d1569f8430700adbc5489a4770d81672"/></dir><file name="Pswidget.php" hash="c963bd2ffa02f7e97894e3cadc974ad5"/><file name="Pswidgetlang.php" hash="9a40bda5f3695b8725283d3095558c2e"/><dir name="Source"><file name="Export.php" hash="203d9c552e3a0e8b829d13ca83b44fa6"/><file name="Store.php" hash="1f20d8f385d0fabaca4b3af5cd3924c6"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Pswidget"><file name="PswidgetController.php" hash="7f395e4e0238a72a11a107ff0433a93b"/><file name="PswidgetbackendController.php" hash="db19f4de2bba7974148df71f9461c031"/></dir></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="edcf078f0341d62edb7513350fd0c9a7"/><file name="config.xml" hash="736baf1a01ca6dd59d8491f09d083d3a"/><file name="system.xml" hash="303d0134618b143e81ed8daa7171e911"/></dir><dir name="sql"><dir name="pswidget_setup"><file name="mysql4-install-1.0.0.php" hash="0a7842e9b9d63ca47b69e4fb838216f9"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="58a54f4673f2d3adaa99d257c5a12123"/><file name="mysql4-upgrade-1.0.1-1.0.2.php" hash="4f8d333b80208a1d2274b212d571ef13"/><file name="mysql4-upgrade-1.0.10-1.0.11.php" hash="27a8126cd27372a57d37342e9baff14e"/><file name="mysql4-upgrade-1.0.17-1.0.18.php" hash="adbb0ea0357d1a55d8004d18bf6b34d4"/><file name="mysql4-upgrade-1.0.2-1.0.3.php" hash="26da4479c7dd5c7438bb6493ed13bbc9"/><file name="mysql4-upgrade-1.0.21-1.0.22.php" hash="4eb1a7b1657bc66aeeaa447639582993"/><file name="mysql4-upgrade-1.0.23-1.0.24.php" hash="b86117d2db849466f666851bde50723c"/><file name="mysql4-upgrade-1.0.24-1.0.25.php" hash="0efc4a42362628c2f113126173bc3413"/><file name="mysql4-upgrade-1.0.4-1.0.5.php" hash="974aeac2421feaf1875eff5202c01f71"/><file name="mysql4-upgrade-1.0.5-1.0.6.php" hash="76e05edf7eef2702df21ad463983d129"/><file name="mysql4-upgrade-1.0.6-1.0.7.php" hash="f41bf19ff684ba4cefbba479022d82cc"/><file name="mysql4-upgrade-1.0.8-1.0.9.php" hash="80469dfc31ac50b80c82264e3a5b21e8"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="pswidget.xml" hash="fcbd9b296b1a153c1cdbdc39cb79eeec"/></dir><dir name="template"><dir name="pswidget"><file name="pswidgetbackend.phtml" hash="384a53871152aa8495f83f940ecac9f7"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="pswidget.xml" hash="fb35c29a3fa177282a438f53ad8c377d"/></dir><dir name="template"><dir name="pswidget"><file name="style.phtml" hash="7fbdab2088119db02ebaa0d36d526b14"/><file name="tracking.phtml" hash="8b7f9745b84d81336460ee286fcd7ae0"/><file name="widget.phtml" hash="a0620657a46ce19c072b0c4b5d2d06b0"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Photoslurp_PsWidget.xml" hash="d7596ef6fa89cd0424cdb8cae80a2910"/></dir></target><target name="mageweb"><dir name="js"><dir name="photoslurp"><file name="admin.js" hash="de32022ef0b9a76e3a0c76d3735f2d1c"/></dir></dir></target></contents>
31
  <compatible/>
32
  <dependencies><required><php><min>5.2.0</min><max>7.0.0</max></php></required></dependencies>
33
  </package>