Menu
▾
▴
xoops-svn
|
From: <be...@us...> - 2013-02-06 09:33:59
|
Revision: 10999
http://sourceforge.net/p/xoops/svn/10999
Author: beckmi
Date: 2013-02-06 09:33:52 +0000 (Wed, 06 Feb 2013)
Log Message:
-----------
updating for voltan to 2.34
Modified Paths:
--------------
XoopsModules/oledrion/branches/voltan/oledrion/admin/about.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/categories.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/dashboard.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/discounts.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/files.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/gateways.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/lists.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/lowstock.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/manufacturers.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/newsletter.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/orders.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/products.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/property.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/texts.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/vat.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/vendors.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/admin_footer.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/admin_header.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/dbupdate.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/exports/csv.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/exports/dbase.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/exports/export.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/functions.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/gateway.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/gateway.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/language/english/main.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/language/french/main.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/index.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/menu.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/productsselector.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/tablefunctions.php
XoopsModules/oledrion/branches/voltan/oledrion/ajax.php
XoopsModules/oledrion/branches/voltan/oledrion/all-lists.php
XoopsModules/oledrion/branches/voltan/oledrion/all-products.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_best_sales.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_block_tag.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_cart.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_categories.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_categoy_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_mostviewed_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_my_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_new.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_promotion.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_random.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_random_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_rated.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_recent_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_recentlysold.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_recommended.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_top.php
XoopsModules/oledrion/branches/voltan/oledrion/caddy.php
XoopsModules/oledrion/branches/voltan/oledrion/cancel-payment.php
XoopsModules/oledrion/branches/voltan/oledrion/categories-map.php
XoopsModules/oledrion/branches/voltan/oledrion/category.php
XoopsModules/oledrion/branches/voltan/oledrion/cgv.php
XoopsModules/oledrion/branches/voltan/oledrion/changelog.php
XoopsModules/oledrion/branches/voltan/oledrion/checkout.php
XoopsModules/oledrion/branches/voltan/oledrion/class/PEAR.php
XoopsModules/oledrion/branches/voltan/oledrion/class/PEAR5.php
XoopsModules/oledrion/branches/voltan/oledrion/class/PersistableObjectHandler.php
XoopsModules/oledrion/branches/voltan/oledrion/class/classheader.php
XoopsModules/oledrion/branches/voltan/oledrion/class/lite.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_caddy.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_caddy_attributes.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_cat.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_commands.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_currency.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_discounts.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_files.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_gateways.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_gateways_options.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_handlers.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_manufacturer.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_parameters.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_persistent_cart.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_plugins.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_products_list.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_productsmanu.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_reductions.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_related.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_shelf.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_shelf_parameters.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_utils.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_vat.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_vendors.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_votedata.php
XoopsModules/oledrion/branches/voltan/oledrion/class/registryfile.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/fonts/Font_GDF.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/fonts/Font_TTF.class.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_delete.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_edit.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_new.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_post.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_reply.php
XoopsModules/oledrion/branches/voltan/oledrion/config.php
XoopsModules/oledrion/branches/voltan/oledrion/docs/changelog.txt
XoopsModules/oledrion/branches/voltan/oledrion/docs/licence.txt
XoopsModules/oledrion/branches/voltan/oledrion/download.php
XoopsModules/oledrion/branches/voltan/oledrion/extra/modules/rss/plugins/rssfit.oledrion.php
XoopsModules/oledrion/branches/voltan/oledrion/extra/modules/sitemap/plugins/oledrion.php
XoopsModules/oledrion/branches/voltan/oledrion/gateway-notify.php
XoopsModules/oledrion/branches/voltan/oledrion/header.php
XoopsModules/oledrion/branches/voltan/oledrion/images/cartadd.png
XoopsModules/oledrion/branches/voltan/oledrion/include/comment_functions.php
XoopsModules/oledrion/branches/voltan/oledrion/include/common.php
XoopsModules/oledrion/branches/voltan/oledrion/include/functions.php
XoopsModules/oledrion/branches/voltan/oledrion/include/notification.inc.php
XoopsModules/oledrion/branches/voltan/oledrion/include/plugin.tag.php
XoopsModules/oledrion/branches/voltan/oledrion/include/product_search_form.php
XoopsModules/oledrion/branches/voltan/oledrion/include/search.inc.php
XoopsModules/oledrion/branches/voltan/oledrion/index.php
XoopsModules/oledrion/branches/voltan/oledrion/invoice.php
XoopsModules/oledrion/branches/voltan/oledrion/js/css/prettyPhoto.css
XoopsModules/oledrion/branches/voltan/oledrion/js/css/ui-lightness/jquery-ui-1.7.1.custom.css
XoopsModules/oledrion/branches/voltan/oledrion/js/jquery/jquery.js
XoopsModules/oledrion/branches/voltan/oledrion/js/jquery.swfobject/jquery.swfobject.min.js
XoopsModules/oledrion/branches/voltan/oledrion/js/prettyphoto/DD_belatedPNG_0.0.7a-min.js
XoopsModules/oledrion/branches/voltan/oledrion/js/prettyphoto/jquery.prettyPhoto.js
XoopsModules/oledrion/branches/voltan/oledrion/js/tablesorter/jquery.tablesorter.min.js
XoopsModules/oledrion/branches/voltan/oledrion/js/validate/jquery.validate.js
XoopsModules/oledrion/branches/voltan/oledrion/js/validate/jquery.validate.min.js
XoopsModules/oledrion/branches/voltan/oledrion/js/validate/jquery.validate.pack.js
XoopsModules/oledrion/branches/voltan/oledrion/js/validate/localization/messages_it.js
XoopsModules/oledrion/branches/voltan/oledrion/language/english/admin.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english.old/admin.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english.old/blocks.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/addtocart.png
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/addtowishlist.png
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/admin.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/blocks.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/mail_template/command_client.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/mail_template/command_shop.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/mail_template/command_shop_verified.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/main.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/modinfo.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/style.css
XoopsModules/oledrion/branches/voltan/oledrion/list.php
XoopsModules/oledrion/branches/voltan/oledrion/list.tag.php
XoopsModules/oledrion/branches/voltan/oledrion/manufacturer.php
XoopsModules/oledrion/branches/voltan/oledrion/media.php
XoopsModules/oledrion/branches/voltan/oledrion/mime/magic
XoopsModules/oledrion/branches/voltan/oledrion/mime/magic.mime
XoopsModules/oledrion/branches/voltan/oledrion/my-lists.php
XoopsModules/oledrion/branches/voltan/oledrion/notification_update.php
XoopsModules/oledrion/branches/voltan/oledrion/paypal-notify.php
XoopsModules/oledrion/branches/voltan/oledrion/plugins/actions/newelements/plugins.php
XoopsModules/oledrion/branches/voltan/oledrion/plugins/models/oledrion_action.php
XoopsModules/oledrion/branches/voltan/oledrion/plugins/models/oledrion_filter.php
XoopsModules/oledrion/branches/voltan/oledrion/product.php
XoopsModules/oledrion/branches/voltan/oledrion/rate-product.php
XoopsModules/oledrion/branches/voltan/oledrion/recommended.php
XoopsModules/oledrion/branches/voltan/oledrion/rss.php
XoopsModules/oledrion/branches/voltan/oledrion/search.php
XoopsModules/oledrion/branches/voltan/oledrion/sql/mysql.sql
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_bestsales.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_cart.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_categories.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_category_lists.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_mostviewed_lists.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_my_lists.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_new.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_promotion.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_random.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_random_lists.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_rated.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_recent_lists.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_recentlysold.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_recommended.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_top.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_admin_discounts.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_all_lists.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_allproducts.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_bill.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_caddy.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_cancelpurchase.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_categories_list.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_category.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_cgv.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_chunk.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_command.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_index.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_list.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_manufacturer.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_map.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_mylists.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_product.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_productsselector.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_rate_product.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_recommended.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_search.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_thankyou.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_whoswho.html
XoopsModules/oledrion/branches/voltan/oledrion/thankyou.php
XoopsModules/oledrion/branches/voltan/oledrion/view.tag.php
XoopsModules/oledrion/branches/voltan/oledrion/whoswho.php
XoopsModules/oledrion/branches/voltan/oledrion/xoops_version.php
Added Paths:
-----------
XoopsModules/oledrion/branches/voltan/oledrion/.directory
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/gateway.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/english/
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/english/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/english/main.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/persian/
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/persian/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/persian/main.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/nusoap.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24.tar.gz
XoopsModules/oledrion/branches/voltan/oledrion/blocks/.directory
XoopsModules/oledrion/branches/voltan/oledrion/css/
XoopsModules/oledrion/branches/voltan/oledrion/css/autocomplete.css
XoopsModules/oledrion/branches/voltan/oledrion/css/index.html
XoopsModules/oledrion/branches/voltan/oledrion/css/oledrion.css
XoopsModules/oledrion/branches/voltan/oledrion/css/print.css
XoopsModules/oledrion/branches/voltan/oledrion/css/validate.css
XoopsModules/oledrion/branches/voltan/oledrion/images/addtocart.png
XoopsModules/oledrion/branches/voltan/oledrion/js/autocomplete.js
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/addtocart.png
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/addtowishlist.png
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/admin.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/blocks.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/index.html
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/mail_template/
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/mail_template/command_client.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/mail_template/command_client_cancel.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/mail_template/command_client_verified.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/mail_template/command_shop.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/mail_template/command_shop_cancel.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/mail_template/command_shop_failed.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/mail_template/command_shop_fraud.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/mail_template/command_shop_pending.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/mail_template/command_shop_verified.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/mail_template/global_newcategory_notify.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/mail_template/global_newproduct_notify.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/mail_template/index.html
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/mail_template/shop_lowstock.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/main.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/messages.js
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/modinfo.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/newsletter.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/style.css
XoopsModules/oledrion/branches/voltan/oledrion/templates/.directory
XoopsModules/oledrion/branches/voltan/oledrion/templates/admin/
XoopsModules/oledrion/branches/voltan/oledrion/templates/admin/index.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/admin/oledrion_order_print.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_caddy1.html
Removed Paths:
-------------
XoopsModules/oledrion/branches/voltan/oledrion/include/oledrion.css
XoopsModules/oledrion/branches/voltan/oledrion/lang.diff
XoopsModules/oledrion/branches/voltan/oledrion/licence.txt
XoopsModules/oledrion/branches/voltan/oledrion/pdf/
XoopsModules/oledrion/branches/voltan/oledrion/plugins/filters/
XoopsModules/oledrion/branches/voltan/oledrion/style.css
Added: XoopsModules/oledrion/branches/voltan/oledrion/.directory
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/.directory (rev 0)
+++ XoopsModules/oledrion/branches/voltan/oledrion/.directory 2013-02-06 09:33:52 UTC (rev 10999)
@@ -0,0 +1,3 @@
+[Dolphin]
+Timestamp=2013,1,20,23,22,20
+Version=3
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/about.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/about.php 2013-02-06 09:00:59 UTC (rev 10998)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/about.php 2013-02-06 09:33:52 UTC (rev 10999)
@@ -1,29 +1,29 @@
-<?php
-/**
- * Birthday module
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright The XOOPS Project (http://www.xoops.org)
- * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
- * @package birthday
- * @since 2.5.0
- * @author XOOPS Module Team
- * @version $Id $
- **/
-
-include_once dirname(__FILE__) . '/admin_header.php';
-
-xoops_cp_header();
-
-$aboutAdmin = new ModuleAdmin();
-
-echo $aboutAdmin->addNavigation('about.php');
-echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
-
+<?php
+/**
+ * Birthday module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project (http://www.xoops.org)
+ * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
+ * @package birthday
+ * @since 2.5.0
+ * @author XOOPS Module Team
+ * @version $Id $
+ **/
+
+include_once dirname(__FILE__) . '/admin_header.php';
+
+xoops_cp_header();
+
+$aboutAdmin = new ModuleAdmin();
+
+echo $aboutAdmin->addNavigation('about.php');
+echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
+
include 'admin_footer.php';
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php 2013-02-06 09:00:59 UTC (rev 10998)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php 2013-02-06 09:33:52 UTC (rev 10999)
@@ -182,7 +182,7 @@
if(isset($pagenav) && is_object($pagenav)) {
echo "<div align='right'>".$pagenav->renderNav()."</div>";
}
- include_once 'admin_footer.php';
+ include_once OLEDRION_ADMIN_PATH . 'admin_footer.php';
break;
// ****************************************************************************************************************
@@ -243,7 +243,7 @@
echo "<tr>\n";
}
echo '</table>';
- include_once 'admin_footer.php';
+ include_once OLEDRION_ADMIN_PATH . 'admin_footer.php';
}
break;
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/categories.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/categories.php 2013-02-06 09:00:59 UTC (rev 10998)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/categories.php 2013-02-06 09:33:52 UTC (rev 10999)
@@ -2,7 +2,7 @@
/**
* ****************************************************************************
* oledrion - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
+ * Copyright (c) Hervé Thouzard (http://www.herve-thouzard.com/)
*
* You may not change or alter any portion of this comment or credits
* of supporting developers from this source code or any supporting source code
@@ -11,23 +11,23 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
- * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
+ * @copyright Hervé Thouzard (http://www.herve-thouzard.com/)
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package oledrion
- * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com/)
+ * @author Hervé Thouzard (http://www.herve-thouzard.com/)
*
* Version : $Id:
* ****************************************************************************
*/
/**
- * Gestion des cat\xE9gories de produits
+ * Gestion des catégories de produits
*/
if(!defined("OLEDRION_ADMIN")) exit();
switch($action) {
// ****************************************************************************************************************
- case 'default': // Liste des cat\xE9gories
+ case 'default': // Liste des catégories
// ****************************************************************************************************************
xoops_cp_header();
oledrion_adminMenu(3);
@@ -82,7 +82,7 @@
$sform->addElement($button_tray);
$sform = oledrion_utils::formMarkRequiredFields($sform);
$sform->display();
- include_once 'admin_footer.php';
+ include_once OLEDRION_ADMIN_PATH . 'admin_footer.php';
break;
@@ -98,8 +98,8 @@
break;
// ****************************************************************************************************************
- case 'add': // Ajout d'une cat\xE9gorie
- case 'edit': // Edition d'une cat\xE9gorie
+ case 'add': // Ajout d'une catégorie
+ case 'edit': // Edition d'une catégorie
// ****************************************************************************************************************
xoops_cp_header();
oledrion_adminMenu(3);
@@ -175,12 +175,12 @@
$sform = oledrion_utils::formMarkRequiredFields($sform);
$sform->display();
- include_once 'admin_footer.php';
+ include_once OLEDRION_ADMIN_PATH . 'admin_footer.php';
break;
// ****************************************************************************************************************
- case 'saveedit': // Sauvegarde d'une cat\xE9gorie
+ case 'saveedit': // Sauvegarde d'une catégorie
// ****************************************************************************************************************
xoops_cp_header();
$id = isset($_POST['cat_cid']) ? intval($_POST['cat_cid']) : 0;
@@ -220,8 +220,8 @@
if($res) {
oledrion_utils::updateCache();
if($add) {
- $plugins = oledrion_plugins::getInstance();
- $plugins->fireAction(oledrion_plugins::EVENT_ON_CATEGORY_CREATE, new oledrion_parameters(array('category' => $item)));
+ //$plugins = oledrion_plugins::getInstance();
+ //$plugins->fireAction(oledrion_plugins::EVENT_ON_CATEGORY_CREATE, new oledrion_parameters(array('category' => $item)));
}
oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl.'?op='.$opRedirect, 2);
} else {
@@ -231,7 +231,7 @@
// ****************************************************************************************************************
- case 'delete': // Suppression d'une cat\xE9gorie
+ case 'delete': // Suppression d'une catégorie
// ****************************************************************************************************************
xoops_cp_header();
oledrion_adminMenu(3);
@@ -250,7 +250,7 @@
// ****************************************************************************************************************
- case 'confdelete': //Suppression effective d'une cat\xE9gorie
+ case 'confdelete': //Suppression effective d'une catégorie
// ****************************************************************************************************************
xoops_cp_header();
$id = isset($_POST['id']) ? intval($_POST['id']) : 0;
@@ -258,7 +258,7 @@
oledrion_utils::redirect(_AM_OLEDRION_ERROR_1, $baseurl, 5);
}
$opRedirect = 'categories';
- // On v\xE9rifie que cette cat\xE9gorie (et ses sous-cat\xE9gories) ne sont pas utilis\xE9es par des produits
+ // On vérifie que cette catégorie (et ses sous-catégories) ne sont pas utilisées par des produits
$cnt = $h_oledrion_cat->getCategoryProductsCount($id);
if($cnt == 0) {
$item = null;
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/dashboard.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/dashboard.php 2013-02-06 09:00:59 UTC (rev 10998)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/dashboard.php 2013-02-06 09:33:52 UTC (rev 10999)
@@ -2,7 +2,7 @@
/**
* ****************************************************************************
...
[truncated message content] |
|
From: <be...@us...> - 2013-02-07 09:35:27
|
Revision: 11005
http://sourceforge.net/p/xoops/svn/11005
Author: beckmi
Date: 2013-02-07 09:35:22 +0000 (Thu, 07 Feb 2013)
Log Message:
-----------
updates from Voltan (see changelog)
Modified Paths:
--------------
XoopsModules/oledrion/branches/voltan/oledrion/docs/changelog.txt
XoopsModules/oledrion/branches/voltan/oledrion/include/product_search_form.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/blocks.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/main.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/modinfo.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/main.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/modinfo.php
XoopsModules/oledrion/branches/voltan/oledrion/xoops_version.php
Added Paths:
-----------
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_ajax_search.php
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_ajax_search.html
Added: XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_ajax_search.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_ajax_search.php (rev 0)
+++ XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_ajax_search.php 2013-02-07 09:35:22 UTC (rev 11005)
@@ -0,0 +1,52 @@
+<?php
+/**
+ * ****************************************************************************
+ * oledrion - MODULE FOR XOOPS
+ * Copyright (c) Hervé Thouzard (http://www.herve-thouzard.com/)
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright Hossein Azizabadi
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package oledrion
+ * @author Hossein Azizabadi
+ *
+ * Version : $Id:
+ * ****************************************************************************
+ */
+
+ /**
+ * block to display ajax search
+ */
+function b_oledrion_ajax_search_show($options)
+{
+ global $xoTheme;
+
+ if($options[0] == 1) {
+ $xoTheme->addScript("browse.php?Frameworks/jquery/jquery.js");
+ $xoTheme->addScript(XOOPS_URL . '/modules/oledrion/js/autocomplete.js');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/oledrion/css/autocomplete.css');
+ }
+
+ $block = array();
+ $block['custom'] = $options[0];
+ return $block;
+}
+
+function b_oledrion__ajax_search_edit($options)
+{
+ $form = '';
+ $checkeds = array('','');
+ $checkeds[$options[0]] = 'checked';
+ $form .= "<table border='0'>";
+ $form .= '<tr><td>'._MB_OLEDRION_USE_STYLE_JS."</td><td><input type='radio' name='options[]' id='options[]' value='0' ".$checkeds[0]." />"._NO." <input type='radio' name='options[]' id='options[]' value='1' ".$checkeds[1]." />"._YES.'</td></tr>';
+ $form .= '</table>';
+ return $form;
+}
+?>
+
Modified: XoopsModules/oledrion/branches/voltan/oledrion/docs/changelog.txt
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/docs/changelog.txt 2013-02-07 08:49:53 UTC (rev 11004)
+++ XoopsModules/oledrion/branches/voltan/oledrion/docs/changelog.txt 2013-02-07 09:35:22 UTC (rev 11005)
@@ -1,9 +1,15 @@
---------------------------------------
2.34
---------------------------------------
-- Add Ajax search ( ajax.php css/autocomplete.css js/autocomplete.js ) (voltan)
-- improve search ( search.php include/product_search_form.php) (voltan)
-- improve gateway ( checkout.php admin/gateways/gateway.php ) (voltan)
+- Add Ajax search system and block (voltan)
+- Improve search (voltan)
+- Improve gateway ( checkout.php admin/gateways/gateway.php ) (voltan)
+- Fix errors in admin and user side (voltan)
+- Remove Cache Lite (voltan)
+- Support php 5.4.11 and mysql 5.5.28 (voltan)
+- convert all files to utf-8 (voltan)
+- json output for products and categoresy (voltan)
+- improve admin order page (voltan)
---------------------------------------
2.33 Beta 1 2012-07-23
Modified: XoopsModules/oledrion/branches/voltan/oledrion/include/product_search_form.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/include/product_search_form.php 2013-02-07 08:49:53 UTC (rev 11004)
+++ XoopsModules/oledrion/branches/voltan/oledrion/include/product_search_form.php 2013-02-07 09:35:22 UTC (rev 11005)
@@ -33,52 +33,56 @@
$sform->addElement(new XoopsFormText(_OLEDRION_TEXT,'product_text', 50, 255, ''), false);
$sform->addElement(new XoopsFormSelectMatchOption(_OLEDRION_TYPE, 'search_type', 3), false);
-// Sélecteur de catégories ****************************************************
-$categorySelect = new XoopsFormSelect(_OLEDRION_CATEGORY, 'product_category', 0);
-$treeObject = new Oledrion_XoopsObjectTree($categories, 'cat_cid', 'cat_pid');
-$tree = $treeObject->makeTreeAsArray('cat_title', '-', 0, _OLEDRION_ALL_CATEGORIES);
-$categorySelect->addOptionArray($tree);
-$sform->addElement($categorySelect, false);
+// Sélecteur de catégories ****************************************************
+if(oledrion_utils::getModuleOption('search_category')) {
+ $categorySelect = new XoopsFormSelect(_OLEDRION_CATEGORY, 'product_category', 0);
+ $treeObject = new Oledrion_XoopsObjectTree($categories, 'cat_cid', 'cat_pid');
+ $tree = $treeObject->makeTreeAsArray('cat_title', '-', 0, _OLEDRION_ALL_CATEGORIES);
+ $categorySelect->addOptionArray($tree);
+ $sform->addElement($categorySelect, false);
+}
-// By voltan
// Sélecteur pour les fabricants *************************************************
-/*
-$authorSelect = new XoopsFormSelect(_OLEDRION_MANUFACTURER, 'product_manufacturers', 0, 5, true);
-$tblTmp = array();
-$tblTmp[0] = _OLEDRION_ALL_MANUFACTURERS;
-foreach($manufacturers as $item) {
- $tblTmp[$item->getVar('manu_id')] = $item->getVar('manu_commercialname').' '.$item->getVar('manu_name');
+if(oledrion_utils::getModuleOption('search_manufacturers')) {
+ $authorSelect = new XoopsFormSelect(_OLEDRION_MANUFACTURER, 'product_manufacturers', 0, 5, true);
+ $tblTmp = array();
+ $tblTmp[0] = _OLEDRION_ALL_MANUFACTURERS;
+ foreach($manufacturers as $item) {
+ $tblTmp[$item->getVar('manu_id')] = $item->getVar('manu_commercialname').' '.$item->getVar('manu_name');
+ }
+ $authorSelect->addOptionArray($tblTmp);
+ $sform->addElement($authorSelect, false);
}
-$authorSelect->addOptionArray($tblTmp);
-$sform->addElement($authorSelect, false);
-*/
// Sélecteur pour les vendeurs *************************************************
-/*
-$languageSelect = new XoopsFormSelect(_OLEDRION_VENDOR, 'product_vendors', 0, 1, false);
-$tblTmp = array();
-$tblTmp[0] = _OLEDRION_ALL_VENDORS;
-foreach($vendors as $item) {
- $tblTmp[$item->getVar('vendor_id')] = $item->getVar('vendor_name');
-}
-$languageSelect->addOptionArray($tblTmp);
-$sform->addElement($languageSelect, false);
-*/
+if(oledrion_utils::getModuleOption('search_vendors')) {
+ $languageSelect = new XoopsFormSelect(_OLEDRION_VENDOR, 'product_vendors', 0, 1, false);
+ $tblTmp = array();
+ $tblTmp[0] = _OLEDRION_ALL_VENDORS;
+ foreach($vendors as $item) {
+ $tblTmp[$item->getVar('vendor_id')] = $item->getVar('vendor_name');
+ }
+ $languageSelect->addOptionArray($tblTmp);
+ $sform->addElement($languageSelect, false);
+}
+
//
-$sform->addElement(new XoopsFormText(_OLEDRION_FROM,'product_from', 10, 10, ''), false);
-$sform->addElement(new XoopsFormText(_OLEDRION_TO,'product_to', 10, 10, ''), false);
+if(oledrion_utils::getModuleOption('search_price')) {
+ $sform->addElement(new XoopsFormText(_OLEDRION_FROM,'product_from', 10, 10, ''), false);
+ $sform->addElement(new XoopsFormText(_OLEDRION_TO,'product_to', 10, 10, ''), false);
+}
+//
+if(oledrion_utils::getModuleOption('search_stocks')) {
+ $stockselect = new XoopsFormSelect(_OLEDRION_QUANTITYS, 'product_stock', 1);
+ $stockselect->addOption(1,_OLEDRION_QUANTITYALL);
+ $stockselect->addOption(2,_OLEDRION_QUANTITY1);
+ $stockselect->addOption(0,_OLEDRION_QUANTITY2);
+ $sform->addElement($stockselect, false);
+}
-$stockselect = new XoopsFormSelect(_OLEDRION_QUANTITYS, 'product_stock', 1);
-$stockselect->addOption(1,_OLEDRION_QUANTITYALL);
-$stockselect->addOption(2,_OLEDRION_QUANTITY1);
-$stockselect->addOption(0,_OLEDRION_QUANTITY2);
-$sform->addElement($stockselect, false);
-
-
-
//
-if(oledrion_utils::getModuleOption('product_property1')) {
+if(oledrion_utils::getModuleOption('search_property1') && oledrion_utils::getModuleOption('product_property1')) {
$property1select = new XoopsFormSelect(_OLEDRION_PRODUCT_PROPERTY1, 'product_property1', '');
$property1Array = explode('|',oledrion_utils::getModuleOption('product_property1'));
foreach( $property1Array as $property1 ) {
@@ -86,8 +90,9 @@
}
$sform->addElement($property1select, false);
}
-
-if(oledrion_utils::getModuleOption('product_property2')) {
+
+//
+if(oledrion_utils::getModuleOption('search_property2') && oledrion_utils::getModuleOption('product_property2')) {
$property2select = new XoopsFormSelect(_OLEDRION_PRODUCT_PROPERTY2, 'product_property2', '');
$property2Array = explode('|',oledrion_utils::getModuleOption('product_property2'));
foreach( $property2Array as $property2 ) {
@@ -95,8 +100,9 @@
}
$sform->addElement($property2select, false);
}
-
-if(oledrion_utils::getModuleOption('product_property3')) {
+
+//
+if(oledrion_utils::getModuleOption('search_property3') && oledrion_utils::getModuleOption('product_property3')) {
$property3select = new XoopsFormSelect(_OLEDRION_PRODUCT_PROPERTY3, 'product_property3', '');
$property3Array = explode('|',oledrion_utils::getModuleOption('product_property3'));
foreach( $property3Array as $property3 ) {
@@ -104,8 +110,9 @@
}
$sform->addElement($property3select, false);
}
-
-if(oledrion_utils::getModuleOption('product_property4')) {
+
+//
+if(oledrion_utils::getModuleOption('search_property4') && oledrion_utils::getModuleOption('product_property4')) {
$property4select = new XoopsFormSelect(_OLEDRION_PRODUCT_PROPERTY4, 'product_property4', '');
$property4Array = explode('|',oledrion_utils::getModuleOption('product_property4'));
foreach( $property4Array as $property4 ) {
@@ -113,9 +120,9 @@
}
$sform->addElement($property4select, false);
}
-// By voltan
-/*
-if(oledrion_utils::getModuleOption('product_property5')) {
+
+//
+if(oledrion_utils::getModuleOption('search_property5') && oledrion_utils::getModuleOption('product_property5')) {
$property5select = new XoopsFormSelect(_OLEDRION_PRODUCT_PROPERTY4, 'product_property5', '');
$property5Array = explode('|',oledrion_utils::getModuleOption('product_property5'));
foreach( $property5Array as $property5 ) {
@@ -123,7 +130,7 @@
}
$sform->addElement($property5select, false);
}
-*/
+
$sform->addElement(new XoopsFormHidden('op', 'go'));
$button_tray = new XoopsFormElementTray('' ,'');
Modified: XoopsModules/oledrion/branches/voltan/oledrion/language/english/blocks.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/english/blocks.php 2013-02-07 08:49:53 UTC (rev 11004)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/english/blocks.php 2013-02-07 09:35:22 UTC (rev 11005)
@@ -38,5 +38,6 @@
define("_MB_OLEDRION_THIS_MONTH", "This month only?");
define("_MB_OLEDRION_LISTS_COUNT", "Maximum count of lists to display");
define("_MB_OLEDRION_LISTS_TYPE", "Lists of the type");
-define("_MB_OLEDRION_SEE_ALL_LISTS", "See all lists");
+define("_MB_OLEDRION_SEE_ALL_LISTS", "See all lists");
+define("_MB_OLEDRION_USE_STYLE_JS", "Use module style/js ?");
?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/language/english/main.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/english/main.php 2013-02-07 08:49:53 UTC (rev 11004)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/english/main.php 2013-02-07 09:35:22 UTC (rev 11005)
@@ -283,5 +283,18 @@
define("_OLEDRION_PLUGINS_ERROR_1","Error, unknown event: %s");
//2.32
+define("_OLEDRION_ECOTAXE","EcoTax");
+
+//2.34
+define('_OLEDRION_PRODUCT_PROPERTY1', "Property 1");
+define('_OLEDRION_PRODUCT_PROPERTY2', "Property 2");
+define('_OLEDRION_PRODUCT_PROPERTY3', "Property 3");
+define('_OLEDRION_PRODUCT_PROPERTY4', "Property 4");
+define('_OLEDRION_PRODUCT_PROPERTY5', "Property 5");
+define('_OLEDRION_FROM', "From");
+define('_OLEDRION_TO', "To");
-define("_OLEDRION_ECOTAXE","EcoTax");
+define("_OLEDRION_QUANTITYS","Quantitys");
+define("_OLEDRION_QUANTITYALL","All");
+define("_OLEDRION_QUANTITY1","Available");
+define("_OLEDRION_QUANTITY2","Not available");
Modified: XoopsModules/oledrion/branches/voltan/oledrion/language/english/modinfo.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/english/modinfo.php 2013-02-07 08:49:53 UTC (rev 11004)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/english/modinfo.php 2013-02-07 09:35:22 UTC (rev 11005)
@@ -41,7 +41,8 @@
define("_MI_OLEDRION_BNAME12","My lists");
define("_MI_OLEDRION_BNAME13","Lists of the current category");
define("_MI_OLEDRION_BNAME14","Random lists");
-define("_MI_OLEDRION_BNAME15","Most viewed lists");
+define("_MI_OLEDRION_BNAME15","Most viewed lists");
+define("_MI_OLEDRION_BNAME16","Ajax search");
// Sub menu titles
define("_MI_OLEDRION_SMNAME1","Shopping cart");
@@ -229,4 +230,20 @@
define("_MI_OLEDRION_BNAME12_DESC",'Shows user lists');
define("_MI_OLEDRION_BNAME13_DESC",'Shows recent public lists according to the current category');
define("_MI_OLEDRION_BNAME14_DESC",'Shows random lists');
-define("_MI_OLEDRION_BNAME15_DESC",'Shows most viewed lists');
\ No newline at end of file
+define("_MI_OLEDRION_BNAME15_DESC",'Shows most viewed lists');
+define("_MI_OLEDRION_BNAME16_DESC",'Shows ajax search form');
+
+define("_MI_OLEDRION_SEARCH_CATEGORY",'Show category');
+define("_MI_OLEDRION_SEARCH_MANUFACTURERS",'Show Manufacturers');
+define("_MI_OLEDRION_SEARCH_VENDORS",'Show vendors');
+define("_MI_OLEDRION_SEARCH_PRICE",'Show price');
+define("_MI_OLEDRION_SEARCH_STOCKS",'Show stocks');
+define("_MI_OLEDRION_SEARCH_PROPERTY1",'Show property 1');
+define("_MI_OLEDRION_SEARCH_PROPERTY2",'Show property 2');
+define("_MI_OLEDRION_SEARCH_PROPERTY3",'Show property 3');
+define("_MI_OLEDRION_SEARCH_PROPERTY4",'Show property 4');
+define("_MI_OLEDRION_SEARCH_PROPERTY5",'Show property 5');
+
+define("_MI_OLEDRION_BREAK_COMMENT_NOTIFICATION",'Comments and Notifications');
+define("_MI_OLEDRION_BREAK_SEARCH",'Search');
+define("_MI_OLEDRION_BREAK_IMAGE",'Image');
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/main.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/persian/main.php 2013-02-07 08:49:53 UTC (rev 11004)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/persian/main.php 2013-02-07 09:35:22 UTC (rev 11005)
@@ -283,7 +283,11 @@
define("_OLEDRION_PRODUCTS_COUNT", "%u محصول");
define("_OLEDRION_PLUGINS_ERROR_1", "خطا, رویداد ناشناس: %s");
-
+
+//2.32
+define("_OLEDRION_ECOTAXE","EcoTax");
+
+//2.34
define('_OLEDRION_PRODUCT_PROPERTY1', "جنسیت");
define('_OLEDRION_PRODUCT_PROPERTY2', "نوع عطر");
define('_OLEDRION_PRODUCT_PROPERTY3', "رایحه");
Modified: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/modinfo.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/persian/modinfo.php 2013-02-07 08:49:53 UTC (rev 11004)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/persian/modinfo.php 2013-02-07 09:35:22 UTC (rev 11005)
@@ -42,6 +42,7 @@
define("_MI_OLEDRION_BNAME13","فهرست های شاخه فعلی");
define("_MI_OLEDRION_BNAME14","فهرست های تصادفی");
define("_MI_OLEDRION_BNAME15","فهرست های پر بازدید");
+define("_MI_OLEDRION_BNAME16","Ajax search");
// Sub menu titles
define("_MI_OLEDRION_SMNAME1","سبد خرید");
@@ -222,4 +223,19 @@
define("_MI_OLEDRION_BNAME13_DESC",'Shows recent public lists according to the current category');
define("_MI_OLEDRION_BNAME14_DESC",'Shows random lists');
define("_MI_OLEDRION_BNAME15_DESC",'Shows most viewed lists');
+
+define("_MI_OLEDRION_SEARCH_CATEGORY",'Show category');
+define("_MI_OLEDRION_SEARCH_MANUFACTURERS",'Show Manufacturers');
+define("_MI_OLEDRION_SEARCH_VENDORS",'Show vendors');
+define("_MI_OLEDRION_SEARCH_PRICE",'Show price');
+define("_MI_OLEDRION_SEARCH_STOCKS",'Show stocks');
+define("_MI_OLEDRION_SEARCH_PROPERTY1",'Show property 1');
+define("_MI_OLEDRION_SEARCH_PROPERTY2",'Show property 2');
+define("_MI_OLEDRION_SEARCH_PROPERTY3",'Show property 3');
+define("_MI_OLEDRION_SEARCH_PROPERTY4",'Show property 4');
+define("_MI_OLEDRION_SEARCH_PROPERTY5",'Show property 5');
+
+define("_MI_OLEDRION_BREAK_COMMENT_NOTIFICATION",'Comments and Notifications');
+define("_MI_OLEDRION_BREAK_SEARCH",'Search');
+define("_MI_OLEDRION_BREAK_IMAGE",'Image');
?>
\ No newline at end of file
Added: XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_ajax_search.html
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_ajax_search.html (rev 0)
+++ XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_ajax_search.html 2013-02-07 09:35:22 UTC (rev 11005)
@@ -0,0 +1,13 @@
+<{if $block.custom}>
+<script type="text/javascript">
+$(function(){
+ setAutoComplete("searchField", "results", "<{$smarty.const.OLEDRION_URL}>/ajax.php?op=search&part=");
+});
+</script>
+<{/if}>
+<div id="ajax_search">
+ <div id="auto" class="ajax_search_item">
+ <input id="searchField" name="searchField" type="text">
+ <div style="position: absolute; width: 304px;" id="results"></div>
+ </div>
+</div>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/xoops_version.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/xoops_version.php 2013-02-07 08:49:53 UTC (rev 11004)
+++ XoopsModules/oledrion/branches/voltan/oledrion/xoops_version.php 2013-02-07 09:35:22 UTC (rev 11005)
@@ -259,7 +259,19 @@
$modversion['blocks'][$cptb]['show_func'] = 'b_oledrion_mostviewed_lists_show';
$modversion['blocks'][$cptb]['edit_func'] = 'b_oledrion__mostviewed_lists_edit';
$modversion['blocks'][$cptb]['options'] = '10|0'; // Nombre maximum de listes à voir, Type de listes (0 = les 2, 1 = liste cadeaux, 2 = produits recommandés)
-$modversion['blocks'][$cptb]['template'] = 'oledrion_block_mostviewed_lists.html';
+$modversion['blocks'][$cptb]['template'] = 'oledrion_block_mostviewed_lists.html';
+
+/**
+ * Ajax search
+ */
+$cptb++;
+$modversion['blocks'][$cptb]['file'] = 'oledrion_ajax_search.php';
+$modversion['blocks'][$cptb]['name'] = _MI_OLEDRION_BNAME16;
+$modversion['blocks'][$cptb]['description'] = _MI_OLEDRION_BNAME16_DESC;
+$modversion['blocks'][$cptb]['show_func'] = 'b_oledrion_ajax_search_show';
+$modversion['blocks'][$cptb]['edit_func'] = 'b_oledrion__ajax_search_edit';
+$modversion['blocks'][$cptb]['options'] = '1';
+$modversion['blocks'][$cptb]['template'] = 'oledrion_block_ajax_search.html';
/*
@@ -901,6 +913,84 @@
$modversion['config'][$cpto]['default'] = 0;
/**
+ * Multiply Shipping by product's quantity ?
+ */
+$cpto++;
+$modversion['config'][$cpto]['name'] = 'shipping_quantity';
+$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_SHIPPING_QUANTITY';
+$modversion['config'][$cpto]['description'] = '';
+$modversion['config'][$cpto]['formtype'] = 'yesno';
+$modversion['config'][$cpto]['valuetype'] = 'int';
+$modversion['config'][$cpto]['default'] = 1;
+
+/**
+ * Use tags ?
+ */
+$cpto++;
+$modversion['config'][$cpto]['name'] = 'use_tags';
+$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_USE_TAGS';
+$modversion['config'][$cpto]['description'] = '';
+$modversion['config'][$cpto]['formtype'] = 'yesno';
+$modversion['config'][$cpto]['valuetype'] = 'int';
+$modversion['config'][$cpto]['default'] = 0;
+
+/**
+ * Ask for VAT number ?
+ * @since 2.3.2009.03.09
+ */
+$cpto++;
+$modversion['config'][$cpto]['name'] = 'ask_vatnumber';
+$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_ASK_VAT_NUMBER';
+$modversion['config'][$cpto]['description'] = '';
+$modversion['config'][$cpto]['formtype'] = 'yesno';
+$modversion['config'][$cpto]['valuetype'] = 'int';
+$modversion['config'][$cpto]['default'] = 0;
+
+/**
+ * Use stocks in products attributes ?
+ * @since 2.3.2009.03.11
+ */
+$cpto++;
+$modversion['config'][$cpto]['name'] = 'attributes_stocks';
+$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_USE_STOCK_ATTRIBUTES';
+$modversion['config'][$cpto]['description'] = '';
+$modversion['config'][$cpto]['formtype'] = 'yesno';
+$modversion['config'][$cpto]['valuetype'] = 'int';
+$modversion['config'][$cpto]['default'] = 1;
+
+$cpto++;
+$modversion['config'][$cpto]['name'] = 'index_colums';
+$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_COLUMNS_INDEX';
+$modversion['config'][$cpto]['description'] = '';
+$modversion['config'][$cpto]['formtype'] = 'textbox';
+$modversion['config'][$cpto]['valuetype'] = 'int';
+$modversion['config'][$cpto]['default'] = 1;
+
+$cpto++;
+$modversion['config'][$cpto]['name'] = 'catagory_colums';
+$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_COLUMNS_CATEGORY';
+$modversion['config'][$cpto]['description'] = '';
+$modversion['config'][$cpto]['formtype'] = 'textbox';
+$modversion['config'][$cpto]['valuetype'] = 'int';
+$modversion['config'][$cpto]['default'] = 1;
+
+$cpto++;
+$modversion['config'][$cpto]['name'] = 'max_products';
+$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_ADAPTED_LIST';
+$modversion['config'][$cpto]['description'] = '';
+$modversion['config'][$cpto]['formtype'] = 'textbox';
+$modversion['config'][$cpto]['valuetype'] = 'int';
+$modversion['config'][$cpto]['default'] = 200;
+
+$cpto++;
+$modversion['config'][$cpto]['name'] = 'break' . $cpto;
+$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_BREAK_IMAGE';
+$modversion['config'][$cpto]['description'] = '';
+$modversion['config'][$cpto]['formtype'] = 'line_break';
+$modversion['config'][$cpto]['valuetype'] = 'textbox';
+$modversion['config'][$cpto]['default'] = 'head';
+
+/**
* Do you want to automatically resize the main picture of each product ?
*/
$cpto++;
@@ -977,77 +1067,103 @@
$modversion['config'][$cpto]['description'] = '';
$modversion['config'][$cpto]['formtype'] = 'yesno';
$modversion['config'][$cpto]['valuetype'] = 'int';
-$modversion['config'][$cpto]['default'] = 0;
-
-/**
- * Multiply Shipping by product's quantity ?
- */
+$modversion['config'][$cpto]['default'] = 0;
+
$cpto++;
-$modversion['config'][$cpto]['name'] = 'shipping_quantity';
-$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_SHIPPING_QUANTITY';
+$modversion['config'][$cpto]['name'] = 'break' . $cpto;
+$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_BREAK_SEARCH';
$modversion['config'][$cpto]['description'] = '';
+$modversion['config'][$cpto]['formtype'] = 'line_break';
+$modversion['config'][$cpto]['valuetype'] = 'textbox';
+$modversion['config'][$cpto]['default'] = 'head';
+
+$cpto++;
+$modversion['config'][$cpto]['name'] = 'search_category';
+$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_SEARCH_CATEGORY';
+$modversion['config'][$cpto]['description'] = '';
$modversion['config'][$cpto]['formtype'] = 'yesno';
$modversion['config'][$cpto]['valuetype'] = 'int';
-$modversion['config'][$cpto]['default'] = 1;
-
-/**
- * Use tags ?
- */
+$modversion['config'][$cpto]['default'] = 1;
+
$cpto++;
-$modversion['config'][$cpto]['name'] = 'use_tags';
-$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_USE_TAGS';
+$modversion['config'][$cpto]['name'] = 'search_manufacturers';
+$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_SEARCH_MANUFACTURERS';
$modversion['config'][$cpto]['description'] = '';
$modversion['config'][$cpto]['formtype'] = 'yesno';
$modversion['config'][$cpto]['valuetype'] = 'int';
-$modversion['config'][$cpto]['default'] = 0;
-
-/**
- * Ask for VAT number ?
- * @since 2.3.2009.03.09
- */
+$modversion['config'][$cpto]['default'] = 1;
+
$cpto++;
-$modversion['config'][$cpto]['name'] = 'ask_vatnumber';
-$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_ASK_VAT_NUMBER';
+$modversion['config'][$cpto]['name'] = 'search_vendors';
+$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_SEARCH_VENDORS';
$modversion['config'][$cpto]['description'] = '';
$modversion['config'][$cpto]['formtype'] = 'yesno';
$modversion['config'][$cpto]['valuetype'] = 'int';
-$modversion['config'][$cpto]['default'] = 0;
-
-/**
- * Use stocks in products attributes ?
- * @since 2.3.2009.03.11
- */
+$modversion['config'][$cpto]['default'] = 1;
+
$cpto++;
-$modversion['config'][$cpto]['name'] = 'attributes_stocks';
-$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_USE_STOCK_ATTRIBUTES';
+$modversion['config'][$cpto]['name'] = 'search_price';
+$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_SEARCH_PRICE';
$modversion['config'][$cpto]['description'] = '';
$modversion['config'][$cpto]['formtype'] = 'yesno';
$modversion['config'][$cpto]['valuetype'] = 'int';
-$modversion['config'][$cpto]['default'] = 1;
-
+$modversion['config'][$cpto]['default'] = 1;
+
$cpto++;
-$modversion['config'][$cpto]['name'] = 'index_colums';
-$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_COLUMNS_INDEX';
+$modversion['config'][$cpto]['name'] = 'search_stocks';
+$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_SEARCH_STOCKS';
$modversion['config'][$cpto]['description'] = '';
-$modversion['config'][$cpto]['formtype'] = 'textbox';
+$modversion['config'][$cpto]['formtype'] = 'yesno';
$modversion['config'][$cpto]['valuetype'] = 'int';
-$modversion['config'][$cpto]['default'] = 1;
-
+$modversion['config'][$cpto]['default'] = 1;
+
$cpto++;
-$modversion['config'][$cpto]['name'] = 'catagory_colums';
-$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_COLUMNS_CATEGORY';
+$modversion['config'][$cpto]['name'] = 'search_property1';
+$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_SEARCH_PROPERTY1';
$modversion['config'][$cpto]['description'] = '';
-$modversion['config'][$cpto]['formtype'] = 'textbox';
+$modversion['config'][$cpto]['formtype'] = 'yesno';
$modversion['config'][$cpto]['valuetype'] = 'int';
+$modversion['config'][$cpto]['default'] = 1;
+
+$cpto++;
+$modversion['config'][$cpto]['name'] = 'search_property2';
+$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_SEARCH_PROPERTY2';
+$modversion['config'][$cpto]['description'] = '';
+$modversion['config'][$cpto]['formtype'] = 'yesno';
+$modversion['config'][$cpto]['valuetype'] = 'int';
+$modversion['config'][$cpto]['default'] = 1;
+
+$cpto++;
+$modversion['config'][$cpto]['name'] = 'search_property3';
+$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_SEARCH_PROPERTY3';
+$modversion['config'][$cpto]['description'] = '';
+$modversion['config'][$cpto]['formtype'] = 'yesno';
+$modversion['config'][$cpto]['valuetype'] = 'int';
+$modversion['config'][$cpto]['default'] = 1;
+
+$cpto++;
+$modversion['config'][$cpto]['name'] = 'search_property4';
+$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_SEARCH_PROPERTY4';
+$modversion['config'][$cpto]['description'] = '';
+$modversion['config'][$cpto]['formtype'] = 'yesno';
+$modversion['config'][$cpto]['valuetype'] = 'int';
+$modversion['config'][$cpto]['default'] = 1;
+
+$cpto++;
+$modversion['config'][$cpto]['name'] = 'search_property5';
+$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_SEARCH_PROPERTY5';
+$modversion['config'][$cpto]['description'] = '';
+$modversion['config'][$cpto]['formtype'] = 'yesno';
+$modversion['config'][$cpto]['valuetype'] = 'int';
$modversion['config'][$cpto]['default'] = 1;
-
+
$cpto++;
-$modversion['config'][$cpto]['name'] = 'max_products';
-$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_ADAPTED_LIST';
+$modversion['config'][$cpto]['name'] = 'break' . $cpto;
+$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_BREAK_COMMENT_NOTIFICATION';
$modversion['config'][$cpto]['description'] = '';
-$modversion['config'][$cpto]['formtype'] = 'textbox';
-$modversion['config'][$cpto]['valuetype'] = 'int';
-$modversion['config'][$cpto]['default'] = 200;
+$modversion['config'][$cpto]['formtype'] = 'line_break';
+$modversion['config'][$cpto]['valuetype'] = 'textbox';
+$modversion['config'][$cpto]['default'] = 'head';
// ************************************************************************************************
// ************************* Hidden settings ******************************************************
@@ -1125,7 +1241,8 @@
$modversion['config'][$cpto]['title'] = '_MI_OLEDRION_PRODUCT_PROPERTY5';
$modversion['config'][$cpto]['description'] = '';
$modversion['config'][$cpto]['formtype'] = 'hidden';
-$modversion['config'][$cpto]['valuetype'] = 'text';
+$modversion['config'][$cpto]['valuetype'] = 'text';
+
// ************************************************************************************************
// Notifications **********************************************************************************
|
|
From: <vo...@us...> - 2013-02-07 15:10:45
|
Revision: 11006
http://sourceforge.net/p/xoops/svn/11006
Author: voltan1
Date: 2013-02-07 15:10:40 +0000 (Thu, 07 Feb 2013)
Log Message:
-----------
Remove old files
Modified Paths:
--------------
XoopsModules/oledrion/branches/voltan/oledrion/ajax.php
Removed Paths:
-------------
XoopsModules/oledrion/branches/voltan/oledrion/.directory
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24.tar.gz
XoopsModules/oledrion/branches/voltan/oledrion/blocks/.directory
XoopsModules/oledrion/branches/voltan/oledrion/language/english.old/
XoopsModules/oledrion/branches/voltan/oledrion/language/englishUTF8/
XoopsModules/oledrion/branches/voltan/oledrion/language/french/
XoopsModules/oledrion/branches/voltan/oledrion/language/frenchUTF8/
XoopsModules/oledrion/branches/voltan/oledrion/language/persian_old/
XoopsModules/oledrion/branches/voltan/oledrion/templates/.directory
Deleted: XoopsModules/oledrion/branches/voltan/oledrion/.directory
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/.directory 2013-02-07 09:35:22 UTC (rev 11005)
+++ XoopsModules/oledrion/branches/voltan/oledrion/.directory 2013-02-07 15:10:40 UTC (rev 11006)
@@ -1,3 +0,0 @@
-[Dolphin]
-Timestamp=2013,1,20,23,22,20
-Version=3
Deleted: XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24.tar.gz
===================================================================
(Binary files differ)
Modified: XoopsModules/oledrion/branches/voltan/oledrion/ajax.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/ajax.php 2013-02-07 09:35:22 UTC (rev 11005)
+++ XoopsModules/oledrion/branches/voltan/oledrion/ajax.php 2013-02-07 15:10:40 UTC (rev 11006)
@@ -131,7 +131,7 @@
$items[$i]['title'] = $row['title'];
$items[$i]['type'] = 'product';
$items[$i]['link'] = XOOPS_URL . '/modules/oledrion/product.php?product_id=' . $row['id'];
- $items[$i]['image'] = XOOPS_URL . '/uploads/' . $row['image'];
+ $items[$i]['image'] = OLEDRION_PICTURES_URL . '/' . $row['image'];
//$items[$i]['price'] = oledrion_utils::getTTC($row['price']);
$category = $h_oledrion_cat->get($row['cid']);
$items[$i]['cat_cid'] = $category->getVar('cat_cid');
@@ -145,7 +145,7 @@
$items[$i]['title'] = $row['title'];
$items[$i]['type'] = 'cat';
$items[$i]['link'] = XOOPS_URL . '/modules/oledrion/category.php?cat_cid=' . $row['id'];
- $items[$i]['image'] = XOOPS_URL . '/uploads/' . $row['image'];
+ $items[$i]['image'] = OLEDRION_PICTURES_URL . '/' . $row['image'];
$items[$i]['price'] = '';
$i++;
}
Deleted: XoopsModules/oledrion/branches/voltan/oledrion/blocks/.directory
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/blocks/.directory 2013-02-07 09:35:22 UTC (rev 11005)
+++ XoopsModules/oledrion/branches/voltan/oledrion/blocks/.directory 2013-02-07 15:10:40 UTC (rev 11006)
@@ -1,4 +0,0 @@
-[Dolphin]
-Timestamp=2012,12,17,20,59,29
-Version=3
-ViewMode=2
Deleted: XoopsModules/oledrion/branches/voltan/oledrion/templates/.directory
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/templates/.directory 2013-02-07 09:35:22 UTC (rev 11005)
+++ XoopsModules/oledrion/branches/voltan/oledrion/templates/.directory 2013-02-07 15:10:40 UTC (rev 11006)
@@ -1,4 +0,0 @@
-[Dolphin]
-Timestamp=2012,12,10,23,8,56
-Version=3
-ViewMode=2
|
|
From: <vo...@us...> - 2013-02-16 11:02:57
|
Revision: 11056
http://sourceforge.net/p/xoops/svn/11056
Author: voltan1
Date: 2013-02-16 11:02:52 +0000 (Sat, 16 Feb 2013)
Log Message:
-----------
Improve module
Modified Paths:
--------------
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/dashboard.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/orders.php
XoopsModules/oledrion/branches/voltan/oledrion/templates/admin/oledrion_order_print.html
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/dashboard.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/dashboard.php 2013-02-15 23:11:35 UTC (rev 11055)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/dashboard.php 2013-02-16 11:02:52 UTC (rev 11056)
@@ -32,8 +32,20 @@
oledrion_adminMenu(0);
oledrion_utils::htitle(_MI_OLEDRION_ADMENU10, 4);
$indexAdmin = new ModuleAdmin();
+ $indexAdmin->addConfigBoxLine(OLEDRION_UPLOAD_PATH, 'folder');
+ $indexAdmin->addConfigBoxLine(array(OLEDRION_UPLOAD_PATH, '777'), 'chmod');
+ $indexAdmin->addConfigBoxLine(OLEDRION_ATTACHED_FILES_PATH, 'folder');
+ $indexAdmin->addConfigBoxLine(array(OLEDRION_ATTACHED_FILES_PATH, '777'), 'chmod');
+ $indexAdmin->addConfigBoxLine(OLEDRION_PICTURES_PATH, 'folder');
+ $indexAdmin->addConfigBoxLine(array(OLEDRION_PICTURES_PATH, '777'), 'chmod');
+ $indexAdmin->addConfigBoxLine(OLEDRION_CSV_PATH, 'folder');
+ $indexAdmin->addConfigBoxLine(array(OLEDRION_CSV_PATH, '777'), 'chmod');
+ $indexAdmin->addConfigBoxLine(OLEDRION_CACHE_PATH, 'folder');
+ $indexAdmin->addConfigBoxLine(array(OLEDRION_CACHE_PATH, '777'), 'chmod');
+
echo $indexAdmin->addNavigation('index.php');
echo $indexAdmin->renderIndex();
+
$itemsCount = 5; // Nombre d'éléments à afficher
if($h_oledrion_products->getCount() > 0) {
echo "<table border='0' width='100%' cellpadding='2' cellspacing='2'>";
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/orders.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/orders.php 2013-02-15 23:11:35 UTC (rev 11055)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/orders.php 2013-02-16 11:02:52 UTC (rev 11056)
@@ -233,7 +233,10 @@
foreach($caddy as $itemCaddy) {
$productForTemplate = $tblJoin = $productManufacturers = $productAttributes = array();
$product = $products[$itemCaddy->getVar('caddy_product_id')];
- $productForTemplate = $product->toArray(); // Produit
+ $productForTemplate = $product->toArray(); // Produit
+ // Get cat title
+ $cat = $h_oledrion_cat->get($productForTemplate['product_cid'])->toArray();
+ $productForTemplate['product_cat_title'] = $cat['cat_title'];
// Est-ce qu'il y a des attributs ?
if($handlers->h_oledrion_caddy_attributes->getAttributesCountForCaddy($itemCaddy->getVar('caddy_id')) > 0) {
$productAttributes = $handlers->h_oledrion_caddy_attributes->getFormatedAttributesForCaddy($itemCaddy->getVar('caddy_id'), $product);
@@ -260,11 +263,11 @@
}
$productForTemplate['product_caddy']['caddy_price_t'] = $oledrion_Currency->amountForDisplay($discount);
$xoopsTpl->append('products', $productForTemplate);
- /*
+ /*
echo '<pre>';
print_r($productForTemplate);
echo '</pre>';
- */
+ */
}
$order = $order->toArray();
$xoopsTpl->assign('order', $order);
Modified: XoopsModules/oledrion/branches/voltan/oledrion/templates/admin/oledrion_order_print.html
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/templates/admin/oledrion_order_print.html 2013-02-15 23:11:35 UTC (rev 11055)
+++ XoopsModules/oledrion/branches/voltan/oledrion/templates/admin/oledrion_order_print.html 2013-02-16 11:02:52 UTC (rev 11056)
@@ -53,7 +53,7 @@
<{if count($product.product_attributes) > 0}>
<tr>
<td rowspan="<{math equation='x + y' x=$product.product_attributes_count y=1}>" class="center"><{$product.product_extraid}></td>
- <td rowspan="<{math equation='x + y' x=$product.product_attributes_count y=1}>" class="center"><{$product.product_joined_manufacturers}> <{$product.product_title}></td>
+ <td rowspan="<{math equation='x + y' x=$product.product_attributes_count y=1}>" class="center"><{$product.product_cat_title}> <{$product.product_title}></td>
<td rowspan="<{math equation='x + y' x=$product.product_attributes_count y=1}>" class="center"><{$product.product_id}></td>
<td class="center" style="border-bottom-color: #fff;"></td>
<td class="center" style="border-bottom-color: #fff;"></td>
@@ -109,7 +109,9 @@
</tr>
</table>
<div class="moreinfo"><span class="bold">زمان ارسال</span> : </div>
- <div class="moreinfo"><span class="bold">سایر توضیحات</span> : </div>
+ <div class="moreinfo"><span class="bold">سایر توضیحات</span> : </div>
+ <div class="moreinfo"><span class="bold">شماره کارت ( ۴ رقم )</span> : </div>
+ <div class="moreinfo"><span class="bold">شماره پیگیری</span> : </div>
</div>
<{if $order.cmd_text_fordisplay != ''}>
|
|
From: <vo...@us...> - 2013-02-18 09:16:32
|
Revision: 11057
http://sourceforge.net/p/xoops/svn/11057
Author: voltan1
Date: 2013-02-18 09:15:51 +0000 (Mon, 18 Feb 2013)
Log Message:
-----------
improve product properties
Modified Paths:
--------------
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/products.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/property.php
XoopsModules/oledrion/branches/voltan/oledrion/docs/changelog.txt
XoopsModules/oledrion/branches/voltan/oledrion/include/product_search_form.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/admin.php
XoopsModules/oledrion/branches/voltan/oledrion/product.php
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_product.html
XoopsModules/oledrion/branches/voltan/oledrion/xoops_version.php
Added Paths:
-----------
XoopsModules/oledrion/branches/voltan/oledrion/css/rateit.css
XoopsModules/oledrion/branches/voltan/oledrion/js/rateit.js
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/products.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/products.php 2013-02-16 11:02:52 UTC (rev 11056)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/products.php 2013-02-18 09:15:51 UTC (rev 11057)
@@ -480,7 +480,7 @@
$sform->addElement($downloadFile, false);
if(oledrion_utils::getModuleOption('product_property1')) {
- $property1select = new XoopsFormSelect(_AM_OLEDRION_PRODUCT_PROPERTY1, 'product_property1', $item->getVar('product_property1'));
+ $property1select = new XoopsFormSelect(oledrion_utils::getModuleOption('product_property1_title'), 'product_property1', $item->getVar('product_property1'));
$property1Array = explode('|',oledrion_utils::getModuleOption('product_property1'));
foreach( $property1Array as $property1 ) {
$property1select->addOption($property1);
@@ -489,7 +489,7 @@
}
if(oledrion_utils::getModuleOption('product_property2')) {
- $property2select = new XoopsFormSelect(_AM_OLEDRION_PRODUCT_PROPERTY2, 'product_property2', $item->getVar('product_property2'));
+ $property2select = new XoopsFormSelect(oledrion_utils::getModuleOption('product_property2_title'), 'product_property2', $item->getVar('product_property2'));
$property2Array = explode('|',oledrion_utils::getModuleOption('product_property2'));
foreach( $property2Array as $property2 ) {
$property2select->addOption($property2);
@@ -498,7 +498,7 @@
}
if(oledrion_utils::getModuleOption('product_property3')) {
- $property3select = new XoopsFormSelect(_AM_OLEDRION_PRODUCT_PROPERTY3, 'product_property3', $item->getVar('product_property3'));
+ $property3select = new XoopsFormSelect(oledrion_utils::getModuleOption('product_property3_title'), 'product_property3', $item->getVar('product_property3'));
$property3Array = explode('|',oledrion_utils::getModuleOption('product_property3'));
foreach( $property3Array as $property3 ) {
$property3select->addOption($property3);
@@ -507,7 +507,7 @@
}
if(oledrion_utils::getModuleOption('product_property4')) {
- $property4select = new XoopsFormSelect(_AM_OLEDRION_PRODUCT_PROPERTY4, 'product_property4', $item->getVar('product_property4'));
+ $property4select = new XoopsFormSelect(oledrion_utils::getModuleOption('product_property4_title'), 'product_property4', $item->getVar('product_property4'));
$property4Array = explode('|',oledrion_utils::getModuleOption('product_property4'));
foreach( $property4Array as $property4 ) {
$property4select->addOption($property4);
@@ -516,7 +516,7 @@
}
if(oledrion_utils::getModuleOption('product_property5')) {
- $property5select = new XoopsFormSelect(_AM_OLEDRION_PRODUCT_PROPERTY5, 'product_property5', $item->getVar('product_property5'));
+ $property5select = new XoopsFormSelect(oledrion_utils::getModuleOption('product_property5_title'), 'product_property5', $item->getVar('product_property5'));
$property5Array = explode('|',oledrion_utils::getModuleOption('product_property5'));
foreach( $property5Array as $property5 ) {
$property5select->addOption($property5);
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/property.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/property.php 2013-02-16 11:02:52 UTC (rev 11056)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/property.php 2013-02-18 09:15:51 UTC (rev 11057)
@@ -37,25 +37,35 @@
$sform = new XoopsThemeForm(_MI_OLEDRION_ADMENU17, 'property', $baseurl);
$sform->addElement(new XoopsFormHidden('op', 'property'));
$sform->addElement(new XoopsFormHidden('action', 'fromproperty'));
-
- $property1 = new XoopsFormTextArea ( _AM_OLEDRION_PRODUCT_PROPERTY1, 'product_property1', oledrion_utils::getModuleOption('product_property1'), 5, 90 );
- $property1->setDescription ( _AM_OLEDRION_PRODUCT_PROPERTY1_DESC );
+
+ $property1 = new XoopsFormElementTray ( _AM_OLEDRION_PRODUCT_PROPERTY1, '<br />' );
+ $property1->addElement(new XoopsFormText( _AM_OLEDRION_PRODUCT_PROPERTY_TITLE, 'product_property1_title', 50, 255, oledrion_utils::getModuleOption('product_property1_title') ));
+ $property1->addElement(new XoopsFormTextArea ( '', 'product_property1', oledrion_utils::getModuleOption('product_property1'), 5, 90 ));
+ $property1->setDescription ( _AM_OLEDRION_PRODUCT_PROPERTY_DESC );
$sform->addElement ( $property1 );
- $property2 = new XoopsFormTextArea ( _AM_OLEDRION_PRODUCT_PROPERTY2, 'product_property2', oledrion_utils::getModuleOption('product_property2'), 5, 90 );
- $property2->setDescription ( _AM_OLEDRION_PRODUCT_PROPERTY2_DESC );
+ $property2 = new XoopsFormElementTray ( _AM_OLEDRION_PRODUCT_PROPERTY2, '<br />' );
+ $property2->addElement(new XoopsFormText( _AM_OLEDRION_PRODUCT_PROPERTY_TITLE, 'product_property2_title', 50, 255, oledrion_utils::getModuleOption('product_property2_title') ));
+ $property2->addElement(new XoopsFormTextArea ( '', 'product_property2', oledrion_utils::getModuleOption('product_property2'), 5, 90 ));
+ $property2->setDescription ( _AM_OLEDRION_PRODUCT_PROPERTY_DESC );
$sform->addElement ( $property2 );
- $property3 = new XoopsFormTextArea ( _AM_OLEDRION_PRODUCT_PROPERTY3, 'product_property3', oledrion_utils::getModuleOption('product_property3'), 5, 90 );
- $property3->setDescription ( _AM_OLEDRION_PRODUCT_PROPERTY3_DESC );
+ $property3 = new XoopsFormElementTray ( _AM_OLEDRION_PRODUCT_PROPERTY3, '<br />' );
+ $property3->addElement(new XoopsFormText( _AM_OLEDRION_PRODUCT_PROPERTY_TITLE, 'product_property3_title', 50, 255, oledrion_utils::getModuleOption('product_property3_title') ));
+ $property3->addElement(new XoopsFormTextArea ( '', 'product_property3', oledrion_utils::getModuleOption('product_property3'), 5, 90 ));
+ $property3->setDescription ( _AM_OLEDRION_PRODUCT_PROPERTY_DESC );
$sform->addElement ( $property3 );
- $property4 = new XoopsFormTextArea ( _AM_OLEDRION_PRODUCT_PROPERTY4, 'product_property4', oledrion_utils::getModuleOption('product_property4'), 5, 90 );
- $property4->setDescription ( _AM_OLEDRION_PRODUCT_PROPERTY4_DESC );
+ $property4 = new XoopsFormElementTray ( _AM_OLEDRION_PRODUCT_PROPERTY4, '<br />' );
+ $property4->addElement(new XoopsFormText( _AM_OLEDRION_PRODUCT_PROPERTY_TITLE, 'product_property4_title', 50, 255, oledrion_utils::getModuleOption('product_property4_title') ));
+ $property4->addElement(new XoopsFormTextArea ( '', 'product_property4', oledrion_utils::getModuleOption('product_property4'), 5, 90 ));
+ $property4->setDescription ( _AM_OLEDRION_PRODUCT_PROPERTY_DESC );
$sform->addElement ( $property4 );
- $property5 = new XoopsFormTextArea ( _AM_OLEDRION_PRODUCT_PROPERTY5, 'product_property5', oledrion_utils::getModuleOption('product_property5'), 5, 90 );
- $property5->setDescription ( _AM_OLEDRION_PRODUCT_PROPERTY5_DESC );
+ $property5 = new XoopsFormElementTray ( _AM_OLEDRION_PRODUCT_PROPERTY5, '<br />' );
+ $property5->addElement(new XoopsFormText( _AM_OLEDRION_PRODUCT_PROPERTY_TITLE, 'product_property5_title', 50, 255, oledrion_utils::getModuleOption('product_property5_title') ));
+ $property5->addElement(new XoopsFormTextArea ( '', 'product_property5', oledrion_utils::getModuleOption('product_property5'), 5, 90 ));
+ $property5->setDescription ( _AM_OLEDRION_PRODUCT_PROPERTY_DESC );
$sform->addElement ( $property5 );
$button_tray = new XoopsFormElementTray('' ,'');
@@ -90,6 +100,26 @@
$configHandler->insertConfig($config);
}
}
+
+ if(isset($_POST['product_property1_title'])) {
+ if(oledrion_utils::getModuleOption('product_property1_title') != $_POST['product_property1_title']) {
+ $criteria = new CriteriaCompo();
+ $criteria->add($moduleIdCriteria);
+ $criteria->add(new Criteria('conf_name','product_property1_title'));
+ $config = $configHandler->getConfigs($criteria);
+ $config = $config[0];
+ $configValue = array(
+ 'conf_modid'=>$xoopsModule->getVar('mid'),
+ 'conf_catid'=>0,
+ 'conf_name'=>'product_property1_title',
+ 'conf_value'=>$_POST['product_property1_title'],
+ 'conf_formtype'=>'hidden',
+ 'conf_valuetype'=>'text'
+ );
+ $config->setVars($configValue);
+ $configHandler->insertConfig($config);
+ }
+ }
if(isset($_POST['product_property2'])) {
if(oledrion_utils::getModuleOption('product_property2') != $_POST['product_property2']) {
@@ -111,6 +141,25 @@
}
}
+ if(isset($_POST['product_property2_title'])) {
+ if(oledrion_utils::getModuleOption('product_property2_title') != $_POST['product_property2_title']) {
+ $criteria = new CriteriaCompo();
+ $criteria->add($moduleIdCriteria);
+ $criteria->add(new Criteria('conf_name','product_property2_title'));
+ $config = $configHandler->getConfigs($criteria);
+ $config = $config[0];
+ $configValue = array(
+ 'conf_modid'=>$xoopsModule->getVar('mid'),
+ 'conf_catid'=>0,
+ 'conf_name'=>'product_property2_title',
+ 'conf_value'=>$_POST['product_property2_title'],
+ 'conf_formtype'=>'hidden',
+ 'conf_valuetype'=>'text'
+ );
+ $config->setVars($configValue);
+ $configHandler->insertConfig($config);
+ }
+ }
if(isset($_POST['product_property3'])) {
if(oledrion_utils::getModuleOption('product_property3') != $_POST['product_property3']) {
@@ -132,6 +181,25 @@
}
}
+ if(isset($_POST['product_property3_title'])) {
+ if(oledrion_utils::getModuleOption('product_property3_title') != $_POST['product_property3_title']) {
+ $criteria = new CriteriaCompo();
+ $criteria->add($moduleIdCriteria);
+ $criteria->add(new Criteria('conf_name','product_property3_title'));
+ $config = $configHandler->getConfigs($criteria);
+ $config = $config[0];
+ $configValue = array(
+ 'conf_modid'=>$xoopsModule->getVar('mid'),
+ 'conf_catid'=>0,
+ 'conf_name'=>'product_property3_title',
+ 'conf_value'=>$_POST['product_property3_title'],
+ 'conf_formtype'=>'hidden',
+ 'conf_valuetype'=>'text'
+ );
+ $config->setVars($configValue);
+ $configHandler->insertConfig($config);
+ }
+ }
if(isset($_POST['product_property4'])) {
if(oledrion_utils::getModuleOption('product_property4') != $_POST['product_property4']) {
@@ -152,6 +220,26 @@
$configHandler->insertConfig($config);
}
}
+
+ if(isset($_POST['product_property4_title'])) {
+ if(oledrion_utils::getModuleOption('product_property4_title') != $_POST['product_property4_title']) {
+ $criteria = new CriteriaCompo();
+ $criteria->add($moduleIdCriteria);
+ $criteria->add(new Criteria('conf_name','product_property4_title'));
+ $config = $configHandler->getConfigs($criteria);
+ $config = $config[0];
+ $configValue = array(
+ 'conf_modid'=>$xoopsModule->getVar('mid'),
+ 'conf_catid'=>0,
+ 'conf_name'=>'product_property4_title',
+ 'conf_value'=>$_POST['product_property4_title'],
+ 'conf_formtype'=>'hidden',
+ 'conf_valuetype'=>'text'
+ );
+ $config->setVars($configValue);
+ $configHandler->insertConfig($config);
+ }
+ }
if(isset($_POST['product_property5'])) {
if(oledrion_utils::getModuleOption('product_property5') != $_POST['product_property5']) {
@@ -172,7 +260,27 @@
$configHandler->insertConfig($config);
}
}
-
+
+ if(isset($_POST['product_property5_title'])) {
+ if(oledrion_utils::getModuleOption('product_property5_title') != $_POST['product_property5_title']) {
+ $criteria = new CriteriaCompo();
+ $criteria->add($moduleIdCriteria);
+ $criteria->add(new Criteria('conf_name','product_property5_title'));
+ $config = $configHandler->getConfigs($criteria);
+ $config = $config[0];
+ $configValue = array(
+ 'conf_modid'=>$xoopsModule->getVar('mid'),
+ 'conf_catid'=>0,
+ 'conf_name'=>'product_property5_title',
+ 'conf_value'=>$_POST['product_property5_title'],
+ 'conf_formtype'=>'hidden',
+ 'conf_valuetype'=>'text'
+ );
+ $config->setVars($configValue);
+ $configHandler->insertConfig($config);
+ }
+ }
+
oledrion_utils::updateCache();
oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl.'?op=property', 2);
break;
Added: XoopsModules/oledrion/branches/voltan/oledrion/css/rateit.css
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/css/rateit.css (rev 0)
+++ XoopsModules/oledrion/branches/voltan/oledrion/css/rateit.css 2013-02-18 09:15:51 UTC (rev 11057)
@@ -0,0 +1,76 @@
+div.rateit {
+ display: -moz-inline-box;
+ display: inline-block;
+ position: relative;
+ -webkit-user-select: none;
+ -khtml-user-select: none;
+ -moz-user-select: none;
+ -o-user-select: none;
+ user-select: none;
+ -webkit-touch-callout: none;
+}
+
+div.rateit div.rateit-range {
+ position: relative;
+ display: -moz-inline-box;
+ display: inline-block;
+ background: url(../images/rate/star.gif);
+ height: 16px;
+}
+
+/* for IE 6 */
+* html div.rateit, * html div.rateit div.rateit-range {
+ display: inline;
+}
+
+/* for IE 7 */
+* + html div.rateit, * + html div.rateit div.rateit-range {
+ display: inline;
+}
+
+div.rateit div.rateit-hover, div.rateit div.rateit-selected {
+ position: absolute;
+ left: 0px;
+}
+
+div.rateit div.rateit-hover-rtl, div.rateit div.rateit-selected-rtl {
+ left: auto;
+ right: 0px;
+}
+
+div.rateit div.rateit-hover {
+ background: url(../images/rate/star.gif) left -32px;
+}
+
+div.rateit div.rateit-hover-rtl {
+ background-position: right -32px;
+}
+
+div.rateit div.rateit-selected {
+ background: url(../images/rate/star.gif) left -16px;
+}
+
+div.rateit div.rateit-selected-rtl {
+ background-position: right -16px;
+}
+
+div.rateit div.rateit-preset {
+ background: url(../images/rate/star.gif) left -48px;
+}
+
+div.rateit div.rateit-preset-rtl {
+ background: url(../images/rate/star.gif) left -48px;
+}
+
+div.rateit div.rateit-reset {
+ background: url(../images/rate/delete.gif) 0 0;
+ width: 16px;
+ height: 16px;
+ display: -moz-inline-box;
+ display: inline-block;
+ float: left;
+}
+
+div.rateit div.rateit-reset:hover {
+ background-position: 0 -16px;
+}
Modified: XoopsModules/oledrion/branches/voltan/oledrion/docs/changelog.txt
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/docs/changelog.txt 2013-02-16 11:02:52 UTC (rev 11056)
+++ XoopsModules/oledrion/branches/voltan/oledrion/docs/changelog.txt 2013-02-18 09:15:51 UTC (rev 11057)
@@ -9,7 +9,8 @@
- Support php 5.4.11 and mysql 5.5.28 (voltan)
- convert all files to utf-8 (voltan)
- json output for products and categoresy (voltan)
-- improve admin order page (voltan)
+- improve admin order page (voltan)
+- improve product properties (voltan)
---------------------------------------
2.33 Beta 1 2012-07-23
Modified: XoopsModules/oledrion/branches/voltan/oledrion/include/product_search_form.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/include/product_search_form.php 2013-02-16 11:02:52 UTC (rev 11056)
+++ XoopsModules/oledrion/branches/voltan/oledrion/include/product_search_form.php 2013-02-18 09:15:51 UTC (rev 11057)
@@ -83,7 +83,7 @@
//
if(oledrion_utils::getModuleOption('search_property1') && oledrion_utils::getModuleOption('product_property1')) {
- $property1select = new XoopsFormSelect(_OLEDRION_PRODUCT_PROPERTY1, 'product_property1', '');
+ $property1select = new XoopsFormSelect(oledrion_utils::getModuleOption('product_property1_title'), 'product_property1', '');
$property1Array = explode('|',oledrion_utils::getModuleOption('product_property1'));
foreach( $property1Array as $property1 ) {
$property1select->addOption($property1);
@@ -93,7 +93,7 @@
//
if(oledrion_utils::getModuleOption('search_property2') && oledrion_utils::getModuleOption('product_property2')) {
- $property2select = new XoopsFormSelect(_OLEDRION_PRODUCT_PROPERTY2, 'product_property2', '');
+ $property2select = new XoopsFormSelect(oledrion_utils::getModuleOption('product_property2_title'), 'product_property2', '');
$property2Array = explode('|',oledrion_utils::getModuleOption('product_property2'));
foreach( $property2Array as $property2 ) {
$property2select->addOption($property2);
@@ -103,7 +103,7 @@
//
if(oledrion_utils::getModuleOption('search_property3') && oledrion_utils::getModuleOption('product_property3')) {
- $property3select = new XoopsFormSelect(_OLEDRION_PRODUCT_PROPERTY3, 'product_property3', '');
+ $property3select = new XoopsFormSelect(oledrion_utils::getModuleOption('product_property3_title'), 'product_property3', '');
$property3Array = explode('|',oledrion_utils::getModuleOption('product_property3'));
foreach( $property3Array as $property3 ) {
$property3select->addOption($property3);
@@ -113,7 +113,7 @@
//
if(oledrion_utils::getModuleOption('search_property4') && oledrion_utils::getModuleOption('product_property4')) {
- $property4select = new XoopsFormSelect(_OLEDRION_PRODUCT_PROPERTY4, 'product_property4', '');
+ $property4select = new XoopsFormSelect(oledrion_utils::getModuleOption('product_property4_title'), 'product_property4', '');
$property4Array = explode('|',oledrion_utils::getModuleOption('product_property4'));
foreach( $property4Array as $property4 ) {
$property4select->addOption($property4);
@@ -123,7 +123,7 @@
//
if(oledrion_utils::getModuleOption('search_property5') && oledrion_utils::getModuleOption('product_property5')) {
- $property5select = new XoopsFormSelect(_OLEDRION_PRODUCT_PROPERTY4, 'product_property5', '');
+ $property5select = new XoopsFormSelect(oledrion_utils::getModuleOption('product_property5_title'), 'product_property5', '');
$property5Array = explode('|',oledrion_utils::getModuleOption('product_property5'));
foreach( $property5Array as $property5 ) {
$property5select->addOption($property5);
Added: XoopsModules/oledrion/branches/voltan/oledrion/js/rateit.js
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/js/rateit.js (rev 0)
+++ XoopsModules/oledrion/branches/voltan/oledrion/js/rateit.js 2013-02-18 09:15:51 UTC (rev 11057)
@@ -0,0 +1,259 @@
+/*
+ RateIt
+ version 1.0.4
+ 03/31/2012
+ http://rateit.codeplex.com
+ Twitter: @gjunge
+
+ */
+(function ($) {
+ $.fn.rateit = function (p1, p2) {
+ //quick way out.
+ var options = {};
+ var mode = 'init';
+ var capitaliseFirstLetter = function (string) {
+ return string.charAt(0).toUpperCase() + string.substr(1);
+ };
+
+ if (this.length == 0) return this;
+
+
+ var tp1 = $.type(p1);
+ if (tp1 == 'object' || p1 === undefined || p1 == null) {
+ options = $.extend({}, $.fn.rateit.defaults, p1); //wants to init new rateit plugin(s).
+ }
+ else if (tp1 == 'string' && p2 === undefined) {
+ return this.data('rateit' + capitaliseFirstLetter(p1)); //wants to get a vote.
+ }
+ else if (tp1 == 'string') {
+ mode = 'setvote'
+ }
+
+ return this.each(function () {
+ var item = $(this);
+
+ //shorten all the item.data('rateit-XXX'), will save space in closure compiler, will be like item.data('XXX') will become x('XXX')
+ var itemdata = function (key, vote) {
+ arguments[0] = 'rateit' + capitaliseFirstLetter(key);
+ return item.data.apply(item, arguments); ////Fix for WI: 523
+ };
+
+ //add the rate it class.
+ if (!item.hasClass('rateit')) item.addClass('rateit');
+
+ var ltr = item.css('direction') != 'rtl';
+
+ // set vote mode
+ if (mode == 'setvote') {
+ if (!itemdata('init')) throw 'Can\'t set vote before init';
+
+
+ //if readonly now and it wasn't readonly, remove the eventhandlers.
+ if (p1 == 'readonly' && !itemdata('readonly')) {
+ item.find('.rateit-range').unbind();
+ itemdata('wired', false);
+ }
+
+ if (itemdata('backingfld')) {
+ //if we have a backing field, check which fields we should update.
+ //In case of input[type=range], although we did read its attributes even in browsers that don't support it (using fld.attr())
+ //we only update it in browser that support it (&& fld[0].min only works in supporting browsers), not only does it save us from checking if it is range input type, it also is unnecessary.
+ var fld = $(itemdata('backingfld'));
+ if (p1 == 'vote') fld.val(p2);
+ if (p1 == 'min' && fld[0].min) fld[0].min = p2;
+ if (p1 == 'max' && fld[0].max) fld[0].max = p2;
+ if (p1 == 'step' && fld[0].step) fld[0].step = p2;
+ }
+
+ itemdata(p1, p2);
+ }
+
+ //init rateit plugin
+ if (!itemdata('init')) {
+
+ //get our votes, either from the data-* html5 attribute or from the options.
+ itemdata('min', itemdata('min') || options.min);
+ itemdata('max', itemdata('max') || options.max);
+ itemdata('step', itemdata('step') || options.step);
+ itemdata('readonly', itemdata('readonly') !== undefined ? itemdata('readonly') : options.readonly);
+ itemdata('resetable', itemdata('resetable') !== undefined ? itemdata('resetable') : options.resetable);
+ itemdata('backingfld', itemdata('backingfld') || options.backingfld);
+ itemdata('starwidth', itemdata('starwidth') || options.starwidth);
+ itemdata('starheight', itemdata('starheight') || options.starheight);
+ itemdata('vote', itemdata('vote') || options.min);
+ itemdata('ispreset', itemdata('ispreset') !== undefined ? itemdata('ispreset') : options.ispreset);
+ //are we LTR or RTL?
+
+ if (itemdata('backingfld')) {
+ //if we have a backing field, hide it, and get its vote, and override defaults if range.
+ var fld = $(itemdata('backingfld'));
+ itemdata('vote', fld.hide().val());
+
+ if (fld[0].nodeName == 'INPUT') {
+ if (fld[0].type == 'range' || fld[0].type == 'text') { //in browsers not support the range type, it defaults to text
+
+ itemdata('min', parseInt(fld.attr('min')) || itemdata('min')); //if we would have done fld[0].min it wouldn't have worked in browsers not supporting the range type.
+ itemdata('max', parseInt(fld.attr('max')) || itemdata('max'));
+ itemdata('step', parseInt(fld.attr('step')) || itemdata('step'));
+ }
+ }
+ if (fld[0].nodeName == 'SELECT' && fld[0].options.length > 1) {
+ itemdata('min', Number(fld[0].options[0].vote));
+ itemdata('max', Number(fld[0].options[fld[0].length - 1].vote));
+ itemdata('step', Number(fld[0].options[1].vote) - Number(fld[0].options[0].vote));
+ }
+ }
+
+ //Create the necessary tags.
+ item.append('<div class="rateit-reset"></div><div class="rateit-range"><div class="rateit-selected" style="height:' + itemdata('starheight') + 'px"></div><div class="rateit-hover" style="height:' + itemdata('starheight') + 'px"></div></div>');
+
+ //if we are in RTL mode, we have to change the float of the "reset button"
+ if (!ltr) {
+ item.find('.rateit-reset').css('float', 'right');
+ item.find('.rateit-selected').addClass('rateit-selected-rtl');
+ item.find('.rateit-hover').addClass('rateit-hover-rtl');
+ }
+ itemdata('init', true);
+ }
+
+
+ //set the range element to fit all the stars.
+ var range = item.find('.rateit-range');
+ range.width(itemdata('starwidth') * (itemdata('max') - itemdata('min'))).height(itemdata('starheight'));
+
+ //add/remove the preset class
+ var presetclass = 'rateit-preset' + ((ltr) ? '' : '-rtl');
+ if (itemdata('ispreset'))
+ item.find('.rateit-selected').addClass(presetclass);
+ else
+ item.find('.rateit-selected').removeClass(presetclass);
+
+ //set the vote if we have it.
+ if (itemdata('vote')) {
+ var score = (itemdata('vote') - itemdata('min')) * itemdata('starwidth');
+ item.find('.rateit-selected').width(score);
+ }
+
+ var resetbtn = item.find('.rateit-reset');
+
+ var calcRawScore = function (element, event) {
+ var pageX = (event.changedTouches) ? event.changedTouches[0].pageX : event.pageX;
+
+ var offsetx = pageX - $(element).offset().left;
+ if (!ltr) offsetx = range.width() - offsetx;
+ if (offsetx > range.width()) offsetx = range.width();
+ if (offsetx < 0) offsetx = 0;
+
+ return score = Math.ceil(offsetx / itemdata('starwidth') * (1 / itemdata('step')));
+ };
+
+
+ //
+
+ if (!itemdata('readonly')) {
+ //if we are not read only, add all the events
+
+ //if we have a reset button, set the event handler.
+ if (itemdata('resetable')) {
+ resetbtn.click(function () {
+ itemdata('vote', itemdata('min'));
+ range.find('.rateit-hover').hide().width(0);
+ range.find('.rateit-selected').width(0).show();
+ if (itemdata('backingfld')) $(itemdata('backingfld')).val(itemdata('min'));
+ item.trigger('reset');
+ });
+
+ }
+ else {
+ resetbtn.hide();
+ }
+
+
+ //when the mouse goes over the range div, we set the "hover" stars.
+ if (!itemdata('wired')) {
+ range.bind('touchmove touchend', touchHandler); //bind touch events
+ range.mousemove(function (e) {
+ var score = calcRawScore(this, e);
+ var w = score * itemdata('starwidth') * itemdata('step');
+ var h = range.find('.rateit-hover');
+ if (h.data('width') != w) {
+ range.find('.rateit-selected').hide();
+ h.width(w).show().data('width', w);
+ var data = [(score * itemdata('step')) + itemdata('min')];
+ item.trigger('hover', data).trigger('over', data);
+ }
+ });
+ //when the mouse leaves the range, we have to hide the hover stars, and show the current vote.
+ range.mouseleave(function (e) {
+ range.find('.rateit-hover').hide().width(0).data('width', '');
+ item.trigger('hover', [null]).trigger('over', [null]);
+ range.find('.rateit-selected').show();
+ });
+ //when we click on the range, we have to set the vote, hide the hover.
+ range.mouseup(function (e) {
+ var score = calcRawScore(this, e);
+
+ var newvote = (score * itemdata('step')) + itemdata('min');
+ itemdata('vote', newvote);
+ if (itemdata('backingfld')) {
+ ...
[truncated message content] |
|
From: <vo...@us...> - 2013-02-18 11:39:52
|
Revision: 11058
http://sourceforge.net/p/xoops/svn/11058
Author: voltan1
Date: 2013-02-18 11:39:46 +0000 (Mon, 18 Feb 2013)
Log Message:
-----------
Add ajax rate
Modified Paths:
--------------
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php
XoopsModules/oledrion/branches/voltan/oledrion/ajax.php
XoopsModules/oledrion/branches/voltan/oledrion/all-products.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_products.php
XoopsModules/oledrion/branches/voltan/oledrion/docs/changelog.txt
XoopsModules/oledrion/branches/voltan/oledrion/language/english/modinfo.php
XoopsModules/oledrion/branches/voltan/oledrion/product.php
XoopsModules/oledrion/branches/voltan/oledrion/rate-product.php
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_product.html
Added Paths:
-----------
XoopsModules/oledrion/branches/voltan/oledrion/images/rate/
XoopsModules/oledrion/branches/voltan/oledrion/images/rate/delete.gif
XoopsModules/oledrion/branches/voltan/oledrion/images/rate/index.html
XoopsModules/oledrion/branches/voltan/oledrion/images/rate/star.gif
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php 2013-02-18 09:15:51 UTC (rev 11057)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php 2013-02-18 11:39:46 UTC (rev 11058)
@@ -277,7 +277,7 @@
$edit = false;
}
// Appel à jQuery
- oledrion_utils::callJavascriptFile('jquery/jquery.js', false, true);
+ $xoTheme->addScript("browse.php?Frameworks/jquery/jquery.js");
oledrion_utils::callJavascriptFile('noconflict.js', false, true);
// Appel du fichier langue
oledrion_utils::callJavascriptFile('messages.js', true, true);
Modified: XoopsModules/oledrion/branches/voltan/oledrion/ajax.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/ajax.php 2013-02-18 09:15:51 UTC (rev 11057)
+++ XoopsModules/oledrion/branches/voltan/oledrion/ajax.php 2013-02-18 11:39:46 UTC (rev 11058)
@@ -237,7 +237,52 @@
}
$return = json_encode($ret);
}
- break;
+ break;
+
+ // Ajax rate
+ case 'rate':
+ if(isset($_POST['product_id'])) {
+ $product_id = intval($_POST['product_id']);
+ $product = null;
+ $product = $h_oledrion_products->get($product_id);
+ if(is_object($product) && $product->getVar('product_online') && !oledrion_utils::getModuleOption('show_unpublished') && $product->getVar('product_submitted') < time() && oledrion_utils::getModuleOption('nostock_display') && $product->getVar('product_stock')) {
+ $GLOBALS['current_category'] = -1;
+ $ratinguser = oledrion_utils::getCurrentUserID();
+ $canRate = true;
+ if ($ratinguser != 0) {
+ if($h_oledrion_votedata->hasUserAlreadyVoted($ratinguser, $product->getVar('product_id'))) {
+ $canRate = false;
+ }
+ } else {
+ if($h_oledrion_votedata->hasAnonymousAlreadyVoted('', $product->getVar('product_id'))) {
+ $canRate = false;
+ }
+ }
+ if($canRate) {
+ if($_POST['rating'] == '--' ) {
+ oledrion_utils::redirect(_OLEDRION_NORATING, OLEDRION_URL.'product.php?product_id='.$product->getVar('product_id'),4);
+ }
+ $rating = intval($_POST['rating']);
+ if($rating <1 || $rating > 10) {
+ exit(_ERRORS);
+ }
+ $result = $h_oledrion_votedata->createRating($product->getVar('product_id'), $ratinguser, $rating);
+
+ // Calcul du nombre de votes et du total des votes pour mettre à jour les informations du produit
+ $totalVotes = 0;
+ $sumRating = 0;
+ $ret = 0;
+ $ret = $h_oledrion_votedata->getCountRecordSumRating($product->getVar('product_id'), $totalVotes, $sumRating);
+
+ $finalrating = $sumRating / $totalVotes;
+ $finalrating = number_format($finalrating, 4);
+ $h_oledrion_products->updateRating($product_id, $finalrating, $totalVotes);
+ $ratemessage = _OLEDRION_VOTEAPPRE.'<br />'.sprintf(_OLEDRION_THANKYOU,$xoopsConfig['sitename']);
+ oledrion_utils::redirect($ratemessage, OLEDRION_URL.'product.php?product_id='.$product->getVar('product_id'), 2);
+ }
+ }
+ }
+ break;
}
echo $return;
?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/all-products.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/all-products.php 2013-02-18 09:15:51 UTC (rev 11057)
+++ XoopsModules/oledrion/branches/voltan/oledrion/all-products.php 2013-02-18 11:39:46 UTC (rev 11058)
@@ -60,7 +60,7 @@
oledrion_utils::setCSS();
oledrion_utils::setLocalCSS($xoopsConfig['language']);
if(!OLEDRION_MY_THEME_USES_JQUERY) {
- oledrion_utils::callJavascriptFile('jquery/jquery.js');
+ $xoTheme->addScript("browse.php?Frameworks/jquery/jquery.js");
}
oledrion_utils::callJavascriptFile('noconflict.js');
oledrion_utils::callJavascriptFile('tablesorter/jquery.tablesorter.min.js');
Modified: XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_products.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_products.php 2013-02-18 09:15:51 UTC (rev 11057)
+++ XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_products.php 2013-02-18 11:39:46 UTC (rev 11058)
@@ -1245,8 +1245,9 @@
if($itemsCount > oledrion_utils::getModuleOption('max_products')) { // Il faut créer notre propre sélecteur
if($parameters['multiple']) {
if($jqueryIncluded == null) {
- $jqueryIncluded = true;
- oledrion_utils::callJavascriptFile('jquery/jquery.js');
+ $jqueryIncluded = true;
+ global $xoTheme;
+ $xoTheme->addScript("browse.php?Frameworks/jquery/jquery.js");
}
oledrion_utils::callJavascriptFile('select/select.js', false, true);
$productTray = new XoopsFormElementTray($parameters['caption'], '');
Modified: XoopsModules/oledrion/branches/voltan/oledrion/docs/changelog.txt
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/docs/changelog.txt 2013-02-18 09:15:51 UTC (rev 11057)
+++ XoopsModules/oledrion/branches/voltan/oledrion/docs/changelog.txt 2013-02-18 11:39:46 UTC (rev 11058)
@@ -2,15 +2,17 @@
2.34
---------------------------------------
- Add Ajax search system and block (voltan)
+- Add Ajax rate (voltan)
+- Add json output for products and categoresy (voltan)
- Improve search (voltan)
- Improve gateway ( checkout.php admin/gateways/gateway.php ) (voltan)
+- improve admin order page (voltan)
+- improve product properties (voltan)
+- improve load jquery (voltan)
- Fix errors in admin and user side (voltan)
- Remove Cache Lite (voltan)
-- Support php 5.4.11 and mysql 5.5.28 (voltan)
+- Support php 5.4.11 and mysql 5.5.29 (voltan)
- convert all files to utf-8 (voltan)
-- json output for products and categoresy (voltan)
-- improve admin order page (voltan)
-- improve product properties (voltan)
---------------------------------------
2.33 Beta 1 2012-07-23
Added: XoopsModules/oledrion/branches/voltan/oledrion/images/rate/delete.gif
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/images/rate/delete.gif
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/images/rate/delete.gif 2013-02-18 09:15:51 UTC (rev 11057)
+++ XoopsModules/oledrion/branches/voltan/oledrion/images/rate/delete.gif 2013-02-18 11:39:46 UTC (rev 11058)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/images/rate/delete.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/images/rate/index.html
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/images/rate/index.html (rev 0)
+++ XoopsModules/oledrion/branches/voltan/oledrion/images/rate/index.html 2013-02-18 11:39:46 UTC (rev 11058)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/images/rate/index.html
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/images/rate/star.gif
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/images/rate/star.gif
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/images/rate/star.gif 2013-02-18 09:15:51 UTC (rev 11057)
+++ XoopsModules/oledrion/branches/voltan/oledrion/images/rate/star.gif 2013-02-18 11:39:46 UTC (rev 11058)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/images/rate/star.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Modified: XoopsModules/oledrion/branches/voltan/oledrion/language/english/modinfo.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/english/modinfo.php 2013-02-18 09:15:51 UTC (rev 11057)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/english/modinfo.php 2013-02-18 11:39:46 UTC (rev 11058)
@@ -212,7 +212,8 @@
define('_MI_OLEDRION_PRODUCT_PROPERTY2',"Product Property 2");
define('_MI_OLEDRION_PRODUCT_PROPERTY3',"Product Property 3");
define('_MI_OLEDRION_PRODUCT_PROPERTY4',"Product Property 4");
-define('_MI_OLEDRION_PRODUCT_PROPERTY5',"Product Property 5");
+define('_MI_OLEDRION_PRODUCT_PROPERTY5',"Product Property 5");
+define('_MI_OLEDRION_PRODUCT_PROPERTY_TITLE',"Title");
define('_MI_OLEDRION_GATEWAY',"Gateway used by the module");
Modified: XoopsModules/oledrion/branches/voltan/oledrion/product.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/product.php 2013-02-18 09:15:51 UTC (rev 11057)
+++ XoopsModules/oledrion/branches/voltan/oledrion/product.php 2013-02-18 11:39:46 UTC (rev 11058)
@@ -83,7 +83,7 @@
}
}
if(!OLEDRION_MY_THEME_USES_JQUERY) {
- oledrion_utils::callJavascriptFile('jquery/jquery.js');
+ $xoTheme->addScript("browse.php?Frameworks/jquery/jquery.js");
}
oledrion_utils::callJavascriptFile('noconflict.js');
$xoTheme->addStylesheet(OLEDRION_JS_URL.'css/prettyPhoto.css');
@@ -428,7 +428,11 @@
$canRate = !$h_oledrion_votedata->hasUserAlreadyVoted($currentUser, $product->getVar('product_id'));
} else {
$canRate = !$h_oledrion_votedata->hasAnonymousAlreadyVoted('', $product->getVar('product_id'));
- }
+ }
+ $xoTheme->addScript("browse.php?Frameworks/jquery/jquery.js");
+ oledrion_utils::callJavascriptFile('rateit.js');
+ oledrion_utils::setCSS(OLEDRION_URL.'css/rateit.css');
+
$xoopsTpl->assign('userCanRate', $canRate);
}
Modified: XoopsModules/oledrion/branches/voltan/oledrion/rate-product.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/rate-product.php 2013-02-18 09:15:51 UTC (rev 11057)
+++ XoopsModules/oledrion/branches/voltan/oledrion/rate-product.php 2013-02-18 11:39:46 UTC (rev 11058)
@@ -24,7 +24,8 @@
* Notation d'un produit
*/
require 'header.php';
-
+oledrion_utils::redirect(_OLEDRION_NORATE, 'index.php', 5);
+/*
$product_id = 0;
// Les tests **************************************************************************************
// Peut on voter ?
@@ -119,7 +120,7 @@
oledrion_utils::setCSS();
oledrion_utils::setLocalCSS($xoopsConfig['language']);
}
+*/
-
require_once XOOPS_ROOT_PATH.'/footer.php';
?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_product.html
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_product.html 2013-02-18 09:15:51 UTC (rev 11057)
+++ XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_product.html 2013-02-18 11:39:46 UTC (rev 11058)
@@ -399,7 +399,30 @@
<div class="oledrion_rating">
<{$smarty.const._OLEDRION_RATINGC}> <{$product.product_rating_formated}> (<{$product.product_votes_count}>)
<{if $userCanRate}>
- - <a href="<{$smarty.const.OLEDRION_URL}>rate-product.php?product_id=<{$product.product_id}>" title="<{$smarty.const._OLEDRION_RATETHISPRODUCT}>"><{$smarty.const._OLEDRION_RATETHISPRODUCT}></a>
+ <div class="vote">
+ <input value="<{$product.product_rating_formated}>" step="1" id="backing<{$product.product_id}>" type="range">
+ <div class="rateit" data-url="<{$smarty.const.OLEDRION_URL}>ajax.php?op=rate" data-product="<{$product.product_id}>" data-rateit-backingfld="#backing<{$product.product_id}>" data-rateit-resetable="false" data-rateit-ispreset="true" data-rateit-min="0" data-rateit-max="10"></div>
+ </div>
+ <script type="text/javascript">
+ $('.vote .rateit').bind('rated reset', function (e) {
+ var ri = $(this);
+ var rating = ri.rateit('vote');
+ var product_id = ri.data('product');
+ var url = ri.data('url');
+ ri.rateit('readonly', true);
+ $.ajax({
+ url: url,
+ data: { product_id: product_id, rating: rating},
+ type: 'POST',
+ dataType: "json",
+ success:function (result) {
+ if (!result.status == 1) {
+ alert(result.message);
+ }
+ }
+ });
+ });
+ </script>
<{/if}>
</div>
<{/if}>
|
|
From: <vo...@us...> - 2013-02-18 18:36:58
|
Revision: 11061
http://sourceforge.net/p/xoops/svn/11061
Author: voltan1
Date: 2013-02-18 18:36:55 +0000 (Mon, 18 Feb 2013)
Log Message:
-----------
improve js image gallery, remove pretty Photo and add core lightbox
Modified Paths:
--------------
XoopsModules/oledrion/branches/voltan/oledrion/docs/changelog.txt
XoopsModules/oledrion/branches/voltan/oledrion/product.php
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_product.html
Added Paths:
-----------
XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/
XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/addtocart.png
XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/addtowishlist.png
XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/index.html
XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-blank.gif
XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-btn-close.gif
XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-btn-next.gif
XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-btn-prev.gif
XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-ico-loading.gif
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/addtocart.png
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/addtowishlist.png
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/index.html
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-blank.gif
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-btn-close.gif
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-btn-next.gif
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-btn-prev.gif
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-ico-loading.gif
Removed Paths:
-------------
XoopsModules/oledrion/branches/voltan/oledrion/js/css/
XoopsModules/oledrion/branches/voltan/oledrion/js/images/
XoopsModules/oledrion/branches/voltan/oledrion/js/prettyphoto/
XoopsModules/oledrion/branches/voltan/oledrion/language/english/addtocart.png
XoopsModules/oledrion/branches/voltan/oledrion/language/english/addtowishlist.png
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/addtocart.png
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/addtowishlist.png
Modified: XoopsModules/oledrion/branches/voltan/oledrion/docs/changelog.txt
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/docs/changelog.txt 2013-02-18 18:19:19 UTC (rev 11060)
+++ XoopsModules/oledrion/branches/voltan/oledrion/docs/changelog.txt 2013-02-18 18:36:55 UTC (rev 11061)
@@ -9,6 +9,7 @@
- improve admin order page (voltan)
- improve product properties (voltan)
- improve load jquery (voltan)
+- improve js image gallery, remove pretty Photo and add core lightbox (voltan)
- Fix errors in admin and user side (voltan)
- Remove Cache Lite (voltan)
- Support php 5.4.11 and mysql 5.5.29 (voltan)
Deleted: XoopsModules/oledrion/branches/voltan/oledrion/language/english/addtocart.png
===================================================================
(Binary files differ)
Deleted: XoopsModules/oledrion/branches/voltan/oledrion/language/english/addtowishlist.png
===================================================================
(Binary files differ)
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/addtocart.png
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/addtocart.png
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/addtocart.png 2013-02-18 18:19:19 UTC (rev 11060)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/addtocart.png 2013-02-18 18:36:55 UTC (rev 11061)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/addtocart.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/addtowishlist.png
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/addtowishlist.png
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/addtowishlist.png 2013-02-18 18:19:19 UTC (rev 11060)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/addtowishlist.png 2013-02-18 18:36:55 UTC (rev 11061)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/addtowishlist.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/index.html
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/index.html (rev 0)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/index.html 2013-02-18 18:36:55 UTC (rev 11061)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/index.html
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-blank.gif
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-blank.gif
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-blank.gif 2013-02-18 18:19:19 UTC (rev 11060)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-blank.gif 2013-02-18 18:36:55 UTC (rev 11061)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-blank.gif
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-btn-close.gif
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-btn-close.gif
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-btn-close.gif 2013-02-18 18:19:19 UTC (rev 11060)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-btn-close.gif 2013-02-18 18:36:55 UTC (rev 11061)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-btn-close.gif
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-btn-next.gif
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-btn-next.gif
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-btn-next.gif 2013-02-18 18:19:19 UTC (rev 11060)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-btn-next.gif 2013-02-18 18:36:55 UTC (rev 11061)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-btn-next.gif
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-btn-prev.gif
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-btn-prev.gif
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-btn-prev.gif 2013-02-18 18:19:19 UTC (rev 11060)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-btn-prev.gif 2013-02-18 18:36:55 UTC (rev 11061)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-btn-prev.gif
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-ico-loading.gif
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-ico-loading.gif
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-ico-loading.gif 2013-02-18 18:19:19 UTC (rev 11060)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-ico-loading.gif 2013-02-18 18:36:55 UTC (rev 11061)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/lightbox-ico-loading.gif
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Deleted: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/addtocart.png
===================================================================
(Binary files differ)
Deleted: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/addtowishlist.png
===================================================================
(Binary files differ)
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/addtocart.png
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/addtocart.png
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/addtocart.png 2013-02-18 18:19:19 UTC (rev 11060)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/addtocart.png 2013-02-18 18:36:55 UTC (rev 11061)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/addtocart.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/addtowishlist.png
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/addtowishlist.png
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/addtowishlist.png 2013-02-18 18:19:19 UTC (rev 11060)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/addtowishlist.png 2013-02-18 18:36:55 UTC (rev 11061)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/addtowishlist.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/index.html
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/index.html (rev 0)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/index.html 2013-02-18 18:36:55 UTC (rev 11061)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/index.html
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-blank.gif
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-blank.gif
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-blank.gif 2013-02-18 18:19:19 UTC (rev 11060)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-blank.gif 2013-02-18 18:36:55 UTC (rev 11061)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-blank.gif
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-btn-close.gif
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-btn-close.gif
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-btn-close.gif 2013-02-18 18:19:19 UTC (rev 11060)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-btn-close.gif 2013-02-18 18:36:55 UTC (rev 11061)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-btn-close.gif
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-btn-next.gif
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-btn-next.gif
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-btn-next.gif 2013-02-18 18:19:19 UTC (rev 11060)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-btn-next.gif 2013-02-18 18:36:55 UTC (rev 11061)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-btn-next.gif
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-btn-prev.gif
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-btn-prev.gif
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-btn-prev.gif 2013-02-18 18:19:19 UTC (rev 11060)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-btn-prev.gif 2013-02-18 18:36:55 UTC (rev 11061)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-btn-prev.gif
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-ico-loading.gif
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-ico-loading.gif
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-ico-loading.gif 2013-02-18 18:19:19 UTC (rev 11060)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-ico-loading.gif 2013-02-18 18:36:55 UTC (rev 11061)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/lightbox-ico-loading.gif
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Modified: XoopsModules/oledrion/branches/voltan/oledrion/product.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/product.php 2013-02-18 18:19:19 UTC (rev 11060)
+++ XoopsModules/oledrion/branches/voltan/oledrion/product.php 2013-02-18 18:36:55 UTC (rev 11061)
@@ -85,9 +85,10 @@
if(!OLEDRION_MY_THEME_USES_JQUERY) {
$xoTheme->addScript("browse.php?Frameworks/jquery/jquery.js");
}
-oledrion_utils::callJavascriptFile('noconflict.js');
-$xoTheme->addStylesheet(OLEDRION_JS_URL.'css/prettyPhoto.css');
-oledrion_utils::callJavascriptFile('prettyphoto/jquery.prettyPhoto.js');
+oledrion_utils::callJavascriptFile('noconflict.js');
+// Add lightbox
+$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.lightbox.js');
+$xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/lightbox.css');
if(isset($_GET['stock']) && $_GET['stock'] == 'add' && oledrion_utils::isMemberOfGroup(oledrion_utils::getModuleOption('grp_qty'))) {
$h_oledrion_products->increaseStock($product);
@@ -154,12 +155,12 @@
$xoopsTpl->assign('product_submitter', $product_user);
// Image du bouton "Ajouter au panier"
-if (file_exists(OLEDRION_PATH.'language'.DIRECTORY_SEPARATOR.$xoopsConfig['language'].DIRECTORY_SEPARATOR.'addtocart.png')) {
- $addToCart = OLEDRION_URL.'language/'.$xoopsConfig['language'].'/addtocart.png';
- $addToWishList = OLEDRION_URL.'language/'.$xoopsConfig['language'].'/addtowishlist.png';
+if (file_exists(OLEDRION_PATH.'language'.DIRECTORY_SEPARATOR.$xoopsConfig['language'].DIRECTORY_SEPARATOR.'image'.DIRECTORY_SEPARATOR.'addtocart.png')) {
+ $addToCart = OLEDRION_URL.'language/'.$xoopsConfig['language'].'/image/addtocart.png';
+ $addToWishList = OLEDRION_URL.'language/'.$xoopsConfig['language'].'/image/addtowishlist.png';
} else { // Fallback
- $addToCart = OLEDRION_URL.'language/english/addtocart.png';
- $addToWishList = OLEDRION_URL.'language/english/addtowishlist.png';
+ $addToCart = OLEDRION_URL.'language/english/image/addtocart.png';
+ $addToWishList = OLEDRION_URL.'language/english/image/addtowishlist.png';
}
$xoopsTpl->assign('addToCartImage', $addToCart);
$xoopsTpl->assign('addToWishList', $addToWishList);
Modified: XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_product.html
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_product.html 2013-02-18 18:19:19 UTC (rev 11060)
+++ XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_product.html 2013-02-18 18:36:55 UTC (rev 11061)
@@ -36,13 +36,19 @@
</script>
<{/if}>
- <script type="text/javascript">
- jQuery().ready(function() {
- // Effet lightview
- jQuery("a[rel^='prettyPhoto']").prettyPhoto({
- theme: 'light_rounded'
- });
- });
+ <script type="text/javascript">
+ $(function() {
+ $('.gallery a').lightBox({
+ imageLoading:'<{$smarty.const.OLEDRION_URL}>language/<{$xoops_language}>/images/lightbox-ico-loading.gif',
+ imageBtnClose:'<{$smarty.const.OLEDRION_URL}>language/<{$xoops_language}>/images/lightbox-btn-close.gif',
+ imageBtnNext:'<{$smarty.const.OLEDRION_URL}>language/<{$xoops_language}>/images/lightbox-btn-next.gif',
+ imageBtnPrev:'<{$smarty.const.OLEDRION_URL}>language/<{$xoops_language}>/images/lightbox-btn-prev.gif',
+ imageBlank:'<{$smarty.const.OLEDRION_URL}>language/<{$xoops_language}>/images/lightbox-blank.gif',
+ txtImage: '<{$smarty.const._NEWS_MD_LIGHTBOX_IMAGE}>',
+ overlayOpacity: 0.6,
+ containerResizeSpeed: 350,
+ });
+ });
</script>
<!--*********** HEADER ********-->
<div id="oledrion-logo">
@@ -87,11 +93,11 @@
<tr>
<td class="top">
<{if $product.product_thumb_full_url != ''}>
- <div class="oledrion_productthumb-big">
+ <div class="oledrion_productthumb-big gallery">
<!-- Old way to see the product's picture -->
<!-- <a href="javascript:openWithSelfMain('<{$smarty.const.OLEDRION_URL}>media.php?product_id=<{$product.product_id}>&type=picture', '',<{$smarty.const.OLEDRION_POPUP_MEDIA_WIDTH}>, <{$smarty.const.OLEDRION_POPUP_MEDIA_HEIGHT}>);" title="<{$product.product_href_title}>"> <img src="<{$product.product_thumb_full_url}>" alt="<{$product.product_href_title}>" /></a> -->
<!-- With a ligthview effect -->
- <a href="<{$product.product_image_full_url}>" rel="prettyPhoto" title="<{$product.product_href_title}>"> <img src="<{$product.product_thumb_full_url}>" alt="<{$product.product_href_title}>" /></a>
+ <a href="<{$product.product_image_full_url}>" title="<{$product.product_href_title}>"> <img src="<{$product.product_thumb_full_url}>" alt="<{$product.product_href_title}>" /></a>
</div>
<{/if}>
</td>
|
|
From: <vo...@us...> - 2013-02-19 08:14:58
|
Revision: 11065
http://sourceforge.net/p/xoops/svn/11065
Author: voltan1
Date: 2013-02-19 08:14:48 +0000 (Tue, 19 Feb 2013)
Log Message:
-----------
fix template
Modified Paths:
--------------
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_utils.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/main.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/modinfo.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/main.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/modinfo.php
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_product.html
XoopsModules/oledrion/branches/voltan/oledrion/xoops_version.php
Added Paths:
-----------
XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/
XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/addtocart.png
XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/addtowishlist.png
XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/index.html
XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-blank.gif
XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-btn-close.gif
XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-btn-next.gif
XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-btn-prev.gif
XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-ico-loading.gif
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/addtocart.png
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/addtowishlist.png
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/index.html
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-blank.gif
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-btn-close.gif
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-btn-next.gif
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-btn-prev.gif
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-ico-loading.gif
Removed Paths:
-------------
XoopsModules/oledrion/branches/voltan/oledrion/language/english/images/
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/images/
Modified: XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_utils.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_utils.php 2013-02-19 07:06:58 UTC (rev 11064)
+++ XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_utils.php 2013-02-19 08:14:48 UTC (rev 11065)
@@ -1454,11 +1454,9 @@
} else {
$fileToCall = OLEDRION_JS_URL.$javascriptFile;
}
- if(!$oldWay && isset($xoTheme)) {
- $xoTheme->addScript($fileToCall);
- } else {
- echo "<script type=\"text/javascript\" src=\"".$fileToCall."\"></script>\n";
- }
+
+ $xoTheme->addScript("browse.php?Frameworks/jquery/jquery.js");
+ $xoTheme->addScript($fileToCall);
}
/**
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/addtocart.png
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/addtocart.png
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/addtocart.png 2013-02-19 07:06:58 UTC (rev 11064)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/addtocart.png 2013-02-19 08:14:48 UTC (rev 11065)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/addtocart.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/addtowishlist.png
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/addtowishlist.png
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/addtowishlist.png 2013-02-19 07:06:58 UTC (rev 11064)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/addtowishlist.png 2013-02-19 08:14:48 UTC (rev 11065)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/addtowishlist.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/index.html
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/index.html (rev 0)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/index.html 2013-02-19 08:14:48 UTC (rev 11065)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/index.html
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-blank.gif
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-blank.gif
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-blank.gif 2013-02-19 07:06:58 UTC (rev 11064)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-blank.gif 2013-02-19 08:14:48 UTC (rev 11065)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-blank.gif
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-btn-close.gif
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-btn-close.gif
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-btn-close.gif 2013-02-19 07:06:58 UTC (rev 11064)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-btn-close.gif 2013-02-19 08:14:48 UTC (rev 11065)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-btn-close.gif
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-btn-next.gif
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-btn-next.gif
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-btn-next.gif 2013-02-19 07:06:58 UTC (rev 11064)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-btn-next.gif 2013-02-19 08:14:48 UTC (rev 11065)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-btn-next.gif
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-btn-prev.gif
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-btn-prev.gif
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-btn-prev.gif 2013-02-19 07:06:58 UTC (rev 11064)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-btn-prev.gif 2013-02-19 08:14:48 UTC (rev 11065)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-btn-prev.gif
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-ico-loading.gif
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-ico-loading.gif
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-ico-loading.gif 2013-02-19 07:06:58 UTC (rev 11064)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-ico-loading.gif 2013-02-19 08:14:48 UTC (rev 11065)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/lightbox-ico-loading.gif
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Modified: XoopsModules/oledrion/branches/voltan/oledrion/language/english/main.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/english/main.php 2013-02-19 07:06:58 UTC (rev 11064)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/english/main.php 2013-02-19 08:14:48 UTC (rev 11065)
@@ -240,7 +240,6 @@
define("_OLEDRION_PAY_ONLINE","Do you want to pay Online?");
define("_OLEDRION_FINISH","Your order is finalized");
-//define("_OLEDRION_ECOTAXE","Ecotax");
define("_OLEDRION_DELIVERY_TIME","Delivery");
define("_OLEDRION_IN_DAYS","in days");
define("_OLEDRION_DAYS","days");
Modified: XoopsModules/oledrion/branches/voltan/oledrion/language/english/modinfo.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/english/modinfo.php 2013-02-19 07:06:58 UTC (rev 11064)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/english/modinfo.php 2013-02-19 08:14:48 UTC (rev 11065)
@@ -247,4 +247,5 @@
define("_MI_OLEDRION_BREAK_COMMENT_NOTIFICATION",'Comments and Notifications');
define("_MI_OLEDRION_BREAK_SEARCH",'Search');
-define("_MI_OLEDRION_BREAK_IMAGE",'Image');
\ No newline at end of file
+define("_MI_OLEDRION_BREAK_IMAGE",'Image');
+?>
\ No newline at end of file
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/addtocart.png
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/addtocart.png
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/addtocart.png 2013-02-19 07:06:58 UTC (rev 11064)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/addtocart.png 2013-02-19 08:14:48 UTC (rev 11065)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/addtocart.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/addtowishlist.png
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/addtowishlist.png
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/addtowishlist.png 2013-02-19 07:06:58 UTC (rev 11064)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/addtowishlist.png 2013-02-19 08:14:48 UTC (rev 11065)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/addtowishlist.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/index.html
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/index.html (rev 0)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/index.html 2013-02-19 08:14:48 UTC (rev 11065)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/index.html
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-blank.gif
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-blank.gif
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-blank.gif 2013-02-19 07:06:58 UTC (rev 11064)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-blank.gif 2013-02-19 08:14:48 UTC (rev 11065)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-blank.gif
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-btn-close.gif
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-btn-close.gif
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-btn-close.gif 2013-02-19 07:06:58 UTC (rev 11064)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-btn-close.gif 2013-02-19 08:14:48 UTC (rev 11065)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-btn-close.gif
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-btn-next.gif
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-btn-next.gif
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-btn-next.gif 2013-02-19 07:06:58 UTC (rev 11064)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-btn-next.gif 2013-02-19 08:14:48 UTC (rev 11065)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-btn-next.gif
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-btn-prev.gif
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-btn-prev.gif
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-btn-prev.gif 2013-02-19 07:06:58 UTC (rev 11064)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-btn-prev.gif 2013-02-19 08:14:48 UTC (rev 11065)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-btn-prev.gif
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Added: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-ico-loading.gif
===================================================================
(Binary files differ)
Index: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-ico-loading.gif
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-ico-loading.gif 2013-02-19 07:06:58 UTC (rev 11064)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-ico-loading.gif 2013-02-19 08:14:48 UTC (rev 11065)
Property changes on: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/lightbox-ico-loading.gif
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+image/gif
\ No newline at end of property
Modified: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/main.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/persian/main.php 2013-02-19 07:06:58 UTC (rev 11064)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/persian/main.php 2013-02-19 08:14:48 UTC (rev 11065)
@@ -19,7 +19,7 @@
* Version : $Id:
* ****************************************************************************
*/
-
+define("_AM_OLEDRION_COUNTRY","کشور");
define("_OLEDRION_SEARCHFOR","جستجو برای");
define("_OLEDRION_SEARCH","جستجو");
define("_OLEDRION_CATEGORYC","شاخه: ");
@@ -242,7 +242,6 @@
define("_OLEDRION_PAY_ONLINE","پرداخت بصورت آنلاین ؟");
define("_OLEDRION_FINISH","تایید نهایی");
-define("_OLEDRION_ECOTAXE","Ecotaxe");
define("_OLEDRION_DELIVERY_TIME","زمان تحویل");
define("_OLEDRION_IN_DAYS","در روز");
define("_OLEDRION_DAYS","روز");
Modified: XoopsModules/oledrion/branches/voltan/oledrion/language/persian/modinfo.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/language/persian/modinfo.php 2013-02-19 07:06:58 UTC (rev 11064)
+++ XoopsModules/oledrion/branches/voltan/oledrion/language/persian/modinfo.php 2013-02-19 08:14:48 UTC (rev 11065)
@@ -208,6 +208,15 @@
define('_MI_OLEDRION_COLUMNS_CATEGORY', "تعداد ستون ها در هر شاخه");
define('_MI_OLEDRION_ADAPTED_LIST', "بیشترین تعداد محصولات برای نمایش قبل از جایگزین لیست با لیست تطبیق داده شده");
+define('_MI_OLEDRION_PRODUCT_PROPERTY1',"Product Property 1");
+define('_MI_OLEDRION_PRODUCT_PROPERTY2',"Product Property 2");
+define('_MI_OLEDRION_PRODUCT_PROPERTY3',"Product Property 3");
+define('_MI_OLEDRION_PRODUCT_PROPERTY4',"Product Property 4");
+define('_MI_OLEDRION_PRODUCT_PROPERTY5',"Product Property 5");
+define('_MI_OLEDRION_PRODUCT_PROPERTY_TITLE',"Title");
+define('_MI_OLEDRION_GATEWAY',"Gateway used by the module");
+
+
define("_MI_OLEDRION_BNAME1_DESC",'Shows recently added products titles');
define("_MI_OLEDRION_BNAME2_DESC",'Shows most viewed products titles');
define("_MI_OLEDRION_BNAME3_DESC",'Show categories in relation with the category page');
@@ -223,6 +232,7 @@
define("_MI_OLEDRION_BNAME13_DESC",'Shows recent public lists according to the current category');
define("_MI_OLEDRION_BNAME14_DESC",'Shows random lists');
define("_MI_OLEDRION_BNAME15_DESC",'Shows most viewed lists');
+define("_MI_OLEDRION_BNAME16_DESC",'Shows ajax search form');
define("_MI_OLEDRION_SEARCH_CATEGORY",'Show category');
define("_MI_OLEDRION_SEARCH_MANUFACTURERS",'Show Manufacturers');
Modified: XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_product.html
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_product.html 2013-02-19 07:06:58 UTC (rev 11064)
+++ XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_product.html 2013-02-19 08:14:48 UTC (rev 11065)
@@ -35,21 +35,7 @@
});
</script>
<{/if}>
-
- <script type="text/javascript">
- $(function() {
- $('.gallery a').lightBox({
- imageLoading:'<{$smarty.const.OLEDRION_URL}>language/<{$xoops_language}>/images/lightbox-ico-loading.gif',
- imageBtnClose:'<{$smarty.const.OLEDRION_URL}>language/<{$xoops_language}>/images/lightbox-btn-close.gif',
- imageBtnNext:'<{$smarty.const.OLEDRION_URL}>language/<{$xoops_language}>/images/lightbox-btn-next.gif',
- imageBtnPrev:'<{$smarty.const.OLEDRION_URL}>language/<{$xoops_language}>/images/lightbox-btn-prev.gif',
- imageBlank:'<{$smarty.const.OLEDRION_URL}>language/<{$xoops_language}>/images/lightbox-blank.gif',
- txtImage: '<{$smarty.const._NEWS_MD_LIGHTBOX_IMAGE}>',
- overlayOpacity: 0.6,
- containerResizeSpeed: 350,
- });
- });
- </script>
+
<!--*********** HEADER ********-->
<div id="oledrion-logo">
<{* Display category's advertisement and if it does not exists, the module's advertisement *}>
@@ -91,14 +77,61 @@
</td>
</tr>
<tr>
- <td class="top">
+ <td class="top">
+ <!--********* VOTES ******-->
+ <{if $canRateProducts}>
+ <div class="oledrion_rating">
+ <div class="floatleft"><{$smarty.const._OLEDRION_RATINGC}> <{$product.product_rating_formated}> (<{$product.product_votes_count}>)</div>
+ <div class="vote">
+ <input value="<{$product.product_rating_formated}>" step="1" id="backing<{$product.product_id}>" type="range">
+ <div class="floatleft rateit" data-url="<{$smarty.const.OLEDRION_URL}>ajax.php?op=rate" data-product="<{$product.product_id}>" data-rateit-backingfld="#backing<{$product.product_id}>" data-rateit-resetable="false" data-rateit-ispreset="true" data-rateit-min="0" data-rateit-max="10"></div>
+ </div>
+ <{if $userCanRate}>
+ <script type="text/javascript">
+ $('.vote .rateit').bind('rated reset', function (e) {
+ var ri = $(this);
+ var rating = ri.rateit('vote');
+ var product_id = ri.data('product');
+ var url = ri.data('url');
+ ri.rateit('readonly', true);
+ $.ajax({
+ url: url,
+ data: { product_id: product_id, rating: rating},
+ type: 'POST',
+ dataType: "json",
+ success:function (result) {
+ if (!result.status == 1) {
+ alert(result.message);
+ }
+ }
+ });
+ });
+ </script>
+ <{/if}>
+ <div class="clear"></div>
+ </div>
+ <{/if}>
+ <!--********* /VOTES ******-->
<{if $product.product_thumb_full_url != ''}>
- <div class="oledrion_productthumb-big gallery">
- <!-- Old way to see the product's picture -->
- <!-- <a href="javascript:openWithSelfMain('<{$smarty.const.OLEDRION_URL}>media.php?product_id=<{$product.product_id}>&type=picture', '',<{$smarty.const.OLEDRION_POPUP_MEDIA_WIDTH}>, <{$smarty.const.OLEDRION_POPUP_MEDIA_HEIGHT}>);" title="<{$product.product_href_title}>"> <img src="<{$product.product_thumb_full_url}>" alt="<{$product.product_href_title}>" /></a> -->
- <!-- With a ligthview effect -->
- <a href="<{$product.product_image_full_url}>" title="<{$product.product_href_title}>"> <img src="<{$product.product_thumb_full_url}>" alt="<{$product.product_href_title}>" /></a>
- </div>
+ <script type="text/javascript">
+ $(function() {
+ $('.lightbox').lightBox({
+ imageLoading:'<{$smarty.const.OLEDRION_URL}>language/<{$xoops_language}>/images/lightbox-ico-loading.gif',
+ imageBtnClose:'<{$smarty.const.OLEDRION_URL}>language/<{$xoops_language}>/images/lightbox-btn-close.gif',
+ imageBtnNext:'<{$smarty.const.OLEDRION_URL}>language/<{$xoops_language}>/images/lightbox-btn-next.gif',
+ imageBtnPrev:'<{$smarty.const.OLEDRION_URL}>language/<{$xoops_language}>/images/lightbox-btn-prev.gif',
+ imageBlank:'<{$smarty.const.OLEDRION_URL}>language/<{$xoops_language}>/images/lightbox-blank.gif',
+ txtImage: '<{$smarty.const._NEWS_MD_LIGHTBOX_IMAGE}>',
+ overlayOpacity: 0.6,
+ containerResizeSpeed: 350
+ });
+ });
+ </script>
+ <div class="oledrion_productthumb-big">
+ <a class="lightbox" href="<{$product.product_image_full_url}>" title="<{$product.product_href_title}>">
+ <img src="<{$product.product_thumb_full_url}>" alt="<{$product.product_href_title}>" />
+ </a>
+ </div>
<{/if}>
</td>
<td class="top">
@@ -114,62 +147,61 @@
<{/if}>
<!-- Price box -->
<{if $mod_pref.use_price}>
- <div class="oledrion_productprice_view-product">
- <div class="oledrion_view-product_price">
- <{if $product.product_stock == 0 }>
- <{$mod_pref.nostock_msg}>
- <{elseif count($product.product_attributes) == 0 }>
- <span class="oledrion_productdescription-contentTitles"><{$smarty.const._OLEDRION_PRICE}></span>: <a href="<{$smarty.const.OLEDRION_URL}>caddy.php?op=addproduct&product_id=<{$product.product_id}>" title="<{$smarty.const._OLEDRION_ADD_TO_CART}>">
- <{if $product.product_discount_price_ttc != ''}>
- <s><{$product.product_price_ttc_long}> </s> <{$product.product_discount_price_ttc}>
- <{else}>
- <{$product.product_price_ttc_long}>
- <{/if}>
-
- <img src="<{$smarty.const.OLEDRION_IMAGES_URL}>cartadd.png" alt="" /></a>
- <{if $product.product_ecotaxe != ''}>
- <div class="oledrion_view-product_price_ecotaxe"><span class="oledrion_productdescription-contentTitles"><{$smarty.const._OLEDRION_ECOTAXE}></span> : <{$product.product_ecotaxe_formated}></div>
- <{/if}>
- <{else}>
- <div class="oledrion_view-product_price_frmcart">
- <form method="post" name="frmCart" id="frmCart" action="<{$smarty.const.OLEDRION_URL}>caddy.php?op=addproduct&product_id=<{$product.product_id}>">
- <table class="tablefix">
+ <div class="oledrion_productprice_view-product">
+ <div class="oledrion_view-product_price">
+ <{if $product.product_stock == 0 }>
+ <{$mod_pref.nostock_msg}>
+ <{elseif count($product.product_attributes) == 0 }>
+ <span class="oledrion_productdescription-contentTitles"><{$smarty.const._OLEDRION_PRICE}></span>: <a href="<{$smarty.const.OLEDRION_URL}>caddy.php?op=addproduct&product_id=<{$product.product_id}>" title="<{$smarty.const._OLEDRION_ADD_TO_CART}>">
+ <{if $product.product_discount_price_ttc != ''}>
+ <s><{$product.product_price_ttc_long}> </s> <{$product.product_discount_price_ttc}>
+ <{else}>
+ <{$product.product_price_ttc_long}>
+ <{/if}>
+ <img src="<{$smarty.const.OLEDRION_IMAGES_URL}>cartadd.png" alt="" /></a>
+ <{if $product.product_ecotaxe != ''}>
+ <div class="oledrion_view-product_price_ecotaxe"><span class="oledrion_productdescription-contentTitles"><{$smarty.const._OLEDRION_ECOTAXE}></span> : <{$product.product_ecotaxe_formated}></div>
+ <{/if}>
+ <{else}>
+ <div class="oledrion_view-product_price_frmcart">
+ <form method="post" name="frmCart" id="frmCart" action="<{$smarty.const.OLEDRION_URL}>caddy.php?op=addproduct&product_id=<{$product.product_id}>">
+ <table class="tablefix">
<tr>
<td>
<{foreach item=attribute from=$product.product_attributes}>
- <div class="pad2"><{$attribute}></div>
+ <div class="pad2"><{$attribute}></div>
<{/foreach}>
</td>
<td>
<span class="oledrion_productdescription-contentTitles"><{$smarty.const._OLEDRION_PRICE}></span> : <{if $product.product_discount_price_ttc != ''}>
- <s><{$product.product_price_ttc}> </s> <b><{$produ...
[truncated message content] |
|
From: <vo...@us...> - 2013-02-20 09:37:30
|
Revision: 11078
http://sourceforge.net/p/xoops/svn/11078
Author: voltan1
Date: 2013-02-20 09:37:26 +0000 (Wed, 20 Feb 2013)
Log Message:
-----------
Fix style url
Modified Paths:
--------------
XoopsModules/oledrion/branches/voltan/oledrion/manufacturer.php
XoopsModules/oledrion/branches/voltan/oledrion/product.php
Modified: XoopsModules/oledrion/branches/voltan/oledrion/manufacturer.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/manufacturer.php 2013-02-20 08:05:11 UTC (rev 11077)
+++ XoopsModules/oledrion/branches/voltan/oledrion/manufacturer.php 2013-02-20 09:37:26 UTC (rev 11078)
@@ -87,8 +87,9 @@
oledrion_utils::setLocalCSS($xoopsConfig['language']);
oledrion_utils::loadLanguageFile('modinfo.php');
-$xoopsTpl->assign('global_advert', oledrion_utils::getModuleOption('advertisement'));
-$breadcrumb = array(OLEDRION_URL.'whoswho.php' => _OLEDRION_MANUFACTURERS,
+$xoopsTpl->assign('global_advert', oledrion_utils::getModuleOption('advertisement'));
+// By voltan
+$breadcrumb = array(/*OLEDRION_URL.'whoswho.php' => _OLEDRION_MANUFACTURERS,*/
OLEDRION_URL.basename(__FILE__) => $manufacturer->getVar('manu_name').' '.$manufacturer->getVar('manu_commercialname'));
$xoopsTpl->assign('breadcrumb', oledrion_utils::breadcrumb($breadcrumb));
Modified: XoopsModules/oledrion/branches/voltan/oledrion/product.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/product.php 2013-02-20 08:05:11 UTC (rev 11077)
+++ XoopsModules/oledrion/branches/voltan/oledrion/product.php 2013-02-20 09:37:26 UTC (rev 11078)
@@ -74,7 +74,7 @@
$xoopsConfig['sitename'] = $title;
xoops_header(false);
// Inclusion de la feuille de style du module
- $url = OLEDRION_URL.'include/oledrion.css';
+ $url = OLEDRION_URL.'css/oledrion.css';
echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"$url\" />";
echo "</head><body>";
if(!isset($xoopsTpl)) {
@@ -453,7 +453,7 @@
require_once XOOPS_ROOT_PATH.'/include/comment_view.php';
require_once XOOPS_ROOT_PATH.'/footer.php';
} elseif(isset($_GET['op']) && $_GET['op'] == 'print') { // Version imprimable de la page
- $xoopsTpl->display('db:oledrion_product.html');
+ $xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/oledrion/templates/oledrion_product.html');
xoops_footer();
}
?>
\ No newline at end of file
|
|
From: <be...@us...> - 2013-07-03 23:18:44
|
Revision: 11808
http://sourceforge.net/p/xoops/svn/11808
Author: beckmi
Date: 2013-07-03 23:18:37 +0000 (Wed, 03 Jul 2013)
Log Message:
-----------
Adding new changes from Voltan
Modified Paths:
--------------
XoopsModules/oledrion/branches/voltan/oledrion/admin/about.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/categories.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/dashboard.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/discounts.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/files.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/gateways.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/lists.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/lowstock.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/manufacturers.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/newsletter.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/orders.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/products.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/property.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/texts.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/vat.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/vendors.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/admin_footer.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/admin_header.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/exports/csv.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/exports/dbase.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/exports/export.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/exports/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/functions.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/gateway.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/gateway.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/language/english/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/language/english/main.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/language/french/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/language/french/main.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/language/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/index.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/menu.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/productsselector.php
XoopsModules/oledrion/branches/voltan/oledrion/ajax.php
XoopsModules/oledrion/branches/voltan/oledrion/all-lists.php
XoopsModules/oledrion/branches/voltan/oledrion/all-products.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/index.html
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_ajax_search.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_best_sales.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_block_tag.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_cart.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_categories.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_categoy_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_mostviewed_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_my_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_new.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_promotion.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_random.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_random_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_rated.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_recent_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_recentlysold.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_recommended.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_top.php
XoopsModules/oledrion/branches/voltan/oledrion/caddy.php
XoopsModules/oledrion/branches/voltan/oledrion/cancel-payment.php
XoopsModules/oledrion/branches/voltan/oledrion/categories-map.php
XoopsModules/oledrion/branches/voltan/oledrion/category.php
XoopsModules/oledrion/branches/voltan/oledrion/cgv.php
XoopsModules/oledrion/branches/voltan/oledrion/changelog.php
XoopsModules/oledrion/branches/voltan/oledrion/checkout.php
XoopsModules/oledrion/branches/voltan/oledrion/class/PersistableObjectHandler.php
XoopsModules/oledrion/branches/voltan/oledrion/class/classheader.php
XoopsModules/oledrion/branches/voltan/oledrion/class/index.html
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_attributes.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_caddy.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_caddy_attributes.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_cat.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_commands.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_currency.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_discounts.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_files.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_gateways.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_gateways_options.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_handlers.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_manufacturer.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_parameters.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_persistent_cart.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_plugins.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_products.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_products_list.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_productsmanu.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_reductions.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_related.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_shelf.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_shelf_parameters.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_utils.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_vat.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_vendors.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_votedata.php
XoopsModules/oledrion/branches/voltan/oledrion/class/registryfile.php
XoopsModules/oledrion/branches/voltan/oledrion/class/tree.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_delete.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_edit.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_new.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_post.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_reply.php
XoopsModules/oledrion/branches/voltan/oledrion/config.php
XoopsModules/oledrion/branches/voltan/oledrion/css/autocomplete.css
XoopsModules/oledrion/branches/voltan/oledrion/css/index.html
XoopsModules/oledrion/branches/voltan/oledrion/css/oledrion.css
XoopsModules/oledrion/branches/voltan/oledrion/css/print.css
XoopsModules/oledrion/branches/voltan/oledrion/css/validate.css
XoopsModules/oledrion/branches/voltan/oledrion/docs/changelog.txt
XoopsModules/oledrion/branches/voltan/oledrion/download.php
XoopsModules/oledrion/branches/voltan/oledrion/extra/clone.php
XoopsModules/oledrion/branches/voltan/oledrion/extra/index.html
XoopsModules/oledrion/branches/voltan/oledrion/extra/modules/index.html
XoopsModules/oledrion/branches/voltan/oledrion/extra/modules/rss/index.html
XoopsModules/oledrion/branches/voltan/oledrion/extra/modules/rss/plugins/index.html
XoopsModules/oledrion/branches/voltan/oledrion/extra/modules/rss/plugins/rssfit.oledrion.php
XoopsModules/oledrion/branches/voltan/oledrion/extra/modules/sitemap/index.html
XoopsModules/oledrion/branches/voltan/oledrion/extra/modules/sitemap/plugins/index.html
XoopsModules/oledrion/branches/voltan/oledrion/extra/modules/sitemap/plugins/oledrion.php
XoopsModules/oledrion/branches/voltan/oledrion/gateway-notify.php
XoopsModules/oledrion/branches/voltan/oledrion/header.php
XoopsModules/oledrion/branches/voltan/oledrion/include/comment_functions.php
XoopsModules/oledrion/branches/voltan/oledrion/include/common.php
XoopsModules/oledrion/branches/voltan/oledrion/include/functions.php
XoopsModules/oledrion/branches/voltan/oledrion/include/index.html
XoopsModules/oledrion/branches/voltan/oledrion/include/notification.inc.php
XoopsModules/oledrion/branches/voltan/oledrion/include/plugin.tag.php
XoopsModules/oledrion/branches/voltan/oledrion/include/product_search_form.php
XoopsModules/oledrion/branches/voltan/oledrion/include/search.inc.php
XoopsModules/oledrion/branches/voltan/oledrion/index.php
XoopsModules/oledrion/branches/voltan/oledrion/invoice.php
XoopsModules/oledrion/branches/voltan/oledrion/js/attributes.js
XoopsModules/oledrion/branches/voltan/oledrion/language/english/admin.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/blocks.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/help/help.html
XoopsModules/oledrion/branches/voltan/oledrion/language/english/help/index.html
XoopsModules/oledrion/branches/voltan/oledrion/language/english/index.html
XoopsModules/oledrion/branches/voltan/oledrion/language/english/mail_template/command_client.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/english/mail_template/command_shop.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/english/mail_template/global_newcategory_notify.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/english/mail_template/index.html
XoopsModules/oledrion/branches/voltan/oledrion/language/english/main.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/modinfo.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/newsletter.php
XoopsModules/oledrion/branches/voltan/oledrion/language/index.html
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/admin.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/blocks.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/index.html
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/index.html
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/mail_template/command_client.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/mail_template/command_client_verified.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/mail_template/command_shop.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/mail_template/command_shop_failed.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/mail_template/global_newcategory_notify.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/mail_template/index.html
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/main.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/modinfo.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/newsletter.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/style.css
XoopsModules/oledrion/branches/voltan/oledrion/list.php
XoopsModules/oledrion/branches/voltan/oledrion/list.tag.php
XoopsModules/oledrion/branches/voltan/oledrion/manufacturer.php
XoopsModules/oledrion/branches/voltan/oledrion/media.php
XoopsModules/oledrion/branches/voltan/oledrion/my-lists.php
XoopsModules/oledrion/branches/voltan/oledrion/notification_update.php
XoopsModules/oledrion/branches/voltan/oledrion/paypal-notify.php
XoopsModules/oledrion/branches/voltan/oledrion/plugins/actions/newelements/plugins.php
XoopsModules/oledrion/branches/voltan/oledrion/plugins/models/oledrion_action.php
XoopsModules/oledrion/branches/voltan/oledrion/plugins/models/oledrion_filter.php
XoopsModules/oledrion/branches/voltan/oledrion/product.php
XoopsModules/oledrion/branches/voltan/oledrion/rate-product.php
XoopsModules/oledrion/branches/voltan/oledrion/recommended.php
XoopsModules/oledrion/branches/voltan/oledrion/rss.php
XoopsModules/oledrion/branches/voltan/oledrion/search.php
XoopsModules/oledrion/branches/voltan/oledrion/sql/index.html
XoopsModules/oledrion/branches/voltan/oledrion/sql/mysql.sql
XoopsModules/oledrion/branches/voltan/oledrion/templates/admin/oledrion_order_print.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_ajax_search.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_bestsales.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_cart.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_category_lists.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_mostviewed_lists.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_my_lists.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_new.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_promotion.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_random.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_random_lists.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_rated.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_recent_lists.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_recentlysold.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_recommended.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_top.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_all_lists.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_allproducts.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_caddy.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_cancelpurchase.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_categories_list.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_category.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_cgv.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_command.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_index.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_list.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_manufacturer.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_map.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_mylists.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_product.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_rate_product.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_recommended.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_search.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_thankyou.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_whoswho.html
XoopsModules/oledrion/branches/voltan/oledrion/thankyou.php
XoopsModules/oledrion/branches/voltan/oledrion/view.tag.php
XoopsModules/oledrion/branches/voltan/oledrion/whoswho.php
XoopsModules/oledrion/branches/voltan/oledrion/xoops_version.php
Added Paths:
-----------
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/delivery.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/location.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/maintain.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/packing.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/payment.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/gateway.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/english/
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/english/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/english/main.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/persian/
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/persian/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/persian/main.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/nusoap.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24.tar.gz
XoopsModules/oledrion/branches/voltan/oledrion/blocks/.directory
XoopsModules/oledrion/branches/voltan/oledrion/class/.directory
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_delivery.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_delivery_payment.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_location.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_location_delivery.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_packing.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_payment.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_payment_log.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_fast.php
XoopsModules/oledrion/branches/voltan/oledrion/include/functions_install.php
XoopsModules/oledrion/branches/voltan/oledrion/include/functions_update.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/step1.png
XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/step2.png
XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/step3.png
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/step1.png
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/step2.png
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/step3.png
XoopsModules/oledrion/branches/voltan/oledrion/templates/.directory
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/.directory
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_product_box.html
Removed Paths:
-------------
XoopsModules/oledrion/branches/voltan/oledrion/admin/dbupdate.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/main.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/tablefunctions.php
XoopsModules/oledrion/branches/voltan/oledrion/class/PEAR.php
XoopsModules/oledrion/branches/voltan/oledrion/class/PEAR5.php
XoopsModules/oledrion/branches/voltan/oledrion/class/lite.php
XoopsModules/oledrion/branches/voltan/oledrion/include/validate.css
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_caddy1.html
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/about.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/about.php 2013-07-03 20:01:14 UTC (rev 11807)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/about.php 2013-07-03 23:18:37 UTC (rev 11808)
@@ -1,22 +1,22 @@
<?php
-/**
- * Birthday module
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright The XOOPS Project (http://www.xoops.org)
- * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
- * @package birthday
- * @since 2.5.0
- * @author XOOPS Module Team
- * @version $Id $
- **/
-
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * oledrion
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Hervé Thouzard (http://www.herve-thouzard.com/)
+ * @version $Id$
+ */
include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php 2013-07-03 20:01:14 UTC (rev 11807)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php 2013-07-03 23:18:37 UTC (rev 11808)
@@ -1,30 +1,28 @@
<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
/**
- * ****************************************************************************
- * oledrion - MODULE FOR XOOPS
- * Copyright (c) Hervé Thouzard (http://www.herve-thouzard.com/)
+ * oledrion
*
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright Hervé Thouzard (http://www.herve-thouzard.com/)
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package oledrion
- * @author Hervé Thouzard (http://www.herve-thouzard.com/)
- *
- * Version : $Id:
- * ****************************************************************************
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Hervé Thouzard (http://www.herve-thouzard.com/)
+ * @version $Id$
*/
/**
* Gestion des attributs produits
*/
-if(!defined("OLEDRION_ADMIN")) exit();
-global $baseurl; // Pour faire taire les warnings de Zend Studio
+if (!defined("OLEDRION_ADMIN")) exit();
+global $baseurl; // Pour faire taire les warnings de Zend Studio
$operation = 'attributes';
/**
@@ -34,305 +32,303 @@
*/
function removeAttributInSession()
{
- if(isset($_SESSION['oledrion_attribute'])) {
+ if (isset($_SESSION['oledrion_attribute'])) {
$_SESSION['oledrion_attribute'] = null;
unset($_SESSION['oledrion_attribute']);
}
}
-switch($action) {
- // ****************************************************************************************************************
- case 'default': // Liste des attributs produits
+switch ($action) {
// ****************************************************************************************************************
+ case 'default': // Liste des attributs produits
+ // ****************************************************************************************************************
xoops_cp_header();
- oledrion_adminMenu(13);
- global $xoopsConfig;
- $productsIds = $products = $productsIdsForList = $productsForList = array();
+
+ global $xoopsConfig;
+ $productsIds = $products = $productsIdsForList = $productsForList = array();
$class = '';
removeAttributInSession();
- $form = "<form method='post' action='$baseurl' name='frmadd$operation' id='frmadd$operation'><input type='hidden' name='op' id='op' value='$operation' /><input type='hidden' name='action' id='action' value='add' /><input type='submit' name='btngo' id='btngo' value='"._AM_OLEDRION_ADD_ITEM."' /></form>";
- echo $form;
+ $form = "<form method='post' action='$baseurl' name='frmadd$operation' id='frmadd$operation'><input type='hidden' name='op' id='op' value='$operation' /><input type='hidden' name='action' id='action' value='add' /><input type='submit' name='btngo' id='btngo' value='" . _AM_OLEDRION_ADD_ITEM . "' /></form>";
+ echo $form;
- oledrion_utils::htitle(_AM_OLEDRION_ATTRIBUTES_LIST, 4);
+ oledrion_utils::htitle(_AM_OLEDRION_ATTRIBUTES_LIST, 4);
$start = isset($_GET['start']) ? intval($_GET['start']) : 0;
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('attribute_id', 0, '<>'));
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('attribute_id', 0, '<>'));
- $filter_attribute_id = $filter_attribute_id = $filter_attribute_weight = $filter_attribute_type = $filter_attribute_product_id = 0;
- $filter_attribute_title = '';
+ $filter_attribute_id = $filter_attribute_id = $filter_attribute_weight = $filter_attribute_type = $filter_attribute_product_id = 0;
+ $filter_attribute_title = '';
- $newFilter = false;
+ $newFilter = false;
- if(isset($_POST['filter_attribute_id'])) {
- if(intval($_POST['filter_attribute_id']) != 0) {
- $criteria->add(new Criteria('attribute_id', intval($_POST['filter_attribute_id']), '='));
- }
- $filter_attribute_id = intval($_POST['filter_attribute_id']);
- $newFilter = true;
- }
- if(isset($_POST['filter_attribute_title']) && xoops_trim($_POST['filter_attribute_title']) != '') {
- $criteria->add(new Criteria('attribute_title', '%'.$_POST['filter_attribute_title'].'%', 'LIKE'));
- $filter_attribute_title = $_POST['filter_attribute_title'];
- $newFilter = true;
- }
- if(isset($_POST['filter_attribute_product_id']) && intval($_POST['filter_attribute_product_id']) != 0) {
- $criteria->add(new Criteria('attribute_product_id', intval($_POST['filter_attribute_product_id']), '='));
- $filter_attribute_product_id = intval($_POST['filter_attribute_product_id']);
- $newFilter = true;
- }
- if(isset($_POST['filter_attribute_weight']) && intval($_POST['filter_attribute_weight']) != 0) {
- $criteria->add(new Criteria('attribute_weight', intval($_POST['filter_attribute_weight']), '='));
- $filter_attribute_weight = intval($_POST['filter_attribute_weight']);
- $newFilter = true;
- }
- if(isset($_POST['filter_attribute_type']) && intval($_POST['filter_attribute_type']) != 0) {
- $criteria->add(new Criteria('attribute_type', intval($_POST['filter_attribute_type']), '='));
- $filter_attribute_type = intval($_POST['filter_attribute_type']);
- $newFilter = true;
- }
+ if (isset($_POST['filter_attribute_id'])) {
+ if (intval($_POST['filter_attribute_id']) != 0) {
+ $criteria->add(new Criteria('attribute_id', intval($_POST['filter_attribute_id']), '='));
+ }
+ $filter_attribute_id = intval($_POST['filter_attribute_id']);
+ $newFilter = true;
+ }
+ if (isset($_POST['filter_attribute_title']) && xoops_trim($_POST['filter_attribute_title']) != '') {
+ $criteria->add(new Criteria('attribute_title', '%' . $_POST['filter_attribute_title'] . '%', 'LIKE'));
+ $filter_attribute_title = $_POST['filter_attribute_title'];
+ $newFilter = true;
+ }
+ if (isset($_POST['filter_attribute_product_id']) && intval($_POST['filter_attribute_product_id']) != 0) {
+ $criteria->add(new Criteria('at...
[truncated message content] |
|
From: <be...@us...> - 2014-02-07 11:05:25
|
Revision: 12290
http://sourceforge.net/p/xoops/svn/12290
Author: beckmi
Date: 2014-02-07 11:05:17 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
Changes from Voltan (see changelog)
Modified Paths:
--------------
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/categories.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/dashboard.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/delivery.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/discounts.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/files.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/gateways.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/lists.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/location.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/lowstock.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/maintain.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/manufacturers.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/newsletter.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/orders.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/packing.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/payment.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/products.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/property.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/texts.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/vat.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/vendors.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/exports/csv.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/exports/dbase.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/exports/export.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/functions.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/gateway.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/gateway.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/language/english/main.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/language/french/main.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/gateway.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/english/main.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/persian/main.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/nusoap.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/index.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/menu.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/productsselector.php
XoopsModules/oledrion/branches/voltan/oledrion/ajax.php
XoopsModules/oledrion/branches/voltan/oledrion/all-lists.php
XoopsModules/oledrion/branches/voltan/oledrion/all-products.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_ajax_search.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_best_sales.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_block_tag.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_cart.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_categories.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_categoy_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_mostviewed_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_my_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_new.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_promotion.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_random.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_random_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_rated.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_recent_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_recentlysold.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_recommended.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_top.php
XoopsModules/oledrion/branches/voltan/oledrion/caddy.php
XoopsModules/oledrion/branches/voltan/oledrion/cancel-payment.php
XoopsModules/oledrion/branches/voltan/oledrion/categories-map.php
XoopsModules/oledrion/branches/voltan/oledrion/category.php
XoopsModules/oledrion/branches/voltan/oledrion/cgv.php
XoopsModules/oledrion/branches/voltan/oledrion/checkout.php
XoopsModules/oledrion/branches/voltan/oledrion/class/.directory
XoopsModules/oledrion/branches/voltan/oledrion/class/PersistableObjectHandler.php
XoopsModules/oledrion/branches/voltan/oledrion/class/classheader.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_attributes.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_caddy.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_caddy_attributes.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_cat.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_commands.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_currency.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_delivery.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_delivery_payment.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_discounts.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_files.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_gateways.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_gateways_options.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_handlers.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_location.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_location_delivery.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_manufacturer.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_packing.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_parameters.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_payment.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_payment_log.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_persistent_cart.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_plugins.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_products.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_products_list.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_productsmanu.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_reductions.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_related.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_shelf.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_shelf_parameters.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_utils.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_vat.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_vendors.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_votedata.php
XoopsModules/oledrion/branches/voltan/oledrion/class/registryfile.php
XoopsModules/oledrion/branches/voltan/oledrion/class/tree.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/Canvas.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/Dimension.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/Exception.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/FileMapperFactory.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/Image.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/OpFactory.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/PaletteImage.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/TrueColorImage.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/WideImage.inc.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/fonts/Font_GDF.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/fonts/Font_TTF.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/mappers/ImageFileMapper_GD.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/mappers/ImageFileMapper_GD2.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/mappers/ImageFileMapper_GIF.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/mappers/ImageFileMapper_JPEG.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/mappers/ImageFileMapper_PNG.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/ApplyConvolution.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/ApplyFilter.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/ApplyMask.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/AsGrayscale.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/CopyChannelsPalette.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/CopyChannelsTrueColor.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/CorrectGamma.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/Crop.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/Flip.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/GetMask.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/Merge.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/Mirror.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/Resize.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/Rotate.class.php
XoopsModules/oledrion/branches/voltan/oledrion/class/wideimage/operations/Unsharp.class.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_delete.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_edit.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_fast.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_new.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_post.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_reply.php
XoopsModules/oledrion/branches/voltan/oledrion/config.php
XoopsModules/oledrion/branches/voltan/oledrion/css/autocomplete.css
XoopsModules/oledrion/branches/voltan/oledrion/css/oledrion.css
XoopsModules/oledrion/branches/voltan/oledrion/css/print.css
XoopsModules/oledrion/branches/voltan/oledrion/css/rateit.css
XoopsModules/oledrion/branches/voltan/oledrion/docs/changelog.txt
XoopsModules/oledrion/branches/voltan/oledrion/download.php
XoopsModules/oledrion/branches/voltan/oledrion/extra/clone.php
XoopsModules/oledrion/branches/voltan/oledrion/extra/modules/rss/plugins/rssfit.oledrion.php
XoopsModules/oledrion/branches/voltan/oledrion/extra/modules/sitemap/plugins/oledrion.php
XoopsModules/oledrion/branches/voltan/oledrion/gateway-notify.php
XoopsModules/oledrion/branches/voltan/oledrion/header.php
XoopsModules/oledrion/branches/voltan/oledrion/images/addtocart.png
XoopsModules/oledrion/branches/voltan/oledrion/images/cartadd.png
XoopsModules/oledrion/branches/voltan/oledrion/include/comment_functions.php
XoopsModules/oledrion/branches/voltan/oledrion/include/common.php
XoopsModules/oledrion/branches/voltan/oledrion/include/functions.php
XoopsModules/oledrion/branches/voltan/oledrion/include/functions_install.php
XoopsModules/oledrion/branches/voltan/oledrion/include/functions_update.php
XoopsModules/oledrion/branches/voltan/oledrion/include/notification.inc.php
XoopsModules/oledrion/branches/voltan/oledrion/include/plugin.tag.php
XoopsModules/oledrion/branches/voltan/oledrion/include/product_search_form.php
XoopsModules/oledrion/branches/voltan/oledrion/include/search.inc.php
XoopsModules/oledrion/branches/voltan/oledrion/index.php
XoopsModules/oledrion/branches/voltan/oledrion/invoice.php
XoopsModules/oledrion/branches/voltan/oledrion/js/tableWidget.js
XoopsModules/oledrion/branches/voltan/oledrion/language/english/admin.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/blocks.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/main.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/modinfo.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/newsletter.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/admin.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/blocks.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/main.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/modinfo.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/newsletter.php
XoopsModules/oledrion/branches/voltan/oledrion/list.php
XoopsModules/oledrion/branches/voltan/oledrion/list.tag.php
XoopsModules/oledrion/branches/voltan/oledrion/manufacturer.php
XoopsModules/oledrion/branches/voltan/oledrion/my-lists.php
XoopsModules/oledrion/branches/voltan/oledrion/notification_update.php
XoopsModules/oledrion/branches/voltan/oledrion/paypal-notify.php
XoopsModules/oledrion/branches/voltan/oledrion/plugins/actions/newelements/plugins.php
XoopsModules/oledrion/branches/voltan/oledrion/plugins/models/oledrion_action.php
XoopsModules/oledrion/branches/voltan/oledrion/plugins/models/oledrion_filter.php
XoopsModules/oledrion/branches/voltan/oledrion/product.php
XoopsModules/oledrion/branches/voltan/oledrion/rate-product.php
XoopsModules/oledrion/branches/voltan/oledrion/recommended.php
XoopsModules/oledrion/branches/voltan/oledrion/rss.php
XoopsModules/oledrion/branches/voltan/oledrion/search.php
XoopsModules/oledrion/branches/voltan/oledrion/sql/mysql.sql
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_bill.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_caddy.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_product.html
XoopsModules/oledrion/branches/voltan/oledrion/thankyou.php
XoopsModules/oledrion/branches/voltan/oledrion/view.tag.php
XoopsModules/oledrion/branches/voltan/oledrion/whoswho.php
XoopsModules/oledrion/branches/voltan/oledrion/xoops_version.php
Added Paths:
-----------
XoopsModules/oledrion/branches/voltan/oledrion/.directory
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_sms.php
XoopsModules/oledrion/branches/voltan/oledrion/class/sms/
XoopsModules/oledrion/branches/voltan/oledrion/class/sms/example/
XoopsModules/oledrion/branches/voltan/oledrion/class/sms/example/option.php
XoopsModules/oledrion/branches/voltan/oledrion/class/sms/example/sms.php
XoopsModules/oledrion/branches/voltan/oledrion/class/sms.zip
XoopsModules/oledrion/branches/voltan/oledrion/docs/todo.txt
XoopsModules/oledrion/branches/voltan/oledrion/images/delivery.png
XoopsModules/oledrion/branches/voltan/oledrion/images/icons/16/
XoopsModules/oledrion/branches/voltan/oledrion/images/icons/16/factory.png
XoopsModules/oledrion/branches/voltan/oledrion/images/icons/32/
XoopsModules/oledrion/branches/voltan/oledrion/images/icons/32/factory.png
XoopsModules/oledrion/branches/voltan/oledrion/images/icons/32/money_delete.png
XoopsModules/oledrion/branches/voltan/oledrion/images/icons/32/package.png
XoopsModules/oledrion/branches/voltan/oledrion/images/package.png
XoopsModules/oledrion/branches/voltan/oledrion/images/submit.png
XoopsModules/oledrion/branches/voltan/oledrion/images/track.png
XoopsModules/oledrion/branches/voltan/oledrion/include/directorychecker.php
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_bill_print.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_product_print.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_user.html
XoopsModules/oledrion/branches/voltan/oledrion/user.php
Removed Paths:
-------------
XoopsModules/oledrion/branches/voltan/oledrion/js/validate/lib/jquery.js
Added: XoopsModules/oledrion/branches/voltan/oledrion/.directory
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/.directory (rev 0)
+++ XoopsModules/oledrion/branches/voltan/oledrion/.directory 2014-02-07 11:05:17 UTC (rev 12290)
@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2013,11,21,10,10,32
+Version=3
+ViewMode=2
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php 2014-02-07 10:33:00 UTC (rev 12289)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php 2014-02-07 11:05:17 UTC (rev 12290)
@@ -554,4 +554,3 @@
exit;
break;
}
-?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/categories.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/categories.php 2014-02-07 10:33:00 UTC (rev 12289)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/categories.php 2014-02-07 11:05:17 UTC (rev 12290)
@@ -275,4 +275,3 @@
}
break;
}
-?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/dashboard.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/dashboard.php 2014-02-07 10:33:00 UTC (rev 12289)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/dashboard.php 2014-02-07 11:05:17 UTC (rev 12290)
@@ -27,19 +27,63 @@
case 'default': // Affichage du dashboard
// ****************************************************************************************************************
xoops_cp_header();
+
+ include_once dirname(dirname(dirname(__FILE__))) . '/include/directorychecker.php';
+
oledrion_utils::htitle(_MI_OLEDRION_ADMENU10, 4);
$indexAdmin = new ModuleAdmin();
- $indexAdmin->addConfigBoxLine(OLEDRION_UPLOAD_PATH, 'folder');
- $indexAdmin->addConfigBoxLine(array(OLEDRION_UPLOAD_PATH, '777'), 'chmod');
- $indexAdmin->addConfigBoxLine(OLEDRION_ATTACHED_FILES_PATH, 'folder');
- $indexAdmin->addConfigBoxLine(array(OLEDRION_ATTACHED_FILES_PATH, '777'), 'chmod');
- $indexAdmin->addConfigBoxLine(OLEDRION_PICTURES_PATH, 'folder');
- $indexAdmin->addConfigBoxLine(array(OLEDRION_PICTURES_PATH, '777'), 'chmod');
- $indexAdmin->addConfigBoxLine(OLEDRION_CSV_PATH, 'folder');
- $indexAdmin->addConfigBoxLine(array(OLEDRION_CSV_PATH, '777'), 'chmod');
- $indexAdmin->addConfigBoxLine(OLEDRION_CACHE_PATH, 'folder');
- $indexAdmin->addConfigBoxLine(array(OLEDRION_CACHE_PATH, '777'), 'chmod');
+ //$indexAdmin->addConfigBoxLine(OLEDRION_UPLOAD_PATH, 'folder');
+ //$indexAdmin->addConfigBoxLine(array(OLEDRION_UPLOAD_PATH, '777'), 'chmod');
+ //$indexAdmin->addConfigBoxLine(OLEDRION_ATTACHED_FILES_PATH, 'folder');
+ //$indexAdmin->addConfigBoxLine(array(OLEDRION_ATTACHED_FILES_PATH, '777'), 'chmod');
+ //$indexAdmin->addConfigBoxLine(OLEDRION_PICTURES_PATH, 'folder');
+ //$indexAdmin->addConfigBoxLine(array(OLEDRION_PICTURES_PATH, '777'), 'chmod');
+ //$indexAdmin->addConfigBoxLine(OLEDRION_CSV_PATH, 'folder');
+ //$indexAdmin->addConfigBoxLine(array(OLEDRION_CSV_PATH, '777'), 'chmod');
+ //$indexAdmin->addConfigBoxLine(OLEDRION_CACHE_PATH, 'folder');
+ //$indexAdmin->addConfigBoxLine(array(OLEDRION_CACHE_PATH, '777'), 'chmod');
+ $categories = $h_oledrion_cat->getCategoriesCount();
+ if($categories == 0) {
+ $link = OLEDRION_ADMIN_URL . 'index.php?op=maintain&action=import';
+ $link = sprintf('<a href="%s">%s</a>', $link, _AM_OLEDRION_IMPORT_DATA_TITLE);
+ $text = sprintf(_AM_OLEDRION_IMPORT_DATA_TEXT, $link);
+ $indexAdmin->addInfoBox(_AM_OLEDRION_IMPORT_DATA);
+ $indexAdmin->addInfoBoxLine(_AM_OLEDRION_IMPORT_DATA, $text);
+ }
+
+
+//------ check directories ---------------
+
+$indexAdmin->addConfigBoxLine('');
+$redirectFile = $_SERVER['PHP_SELF'];
+
+$languageConstants = array(_AM_OLEDRION_AVAILABLE,_AM_OLEDRION_NOTAVAILABLE, _AM_OLEDRION_CREATETHEDIR, _AM_OLEDRION_NOTWRITABLE, _AM_OLEDRION_SETMPERM, _AM_OLEDRION_DIRCREATED,_AM_OLEDRION_DIRNOTCREATED,_AM_OLEDRION_PERMSET,_AM_OLEDRION_PERMNOTSET);
+
+//$path = $xoopsModuleConfig['uploaddir'] . '/';
+$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus(OLEDRION_UPLOAD_PATH,0777,$languageConstants,$redirectFile));
+
+//$path = XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['screenshots'] . '/';
+$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus(OLEDRION_ATTACHED_FILES_PATH,0777,$languageConstants,$redirectFile));
+
+//$path = XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['catimage'] . '/';
+$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus(OLEDRION_PICTURES_PATH,0777,$languageConstants,$redirectFile));
+
+
+//$path = XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['mainimagedir'] . '/';
+$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus(OLEDRION_CSV_PATH,0777,$languageConstants,$redirectFile));
+
+//$path = XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['catimage'] . '/';
+$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus(OLEDRION_CACHE_PATH,0777,$languageConstants,$redirectFile));
+
+
+//$path = XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['mainimagedir'] . '/';
+$indexAdmin->addConfigBoxLine(DirectoryChecker::getDirectoryStatus(OLEDRION_TEXT_PATH,0777,$languageConstants,$redirectFile));
+
+//echo $indexAdmin->addNavigation('index.php');
+//echo $indexAdmin->renderIndex();
+//echo wfd_serverstats();
+//---------------------------
echo $indexAdmin->addNavigation('index.php');
echo $indexAdmin->renderIndex();
@@ -170,4 +214,3 @@
}
break;
}
-?>
\ No newline at end of file
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/delivery.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/delivery.php 2014-02-07 10:33:00 UTC (rev 12289)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/delivery.php 2014-02-07 11:05:17 UTC (rev 12290)
@@ -21,41 +21,30 @@
/**
* Check is admin
*/
-if (!defined("OLEDRION_ADMIN")) {
- exit();
-}
+if (!defined("OLEDRION_ADMIN")) exit();
switch ($action) {
case 'default':
xoops_cp_header();
- $start = isset($_GET['start']) ? intval($_GET['start']) : 0;
+ $start = isset($_GET['start']) ? intval($_GET['start']) : 0;
$delivery = array();
- $form = "<form method='post' action='$baseurl' name='frmadddelivery' id='frmadddelivery'><input type='hidden' name='op' id='op' value='delivery' /><input type='hidden' name='action' id='action' value='add' /><input type='submit' name='btngo' id='btngo' value='"
- . _AM_OLEDRION_ADD_ITEM . "' /></form>";
+ $form = "<form method='post' action='$baseurl' name='frmadddelivery' id='frmadddelivery'><input type='hidden' name='op' id='op' value='delivery' /><input type='hidden' name='action' id='action' value='add' /><input type='submit' name='btngo' id='btngo' value='" . _AM_OLEDRION_ADD_ITEM . "' /></form>";
echo $form;
oledrion_utils::htitle(_MI_OLEDRION_ADMENU20, 4);
- $delivery = $h_oledrion_delivery->getAllDelivery(
- new oledrion_parameters(array('start' => $start, 'limit' => $limit))
- );
+ $delivery = $h_oledrion_delivery->getAllDelivery(new oledrion_parameters(array('start' => $start, 'limit' => $limit)));
$class = '';
echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
- echo "<tr><th align='center'>" . _AM_OLEDRION_ID . "</th><th align='center'>" . _AM_OLEDRION_DELIVERY_TITLE
- . "</th><th align='center'>" . _OLEDRION_ONLINE . "</th><th align='center'>" . _AM_OLEDRION_ACTION
- . "</th></tr>";
+ echo "<tr><th align='center'>" . _AM_OLEDRION_ID . "</th><th align='center'>" . _AM_OLEDRION_DELIVERY_TITLE . "</th><th align='center'>" . _OLEDRION_ONLINE . "</th><th align='center'>" . _AM_OLEDRION_ACTION . "</th></tr>";
foreach ($delivery as $item) {
- $id = $item->getVar('delivery_id');
- $class = ($class == 'even') ? 'odd' : 'even';
- $actions = array();
- $actions[] = "<a href='$baseurl?op=delivery&action=edit&id=" . $id . "' title='" . _OLEDRION_EDIT . "'>"
- . $icones['edit'] . '</a>';
- $actions[] = "<a href='$baseurl?op=delivery&action=delete&id=" . $id . "' title='" . _OLEDRION_DELETE . "'"
- . $conf_msg . ">" . $icones['delete'] . '</a>';
- $online = $item->getVar('delivery_online') == 1 ? _YES : _NO;
+ $id = $item->getVar('delivery_id');
+ $class = ($class == 'even') ? 'odd' : 'even';
+ $actions = array();
+ $actions[] = "<a href='$baseurl?op=delivery&action=edit&id=" . $id . "' title='" . _OLEDRION_EDIT . "'>" . $icones['edit'] . '</a>';
+ $actions[] = "<a href='$baseurl?op=delivery&action=delete&id=" . $id . "' title='" . _OLEDRION_DELETE . "'" . $conf_msg . ">" . $icones['delete'] . '</a>';
+ $online = $item->getVar('delivery_online') == 1 ? _YES : _NO;
echo "<tr class='" . $class . "'>\n";
- echo "<td align='center'>" . $id . "</td><td align='center'>" . $item->getVar('delivery_title')
- . "</td><td align='center'>" . $online . "</td><td align='center'>" . implode(' ', $actions)
- . "</td>\n";
+ echo "<td align='center'>" . $id . "</td><td align='center'>" . $item->getVar('delivery_title') . "</td><td align='center'>" . $online . "</td><td align='center'>" . implode(' ', $actions) . "</td>\n";
echo "<tr>\n";
}
$class = ($class == 'even') ? 'odd' : 'even';
@@ -71,7 +60,7 @@
xoops_cp_header();
if ($action == 'edit') {
$title = _AM_OLEDRION_DELIVERY_EDIT;
- $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+ $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
if (empty($id)) {
oledrion_utils::redirect(_AM_OLEDRION_ERROR_1, $baseurl, 5);
}
@@ -81,23 +70,19 @@
if (!is_object($item)) {
oledrion_utils::redirect(_AM_OLEDRION_NOT_FOUND, $baseurl, 5);
}
- $edit = true;
+ $edit = true;
$label_submit = _AM_OLEDRION_MODIFY;
} else {
- $title = _AM_OLEDRION_DELIVERY_ADD;
- $item = $h_oledrion_delivery->create(true);
+ $title = _AM_OLEDRION_DELIVERY_ADD;
+ $item = $h_oledrion_delivery->create(true);
$label_submit = _AM_OLEDRION_ADD;
- $edit = false;
+ $edit = false;
}
$sform = new XoopsThemeForm($title, 'frmadddelivery', $baseurl);
$sform->addElement(new XoopsFormHidden('op', 'delivery'));
$sform->addElement(new XoopsFormHidden('action', 'save'));
$sform->addElement(new XoopsFormHidden('delivery_id', $item->getVar('delivery_id')));
- $sform->addElement(
- new XoopsFormText(_AM_OLEDRION_DELIVERY_TITLE, 'delivery_title', 50, 150, $item->getVar(
- 'delivery_title', 'e'
- )), true
- );
+ $sform->addElement(new XoopsFormText(_AM_OLEDRION_DELIVERY_TITLE, 'delivery_title', 50, 150, $item->getVar('delivery_title', 'e')), true);
// Add payment options ************************************************************
$payments = $deliveryPayments = $payments_d = $deliveryPayments_d = array();
@@ -128,31 +113,21 @@
if ($action == 'edit' && $item->pictureExists()) {
$pictureTray = new XoopsFormElementTray(_AM_OLEDRION_CURRENT_PICTURE, '<br />');
- $pictureTray->addElement(
- new XoopsFormLabel('', "<img src='" . $item->getPictureUrl() . "' alt='' border='0' />")
- );
+ $pictureTray->addElement(new XoopsFormLabel('', "<img src='" . $item->getPictureUrl() . "' alt='' border='0' />"));
$deleteCheckbox = new XoopsFormCheckBox('', 'delpicture');
$deleteCheckbox->addOption(1, _DELETE);
$pictureTray->addElement($deleteCheckbox);
...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X