oscss-commit Mailing List for osCSS E-Commerce Shopping Cart (Page 4)

E-Commerce Shopping Cart

Brought to you by: homer8173, j4k, manmachine, opentechno, oscim

oscss-commit — SVN Commit Notifications

You can subscribe to this list here.

2011	Jan	Feb	Mar (4)	Apr (57)	May (31)	Jun (21)	Jul (11)	Aug (23)	Sep (22)	Oct (36)	Nov (62)	Dec (85)
2012	Jan (24)	Feb (24)	Mar (65)	Apr (232)	May (118)	Jun (22)	Jul (54)	Aug (57)	Sep (14)	Oct (27)	Nov (16)	Dec (19)
2013	Jan (16)	Feb (12)	Mar (3)	Apr (17)	May (2)	Jun (30)	Jul (33)	Aug (19)	Sep (35)	Oct (58)	Nov (27)	Dec (64)
2014	Jan (102)	Feb (80)	Mar (15)	Apr (4)	May (3)	Jun (3)	Jul (5)	Aug (11)	Sep (15)	Oct	Nov (3)	Dec (5)
2015	Jan (5)	Feb (4)	Mar (2)	Apr (11)	May	Jun	Jul	Aug	Sep	Oct (9)	Nov (10)	Dec
2016	Jan (3)	Feb (2)	Mar (18)	Apr (13)	May (2)	Jun	Jul	Aug	Sep (4)	Oct	Nov	Dec

Flat | Threaded

<< < 1 2 3 4 5 6 .. 67 > >> (Page 4 of 67)

[Oscss-commit] SF.net SVN: oscss:[5254] trunk/catalog/admin/includes

From: <os...@us...> - 2015-02-13 09:37:52

Revision: 5254
          http://sourceforge.net/p/oscss/svn/5254
Author:   oscim
Date:     2015-02-13 09:37:49 +0000 (Fri, 13 Feb 2015)
Log Message:
-----------
Fix manage class type of product in edit page 

Modified Paths:
--------------
    trunk/catalog/admin/includes/gabarit/products/edit.tab.generic.gab
    trunk/catalog/admin/includes/modules/pages/products.php

Modified: trunk/catalog/admin/includes/gabarit/products/edit.tab.generic.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/products/edit.tab.generic.gab	2015-02-13 07:08:37 UTC (rev 5253)
+++ trunk/catalog/admin/includes/gabarit/products/edit.tab.generic.gab	2015-02-13 09:37:49 UTC (rev 5254)
@@ -12,6 +12,11 @@
 */
 global $currencies;
 $page= MGabCont::CallSt('GetClassName');
+
+
+// var_dump($page::CheckClassProduct('CLASS_WEIGHT')); 
+// exit; 
+
 ?>
 
 
@@ -22,7 +27,7 @@
 			<?php if($page::CheckClassProduct('CLASS_REF') || $page::CheckClassProduct('CLASS_MODELE') ):  ?>
 				<fieldset class="block_field">
 						<legend><?php echo __('@products text legend ref and model'); ?></legend>
-						<?php echo  $page::DisplayField('products_ref','',$page::$Info); ?>
+						<?php echo $page::DisplayField('ref','',$page::$Info); ?>
 						<?php echo $page::DisplayField('model','',$page::$Info); ?>
 				</fieldset>
 			<?php endif; ?>
@@ -178,6 +183,8 @@
       <?php endif; ?>
 
       
-				<?php foreach (MGabCont::CallSt('DisplayCol','left') as $value): ?>
-						<?php echo $page::DisplayField($value, '', $page::$Info); ?>
+				<?php foreach (MGabCont::CallSt('DisplayCol','left') as $value):  ?>
+						<?php if($page::CheckClassProduct('CLASS_'.strtoupper($value))):  ?>
+							<?php echo $page::DisplayField($value, '', $page::$Info); ?>
+						<?php endif; ?>
 				<?php endforeach; ?>

Modified: trunk/catalog/admin/includes/modules/pages/products.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/products.php	2015-02-13 07:08:37 UTC (rev 5253)
+++ trunk/catalog/admin/includes/modules/pages/products.php	2015-02-13 09:37:49 UTC (rev 5254)
@@ -1405,9 +1405,10 @@
     @param int $flag_type, peut être homis
     @return true/false
   */
-  public static function CheckClassProduct($string_class, $flag_type=''){
-    $virtual_type=(tep_not_null($flag_type)?$flag_type : self::$modules->type_flag);
+  public static function CheckClassProduct($string_class, $flag_type=1){
+    $virtual_type=(!isset(self::$Info->type)?$flag_type :self::$Info->type);
     $class = 'CFG_CLASS_VIRTUAL_TYPE_'.$virtual_type;
+
     if(defined($class) && in_array($string_class, explode(';',constant($class)))) return false;
     if(_cst_bool($string_class)) return false;
     return true;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[5253] trunk/catalog/admin/includes/modules/configuration /modstatus.php

From: <os...@us...> - 2015-02-13 07:08:39

Revision: 5253
          http://sourceforge.net/p/oscss/svn/5253
Author:   oscim
Date:     2015-02-13 07:08:37 +0000 (Fri, 13 Feb 2015)
Log Message:
-----------
Fix #FS1143

Modified Paths:
--------------
    trunk/catalog/admin/includes/modules/configuration/modstatus.php

Modified: trunk/catalog/admin/includes/modules/configuration/modstatus.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/modstatus.php	2015-02-13 07:04:26 UTC (rev 5252)
+++ trunk/catalog/admin/includes/modules/configuration/modstatus.php	2015-02-13 07:08:37 UTC (rev 5253)
@@ -3,13 +3,13 @@
   @licence GPL 2005-2013  The osCSS developers - osCSS Open Source E-commerce
   @portion code Copyright (c) 2002 osCommerce
   @package osCSS-2 <www http://www.oscss.org>
-  @version 2.1.1
+  @version 2.2.0
   @date  14/04/2012, 17:00
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
   @class modstatus
   @brief Manage All status in table status, for all status type
-		La modification des status
+					La modification des status
 */
 
 error_reporting(E_ALL);
@@ -98,7 +98,7 @@
   /**
     @fn update_advanced()
     @brief Add/update les constantes associé au status
-	  Lisaison talle configuration
+	  Lisaison talble configuration
   */
   private function update_advanced(){
     if (isset($_POST['default']) && ($_POST['default'] == 'on'))
@@ -184,7 +184,10 @@
 /** PUBLIC METHODE */
 
   /**
-    Action en remplacement des action par defaut
+		@fn draw_action()
+    @brief Action en remplacement des action par defaut
+    @return none 
+			use redirect after action 
   */
   public function draw_action(){
     global $action,$messageStack;
@@ -219,7 +222,7 @@
 
 
 					if ($action == 'insert')
-						sqlstatus::create($sql_data);
+						$list_status_id = sqlstatus::create($sql_data);
 					else
 						sqlstatus::update($sql_data);
 
@@ -229,6 +232,19 @@
 				if(in_array(self::$config['type'],self::$type_advanced )) $this->update_advanced();
 
 
+				/**
+					add specific type product 
+					Add CFG_CLASS_VIRTUAL_TYPE_xxx in configuration table
+					This new var conf define section visible in product edit 
+				*/
+				if(self::$config['type'] == 'product') {
+					sqlconfiguration::create(array(
+							'key'=>'CFG_CLASS_VIRTUAL_TYPE_'.$list_status_id , 
+							'value'=>''
+					));
+				}
+				
+				
 				tep_redirect(tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','sID'),false).  '&sID=' . $list_status_id));
 			break;
 			case 'deleteconfirm':

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[5252] trunk/catalog/install/includes/sql/mysql/data/ 91_osc_configuration.sql

From: <os...@us...> - 2015-02-13 07:04:27

Revision: 5252
          http://sourceforge.net/p/oscss/svn/5252
Author:   oscim
Date:     2015-02-13 07:04:26 +0000 (Fri, 13 Feb 2015)
Log Message:
-----------
Fix

Modified Paths:
--------------
    trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql

Modified: trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql	2015-01-19 17:19:43 UTC (rev 5251)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql	2015-02-13 07:04:26 UTC (rev 5252)
@@ -17,11 +17,11 @@
 insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DEFAULT_CURRENCY_S', 'DEFAULT_CURRENCY', 'EUR', 'DEFAULT_CURRENCY_L', '0', '0', NULL, NOW(), NULL, NULL);
 insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DEFAULT_LANGUAGE_S', 'DEFAULT_LANGUAGE', 'fr', 'DEFAULT_LANGUAGE_L', '0', '1', NULL, NOW(), NULL, NULL);
 insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function) values ('WHOS_ONLINE_ACTIVE_S', 'WHOS_ONLINE_FLAG', 'false', 'WHOS_ONLINE_ACTIVE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_Non_Edit(\';\',');
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('CFG_CLASS_VIRTUAL_TYPE_1_S', 'CFG_CLASS_VIRTUAL_TYPE_1', '', 'CFG_CLASS_VIRTUAL_TYPE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('CFG_CLASS_VIRTUAL_TYPE_2_S', 'CFG_CLASS_VIRTUAL_TYPE_2', 'CLASS_WEIGHT;', 'CFG_CLASS_VIRTUAL_TYPE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('CFG_CLASS_VIRTUAL_TYPE_3_S', 'CFG_CLASS_VIRTUAL_TYPE_3', 'CLASS_WEIGHT;', 'CFG_CLASS_VIRTUAL_TYPE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('CFG_CLASS_VIRTUAL_TYPE_4_S', 'CFG_CLASS_VIRTUAL_TYPE_4', 'CLASS_WEIGHT;', 'CFG_CLASS_VIRTUAL_TYPE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('TYPE_VIRTUAL_PRODUCTS_S', 'TYPE_VIRTUAL_PRODUCTS', '2,3,4', 'TYPE_VIRTUAL_PRODUCTS_L', '0', '0', NOW(), NOW(),NULL, NULL, 2);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('CFG_CLASS_VIRTUAL_TYPE_1_S', 'CFG_CLASS_VIRTUAL_TYPE_1', '', 'CFG_CLASS_VIRTUAL_TYPE_1_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('CFG_CLASS_VIRTUAL_TYPE_2_S', 'CFG_CLASS_VIRTUAL_TYPE_2', 'CLASS_WEIGHT;', 'CFG_CLASS_VIRTUAL_TYPE_2_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('CFG_CLASS_VIRTUAL_TYPE_3_S', 'CFG_CLASS_VIRTUAL_TYPE_3', 'CLASS_WEIGHT;', 'CFG_CLASS_VIRTUAL_TYPE_3_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('CFG_CLASS_VIRTUAL_TYPE_4_S', 'CFG_CLASS_VIRTUAL_TYPE_4', 'CLASS_WEIGHT;', 'CFG_CLASS_VIRTUAL_TYPE_4_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('TYPE_VIRTUAL_PRODUCTS_S', 'TYPE_VIRTUAL_PRODUCTS', '2,3,4', 'TYPE_VIRTUAL_PRODUCTS_5_L', '0', '0', NOW(), NOW(),NULL, NULL, 2);
 insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('ORPHELIN_COLLECTOR_S', 'ORPHELIN_COLLECTOR', '1', 'ORPHELIN_COLLECTOR_L', '0', '0', NOW(), NOW(),NULL, NULL, 1);
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[5251] trunk/catalog

From: <os...@us...> - 2015-01-19 17:19:51

Revision: 5251
          http://sourceforge.net/p/oscss/svn/5251
Author:   oscim
Date:     2015-01-19 17:19:43 +0000 (Mon, 19 Jan 2015)
Log Message:
-----------
Fix devise add 
Add in install other devise

Modified Paths:
--------------
    trunk/catalog/admin/includes/modules/pages/currencies.php
    trunk/catalog/install/includes/sql/mysql/data/20_osc_currencies.sql

Modified: trunk/catalog/admin/includes/modules/pages/currencies.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/currencies.php	2015-01-19 17:01:35 UTC (rev 5250)
+++ trunk/catalog/admin/includes/modules/pages/currencies.php	2015-01-19 17:19:43 UTC (rev 5251)
@@ -33,7 +33,7 @@
   /**
     @var string file
   */
-  public static $Id;
+//   public static $Id;
   /**
     @var array list code action module
   */

Modified: trunk/catalog/install/includes/sql/mysql/data/20_osc_currencies.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/20_osc_currencies.sql	2015-01-19 17:01:35 UTC (rev 5250)
+++ trunk/catalog/install/includes/sql/mysql/data/20_osc_currencies.sql	2015-01-19 17:19:43 UTC (rev 5251)
@@ -12,6 +12,8 @@
 --+######################################################################--+
 
 
-insert into osc_currencies (currencies_id, title, code, symbol_left, symbol_right, decimal_point, thousands_point, decimal_places, value, last_updated) values ('1', 'Euro', 'EUR', '', '€', '.', ',', '2', '1.00000000', '2005-03-13 17:51:14');
-insert into osc_currencies (currencies_id, title, code, symbol_left, symbol_right, decimal_point, thousands_point, decimal_places, value, last_updated) values ('2', 'US Dollar', 'USD', '$', '', '.', ',', '2', '1.07819998', '2005-03-13 17:51:14');
+insert into osc_currencies (currencies_id, title, code, symbol_left, symbol_right, decimal_point, thousands_point, decimal_places, value, last_updated) values ('1', 'Euro', 'EUR', '', '€', '.', ',', '2', '1.00000000', '2015-01-19 17:15:02');
+insert into osc_currencies (currencies_id, title, code, symbol_left, symbol_right, decimal_point, thousands_point, decimal_places, value, last_updated) values (2, 'US Dollar', 'USD', '$', '', '.', ',', '2', 1.15750003, '2015-01-19 17:15:02');
+insert into osc_currencies (currencies_id, title, code, symbol_left, symbol_right, decimal_point, thousands_point, decimal_places, value, last_updated) values (3, 'Franc suisse', 'CHF', '', 'Fr', '3', '.', '3', 0.99589998, '2015-01-19 17:15:18');
+insert into osc_currencies (currencies_id, title, code, symbol_left, symbol_right, decimal_point, thousands_point, decimal_places, value, last_updated) values (4, 'Livre sterling', 'GBP', '£', '', '3', ',', '.', 0.76359999, '2015-01-19 17:15:19');
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[5250] trunk/catalog/admin/includes

From: <os...@us...> - 2015-01-19 17:01:44

Revision: 5250
          http://sourceforge.net/p/oscss/svn/5250
Author:   oscim
Date:     2015-01-19 17:01:35 +0000 (Mon, 19 Jan 2015)
Log Message:
-----------
Fix

Modified Paths:
--------------
    trunk/catalog/admin/includes/classes/ModTreePage.php
    trunk/catalog/admin/includes/classes/drivers/sqlnewsletters_modeles.php
    trunk/catalog/admin/includes/modules/pages/newslettersModeles.php

Modified: trunk/catalog/admin/includes/classes/ModTreePage.php
===================================================================
--- trunk/catalog/admin/includes/classes/ModTreePage.php	2015-01-19 16:33:17 UTC (rev 5249)
+++ trunk/catalog/admin/includes/classes/ModTreePage.php	2015-01-19 17:01:35 UTC (rev 5250)
@@ -627,7 +627,7 @@
 							$ord[$k]=$item[$k];
 					}
 
-					$item[1]=tep_draw_checkbox_field('action_multi['.$item['id'].']','action_mutli_'.$item['id'],$item['id']);
+					$ord[1]=tep_draw_checkbox_field('action_multi['.$item['id'].']','action_mutli_'.$item['id'],$item['id']);
 					$ord[0]=$item['id'];
 
 					$res[]=$ord;
@@ -715,8 +715,8 @@
     $DB=Database::getInstance();
 		$class=self::GetClassName();
 		$modules=$class::$modules;
-// 		if(!is_string($key)) 
-// 			return false; 
+		if(!is_string($key)) 
+			return false; 
 			
     switch ($class::$action) {
 			case 'listing':

Modified: trunk/catalog/admin/includes/classes/drivers/sqlnewsletters_modeles.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlnewsletters_modeles.php	2015-01-19 16:33:17 UTC (rev 5249)
+++ trunk/catalog/admin/includes/classes/drivers/sqlnewsletters_modeles.php	2015-01-19 17:01:35 UTC (rev 5250)
@@ -255,7 +255,7 @@
     
     
     $par = array(
-				'nmodele_id' => '',
+				'nmodele_id' => 0,
 				'languages_id' => 1,
 				'status' => 0,
 				'date_added' => '',

Modified: trunk/catalog/admin/includes/modules/pages/newslettersModeles.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/newslettersModeles.php	2015-01-19 16:33:17 UTC (rev 5249)
+++ trunk/catalog/admin/includes/modules/pages/newslettersModeles.php	2015-01-19 17:01:35 UTC (rev 5250)
@@ -37,7 +37,7 @@
   /**
     @var int current id
   */
-  public static $Id;
+//   public static $Id;
   /**
     @var obj module newsletter
   */
@@ -61,23 +61,8 @@
   public static function GetConf(){
     global $languages_id;
 
-    self::$code=__CLASS__;
 
-//     self::$action=(isset($_REQUEST['action'])? $_REQUEST['action'] : 'listing' );
-    self::$Id=(isset($_REQUEST['cID'])? (int)$_REQUEST['cID'] : 0 );
-		
 		self::PreLoad(__CLASS__, 'newsletters_modeles' , $languages_id);
-		
-		
-    /**
-      @remarks not load if not first init
-    */
-    if(!defined('JSONSTATMENT')) {
-				//! active datatable in ajax, precise les GET necessaire
-				define('JSONSTATMENT', 'ModTwo=true&mod=page&type='.self::$code);
-				//! detail item in ajax
-				define('AJAXSTATMENTDETAIL', 'mod=page&type='.self::$code);
-		}
 
 		$list_lg = array();
 		foreach(tep_get_languages() as $row)
@@ -89,7 +74,6 @@
 			@remarks this define col theader title, and ajust html code
 				Just for Edit listing
 		*/
-// 		self::$allfields = array();
 
 		self::$allfields['nm.nmodele_id'] = array(
 																'sort'=>true,
@@ -100,21 +84,21 @@
 																'class'=>'tcenter',
 																'default'=>true,
 												);
-// 		self::$allfields['nm.languages_id'] = array(
-// 																'sort'=>true,
-// 																'search'=>true,
-// 																'alias'=>'languages_id',
-// 																'text'=>__('newslettersmodeles table heading languages id'),
-// 																'width'=>'2%',
-// 																'class'=>'tcenter',
-// 																'default'=>true,
-// 																'edit'=>array(
-// 																						'input_type'=>'select',
-// 																						'input_size'=>'1',
-// 																						'input_name'=>'languages_id',
-// 																						'select_values'=>$list_lg,
-// 																					),
-// 												);
+		self::$allfields['nm.languages_id'] = array(
+																'sort'=>true,
+																'search'=>true,
+																'alias'=>'languages_id',
+																'text'=>__('newslettersmodeles table heading languages id'),
+																'width'=>'2%',
+																'class'=>'tcenter',
+																'default'=>true,
+																'edit'=>array(
+																						'input_type'=>'select',
+																						'input_size'=>'1',
+																						'input_name'=>'languages_id',
+																						'select_values'=>$list_lg,
+																					),
+												);
 		self::$allfields['nm.status'] = array(
 																'sort'=>true,
 																'search'=>true,
@@ -324,12 +308,9 @@
 
 
 			default:
-// 			var_dump(self::$action); 
-// 			exit;
 				parent::GenericAction();
+    }
 
-   }
-
     return self::$action;
   }
 
@@ -480,9 +461,8 @@
 					$ord  =array();
 
 
-// 					$item[1]=tep_draw_checkbox_field('action_multi['.$item['id'].']','action_mutli_'.$item['id'],$item['id'],false, '','class="multi"');
+					$ord[0]=$item['id'];
 
-					$item[0]=$item['id'];
 					foreach(self::$InitInfo['modele']['listing'] as $k=>$row){
 						if( ($value = self::FormatDBValueRow($k, $item)) && $value !=false )
 							$ord[$k]= $value;
@@ -493,10 +473,7 @@
 						}
 						else $ord[$k]=$item[$k];
 					}
-					
 
-
-
 					$res[]=$ord;
 				}
       break;
@@ -555,26 +532,6 @@
 
 
 
-  /**
-    Nombre d'envoi a effectué
-  */
-//   public function count_send(){
-//     $DB=Database::getInstance();
-//     $mail_query = $DB->query("SELECT COUNT(*) as count FROM " . TABLE_CUSTOMERS . " WHERE customers_newsletter = '1'  ");
-//     $mail = $mail_query->fetchAssoc();
-//     return $mail['count'];
-//   }
-
-  /**
-    Nombre d'envoi deja effetué
-    @a int nmodele_id
-  */
-//   public static function count_sended_ok($nmodele_id, $code){
-//     $DB=Database::getInstance();
-//     $mail_query = $DB->query($sql="SELECT COUNT(*) AS count FROM ".TABLE_NEWSLETTERS_MODELES_SENT." WHERE nmodele_id = '" . $nmodele_id. "' AND module_type='".$code."' ");
-//     $mail = $mail_query->fetchAssoc();
-//     return $mail['count'];
-//   }
 }
 
 ?>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[5249] trunk/catalog

From: <os...@us...> - 2015-01-19 16:33:28

Revision: 5249
          http://sourceforge.net/p/oscss/svn/5249
Author:   oscim
Date:     2015-01-19 16:33:17 +0000 (Mon, 19 Jan 2015)
Log Message:
-----------
Fix 
FX#1137

Modified Paths:
--------------
    trunk/catalog/admin/includes/classes/ModTreePage.php
    trunk/catalog/admin/includes/classes/SqlFilesDataDriverClass.php
    trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php
    trunk/catalog/admin/includes/classes/drivers/sqlproduct.php
    trunk/catalog/admin/includes/modules/pages/categories.php
    trunk/catalog/admin/includes/modules/products/desc_base.php
    trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql

Modified: trunk/catalog/admin/includes/classes/ModTreePage.php
===================================================================
--- trunk/catalog/admin/includes/classes/ModTreePage.php	2015-01-19 07:41:45 UTC (rev 5248)
+++ trunk/catalog/admin/includes/classes/ModTreePage.php	2015-01-19 16:33:17 UTC (rev 5249)
@@ -218,7 +218,7 @@
 					$params['language_id']= $languages_id;
 					$params['sqlarray'] = $sqlclass::ExtractForm($_POST);
 					
-					
+
 					$class::$Id=$sqlclass::create($params);
 
 					if( !is_int($class::$Id) || $class::$Id <=0)
@@ -331,7 +331,6 @@
 
 				if($res ===false || count($res)<=1)
 					tep_redirect(tep_href_link($class::FILENAME, 'action=insert'));
-
 					
 				// load data if not loaded 
 				if(!is_object($class::$Info)) 
@@ -716,20 +715,22 @@
     $DB=Database::getInstance();
 		$class=self::GetClassName();
 		$modules=$class::$modules;
-		
+// 		if(!is_string($key)) 
+// 			return false; 
+			
     switch ($class::$action) {
 			case 'listing':
 				// button action 
-				if($key == 'action')
+				if($key === 'action')
 					return $class::ButtonRowsActions($data);
 				// flag status 
-				elseif($key == 'status') 
+				elseif($key === 'status') 
 					return $class::RowStatus($data);
 				// flag hidden 
-				elseif($key == 'hidden') 
+				elseif($key === 'hidden') 
 					return $class::RowHidden($data);
 				// view ref image
-				elseif($key == 'image')
+				elseif($key === 'image')
 					return (!empty($data['image']) ? tep_info_image($data['image'], $data['name'], TEMP_BO_SMALL_IMAGE_WIDTH, TEMP_BO_SMALL_IMAGE_HEIGHT) : ' N/A');
 				// Format Date 
 				elseif( preg_match('#last_logon#i', $key) )

Modified: trunk/catalog/admin/includes/classes/SqlFilesDataDriverClass.php
===================================================================
--- trunk/catalog/admin/includes/classes/SqlFilesDataDriverClass.php	2015-01-19 07:41:45 UTC (rev 5248)
+++ trunk/catalog/admin/includes/classes/SqlFilesDataDriverClass.php	2015-01-19 16:33:17 UTC (rev 5249)
@@ -129,8 +129,10 @@
 
 		if(!is_array($specimen) && !is_object($specimen) )
 			return $sqlarray;
+// print_r(self::$modules);
+// print_r($data);
+// print_r($specimen); $sql_data_array_lg
 
-
 		foreach($specimen as $key=>$item){
 
 			if(!in_array($key ,array( self::$DataDriverType.'_id', 'id') ) )
@@ -174,15 +176,17 @@
 						$sqlarray[$key] = tep_db_prepare_input((string)$data[$key]);
 				}
 				elseif(is_array($item)){
-
-					if( $key == 'lg' ) 
+					if( $key == 'lg'  /*|| in_array($key, array_keys(self::$modules))*/ ){
 						foreach($item as $language_id=>$arraylg)
 							foreach($arraylg as $subkey=>$value){
-								if( isset($specimen[$key][$language_id][$subkey] ) &&  isset($data[$key][$subkey][$language_id]) )
-									$sqlarray[$key][$subkey][$language_id] =  (!empty($data[$key][$subkey][$language_id]) ? tep_db_prepare_input((string)$data[$key][$subkey][$language_id]) : $specimen[$key][1][$subkey] );
-									elseif(isset($data[$key][$subkey][$language_id]))
-										$sqlarray[$key][$subkey][$language_id] =   $specimen[$key][$language_id][$subkey];
+								if( isset($specimen['lg'][$language_id][$subkey] ) &&  isset($data[$key][$subkey][$language_id]) )
+									$sqlarray['lg'][$subkey][$language_id] =  (!empty($data[$key][$subkey][$language_id]) ? tep_db_prepare_input((string)$data[$key][$subkey][$language_id]) : $specimen[$key][1][$subkey] );
+								elseif(isset($data[$subkey][$language_id]))
+									$sqlarray['lg'][$subkey][$language_id] =   $data[$subkey][$language_id];
+								elseif(isset($data[$key][$subkey][$language_id]))
+									$sqlarray['lg'][$subkey][$language_id] =   $specimen[$key][$language_id][$subkey];
 							}
+					}
 					elseif($key == 'images'){
 						$tmpkey = self::$DataDriverType.'_image';
 						$img = array();
@@ -222,7 +226,8 @@
 				}
 				
 		}
-
+// print_r($sqlarray); 
+// exit;
 		return $sqlarray;
 	}
 

Modified: trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php	2015-01-19 07:41:45 UTC (rev 5248)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php	2015-01-19 16:33:17 UTC (rev 5249)
@@ -202,6 +202,7 @@
 
 		$DB->beginTransaction();
 
+
     if(count($sql_data_array) > 0 || count($sql_data_array_lg) > 0){
 			
 			if(isset($sql_data_array['categories_datatype']) && $sql_data_array['categories_datatype'] =='-1')
@@ -229,6 +230,8 @@
 					unset($sql_data_array['language_id']);
 					
 					$res=tep_db_perform(TABLE_CATEGORIES_DESCRIPTION, $sql_data_array, 'update', "categories_id = '" . (int)$id . "' and language_id = '" . (int)$key . "'");
+					
+					var_dump($res);
 					if(!$res)
 						$error++;
 				}
@@ -238,7 +241,8 @@
 // 		if(in_array(false, $res) )
 // 			$error++;
 
-
+		print_r($error);
+		exit;
 		if( $error > 0){
 			$DB->rollbackTransaction();
 			return false;

Modified: trunk/catalog/admin/includes/classes/drivers/sqlproduct.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlproduct.php	2015-01-19 07:41:45 UTC (rev 5248)
+++ trunk/catalog/admin/includes/classes/drivers/sqlproduct.php	2015-01-19 16:33:17 UTC (rev 5249)
@@ -174,7 +174,7 @@
 
 				
 		// language table
-		if( $error <= 0)
+		if( $error <= 0){
 			if(isset($sql_data_array_lg['lg']) && count($sql_data_array_lg['lg']) > 0){
 				foreach($sql_data_array_lg['lg'] as $key=>$sql_data_array){
 				
@@ -214,7 +214,7 @@
 							}
 					}
 			}
-			
+		}
 
 		/*
 			Use transversal Datatype Rootlisting and update in data

Modified: trunk/catalog/admin/includes/modules/pages/categories.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/categories.php	2015-01-19 07:41:45 UTC (rev 5248)
+++ trunk/catalog/admin/includes/modules/pages/categories.php	2015-01-19 16:33:17 UTC (rev 5249)
@@ -35,6 +35,8 @@
 		,InterfacedTJsonS
 		// detail row in chidls  
 		,InterfacedInnerHtml
+		// use filter generic
+		, FilterTabsData
 		
 		// use filter put in RootListing link 
 		, RightToFilter 
@@ -61,12 +63,9 @@
     @var array $DiversInfo transport var
   */
   public static $DiversInfo;
-  /**
-    @var array $actions
-  */
-  public static $actions;
 
 
+
   public function  __construct(){
     self::Clean();
     self::GetConf();
@@ -356,7 +355,7 @@
 			self::$action=$actions;
 			
 			
-  
+
     self::$modules->check_action(self::$action);
     self::$DiversInfo['current_category_id']=((isset($_GET['cPath'])&& !empty($_GET['cPath']))  ? tep_db_prepare_input($_GET['cPath']) :  0);
 
@@ -472,7 +471,7 @@
 				}
 
 
-					$query_raw = "SELECT DISTINCT ".$adjust->listfields." ".
+					$query_raw = "SELECT DISTINCT ".$adjust->listfields." , cat.categories_id as id  ".
 							" FROM " . TABLE_CATEGORIES . " cat ".
 							" JOIN  " . TABLE_CATEGORIES_DESCRIPTION . " catd ON (catd.categories_id = cat.categories_id AND catd.language_id = '" . (int)$adjust->languages_id . "') ";
 
@@ -509,7 +508,7 @@
 					$_query = $DB->query($query_raw);
 
 					$res=self::FormatDBValue($_query);
-
+					
 					return $res;
 
     }
@@ -583,19 +582,20 @@
     $DB=Database::getInstance();
     $res=array();
 
-		/* DEB  Sub module add col */
-		self::GetExternalFieldsForFormat( self::$allfieldsexternal );
-				
+		
     switch (self::$action) {
       case 'listing':
 				global $languages_id;
-
+				
+				/* DEB  Sub module add col */
+				self::GetExternalFieldsForFormat( self::$allfieldsexternal );
+ 
+				
 				while ($item = $_query->fetchAssoc()) {
 					$ord  =array();
-					
+
 					$item[0]=$item['id'];
 					$item[1]=tep_draw_checkbox_field('action_multi['.$item['id'].']','action_mutli_'.$item['id'],$item['id']);
-					
 					foreach(self::$InitInfo['modele']['listing'] as $k=>$row){
 						if( ($value = self::FormatDBValueRow($k, $item)) && $value !=false )
 							$ord[$k]= $value;

Modified: trunk/catalog/admin/includes/modules/products/desc_base.php
===================================================================
--- trunk/catalog/admin/includes/modules/products/desc_base.php	2015-01-19 07:41:45 UTC (rev 5248)
+++ trunk/catalog/admin/includes/modules/products/desc_base.php	2015-01-19 16:33:17 UTC (rev 5249)
@@ -80,7 +80,6 @@
   public function GetConf($opt){
 		$array = array();
 
-
 		$conf = Config::getInstance();
 
 		$attach_tab = ( ($conf->GetConf( 'MODULE_ACAPRO_DESC_BASE_ATTACH_FIELDS_TABS' ) ===false) ? __CLASS__ : $conf->GetConf( 'MODULE_ACAPRO_DESC_BASE_ATTACH_FIELDS_TABS')  ) ;  

Modified: trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql	2015-01-19 07:41:45 UTC (rev 5248)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql	2015-01-19 16:33:17 UTC (rev 5249)
@@ -105,8 +105,9 @@
 insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('Ordre de tri sous-total', 'MODULE_ORDER_TOTAL_SUBTOTAL_SORT_ORDER', '0', 'Ordre de tri pour l\'affichage', '6', '11', NULL, NOW(), '2');
 insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('Ordre de tri taxes', 'MODULE_ORDER_TOTAL_TAX_SORT_ORDER', '8', 'Ordre de tri pour l\'affichage', '6', '12', NULL, NOW(), '2');
 insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('Ordre de description', 'MODULE_ACAPRO_DESC_BASE_SORT_ORDER', '1', 'Ordre de tri pour l\'affichage', '6', '13', NULL, NOW(), '2');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('Ordre de tri taxes', 'MODULE_ORDER_TOTAL_TAX_SORT_ORDER', '8', 'Ordre de tri pour l\'affichage', '6', '12', NULL, NOW(), '2');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('MODULE_ACAPRO_DESC_BASE_ATTACH_FIELDS_TABS_S', 'MODULE_ACAPRO_DESC_BASE_ATTACH_FIELDS_TABS', 'desc_base', 'MODULE_ACAPRO_DESC_BASE_ATTACH_FIELDS_TABS_L', '6', '13', NULL, NOW(), '1');
 
-
 -- 7 shipping
 insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SHIPPING_ORIGIN_COUNTRY_S', 'SHIPPING_ORIGIN_COUNTRY', '73', 'SHIPPING_ORIGIN_COUNTRY_L', '7', '1', NULL, NOW(), 'tep_get_country_name', 'tep_cfg_pull_down_country_list(');
 insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SHIPPING_ORIGIN_ZIP_S', 'SHIPPING_ORIGIN_ZIP', '75000', 'SHIPPING_ORIGIN_ZIP_L', '7', '2', NULL, NOW(), NULL, NULL);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[5248] trunk/catalog/admin/includes

From: <os...@us...> - 2015-01-19 07:41:53

Revision: 5248
          http://sourceforge.net/p/oscss/svn/5248
Author:   oscim
Date:     2015-01-19 07:41:45 +0000 (Mon, 19 Jan 2015)
Log Message:
-----------
Fix bug FS#1133

Modified Paths:
--------------
    trunk/catalog/admin/includes/classes/drivers/sqlnewsletters_modeles.php
    trunk/catalog/admin/includes/modules/pages/newslettersModeles.php

Modified: trunk/catalog/admin/includes/classes/drivers/sqlnewsletters_modeles.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlnewsletters_modeles.php	2015-01-17 13:22:50 UTC (rev 5247)
+++ trunk/catalog/admin/includes/classes/drivers/sqlnewsletters_modeles.php	2015-01-19 07:41:45 UTC (rev 5248)
@@ -3,7 +3,7 @@
   @licence GPL 2005-2013  The osCSS developers - osCSS Open Source E-commerce
   @portion code Copyright (c) 2002 osCommerce
   @package osCSS-2 <www http://www.oscss.org>
-  @version 2.1.2
+  @version 2.2.0
   @date  10/10/2013, 20:48
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
@@ -12,7 +12,7 @@
   @brief manage db update/insert/delete for navigation_links
 */
 
-error_reporting(E_ALL);
+
 require_once( DIR_FS_ADMIN . DIR_WS_CLASSES . 'SqlFilesDataDriverClass.php');
 
 class sqlnewsletters_modeles
@@ -40,11 +40,12 @@
 
 		$DB->beginTransaction();
 
-		if(isset($post['languages_id']))	$sql_data_array['languages_id'] = tep_db_prepare_input($post['languages_id']);
-    if(isset($post['status']))				$sql_data_array['status'] = tep_db_prepare_input($post['status']);
-		if(isset($post['title']))					$sql_data_array['title'] = tep_db_prepare_input($post['title']);
-		if(isset($post['content']))				$sql_data_array['nmodele_content'] = tep_db_prepare_input($post['content']);
 
+		$sql_data_array['languages_id'] = (isset($option['language_id']) ? $option['language_id'] : $languages_id);
+//     if(isset($post['status']))				$sql_data_array['status'] = tep_db_prepare_input($post['status']);
+// 		if(isset($post['title']))					$sql_data_array['title'] = tep_db_prepare_input($post['title']);
+// 		if(isset($post['content']))				$sql_data_array['nmodele_content'] = tep_db_prepare_input($post['content']);
+
 		if(count($sql_data_array)>0){
 			if( ($res = tep_db_perform(TABLE_NEWSLETTERS_MODELES, $sql_data_array) ) && ! $res )
 				$error++;
@@ -94,9 +95,6 @@
     $sql_data_array_prem = self::GetSqlArray();
     $sql_data_array_lg = self::GetSqlArrayLg();
     
-//     print_r($sql_data_array);
-//     print_r($sql_data_array_lg);
-//     exit;
 		$DB->beginTransaction();
 
 		

Modified: trunk/catalog/admin/includes/modules/pages/newslettersModeles.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/newslettersModeles.php	2015-01-17 13:22:50 UTC (rev 5247)
+++ trunk/catalog/admin/includes/modules/pages/newslettersModeles.php	2015-01-19 07:41:45 UTC (rev 5248)
@@ -62,22 +62,9 @@
     global $languages_id;
 
     self::$code=__CLASS__;
-//     self::$datatype='newsletters_modeles';
-// 
-// 
+
 //     self::$action=(isset($_REQUEST['action'])? $_REQUEST['action'] : 'listing' );
-//     self::$Id=(isset($_REQUEST['cID'])? (int)$_REQUEST['cID'] : 0 );
-// 
-//     // aca
-// 		self::$modules=new AcaFactory(__CLASS__);
-// 		// Event
-// 		EventsHandlerActive::ActiveForClass(__CLASS__);
-// 		// instancie MLinkTo
-// 		MLinkTo::getInstance(self::$datatype);
-// 		// Set Name in MAster Gab 
-// 		MGabCont::SetCurrentName(__CLASS__);
-// 		// 
-// 		self::$languages = tep_get_languages();
+    self::$Id=(isset($_REQUEST['cID'])? (int)$_REQUEST['cID'] : 0 );
 		
 		self::PreLoad(__CLASS__, 'newsletters_modeles' , $languages_id);
 		
@@ -97,18 +84,7 @@
 				$list_lg[] = array('id'=>$row['id'], 'text'=>$row['name']);
 
 
-   /**
-      @remarks define var execution  sql in GetDBValue()
-    */
-//     self::$InitInfo['adjust']=array(
-// 			  'languages_id'=>$languages_id,
-// 			  'page'=>1,
-// 			  'rowbyp'=>10,
-// 			  'sOrder'=>'',
-// 			  'sWhere'=>'',
-// 			  );
 
-
 		/**
 			@remarks this define col theader title, and ajust html code
 				Just for Edit listing
@@ -348,6 +324,8 @@
 
 
 			default:
+// 			var_dump(self::$action); 
+// 			exit;
 				parent::GenericAction();
 
    }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[5247] trunk/catalog/includes/application_top.php

From: <os...@us...> - 2015-01-17 13:22:58

Revision: 5247
          http://sourceforge.net/p/oscss/svn/5247
Author:   oscim
Date:     2015-01-17 13:22:50 +0000 (Sat, 17 Jan 2015)
Log Message:
-----------
Fix move kint

Modified Paths:
--------------
    trunk/catalog/includes/application_top.php

Modified: trunk/catalog/includes/application_top.php
===================================================================
--- trunk/catalog/includes/application_top.php	2014-12-29 14:28:24 UTC (rev 5246)
+++ trunk/catalog/includes/application_top.php	2015-01-17 13:22:50 UTC (rev 5247)
@@ -16,10 +16,8 @@
 /// start the timer for the page parse time log
 define('PAGE_PARSE_START_TIME', microtime());
 
-// debug tool to replace dump_var
-// usage : d($page);
-require_once 'includes/kint/Kint.class.php';
 
+
 /// Set the local configuration parameters - mainly for developers
   if (file_exists('includes/local/configure.php'))  include('includes/local/configure.php');
   elseif (!file_exists('includes/configure.php')) {
@@ -29,17 +27,22 @@
 
 
 	if (OSCSS_DEBUG == true) {
+		// debug tool to replace dump_var
+		// usage : d($page);
+		include_once '../dev/kint/Kint.class.php';
+		
 		$oscss_debug_infos = array();
 		error_reporting(-1);
 	} else {
-	/// set the level of error reporting
+
+
+		/// set the level of error reporting
 		ini_set("error_reporting",E_ALL & ~E_NOTICE);
 		ini_set("display_errors","1");
 		ini_set("log_errors", "0" );
 		error_reporting(0);
 	}
- 		ini_set("error_reporting",E_ALL );
- 		error_reporting(E_ALL);
+
  		
  		
 	// call Config Class And Init

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[5246] trunk/catalog/templates/defaut/includes/gabarit/ checkout/payment.gab

From: <os...@us...> - 2014-12-29 14:28:27

Revision: 5246
          http://sourceforge.net/p/oscss/svn/5246
Author:   oscim
Date:     2014-12-29 14:28:24 +0000 (Mon, 29 Dec 2014)
Log Message:
-----------
Fix html div 

Modified Paths:
--------------
    trunk/catalog/templates/defaut/includes/gabarit/checkout/payment.gab

Modified: trunk/catalog/templates/defaut/includes/gabarit/checkout/payment.gab
===================================================================
--- trunk/catalog/templates/defaut/includes/gabarit/checkout/payment.gab	2014-12-29 14:14:00 UTC (rev 5245)
+++ trunk/catalog/templates/defaut/includes/gabarit/checkout/payment.gab	2014-12-29 14:28:24 UTC (rev 5246)
@@ -2,8 +2,8 @@
 /**
  @licence GPL 2005-2010  The osCSS developers - osCSS Open Source E-commerce
  @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.2
- @date  18/12/2013, 08:18
+ @version 2.2.0
+ @date  28/12/2014, 08:18
  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
  @encode UTF-8
 */
@@ -95,11 +95,8 @@
 		</div>
 
 		<div class="row">
-					<!--<label for="comment" class="col-sm-2 control-label"><?php echo __('heading title comments'); ?></label>-->
 			<div class="col-sm-12">
-<!-- 					<label for="comment"><?php echo __('add comments label'); ?></label> -->
 				<?php echo tep_draw_textarea_field('comments', 'comment', '48', '5',false , ' class="form-control" placeholder="'.__('add comments label').'" '); ?>
-						</div>
 			</div>
 		</div>
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[5245] trunk/catalog

From: <os...@us...> - 2014-12-29 14:14:37

Revision: 5245
          http://sourceforge.net/p/oscss/svn/5245
Author:   oscim
Date:     2014-12-29 14:14:00 +0000 (Mon, 29 Dec 2014)
Log Message:
-----------
Fix bug call old function in orders.php
Fix bug in shoping cart page in ajax adjust qty

Modified Paths:
--------------
    trunk/catalog/admin/includes/modules/pages/orders.php
    trunk/catalog/common/classes/osCSS_pdf.php
    trunk/catalog/templates/defaut/includes/gabarit/pages/shopping_cart.gab
    trunk/catalog/templates/defaut/includes/triggers/cart_line.inc

Modified: trunk/catalog/admin/includes/modules/pages/orders.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/orders.php	2014-12-29 10:21:49 UTC (rev 5244)
+++ trunk/catalog/admin/includes/modules/pages/orders.php	2014-12-29 14:14:00 UTC (rev 5245)
@@ -3,7 +3,7 @@
   @licence GPL 2005-2014  The osCSS developers - osCSS Open Source E-commerce
   @package osCSS-2 <www http://www.oscss.org>
   @version 2.2.0
-  @date  04/07/2013, 10:36
+  @date  28/12/2014, 10:36
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
   @file orders.php
@@ -15,7 +15,7 @@
 require_once(DIR_FS_ADMIN . DIR_WS_CLASSES  .'listeners/EventMessListener.php');
 require_once(DIR_FS_ADMIN . DIR_WS_CLASSES  .'listeners/EventNotificationListener.php');
 
-
+// error_reporting(E_ALL);
 /**
   @class orders
   @brief manage orders, listing and edit status
@@ -34,6 +34,7 @@
 		,InterfacedTJsonS
 		// detail row in chidls  
 		,InterfacedInnerHtml
+
 		
 		// use filter put in RootListing link 
 // 		, RightToFilter 
@@ -100,8 +101,6 @@
   public function __construct() {
     self::Clean();
     self::GetConf();
-
-
   }
 
   /**
@@ -512,7 +511,6 @@
 					/// force encode for fdpf is in iso8859
 					header("Content-Type: text/html; charset=utf-8");
 					self::$orders_statuses = array_merge(tep_get_status_array('orders'),array(array('id'=>'','text'=>TEXT_NONE)));
-					self::$file_type_array= osCSS_pdf::get_module();
 
 					$pdf=osCSS_pdf::OutputInit($type);
 					$DF = new DatasFiles;
@@ -542,8 +540,6 @@
 
 					$pdf=osCSS_pdf::SaveEnd($file);
 
-					/// @remarks draw and exit;
-	// 				$pdf=osCSS_pdf::OutputEnd();
 				}
 				if(!isset($_GET['forceajax']))
 					tep_redirect(tep_href_link(self::FILENAME,  'cID='.$cID.'&action=edit'));
@@ -1116,7 +1112,7 @@
 											" LEFT JOIN " . TABLE_ORDERS_TOTAL . " ot on (o.orders_id = ot.orders_id AND  ot.class = 'ot_total' ) ".
 											" LEFT JOIN " . TABLE_ORDERS_PRODUCTS . " op on (op.orders_id = o.orders_id) ".
 											" LEFT JOIN " . TABLE_STATUS . " s ON(o.orders_status = s.status_id  and s.status_type='orders' and s.language_id = '" . (int)$adjust->languages_id . "')  ".
-											" WHERE  o.orders_type >= 0  ".$adjust->sWhere.
+											" WHERE  o.orders_type = 0  ".$adjust->sWhere.
 // 											" GROUP BY o.orders_id ".
 											" ORDER BY  ".((!empty($adjust->sOrder)) ? $adjust->sOrder : 'o.orders_id DESC');
 

Modified: trunk/catalog/common/classes/osCSS_pdf.php
===================================================================
--- trunk/catalog/common/classes/osCSS_pdf.php	2014-12-29 10:21:49 UTC (rev 5244)
+++ trunk/catalog/common/classes/osCSS_pdf.php	2014-12-29 14:14:00 UTC (rev 5245)
@@ -3,8 +3,8 @@
   @licence GPL 2005-2013  The osCSS developers - osCSS Open Source E-commerce
   @portion code Copyright (c) 2002 osCommerce
   @package osCSS-2 <www http://www.oscss.org>
-  @version 2.1.1
-  @date  03/03/2012, 20:11
+  @version 2.2.0
+  @date  28/12/2014, 20:11
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
   @class osCSS_pdf
@@ -47,11 +47,12 @@
     define('LOGO_SHOP_FOR_PRINT',DIR_FS_ROOT_DOCS. str_replace('//','/',STORE_LOGO_PRINT) );
   }
 
-
+	/**
+		@brief public constructor
+	*/
   public static function getInstance() {
-      if(self::$_instance == null) {
-    self::$_instance = new self();
-      }
+      if(self::$_instance == null)
+					self::$_instance = new self();
       return self::$_instance;
   }
 
@@ -127,25 +128,5 @@
     return DIR_FS_ROOT_DOCS . 'modeles/pdf/'. USE_MODELE_PDF.'/publicCustomers/'. self::$type.'.php';
   }
 
-
-  /**
-    @brief call module present for pdf
-    @param $pull_down boolean , format for pull down menu, or just array
-  */
-//   public static function get_module($pull_down=true){
-//     global $messageStack;
-//     if (!is_dir(BATCH_PRINT_INC))
-// 			$messageStack->add_session(sprintf(__("error problem opening directory %s  "),BATCH_PRINT_INC), 'error');
-// 
-//     $file_type_array = array();
-//     foreach(scan(BATCH_PRINT_INC) as $file) {
-// 			$ext = strrchr($file, ".");
-// 			if ($ext == ".php")
-// 				if($pull_down) $file_type_array[] = array('id' => substr($file,0,-4),'text' => __('BP template '.str_replace(array('-'),array("_"),substr($file,0,-4))));
-// 				else $file_type_array[] = substr($file,0,-4);
-//     }
-//     return $file_type_array;
-//   }
-
 }
 ?>
\ No newline at end of file

Modified: trunk/catalog/templates/defaut/includes/gabarit/pages/shopping_cart.gab
===================================================================
--- trunk/catalog/templates/defaut/includes/gabarit/pages/shopping_cart.gab	2014-12-29 10:21:49 UTC (rev 5244)
+++ trunk/catalog/templates/defaut/includes/gabarit/pages/shopping_cart.gab	2014-12-29 14:14:00 UTC (rev 5245)
@@ -3,7 +3,7 @@
  @licence GPL 2005-2014  The osCSS developers - osCSS Open Source E-commerce
  @package osCSS-2 <www http://www.oscss.org>
  @version 2.2.0
- @date  18/12/2013, 08:18
+ @date  28/12/2014, 08:18
  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
  @encode UTF-8
  @file shopping_cart.gab 
@@ -48,9 +48,9 @@
 									<?php echo $currencies->format($product['price']) ;?>
 								</td>
 								<td class="cart-line qty tcenter" >
+									<input class="Bt button cart-line" type="button" value="-" >
+									<?php echo   tep_draw_input_field('cart_quantity[]','cartQty_'.$i, $product['quantity'], 'class="CartQty" ');?>
 									<input class="Bt button cart-line" type="button" value="+" >
-									<?php echo   tep_draw_input_field('cart_quantity[]','cartQty_'.$i, $product['quantity'], 'class="CartQty" ');?>
-									<input class="Bt button cart-line" type="button" value="-" >
 									<?php echo tep_draw_hidden_field('products_id[]', $product['id']) ; ?>
 								</td>
 								<td class="cart-line taxe tcenter" rowspan="<?php echo ($product['group']['count']);  ?>">

Modified: trunk/catalog/templates/defaut/includes/triggers/cart_line.inc
===================================================================
--- trunk/catalog/templates/defaut/includes/triggers/cart_line.inc	2014-12-29 10:21:49 UTC (rev 5244)
+++ trunk/catalog/templates/defaut/includes/triggers/cart_line.inc	2014-12-29 14:14:00 UTC (rev 5245)
@@ -3,8 +3,8 @@
   @licence GPL 2005-2013  The osCSS developers - osCSS Open Source E-commerce
   @portion code Copyright (c) 2002 osCommerce
   @package osCSS-2 <www http://www.oscss.org>
-  @version 2.1.1
-  @date  20/10/11, 11:13
+  @version 2.2.0
+  @date  28/12/2014, 11:13
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
   @brief code is part of execution shopping cart by ajax control
@@ -36,21 +36,18 @@
 
 
 
-		$back = $current['quantity'];
+		$back = (int)$current['quantity'];
     $current['quantity'] = $product_qty_get;
 
-
 		/**
 			@remarks check stock and prepare alert message
 		*/
     if( ! Stock::check_inline($current) ){
-			
-			$cart->remove($current['id']);
-			
+ 
+
 			/// add in cart session 
-			$cart->add_cart($current['id'], $product_qty_get, $attributes, false);
+			$cart->add_cart($current['id'], ($product_qty_get - $back) , $attributes, false);
 
-
 			/**
 				@remarks Stock is ok, continue
 			*/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[5244] trunk

From: <os...@us...> - 2014-12-29 10:22:00

Revision: 5244
          http://sourceforge.net/p/oscss/svn/5244
Author:   oscim
Date:     2014-12-29 10:21:49 +0000 (Mon, 29 Dec 2014)
Log Message:
-----------
Clean held_order code
Move kint in dev section

Modified Paths:
--------------
    trunk/catalog/admin/includes/modules/pages/held_orders.php

Added Paths:
-----------
    trunk/dev/kint/

Removed Paths:
-------------
    trunk/catalog/includes/kint/

Modified: trunk/catalog/admin/includes/modules/pages/held_orders.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/held_orders.php	2014-12-29 10:17:01 UTC (rev 5243)
+++ trunk/catalog/admin/includes/modules/pages/held_orders.php	2014-12-29 10:21:49 UTC (rev 5244)
@@ -3,7 +3,7 @@
   @licence GPL 2005-2014  The osCSS developers - osCSS Open Source E-commerce
   @package osCSS-2 <www http://www.oscss.org>
   @version 2.2.0
-  @date  06/11/2013, 22:33
+  @date  28/12/2014, 22:33
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
 	@file adminAccount.php
@@ -599,14 +599,7 @@
     return MGabCont::CallGab('inline','display_view',__CLASS__);
   }
 
-  /**
-    @brief return Filename
-  */
-  public static function GetFILENAME(){
-    return self::FILENAME;
-  }
 
-
 }
 
 ?>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[5243] trunk/catalog

From: <os...@us...> - 2014-12-29 10:17:03

Revision: 5243
          http://sourceforge.net/p/oscss/svn/5243
Author:   oscim
Date:     2014-12-29 10:17:01 +0000 (Mon, 29 Dec 2014)
Log Message:
-----------
Fix bug in page for manage classes and taxes in BO
Fix Format in address 

Modified Paths:
--------------
    trunk/catalog/admin/includes/languages/fr_FR/modules/pages/tax_classes.txt
    trunk/catalog/admin/includes/modules/pages/tax_classes.php
    trunk/catalog/install/includes/sql/mysql/data/20_osc_address_format.sql

Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/tax_classes.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/tax_classes.txt	2014-12-17 10:26:38 UTC (rev 5242)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/tax_classes.txt	2014-12-29 10:17:01 UTC (rev 5243)
@@ -3,12 +3,12 @@
   @licence GPL 2005-2010  The osCSS developers - osCSS Open Source E-commerce
   @portion code Copyright (c) 2002 osCommerce
   @package osCSS-2 <www http://www.oscss.org>
-  @version 2.1.0
-  @date  18/09/10, 19:19
+  @version 2.2.0
+  @date  28/12/2014, 10:30
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
 */
-$lang['heading title tax_classes']="Manager des plugins de template" ;
+$lang['heading title tax_classes']="Gestion des Taxes et des classes de taxes" ;
 
 /* listing */
 	$lang['tax_classes table heading id']="Id" ;

Modified: trunk/catalog/admin/includes/modules/pages/tax_classes.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/tax_classes.php	2014-12-17 10:26:38 UTC (rev 5242)
+++ trunk/catalog/admin/includes/modules/pages/tax_classes.php	2014-12-29 10:17:01 UTC (rev 5243)
@@ -3,23 +3,30 @@
   @licence GPL 2005-2014  The osCSS developers - osCSS Open Source E-commerce
   @package osCSS-2 <www http://www.oscss.org>
   @version 2.2.0
-  @date  10/10/2013, 10:30
+  @date  28/12/2014, 10:30
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
 	@file tax_classes.php
 	@dir admin/includes/modules/pages/
 */
-require_once(DIR_FS_ADMIN . DIR_WS_CLASSES  .'ModTwo.php');
+require_once(DIR_FS_ADMIN . DIR_WS_CLASSES  .'ModTreePage.php');
 
+
 /**
   @class tax_classes
 */
 class tax_classes
-  extends ModTwo /// new abstract class for nextgen module
+  extends ModTreePage
   implements
-			InterfaceModule,
-	    /*IntModTwo, */ /// new interface module for nextgen module
-	    ExtModConfig {
+				InterfaceModule
+				
+			// base module config structure
+	    , ExtModConfig 
+			// global GetConf methode
+			,IntModTree 
+			// datatable and editable by ajax 
+			,InterfacedTJsonS
+	    {
 
   const FILENAME = FILENAME_TAX_CLASSES;
 
@@ -31,10 +38,6 @@
     @var int current rates
   */
   public static $sId;
-  /**
-    @var bool $dir_ok
-  */
-  public static $dir_ok;
 
 
   /**
@@ -76,7 +79,7 @@
 		MGabCont::SetCurrentName(__CLASS__);
 
 
-
+		
    /**
       @remarks define var execution  sql in GetDBValue()
     */
@@ -558,31 +561,6 @@
 
 
 
-  public static function tep_get_list($page=1,$rowbyp=10,$sOrder='',$sWhere='',$options=''){
-    global $query_numrows;
-
-    /// @remarks force load conf
-    self::GetConf();
-
-    $res=array();
-
-    /**
-      @remarks adjust param for sql requete
-    */
-    self::$InitInfo['adjust']['page']=$page;
-    self::$InitInfo['adjust']['rowbyp']=$rowbyp;
-    self::$InitInfo['adjust']['sOrder'].=$sOrder;
-    self::$InitInfo['adjust']['sWhere'].=$sWhere;
-    self::$InitInfo['adjust']['options']=$options;
-
-    $res = self::GetDBValue();
-
-    self::$list= $query_numrows ;
-
-    return $res;
-  }
-
-
   /** public static InterfacedTJsonS */
 
   /**
@@ -590,7 +568,7 @@
     @param $_query ressource db sql
     @return array
   */
-  private static function FormatDBValue($_query){
+  protected static function FormatDBValue($_query){
     $DB=Database::getInstance();
     $res=array();
 
@@ -602,81 +580,22 @@
 				while ($item = $_query->fetchAssoc()) {
 
 					foreach(self::$InitInfo['modele']['listing'] as $k=>$row)
-						if($k == 'action') $ord[$k]=self::ButtonRowsActions($item);
-						elseif($k == 'visible') $ord[$k]=self::RowStatus($item);
+						if( ($value = self::FormatDBValueRow($k, $item)) && $value !=false )
+							$ord[$k]= $value;
 						else $ord[$k]=$item[$k];
 
 					$res[]=$ord;
 				}
       break;
-      default:
-				global $languages_id;
-
-				$ord  =array();
-
-				if(is_object($_query)){
-					$res = new stdClass;
-					foreach($_query as $key=>$row) {
-						switch($key){
-							default:
-
-							if( ($new_r = self::GetEditFieldsDefine($key) ) && $new_r !=false ){
-								$new_r['input_value'] = $row;
-								$edit  = 'edit_'.$key;
-								$res->$edit = new objectInfo($new_r);
-							}
-
-							$res->$key = $row;
-						}
-					}
-				}
-
+			default:
+				$res = parent::FormatDBValueDefault($_query);
     }
 
     return $res;
   }
 
-  /**
-    @fn ButtonRowsActions($item)
-    @return string html
-  */
-  public  static function ButtonRowsActions($item){
-    return  sprintf(
-		  CsrtAction::getFormat('row_action'),
-// 		  sprintf(CsrtAction::getLink('row_action_right', ICON_FILE_DOWNLOAD, 'plus'), '',  tep_href_link(self::FILENAME,  'cID=' . $item['tax_class_id'] . '&amp;action=download') ,'' )
-''
-		  ,
-		  sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'edit'), '',  tep_href_link(self::FILENAME,  'cID=' . $item['id'] . '&amp;action=edit') ,'' ).
-		  sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'fancy',  tep_href_link(self::FILENAME,  'cID=' . $item['id'] . '&amp;action=delete') ,'' )
-	      );
-  }
 
-  /**
-    @brief return format html for row status
-    @param $product array restuts row product
-    @return string html
-  */
-  private static function RowStatus($item){
-    $exclude=array('action','pID','forceajax','type','class','function','funct', 'mod');
-    $query_s='action=setflag&amp;cID=' . $item['id'].'&amp;flag=';
 
-    return '<a class="ajaxinline" href="' . tep_href_link(self::FILENAME,  tep_get_all_get_params($exclude).$query_s.(($item['visible'] == '1')? '0' : '1') ) . '">'.
-	      sprintf(
-		    CsrtAction::getFormat('row_flag'),
-		    (int)$item['visible'],
-		    ( ($item['visible'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
-		    ).
-	    '</a>';
-  }
-
-
-  /**
-    @brief return Filename
-  */
-  public static function GetFILENAME(){
-    return self::FILENAME;
-  }
-
 }
 
 ?>
\ No newline at end of file

Modified: trunk/catalog/install/includes/sql/mysql/data/20_osc_address_format.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/20_osc_address_format.sql	2014-12-17 10:26:38 UTC (rev 5242)
+++ trunk/catalog/install/includes/sql/mysql/data/20_osc_address_format.sql	2014-12-29 10:17:01 UTC (rev 5243)
@@ -12,8 +12,8 @@
 --+######################################################################--+
 
 
-INSERT INTO osc_address_format (address_format_id, address_format, address_summary, address_example) VALUES(1, '$firstname $lastname$cr$streets$cr$city, $postcode$cr$statecomma$country', '$city / $country', 'Jean-Claude Duce \\n Rue des Bronzés \\n Paris, 75000 FR, \\n France');
-INSERT INTO osc_address_format (address_format_id, address_format, address_summary, address_example) VALUES(2, '$firstname $lastname$cr$streets$cr$city, $state    $postcode$cr$country', '$city, $state / $country', 'Jean-Claude Duce Rue des Bronzés Paris, FR 75000 France');
-INSERT INTO osc_address_format (address_format_id, address_format, address_summary, address_example) VALUES(3, '$firstname $lastname$cr$streets$cr$city$cr$postcode - $statecomma$country', '$state / $country', 'Jean-Claude Duce Rue des Bronzés Paris 75000 - FR, France');
+INSERT INTO osc_address_format (address_format_id, address_format, address_summary, address_example) VALUES(1, '$company$personnal$cr$streets$cr$city, $postcode$cr$statecomma$country', '$city / $country', 'Jean-Claude Duce \\n Rue des Bronzés \\n Paris, 75000 FR, \\n France');
+INSERT INTO osc_address_format (address_format_id, address_format, address_summary, address_example) VALUES(2, '$company$personnal$cr$streets$cr$city, $state    $postcode$cr$country', '$city, $state / $country', 'Jean-Claude Duce Rue des Bronzés Paris, FR 75000 France');
+INSERT INTO osc_address_format (address_format_id, address_format, address_summary, address_example) VALUES(3, '$company$personnal$cr$streets$cr$city$cr$postcode - $statecomma$country', '$state / $country', 'Jean-Claude Duce Rue des Bronzés Paris 75000 - FR, France');
 INSERT INTO osc_address_format (address_format_id, address_format, address_summary, address_example) VALUES(4, '$firstname $lastname$cr$streets$cr$city ($postcode)$cr$country', '$postcode / $country', 'Jean-Claude Duce Rue des Bronzés Paris (75000) France');
 INSERT INTO osc_address_format (address_format_id, address_format, address_summary, address_example) VALUES(5, '$firstname $lastname$cr$streets$cr$postcode $city$cr$country', '$city / $country', 'Jean-Claude Duce \\n Rue des Bronzés \\n 75000 Paris \\n France');

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[5242] trunk/catalog

From: <os...@us...> - 2014-12-17 10:26:40

Revision: 5242
          http://sourceforge.net/p/oscss/svn/5242
Author:   oscim
Date:     2014-12-17 10:26:38 +0000 (Wed, 17 Dec 2014)
Log Message:
-----------
change id in install 
adjust config and file fr

Modified Paths:
--------------
    trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
    trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql

Added Paths:
-----------
    trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_55.txt

Removed Paths:
-------------
    trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_128.txt

Deleted: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_128.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_128.txt	2014-11-30 11:06:20 UTC (rev 5241)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_128.txt	2014-12-17 10:26:38 UTC (rev 5242)
@@ -1,37 +0,0 @@
-<?php
-/**
-  @licence GPL 2005-2014  The osCSS developers - osCSS Open Source E-commerce
-  @package osCSS-2 <www http://www.oscss.org>
-  @version 2.2.0
-  @date  24/01/2014, 11:18
-  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
-  @encode UTF-8
-  @dir admin/includes/languages/fr_FR/modules/configuration/
-*/
-$lang['modconfig heading title 128']="Environement" ;
-
-$lang['USE_LOCAL_GENERAT_PDF_S']="Generation des pdf(commande/BL..)" ;
-$lang['USE_LOCAL_GENERAT_PDF_L']="Utiliser un outils externe pour la generation des document pdf, disponible coté public et privé" ;
-
-$lang['USE_MODELE_PDF_S']="Choix du modele de gabarit a utiliser" ;
-$lang['USE_MODELE_PDF_L']="Vous Pouver ajouter et modifier les modeles dans Documents" ;
-
-
-$lang['DATATYPES_S']="La liste des datatypes actif" ;
-$lang['DATATYPES_L']="L'ordre de la liste à son importance, surtout dans le cas de datatype utilisant les mêmes params GET pour être detecté; Respecter les recommendations suivante:<br />
-- la liste doit commencer par 'error'  qui arrete les tests et ou contrôle est prend en charge les erreur d'url de page ou d'id, <br />
-- ce terminer par 'home', qui est defini par le fait qu'aucun autre module ne prend la main avanat lui <br />
-- les datatype 'Rootlisting' qui sont des datatype transversaux, doivent ce situer apres les datatypes qui sont leur enfants (product avant categorie ou manufacturer)<br />
-<br />
-note:  Les datatypes actif, doivent avoir l'ensemble de leur ficheir présent pur fonctioner. Si le fichier principal du datatype, n'est pas présent, coté public il sera désactiver, mais pas coté admin.  " ;
-
-$lang['DATATYPES_DEFAULT_NOSELECTED_S']="le datatype par defaut" ;
-$lang['DATATYPES_DEFAULT_NOSELECTED_L']="definit le datatype qui sera affiché par defaut" ;
-
-$lang['DATATYPES_ROOTLISTING_MANUFACTURER_S']="les datatypes pris en charge par le datatype manufacturer" ;
-$lang['DATATYPES_ROOTLISTING_MANUFACTURER_L']="la liste des datatypes couplé aux les fabricants" ;
-
-$lang['DATATYPES_ROOTLISTING_FEATURED_S']="les datatypes pris en charge par le datatype featured" ;
-$lang['DATATYPES_ROOTLISTING_FEATURED_L']="la liste des datatypes couplé aux les featured" ;
-
-?>
\ No newline at end of file

Copied: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_55.txt (from rev 5238, trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_128.txt)
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_55.txt	                        (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_55.txt	2014-12-17 10:26:38 UTC (rev 5242)
@@ -0,0 +1,37 @@
+<?php
+/**
+  @licence GPL 2005-2014  The osCSS developers - osCSS Open Source E-commerce
+  @package osCSS-2 <www http://www.oscss.org>
+  @version 2.2.0
+  @date  24/01/2014, 11:18
+  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+  @encode UTF-8
+  @dir admin/includes/languages/fr_FR/modules/configuration/
+*/
+$lang['modconfig heading title 55']="Environement" ;
+
+$lang['USE_LOCAL_GENERAT_PDF_S']="Generation des pdf(commande/BL..)" ;
+$lang['USE_LOCAL_GENERAT_PDF_L']="Utiliser un outils externe pour la generation des document pdf, disponible coté public et privé" ;
+
+$lang['USE_MODELE_PDF_S']="Choix du modele de gabarit a utiliser" ;
+$lang['USE_MODELE_PDF_L']="Vous Pouver ajouter et modifier les modeles dans Documents" ;
+
+
+$lang['DATATYPES_S']="La liste des datatypes actif" ;
+$lang['DATATYPES_L']="L'ordre de la liste à son importance, surtout dans le cas de datatype utilisant les mêmes params GET pour être detecté; Respecter les recommendations suivante:<br />
+- la liste doit commencer par 'error'  qui arrete les tests et ou contrôle est prend en charge les erreur d'url de page ou d'id, <br />
+- ce terminer par 'home', qui est defini par le fait qu'aucun autre module ne prend la main avanat lui <br />
+- les datatype 'Rootlisting' qui sont des datatype transversaux, doivent ce situer apres les datatypes qui sont leur enfants (product avant categorie ou manufacturer)<br />
+<br />
+note:  Les datatypes actif, doivent avoir l'ensemble de leur ficheir présent pur fonctioner. Si le fichier principal du datatype, n'est pas présent, coté public il sera désactiver, mais pas coté admin.  " ;
+
+$lang['DATATYPES_DEFAULT_NOSELECTED_S']="le datatype par defaut" ;
+$lang['DATATYPES_DEFAULT_NOSELECTED_L']="definit le datatype qui sera affiché par defaut" ;
+
+$lang['DATATYPES_ROOTLISTING_MANUFACTURER_S']="les datatypes pris en charge par le datatype manufacturer" ;
+$lang['DATATYPES_ROOTLISTING_MANUFACTURER_L']="la liste des datatypes couplé aux les fabricants" ;
+
+$lang['DATATYPES_ROOTLISTING_FEATURED_S']="les datatypes pris en charge par le datatype featured" ;
+$lang['DATATYPES_ROOTLISTING_FEATURED_L']="la liste des datatypes couplé aux les featured" ;
+
+?>
\ No newline at end of file

Modified: trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql	2014-11-30 11:06:20 UTC (rev 5241)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql	2014-12-17 10:26:38 UTC (rev 5242)
@@ -342,32 +342,32 @@
 insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('SHOW_COUNTS_S', 'SHOW_COUNTS', 'false', 'SHOW_COUNTS_L', '46', '0', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),', '3');
 insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified,date_added, use_function, set_function) values ('NOT_RECUP_CASSE_IN_TXT_CATEGORIES_S', 'NOT_RECUP_CASSE_IN_TXT_CATEGORIES', 'false', 'NOT_RECUP_CASSE_IN_TXT_CATEGORIES_L', '46', '1', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
 
--- 128 General environement
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('USE_LOCAL_GENERAT_PDF_S', 'USE_LOCAL_GENERAT_PDF', 'false', 'USE_LOCAL_GENERAT_PDF_L', '128', '5', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','3');
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('USE_MODELE_PDF_S', 'USE_MODELE_PDF', 'harry', 'USE_MODELE_PDF_L', '128', '5', NULL, NOW(), NULL, '','2');
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('PUBLIC_DRIVERS_PAGE_S', 'PUBLIC_DRIVERS_PAGE', 'GabaritTemplate', 'PUBLIC_DRIVERS_PAGE_L', '128', '0', NOW(), NOW(),NULL, NULL, 2);
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('NO_DISPLAY_SYMBOL_TAXE_S', 'NO_DISPLAY_SYMBOL_TAXE', 'GabaritTemplate', 'NO_DISPLAY_SYMBOL_TAXE_L', '128', '0', NOW(), NOW(),NULL, NULL, 2);
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function ,set_function,configuration_type) values ('DATATYPES_DEFAULT_NOSELECTED_S', 'DATATYPES_DEFAULT_NOSELECTED', 'product', 'DATATYPES_DEFAULT_NOSELECTED_L', '128', '0', NOW(), NOW(),NULL, NULL, 2);
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('PUBLIC_PAGE_TYPE_S', 'PUBLIC_PAGE_TYPE', 'listing,product,account,home,content', 'PUBLIC_PAGE_TYPE_L', '128', '0', NOW(), NOW(),NULL, NULL, 2);
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('DATATYPES_S', 'DATATYPES', 'error,product,content,diver,featured,categorie,home,', 'DATATYPES_L', '128', '0', NOW(), NOW(),NULL, NULL, 2);
-insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('DATATYPES_ROOTLISTING_FEATURED_S', 'DATATYPES_ROOTLISTING_FEATURED', 'product', 'DATATYPES_ROOTLISTING_FEATURED_L', '128', '0', NOW(), NOW(),NULL, NULL, 2);
+-- 55 General environement
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('USE_LOCAL_GENERAT_PDF_S', 'USE_LOCAL_GENERAT_PDF', 'false', 'USE_LOCAL_GENERAT_PDF_L', '55', '5', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','3');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('USE_MODELE_PDF_S', 'USE_MODELE_PDF', 'harry', 'USE_MODELE_PDF_L', '55', '5', NULL, NOW(), NULL, '','2');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('PUBLIC_DRIVERS_PAGE_S', 'PUBLIC_DRIVERS_PAGE', 'GabaritTemplate', 'PUBLIC_DRIVERS_PAGE_L', '55', '0', NOW(), NOW(),NULL, NULL, 2);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('NO_DISPLAY_SYMBOL_TAXE_S', 'NO_DISPLAY_SYMBOL_TAXE', 'GabaritTemplate', 'NO_DISPLAY_SYMBOL_TAXE_L', '55', '0', NOW(), NOW(),NULL, NULL, 2);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function ,set_function,configuration_type) values ('DATATYPES_DEFAULT_NOSELECTED_S', 'DATATYPES_DEFAULT_NOSELECTED', 'product', 'DATATYPES_DEFAULT_NOSELECTED_L', '55', '0', NOW(), NOW(),NULL, NULL, 2);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('PUBLIC_PAGE_TYPE_S', 'PUBLIC_PAGE_TYPE', 'listing,product,account,home,content', 'PUBLIC_PAGE_TYPE_L', '55', '0', NOW(), NOW(),NULL, NULL, 2);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('DATATYPES_S', 'DATATYPES', 'error,product,content,diver,featured,categorie,home,', 'DATATYPES_L', '55', '0', NOW(), NOW(),NULL, NULL, 2);
+insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('DATATYPES_ROOTLISTING_FEATURED_S', 'DATATYPES_ROOTLISTING_FEATURED', 'product', 'DATATYPES_ROOTLISTING_FEATURED_L', '55', '0', NOW(), NOW(),NULL, NULL, 2);
 
 
 
 
--- 129 option orders
+-- 49 option orders
 
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function,configuration_type) values ('DEFAULT_ORDERS_STATUS_ID_S', 'DEFAULT_ORDERS_STATUS_ID', '1', 'DEFAULT_ORDERS_STATUS_ID_L', '129', '2', NULL, NOW(), 'tep_cfg_pull_down_order_statuses(', 'tep_cfg_pull_down_order_statuses(',2);
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('DEFAULT_ORDERS_STATUS_COMPLETED_S', 'DEFAULT_ORDERS_STATUS_COMPLETED', '6', 'DEFAULT_ORDERS_STATUS_COMPLETED_L', '129', '0', NULL, NOW(), 'tep_cfg_pull_down_order_statuses(', 'tep_cfg_pull_down_order_statuses(',2);
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('DEFAULT_ORDERS_STATUS_ID_S', 'DEFAULT_ORDERS_STATUS_ANNULATE', '-1', 'DEFAULT_ORDERS_STATUS_ID_L', '129', '0', NULL, NOW(),'tep_cfg_pull_down_order_statuses(', 'tep_cfg_pull_down_order_statuses(',2);
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function,configuration_type) values ('DEFAULT_ORDERS_STATUS_PAYED_S', 'DEFAULT_ORDERS_STATUS_PAYED', '2', 'DEFAULT_ORDERS_STATUS_PAYED_L', '129', '2', NULL, NOW(), 'tep_cfg_pull_down_order_statuses(', 'tep_cfg_pull_down_order_statuses(',2);
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function,configuration_type) values ('DEFAULT_ORDERS_STATUS_SHIPPING_S', 'DEFAULT_ORDERS_STATUS_SHIPPING', '4', 'DEFAULT_ORDERS_STATUS_SHIPPING_L', '129', '2', NULL, NOW(), 'tep_cfg_pull_down_order_statuses(', 'tep_cfg_pull_down_order_statuses(',2);
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function,configuration_type) values ('DEFAULT_ORDERS_STATUS_DELIVERY_S', 'DEFAULT_ORDERS_STATUS_DELIVERY', '5', 'DEFAULT_ORDERS_STATUS_DELIVERY_L', '129', '2', NULL, NOW(), 'tep_cfg_pull_down_order_statuses(', 'tep_cfg_pull_down_order_statuses(',2);
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('USE_LOCAL_GENERAT_ORDER_REF_S', 'USE_LOCAL_GENERAT_ORDER_REF', 'true', 'USE_LOCAL_GENERAT_ORDER_REF_L', '129', '5', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','2');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function,configuration_type) values ('DEFAULT_ORDERS_STATUS_ID_S', 'DEFAULT_ORDERS_STATUS_ID', '1', 'DEFAULT_ORDERS_STATUS_ID_L', '49', '2', NULL, NOW(), 'tep_cfg_pull_down_order_statuses(', 'tep_cfg_pull_down_order_statuses(',2);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('DEFAULT_ORDERS_STATUS_COMPLETED_S', 'DEFAULT_ORDERS_STATUS_COMPLETED', '6', 'DEFAULT_ORDERS_STATUS_COMPLETED_L', '49', '0', NULL, NOW(), 'tep_cfg_pull_down_order_statuses(', 'tep_cfg_pull_down_order_statuses(',2);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('DEFAULT_ORDERS_STATUS_ID_S', 'DEFAULT_ORDERS_STATUS_ANNULATE', '-1', 'DEFAULT_ORDERS_STATUS_ID_L', '49', '0', NULL, NOW(),'tep_cfg_pull_down_order_statuses(', 'tep_cfg_pull_down_order_statuses(',2);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function,configuration_type) values ('DEFAULT_ORDERS_STATUS_PAYED_S', 'DEFAULT_ORDERS_STATUS_PAYED', '2', 'DEFAULT_ORDERS_STATUS_PAYED_L', '49', '2', NULL, NOW(), 'tep_cfg_pull_down_order_statuses(', 'tep_cfg_pull_down_order_statuses(',2);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function,configuration_type) values ('DEFAULT_ORDERS_STATUS_SHIPPING_S', 'DEFAULT_ORDERS_STATUS_SHIPPING', '4', 'DEFAULT_ORDERS_STATUS_SHIPPING_L', '49', '2', NULL, NOW(), 'tep_cfg_pull_down_order_statuses(', 'tep_cfg_pull_down_order_statuses(',2);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function,configuration_type) values ('DEFAULT_ORDERS_STATUS_DELIVERY_S', 'DEFAULT_ORDERS_STATUS_DELIVERY', '5', 'DEFAULT_ORDERS_STATUS_DELIVERY_L', '49', '2', NULL, NOW(), 'tep_cfg_pull_down_order_statuses(', 'tep_cfg_pull_down_order_statuses(',2);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('USE_LOCAL_GENERAT_ORDER_REF_S', 'USE_LOCAL_GENERAT_ORDER_REF', 'true', 'USE_LOCAL_GENERAT_ORDER_REF_L', '49', '5', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','2');
 
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type, set_function) values ('USE_MODELE_NUMREF_ORDERS_S', 'USE_MODELE_NUMREF_ORDERS', 'poisson', 'USE_MODELE_NUMREF_ORDERS_L', '129', '0', NULL, NOW(), '2', 'tep_cfg_pull_down_numref_mod(\'orders\',');
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type, set_function) values ('USE_MODELE_NUMREF_BILLS_S', 'USE_MODELE_NUMREF_BILLS', 'sakura', 'USE_MODELE_NUMREF_BILLS_L', '129', '0', NULL, NOW(), '2', 'tep_cfg_pull_down_numref_mod(\'bills\',');
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type, set_function) values ('USE_MODELE_NUMREF_SHIPPING_S', 'USE_MODELE_NUMREF_SHIPPING', 'shikamaru', 'USE_MODELE_NUMREF_SHIPPING_L', '129', '0', NULL, NOW(), '2', 'tep_cfg_pull_down_numref_mod(\'shipping\',');
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type, set_function) values ('USE_MODELE_NUMREF_SERVICE_S', 'USE_MODELE_NUMREF_SERVICE', '', 'USE_MODELE_NUMREF_SERVICE_L', '129', '0', NULL, NOW(), '2', 'tep_cfg_pull_down_numref_mod(\'services\',');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type, set_function) values ('USE_MODELE_NUMREF_ORDERS_S', 'USE_MODELE_NUMREF_ORDERS', 'poisson', 'USE_MODELE_NUMREF_ORDERS_L', '49', '0', NULL, NOW(), '2', 'tep_cfg_pull_down_numref_mod(\'orders\',');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type, set_function) values ('USE_MODELE_NUMREF_BILLS_S', 'USE_MODELE_NUMREF_BILLS', 'sakura', 'USE_MODELE_NUMREF_BILLS_L', '49', '0', NULL, NOW(), '2', 'tep_cfg_pull_down_numref_mod(\'bills\',');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type, set_function) values ('USE_MODELE_NUMREF_SHIPPING_S', 'USE_MODELE_NUMREF_SHIPPING', 'shikamaru', 'USE_MODELE_NUMREF_SHIPPING_L', '49', '0', NULL, NOW(), '2', 'tep_cfg_pull_down_numref_mod(\'shipping\',');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type, set_function) values ('USE_MODELE_NUMREF_SERVICE_S', 'USE_MODELE_NUMREF_SERVICE', '', 'USE_MODELE_NUMREF_SERVICE_L', '49', '0', NULL, NOW(), '2', 'tep_cfg_pull_down_numref_mod(\'services\',');
 COMMIT;
 

Modified: trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql	2014-11-30 11:06:20 UTC (rev 5241)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql	2014-12-17 10:26:38 UTC (rev 5242)
@@ -14,76 +14,77 @@
 
 -- Preserver les ID
 
-insert into osc_configuration_group values (100,'APPARENCE', NULL, 2, 1, 0, '1', 'CG_APPARENCE');
-	insert into osc_configuration_group values (19, 'PAGE_PRODUCT_DETAIL', NULL, 0, 1, 100, '0', 'CG_PAGE_PRODUCT_DETAIL');
-	insert into osc_configuration_group values (4,  'IMAGES', NULL, 0, 1, 100, '0', 'MODIMAGES');
-	insert into osc_configuration_group values (8,  'LIST_PRODUTCS', NULL, 0, 1, 100, '0', 'CG_LIST_PRODUTCS');
-	insert into osc_configuration_group values (21, 'OPEN_BOX', NULL, 0, 1, 100, '0', 'CG_OPEN_BOX');
-	insert into osc_configuration_group values (27 , 'APPARENCE_GENERAL', NULL, 0 , 1, 100, '0', 'CG_APPARENCE_GENERAL');
-	insert into osc_configuration_group values (29 , 'BOX_CONFIGURATION_TEMPLATE', NULL, 0 , 1, 100, '0', 'MODTEMPLATE');
+insert into osc_configuration_group values (51,'APPARENCE', NULL, 2, 1, 0, '1', 'CG_APPARENCE');
+	insert into osc_configuration_group values (19, 'PAGE_PRODUCT_DETAIL', NULL, 0, 1, 51, '0', 'CG_PAGE_PRODUCT_DETAIL');
+	insert into osc_configuration_group values (4,  'IMAGES', NULL, 0, 1, 51, '0', 'MODIMAGES');
+	insert into osc_configuration_group values (8,  'LIST_PRODUTCS', NULL, 0, 1, 51, '0', 'CG_LIST_PRODUTCS');
+	insert into osc_configuration_group values (21, 'OPEN_BOX', NULL, 0, 1, 51, '0', 'CG_OPEN_BOX');
+	insert into osc_configuration_group values (27 , 'APPARENCE_GENERAL', NULL, 0 , 1, 51, '0', 'CG_APPARENCE_GENERAL');
+	insert into osc_configuration_group values (29 , 'BOX_CONFIGURATION_TEMPLATE', NULL, 0 , 1, 51, '0', 'MODTEMPLATE');
 
-insert into osc_configuration_group values (110,'CONFIGURATION', NULL, 1, 1, 0, '1', 'CG_CONFIGURATION');
--- insert into osc_configuration_group values (3,  'VALUE_MAXI', NULL, 0, 1, 110, '0', 'CG_VALUE_MAXI');
-	insert into osc_configuration_group values (2,  'VALUE_MINI', NULL, 0, 1, 110, '0', 'CG_VALUE_MINI');
-	insert into osc_configuration_group values (1, 	'MY_BOUTIQUE', NULL, 0, 1, 110, '0', 'CG_MY_BOUTIQUE');
+insert into osc_configuration_group values (52,'CONFIGURATION', NULL, 1, 1, 0, '1', 'CG_CONFIGURATION');
+-- insert into osc_configuration_group values (3,  'VALUE_MAXI', NULL, 0, 1, 52, '0', 'CG_VALUE_MAXI');
+	insert into osc_configuration_group values (2,  'VALUE_MINI', NULL, 0, 1, 52, '0', 'CG_VALUE_MINI');
+	insert into osc_configuration_group values (1, 	'MY_BOUTIQUE', NULL, 0, 1, 52, '0', 'CG_MY_BOUTIQUE');
 
-	insert into osc_configuration_group values (30 , 'BOX_LOCALIZATION_ORDERS_STATUS', NULL, 0 , 1, 110, '0', 'MODSTATUS');
+	insert into osc_configuration_group values (30 , 'BOX_LOCALIZATION_ORDERS_STATUS', NULL, 0 , 1, 52, '0', 'MODSTATUS');
 
 
-insert into osc_configuration_group values (120,'CONFIG_AVANCE', NULL, 4, 1, 0, '1', 'CG_CONFIG_AVANCE');
-	insert into osc_configuration_group values (24 , 'CG_CIP_MANAGER', NULL, 0 , 1, 120, '0', 'CG_CIP_MANAGER');
+insert into osc_configuration_group values (53,'CONFIG_AVANCE', NULL, 4, 1, 0, '1', 'CG_CONFIG_AVANCE');
+	insert into osc_configuration_group values (24 , 'CG_CIP_MANAGER', NULL, 0 , 1, 53, '0', 'CG_CIP_MANAGER');
 
-	insert into osc_configuration_group values (10, 'LOGGING', NULL, 0, 1, 120, '0', 'CG_LOGGING');
-	insert into osc_configuration_group values (12, 'OPTION_MAIL', NULL, 0, 1, 120, '0', 'MODMAIL');
-	insert into osc_configuration_group values (14, 'COMPRESSION', NULL, 0, 1, 120, '0', 'CG_COMPRESSION');
-	insert into osc_configuration_group values (15, 'SESSION', NULL, 0, 1, 120, '0', 'CG_SESSION');
-	insert into osc_configuration_group values (16, 'SEO_URL', NULL, 0, 1, 120, '0', 'MODSEOURL');
-	insert into osc_configuration_group values (31 , 'BOX_LOCALIZATION_LANGUAGES', NULL, 0 , 1, 120, '0', 'MODLANGUE');
+	insert into osc_configuration_group values (10, 'LOGGING', NULL, 0, 1, 53, '0', 'CG_LOGGING');
+	insert into osc_configuration_group values (12, 'OPTION_MAIL', NULL, 0, 1, 53, '0', 'MODMAIL');
+	insert into osc_configuration_group values (14, 'COMPRESSION', NULL, 0, 1, 53, '0', 'CG_COMPRESSION');
+	insert into osc_configuration_group values (15, 'SESSION', NULL, 0, 1, 53, '0', 'CG_SESSION');
+	insert into osc_configuration_group values (16, 'SEO_URL', NULL, 0, 1, 53, '0', 'MODSEOURL');
+	insert into osc_configuration_group values (31 , 'BOX_LOCALIZATION_LANGUAGES', NULL, 0 , 1, 53, '0', 'MODLANGUE');
 
--- insert into osc_configuration_group values (26,  'ATTRIBUTE_PRODUCT', NULL,0 , 1, 120, '0', 'CG_ATTRIBUTE_PRODUCT');
-	insert into osc_configuration_group values (128,'BOX_CONFIGURATION_ENVIRONEMENT', NULL, 0, 1, 120, '0', 'CFG_ENVIRONEMENT');
+-- insert into osc_configuration_group values (26,  'ATTRIBUTE_PRODUCT', NULL,0 , 1, 53, '0', 'CG_ATTRIBUTE_PRODUCT');
+	insert into osc_configuration_group values (55,'BOX_CONFIGURATION_ENVIRONEMENT', NULL, 0, 1, 53, '0', 'CFG_ENVIRONEMENT');
 
-insert into osc_configuration_group values (126,'ESPACE_ADMIN', NULL, 5, 1, 0, '1', 'CG_ESPACE_ADMIN');
-	insert into osc_configuration_group values (17, 'QUICK_UPDATE', NULL, 0, 1, 126, '0', 'MODADMINCONFIG');
-	insert into osc_configuration_group values (20, 'PRODUCT_ATTENTE', NULL, 0, 1, 126, '0', 'CG_PRODUCT_ATTENTE');
-	insert into osc_configuration_group values (22, 'RECOVER_CART_SALES', NULL,  0, 1, 126, '0', 'CG_RECOVER_CART_SALES');
+insert into osc_configuration_group values (56,'ESPACE_ADMIN', NULL, 5, 1, 0, '1', 'CG_ESPACE_ADMIN');
+	insert into osc_configuration_group values (17, 'QUICK_UPDATE', NULL, 0, 1, 56, '0', 'MODADMINCONFIG');
+	insert into osc_configuration_group values (20, 'PRODUCT_ATTENTE', NULL, 0, 1, 56, '0', 'CG_PRODUCT_ATTENTE');
+	insert into osc_configuration_group values (22, 'RECOVER_CART_SALES', NULL,  0, 1, 56, '0', 'CG_RECOVER_CART_SALES');
 
-insert into osc_configuration_group values (127,'CONFIG_COMM', NULL, 3, 1, 0, '1', 'CG_CONFIG_COMM');
+insert into osc_configuration_group values (57,'CONFIG_COMM', NULL, 3, 1, 0, '1', 'CG_CONFIG_COMM');
 
-	insert into osc_configuration_group values (9,  'STOCK', NULL, 0, 1, 127, '0', 'MODSTOCK');
-	insert into osc_configuration_group values (11, 'OPTION_CATALOG', NULL, 0, 1, 127, '0', 'CG_OPTION_CATALOG');
+	insert into osc_configuration_group values (9,  'STOCK', NULL, 0, 1, 57, '0', 'MODSTOCK');
+	insert into osc_configuration_group values (11, 'OPTION_CATALOG', NULL, 0, 1, 57, '0', 'CG_OPTION_CATALOG');
 
 
--- 	insert into osc_configuration_group values (6, 	'OPTION_MODULES', NULL, 0, 1, 120, '0', 'CG_OPTION_MODULES');
+-- 	insert into osc_configuration_group values (6, 	'OPTION_MODULES', NULL, 0, 1, 53, '0', 'CG_OPTION_MODULES');
 
--- insert into osc_configuration_group values (130,'CONFIGURATION_DATATYPES', NULL, 0, 1, 127, '0', 'MODDATATYPE');
+-- insert into osc_configuration_group values (130,'CONFIGURATION_DATATYPES', NULL, 0, 1, 57, '0', 'MODDATATYPE');
 
-	insert into osc_configuration_group values (35 , 'OPTION_PRODUCTS', NULL, 0 , 1, 127, '1', 'OPTION_PRODUCTS');
+	insert into osc_configuration_group values (35 , 'OPTION_PRODUCTS', NULL, 0 , 1, 57, '1', 'OPTION_PRODUCTS');
 		insert into osc_configuration_group values (36, 'CONFIG_PRODUCTS', NULL , 0, 1, 35, '0', 'DATATYPEPRODUCT');
 		insert into osc_configuration_group values (13, 'DOWNLOADS', NULL, 0, 1, 35, '0', 'MODDOWNLOADS');
 		insert into osc_configuration_group values (34 , 'BOX_CONFIGURATION_PRODUCTS_EXTRA_FIELDS', NULL, 0 , 1, 35, '0', 'MODEXTRAPRODUCT');
 		insert into osc_configuration_group values (25 , 'NEW_PRODUCTS', NULL, 0 , 1, 35, '0', 'CG_NEW_PRODUCTS');
 
-	insert into osc_configuration_group values (39 , 'OPTION_CUSTOMERS', NULL, 0 , 1, 127, '1', 'OPTION_CUSTOMERS');
+	insert into osc_configuration_group values (39 , 'OPTION_CUSTOMERS', NULL, 0 , 1, 57, '1', 'OPTION_CUSTOMERS');
 		insert into osc_configuration_group values (42 , 'CONFIG_CUSTOMERS', NULL, 0 , 1, 39, '0', 'DATATYPEACCOUNT');
 		insert into osc_configuration_group values (28 , 'MEMBRES_DETAIL', NULL, 0 , 1, 39, '0', 'MODMEMBRES');
 		insert into osc_configuration_group values (33 , 'BOX_CONFIGURATION_EXTRA_FIELDS', NULL, 0 , 1, 39, '0', 'MODEXTRACUSTOMER');
 		insert into osc_configuration_group values (47 , 'BOX_EXTRA_FIELDS_ADDRESS_BOOK', NULL, 0 , 1, 39, '0', 'MODEXTRAADDRESSBOOK');
 
-	insert into osc_configuration_group values (40 , 'OPTION_ORDERS', NULL, 0 , 1, 127, '1', 'OPTION_ORDERS');
-		insert into osc_configuration_group values (129,'CONFIGURATION_ORDERS', NULL, 0, 1, 40, '0', 'MODORDER');
+	insert into osc_configuration_group values (40 , 'OPTION_ORDERS', NULL, 0 , 1, 57, '1', 'OPTION_ORDERS');
+		insert into osc_configuration_group values (49,'CONFIGURATION_ORDERS', NULL, 0, 1, 40, '0', 'MODORDER');
 		insert into osc_configuration_group values (7,  'EXPEDITION_EMBALLAGE', NULL, 0, 1, 40, '0', 'MODEXPEDITION');
 		insert into osc_configuration_group values (41,  'PAYMENT', NULL, 0, 1, 40, '0', 'MODPAYMENT');
+		insert into osc_configuration_group values (50,'CONFIGURATION_ORDERS_EXTRA', NULL, 0, 1, 40, '0', 'MODEXTRAORDER');
 
-	insert into osc_configuration_group values (43 , 'OPTION_CONTENT', NULL, 0 , 1, 127, '1', 'OPTION_CONTENT');
+	insert into osc_configuration_group values (43 , 'OPTION_CONTENT', NULL, 0 , 1, 57, '1', 'OPTION_CONTENT');
 		insert into osc_configuration_group values (44, 'CONFIG_CONTENT', NULL , 0, 1, 43, '0', 'DATATYPECONTENT');
 		insert into osc_configuration_group values (48, 'BOX_EXTRA_FIELDS_CONTENT', NULL , 0, 1, 43, '0', 'MODEXTRACONTENT');
 
-	insert into osc_configuration_group values (45 , 'OPTION_CATEGORIE', NULL, 0 , 1, 127, '1', 'OPTION_CATEGORIE');
+	insert into osc_configuration_group values (45 , 'OPTION_CATEGORIE', NULL, 0 , 1, 57, '1', 'OPTION_CATEGORIE');
 		insert into osc_configuration_group values (46, 'CONFIG_CATEGORIE', NULL , 0, 1, 45, '0', 'DATATYPECATEGORIE');
 -- hidden in menu configuration
-insert into osc_configuration_group values (37 , 'VIEW_SYSINFO', NULL, 0 , 0, 120, '1', 'MODSYSINFO');
-insert into osc_configuration_group values (38 , 'VIEW_SYSINFO', NULL, 0 , 0, 120, '1', 'MODCORECACHE');
+insert into osc_configuration_group values (37 , 'VIEW_SYSINFO', NULL, 0 , 0, 53, '1', 'MODSYSINFO');
+insert into osc_configuration_group values (38 , 'VIEW_SYSINFO', NULL, 0 , 0, 53, '1', 'MODCORECACHE');
 
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[5241] trunk/catalog

From: <os...@us...> - 2014-11-30 11:06:29

Revision: 5241
          http://sourceforge.net/p/oscss/svn/5241
Author:   oscim
Date:     2014-11-30 11:06:20 +0000 (Sun, 30 Nov 2014)
Log Message:
-----------
Fix process cart
Add method in checkout_process for manipulate type of orders
Fix history for restrict type listen in history public page 

Modified Paths:
--------------
    trunk/catalog/common/classes/cart/CartStockageCustomer.class.php
    trunk/catalog/common/classes/shoppingCart.php
    trunk/catalog/includes/classes/checkout_process.php
    trunk/catalog/includes/modules/account/history.php

Modified: trunk/catalog/common/classes/cart/CartStockageCustomer.class.php
===================================================================
--- trunk/catalog/common/classes/cart/CartStockageCustomer.class.php	2014-11-29 07:30:07 UTC (rev 5240)
+++ trunk/catalog/common/classes/cart/CartStockageCustomer.class.php	2014-11-30 11:06:20 UTC (rev 5241)
@@ -177,8 +177,7 @@
 		
 		$DB = Database::getInstance();
     $products_query = $DB->query($sql);
-    
-    
+
     $list = array();
     foreach($products_query->fetchAllAssoc() as $products) {
 
@@ -186,6 +185,11 @@
 				'qty'=> $products['customers_basket_quantity'],
 						);
 						
+			if(!$products_id_string) {
+				$products_id_string =  tep_get_prid($products['products_id']); 
+				$option =  ( count(tep_get_prid_array($products['products_id']))>0 ? 1 : 0 ); 
+			}
+
       // attributes
       if( $products_id_string  && $option > 0) {
 				$sql="select cba.products_options_id as options_id, cba.products_options_value_id as value_id, cba.products_options_value_text, po.products_options_type as type from " . TABLE_CUSTOMERS_BASKET_ATTRIBUTES . " cba LEFT JOIN ".TABLE_PRODUCTS_OPTIONS." po ON(cba.products_options_id = po.products_options_id )  where cba.customers_id = '" . (int)$_SESSION['customer_id'] . "' and cba.products_id = '" . tep_db_input($products['products_id']) . "' ";

Modified: trunk/catalog/common/classes/shoppingCart.php
===================================================================
--- trunk/catalog/common/classes/shoppingCart.php	2014-11-29 07:30:07 UTC (rev 5240)
+++ trunk/catalog/common/classes/shoppingCart.php	2014-11-30 11:06:20 UTC (rev 5241)
@@ -264,39 +264,39 @@
 		if ($this->in_cart($products_id_string)==true) 
 			$Prefix = 'Update';
 
-				if (is_array($attributes)) {
-					reset($attributes);
-					while (list($option, $value) = each($attributes)) {
-						$attr_value = NULL;
-						$blank_value = FALSE;
-						if (strstr($option, TEXT_PREFIX)) {
-							if (trim($value) == NULL) {
-								$blank_value = TRUE;
-							} else {
-								$option = substr($option, strlen(TEXT_PREFIX));
-								$attr_value = htmlspecialchars(stripslashes($value), ENT_QUOTES);
-								
-								if($Prefix =='Set')
-									$value = (isset($_POST['Valueid'][$option])? $_POST['Valueid'][$option]:  $option); 
-								else
-									$value = (isset($_POST['Valueid'][$products_id_string][$option])? $_POST['Valueid'][$products_id_string][$option]:  $option);
-							}
-						}
-						// adjust for multi value for one option
-						elseif (is_array($value)) {
-							foreach($value as $k=>$v)
-								$tmp_value[$k] = htmlspecialchars(stripslashes($v), ENT_QUOTES);
+		if (is_array($attributes)) {
+			reset($attributes);
+			while (list($option, $value) = each($attributes)) {
+				$attr_value = NULL;
+				$blank_value = FALSE;
+				if (strstr($option, TEXT_PREFIX)) {
+					if (trim($value) == NULL) {
+						$blank_value = TRUE;
+					} else {
+						$option = substr($option, strlen(TEXT_PREFIX));
+						$attr_value = htmlspecialchars(stripslashes($value), ENT_QUOTES);
+						
+						if($Prefix =='Set')
+							$value = (isset($_POST['Valueid'][$option])? $_POST['Valueid'][$option]:  $option); 
+						else
+							$value = (isset($_POST['Valueid'][$products_id_string][$option])? $_POST['Valueid'][$products_id_string][$option]:  $option);
+					}
+				}
+				// adjust for multi value for one option
+				elseif (is_array($value)) {
+					foreach($value as $k=>$v)
+						$tmp_value[$k] = htmlspecialchars(stripslashes($v), ENT_QUOTES);
 
-								$attr_value = implode(',',$tmp_value);
-						}
+						$attr_value = implode(',',$tmp_value);
+				}
 
-						if (!$blank_value)
-							$this->CallerStockage($Prefix.'Attribute',$products_id_string,  $option, $value, $attr_value);
+				if (!$blank_value)
+					$this->CallerStockage($Prefix.'Attribute',$products_id_string,  $option, $value, $attr_value);
 
-					}
-				}
+			}
+		}
 
-				$this->CallerStockage($Prefix,$products_id_string, $qty, @$special_class);
+		$this->CallerStockage($Prefix,$products_id_string, $qty, @$special_class);
 					
 // 		}
 		// assign a temporary unique ID to the order contents to prevent hack attempts during the checkout procedure
@@ -420,18 +420,18 @@
 
 								'price' =>  (($special)? $res_price['sprice_ht'] :$res_price['price_ht']),
 								'quantity' => $product['qty'],
-								'weight' => $objectProduct->GetWeight() +( isset($content[$products_id]['attributes']) ?(float)product::get_attributes_weight($products_id, $content[$products_id]['attributes']) : 0) ,
+								'weight' => $objectProduct->GetWeight() +( isset($product['attributes']) ?(float)product::get_attributes_weight($products_id, $product['attributes']) : 0) ,
 								'final_price' => (($special)? $res_price['sprice_ht'] :$res_price['price_ht']),
 								'final_price_ttc' => (($special)? $res_price['sprice_ttc'] :$res_price['price_ttc']),
 								'total_line' => $res_price['total_line'],
 								'total_line_ttc' => $res_price['total_line_ttc'],
 								'tax_class_id' => $objectProduct->GetTaxClassId(),
-								'attributes' => (isset($content[$products_id]['attributes']) ? $content[$products_id]['attributes'] : ''),
-								'attributes_values' => (isset($content[$products_id]['attributes_values']) ? $content[$products_id]['attributes_values'] : ''),
+								'attributes' => (isset($product['attributes']) ? $product['attributes'] : ''),
+								'attributes_values' => (isset($product['attributes_values']) ? $product['attributes_values'] : ''),
 
-								'special_class'=> (isset($content[$products_id]['special_class'])? $content[$products_id]['special_class'] : ''),
+								'special_class'=> (isset($product['special_class'])? $product['special_class'] : ''),
 
-// 								'group' => (isset($content[$products_id]['group'])? (array)$content[$products_id]['group'] : false),
+// 								'group' => (isset($product['group'])? (array)$product['group'] : false),
 								);
 
 // 				if(isset($tmp['group']['id']))

Modified: trunk/catalog/includes/classes/checkout_process.php
===================================================================
--- trunk/catalog/includes/classes/checkout_process.php	2014-11-29 07:30:07 UTC (rev 5240)
+++ trunk/catalog/includes/classes/checkout_process.php	2014-11-30 11:06:20 UTC (rev 5241)
@@ -51,10 +51,13 @@
     @var array  tableau de table
   */
   private static $tables;
+  /**
+    @var array  tableau de table
+  */
+  private static $type = 0;
 
 
 
-
   /**
    @fn  __construct($order_id='',$table='')
    @brief Charge les module aca specifique au porduits
@@ -103,6 +106,13 @@
     /*if(tep_not_null($order_id))*/ self::$Id=$this->the_order_id=(int)$order_id;
   }
 
+  
+  /**
+		@brief Fix current type of order 
+  */
+  public static function SetTypeOrder( $type ){
+		self::$type = $type; 
+  }
 
   /**
    @fn GetMode()
@@ -527,7 +537,7 @@
 
     $sql_data_array = array(
 					'holding_origin_id'=>(int)$pre_order_id,
-					'orders_type' => 0,
+					'orders_type' => self::$type ,
 					'orders_ref' => tep_db_input( $ref ),
 			    'orders_prefix' => tep_db_input($order['orders_prefix']), // obsolete
 			    'currency' => tep_db_input($order['currency']),

Modified: trunk/catalog/includes/modules/account/history.php
===================================================================
--- trunk/catalog/includes/modules/account/history.php	2014-11-29 07:30:07 UTC (rev 5240)
+++ trunk/catalog/includes/modules/account/history.php	2014-11-30 11:06:20 UTC (rev 5241)
@@ -53,7 +53,7 @@
   */
   function __construct(){
     $this->code =__CLASS__;
-    @$this->type = self::$type;
+		$this->type = self::$type;
     $this->title = __('module history text title');
     $this->description = __('module history text description') ;
     $this->sort_order = (defined('MODULE_ACA_HISTORY_SORT_ORDER')) ? MODULE_ACA_HISTORY_SORT_ORDER : 0;
@@ -160,7 +160,7 @@
 		switch(self::$action){
 			case 'display_view':
 
-				$sql="SELECT o.orders_id,o.orders_ref, o.date_purchased, o.delivery_name, o.billing_name, ot.text as order_total,o.orders_status, s.status_name as orders_status_name from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_TOTAL . " ot, " . TABLE_STATUS . " s WHERE o.customers_id = '" . (int)$cID . "' AND o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.status_id AND status_type='orders' AND s.language_id = '" . (int)$languages_id . "' ORDER BY orders_id DESC";
+				$sql="SELECT o.orders_id,o.orders_ref, o.date_purchased, o.delivery_name, o.billing_name, ot.text as order_total,o.orders_status, s.status_name as orders_status_name from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_TOTAL . " ot, " . TABLE_STATUS . " s WHERE o.customers_id = '" . (int)$cID . "' AND orders_type = 0 AND o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.status_id AND status_type='orders' AND s.language_id = '" . (int)$languages_id . "' ORDER BY orders_id DESC";
 
 				self::$history_split = new splitPageResults($sql, MAX_DISPLAY_ORDER_HISTORY);
 				$_query = $DB->query(self::$history_split->sql_query);
@@ -206,7 +206,7 @@
 
 			default:
 
-				$orders_query = tep_db_query("select o.orders_id,o.orders_ref, o.date_purchased, o.delivery_name, o.delivery_country, o.billing_name, o.billing_country, ot.text as order_total, s.status_name as orders_status_name from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_TOTAL . " ot, " . TABLE_STATUS . " s where o.customers_id = '" . (int)$cID . "' and o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.status_id and s.language_id = '" . (int)$languages_id . "' AND status_type='orders' ORDER BY orders_id desc limit 1");
+				$orders_query = tep_db_query("select o.orders_id,o.orders_ref, o.date_purchased, o.delivery_name, o.delivery_country, o.billing_name, o.billing_country, ot.text as order_total, s.status_name as orders_status_name from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_TOTAL . " ot, " . TABLE_STATUS . " s where o.customers_id = '" . (int)$cID . "' AND orders_type = 0 and o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.status_id and s.language_id = '" . (int)$languages_id . "' AND status_type='orders' ORDER BY orders_id desc limit 1");
 
 				$result = $orders_query->fetchAssoc();
 		}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[5240] trunk/catalog/includes/classes/checkout_process. php

From: <os...@us...> - 2014-11-29 07:30:14

Revision: 5240
          http://sourceforge.net/p/oscss/svn/5240
Author:   oscim
Date:     2014-11-29 07:30:07 +0000 (Sat, 29 Nov 2014)
Log Message:
-----------
Fix bug in process cmd , error for named var used 

Modified Paths:
--------------
    trunk/catalog/includes/classes/checkout_process.php

Modified: trunk/catalog/includes/classes/checkout_process.php
===================================================================
--- trunk/catalog/includes/classes/checkout_process.php	2014-11-29 07:07:22 UTC (rev 5239)
+++ trunk/catalog/includes/classes/checkout_process.php	2014-11-29 07:30:07 UTC (rev 5240)
@@ -520,7 +520,7 @@
     $DB=Database::getInstance();
 
 
-		$order = self::GetTblByOrderId($_id); 
+		$order = self::GetTblByOrderId($pre_order_id); 
 		$ref = self::GetRef($order);
 		
 		$this->the_order_formated=$_SESSION['the_order_formated']=$ref;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[5239] trunk/catalog/install/data/templates/ appareil_photo/Modern_RWD

From: <os...@us...> - 2014-11-29 07:07:25

Revision: 5239
          http://sourceforge.net/p/oscss/svn/5239
Author:   oscim
Date:     2014-11-29 07:07:22 +0000 (Sat, 29 Nov 2014)
Log Message:
-----------
Fix template for called short cart

Modified Paths:
--------------
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/boxes/view_min_cart.php

Modified: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php	2014-09-18 22:28:08 UTC (rev 5238)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php	2014-11-29 07:07:22 UTC (rev 5239)
@@ -40,39 +40,13 @@
                         </ul>
                     </li>
                     <li class="divider"></li>
-                    <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="sprite-basket rotator"></i>100,00 &euro; <span class="badge">2</span><span class="caret"></span></a>  
+                    <li class="dropdown">
+												<?= $boxe =$page->oscss_boxes->_return('view_min_cart');  ?>
+												<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="sprite-basket rotator"></i><?= $boxe->total ?> &euro; <span class="badge"><?= $boxe->items ?></span><span class="caret"></span></a>  
                         <ul class="dropdown-menu" role="menu">
-                            <?= $boxe =$page->oscss_boxes->_return('shopping_cart_short'); ?>
-                            <li>
-                                <table class="table table-condensed table-striped table-hover">
-                                    <thead>
-                                        <tr>
-                                            <th>Prod.</th>
-                                            <th>Qté.</th>
-                                            <th>Prix</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        <tr>
-                                            <td class="dark">Disque</td>
-                                            <td>1</td>
-                                            <td>50.00&euro;</td>
-                                        </tr>
-                                        <tr>
-                                            <td class="dark">Vaisselle</td>
-                                            <td>1</td>
-                                            <td>50.00&euro;</td>
-                                        </tr>
-                                    </tbody>
-                                    <tfoot>
-                                        <tr class="active">
-                                            <td colspan="2">Total : </td>
-                                            <td class="dark">100.00€</td>
-                                        </tr>
-                                    </tfoot>
-                                </table>
-                            </li>
-                            <li><a href="#">Voir mon panier</a></li>
+                           
+                            <li><?php echo unhtmlentities($boxe->content) ?></li>
+                            <li><?php echo unhtmlentities($boxe->title) ?></li>
                         </ul>
 
                     </li>

Modified: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/boxes/view_min_cart.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/boxes/view_min_cart.php	2014-09-18 22:28:08 UTC (rev 5238)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/boxes/view_min_cart.php	2014-11-29 07:07:22 UTC (rev 5239)
@@ -1,46 +1,62 @@
 <?php
 /**
 /**
- *\licence GPL 2005-2010  The osCSS developers - osCSS Open Source E-commerce
+ *\licence GPL 2005-2014  The osCSS developers - osCSS Open Source E-commerce
  *\portion code Copyright (c) 2002 osCommerce
  *\package osCSS-2 <www http://www.oscss.org>
- *\version 2.1.2
+ *\version 2.2.0
  *\date  04/10/2013, 08:18
  *\author oscim <mail aur...@os...> <www http://www.oscim.fr>
  *\encode UTF-8
  *\group boxes
  *\file view_min_cart.php
- *\brief very min info cart box
- *
- * 		Affichage minimum des informations du panier
+ *\brief 
 */
 
 
 /**
 	@remarks Process Specific Boxes 
 */
-  global $page, $template;
+  global $page, $template, $cart;
   $currencies=$page->return_object('currencies');
-  $cart=$page->return_object('cart');
-  $cart_contents_string = '';
-  if (is_object($cart) && $cart->count_contents() > 0) {
-    $item=$cart->count_contents();
-    $wieght=$cart->show_weight();
-  } else {
-    $item=$wieght=0;
-  }
-    /* affichage du sous total box panier */
-//    foreach($cart->show_list_total() as $i=>$tot) {
-////      $cart_contents_string .=  sprintf('<span>%s </span> %s ' ,$tot->text, $currencies->format($tot->value)) ;
-//    }
-    
-  $cart_contents_string.=' <a href="'.tep_href_link(FILENAME_SHOPPING_CART).'"><span class="nbproducts">'.__('article x ').''.$item.'</span><img  id="img_cart" src="'.HTTP_SERVER.DIR_WS_HTTP_CATALOG.DIR_WS_TEMPLATES.$template.'/img/'.'panier.jpg" alt="panier"/></a> ';
 
+  $cart_contents_string =''
+  .'<table class="table table-condensed table-striped table-hover">'
+		.'<thead>'
+			.'<tr>'
+				.'<th>Prod.</th>'
+				.'<th>Qté.</th>'
+				.'<th>Prix</th>'
+			.'</tr>'
+		.'</thead>'
+		.'<tbody>';
+		
+		foreach($cart->get_products() as $row ){
+		
+			$cart_contents_string .='<tr>'
+							.'<td class="dark">'.$row['name'].'</td>'
+							.'<td>'.$row['quantity'].'</td>'
+							.'<td>'.$currencies->format($row['total_line_ttc']).'</td>'
+					.'</tr>';
+		}
+		$cart_contents_string .='</tbody>'
+			.'<tfoot>'
+					.'<tr class="active">'
+							.'<td colspan="2">Total : </td>'
+							.'<td class="dark">'. $currencies->format( $cart->GetTotal('total') ).'</td>'
+					.'</tr>'
+			.'</tfoot>'
+	.'</table>';
+                                
 
-
 /**
 	@remarks Transmit var array for master construtor boxes 
 */
-  $array=array('title'=>__('Votre Panier'),'content'=>tep_output_string_protected($cart_contents_string,false,true));
+  $array=array(
+		'title'=>' <a href="'.tep_href_link(FILENAME_SHOPPING_CART).'">'.__('Voir mon panier').'</a>'
+		,'content'=>tep_output_string_protected($cart_contents_string,false,true)
+		,'items'=> $cart->GetTotal('item')
+		,'total'=> $cart->GetTotal('total')
+		);
 
 ?>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[5238] trunk/catalog/install/data/templates/ appareil_photo/Modern_RWD

From: <hom...@us...> - 2014-09-18 22:28:16

Revision: 5238
          http://sourceforge.net/p/oscss/svn/5238
Author:   homer8173
Date:     2014-09-18 22:28:08 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
update RWD template :
fix aligment on product page and move tab module

Modified Paths:
--------------
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/init.php
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/bootstrap.css
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/product/view.gab
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/_custom.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/product.template.php
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/template.php

Modified: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php	2014-09-18 22:27:10 UTC (rev 5237)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php	2014-09-18 22:28:08 UTC (rev 5238)
@@ -138,4 +138,22 @@
     <?php echo $page->draw_breadcrumb('');  ?>
   </ol>
 </section>    
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
+<div class="helper">
+    <i class="fa fa-graduation-cap"></i>
+    <div class="helper-content">
+        <div class="col-md-8">
+            <h1>Assistant découverte osCSS </h1>
+            <p>blabla</p>
+        </div>
+        <div class="col-md-4">
+            <h2>Formation</h2>
+            <p>contenu</p>
+            <h2>Personnalisation</h2>
+            <p>contenu</p>
+        </div>
+        <div class="col-md-12">
+            <p class="text-right">Pour désactiver ce module, rendez-vous dans l'<a href="/admin/package.php">administration</a></p>
+        </div>
+    </div>
+</div>   
\ No newline at end of file

Modified: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/init.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/init.php	2014-09-18 22:27:10 UTC (rev 5237)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/init.php	2014-09-18 22:28:08 UTC (rev 5238)
@@ -17,7 +17,9 @@
     Tout les appels ici, doit utiliser l'object constructeur
 */
 
-/*
+/* 
+ *  redefine price format
+ * 
  *   protected static $modele = array( 'price_model' => array( 'text'=>'%pprice', // Modèle Brut
 							    'html'=>'<span class="h2 diff-font normalprice">%pprice</span>', // Modèle HTML
 							    'rss'=>'      <price>%pprice</price>' // Modèle rss

Modified: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/bootstrap.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/bootstrap.css	2014-09-18 22:27:10 UTC (rev 5237)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/bootstrap.css	2014-09-18 22:28:08 UTC (rev 5238)
@@ -1,4 +1,4 @@

@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[5237] trunk/catalog/includes/languages/fr_FR/product.txt

From: <hom...@us...> - 2014-09-18 22:27:20

Revision: 5237
          http://sourceforge.net/p/oscss/svn/5237
Author:   homer8173
Date:     2014-09-18 22:27:10 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
update langage file

Modified Paths:
--------------
    trunk/catalog/includes/languages/fr_FR/product.txt

Modified: trunk/catalog/includes/languages/fr_FR/product.txt
===================================================================
--- trunk/catalog/includes/languages/fr_FR/product.txt	2014-09-18 22:21:22 UTC (rev 5236)
+++ trunk/catalog/includes/languages/fr_FR/product.txt	2014-09-18 22:27:10 UTC (rev 5237)
@@ -9,7 +9,7 @@
 */
 
 /* shopping cart  */
-	$lang['add to cart']="Ajout Panier" ;
+	$lang['add to cart']="Ajouter au panier" ;
 
 /* search */
 	$lang['entry price from']="Prix " ;
@@ -40,9 +40,9 @@
 	$lang['breadcrumb listing products new'] = "Nouveaux produits";
 
 	/* */
-	$lang['link best sellers'] = "Meilleurs ventes";
-	$lang['product best sellers heading title']="Meilleurs ventes" ;
-	$lang['breadcrumb listing best sellers'] = "Meilleurs ventes";
+	$lang['link best sellers'] = "Meilleures ventes";
+	$lang['product best sellers heading title']="Meilleures ventes" ;
+	$lang['breadcrumb listing best sellers'] = "Meilleures ventes";
 	/* */
 	$lang['link small price'] = "Petit Prix";
 	$lang['product small price heading title']="Petits prix" ;
@@ -68,7 +68,9 @@
 	$lang['txt in select choose end']="..." ;
 	$lang['text more information']="Pour plus d'information, veuillez visiter <a class=\"extLink\" href=\"%s\">la page de ce produit</a>." ;// lien vers page produit fabricant
 	$lang['products info stock finish in limited']="Ce produit est epuisé" ;
+	$lang['products info stock ok']="En stock" ;
 	$lang['text click to enlarge']="Cliquer pour agrandir" ;
+	$lang['Model :']="Modèle :" ;
 
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[5236] trunk/catalog/includes

From: <hom...@us...> - 2014-09-18 22:21:36

Revision: 5236
          http://sourceforge.net/p/oscss/svn/5236
Author:   homer8173
Date:     2014-09-18 22:21:22 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
Debuger : kint to replace var_dump
usage : d($myvar);

Modified Paths:
--------------
    trunk/catalog/includes/application_top.php

Added Paths:
-----------
    trunk/catalog/includes/kint/
    trunk/catalog/includes/kint/Kint.class.php
    trunk/catalog/includes/kint/LICENCE
    trunk/catalog/includes/kint/README.md
    trunk/catalog/includes/kint/composer.json
    trunk/catalog/includes/kint/config.default.php
    trunk/catalog/includes/kint/decorators/
    trunk/catalog/includes/kint/decorators/concise.php
    trunk/catalog/includes/kint/decorators/plain.php
    trunk/catalog/includes/kint/decorators/rich.php
    trunk/catalog/includes/kint/parsers/
    trunk/catalog/includes/kint/parsers/custom/
    trunk/catalog/includes/kint/parsers/custom/arrayobject.php
    trunk/catalog/includes/kint/parsers/custom/classmethods.php
    trunk/catalog/includes/kint/parsers/custom/classstatics.php
    trunk/catalog/includes/kint/parsers/custom/color.php
    trunk/catalog/includes/kint/parsers/custom/json.php
    trunk/catalog/includes/kint/parsers/custom/microtime.php
    trunk/catalog/includes/kint/parsers/custom/splfileinfo.php
    trunk/catalog/includes/kint/parsers/custom/splobjectstorage.php
    trunk/catalog/includes/kint/parsers/custom/timestamp.php
    trunk/catalog/includes/kint/parsers/custom/xml.php
    trunk/catalog/includes/kint/parsers/parser.class.php
    trunk/catalog/includes/kint/scripts/
    trunk/catalog/includes/kint/scripts/source.reg
    trunk/catalog/includes/kint/scripts/source.vbs
    trunk/catalog/includes/kint/view/
    trunk/catalog/includes/kint/view/inc/
    trunk/catalog/includes/kint/view/inc/kint.js
    trunk/catalog/includes/kint/view/inc/original.css
    trunk/catalog/includes/kint/view/inc/solarized-dark.css
    trunk/catalog/includes/kint/view/inc/solarized.css
    trunk/catalog/includes/kint/view/js/
    trunk/catalog/includes/kint/view/js/_kint.js
    trunk/catalog/includes/kint/view/less/
    trunk/catalog/includes/kint/view/less/_kint.less
    trunk/catalog/includes/kint/view/less/original.less
    trunk/catalog/includes/kint/view/less/solarized-dark.less
    trunk/catalog/includes/kint/view/less/solarized.less
    trunk/catalog/includes/kint/view/trace.phtml

Modified: trunk/catalog/includes/application_top.php
===================================================================
--- trunk/catalog/includes/application_top.php	2014-09-17 14:11:50 UTC (rev 5235)
+++ trunk/catalog/includes/application_top.php	2014-09-18 22:21:22 UTC (rev 5236)
@@ -16,6 +16,9 @@
 /// start the timer for the page parse time log
 define('PAGE_PARSE_START_TIME', microtime());
 
+// debug tool to replace dump_var
+// usage : d($page);
+require_once 'includes/kint/Kint.class.php';
 
 /// Set the local configuration parameters - mainly for developers
   if (file_exists('includes/local/configure.php'))  include('includes/local/configure.php');

Added: trunk/catalog/includes/kint/Kint.class.php
===================================================================
--- trunk/catalog/includes/kint/Kint.class.php	                        (rev 0)
+++ trunk/catalog/includes/kint/Kint.class.php	2014-09-18 22:21:22 UTC (rev 5236)
@@ -0,0 +1,742 @@
+<?php
+/**
+ * Kint is a zero-setup debugging tool to output information about variables and stack traces prettily and comfortably.
+ *
+ * https://github.com/raveren/kint
+ */
+define( 'KINT_DIR', dirname( __FILE__ ) . '/' );
+require KINT_DIR . 'config.default.php';
+require KINT_DIR . 'parsers/parser.class.php';
+
+if ( is_readable( KINT_DIR . 'config.php' ) ) {
+	require KINT_DIR . 'config.php';
+}
+
+class Kint
+{
+	// these are all public and 1:1 config array keys so you can switch them easily
+	public static $traceCleanupCallback;
+	public static $fileLinkFormat;
+	public static $hideSequentialKeys;
+	public static $showClassConstants;
+	public static $keyFilterCallback;
+	public static $displayCalledFrom;
+	public static $charEncodings;
+	public static $maxStrLength;
+	public static $appRootDirs;
+	public static $maxLevels;
+	public static $enabled;
+	public static $theme;
+	public static $expandedByDefault;
+	public static $devel; # todo remove
+
+	protected static $_firstRun = true;
+
+	# non-standard function calls
+	protected static $_statements = array( 'include', 'include_once', 'require', 'require_once' );
+
+	/**
+	 * getter/setter for the enabled parameter, called at the beginning of every public function as getter, also
+	 * initializes the settings if te first time it's run.
+	 *
+	 * @param null $value
+	 *
+	 * @return void|bool
+	 */
+	public static function enabled( $value = null )
+	{
+		# act both as a setter...
+		if ( func_num_args() > 0 ) {
+			self::$enabled = $value;
+			return;
+		}
+
+		# ...and a getter
+		return self::$enabled;
+	}
+
+	public static function _init()
+	{
+		# init settings
+		if ( isset( $GLOBALS['_kint_settings'] ) ) {
+			foreach ( $GLOBALS['_kint_settings'] as $key => $val ) {
+				self::$$key = $val;
+			}
+		}
+
+		require KINT_DIR . 'decorators/rich.php';
+		require KINT_DIR . 'decorators/concise.php';
+	}
+
+	/**
+	 * Prints a debug backtrace
+	 *
+	 * @param array $trace [OPTIONAL] you can pass your own trace, otherwise, `debug_backtrace` will be called
+	 *
+	 * @return void
+	 */
+	public static function trace( $trace = null )
+	{
+		if ( !Kint::enabled() ) return;
+
+		echo Kint_Decorators_Rich::_css();
+
+		isset( $trace ) or $trace = debug_backtrace( true );
+
+		$output = array();
+		foreach ( $trace as $step ) {
+			self::$traceCleanupCallback and $step = call_user_func( self::$traceCleanupCallback, $step );
+
+			# if the user defined trace cleanup function returns null, skip this line
+			if ( $step === null ) {
+				continue;
+			}
+
+			if ( !isset( $step['function'] ) ) {
+				# invalid trace step
+				continue;
+			}
+
+			if ( isset( $step['file'] ) AND isset( $step['line'] ) ) {
+				# include the source of this step
+				$source = self::_showSource( $step['file'], $step['line'] );
+			}
+
+			if ( isset( $step['file'] ) ) {
+				$file = $step['file'];
+
+				if ( isset( $step['line'] ) ) {
+					$line = $step['line'];
+				}
+			}
+
+
+			$function = $step['function'];
+
+			if ( in_array( $step['function'], self::$_statements ) ) {
+				if ( empty( $step['args'] ) ) {
+					# no arguments
+					$args = array();
+				} else {
+					# sanitize the file path
+					$args = array( self::shortenPath( $step['args'][0] ) );
+				}
+			} elseif ( isset( $step['args'] ) ) {
+				if ( empty( $step['class'] ) && !function_exists( $step['function'] ) ) {
+					# introspection on closures or language constructs in a stack trace is impossible before PHP 5.3
+					$params = null;
+				} else {
+					try {
+						if ( isset( $step['class'] ) ) {
+							if ( method_exists( $step['class'], $step['function'] ) ) {
+								$reflection = new ReflectionMethod( $step['class'], $step['function'] );
+							} else if ( isset( $step['type'] ) && $step['type'] == '::' ) {
+								$reflection = new ReflectionMethod( $step['class'], '__callStatic' );
+							} else {
+								$reflection = new ReflectionMethod( $step['class'], '__call' );
+							}
+						} else {
+							$reflection = new ReflectionFunction( $step['function'] );
+						}
+
+						# get the function parameters
+						$params = $reflection->getParameters();
+					} catch ( Exception $e ) {
+						$params = null; # avoid various PHP version incompatibilities
+					}
+				}
+
+				$args = array();
+				foreach ( $step['args'] as $i => $arg ) {
+					if ( isset( $params[$i] ) ) {
+						# assign the argument by the parameter name
+						$args[$params[$i]->name] = $arg;
+					} else {
+						# assign the argument by number
+						$args[$i] = $arg;
+					}
+				}
+			}
+
+			if ( isset( $step['class'] ) ) {
+				# Class->method() or Class::method()
+				$function = $step['class'] . $step['type'] . $step['function'];
+			}
+
+			if ( isset( $step['object'] ) ) {
+				$function = $step['class'] . $step['type'] . $step['function'];
+			}
+
+			$output[] = array(
+				'function' => $function,
+				'args'     => isset( $args ) ? $args : null,
+				'file'     => isset( $file ) ? $file : null,
+				'line'     => isset( $line ) ? $line : null,
+				'source'   => isset( $source ) ? $source : null,
+				'object'   => isset( $step['object'] ) ? $step['object'] : null,
+			);
+
+			unset( $function, $args, $file, $line, $source );
+		}
+
+		require KINT_DIR . 'view/trace.phtml';
+	}
+
+	/**
+	 * dump information about variables
+	 *
+	 * @param mixed $data
+	 *
+	 * @return void|string
+	 */
+	public static function dump( $data = null )
+	{
+		if ( !Kint::enabled() ) return;
+
+		# find caller information
+		$trace = debug_backtrace();
+		list( $names, $modifier, $callee, $previousCaller ) = self::_getPassedNames( $trace );
+		if ( $names === array( null ) && func_num_args() === 1 && $data === 1 ) {
+			$call = reset( $trace );
+			if ( !isset( $call['file'] ) && isset( $call['class'] ) && $call['class'] === __CLASS__ ) {
+				array_shift( $trace );
+				$call = reset( $trace );
+			}
+
+			while ( isset( $call['file'] ) && $call['file'] === __FILE__ ) {
+				array_shift( $trace );
+				$call = reset( $trace );
+			}
+
+			self::trace( $trace );
+			return;
+		}
+
+		# process modifiers: @, + and -
+		switch ( $modifier ) {
+			case '-':
+				self::$_firstRun = true;
+				while ( ob_get_level() ) {
+					ob_end_clean();
+				}
+				break;
+
+			case '!':
+				self::$expandedByDefault = true;
+				break;
+			case '+':
+				$maxLevelsOldValue = self::$maxLevels;
+				self::$maxLevels   = false;
+				break;
+			case '@':
+				$firstRunOldValue = self::$_firstRun;
+				self::$_firstRun  = true;
+				break;
+		}
+
+
+		$data = func_num_args() === 0
+			? array( "[[no arguments passed]]" )
+			: func_get_args();
+
+
+		$output = Kint_Decorators_Rich::_css();
+		$output .= Kint_Decorators_Rich::_wrapStart( $callee );
+
+		foreach ( $data as $k => $argument ) {
+			$output .= self::_dump( $argument, $names[$k] );
+		}
+		$output .= Kint_Decorators_Rich::_wrapEnd( $callee, $previousCaller );
+
+		self::$_firstRun = false;
+
+		switch ( $modifier ) {
+			case '+':
+				self::$maxLevels = $maxLevelsOldValue;
+				echo $output;
+				break;
+			case '@':
+				self::$_firstRun = $firstRunOldValue;
+				return $output;
+				break;
+			default:
+				echo $output;
+				break;
+		}
+
+		return '';
+	}
+
+	protected static function _dump( $var, $name = '' )
+	{
+		kintParser::reset();
+		return Kint_Decorators_Rich::decorate(
+			kintParser::factory( $var, $name )
+		);
+	}
+
+
+	/**
+	 * generic path display callback, can be configured in the settings
+	 *
+	 * @param string $file
+	 * @param int    $line [OPTIONAL]
+	 *
+	 * @return string
+	 */
+	public static function shortenPath( $file, $line = null )
+	{
+		$file          = str_replace( '\\', '/', $file );
+		$shortenedName = $file;
+		foreach ( self::$appRootDirs as $path => $replaceString ) {
+			$path = str_replace( '\\', '/', $path );
+
+			if ( strpos( $file, $path ) === 0 ) {
+				$shortenedName = $replaceString . substr( $file, strlen( $path ) );
+				break;
+			}
+		}
+
+
+		if ( !$line ) { # means this is called from resource type dump
+			return $shortenedName;
+		}
+
+		if ( !self::$fileLinkFormat ) {
+			return "{$shortenedName} line <i>{$line}</i>";
+		}
+
+		$url   = str_replace( array( '%f', '%l' ), array( $file, $line ), self::$fileLinkFormat );
+		$class = ( strpos( $url, 'http://' ) === 0 ) ? 'class="kint-ide-link"' : '';
+
+		return "<u><a {$class} href=\"{$url}\">{$shortenedName}</a></u> line <i>{$line}</i>";
+	}
+
+
+	/**
+	 * trace helper, shows the place in code inline
+	 *
+	 * @param string $file full path to file
+	 * @param int    $lineNumber the line to display
+	 * @param int    $padding surrounding lines to show besides the main one
+	 *
+	 * @return bool|string
+	 */
+	private static function _showSource( $file, $lineNumber, $padding = 7 )
+	{
+		if ( !$file OR !is_readable( $file ) ) {
+			# continuing will cause errors
+			return false;
+		}
+
+		# open the file and set the line position
+		$file = fopen( $file, 'r' );
+		$line = 0;
+
+		# Set the reading range
+		$range = array(
+			'start' => $lineNumber - $padding,
+			'end'   => $lineNumber + $padding
+		);
+
+		# set the zero-padding amount for line numbers
+		$format = '% ' . strlen( $range['end'] ) . 'd';
+
+		$source = '';
+		while ( ( $row = fgets( $file ) ) !== false ) {
+			# increment the line number
+			if ( ++$line > $range['end'] ) {
+				break;
+			}
+
+			if ( $line >= $range['start'] ) {
+				# make the row safe for output
+				$row = htmlspecialchars( $row, ENT_NOQUOTES );
+
+				# trim whitespace and sanitize the row
+				$row = '<span>' . sprintf( $format, $line ) . '</span> ' . $row;
+
+				if ( $line === $lineNumber ) {
+					# apply highlighting to this row
+					$row = '<div class="kint-highlight">' . $row . '</div>';
+				} else {
+					$row = '<div>' . $row . '</div>';
+				}
+
+				# add to the captured source
+				$source .= $row;
+			}
+		}
+
+		# close the file
+		fclose( $file );
+
+		return $source;
+	}
+
+
+	/**
+	 * returns parameter names that the function was passed, as well as any predefined symbols before function
+	 * call (modifiers)
+	 *
+	 * @param array $trace
+	 *
+	 * @return array( $parameters, $modifier, $callee, $previousCaller )
+	 */
+	private static function _getPassedNames( $trace )
+	{
+		$previousCaller = array();
+		while ( $callee = array_pop( $trace ) ) {
+			if ( strtolower( $callee['function'] ) === 'd' ||
+				strtolower( $callee['function'] ) === 'dd' ||
+				( isset( $callee['class'] ) && strtolower( $callee['class'] ) === strtolower( __CLASS__ )
+					&& strtolower( $callee['function'] ) === 'dump' )
+			) {
+				break;
+			} else {
+				$previousCaller = $callee;
+			}
+		}
+
+		if ( !isset( $callee['file'] ) || !is_readable( $callee['file'] ) ) {
+			return false;
+		}
+
+		# open the file and read it up to the position where the function call expression ended
+		$file   = fopen( $callee['file'], 'r' );
+		$line   = 0;
+		$source = '';
+		while ( ( $row = fgets( $file ) ) !== false ) {
+			if ( ++$line > $callee['line'] ) break;
+			$source .= $row;
+		}
+		fclose( $file );
+		$source = self::_removeAllButCode( $source );
+
+
+		$codePattern = empty( $callee['class'] )
+			? $callee['function']
+			: $callee['class'] . "\x07*" . $callee['type'] . "\x07*" . $callee['function'];
+		# get the position of the last call to the function
+		preg_match_all( "#[\x07{(](\\+|-|!|@)?{$codePattern}\x07*(\\()#i", $source, $matches, PREG_OFFSET_CAPTURE );
+		$match    = end( $matches[2] );
+		$modifier = end( $matches[1] );
+		$modifier = $modifier[0];
+
+		$passedParameters = str_replace( "\x07", '', substr( $source, $match[1] + 1 ) );
+		# we now have a string like this:
+		# <parameters passed>); <the rest of the last read line>
+
+		# remove everything in brackets and quotes, we don't need nested statements nor literal strings which would
+		# only complicate separating individual arguments
+		$c          = strlen( $passedParameters );
+		$inString   = $escaped = false;
+		$i          = 0;
+		$inBrackets = 0;
+		while ( $i < $c ) {
+			$letter = $passedParameters[$i];
+			if ( $inString === false ) {
+				if ( $letter === '\'' || $letter === '"' ) {
+					$inString = $letter;
+				} elseif ( $letter === '(' ) {
+					$inBrackets++;
+				} elseif ( $letter === ')' ) {
+					$inBrackets--;
+					if ( $inBrackets === -1 ) { # this means we are out of the brackets that denote passed parameters
+						$passedParameters = substr( $passedParameters, 0, $i );
+						break;
+					}
+				}
+			} elseif ( $letter === $inString && !$escaped ) {
+				$inString = false;
+			}
+
+			# place an untype-able character instead of whatever was inside quotes or brackets, we don't
+			# need that info. We'll later replace it with '...'
+			if ( $inBrackets > 0 ) {
+				if ( $inBrackets > 1 || $letter !== '(' ) {
+					$passedParameters[$i] = "\x07";
+				}
+			}
+			if ( $inString !== false ) {
+				if ( $letter !== $inString || $escaped ) {
+					$passedParameters[$i] = "\x07";
+				}
+			}
+
+			$escaped = !$escaped && ( $letter === '\\' );
+			$i++;
+		}
+
+		# by now we have an unnested arguments list, lets make it to an array for processing further
+		$arguments = explode( ',', preg_replace( "#\x07+#", '...', $passedParameters ) );
+
+		# test each argument whether it was passed literary or was it an expression or a variable name
+		$parameters = array();
+		$blacklist  = array( 'null', 'true', 'false', 'array(...)', 'array()', '"..."', 'b"..."', );
+		foreach ( $arguments as $argument ) {
+
+			if ( is_numeric( $argument )
+				|| in_array( str_replace( "'", '"', strtolower( $argument ) ), $blacklist, true )
+			) {
+				$parameters[] = null;
+			} else {
+				$parameters[] = trim( $argument );
+			}
+		}
+
+		return array( $parameters, $modifier, $callee, $previousCaller );
+	}
+
+	/**
+	 * removes comments and zaps whitespace & <?php tags from php code, makes for easier further parsing
+	 *
+	 * @param string $source
+	 *
+	 * @return string
+	 */
+	private static function _removeAllButCode( $source )
+	{
+		$newStr        = '';
+		$tokens        = token_get_all( $source );
+		$commentTokens = array( T_COMMENT => true, T_INLINE_HTML => true, T_DOC_COMMENT => true );
+
+		defined( 'T_NS_SEPARATOR' ) or define( 'T_NS_SEPARATOR', 380 );
+
+		$whiteSpaceTokens = array(
+			T_WHITESPACE => true, T_CLOSE_TAG => true,
+			T_OPEN_TAG   => true, T_OPEN_TAG_WITH_ECHO => true,
+		);
+
+		foreach ( $tokens as $token ) {
+			if ( is_array( $token ) ) {
+				if ( isset( $commentTokens[$token[0]] ) ) continue;
+
+				if ( $token[0] === T_NEW ) {
+					$token = 'new ';
+				} elseif ( $token[0] === T_NS_SEPARATOR ) {
+					$token = "\\\x07";
+				} elseif ( isset( $whiteSpaceTokens[$token[0]] ) ) {
+					$token = "\x07";
+				} else {
+					$token = $token[1];
+				}
+			} elseif ( $token === ';' ) {
+				$token = "\x07";
+			}
+
+			$newStr .= $token;
+		}
+		return $newStr;
+	}
+}
+
+
+if ( !function_exists( 'd' ) ) {
+	/**
+	 * Alias of Kint::dump()
+	 *
+	 * @return string
+	 */
+	function d()
+	{
+		if ( !Kint::enabled() ) return null;
+
+		$args = func_get_args();
+		return call_user_func_array( array( 'Kint', 'dump' ), $args );
+	}
+}
+
+if ( !function_exists( 'dd' ) ) {
+	/**
+	 * Alias of Kint::dump()
+	 * [!!!] IMPORTANT: execution will halt after call to this function
+	 *
+	 * @return string
+	 */
+	function dd()
+	{
+		if ( !Kint::enabled() ) return;
+
+		$args = func_get_args();
+		call_user_func_array( array( 'Kint', 'dump' ), $args );
+		die;
+	}
+}
+
+if ( !function_exists( 's' ) ) {
+
+	/**
+	 * Alias of kintLite()
+	 *
+	 * @return string
+	 */
+	function s()
+	{
+		if ( !Kint::enabled() ) return;
+
+		$argv = func_get_args();
+		echo '<pre>';
+		foreach ( $argv as $k => $v ) {
+			$k && print( "\n\n" );
+			echo kintLite( $v );
+		}
+		echo '</pre>' . "\n";
+	}
+
+	/**
+	 * Alias of kintLite()
+	 * [!!!] IMPORTANT: execution will halt after call to this function
+	 *
+	 * @return string
+	 */
+	function sd()
+	{
+		if ( !Kint::enabled() ) return;
+
+		echo '<pre>';
+		foreach ( func_get_args() as $k => $v ) {
+			$k && print( "\n\n" );
+			echo kintLite( $v );
+		}
+		echo '</pre>';
+		die;
+
+	}
+
+}
+
+
+/**
+ * lightweight version of Kint::dump(). Uses whitespace for formatting instead of html
+ * sadly not DRY yet
+ *
+ * @param     $var
+ * @param int $level
+ *
+ * @return string
+ */
+function kintLite( &$var, $level = 0 )
+{
+
+	// initialize function names into variables for prettier string output (html and implode are also DRY)
+	$html     = "htmlspecialchars";
+	$implode  = "implode";
+	$strlen   = "strlen";
+	$count    = "count";
+	$getClass = "get_class";
+
+
+	if ( $var === null ) {
+		return 'NULL';
+	} elseif ( is_bool( $var ) ) {
+		return 'bool ' . ( $var ? 'TRUE' : 'FALSE' );
+	} elseif ( is_float( $var ) ) {
+		return 'float ' . $var;
+	} elseif ( is_int( $var ) ) {
+		return 'integer ' . $var;
+	} elseif ( is_resource( $var ) ) {
+		if ( ( $type = get_resource_type( $var ) ) === 'stream' AND $meta = stream_get_meta_data( $var ) ) {
+
+			if ( isset( $meta['uri'] ) ) {
+				$file = $meta['uri'];
+
+				return "resource ({$type}) {$html( $file, 0 )}";
+			} else {
+				return "resource ({$type})";
+			}
+		} else {
+			return "resource ({$type})";
+		}
+	} elseif ( is_string( $var ) ) {
+		return "string ({$strlen( $var )}) \"{$html( $var )}\"";
+	} elseif ( is_array( $var ) ) {
+		$output = array();
+		$space  = str_repeat( $s = '    ', $level );
+
+		static $marker;
+
+		if ( $marker === null ) {
+			// Make a unique marker
+			$marker = uniqid( "\x00" );
+		}
+
+		if ( empty( $var ) ) {
+			return "array()";
+		} elseif ( isset( $var[$marker] ) ) {
+			$output[] = "[\n$space$s*RECURSION*\n$space]";
+		} elseif ( $level < 7 ) {
+			$isSeq = array_keys( $var ) === range( 0, count( $var ) - 1 );
+
+			$output[] = "[";
+
+			$var[$marker] = true;
+
+
+			foreach ( $var as $key => &$val ) {
+				if ( $key === $marker ) continue;
+
+				$key = $space . $s . ( $isSeq ? "" : "'{$html( $key, 0 )}' => " );
+
+				$dump     = kintLite( $val, $level + 1 );
+				$output[] = "{$key}{$dump}";
+			}
+
+			unset( $var[$marker] );
+			$output[] = "$space]";
+
+		} else {
+			$output[] = "[\n$space$s*depth too great*\n$space]";
+		}
+		return "array({$count( $var )}) {$implode( "\n", $output )}";
+	} elseif ( is_object( $var ) ) {
+		if ( $var instanceof SplFileInfo ) {
+			return "object SplFileInfo " . $var->getRealPath();
+		}
+
+		// Copy the object as an array
+		$array = (array)$var;
+
+		$output = array();
+		$space  = str_repeat( $s = '    ', $level );
+
+		$hash = spl_object_hash( $var );
+
+		// Objects that are being dumped
+		static $objects = array();
+
+		if ( empty( $array ) ) {
+			return "object {$getClass( $var )} {}";
+		} elseif ( isset( $objects[$hash] ) ) {
+			$output[] = "{\n$space$s*RECURSION*\n$space}";
+		} elseif ( $level < 7 ) {
+			$output[]       = "{";
+			$objects[$hash] = true;
+
+			foreach ( $array as $key => & $val ) {
+				if ( $key[0] === "\x00" ) {
+
+					$access = $key[1] === "*" ? "protected" : "private";
+
+					// Remove the access level from the variable name
+					$key = substr( $key, strrpos( $key, "\x00" ) + 1 );
+				} else {
+					$access = "public";
+				}
+
+				$output[] = "$space$s$access $key -> " . kintLite( $val, $level + 1 );
+			}
+			unset( $objects[$hash] );
+			$output[] = "$space}";
+
+		} else {
+			$output[] = "{\n$space$s*depth too great*\n$space}";
+		}
+
+		return "object {$getClass( $var )} ({$count( $array )}) {$implode( "\n", $output )}";
+	} else {
+		return gettype( $var ) . htmlspecialchars( var_export( $var, true ), ENT_NOQUOTES );
+	}
+}
+
+Kint::_init();

Added: trunk/catalog/includes/kint/LICENCE
===================================================================
--- trunk/catalog/includes/kint/LICENCE	                        (rev 0)
+++ trunk/catalog/includes/kint/LICENCE	2014-09-18 22:21:22 UTC (rev 5236)
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Rokas Šleinius (ra...@gm...)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file

Added: trunk/catalog/includes/kint/README.md
===================================================================
--- trunk/catalog/includes/kint/README.md	                        (rev 0)
+++ trunk/catalog/includes/kint/README.md	2014-09-18 22:21:22 UTC (rev 5236)
@@ -0,0 +1,62 @@
+# Kint - debugging helper for PHP developers
+
+[![Total Downloads](https://poser.pugx.org/raveren/kint/downloads.png)](https://packagist.org/packages/raveren/kint)
+
+http://raveren.github.com/kint/
+
+![Screenshot](http://raveren.github.com/kint/img/preview.png)
+
+Kint for PHP is a powerful and modern, zero-setup replacement for **[var_dump()](http://php.net/manual/en/function.var-dump.php)**, **[print_r()](http://php.net/manual/en/function.print-r.php)** and **[debug_backtrace()](http://php.net/manual/en/function.debug-backtrace.php)**. You'll wonder how you developed without it.
+
+
+----
+
+
+## Installation and usage
+```php
+<?php
+require '/kint/Kint.class.php';
+
+########## DUMP VARIABLE ###########################
+Kint::dump($GLOBALS, $_SERVER); // any nuber of parameters
+// or simply use d() as a shorthand:
+d($_SERVER);
+
+
+########## DEBUG BACKTRACE #########################
+Kint::trace();
+// or via shorthand:
+d(1);
+
+
+########## TEXT-ONLY OUTPUT ########################
+s($GLOBALS);
+
+
+########## MISCELLANEOUS ###########################
+// to disable all output
+Kint::enabled(false);
+// further calls, this one included, will not yield any output
+d('Get off my lawn!'); // no effect
+
+```
+
+### Furthermore
+
+* `sd()` and `dd()` are shorthands for `s();die;` and `d();die;` respectively.
+* `!Kint::dump()` and `!dd()` will display the dump expanded by default.
+
+----
+
+
+[Visit the project page](http://raveren.github.com/kint/) for documentation, configuration, and more advanced usage examples.
+
+### Author
+
+**Rokas Šleinius** (Raveren)
+
+![](http://img199.yfrog.com/img199/4323/imageda.png)
+
+### License
+
+Licensed under the MIT License
\ No newline at end of file

Added: trunk/catalog/includes/kint/composer.json
===================================================================
--- trunk/catalog/includes/kint/composer.json	                        (rev 0)
+++ trunk/catalog/includes/kint/composer.json	2014-09-18 22:21:22 UTC (rev 5236)
@@ -0,0 +1,24 @@
+{
+    "name": "raveren/kint",
+    "description": "Kint - debugging helper for PHP developers",
+    "keywords": ["kint", "php", "debug"],
+    "type": "library",
+    "homepage": "https://github.com/raveren/kint",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Rokas Šleinius",
+            "homepage": "https://github.com/raveren"
+        },
+        {
+            "name": "Contributors",
+            "homepage": "https://github.com/raveren/kint/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=5.2.0"
+    },
+    "autoload": {
+        "files": ["Kint.class.php"]
+    }
+}
\ No newline at end of file

Added: trunk/catalog/includes/kint/config.default.php
===================================================================
--- trunk/catalog/includes/kint/config.default.php	                        (rev 0)
+++ trunk/catalog/includes/kint/config.default.php	2014-09-18 22:21:22 UTC (rev 5236)
@@ -0,0 +1,130 @@
+<?php
+isset( $GLOBALS['_kint_settings'] ) or $GLOBALS['_kint_settings'] = array();
+$_kintSettings = &$GLOBALS['_kint_settings'];
+
+
+/** @var bool if set to false, kint will become silent, same as Kint::enabled(false) or Kint::$enabled = false */
+$_kintSettings['enabled'] = true;
+
+
+/**
+ * @var bool whether to display where kint was called from
+ */
+$_kintSettings['displayCalledFrom'] = true;
+
+
+/**
+ * @var string format of the link to the source file in trace entries. Use %f for file path, %l for line number.
+ * Defaults to xdebug.file_link_format if not set.
+ *
+ * [!] EXAMPLE (works with for phpStorm and RemoteCall Plugin):
+ *
+ * $_kintSettings['fileLinkFormat'] = 'http://localhost:8091/?message=%f:%l';
+ *
+ */
+$_kintSettings['fileLinkFormat'] = ini_get( 'xdebug.file_link_format' );
+
+
+/**
+ * @var array base directories of your application that will be displayed instead of the full path. Keys are paths,
+ * values are replacement strings
+ *
+ * Defaults to array( $_SERVER['DOCUMENT_ROOT'] => '&lt;ROOT&gt;' )
+ *
+ * [!] EXAMPLE (for Kohana framework):
+ *
+ * $_kintSettings['appRootDirs'] = array(
+ *      APPPATH => 'APPPATH', // make sure the constants are already defined at the time of including this config file
+ *      SYSPATH => 'SYSPATH',
+ *      MODPATH => 'MODPATH',
+ *      DOCROOT => 'DOCROOT',
+ * );
+ *
+ * [!] EXAMPLE #2 (for a semi-universal approach)
+ *
+ * $_kintSettings['appRootDirs'] = array(
+ *      realpath( __DIR__ . '/../../..' ) => 'ROOT', // go up as many levels as needed in the realpath() param
+ * );
+ *
+ * $_kintSettings['fileLinkFormat'] = 'http://localhost:8091/?message=%f:%l';
+ *
+ */
+$_kintSettings['appRootDirs'] = array(
+	$_SERVER['DOCUMENT_ROOT'] => '&lt;ROOT&gt;'
+);
+
+
+/**
+ * @var callable|null
+ *
+ * @param array $step each step of the backtrace is passed to this callback to clean it up or skip it entirely
+ *
+ * @return array|null you can return null if you want to bypass outputting this step
+ *
+ * [!] EXAMPLE:
+ *
+ * $_kintSettings['traceCleanupCallback'] = function( $traceStep ) {
+ *      if ( isset( $traceStep['class'] ) && strtolower( $traceStep['class'] ) === 'errorHandler' ) {
+ *           return null;
+ *      }
+ *
+ *      if ( isset( $traceStep['function'] ) && strtolower( $traceStep['function'] ) === '__tostring' ) {
+ *          $traceStep['function'] = "[object converted to string]";
+ *      }
+ *
+ *       return $traceStep;
+ * };
+ */
+$_kintSettings['traceCleanupCallback'] = null;
+
+
+/** @var int max length of string before it is truncated and displayed separately in full. Zero or false to disable */
+$_kintSettings['maxStrLength'] = 60;
+
+/** @var array possible alternative char encodings in order of probability, eg. array('windows-1251') */
+$_kintSettings['charEncodings'] = array();
+
+
+/** @var int max array/object levels to go deep, if zero no limits are applied */
+$_kintSettings['maxLevels'] = 5;
+
+
+/** @var bool whether dumped indexed arrays that are in ideal sequence are displayed */
+$_kintSettings['hideSequentialKeys'] = true;
+
+
+/** @var string name of theme for rich view */
+$_kintSettings['theme'] = 'original';
+
+
+/**
+ * @var callback filters array/object keys before outputting; return false if you do not wish to see it in the output
+ *
+ * @param string $key the key being output
+ * @param mixed  $val the contents of the dumped element in case you need it
+ *
+ * @return bool return false to skip displaying
+ *
+ * [!] EXAMPLE:
+ *
+ * $_kintSettings['keyFilterCallback'] = function( $key, $val ) {
+ *     if ( preg_match( '#_mt$#', $key ) ) {
+ *         return false;
+ *     }
+ *
+ *     if ( $val === '--testing--' ) {
+ *         return false;
+ *     }
+ *
+ *     // no need to return true to continue output
+ * };
+ *
+ */
+$_kintSettings['keyFilterCallback'] = null;
+
+
+/** @var bool only set to true if you want to develop kint and know what you're doing */
+$_kintSettings['devel'] = false;
+
+
+unset( $_kintSettings );
\ No newline at end of file

Added: trunk/catalog/includes/kint/decorators/concise.php
===================================================================
--- trunk/catalog/includes/kint/decorators/concise.php	                        (rev 0)
+++ trunk/catalog/includes/kint/decorators/concise.php	2014-09-18 22:21:22 UTC (rev 5236)
@@ -0,0 +1,58 @@
+<?php
+class Kint_Decorators_Concise extends Kint
+{
+	/**
+	 * output:
+	 *
+	 * [value]
+	 *
+	 * value [title="[access] [name] [operator *] [subtype] [size] "]
+	 * OR
+	 * type [title="[access] [name] type [operator *] [subtype] [size] "]
+	 * <ul>extendedValue
+	 *
+	 * @param kintVariableData $kintVar
+	 *
+	 * @return string
+	 */
+	public static function decorate( kintVariableData $kintVar )
+	{
+		if ( $kintVar->extendedValue !== null || !empty( $kintVar->alternatives ) ) {
+			return Kint_Decorators_Rich::decorate( $kintVar );
+		}
+
+		if ( $kintVar->value !== null ) {
+			$output = '<span title="';
+
+			if ( $kintVar->access !== null ) {
+				$output .= $kintVar->access . " ";
+			}
+
+			if ( $kintVar->name !== null ) {
+				$output .= $kintVar->name . " ";
+			}
+
+			if ( $kintVar->type !== null ) {
+				$output .= $kintVar->type;
+				if ( $kintVar->subtype !== null ) {
+					$output .= " " . $kintVar->subtype;
+				}
+				$output .= " ";
+			}
+
+			if ( $kintVar->operator !== null ) {
+				$output .= $kintVar->operator . "";
+			}
+
+			if ( $kintVar->size !== null ) {
+				$output .= "(" . $kintVar->size . ") ";
+			}
+
+			$output = trim( $output ) . '">' . $kintVar->value . '</span>';
+		} else {
+			$output = '<u>NULL</u>';
+		}
+
+		return $output;
+	}
+}
\ No newline at end of file

Added: trunk/catalog/includes/kint/decorators/plain.php
===================================================================
--- trunk/catalog/includes/kint/decorators/plain.php	                        (rev 0)
+++ trunk/catalog/includes/kint/decorators/plain.php	2014-09-18 22:21:22 UTC (rev 5236)
@@ -0,0 +1,54 @@
+<?php
+class Kint_Decorators_Plain extends Kint
+{
+	/**
+	 * output:
+	 *
+	 * [access *] [name] type [operator *] [subtype] [size] [value]
+	 *
+	 * @param kintParser $kintVar
+	 *
+	 * @return string
+	 */
+	protected static function decorate( $kintVar )
+	{
+	}
+
+
+	/**
+	 * produces css and js required for display. May be called multiple times, will only produce output once per
+	 * pageload or until `-` or `@` modifier is used
+	 *
+	 * @return string
+	 */
+	protected static function _css()
+	{
+	}
+
+
+
+	/**
+	 * called for each dump, opens the html tag
+	 *
+	 * @param array $callee caller information taken from debug backtrace
+	 *
+	 * @return string
+	 */
+	protected static function _wrapStart( $callee )
+	{
+	}
+
+
+	/**
+	 * closes Kint::_wrapStart() started html tags and displays callee information
+	 *
+	 * @param array $callee caller information taken from debug backtrace
+	 * @param array $prevCaller previous caller information taken from debug backtrace
+	 *
+	 * @return string
+	 */
+	private static function _wrapEnd( $callee, $prevCaller )
+	{
+	}
+
+}
\ No newline at end of file

Added: trunk/catalog/includes/kint/decorators/rich.php
===================================================================
--- trunk/catalog/includes/kint/decorators/rich.php	                        (rev 0)
+++ trunk/catalog/includes/kint/decorators/rich.php	2014-09-18 22:21:22 UTC (rev 5236)
@@ -0,0 +1,208 @@
+<?php
+class Kint_Decorators_Rich extends Kint
+{
+	// make calls to Kint::dump() from different places in source coloured differently.
+	private static $_usedColors = array();
+
+	public static function decorate( kintVariableData $kintVar )
+	{
+		$output = '<dl>';
+
+		$extendedPresent = $kintVar->extendedValue !== null || $kintVar->alternatives !== null;
+
+		if ( $extendedPresent ) {
+			$class = 'kint-parent';
+			if ( Kint::$expandedByDefault ) {
+				$class .= ' kint-show';
+			}
+			$output .= '<dt class="' . $class . '"><nav></nav>';
+		} else {
+			$output .= '<dt>';
+		}
+
+		$output .= self::_drawHeader( $kintVar ) . $kintVar->value . '</dt>';
+
+
+		if ( $extendedPresent ) {
+			$output .= '<dd>';
+		}
+
+		if ( isset( $kintVar->extendedValue ) ) {
+
+			if ( is_array( $kintVar->extendedValue ) ) {
+				foreach ( $kintVar->extendedValue as $v ) {
+					$output .= self::decorate( $v );
+				}
+			} elseif ( is_string( $kintVar->extendedValue ) ) {
+				$output .= '<pre>' . $kintVar->extendedValue . '</pre>';
+			} else {
+				$output .= self::decorate( $kintVar->extendedValue ); //it's kint's container
+			}
+
+		} elseif ( isset( $kintVar->alternatives ) ) {
+			$output .= "<ul class=\"kint-tabs\">";
+
+			foreach ( $kintVar->alternatives as $k => $var ) {
+				$active = $k === 0 ? ' class="kint-active-tab"' : '';
+				$output .= "<li{$active}>" . self::_drawHeader( $var, false ) . '</li>';
+			}
+
+			$output .= "</ul><ul>";
+
+			foreach ( $kintVar->alternatives as $var ) {
+				$output .= "<li>";
+
+				$var = $var->value;
+
+				if ( is_array( $var ) ) {
+					foreach ( $var as $v ) {
+						$output .= self::decorate( $v );
+					}
+				} elseif ( is_string( $var ) ) {
+					$output .= '<pre>' . $var . '</pre>';
+				} elseif ( isset( $var ) ) {
+					throw new Exception(
+						'Kint has encountered an error, '
+							. 'please paste this report to https://github.com/raveren/kint/issues<br>'
+							. 'Error encountered at ' . basename( __FILE__ ) . ':' . __LINE__ . '<br>'
+							. ' variables: '
+							. htmlspecialchars( var_export( $kintVar->alternatives, true ), ENT_QUOTES )
+					);
+				}
+
+				$output .= "</li>";
+			}
+
+			$output .= "</ul>";
+		}
+		if ( $extendedPresent ) {
+			$output .= '</dd>';
+		}
+
+		$output .= '</dl>';
+
+		return $output;
+	}
+
+	private static function _drawHeader( kintVariableData $kintVar, $verbose = true )
+	{
+		$output = '';
+		if ( $verbose ) {
+			if ( $kintVar->access !== null ) {
+				$output .= "<var>" . $kintVar->access . "</var> ";
+			}
+
+			if ( $kintVar->name !== null && $kintVar->name !== '' ) {
+				$output .= "<dfn>" . $kintVar->name . "</dfn> ";
+			}
+
+			if ( $kintVar->operator !== null ) {
+				$output .= $kintVar->operator . " ";
+			}
+		}
+
+		if ( $kintVar->type !== null ) {
+			$output .= "<var>" . $kintVar->type;
+			if ( $kintVar->subtype !== null ) {
+				$output .= " " . $kintVar->subtype;
+			}
+			$output .= "</var> ";
+		}
+
+
+		if ( $kintVar->size !== null ) {
+			$output .= "(" . $kintVar->size . ") ";
+		}
+
+		return $output;
+	}
+
+
+	/**
+	 * produces css and js required for display. May be called multiple times, will only produce output once per
+	 * pageload or until `-` or `@` modifier is used
+	 *
+	 * @return string
+	 */
+	protected static function _css()
+	{
+		if ( !self::$_firstRun ) return '';
+		self::$_firstRun = false;
+
+		$baseDir = KINT_DIR . 'view/inc/';
+
+		if ( !is_readable( $cssFile = $baseDir . self::$theme . '.css' ) ) {
+			$cssFile = $baseDir . 'original.css';
+		}
+
+		return '<script>' . file_get_contents( $baseDir . 'kint.js' ) . '</script>'
+			. '<style>' . file_get_contents( $cssFile ) . "</style>\n";
+	}
+
+
+	/**
+	 * called for each dump, opens the html tag
+	 *
+	 * @param array $callee caller information taken from debug backtrace
+	 *
+	 * @return string
+	 */
+	protected static function _wrapStart( $callee )
+	{
+		// colors looping outputs the same (i.e. if same line in code dumps variables multiple time,
+		// we assume it's in a loop)
+
+		$uid = isset( $callee['file'] ) ? crc32( $callee['file'] . $callee['line'] ) : 'no-file';
+
+		if ( isset( self::$_usedColors[$uid] ) ) {
+			$class = self::$_usedColors[$uid];
+		} else {
+			$class                   = sizeof( self::$_usedColors );
+			self::$_usedColors[$uid] = $class;
+		}
+
+		$class = "kint_{$class}";
+
+
+		return "<div class=\"kint {$class}\">";
+	}
+
+
+	/**
+	 * closes Kint::_wrapStart() started html tags and displays callee information
+	 *
+	 * @param array $callee caller information taken from debug backtrace
+	 * @param array $prevCaller previous caller information taken from debug backtrace
+	 *
+	 * @return string
+	 */
+	protected static function _wrapEnd( $callee, $prevCaller )
+	{
+		if ( !Kint::$displayCalledFrom ) {
+			return '</div>';
+		}
+
+		$callingFunction = '';
+		if ( isset( $prevCaller['class'] ) ) {
+			$callingFunction = $prevCaller['class'];
+		}
+		if ( isset( $prevCaller['type'] ) ) {
+			$callingFunction .= $prevCaller['type'];
+		}
+		if ( isset( $prevCaller['function'] ) && !in_array( $prevCaller['function'], Kint::$_statements ) ) {
+			$callingFunction .= $prevCaller['function'] . '()';
+		}
+		$callingFunction and $callingFunction = " in ({$callingFunction})";
+
+
+		$calleeInfo = isset( $callee['file'] )
+			? 'Called from ' . self::shortenPath( $callee['file'], $callee['line'] )
+			: '';
+
+
+		return $calleeInfo || $callingFunction
+			? "<footer>{$calleeInfo}{$callingFunction}</footer></div>"
+			: "</div>";
+	}
+
+}
\ No newline at end of file

Added: trunk/catalog/includes/kint/parsers/custom/arrayobject.php
===================================================================
--- trunk/catalog/includes/kint/parsers/custom/arrayobject.php	                        (rev 0)
+++ trunk/catalog/includes/kint/parsers/custom/arrayobject.php	2014-09-18 22:21:22 UTC (rev 5236)
@@ -0,0 +1,26 @@
+<?php
+class Kint_Parsers_ArrayObject extends kintParser
+{
+	protected function _parse( & $variable )
+	{
+		if ( !is_object( $variable ) ) return false;
+
+		$reflection  = new ReflectionClass( $variable );
+		$parentClass = $reflection->getParentClass();
+
+		if ( $parentClass !== false && $parentClass->name === 'ArrayObject' ) {
+			$arrayCopy = $variable->getArrayCopy();
+			foreach ( $arrayCopy as $k => $var ) {
+				$t             = kintParser::factory( $var );
+				$t->name       = "'{$k}'";
+				$t->operator   = '=>';
+				$this->value[] = $t;
+			}
+
+			$this->type = 'ArrayObject contents';
+			$this->size = count( $arrayCopy );
+		} else {
+			return false;
+		}
+	}
+}

Added: trunk/catalog/includes/kint/parsers/custom/classmethods.php
===================================================================
--- trunk/catalog/includes/kint/parsers/custom/classmethods.php	                        (rev 0)
+++ trunk/catalog/includes/kint/parsers/custom/classmethods.php	2014-09-18 22:21:22 UTC (rev 5236)
@@ -0,0 +1,151 @@
+<?php
+
+class Kint_Parsers_ClassMethods extends kintParser
+{
+    private static $cache = array();
+
+    protected function _parse(&$variable)
+    {
+        if(!is_object($variable)) {
+            return false;
+        }
+
+        $className = get_class($variable);
+
+        // Assuming class definition will not change inside one request
+        if(!isset(self::$cache[$className])) {
+            $reflection = new \ReflectionClass($variable);
+
+            $public = $private = $protected = array();
+
+            // Class methods
+            foreach($reflection->getMethods() as $method) {
+                $params = array();
+
+                // Access type
+                $access = implode(' ', \Reflection::getModifierNames($method->getModifiers()));
+
+                // Method parameters
+                foreach($method->getParameters() as $param) {
+                    $paramString = '';
+
+                    if ( $param->isArray() ) {
+                        $paramString .= 'array ';
+                    } else {
+                        try {
+                            if (( $paramClassName = $param->getClass() )) {
+                                $paramString .= $paramClassName->name . ' ';
+                            }
+                        } catch ( ReflectionException $e ) {
+                            preg_match( '/\[\s\<\w+?>\s([\w]+)/s', $param->__toString(), $matches );
+                            $paramClassName = isset( $matches[1] ) ? $matches[1] : '';
+
+                            $paramString .= ' UNDEFINED CLASS (' . $paramClassName . ') ';
+                        }
+                    }
+
+                    $paramString .= ($param->isPassedByReference() ? '&' : '') . '$' . $param->getName();
+
+                    if($param->isDefaultValueAvailable()) {
+                        if(is_array($param->getDefaultValue())) {
+                            $arrayValues = array();
+                            foreach($param->getDefaultValue() as $key => $value) {
+                                $arrayValues[] = $key . ' => ' . $value;
+                            }
+
+                            $defaultValue = 'array(' . implode(', ', $arrayValues) . ')';
+                        } elseif($param->getDefaultValue() === null){
+                            $defaultValue = 'NULL';
+                        } elseif($param->getDefaultValue() === false){
+                            $defaultValue = 'false';
+                        } elseif($param->getDefaultValue() === true){
+                            $defaultValue = 'true';
+                        } elseif($param->getDefaultValue() === ''){
+                            $defaultValue = '""';
+                        } else {
+                            $defaultValue = $param->getDefaultValue();
+                        }
+
+                        $paramString .= ' = ' . $defaultValue;
+                    }
+
+                    $params[] = $paramString;
+                }
+
+                $output = new \kintVariableData();
+
+                // Simple DocBlock parser, look for @return
+                if(($docBlock = $method->getDocComment())) {
+                    $matches = array();
+                    if(preg_match_all('/@(\w+)\s+(.*)\r?\n/m', $docBlock, $matches)) {
+                        $lines = array_combine($matches[1], $matches[2]);
+                        if(isset($lines['return'])) {
+                            $output->operator = '->';
+                            # since we're outputting code, assumption that the string is utf8 is most likely correct
+                            # and saves resources
+                            $output->type = self::_escape( $lines['return'], 'UTF-8' );
+                        }
+                    }
+                }
+
+                $output->name = ($method->returnsReference() ? '&' : '') . $method->getName() . '('
+                    . implode(', ', $params) . ')';
+                $output->access = $access;
+
+                if(is_string($docBlock)) {
+                    $lines = array();
+                    foreach(explode("\n", $docBlock) as $line) {
+                        $line = trim($line);
+
+                        if(in_array($line, array('/**', '/*', '*/'))) {
+                            continue;
+                        }elseif(strpos($line, '*') === 0) {
+                            $line = substr($line, 1);
+                        }
+
+                        $lines[] = self::_escape( trim( $line ), 'UTF-8' );
+                    }
+
+                    $output->extendedValue = implode("\n", $lines) . "\n\n";
+                }
+
+                $declaringClass = $method->getDeclaringClass();
+                $declaringClassName = $declaringClass->getName();
+
+                if($declaringClassName !== $className) {
+                    $output->extendedValue .= "<small>Inherited from <i>{$declaringClassName}</i></small>\n";
+                }
+
+                $fileName = \Kint::shortenPath($method->getFileName(), $method->getStartLine());
+
+                if($fileName) {
+                    $output->extendedValue .= "<small>Defined in {$fileName}</small>";
+                }
+
+                $sortName = $access . $method->getName();
+
+                if($method->isPrivate()) {
+                    $private[$sortName] = $output;
+                } elseif($method->isProtected()) {
+                    $protected[$sortName] = $output;
+                } else {
+                    $public[$sortName] = $output;
+                }
+            }
+
+            if(!$private && !$protected && !$public) {
+                self::$cache[$className] = false;
+            }
+
+            ksort($public);
+            ksort($protected);
+            ksort($private);
+
+            self::$cache[$className] = $public + $protected + $private;
+        }
+
+        $this->value = self::$cache[$className];
+        $this->type = 'Available methods';
+        $this->size = count(self::$cache[$className]);
+    }
+}
\ No newline at end of file

Added: trunk/catalog/includes/kint/parsers/custom/classstatics.php
===================================================================
--- trunk/catalog/includes/kint/parsers/custom/classstatics.php	                        (rev 0)
+++ trunk/catalog/includes/kint/parsers/custom/classstatics.php	2014-09-18 22:21:22 UTC (rev 5236)
@@ -0,0 +1,54 @@
+<?php
+class Kint_Parsers_ClassStatics extends kintParser
+{
+	protected function _parse( & $variable )
+	{
+		if ( !is_object( $variable ) ) return false;
+
+		$extendedValue = array();
+
+		$reflection = new ReflectionClass( $variable );
+		// first show static values
+		foreach ( $reflection->getProperties( ReflectionProperty::IS_STATIC ) as $property ) {
+			if ( $property->isPrivate() ) {
+				if ( !method_exists( $property, 'setAccessible' ) ) {
+					break;
+				}
+				$property->setAccessible( true );
+				$access = "private";
+			} elseif ( $property->isProtected() ) {
+				$property->setAccessible( true );
+				$access = "protected";
+			} else {
+				$access = 'public';
+			}
+
+			if ( Kint::$keyFilterCallback
+				&& call_user_func( Kint::$keyFilterCallback, $property->getName(), $property->getValue() ) === false
+			) {
+				continue;
+			}
+
+			$_      = $property->getValue();
+			$output = kintParser::factory( $_, '$' . $property->getName() );
+
+			$output->access   = $access;
+			$output->operator = '::';
+			$extendedValue[]  = $output;
+		}
+
+		foreach ( $reflection->getConstants() as $constant => $val ) {
+			$output = kintParser::factory( $val, $constant );
+
+			$output->access   = 'constant';
+			$output->operator = '::';
+			$extendedValue[]  = $output;
+		}
+
+		if ( empty( $extendedValue ) ) return false;
+
+		$this->value = $extendedValue;
+		$this->type  = 'Static class properties';
+		$this->size  = count( $extendedValue );
+	}
+}
\ No newline at end of file

Added: trunk/catalog/includes/kint/parsers/custom/color.php
===================================================================
--- trunk/catalog/includes/kint/parsers/custom/color.php	                        (rev 0)
+++ trunk/catalog/includes/kint/parsers/custom/color.php	2014-09-18 22:21:22 UTC (rev 5236)
@@ -0,0 +1,400 @@
+<?php
+class Kint_Parsers_Color extends kintParser
+{
+	private static $_css3Named = array(
+		'aliceblue'=>'#f0f8ff','antiquewhite'=>'#faebd7','aqua'=>'#00ffff','aquamarine'=>'#7fffd4','azure'=>'#f0ffff',
+		'beige'=>'#f5f5dc','bisque'=>'#ffe4c4','black'=>'#000000','blanchedalmond'=>'#ffebcd','blue'=>'#0000ff',
+		'blueviolet'=>'#8a2be2','brown'=>'#a52a2a','burlywood'=>'#deb887','cadetblue'=>'#5f9ea0','chartreuse'=>'#7fff00',
+		'chocolate'=>'#d2691e','coral'=>'#ff7f50','cornflowerblue'=>'#6495ed','cornsilk'=>'#fff8dc','crimson'=>'#dc143c',
+		'cyan'=>'#00ffff','darkblue'=>'#00008b','darkcyan'=>'#008b8b','darkgoldenrod'=>'#b8860b','darkgray'=>'#a9a9a9',
+		'darkgrey'=>'#a9a9a9','darkgreen'=>'#006400','darkkhaki'=>'#bdb76b','darkmagenta'=>'#8b008b',
+		'darkolivegreen'=>'#556b2f','darkorange'=>'#ff8c00','darkorchid'=>'#9932cc','darkred'=>'#8b0000',
+		'darksalmon'=>'#e9967a','darkseagreen'=>'#8fbc8f','darkslateblue'=>'#483d8b','darkslategray'=>'#2f4f4f',
+		'darkslategrey'=>'#2f4f4f','darkturquoise'=>'#00ced1','darkviolet'=>'#9400d3','deeppink'=>'#ff1493',
+		'deepskyblue'=>'#00bfff','dimgray'=>'#696969','dimgrey'=>'#696969','dodgerblue'=>'#1e90ff',
+		'firebrick'=>'#b22222','floralwhite'=>'#fffaf0','forestgreen'=>'#228b22','fuchsia'=>'#ff00ff',
+		'gainsboro'=>'#dcdcdc','ghostwhite'=>'#f8f8ff','gold'=>'#ffd700','goldenrod'=>'#daa520','gray'=>'#808080',
+		'grey'=>'#808080','green'=>'#008000','greenyellow'=>'#adff2f','honeydew'=>'#f0fff0','hotpink'=>'#ff69b4',
+		'indianred'=>'#cd5c5c','indigo'=>'#4b0082','ivory'=>'#fffff0','khaki'=>'#f0e68c','lavender'=>'#e6e6fa',
+		'lavenderblush'=>'#fff0f5','lawngreen'=>'#7cfc00','lemonchiffon'=>'#fffacd','lightblue'=>'#add8e6',
+		'lightcoral'=>'#f08080','lightcyan'=>'#e0ffff','lightgoldenrodyellow'=>'#fafad2','lightgray'=>'#d3d3d3',
+		'lightgrey'=>'#d3d3d3','lightgreen'=>'#90ee90','lightpink'=>'#ffb6c1','lightsalmon'=>'#ffa07a',
+		'lightseagreen'=>'#20b2aa','lightskyblue'=>'#87cefa','lightslategray'=>'#778899','lightslategrey'=>'#778899',
+		'lightsteelblue'=>'#b0c4de','lightyellow'=>'#ffffe0','lime'=>'#00ff00','limegreen'=>'#32cd32','linen'=>'#faf0e6',
+		'magenta'=>'#ff00ff','maroon'=>'#800000','mediumaquamarine'=>'#66cdaa','mediumblue'=>'#0000cd',
+		'mediumorchid'=>'#ba55d3','mediumpurple'=>'#9370d8','mediumseagreen'=>'#3cb371','mediumslateblue'=>'#7b68ee',
+		'mediumspringgreen'=>'#00fa9a','mediumturquoise'=>'#48d1cc','mediumvioletred'=>'#c71585',
+		'midnightblue'=>'#191970','mintcream'=>'#f5fffa','mistyrose'=>'#ffe4e1','moccasin'=>'#ffe4b5',
+		'navajowhite'=>'#ffdead','navy'=>'#000080','oldlace'=>'#fdf5e6','olive'=>'#808000','olivedrab'=>'#6b8e23',
+		'orange'=>'#ffa500','orangered'=>'#ff4500','orchid'=>'#da70d6','palegoldenrod'=>'#eee8aa','palegreen'=>'#98fb98',
+		'paleturquoise'=>'#afeeee','palevioletred'=>'#d87093','papayawhip'=>'#ffefd5','peachpuff'=>'#ffdab9',
+		'peru'=>'#cd853f','pink'=>'#ffc0cb','plum'=>'#dda0dd','powderblue'=>'#b0e0e6','purple'=>'#800080',
+		'red'=>'#ff0000','rosybrown'=>'#bc8f8f','royalblue'=>'#4169e1','saddlebrown'=>'#8b4513','salmon'=>'#fa8072',
+		'sandybrown'=>'#f4a460','seagreen'=>'#2e8b57','seashell'=>'#fff5ee','sienna'=>'#a0522d','silver'=>'#c0c0c0',
+		'skyblue'=>'#87ceeb','slateblue'=>'#6a5acd','slategray'=>'#708090','slategrey'=>'#708090','snow'=>'#fffafa',
+		'springgreen'=>'#00ff7f','steelblue'=>'#4682b4','tan'=>'#d2b48c','teal'=>'#008080','thistle'=>'#d8bfd8',
+		'tomato'=>'#ff6347','turquoise'=>'#40e0d0','violet'=>'#ee82ee','wheat'=>'#f5deb3','white'=>'#ffffff',
+		'whitesmoke'=>'#f5f5f5','yellow'=>'#ffff00','yellowgreen'=>'#9acd32'
+	);
+
+
+	protected function _parse( & $variable )
+	{
+		if ( !self::_fits( $variable ) ) return false;
+
+		$this->type  = 'CSS color';
+		$variants     = self::_convert( $variable );
+		$this->value =
+			"<div style=\"background:$variable;\" class=\"kint-color-preview\">{$variable}</div>" .
+				"<strong>hex :</strong> {$variants['hex']}\n" .
+				"<strong>rgb :</strong> {$variants['rgb']}\n" .
+				( isset( $variants['name'] ) ? "<strong>name:</strong> {$variants['name']}\n" : '' ) .
+				"<strong>hsl :</strong> {$variants['hsl']}";
+	}
+
+
+	private static function _fits( $variable )
+	{
+		if ( !is_string( $variable ) ) return false;
+
+		$var = strtolower( trim( $variable ) );
+
+		return isset( self::$_css3Named[$var] )
+			|| preg_match(
+				'/^(?:#[0-9A-Fa-f]{3}|#[0-9A-Fa-f]{6}|(?:rgb|hsl)a?\s*\((?:\s*[0-9.%]+\s*,?){3,4}\))$/',
+				$var
+			);
+	}
+
+	private static function _convert( $color )
+	{
+		$color         = strtolower( $color );
+		$decimalColors = array();
+		$variants      = array(
+			'hex'   => null,
+			'rgb'   => null,
+			'name'  => null,
+			'hsl'   => null,
+		);
+
+		if ( isset( self::$_css3Named[$color] ) ) {
+			$variants['name'] = $color;
+			$color            = self::$_css3Named[$color];
+		}
+
+		if ( $color{0} === '#' ) {
+			$variants['hex'] = $color;
+			$color           = substr( $color, 1 );
+			if ( strlen( $color ) === 6 ) {
+				$colors = str_split( $color, 2 );
+			} else {
+				$colors = array(
+					$color{0} . $color{0},
+					$color{1} . $color{1},
+					$color{2} . $color{2},
+				);
+			}
+
+			$decimalColors = array_map( 'hexdec', $colors );
+		} elseif ( substr( $color, 0, 3 ) === 'rgb' ) {
+			$variants['rgb'] = $color;
+			preg_match_all( '#([0-9.%]+)#', $color, $matches );
+			$decimalColors = $matches[1];
+			foreach ( $decimalColors as &$color ) {
+				if ( strpos( $color, '%' ) !== false ) {
+					$color = str_replace( '%', '', $color ) * 2.55;
+				}
+			}
+
+
+		} elseif ( substr( $color, 0, 3 ) === 'hsl' ) {
+			$variants['hsl'] = $color;
+			preg_match_all( '#([0-9.%]+)#', $color, $matches );
+
+			$colors = $matches[1];
+			$colors[0] /= 360;
+			$colors[1] = str_replace( '%', '', $colors[1] ) / 100;
+			$colors[2] = str_replace( '%', '', $colors[2] ) / 100;
+
+			$decimalColors = self::_HSLtoRGB( $colors );
+			if ( isset( $colors[3] ) ) {
+				$decimalColors[] = $colors[3];
+			}
+		}
+
+		if ( isset( $decimalColors[3] ) ) {
+			$alpha = $decimalColors[3];
+			unset( $decimalColors[3] );
+		} else {
+			$alpha = null;
+		}
+		foreach ( $variants as $type => &$variant ) {
+			if ( isset( $variant ) ) continue;
+
+			switch ( $type ) {
+				case 'hex':
+					$variant = '#';
+					foreach ( $decimalColors as &$color ) {
+						$variant .= str_pad( dechex( $color ), 2, "0", STR_PAD_LEFT );
+					}
+					$variant .= isset( $alpha ) ? ' (alpha omitted)' : '';
+					break;
+				case 'rgb':
+					$rgb = $decimalColors;
+					if ( isset( $alpha ) ) {
+						$rgb[] = $alpha;
+						$a     = 'a';
+					} else {
+						$a = '';
+					}
+					$variant = "rgb{$a}( " . implode( ', ', $rgb ) . " )";
+					break;
+				case 'hsl':
+					$rgb = self::_RGBtoHSL( $decimalColors );
+					if ( $rgb === null ) {
+						unset( $variants[$type] );
+						break;
+					}
+					if ( isset( $alpha ) ) {
+						$rgb[] = $alpha;
+						$a     = 'a';
+					} else {
+						$a = '';
+					}
+
+					$variant = "hsl{$a}( " . implode( ', ', $rgb ) . " )";
+					break;
+				case 'name':
+					// [!] name in initial variants array must go after hex
+					if ( ( $key = array_search( $variants['hex'], self::$_css3Named, true ) ) !== false ) {
+						$variant = $key;
+					} else {
+						unset( $variants[$type] );
+					}
+					break;
+			}
+
+		}
+
+		return $variants;
+	}
+
+
+	private static function _HSLtoRGB( array $hsl )
+	{
+		list( $h, $s, $l ) = $hsl;
+		$m2 = ( $l <= 0.5 ) ? $l * ( $s + 1 ) : $l + $s - $l * $s;
+		$m1 = $l * 2 - $m2;
+		return array(
+			round( self::_hue2rgb( $m1, $m2, $h + 0.33333 ) * 255 ),
+			round( self::_hue2rgb( $m1, $m2, $h ) * 255 ),
+			round( self::_hue2rgb( $m1, $m2, $h - 0.33333 ) * 255 ),
+		);
+	}
+
+
+	/**
+	 * Helper function for _color_hsl2rgb().
+	 */
+	private static function _hue2rgb( $m1, $m2, $h )
+	{
+		$h = ( $h < 0 ) ? $h + 1 : ( ( $h > 1 ) ? $h - 1 : $h );
+		if ( $h * 6 < 1 ) return $m1 + ( $m2 - $m1 ) * $h * 6;
+		if ( $h * 2 < 1 ) return $m2;
+		if ( $h * 3 < 2 ) return $m1 + ( $m2 - $m1 ) * ( 0.66666 - $h ) * 6;
+		return $m1;
+	}
+
+
+	private static function _RGBtoHSL( array $rgb )
+	{
+		list( $clrR, $clrG, $clrB ) = $rgb;
+
+		$clrMin   = min( $clrR, $clrG, $clrB );
+		$clrMax   = max( $clrR, $clrG, $clrB );
+		$deltaMax = $clrMax - $clrMin;
+
+		$L = ( $clrMax + $clrMin ) / 510;
+
+		if ( 0 == $deltaMax ) {
+			$H = 0;
+			$S = 0;
+		} else {
+			if ( 0.5 > $L ) {
+				$S = $deltaMax / ( $clrMax + $clrMin );
+			} else {
+				$S = $deltaMax / ( 510 - $clrMax - $clrMin );
+			}
+
+			if ( $clrMax == $clrR ) {
+				$H = ( $clrG - $clrB ) / ( 6.0 * $deltaMax );
+			} else if ( $clrMax == $clrG ) {
+				$H = 1 / 3 + ( $clrB - $clrR ) / ( 6.0 * $deltaMax );
+			} else {
+				$H = 2 / 3 + ( $clrR - $clrG ) / ( 6.0 * $deltaMax );
+			}
+
+			if ( 0 > $H ) $H += 1;
+			if ( 1 < $H ) $H -= 1;
+		}
+		return array(
+			round( $H * 360 ),
+			round( $S * 100 ) . '%',
+			round( $L * 100 ) . '%'
+		);
+
+	}
+}
+
+/* *************
+ * TEST DATA
+ *
+dd(array(
+'hsl(0,  100%,50%)',
+'hsl(30, 100%,50%)',
+'hsl(60, 100%,50%)',
+'hsl(90, 100%,50%)',
+'hsl(120,100%,50%)',
+'hsl(150,100%,50%)',
+'hsl(180,100%,50%)',
+'hsl(210,100%,50%)',
+'hsl(240,100%,50%)',
+'hsl(270,100%,50%)',
+'hsl(300,100%,50%)',
+'hsl(330,100%,50%)',
+'hsl(360,100%,50%)',
+'hsl(120,100%,25%)',
+'hsl(120,100%,50%)',
+'hsl(120,100%,75%)',
+'hsl(120,100%,50%)',
+'hsl(120, 67%,50%)',
+'hsl(120, 33%,50%)',
+'hsl(120,  0%,50%)',
+'hsl(120, 60%,70%)',
+'#f03',
+'#F03',
+'#ff0033',
+'#FF0033',
+'rgb(255,0,51)',
+'rgb(255, 0, 51)',
+'rgb(100%,0%,20%)',
+'rgb(100%, 0%, 20%)',
+'hsla(240,100%,50%,0.05)',
+'hsla(240,100%,50%, 0.4)',
+'hsla(240,100%,50%, 0.7)',
+'hsla(240,100%,50%,   1)',
+'rgba(255,0,0,0.1)',
+'rgba(255,0,0,0.4)',
+'rgba(255,0,0,0.7)',
+'rgba(255,0,0,  1)',
+'black',
+'silver',
+'gray',
+'white',
+'maroon',
+'red',
+'purple',
+'fuchsia',
+'green',
+'lime',
+'olive',
+'yellow',
+'navy',
+'blue',
+'teal',
+'aqua',
+'orange',
+'aliceblue',
+'antiquewhite',
+'aquamarine',
+'azure',
+'beige',
+'bisque',
+'blanchedalmond',
+'blueviolet',
+'brown',
+'burlywood',
+'cadetblue',
+'chartreuse',
+'chocolate',
+'coral',
+'cornflowerblue',
+'cornsilk',
+'crimson',
+'darkblue',
+'...
 
[truncated message content]

[Oscss-commit] SF.net SVN: oscss:[5235] trunk/catalog/install/includes/content/core.base. php

From: <hom...@us...> - 2014-09-17 14:12:02

Revision: 5235
          http://sourceforge.net/p/oscss/svn/5235
Author:   homer8173
Date:     2014-09-17 14:11:50 +0000 (Wed, 17 Sep 2014)
Log Message:
-----------
Installer :
Fix bug lib GD detection

Modified Paths:
--------------
    trunk/catalog/install/includes/content/core.base.php

Modified: trunk/catalog/install/includes/content/core.base.php
===================================================================
--- trunk/catalog/install/includes/content/core.base.php	2014-09-17 00:53:59 UTC (rev 5234)
+++ trunk/catalog/install/includes/content/core.base.php	2014-09-17 14:11:50 UTC (rev 5235)
@@ -149,7 +149,7 @@
         unset($type);
     }
         /** TODO : check functions for library* */
-        if (function_exists("gd_info")) {
+        if (!function_exists("gd_info")) {
             $this->PileMessage('alert', core::l10n("La librairie PHP GD n'est pas installée"));
             $this->err = true;
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[5234] trunk/catalog/install/data/templates/ appareil_photo/Modern_RWD

From: <hom...@us...> - 2014-09-17 00:54:07

Revision: 5234
          http://sourceforge.net/p/oscss/svn/5234
Author:   homer8173
Date:     2014-09-17 00:53:59 +0000 (Wed, 17 Sep 2014)
Log Message:
-----------
New themplate : 
new module begin : helper for new users

Modified Paths:
--------------
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/bootstrap.css
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/_custom.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/template.php

Modified: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/bootstrap.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/bootstrap.css	2014-09-15 23:05:34 UTC (rev 5233)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/bootstrap.css	2014-09-17 00:53:59 UTC (rev 5234)
@@ -1,4 +1,4 @@

@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[5233] trunk/catalog

From: <hom...@us...> - 2014-09-15 23:05:42

Revision: 5233
          http://sourceforge.net/p/oscss/svn/5233
Author:   homer8173
Date:     2014-09-15 23:05:34 +0000 (Mon, 15 Sep 2014)
Log Message:
-----------
New themplate : 
login modifications + language files fix

Modified Paths:
--------------
    trunk/catalog/common/classes/formUtility.php
    trunk/catalog/includes/languages/fr_FR/account.txt
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/bootstrap.css
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/_custom.less

Added Paths:
-----------
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/account/
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/account/create.gab
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/account/createfull.gab
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/account/createsuccess.gab
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/account/login.gab

Modified: trunk/catalog/common/classes/formUtility.php
===================================================================
--- trunk/catalog/common/classes/formUtility.php	2014-09-15 08:04:08 UTC (rev 5232)
+++ trunk/catalog/common/classes/formUtility.php	2014-09-15 23:05:34 UTC (rev 5233)
@@ -14,7 +14,7 @@
 	/**
 		@var string for create html display required input
 	*/
-	protected static $required = '<span class="required"> * </span>';
+	protected static $required = '<span class="input-group-addon required"><i class="fa fa-asterisk text-danger"></i></span>';
   /**
 
   */

Modified: trunk/catalog/includes/languages/fr_FR/account.txt
===================================================================
--- trunk/catalog/includes/languages/fr_FR/account.txt	2014-09-15 08:04:08 UTC (rev 5232)
+++ trunk/catalog/includes/languages/fr_FR/account.txt	2014-09-15 23:05:34 UTC (rev 5233)
@@ -178,14 +178,14 @@
 	$lang['@login password forgotten %s'] = "Si vous avez oublié votre mot de passe; %s ";
 	$lang['@login password forgotten text'] = "Cliquez ici.";
 
-	$lang['image button login'] = "Continuer";
+	$lang['image button login'] = "S'authentifier";
 	$lang['image button create'] = "Créer un compte";
 
 	/* create */
 	$lang['@login heading new customer'] = "Créer un compte";
 	$lang['@login text new customer introduction'] = "En créant votre compte sur " . STORE_NAME . " vous pourrez faire vos achats plus rapidement, garder votre panier d'une visite à l'autre et suivre vos commandes.";
-	$lang['@login text new customer'] = "Nouveau client";
-	$lang['@login LegendCreatAccount'] = "S'enregister";
+	$lang['@login text new customer'] = "Accéder à mon compte";
+	$lang['@login LegendCreatAccount'] = "S'enregistrer";
 	$lang['@login heading title new customers'] = "Créer un compte";
 	$lang['@login text visitors cart'] = "";// "<strong class=\"errorText\">REMARQUE :</strong> Le contenu de votre &quot;panier visiteurs&quot; sera ajouté à celui de votre &quot;panier membres&quot; dès que vous aurez ouvert une session. <a href=\"javascript:session_win();\">[Plus d'info]</a>";
 

Modified: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/bootstrap.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/bootstrap.css	2014-09-15 08:04:08 UTC (rev 5232)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/bootstrap.css	2014-09-15 23:05:34 UTC (rev 5233)
@@ -1,4 +1,4 @@

@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[5232] trunk/catalog/install/data/templates/ appareil_photo/Modern_RWD

From: <hom...@us...> - 2014-09-15 08:04:20

Revision: 5232
          http://sourceforge.net/p/oscss/svn/5232
Author:   homer8173
Date:     2014-09-15 08:04:08 +0000 (Mon, 15 Sep 2014)
Log Message:
-----------
New themplate : 
add Font Awesome framework to the template

Modified Paths:
--------------
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/bootstrap.css
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/box.generic.gab
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/product/view.gab
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/_custom.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/bootstrap.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/product.template.php

Added Paths:
-----------
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/fonts/FontAwesome.otf
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/fonts/fontawesome-webfont.eot
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/fonts/fontawesome-webfont.svg
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/fonts/fontawesome-webfont.ttf
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/fonts/fontawesome-webfont.woff
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/fa/
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/fa/bordered-pulled.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/fa/core.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/fa/fixed-width.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/fa/font-awesome.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/fa/icons.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/fa/larger.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/fa/list.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/fa/mixins.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/fa/path.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/fa/rotated-flipped.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/fa/spinning.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/fa/stacked.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/fa/variables.less

Modified: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php	2014-09-09 00:35:39 UTC (rev 5231)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php	2014-09-15 08:04:08 UTC (rev 5232)
@@ -92,19 +92,19 @@
             </div>
             <div id="navbar-collapse2" class="navbar-collapse collapse">
                 <ul class="nav navbar-nav navbar-left">
-                    <li><a href="">Catégories</a><?php  // echo in_menu_cat('ParentGroupString=ul&catID=0&max_level=3&datatype=product');  ?></li>
+                    <li><a href=""><?php echo __('')  ?>Catégories</a><?php // echo in_menu_cat('ParentGroupString=ul&catID=0&max_level=3&datatype=product');  ?></li>
                     <li><a href="<?php echo tep_href_link(FILENAME_PRODUCTS_NEW) ?>" ><?php echo __('link product new')  ?></a></li>
                     <li><a href="<?php echo tep_href_link(FILENAME_BEST_SELLERS) ?>" ><?php echo __('link best sellers')  ?></a></li>
                     <li><a href="<?php echo tep_href_link(FILENAME_SMALL_PRICE) ?>" ><?php echo __('link small price')  ?></a></li>
                     <?php if(tep_cst_define('MODULE_ACA_SPECIALS_SORT_ORDER') !='false') : ?>
                     <li><?php echo '<a href="' . tep_href_link(FILENAME_SPECIALS) . '">' . __('link specials') . '</a>'; ?></li>
                     <?php endif; ?>
-                                                        <li><a href="#">Blog</a></li>
+                                                        <li><a href="#"><?php echo __('')  ?>Blog</a></li>
                 </ul>
                 <?php echo tep_draw_form('advanced_search', tep_href_link(FILENAME_ADVANCED_SEARCH, '', 'NONSSL', false), 'get', 'class="navbar-form navbar-right input-group"') ;?>
                 <?php echo tep_draw_input_field('keywords','keywords','', 'class="form-control" placeholder="'.ENTRY_KEYWORDS.'"',false,"search"); ?>
                     <span class="input-group-btn">
-                        <input type="submit" class="btn btn-default" value="Go" />
+                        <input type="submit" class="btn btn-default" value="<?php echo __('')  ?>Go" />
                     </span>
                 </form>
 
@@ -120,7 +120,7 @@
 <?php if($load->mode =='home') : ?>
     
   <section id="myCarousel" class="carousel slide margin_top" data-ride="carousel">
-<!--       <div class="intro content"> -->
+      <div class="intro content"> 
 
 		<?php /**
                         @brief Call featured for slideshow
@@ -128,7 +128,7 @@
                 global $themodule;
                 $themodule=templ_draw_list('type=modules&pile=slideshow');
                 include('module.slideshow.php');  ?>
-<!--       </div> -->
+       </div> 
   </section>
 <?php endif; ?>
 

Modified: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/bootstrap.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/bootstrap.css	2014-09-09 00:35:39 UTC (rev 5231)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/bootstrap.css	2014-09-15 08:04:08 UTC (rev 5232)
@@ -1 +1,4 @@

@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[5231] trunk/catalog/install/data/templates/ appareil_photo

From: <hom...@us...> - 2014-09-09 00:35:45

Revision: 5231
          http://sourceforge.net/p/oscss/svn/5231
Author:   homer8173
Date:     2014-09-09 00:35:39 +0000 (Tue, 09 Sep 2014)
Log Message:
-----------
New themplate : 
bad directory for installer

Added Paths:
-----------
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/boxe.php
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/content.php
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/footer.php
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/header.php
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/module.php
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/module.slideshow.php
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/sidebar.php
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/configuration.php
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/init.php
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/bootstrap.css
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/images/
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/images/footer.jpg
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/images/gradient-white.png
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/images/logo.png
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/images/slider.jpg
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/css/images/sprites.png
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/desc.xml
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/favicon.png
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/fonts/
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/fonts/glyphicons-halflings-regular.eot
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/fonts/glyphicons-halflings-regular.svg
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/fonts/glyphicons-halflings-regular.ttf
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/fonts/glyphicons-halflings-regular.woff
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/fonts/glyphicons-halflings-regular_1.eot
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/fonts/glyphicons-halflings-regular_1.svg
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/fonts/glyphicons-halflings-regular_1.ttf
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/fonts/glyphicons-halflings-regular_1.woff
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/boxes/
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/boxes/view_min_cart.php
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/box.categories.gab
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/box.currencies.gab
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/box.generic.gab
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/box.languages.gab
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/pages/
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/pages/listing.gab
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/product/
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/product/view.gab
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/languages/
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/languages/fr_FR.txt
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/js/
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/js/bootstrap.min.js
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/js/holder.js
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/js/jquery.1.10.2.min.js
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/js/jquery.validate.1.7.min.js
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/js/less-1.7.3.min.js
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/_custom.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/_sprites.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/alerts.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/badges.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/bootstrap.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/breadcrumbs.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/button-groups.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/buttons.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/carousel.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/close.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/code.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/component-animations.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/dropdowns.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/forms.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/glyphicons.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/grid.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/input-groups.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/jumbotron.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/labels.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/list-group.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/media.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/alerts.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/background-variant.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/border-radius.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/buttons.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/center-block.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/clearfix.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/forms.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/gradients.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/grid-framework.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/grid.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/hide-text.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/image.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/labels.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/list-group.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/nav-divider.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/nav-vertical-align.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/opacity.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/pagination.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/panels.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/progress-bar.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/reset-filter.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/resize.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/responsive-visibility.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/size.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/tab-focus.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/table-row.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/text-emphasis.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/text-overflow.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins/vendor-prefixes.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/mixins.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/modals.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/navbar.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/navs.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/normalize.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/pager.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/pagination.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/panels.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/popovers.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/print.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/progress-bars.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/responsive-embed.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/responsive-utilities.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/scaffolding.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/tables.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/theme.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/thumbnails.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/tooltip.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/type.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/utilities.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/variables.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/less/wells.less
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/product.template.php
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/sample.css
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/template.php
    trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/thumb.jpg

Copied: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/boxe.php (from rev 5227, trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/boxe.php)
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/boxe.php	                        (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/boxe.php	2014-09-09 00:35:39 UTC (rev 5231)
@@ -0,0 +1,16 @@
+<?php
+/**
+  @licence GPL 2005-2014  The osCSS developers - osCSS Open Source E-commerce
+  @subpackage Template Modern Responsive web design
+  @package osCSS-2 <www http://www.oscss.org>
+  @author NP <mail n....@op...> <www http://www.oscss.biz>
+  @encode UTF-8
+*/
+?>
+<section id="Box-<?php echo $boxe->name_clean; ?>" class="boxe">
+  <header>
+    <h3 class="boxe title"><?php echo unhtmlentities($boxe->title) ;?></h3>
+  </header>
+
+  <?php echo unhtmlentities($boxe->content) ?>
+</section>
\ No newline at end of file

Copied: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/content.php (from rev 5227, trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/content.php)
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/content.php	                        (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/content.php	2014-09-09 00:35:39 UTC (rev 5231)
@@ -0,0 +1,38 @@
+<?php
+/**
+  @licence GPL 2005-2013  The osCSS developers - osCSS Open Source E-commerce
+  @package osCSS-2 <www http://www.oscss.org>
+  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+	@version 2.2.0
+  @encode UTF-8
+  @file content.php
+  @dir templates/defaut/Childs_tpl/
+*/
+global $page;
+
+require_once($page->oscss_content());
+
+if(!isset($SectionTplPC) || !is_object($SectionTplPC)){
+		$SectionTplPC = new SectionTpl(
+					tep_output_string_protected(tep_get_include_contents('pages/'.substr($page->oscss_body_id(),5 )),false,true) ,
+					__('heading title '.str_replace('_', ' ',substr($page->oscss_body_id(),5 ) ) )
+				);
+}
+
+?>
+
+
+<?php if( $SectionTplPC->GetContinue() ): ?>
+
+<header>
+  <h1 class="main-content title <?php echo $language ;?>"><?php echo unhtmlentities( $SectionTplPC->GetTitle() ); ?></h1>
+</header>
+
+
+<section id="Master<?php $page->the_type() ?>" class="<?php $page->the_type() ?>" >
+
+	<?php echo unhtmlentities( $SectionTplPC->GetContent() ) ?>
+
+</section>
+
+<?php endif; ?>
\ No newline at end of file

Copied: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/footer.php (from rev 5227, trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/footer.php)
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/footer.php	                        (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/footer.php	2014-09-09 00:35:39 UTC (rev 5231)
@@ -0,0 +1,124 @@
+<?php
+/**
+  @licence GPL 2005-2014  The osCSS developers - osCSS Open Source E-commerce
+  @subpackage Template Modern Responsive web design
+  @package osCSS-2 <www http://www.oscss.org>
+  @author NP <mail n....@op...> <www http://www.oscss.biz>
+  @encode UTF-8
+
+  @note La Licence OpenSource d'osCSS, vous impose de conserver le liens vers le site de la communauté. C'est la seul contrepartie imposé part l'utilisation de cette solution , qui est diffusé gratuitement, dans le cadre de ca licence.
+  Si vous supprimer la référence à osCSS, la commuanté se reserve le droit de faire valoir ces droits aupres des organisme dedié à la protection de cette licence.
+
+    CE template est livré gratuitement pour donner un aperçu des disponibilités du moteur de templates.
+    Veuillez respecter les termes et conditions générales d'utilisation.
+    Vous pouvez employer nos templates sous n'importe quel site Web publiquement accessible selon les termes et conditions générales du contrat Creative Commons
+*/
+global $template;
+?>
+</main>
+
+<div id="push"></div>
+<footer class="footer_white">
+            <div><i class="sprite-row"></i></div>
+            <div class="container haut">
+                <div class="row">
+                    <div class="col-sm-3">
+                        <h3><span class="sprite-negoce rotator"></span><?= __('negociant en prix footer') ?></h3>
+                        <p class="text-muted justified"><?= __('negociant en prix details footer') ?></p>
+                    </div>
+                    <div class="col-sm-3">
+                        <h3><span class="sprite-about rotator"></span><?= __('a propos footer') ?></h3>
+                        <p class="text-muted justified"><?= __('a propos details footer') ?></p>
+
+                    </div>
+                    <div class="col-sm-3">
+                        <h3><span class="sprite-contact rotator"></span><?= __('Nous contacter footer') ?></h3>
+                        <address class="vcard">
+                            <h4 class="name">Open Commerce</h4>                        
+                            <div>
+                                <i class="sprite-address"></i> 
+                                <a class="adr" target="_blank" href="https://www.google.fr/maps/place/34+avenue+de+l%27Europe,+38100+Grenoble"> 
+                                    <span class="street-address">34 avenue de l'europe</span>   
+                                    <span class="postal-code">38100</span><br />
+                                    <span class="locality">Grenoble</span>, 
+                                    <span class="country-name">France</span> 
+                                </a> 
+                            </div>
+                            <div class="tel"><i class="sprite-tel"></i><a href="tel:+33633323234">+33 (0)6 33 32 32 34</a></div> 
+                            <div class="email"><i class="sprite-email"></i><a href="mailto:co...@op...">co...@op...</a></div> 
+                        </address>
+                    </div>
+                    <div class="col-sm-3">
+                        <h3><span class="sprite-follow rotator"></span><?= __('Nous suivre footer') ?></h3>
+                        <i class="sprite-facebook rotator"></i><a target="_blank" href="https://www.facebook.com/oscss.org">Facebook</a><br />
+                        <i class="sprite-tweeter rotator"></i><a target="_blank" href="https://twitter.com/osCSS">Tweeter</a><br />
+                        <i class="sprite-pinterest rotator"></i><a target="_blank" href="http://forums.oscss.org/forum.html"><?= __('Forum footer') ?></a><br />
+                        <i class="sprite-googlep rotator"></i><a target="_blank" href="https://plus.google.com/107698144587463763937/posts">Google +</a><br />
+                    </div>
+                </div>
+            </div>  
+        </footer>
+        <footer class="footer_blue">
+            <div class="container milieu">
+                <div class="row">
+                    <div class="col-sm-3">
+                        <h3><span class="sprite-info rotator"></span>Informations</h3>
+                        <div class="footer_box">
+                            <p><a href="<?php echo tep_href_link(FILENAME_TEMPLATE) ?>"><?php echo __('about') ?></a></p>
+                            <p><a href="/">Informations de livraison</a></p>
+                            <p><a href="/">Vie priv&eacute;e</a></p>
+                            <p><a href="/">Conditions g&eacute;n&eacute;rales</a></p>
+                        </div>
+                    </div>
+                    <div class="col-sm-3">
+                        <h3><span class="sprite-client rotator"></span>Service client</h3>
+                        <div class="footer_box">
+                            <p><a href="<?php echo tep_href_link(FILENAME_CONTACT_US) ?>"><?php echo __('contact us') ?></a></p>
+                            <p><a href="/">Retours</a></p>
+                            <p><a href="/">Livreurs</a></p>
+                            <p><a href="<?php echo tep_href_link(FILENAME_SITEMAP) ?>"><?php echo __('sitemap') ?></a></p>
+                        </div>
+                    </div>
+                    <div class="col-sm-3">
+                        <h3><span class="sprite-extra rotator"></span>Bonus</h3>
+                        <div class="footer_box">
+                            <p><a href="/">Nos marques</a></p>
+                            <p><a href="/">Bon cadeaux</a></p>
+                            <p><a href="/">Offres du moment</a></p>
+                            <p><a href="<?php echo tep_href_link('rss.php') ?>"><?php echo __('rss') ?></a></p>
+                        </div>
+                    </div>
+                    <div class="col-sm-3">
+                        <h3><span class="sprite-account rotator"></span>Mon compte</h3>
+                        <div class="footer_box">
+                            <p><a href="/">Espace utilisateur</a></p>
+                            <p><a href="/">Historique des commandes</a></p>
+                            <p><a href="/">Liste de voeux</a></p>
+                            <p><a href="/">Newsletter</a></p>
+                        </div>
+                    </div>
+                </div>
+            </div>    
+            <div><i class="sprite-row"></i></div>
+            <div class="container bas">
+                <p class="text-center"><i class="sprite-cb"></i></p>
+                <p class="text-muted text-center">&#126; Design <a target="_blank" href="http://www.oscss.biz"><b>OpenCommerce</b></a> - ©<?php echo date('Y') ?>
+					&#126; Based on <a target="_blank" href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true"><b>@twbootstrap</b></a>
+					&#126; Propuls&eacute; par <a target="_blank" href="http://www.oscss.org/" title=" osCSS "><b>osCSS-2</b></a>  &#126;</p>
+            </div>
+        </footer>
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="<?php echo 'templates/'.$template.'/js/'; ?>bootstrap.min.js"></script>
+
+    <script> 
+        $('#nav').affix({ // used to make a magic menu
+            offset: {
+                top: $('header').height()-80
+            }
+        });	
+        
+        $(".alert").alert()
+    </script>
+
+    <div id="hover_zone"></div>
+  <?php /** Fichier appel bottom page */ $this->draw_file_footer(); ?>
\ No newline at end of file

Copied: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/header.php (from rev 5229, trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/header.php)
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/header.php	                        (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/header.php	2014-09-09 00:35:39 UTC (rev 5231)
@@ -0,0 +1,138 @@
+<?php
+/**
+  @licence GPL 2005-2014  The osCSS developers - osCSS Open Source E-commerce
+  @subpackage Template Modern Responsive web design
+  @package osCSS-2 <www http://www.oscss.org>
+  @author NP <mail n....@op...> <www http://www.oscss.biz>
+  @encode UTF-8
+
+
+  Dans Ce fichier, les element du constructeur sont accessible directement, via la variable this.
+  Chaque sous object est nommé comme la variable habituelle
+  ex: $breadcrumb == $this->breadcrumb
+
+  Les variable local, de la page application top par exemple, eux ne le sont pas. Tout les appel ici, doit utiliser l'object constructeur
+
+  La configuration du theme: editer le fichier /cfg/init.php
+
+
+  @note
+    Ce fichier assure le chargement de l'entete de page, et des element qu'il doit contenir (css , javascript, meta, title) de maniere dynamqiue.
+    En générale, il n'est pas necessaire de modifié celui ci .
+
+    Les variable accessible au sein de ce fichier pour traité les parametre sont:
+    - $page : object contrusteur
+    - $load : configuration fournis en arguement de l'appel de ce fichier
+
+
+    C'est le fichier de template Master, qui est chargée de l'appel de ce fichier.
+    Pour intégrer celui ci dans u fichier master il est necessaire d'utiliser cette forme
+
+    echo $page->tep_get_header('file='.$page->the_var('PathChildGab').'header') ;
+
+    L'arguement est optionnel, il permet le cas echeants de transmettre un chemin autre que le chemin par default
+    Sans arguement la function cherche a charger un fichier header.php palcé à la racine du theme
+*/
+
+?>
+<!DOCTYPE html>
+<!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
+<!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
+<!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
+<html>
+<head>
+    <meta charset="<?php echo CHARSET; ?>">
+    <title><?php echo $page->GetHtmlMeta(); ?></title>
+    <meta name="description" content="<?php echo $page->GetHtmlMeta('description'); ?>" />
+    <meta name="keywords" content="<?php echo $page->GetHtmlMeta('keywords'); ?>" />
+    <meta http-equiv="content-type" content="text/html; charset=<?php echo CHARSET; ?>" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="author" content="oscim"/>
+    <meta name="reply-to" content="<?php echo HEAD_REPLY_TAG_ALL ?>" />
+    <meta name="robots" content="all" />
+    <meta name="generator" content="osCSS-2" />
+    
+    <base href="<?php echo  tep_get_httpdir() ; ?>" />
+    <!--[if lte IE 8]>
+            <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    
+    <script type="text/javascript" src="<?php echo 'templates/'.$template.'/js/'; ?>jquery.1.10.2.min.js"></script>
+    <script type="text/javascript" src="<?php echo 'templates/'.$template.'/js/'; ?>jquery.validate.1.7.min.js"></script>
+    <script type="text/javascript" src="<?php echo 'templates/'.$template.'/js/'; ?>less-1.7.3.min.js" ></script>
+    <script type="text/javascript" src="includes/general.js" ></script>
+    <?php /**
+      @remarks Cette fonction doit necessairement être chargée lors de l'appel du gabarit,
+              sans quoi l'initialisation du template n'et pas achevé
+    */
+    $this->draw_file_header();  ?>
+    
+    <link href='http://fonts.googleapis.com/css?family=Raleway:300,400,600,700' rel='stylesheet' type='text/css' />
+    <link href='http://fonts.googleapis.com/css?family=Lobster&subset=latin,cyrillic,latin-ext' rel='stylesheet' type='text/css'>
+    <link href='http://fonts.googleapis.com/css?family=Oswald:700,400' rel='stylesheet' type='text/css'>
+    <link href='<?php echo 'templates/'.$template.'/css/'; ?>bootstrap.css' rel='stylesheet' type='text/css' media="screen" />	
+    <link rel="shortcut icon" type="images/x-icon" href="favicon.ico" />
+    <link rel="alternate" type="application/rss+xml" title="global" href="<?php echo  tep_get_httpdir().'rss.php' ?>" />
+    <link rel="canonical" href="<?php echo $page->GetHtmlMeta('canonical'); ?>" />
+    <script>
+        
+        $( document ).ready(function() {
+            // page home and others
+            $( ".miniature" ).mousemove(function( event ) {
+                source=$(this).attr("src");
+                if(source!=undefined){
+                    $("#hover_zone").html("<img src='"+source+"' />");
+                    $("#hover_zone").css({ left: (event.pageX+15)+"px",top: (event.pageY-20)+"px"});
+                    $("#hover_zone").show();
+                }
+            }).mouseleave(function(){$("#hover_zone").hide();});
+            
+            // fix height of tabs pane at init
+            function egalize_height(cibles){
+                $(cibles).height("auto");
+                var heights = $(cibles).map(function() {
+                    return $(this).height();
+                }).get(),
+                maxHeight = Math.max.apply(null, heights);
+                $(cibles).height(maxHeight);
+            }
+            egalize_height(".tab-pane");
+            // on windows resize , egalize too
+            $( window ).bind('resize',function() {
+                egalize_height(".tab-pane");
+            });
+                        
+            // sorting element by :
+            function addQSParm(myUrl,name, value) {
+                var re = new RegExp("([?&]" + name + "=)[^&]+", "");
+                function add(sep) {
+                    myUrl += sep + name + "=" + encodeURIComponent(value);
+                }
+                function change() {
+                    myUrl = myUrl.replace(re, "$1" + encodeURIComponent(value));
+                }
+                if (myUrl.indexOf("?") === -1) {
+                    add("?");
+                } else {
+                    if (re.test(myUrl)) { change(); } 
+                    else { add("&"); }
+                }
+                return myUrl;
+            }
+            $('#sort-order-elements').change(function() {
+                newUrl=addQSParm(location.href,'order',$(this).val());
+                document.location.href=newUrl;
+            });
+            //init 
+            function getUrlVars() {
+                var vars = {};
+                var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m,key,value) { vars[key] = value; });
+                return vars;
+            }
+            $('#sort-order-elements option[value="'+getUrlVars()["order"]+'"]').attr("selected", "selected");
+        });
+    </script>
+</head>
+  <body id="<?php echo page::oscss_body_id() ; ?>" class="<?php echo 'Type_'.$page->the_type(); ?> <?php echo 'Class_'.$page->the_typeClass('class'); ?>">
+

Copied: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/module.php (from rev 5229, trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/module.php)
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/module.php	                        (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/module.php	2014-09-09 00:35:39 UTC (rev 5231)
@@ -0,0 +1,152 @@
+<?php
+/**
+  @licence GPL 2005-2014  The osCSS developers - osCSS Open Source E-commerce
+  @portion code Copyright (c) 2002 osCommerce
+  @package osCSS-2 <www http://www.oscss.org>
+  @version 2.2.0
+  @date  12/11/2011, 19:30
+  @author NP <mail n....@op...> <www http://www.oscss.biz>
+  @encode UTF-8
+*/
+global $load;
+
+?>
+
+<hr class="sprite-row">
+  <section class="module panel panel-default">
+    <?php if($load->module =='child' && tep_not_null($themodule->module_db->title) ) : ?>
+      <header>
+				<h4 class="main title"><?php echo unhtmlentities($themodule->module_db->title) ;?></h4>
+      </header>
+    <?php endif; ?>
+
+    <?php if(isset($themodule->module_db->text)): ?>
+      <p><?php echo unhtmlentities($themodule->module_db->text) ;?></p>
+    <?php endif; ?>
+
+
+    <?php if (  isset($themodule->module_db->split) && ($themodule->module_db->split->number_of_rows > 0) && (in_array(PREV_NEXT_BAR_LOCATION ,array('1','3') )) ) { ?>
+      <div  class="panel-heading" role="toolbar">
+        <div class="row">
+            <div class="col-xs-3 vcenter"><?php echo TEXT_RESULT_PAGE ?></div>
+            <div class="col-xs-3 vcenter">
+                <?php echo $themodule->module_db->split->display_count(TEXT_DISPLAY_NUMBER_OF); ?>
+            </div>
+            <div class="col-xs-3 vcenter">
+                <?= $themodule->module_db->split->display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info'))); ?>
+            </div>
+            <div class="col-xs-3 form-group form-group-sm">
+              <div class="input-group">
+                <div class="input-group-addon">Trier par </div>
+                <select id="sort-order-elements" class="form-control input-sm">
+                    <option value="best-seller">Meilleures ventes</option>
+                    <option value="new">Nouveauté</option>
+                    <option value="price-up">Prix croissant</option>
+                    <option value="price-down">Prix décroissant</option>
+                    <option value="alpha-up">Ordre alphabétique</option>
+                </select>
+              </div>
+            </div>  
+        </div>
+      </div>
+    <?php } ?>
+
+
+  <?php /**
+				* Loop Data
+				*/
+				$i = 0; foreach($themodule->module_db->content as $ele): ?>
+				
+		<?php if( $i%3 ==0 ) : ?>
+			<?php if( $i>0 ) : ?>
+				</div>
+			<?php endif; ?>
+			<div class="row">
+		<?php endif; ?>
+		
+		
+	<div class=" one <?php echo $ele->data ?>">
+
+
+	
+    <?php if($ele->data =='product'): /** PRODUCTS */ ?>
+            
+            <article class="produit  col-sm-4">
+                <div class="innerblock">
+                    <p>
+                        <span class="information label label-danger">New</span>
+                        <a class="text-center main-link" href="<?= $ele->GetHref() ?>" title="$ele->GetTitle()">
+                            <?= tep_image(DIR_WS_IMAGES . $ele->GetImage(), $ele->GetTitle(), $page->_conf_value('SMALL_IMAGE_WIDTH'), $page->_conf_value('SMALL_IMAGE_HEIGHT')) ?>
+                            <span class="center-block"><strong><?= $ele->GetName() ?></strong></span>
+                            <?php if (tep_not_null( $ele->GetPrice() ) && $page->_draw_in_page('PRODUCT_LIST_PRICE')) { ?>
+                                    <span class="center-block"><?= print_products_price_rv($ele) ?></span>
+                            <?php } ?>
+                                    <span class="follow-me"><strong><?= __('Voir ce produit') ?></strong></span>
+                        </a>
+                    </p>
+                    <div class="images-extra">
+                        <ul class="list-group"><?php foreach ($ele->images as $key => $value) { if(($key+1) < $page->_conf_value('MAX_DISPLAY_IMG_THUMBNAIL')) {?>
+                            <li class="list-group-item">
+                                <a class="text-center" href="<?= $ele->GetHref() ?>" title="$ele->GetTitle()">
+                                    <?= tep_image(DIR_WS_IMAGES .$value, $ele->GetTitle(), $page->_conf_value('SMALL_IMAGE_WIDTH'), $page->_conf_value('SMALL_IMAGE_HEIGHT'), ' class="miniature"') ?>
+                                </a>
+                            </li>
+                            <?php    } } ?>
+                        </ul>
+                    </div>
+                    <?php  if ( $page->_draw_in_page('PRODUCT_LIST_BUY_NOW')) { ?>
+                        <?php /** @remarks If buy possible and attribute , force choose attribute */ ?>
+                        <?php if (_test_bool($ele->action['buy'] ) && count(product_attribut_info($ele->GetId())) != 0): ?>
+                            <a class="btn btn-warning" href="<?php echo $ele->GetHref() ?>" ><?php echo __('add to cart') ?></a>
+                        <?php /** @remarks If buy possible and attribute  */ ?>
+                        <?php elseif (_test_bool($ele->action['buy'] )) : ?>
+                            <?php echo tep_draw_form($themodule->id.'cart_quantity'.$ele->GetId(), tep_href_link(FILENAME_DEFAULT, tep_get_all_get_params(array('action')) . 'action=add_product'), 'post', ' class="addcart"'); ?>
+                                <?= tep_draw_hidden_field('products_id', $ele->GetId()) ?>
+                            
+                                <div class="input-group">
+                                    <?= tep_draw_input_field('products_quantity', '1', '1', 'class="form-control" min="1"', false, 'number') ?>
+                                    <span class="input-group-btn"><input type="button" value="<?= __('add to cart') ?>" title="<?= __('add to cart') ?>" onclick="this.form.submit()" class="btn btn-warning" /></span>
+                                </div>
+                            </form>
+                        <?php endif; ?>
+                    <?php } ?>
+                </div>
+            </article>            
+            
+			<?php else : /** Other */ ?>
+			<section class="col-sm-3 col-xs-6  outerblock">
+				<div class="innerblock">
+					<p class="title <?php echo $ele->data ?>">
+						<a href="<?php echo $ele->GetHref() ;  ?>" ><?php echo $ele->GetTitle() ?></a>
+					</p>
+					<p class="img-thumbnail <?php echo $ele->data ?>">
+						<?php echo '<a href="' . $ele->GetHref(). '">' . tep_image(DIR_WS_IMAGES . $ele->GetImage(),  $ele->GetTitle(),  $page->_conf_value('SIDEBAR_IMG_WIDTH'),  $page->_conf_value('SIDEBAR_IMAGE_HEIGHT')) .  '</a>' ;?>
+					</p>
+					<p class="preview <?php echo $ele->data ?>">
+						<?php echo truncate(strip_tags(unhtmlentities( $ele->GetText() )), 100) ?>
+					</p>
+				</div>
+			</section>
+			<?php endif; ?>
+		</div>
+		
+		
+  <?php $i++; endforeach; ?>
+
+  </div> <!--Last Div for loop and class row -->
+
+
+
+  <?php if ( isset($themodule->module_db->split) && ($themodule->module_db->split->number_of_rows > 0)&& (in_array(PREV_NEXT_BAR_LOCATION ,array('2','3') )) )  { ?>
+<div  class="panel-footer" role="toolbar">
+    <div class="row">
+        <div class="col-sm-offset-3 col-sm-3"><?php echo $themodule->module_db->split->display_count(TEXT_DISPLAY_NUMBER_OF); ?></div>
+        <div class="col-sm-3" >
+            <?php echo /*TEXT_RESULT_PAGE . ' ' .*/ $themodule->module_db->split->display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info'))); ?>
+        </div>
+    </div>
+</div>    
+  <?php } ?>
+
+  </section>
+<?php ?>
\ No newline at end of file

Copied: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/module.slideshow.php (from rev 5227, trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/module.slideshow.php)
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/module.slideshow.php	                        (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/module.slideshow.php	2014-09-09 00:35:39 UTC (rev 5231)
@@ -0,0 +1,61 @@
+<?php
+/**
+  @licence GPL 2005-2014  The osCSS developers - osCSS Open Source E-commerce
+  @subpackage Template Modern Responsive web design
+  @package osCSS-2 <www http://www.oscss.org>
+  @author NP <mail n....@op...> <www http://www.oscss.biz>
+  @encode UTF-8
+*/
+global $load, $themodule;
+?>
+
+
+<div id="slider" class="module">
+
+  <ul class="module carousel-inner">
+
+  <?php if(isset($themodule->module_db->content) )foreach($themodule->module_db->content as $ele): ?>
+
+    <?php if($ele->type =='product'): /** PRODUCTS */ ?>
+      <li class="item one product">
+				<section class="outerblock">
+					<div class="innerblock">
+							<?php if ($page->_draw_in_page('PRODUCT_LIST_NAME')) { ?>
+									<p class="carousel-caption product"><?php echo '<a href="' . $ele->GetHref() . '" title="header=['.$ele->GetName().'] body=[&nbsp;] fade=[on]">' . $ele->GetName() . '</a>' ;?></p>
+							<?php } ?>
+
+							<?php if ($page->_draw_in_page('PRODUCT_LIST_IMAGE')) { ?>
+								<p class="img product"><?php echo '<a href="' . $ele->href . '" title="header=['.$ele->GetName().'] body=[&nbsp;] fade=[on]" >' . tep_image(DIR_WS_IMAGES . @$ele->products_image, $ele->GetName(), $page->_conf_value('SMALL_IMAGE_WIDTH'), $page->_conf_value('SMALL_IMAGE_HEIGHT')) . '</a>' ; ?></p>
+							<?php } ?>
+
+							<?php if (tep_not_null($ele->GetPrice()) && $page->_draw_in_page('PRODUCT_LIST_PRICE')) { ?>
+								<p class="price prod">
+									<?php echo print_products_price_rv($ele->GetId()) ?>
+								</p>
+							<?php } ?>
+
+							<a class="btn btn-lg btn-primary" href="<?php echo  $ele->GetHref() ?>"  title="header=<?php echo __('view more') ?>" role="button"><?php echo __('more') ?></a>
+
+					</div>
+				</section>
+      </li>
+    <?php else : /** Other */ ?>
+			<li class="item one content">
+				<section class="outerblock">
+					<div class="innerblock">
+						<p class="carousel-caption content">
+							<a id="<?php echo $ele->GetId(); ?>" href="<?php echo $ele->GetHref() ;  ?>" ><?php echo $ele->GetTitle() ?></a>
+						</p>
+						<div class="chapo content">
+							<?php echo $ele->GetText() ?>
+						</div>
+					</div>
+				</section>
+			</li>
+    <?php endif; ?>
+
+  <?php endforeach; ?>
+
+  </ul>
+
+</div>
\ No newline at end of file

Copied: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/sidebar.php (from rev 5227, trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/sidebar.php)
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/sidebar.php	                        (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/sidebar.php	2014-09-09 00:35:39 UTC (rev 5231)
@@ -0,0 +1,26 @@
+<?php
+/**
+  @licence GPL 2005-2014  The osCSS developers - osCSS Open Source E-commerce
+  @subpackage Template Modern Responsive web design
+  @package osCSS-2 <www http://www.oscss.org>
+  @author NP <mail n....@op...> <www http://www.oscss.biz>
+  @encode UTF-8
+*/
+
+/** Page produits */ if(isset($_GET['products_id'])) $product_info=$page->the_var('product_info');
+?>
+
+  <?php	while($boxe=templ_draw_list('type=boxes&pile='.$page->the_type().'')):
+      if (!$page->is_page_here($boxe->name_clean)  ) : ?>
+<!--       <div id="<?php echo $boxe->name_clean; ?>Box" class="deroul l_158"> -->
+	<?php include('boxe.php'); ?>
+<!--       </div> -->
+  <?php endif; endwhile; ?>
+
+  <?php while($boxe=templ_draw_list('type=boxes&pile=sidebar')):
+    if (!$page->is_page_here($boxe->name_clean)  ) : ?>
+<!--     <div id="<?php echo $boxe->name_clean; ?>Box" class="deroul l_158"> -->
+      <?php include('boxe.php'); ?>
+<!--     </div> -->
+  <?php endif; endwhile; ?>
+

Copied: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php (from rev 5229, trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/ssheader.php)
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php	                        (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php	2014-09-09 00:35:39 UTC (rev 5231)
@@ -0,0 +1,141 @@
+<?php
+/**
+  @licence GPL 2005-2013  The osCSS developers - osCSS Open Source E-commerce
+  @subpackage Template 2cShopHtml5Oscim
+  @package osCSS-2 <www http://www.oscss.org>
+  @author NP <mail n....@op...> <www http://www.oscss.biz>
+  @encode UTF-8
+*/
+global $customer_id;
+
+?>
+
+<header class="container">
+    <div class="navbar navbar-inverse navbar-fixed-top clear-menu" role="navigation">
+        <div class="container">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse1">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a class="navbar-brand" href="<?php echo tep_href_link() ?>"><i class="sprite-home rotator"></i><?php echo STORE_NAME ?></a>                
+            </div>
+            <div id="navbar-collapse1" class="navbar-collapse collapse">
+                <ul class="nav navbar-nav navbar-left">
+                    <li class="divider"></li>
+                    <li><a href="<?= tep_href_link(FILENAME_LOGIN, '', 'SSL') ?>" class="btn btn-warning"><?= __('link text login') ?></a></li>					
+                    <li class="divider"></li>
+                    <li><a href="<?= tep_href_link(FILENAME_CREATE_ACCOUNT, '', 'SSL') ?>" class="btn btn-warning"><?= __('link text create account') ?></a></li>
+                </ul>                        
+                <ul class="nav navbar-nav navbar-right">
+                    <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Réglages de langue<span class="caret "></span></a> 
+                        <ul class="dropdown-menu" role="menu">
+                            <?php $boxe =$page->oscss_boxes->_return('currencies');
+                            echo unhtmlentities($boxe->content) ?>
+                            <li class="divider"></li>
+                            <?php $boxe =$page->oscss_boxes->_return('languages'); 
+                            echo unhtmlentities($boxe->content) ?>
+                        </ul>
+                    </li>
+                    <li class="divider"></li>
+                    <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="sprite-basket rotator"></i>100,00 &euro; <span class="badge">2</span><span class="caret"></span></a>  
+                        <ul class="dropdown-menu" role="menu">
+                            <?= $boxe =$page->oscss_boxes->_return('shopping_cart_short'); ?>
+                            <li>
+                                <table class="table table-condensed table-striped table-hover">
+                                    <thead>
+                                        <tr>
+                                            <th>Prod.</th>
+                                            <th>Qté.</th>
+                                            <th>Prix</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        <tr>
+                                            <td class="dark">Disque</td>
+                                            <td>1</td>
+                                            <td>50.00&euro;</td>
+                                        </tr>
+                                        <tr>
+                                            <td class="dark">Vaisselle</td>
+                                            <td>1</td>
+                                            <td>50.00&euro;</td>
+                                        </tr>
+                                    </tbody>
+                                    <tfoot>
+                                        <tr class="active">
+                                            <td colspan="2">Total : </td>
+                                            <td class="dark">100.00€</td>
+                                        </tr>
+                                    </tfoot>
+                                </table>
+                            </li>
+                            <li><a href="#">Voir mon panier</a></li>
+                        </ul>
+
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+    <div id="nav" class="navbar navbar-inverse navbar-fixed-top dark-menu" role="navigation">
+        <div class="container">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse2">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+            <div id="navbar-collapse2" class="navbar-collapse collapse">
+                <ul class="nav navbar-nav navbar-left">
+                    <li><a href="">Catégories</a><?php  // echo in_menu_cat('ParentGroupString=ul&catID=0&max_level=3&datatype=product');  ?></li>
+                    <li><a href="<?php echo tep_href_link(FILENAME_PRODUCTS_NEW) ?>" ><?php echo __('link product new')  ?></a></li>
+                    <li><a href="<?php echo tep_href_link(FILENAME_BEST_SELLERS) ?>" ><?php echo __('link best sellers')  ?></a></li>
+                    <li><a href="<?php echo tep_href_link(FILENAME_SMALL_PRICE) ?>" ><?php echo __('link small price')  ?></a></li>
+                    <?php if(tep_cst_define('MODULE_ACA_SPECIALS_SORT_ORDER') !='false') : ?>
+                    <li><?php echo '<a href="' . tep_href_link(FILENAME_SPECIALS) . '">' . __('link specials') . '</a>'; ?></li>
+                    <?php endif; ?>
+                                                        <li><a href="#">Blog</a></li>
+                </ul>
+                <?php echo tep_draw_form('advanced_search', tep_href_link(FILENAME_ADVANCED_SEARCH, '', 'NONSSL', false), 'get', 'class="navbar-form navbar-right input-group"') ;?>
+                <?php echo tep_draw_input_field('keywords','keywords','', 'class="form-control" placeholder="'.ENTRY_KEYWORDS.'"',false,"search"); ?>
+                    <span class="input-group-btn">
+                        <input type="submit" class="btn btn-default" value="Go" />
+                    </span>
+                </form>
+
+            </div>
+        </div>
+    </div>
+</header>
+
+<div><hr class="sprite-row"></div>
+
+<main id="content" role="main">
+
+<?php if($load->mode =='home') : ?>
+    
+  <section id="myCarousel" class="carousel slide margin_top" data-ride="carousel">
+<!--       <div class="intro content"> -->
+
+		<?php /**
+                        @brief Call featured for slideshow
+                */
+                global $themodule;
+                $themodule=templ_draw_list('type=modules&pile=slideshow');
+                include('module.slideshow.php');  ?>
+<!--       </div> -->
+  </section>
+<?php endif; ?>
+
+<?php if($load->mode !='home') : ?>
+<section class="container margin_top">
+  <ol role="breadcrumbs" id="breadcrumbs" class="breadcrumb">
+    <?php echo $page->draw_breadcrumb('');  ?>
+  </ol>
+</section>    
+<?php endif; ?>
\ No newline at end of file

Copied: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/configuration.php (from rev 5227, trunk/catalog/install/data/templates/Modern_RWD/cfg/configuration.php)
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/configuration.php	                        (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/configuration.php	2014-09-09 00:35:39 UTC (rev 5231)
@@ -0,0 +1,66 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+  @licence GPL 2005-2010  The osCSS developers - osCSS Open Source E-commerce
+  @subpackage Template boostrap
+  @package osCSS-2 <www http://www.oscss.org>
+  @version 2.1.2
+  @date  08/11/2013, 21:14
+  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+  @encode UTF-8
+*/
+/* Config divers */
+UpConfigKey('SMALL_IMAGE_WIDTH','60');
+UpConfigKey('SMALL_IMAGE_HEIGHT','60');
+UpConfigKey('HEADING_IMAGE_WIDTH','160');
+UpConfigKey('HEADING_IMAGE_HEIGHT','250');
+UpConfigKey('SUBCATEGORY_IMAGE_WIDTH','120');
+UpConfigKey('SUBCATEGORY_IMAGE_HEIGHT','120');
+UpConfigKey('POPUP_IMAGE_WIDTH','600');
+UpConfigKey('POPUP_IMAGE_HEIGHT','600');
+UpConfigKey('STACK_IMAGE_WIDTH','50');
+UpConfigKey('STACK_IMAGE_HEIGHT','50');
+UpConfigKey('JPEG_QUALITY','95');
+
+UpConfigKey('PRODUCT_LIST_WEIGHT','false');
+UpConfigKey('PRODUCT_LIST_MODEL','false');
+UpConfigKey('PRODUCT_LIST_DESCRIPTION','false');
+UpConfigKey('PRODUCT_LIST_MANUFACTURER','false');
+UpConfigKey('PRODUCT_LIST_PRICE','false');
+UpConfigKey('PRODUCT_LIST_WEIGHT','false');
+UpConfigKey('PRODUCT_LIST_QUANTITY','false');
+
+/* Config des plugins */
+ResetConfigKey('PLUGIN_ACCOUNT_INSTALLED');
+ResetConfigKey('PLUGIN_GENERIC_INSTALLED');
+ResetConfigKey('PLUGIN_HOME_INSTALLED');
+ResetConfigKey('PLUGIN_LISTING_INSTALLED');
+ResetConfigKey('PLUGIN_PRODUCT_INSTALLED');
+
+
+/* Config des modules base */
+ResetConfigKey('MODULE_ACAPRO_INSTALLED');
+ResetConfigKey('MODULE_ACCOUNT_INSTALLED');
+ResetConfigKey('MODULE_GENERIC_INSTALLED');
+
+ResetConfigKey('MODULE_ACAPRO_INSTALLED_BO');
+ResetConfigKey('MODULE_ACCOUNT_INSTALLED_BO');
+ResetConfigKey('MODULE_ACACAT_INSTALLED_BO');
+ResetConfigKey('MODULE_CONTENT_INSTALLED_BO');
+
+
+addConfigModule('MODULE_ACAPRO_INSTALLED', 'desc_base.php');
+addConfigModule('MODULE_ACAPRO_INSTALLED_BO', 'desc_base.php');
+
+addConfigModule('MODULE_ACAPRO_INSTALLED_BO', 'header_tags.php');
+addConfigModule('MODULE_ACACAT_INSTALLED_BO', 'header_tags.php');
+addConfigModule('MODULE_CONTENT_INSTALLED_BO', 'header_tags.php');
+
+
+/* Purge du repertoire de miniature */
+$path = DIR_FS_ROOT_DOCS.DIR_WS_IMAGES.'imagecache/' ;
+$dir = @opendir($path);
+$templates = array();
+while ($file = @readdir($dir)) {
+  if($file != '..' && $file !='.' && $file !='') @unlink($path.$file);
+}
+@closedir($dir);

Copied: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/init.php (from rev 5229, trunk/catalog/install/data/templates/Modern_RWD/cfg/init.php)
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/init.php	                        (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/init.php	2014-09-09 00:35:39 UTC (rev 5231)
@@ -0,0 +1,261 @@
+<?php
+/**
+  @licence GPL 2005-2013  The osCSS developers - osCSS Open Source E-commerce
+  @subpackage Template boostrap
+  @package osCSS-2 <www http://www.oscss.org>
+  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+  @encode UTF-8
+
+
+
+  @note
+    Dans Ce fichier, les element du constructeur sont accessible directement, via la variable this.
+    Chaque sous object est nommé comme la variable habituelle
+    ex: $breadcrumb == $this->breadcrumb
+
+    Les variable locales, du application_top par exemple, ne le sont pas.
+    Tout les appels ici, doit utiliser l'object constructeur
+*/
+
+/*
+ *   protected static $modele = array( 'price_model' => array( 'text'=>'%pprice', // Modèle Brut
+							    'html'=>'<span class="h2 diff-font normalprice">%pprice</span>', // Modèle HTML
+							    'rss'=>'      <price>%pprice</price>' // Modèle rss
+							  ),
+				    'special_model'=> array( 'text'=>'%sprice', // Modèle Brut
+							    'html'=>'<span class="h2 diff-font productSpecialPrice">%sprice<small><del>%pprice</del></small></span>',// Modèle HTML
+							    'rss'=>"      <price>%pprice</price> \n       <specialprice>%sprice</specialprice>" // Modèle rss
+							  ),
+				      );
+ */
+price::define_modele('<span class="h2 diff-font normalprice">%pprice</span>', 'price_model', 'html' );
+price::define_modele('<span class="h2 diff-font productSpecialPrice">%sprice<small><del>%pprice</del></small></span>', 'special_model', 'html');
+
+
+/*
+    Utilisation de l'objet local
+    $load
+
+    Cet object est specifique au templae, il est initialisé avant l'appel de fichier, est accesible depuis tous les elemnts inclus de ce theme
+    Il transmet ainsi tout calcul ou opertaion necessitant un transport d'informations
+*/
+
+$load = $page->GetThemeLoad();
+
+/**
+  @var PathChildGab Path
+    Childs html tpl files
+*/
+	$this->add_var_page('PathChildGab','Childs_tpl/');
+
+
+/**
+	image
+*/
+	$this->add_var_page('SIDEBAR_IMG_WIDTH','150');
+	$this->add_var_page('SIDEBAR_IMG_HEIGHT','150');
+	$this->add_var_page('HEADING_IMG_WIDTH','150');
+	$this->add_var_page('HEADING_IMG_HEIGHT','150');
+	$this->add_var_page('SMALL_IMAGE_WIDTH','235');
+	$this->add_var_page('SMALL_IMAGE_HEIGHT','200');
+
+/**
+	Listing
+*/
+	/**
+		Nbr maxi dans les listes (shearch, listing)
+	*/
+		$this->add_var_page('MAX_DISPLAY_SEARCH_RESULTS','10');
+		$this->add_var_page('MAX_DISPLAY_PAGE_LINKS','15');
+		$this->add_var_page('MAX_DISPLAY_PRODUCTS_NEW','15');
+		$this->add_var_page('MAX_DISPLAY_NEW_PRODUCTS','15');
+		$this->add_var_page('MAX_DISPLAY_PRODUCTS_NEW','25');
+                $this->add_var_page('MAX_DISPLAY_IMG_THUMBNAIL','3');
+
+	/**
+		Display block
+	*/
+		$this->add_var_page('PRODUCT_LIST_IMAGE','true');
+		$this->add_var_page('PRODUCT_LIST_BUY_NOW','true');
+		$this->add_var_page('PRODUCT_LIST_NAME','true');
+		$this->add_var_page('PRODUCT_LIST_PRICE','true');
+
+
+
+/**
+	Fix format and css class for display message
+*/
+	$Ms = $this->getMessageStack();
+	$Ms->setPrefix('alert');
+	$Ms->setRowsBlock('<div %s >%s</div>');
+	$Ms->setTypeArray(0, 'danger');
+
+
+
+
+/**
+	Configuration des boxes
+Les boxes sont appelé via les lg suivant.
+$this->oscss_boxes(Nom de la boxes, parent);
+@param string boxe: juste le nom, sans ext, et sans path
+@param string parent: le nom dans lesquel l'element sera stocké
+*/
+
+
+
+
+	$this->oscss_boxes->_add('myaccount', 'permanent' ,array('cache'=>false,'sort'=>30));
+
+
+  $this->oscss_boxes->_add('languages', 'headertop');
+/** Boite de recherche */
+  $this->oscss_boxes->_addWidget('Widget_search_suggest', 'headertop');
+
+  $this->oscss_boxes->_add('currencies', 'header');
+  /* panier court */
+  $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
+
+if(self::oscss_body_id() !='Page_shopping_cart')
+  $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
+
+
+  /**
+    @var mode used in template.php for adjust affichage
+      mixed type and other control for determine mode
+  */
+  $load->mode = $page->GetPageType();
+  /**
+    @var module default child, else master
+      master is mode full screen , and child is complete existant page
+  */
+  $load->module = 'child';
+
+/**
+  @brief Estimate environement, for choose block load
+*/
+
+switch($page->GetPageType()){
+
+
+  case 'home':
+
+		$this->add_var_page('MAX_DISPLAY_PRODUCTS_NEW','4');
+		$this->add_var_page('MAX_DISPLAY_NEW_PRODUCTS','4');
+// Added for basket summary
+    $this->oscss_boxes->_add('view_min_cart', 'header', array('cache'=>false));
+    $this->oscss_boxes->_add('whats_new', 'sidebar', array('cache'=>false));
+    $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+    $this->oscss_boxes->_add('best_sellers', 'sidebar', array('cache'=>false));
+    $this->oscss_boxes->_add('selections', 'sidebar', array('cache'=>false));
+
+    $this->oscss_boxes->_add('bann_type', 'sidebar', array('cache'=>false));
+
+    $load->mode = 'home';
+
+		// force put key for load specific featured
+		$this->add_var_page('featured_key','home_slideshow');
+		$this->oscss_modules->_add('featured.php','slideshow',array('sort'=>60));
+
+		$this->oscss_modules->_add(FILENAME_NEW_PRODUCTS,'center',array('sort'=>60));
+  break;
+
+	case 'checkout':
+  case 'cart':
+		$this->oscss_boxes->_add('checkout_progressbar', 'progressbar');
+    $this->oscss_boxes->_add('categories', 'sidebar');
+    $this->oscss_boxes->_add('whats_new', 'sidebar', array('cache'=>false));
+    $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+  break;
+
+
+  case 'account':
+    $this->oscss_boxes->_add('myaccount', 'sidebar' ,array('cache'=>false,'sort'=>30));
+    $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+  break;
+
+  case 'content':
+    $this->oscss_boxes->_add('categories', 'sidebar');
+    $this->oscss_boxes->_add('cms_last_post', 'sidebar', array('cache'=>false));
+		//
+		$this->oscss_boxes->_add('recently_viewed_content', 'sidebar', array('cache'=>false));
+  break;
+
+  case 'product':
+//    $this->oscss_boxes->_add('categories', 'sidebar');
+//
+//		//
+//		$this->oscss_boxes->_add('recently_viewed', 'sidebar', array('cache'=>false));
+//		// required manufacturer exts
+//    $this->oscss_boxes->_add('manufacturer_info', 'sidebar');
+//		// required specials exts
+//    $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+
+
+
+		// load generic module in childs module in page
+		$this->oscss_modules->_add(FILENAME_ALSO_PURCHASED_PRODUCTS,'center',array('sort'=>60));
+		$this->oscss_modules->_add(FILENAME_UPCOMING_PRODUCTS,'center',array('sort'=>61));
+  break;
+
+  case 'listing': // obsolete
+  case 'categorie':
+    $this->oscss_boxes->_add('categories...
 
[truncated message content]

[Oscss-commit] SF.net SVN: oscss:[5230] trunk/catalog/install/data/templates/Modern_RWD/

From: <hom...@us...> - 2014-09-09 00:31:44

Revision: 5230
          http://sourceforge.net/p/oscss/svn/5230
Author:   homer8173
Date:     2014-09-09 00:31:35 +0000 (Tue, 09 Sep 2014)
Log Message:
-----------
New themplate : 
bad directory for installer

Removed Paths:
-------------
    trunk/catalog/install/data/templates/Modern_RWD/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Flat | Threaded

<< < 1 2 3 4 5 6 .. 67 > >> (Page 4 of 67)