Menu
▾
▴
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
|
|
From: <os...@us...> - 2013-06-23 08:58:43
|
Revision: 4754
http://sourceforge.net/p/oscss/svn/4754
Author: oscim
Date: 2013-06-23 08:58:40 +0000 (Sun, 23 Jun 2013)
Log Message:
-----------
Add db transaction in sqlcustomer
Add txt in fr for customers page
Fix error in sqlproduct
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/drivers/sqlcustomer.php
trunk/catalog/admin/includes/classes/drivers/sqlproduct.php
trunk/catalog/admin/includes/languages/fr_FR/modules/account/address_book.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt
trunk/catalog/admin/includes/modules/account/address_book.php
trunk/catalog/admin/includes/modules/pages/customers.php
Modified: trunk/catalog/admin/includes/classes/drivers/sqlcustomer.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcustomer.php 2013-06-22 19:13:53 UTC (rev 4753)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcustomer.php 2013-06-23 08:58:40 UTC (rev 4754)
@@ -33,10 +33,26 @@
/**
@brief create new ligne in table configuration
+ @param $option array
+ password
+ email
+ customers_firstname
+ customers_lastname
+ customers_email_address
+ customers_telephone
+ customers_fax
+ customers_newsletter
+ customers_group_ra
+ [customers_gender]
+ [customers_dob]
+ global_product_notifications
*/
public static function create($option){
self::getInstance();
+ $DB=Database::getInstance();
+ $error=0;
+
if(!isset($option['password']))
return 'password';
if(!isset($option['email']))
@@ -46,57 +62,60 @@
$sqlarray = $option['sqlarray'];
- $sql_data_array = array();
- $sql_data_array['customers_firstname'] = $sqlarray['customers_firstname'];
- $sql_data_array['customers_lastname'] = $sqlarray['customers_lastname'];
- $sql_data_array['customers_email_address'] = $sqlarray['customers_email_address'];
- $sql_data_array['customers_telephone'] = $sqlarray['customers_telephone'];
- $sql_data_array['customers_fax'] = $sqlarray['customers_fax'];
- if(isset($sqlarray['password']))$sql_data_array['customers_password'] = $sqlarray['password'];
- $sql_data_array['customers_newsletter'] = $sqlarray['customers_newsletter'];
- $sql_data_array['customers_group_ra'] = $sqlarray['customers_group_ra'];
+ $sql_data_array = array();
+ $sql_data_array['customers_firstname'] = $sqlarray['customers_firstname'];
+ $sql_data_array['customers_lastname'] = $sqlarray['customers_lastname'];
+ $sql_data_array['customers_email_address'] = $sqlarray['customers_email_address'];
+ $sql_data_array['customers_telephone'] = $sqlarray['customers_telephone'];
+ $sql_data_array['customers_fax'] = $sqlarray['customers_fax'];
+ if(isset($sqlarray['password']))$sql_data_array['customers_password'] = $sqlarray['password'];
+ $sql_data_array['customers_newsletter'] = $sqlarray['customers_newsletter'];
+ $sql_data_array['customers_group_ra'] = $sqlarray['customers_group_ra'];
- if (_cst_bool('ACCOUNT_GENDER'))
- $sql_data_array['customers_gender'] = $sqlarray['customers_gender'];
+ if (_cst_bool('ACCOUNT_GENDER'))
+ $sql_data_array['customers_gender'] = $sqlarray['customers_gender'];
- if (_cst_bool('ACCOUNT_DOB'))
- $sql_data_array['customers_dob'] = tep_date_raw($sqlarray['customers_dob']);
+ if (_cst_bool('ACCOUNT_DOB'))
+ $sql_data_array['customers_dob'] = tep_date_raw($sqlarray['customers_dob']);
- self::$modules->load_post_values($_post);
- $sql_data_array = array_merge($sql_data_array, self::$modules->insert_table_prim () );
+ self::$modules->load_post_values($_post);
+ $sql_data_array = array_merge($sql_data_array, self::$modules->insert_table_prim () );
- $_return= $sql_data_array;
+ $_return= $sql_data_array;
- $resobj=tep_db_perform(TABLE_CUSTOMERS, $sql_data_array);
+ $resobj=tep_db_perform(TABLE_CUSTOMERS, $sql_data_array);
- $lastid=$resobj->__get('insertId');
+ if(!$resobj){
+ $DB->rollbackTransaction();
+ return false;
+ }
- $sql_data_array = array(
- 'customers_info_id' => $lastid,
- 'customers_info_date_account_created' => 'now()',
- 'global_product_notifications' => $sqlarray['global_product_notifications']
- );
+ $lastid=$resobj->__get('insertId');
+ $sql_data_array = array(
+ 'customers_info_id' => $lastid,
+ 'customers_info_date_account_created' => 'now()',
+ 'global_product_notifications' => $sqlarray['global_product_notifications']
+ );
- tep_db_perform(TABLE_CUSTOMERS_INFO, $sql_data_array);
- self::$modules->load_post_values(array_merge(array('customers_id'=>$lastid),$_post) );
- $sql_data_array = array_merge($sql_data_array, self::$modules->insert_table_second() );
+ tep_db_perform(TABLE_CUSTOMERS_INFO, $sql_data_array);
-// $_return=array_merge($_return,$sql_data_array,array('customers_id'=>$lastid));
+ self::$modules->load_post_values(array_merge(array('customers_id'=>$lastid),$_post) );
+ $sql_data_array = array_merge($sql_data_array, self::$modules->insert_table_second() );
- return $lastid;
-// }
-// else
-// return false;
+ if( $error > 0){
+ $DB->rollbackTransaction();
+ return false;
+ }
+ else{
+ $DB->commitTransaction();
+ return $lastid;
+ }
-// if(!$res)
-// return $res;
-// else
-// return $res->__get('insertId');
}
/**
@@ -104,6 +123,8 @@
*/
public static function update($option){
self::getInstance();
+ $DB=Database::getInstance();
+ $error=0;
if(!isset($option['id']) ) return 'id';
@@ -134,6 +155,7 @@
if (_cst_bool('ACCOUNT_DOB'))
$sql_data_array['customers_dob'] = tep_date_raw($sqlarray['customers_dob']);
+ $DB->beginTransaction();
self::$modules->load_post_values($_post);
@@ -149,7 +171,8 @@
);
- $res=tep_db_perform(TABLE_CUSTOMERS_INFO, $sql_data_array, 'update' , " customers_info_id = '".(int)$option['id']."' " );
+ if( !tep_db_perform(TABLE_CUSTOMERS_INFO, $sql_data_array, 'update' , " customers_info_id = '".(int)$option['id']."' " ) )
+ $error++;
self::$modules->load_post_values($_post);
@@ -158,7 +181,16 @@
self::$modules->after_update((int)$option['id']);
- return $res;
+
+ if( $error > 0){
+ $DB->rollbackTransaction();
+ return false;
+ }
+ else{
+ $DB->commitTransaction();
+ return 1;
+ }
+
}
Modified: trunk/catalog/admin/includes/classes/drivers/sqlproduct.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlproduct.php 2013-06-22 19:13:53 UTC (rev 4753)
+++ trunk/catalog/admin/includes/classes/drivers/sqlproduct.php 2013-06-23 08:58:40 UTC (rev 4754)
@@ -61,9 +61,9 @@
$resobj=tep_db_perform(TABLE_PRODUCTS, $sql_data_array);
if(!$resobj){
- $DB->rollbackTransaction();
- return false;
- }
+ $DB->rollbackTransaction();
+ return false;
+ }
$products_id = $resobj->__get('insertId');
@@ -82,14 +82,14 @@
$error++;
}
- if( $error > 0){
- $DB->rollbackTransaction();
- return false;
- }
- else{
- $DB->commitTransaction();
- return $products_id;
- }
+ if( $error > 0){
+ $DB->rollbackTransaction();
+ return false;
+ }
+ else{
+ $DB->commitTransaction();
+ return $products_id;
+ }
}
/**
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/account/address_book.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/account/address_book.txt 2013-06-22 19:13:53 UTC (rev 4753)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/account/address_book.txt 2013-06-23 08:58:40 UTC (rev 4754)
@@ -34,8 +34,15 @@
$lang['address_book edit address']="Editer cette adresse" ;
$lang['address_book delete address']="Supprimer cette adresse" ;
+ /* notify */
+ $lang['@address_book create success']="Creation d'une adresse pour ce client reussie" ;
+ $lang['@address_book not create error']="Erreur lors de la creation d'une adresse" ;
+ $lang['@address_book save success']="Mise à jour de l'adresse reussie" ;
+ $lang['@address_book not save error']="Erreur lors de la mise à jour de l'adresse" ;
+
/* Specific display normal */
$lang['address_book define default address']="Adresse par defaut" ;
+
/* Specific inline */
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt 2013-06-22 19:13:53 UTC (rev 4753)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt 2013-06-23 08:58:40 UTC (rev 4754)
@@ -126,12 +126,16 @@
$lang['error in process notification for %s']="Erreur lors de la notification à " ;
$lang['error in process send mail for %s'] = "Erreur lors de l'envoi email à %s";
$lang['send mail for %s ok'] = "Envoi email reussie à %s";
- $lang['customers save success']="Enregistrement du client reussie" ;
+
$lang['error save in process']="Erreur lors de l'enregistrement du client" ;
$lang['action delete for %s ok']="Erreur lors de la suppresion du client %s" ;
$lang['error delete for %s']="Suppression du client %s effectué" ;
/* MessageStack */
+ $lang['@customers save success']="Enregistrement du client reussi" ;
+ $lang['@customers not save error']="Erreur lors de l'enregistrement du client" ;
+ $lang['@customers create success']="Creation du client reussi" ;
+ $lang['@customers not create error']="Erreur lors de la creation du client" ;
$lang['@customers update confirm status customers']="Mise à jour de l'état de 'confirmé' " ;
$lang['@customers update status customers']="Mise à jour de l'état " ;
Modified: trunk/catalog/admin/includes/modules/account/address_book.php
===================================================================
--- trunk/catalog/admin/includes/modules/account/address_book.php 2013-06-22 19:13:53 UTC (rev 4753)
+++ trunk/catalog/admin/includes/modules/account/address_book.php 2013-06-23 08:58:40 UTC (rev 4754)
@@ -290,8 +290,14 @@
$cID = (int)self::$cInfo->customers_id;
/// update db data
- self:: SQLCreate();
+ $r = self:: SQLCreate();
+ if($r>0)
+ $messageStack->add(__('@address_book create success'), 'success');
+ else
+ $messageStack->add(__('@address_book not create error'), 'error');
+
+
tep_redirect(tep_href_link(customers::FILENAME, 'cID=' .$cID.'&action=edit'));
}
@@ -351,8 +357,13 @@
/// update db data
- self:: SQLUpdate();
+ $r = self:: SQLUpdate();
+ if($r>0)
+ $messageStack->add(__('@address_book save success'), 'success');
+ else
+ $messageStack->add(__('@address_book not save error'), 'error');
+
tep_redirect(tep_href_link(customers::FILENAME, 'cID=' .$cID.'&action=edit'));
}
break;
Modified: trunk/catalog/admin/includes/modules/pages/customers.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/customers.php 2013-06-22 19:13:53 UTC (rev 4753)
+++ trunk/catalog/admin/includes/modules/pages/customers.php 2013-06-23 08:58:40 UTC (rev 4754)
@@ -565,12 +565,23 @@
$array['password']=$mdp=self::randomize();
$array['email']=$array['sqlarray']['customers_email_address'];
$_id=sqlcustomer::create($array);
+
+ if($_id>0)
+ $messageStack->add(__('@customers create success'), 'success');
+ else
+ $messageStack->add(__('@customers not create error'), 'error');
+
$result=sqlcustomer::fetch(array('id'=>$_id), false );
}
else{
$array['id']=$_id=tep_db_prepare_input(self::$Id);
- $result=sqlcustomer::update($array, false);
+ $r=sqlcustomer::update($array, false);
+ if($r>0)
+ $messageStack->add(__('@customers save success'), 'success');
+ else
+ $messageStack->add(__('@customers not save error'), 'error');
+
$result=sqlcustomer::fetch(array('id'=>$_id), false );
}
@@ -611,9 +622,8 @@
$messageStack->add_session(sprintf(__('error in process notification for %s'), STORE_OWNER .' '. STORE_OWNER_EMAIL_ADDRESS ), 'error');
}
- $messageStack->add(__('customers save success'), 'success');
-// print_r($_SESSION);
-// exit;
+
+
if(isset($_POST['up_and_close']) ) tep_redirect(tep_href_link(self::FILENAME));
else tep_redirect(tep_href_link(self::FILENAME, 'cID=' .$_id.'&action=edit'));
}
@@ -775,6 +785,7 @@
$query_raw .= " ORDER BY ".((!empty($adjust->sOrder)) ? $adjust->sOrder : ' ci.customers_info_date_account_created DESC ');
// echo $query_raw;
+
$_split = new splitPageResults($adjust->page, $adjust->rowbyp, $query_raw, $query_numrows);
$_query = $DB->query($query_raw);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-06-22 19:13:56
|
Revision: 4753
http://sourceforge.net/p/oscss/svn/4753
Author: oscim
Date: 2013-06-22 19:13:53 +0000 (Sat, 22 Jun 2013)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/drivers/sqlproduct.php
Modified: trunk/catalog/admin/includes/classes/drivers/sqlproduct.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlproduct.php 2013-06-22 15:24:49 UTC (rev 4752)
+++ trunk/catalog/admin/includes/classes/drivers/sqlproduct.php 2013-06-22 19:13:53 UTC (rev 4753)
@@ -153,10 +153,13 @@
/// Clean link product to categorie and save new link
if(isset($option['cPath']) && count($post['categories']) == 0){
$post['categories'][] = $option['cPath'];
- sqlcategorie::DataInCat('products', $products_id, $post['categories']);
+ $r = sqlcategorie::DataInCat('products', $products_id, $post['categories']);
}
elseif(count($post['categories']) > 0)
- sqlcategorie::DataInCat('products', $products_id, $post['categories']);
+ $r = sqlcategorie::DataInCat('products', $products_id, $post['categories']);
+
+ if($r === false)
+ $error++;
}
if( DataTypes::is_active('featured')) {
if(count($post['linkto']['featured']) > 0)
@@ -176,8 +179,8 @@
)
);
-// if($r == false)
-// $error++;
+ if($r === false)
+ $error++;
}
@@ -212,22 +215,22 @@
$sql_data_array = array('products_name' => tep_db_prepare_input($post['products_name'][$language_id]) );
if ($action == 'insert_product') {
- $insert_sql_data = array('products_id' => $products_id, 'language_id' => $language_id);
+ $insert_sql_data = array('products_id' => $products_id, 'language_id' => $language_id);
- $sql_data_array = array_merge($sql_data_array, $insert_sql_data);
- // ACA START INSERT IN PRODUCT_DESCRIPTION TABLE
- $sql_data_array = array_merge($sql_data_array, self::$modules->get_insert_table_products_description ($language_id));
+ $sql_data_array = array_merge($sql_data_array, $insert_sql_data);
+ // ACA START INSERT IN PRODUCT_DESCRIPTION TABLE
+ $sql_data_array = array_merge($sql_data_array, self::$modules->get_insert_table_products_description ($language_id));
- if( !tep_db_perform(TABLE_PRODUCTS_DESCRIPTION, $sql_data_array) )
- $error++;
+ if( !tep_db_perform(TABLE_PRODUCTS_DESCRIPTION, $sql_data_array) )
+ $error++;
}
elseif ($action == 'update_product') {
- // ACA START UPDATE PRODUCT_DESCRIPTION TABLE
- $sql_data_array = array_merge($sql_data_array, self::$modules->get_update_table_products_description ($language_id));
+ // ACA START UPDATE PRODUCT_DESCRIPTION TABLE
+ $sql_data_array = array_merge($sql_data_array, self::$modules->get_update_table_products_description ($language_id));
- if( ! tep_db_perform(TABLE_PRODUCTS_DESCRIPTION, $sql_data_array, 'update', " products_id = '" . (int)$products_id . "' and language_id = '" . (int)$language_id . "' ") )
- $error++;
+ if( ! tep_db_perform(TABLE_PRODUCTS_DESCRIPTION, $sql_data_array, 'update', " products_id = '" . (int)$products_id . "' and language_id = '" . (int)$language_id . "' ") )
+ $error++;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-06-22 15:24:52
|
Revision: 4752
http://sourceforge.net/p/oscss/svn/4752
Author: oscim
Date: 2013-06-22 15:24:49 +0000 (Sat, 22 Jun 2013)
Log Message:
-----------
displacement element to include the default template
Added Paths:
-----------
trunk/catalog/templates/defaut/includes/js/
trunk/catalog/templates/defaut/includes/triggers/
Removed Paths:
-------------
trunk/catalog/includes/js/
trunk/catalog/includes/triggers/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-06-22 15:21:49
|
Revision: 4751
http://sourceforge.net/p/oscss/svn/4751
Author: oscim
Date: 2013-06-22 15:21:45 +0000 (Sat, 22 Jun 2013)
Log Message:
-----------
Add element missing
Added Paths:
-----------
trunk/catalog/admin/includes/javascript/dataTables.TableTools/as3/lib/AlivePDF.swc
trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/collection.psd
trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/copy document.psd
trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/file_types.psd
trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/printer.psd
trunk/catalog/admin/includes/template/defaut/css/less/datatable.less
trunk/catalog/admin/includes/template/defaut/css/less/element.less
trunk/catalog/admin/includes/template/defaut/css/less/forms.less
trunk/catalog/admin/includes/template/defaut/css/less/header.less
trunk/catalog/admin/includes/template/defaut/css/less/styles.less
trunk/catalog/admin/includes/template/oscss/css/less/header.less
trunk/catalog/admin/includes/template/oscss/css/less/styles.less
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_holding_orders_products_attributes.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_orders_products_attributes.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_products.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_services.key.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_services.sql
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/as3/lib/AlivePDF.swc
===================================================================
(Binary files differ)
Index: trunk/catalog/admin/includes/javascript/dataTables.TableTools/as3/lib/AlivePDF.swc
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/as3/lib/AlivePDF.swc 2013-06-22 15:21:01 UTC (rev 4750)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/as3/lib/AlivePDF.swc 2013-06-22 15:21:45 UTC (rev 4751)
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/as3/lib/AlivePDF.swc
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/collection.psd
===================================================================
(Binary files differ)
Index: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/collection.psd
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/collection.psd 2013-06-22 15:21:01 UTC (rev 4750)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/collection.psd 2013-06-22 15:21:45 UTC (rev 4751)
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/collection.psd
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/copy document.psd
===================================================================
(Binary files differ)
Index: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/copy document.psd
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/copy document.psd 2013-06-22 15:21:01 UTC (rev 4750)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/copy document.psd 2013-06-22 15:21:45 UTC (rev 4751)
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/copy document.psd
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/file_types.psd
===================================================================
(Binary files differ)
Index: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/file_types.psd
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/file_types.psd 2013-06-22 15:21:01 UTC (rev 4750)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/file_types.psd 2013-06-22 15:21:45 UTC (rev 4751)
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/file_types.psd
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/printer.psd
===================================================================
(Binary files differ)
Index: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/printer.psd
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/printer.psd 2013-06-22 15:21:01 UTC (rev 4750)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/printer.psd 2013-06-22 15:21:45 UTC (rev 4751)
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/printer.psd
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/catalog/admin/includes/template/defaut/css/less/datatable.less
===================================================================
--- trunk/catalog/admin/includes/template/defaut/css/less/datatable.less (rev 0)
+++ trunk/catalog/admin/includes/template/defaut/css/less/datatable.less 2013-06-22 15:21:45 UTC (rev 4751)
@@ -0,0 +1,475 @@
+/**
+ *
+ * Use var define in definition.less
+ * Use image based on /includes/javascript/jquery.dataTable
+ *
+ * @font_size
+ * @lineheight
+ *
+ * @color_012
+ * @bg_hover
+ * @bg_hover_txt
+ *
+ * @color_datatable_tr_th
+ * @color_datatable_tr_th_txt
+ *
+ * @bg_table_tr_odd
+ * @bg_table_tr_even
+ *
+ * @color_sorting base color for
+ *
+ * @color_split_active hover rows
+ * @color_split_active_text hover rows text
+ *
+ * @color_bg_gradient_base,
+ * @color_bg_gradient_eob,
+ * @color_bg_gradient_eon
+ *
+ * @color_bg_ext_datatable header and footer for dataTable
+ *
+ * @color_split
+ * @color_split_active
+ * @color_split_active_text
+ * @color_split_border_hover
+ */
+
+/**
+ * Dipslay all listing in array
+ */
+.dataTableBase,
+.dataTableSearch,
+.dataTable{
+ float:left;
+ width:100%;
+ border-width:0;
+ border:1px solid @color_012;
+ .rounded(5px);
+
+ a.button,
+ input[type=submit].button,
+ input[type=image].button,
+ button.button {
+ margin:0;
+ }
+
+
+ tr {
+ padding:0;
+ margin:0;
+
+ th{
+ background-color: @color_datatable_tr_th;
+ font-size:@font_size;
+ font-weight:bold;
+ text-align:center;
+ color: @color_datatable_tr_th_txt;
+ text-shadow:none;
+ min-height:( @lineheight * 1.6 );
+ height:( @lineheight * 1.6 );
+ cursor: pointer;
+ }
+
+
+ .sorting_asc {
+ background: @color_datatable_tr_th url("../../../../../includes/javascript/jquery.dataTables/sort_asc.png") no-repeat center right;
+ padding-right: 20px;
+ }
+
+ .sorting_desc {
+ background: @color_datatable_tr_th url("../../../../../includes/javascript/jquery.dataTables/sort_desc.png") no-repeat center right;
+ padding-right: 20px;
+ }
+
+ .sorting {
+ background: @color_datatable_tr_th url("../../../../../includes/javascript/jquery.dataTables/sort_both.png") no-repeat center right;
+ padding-right: 20px;
+ }
+ }
+
+
+ tbody{
+
+ // rollover rows for mouse
+ tr,
+ tr.odd,
+ tr.even{
+ border:none;
+ cursor:default;
+
+ .highlighted,
+ &:hover{
+ background-color: @bg_hover;
+ cursor: pointer;
+
+ td{
+ background-color: @bg_hover;
+ }
+ td,
+ td a {
+ color : @bg_hover_txt ;
+ }
+ }
+
+ td{
+ line-height:( @lineheight * 1.1 );
+ color: @datatable_color_txt;
+ padding: 2px;
+ font-size: @font_size;
+ cursor:default;
+
+ a{
+ text-decoration:none;
+ color: @datatable_color_txt;
+ }
+
+ /* Replace value by icon */
+ .edit-input-value .Val.img { display: block; height: 16px; margin: auto; width: 16px;}
+
+ .edit-input-value .Flag-0.txt,
+ .edit-input-value .Val-0.txt { display:none}
+ .edit-input-value .Flag-0.img{background:transparent url("../../../../../images/icons/icon_status_red.gif") left top no-repeat}
+ .edit-input-value .Val-0.img { width: 10px; background:transparent url("../../../../../images/icons/icon_view_red.gif") left top no-repeat}
+
+ .edit-input-value .Flag-1.txt,
+ .edit-input-value .Val-1.txt { display:none}
+ .edit-input-value .Flag-1.img{background:transparent url("../../../../../images/icons/icon_status_green.gif") left top no-repeat}
+ .edit-input-value .Val-1.img {width: 10px; background:transparent url("../../../../../images/icons/icon_view_green.gif") left top no-repeat}
+ }
+ .row_action {
+ min-width:100px;
+ text-align:right;
+ }
+
+ .row_action_large {
+ min-width:250px;
+ text-align:right;
+ }
+
+ .row_customers {
+ min-width:100px;
+ text-align:left;
+ }
+
+
+
+ .sorting_1{
+ background-color: ( @color_sorting + 50);
+ }
+ .sorting_1,
+ .sorting_1 a{
+ color : ( @color_sorting_text + 50);
+ }
+
+ .sorting_2{
+ background-color:( @color_sorting + 65);
+ }
+ .sorting_2,
+ .sorting_2 a{
+ color :( @color_sorting_text + 65);
+ }
+
+ .sorting_3{
+ background-color:( @color_sorting + 80);
+ }
+ .sorting_3,
+ .sorting_3 a{
+ color : (@color_sorting_text + 80);
+ }
+
+
+ }
+
+ .odd{
+ background-color: @bg_table_tr_odd;
+ }
+
+ .even{
+ background-color: @bg_table_tr_even;
+ }
+
+ .details {
+ background-color: #d1cfd0;
+ }
+ }
+
+ tfoot tr td input {width:80%;text-align:left;}
+}
+
+
+.dataTables_wrapper {
+ position: relative;
+ clear: both;
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ .paging_full_numbers{
+ a{
+ display:inline-block;
+ padding: 2px;
+ margin:0 1px;
+ min-width:10px;
+ text-align:center;
+ border:1px solid gray;
+ }
+
+
+ .paginate_button,
+ .paginate_active{
+ .rounded(5px);
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ &:hover{
+ border:1px solid @color_split_border_hover;
+ background:white;
+ }
+ }
+
+ .paginate_active{
+ color : @color_split_active_text;
+ background-color: @color_split_active;
+
+ &:hover{
+ cursor: not-allowed !important;
+ color : @color_split_active_text;
+ background-color: @color_split_active;
+ }
+ }
+ }
+
+ .top,
+ .bottom {
+ padding: 1px 10px;
+ background-color: @color_bg_ext_datatable;
+
+ .dataTables_length {
+// clear: both;
+ float: left;
+ width: 40%;
+
+ form label {
+ padding:0;
+ margin:0;
+ }
+ }
+
+ .dataTables_paginate {
+ float: right;
+ text-align: right;
+ padding-top: 0px;
+ }
+
+ .dataTables_filter {
+ width: 50%;
+ float: right;
+ text-align: right;
+ }
+ }
+
+ .top{
+ .border-radius( 5px,0, 0, 5px);
+
+
+ .dataTables_filter {
+ clear: both;
+ position: relative;
+ right: 0;
+ text-align: right;
+ margin-bottom: 0;
+ }
+
+ .dataTables_paginate {
+ float: right;
+ text-align: right;
+ padding-top: 0px;
+ margin-bottom: 5px;
+ }
+ }
+
+ .bottom {
+ padding: 5px 10px;
+ .border-radius( 0, 5px, 5px, 0);
+
+ .dataTables_info {
+ clear:both;
+ }
+ }
+}
+
+
+/* Pagination */
+.paging_full_numbers{
+ width: auto;
+}
+
+.paging_full_numbers span.paginate_button,
+.paging_full_numbers span.paginate_active {
+ border: 1px solid #aaa;
+ padding: 2px 5px;
+ margin: 0 3px;
+ cursor: pointer;
+
+ .rounded(5px);
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+}
+
+
+
+.paging_full_numbers .fg-button {
+ padding: 2px 6px;
+ cursor: pointer;
+}
+
+
+.fg-toolbar {
+ padding: 5px;
+}
+
+.dataTables_paginate {
+ width: auto;
+}
+
+
+
+
+
+
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * DataTables features
+ */
+
+
+
+.dataTables_processing {
+ position: absolute;
+ top: 0px;
+ left: 50%;
+ width: 250px;
+ margin-left: -125px;
+ border: 1px solid #ddd;
+ text-align: center;
+ color: #999;
+ font-size: 11px;
+ padding: 2px 0;
+}
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Misc
+ */
+
+
+
+.dataTables_empty {
+ text-align: center;
+}
+
+
+
+.DTTT_container {
+ padding: 3px 0 3px 3px;
+ border: 1px solid #d0d0d0;
+ background-color: #f0f0f0;
+ float: right;
+ margin-bottom: 0;
+}
+
+.TableTools_button {
+ position: relative;
+ float: left;
+ margin-right: 3px;
+}
+
+/* Buttons are cunning border-box sizing - we can't just use that for A and DIV due to IE6/7 */
+button.DTTT_button {
+ height: 30px;
+ padding: 3px 8px;
+}
+
+.DTTT_button embed {
+ outline: none;
+}
+
+button.DTTT_button:hover,
+div.DTTT_button:hover,
+a.DTTT_button:hover {
+ border: 1px solid #666;
+ text-decoration: none !important;
+
+ -webkit-box-shadow: 1px 1px 3px #999;
+ -moz-box-shadow: 1px 1px 3px #999;
+ -ms-box-shadow: 1px 1px 3px #999;
+ -o-box-shadow: 1px 1px 3px #999;
+ box-shadow: 1px 1px 3px #999;
+
+ background: #f3f3f3; /* Old browsers */
+ background: -webkit-linear-gradient(top, #f3f3f3 0%,#e2e2e2 89%,#f4f4f4 100%); /* Chrome10+,Safari5.1+ */
+ background: -moz-linear-gradient(top, #f3f3f3 0%,#e2e2e2 89%,#f4f4f4 100%); /* FF3.6+ */
+ background: -ms-linear-gradient(top, #f3f3f3 0%,#e2e2e2 89%,#f4f4f4 100%); /* IE10+ */
+ background: -o-linear-gradient(top, #f3f3f3 0%,#e2e2e2 89%,#f4f4f4 100%); /* Opera 11.10+ */
+ background: linear-gradient(top, #f3f3f3 0%,#e2e2e2 89%,#f4f4f4 100%); /* W3C */
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f3f3f3', endColorstr='#f4f4f4',GradientType=0 ); /* IE6-9 */
+}
+
+button.DTTT_disabled,
+div.DTTT_disabled,
+a.DTTT_disabled {
+ color: #999;
+ border: 1px solid #d0d0d0;
+
+ background: #ffffff; /* Old browsers */
+ background: -webkit-linear-gradient(top, #ffffff 0%,#f9f9f9 89%,#fafafa 100%); /* Chrome10+,Safari5.1+ */
+ background: -moz-linear-gradient(top, #ffffff 0%,#f9f9f9 89%,#fafafa 100%); /* FF3.6+ */
+ background: -ms-linear-gradient(top, #ffffff 0%,#f9f9f9 89%,#fafafa 100%); /* IE10+ */
+ background: -o-linear-gradient(top, #ffffff 0%,#f9f9f9 89%,#fafafa 100%); /* Opera 11.10+ */
+ background: linear-gradient(top, #ffffff 0%,#f9f9f9 89%,#fafafa 100%); /* W3C */
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#fafafa',GradientType=0 ); /* IE6-9 */
+}
+
+
+
+.DTTT_print_info {
+ position: fixed;
+ top: 50%;
+ left: 50%;
+ width: 400px;
+ height: 150px;
+ margin-left: -200px;
+ margin-top: -75px;
+ text-align: center;
+ color: #333;
+ padding: 10px 30px;
+
+ background: #ffffff; /* Old browsers */
+ background: -webkit-linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* Chrome10+,Safari5.1+ */
+ background: -moz-linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* FF3.6+ */
+ background: -ms-linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* IE10+ */
+ background: -o-linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* Opera 11.10+ */
+ background: linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* W3C */
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f9f9f9',GradientType=0 ); /* IE6-9 */
+
+ opacity: 0.9;
+
+ border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+
+ box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+ -moz-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+ -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+}
+
+.DTTT_print_info h6 {
+ font-weight: normal;
+ font-size: 28px;
+ line-height: 28px;
+ margin: 1em;
+}
+
+.DTTT_print_info p {
+ font-size: 14px;
+ line-height: 20px;
+}
Added: trunk/catalog/admin/includes/template/defaut/css/less/element.less
===================================================================
--- trunk/catalog/admin/includes/template/defaut/css/less/element.less (rev 0)
+++ trunk/catalog/admin/includes/template/defaut/css/less/element.less 2013-06-22 15:21:45 UTC (rev 4751)
@@ -0,0 +1,136 @@
+/*---------------------------------------------------
+ * LESS Elements 0.6
+ * ---------------------------------------------------
+ * A set of useful LESS mixins by Dmitry Fadeyev
+ * Special thanks for mixin suggestions to:
+ * Kris Van Herzeele,
+ * Benoit Adam,
+ * Portenart Emile-Victor,
+ * Ryan Faerman
+ *
+ * More info at: http://lesselements.com
+ * -----------------------------------------------------*/
+
+.gradient(@color: #F5F5F5, @start: #EEE, @stop: #FFF) {
+ background: @color;
+ background: -webkit-gradient(linear,
+ left bottom,
+ left top,
+ color-stop(0, @start),
+ color-stop(1, @stop));
+ background: -ms-linear-gradient(bottom,
+ @start,
+ @stop);
+ background: -moz-linear-gradient(center bottom,
+ @start 0%,
+ @stop 100%);
+}
+.bw-gradient(@color: #F5F5F5, @start: 0, @stop: 255) {
+ background: @color;
+ background: -webkit-gradient(linear,
+ left bottom,
+ left top,
+ color-stop(0, rgb(@start,@start,@start)),
+ color-stop(1, rgb(@stop,@stop,@stop)));
+ background: -ms-linear-gradient(bottom,
+ rgb(@start,@start,@start) 0%,
+ rgb(@start,@start,@start) 100%);
+ background: -moz-linear-gradient(center bottom,
+ rgb(@start,@start,@start) 0%,
+ rgb(@stop,@stop,@stop) 100%);
+}
+.bordered(@top-color: #EEE, @right-color: #EEE, @bottom-color: #EEE, @left-color: #EEE) {
+ border-top: solid 1px @top-color;
+ border-left: solid 1px @left-color;
+ border-right: solid 1px @right-color;
+ border-bottom: solid 1px @bottom-color;
+}
+.drop-shadow(@x-axis: 0, @y-axis: 1px, @blur: 2px, @alpha: 0.1) {
+ -webkit-box-shadow: @x-axis @y-axis @blur rgba(0, 0, 0, @alpha);
+ -moz-box-shadow: @x-axis @y-axis @blur rgba(0, 0, 0, @alpha);
+ box-shadow: @x-axis @y-axis @blur rgba(0, 0, 0, @alpha);
+}
+.rounded(@radius: 2px) {
+ -webkit-border-radius: @radius;
+ -moz-border-radius: @radius;
+ border-radius: @radius;
+ -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;
+}
+.border-radius(@topright: 0, @bottomright: 0, @bottomleft: 0, @topleft: 0) {
+ -webkit-border-top-right-radius: @topright;
+ -webkit-border-bottom-right-radius: @bottomright;
+ -webkit-border-bottom-left-radius: @bottomleft;
+ -webkit-border-top-left-radius: @topleft;
+ -moz-border-radius-topright: @topright;
+ -moz-border-radius-bottomright: @bottomright;
+ -moz-border-radius-bottomleft: @bottomleft;
+ -moz-border-radius-topleft: @topleft;
+ border-top-right-radius: @topright;
+ border-bottom-right-radius: @bottomright;
+ border-bottom-left-radius: @bottomleft;
+ border-top-left-radius: @topleft;
+ -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;
+}
+.opacity(@opacity: 0.5) {
+ -moz-opacity: @opacity;
+ -khtml-opacity: @opacity;
+ -webkit-opacity: @opacity;
+ opacity: @opacity;
+}
+.transition-duration(@duration: 0.2s) {
+ -moz-transition-duration: @duration;
+ -webkit-transition-duration: @duration;
+ transition-duration: @duration;
+}
+.rotation(@deg:5deg){
+ -webkit-transform: rotate(@deg);
+ -moz-transform: rotate(@deg);
+ transform: rotate(@deg);
+}
+.scale(@ratio:1.5){
+ -webkit-transform:scale(@ratio);
+ -moz-transform:scale(@ratio);
+ transform:scale(@ratio);
+}
+.transition(@duration:0.2s, @ease:ease-out) {
+ -webkit-transition: all @duration @ease;
+ -moz-transition: all @duration @ease;
+ transition: all @duration @ease;
+}
+.inner-shadow(@horizontal:0, @vertical:1px, @blur:2px, @alpha: 0.4) {
+ -webkit-box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha);
+ -moz-box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha);
+ box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha);
+}
+.box-shadow(@arguments) {
+ -webkit-box-shadow: @arguments;
+ -moz-box-shadow: @arguments;
+ box-shadow: @arguments;
+}
+.columns(@colwidth: 250px, @colcount: 0, @colgap: 50px, @columnRuleColor: #EEE, @columnRuleStyle: solid, @columnRuleWidth: 1px) {
+ -moz-column-width: @colwidth;
+ -moz-column-count: @colcount;
+ -moz-column-gap: @colgap;
+ -moz-column-rule-color: @columnRuleColor;
+ -moz-column-rule-style: @columnRuleStyle;
+ -moz-column-rule-width: @columnRuleWidth;
+ -webkit-column-width: @colwidth;
+ -webkit-column-count: @colcount;
+ -webkit-column-gap: @colgap;
+ -webkit-column-rule-color: @columnRuleColor;
+ -webkit-column-rule-style: @columnRuleStyle;
+ -webkit-column-rule-width: @columnRuleWidth;
+ column-width: @colwidth;
+ column-count: @colcount;
+ column-gap: @colgap;
+ column-rule-color: @columnRuleColor;
+ column-rule-style: @columnRuleStyle;
+ column-rule-width: @columnRuleWidth;
+}
+.translate(@x:0, @y:0) {
+ -moz-transform: translate(@x, @y);
+ -webkit-transform: translate(@x, @y);
+ -o-transform: translate(@x, @y);
+ -ms-transform: translate(@x, @y);
+ transform: translate(@x, @y);
+}
Added: trunk/catalog/admin/includes/template/defaut/css/less/forms.less
===================================================================
--- trunk/catalog/admin/includes/template/defaut/css/less/forms.less (rev 0)
+++ trunk/catalog/admin/includes/template/defaut/css/less/forms.less 2013-06-22 15:21:45 UTC (rev 4751)
@@ -0,0 +1,217 @@
+/**
+ */
+
+
+
+input,
+select,
+textarea,
+button {
+ padding:(@padding_base * 0.3) ;
+ font-family: Verdana,Arial,sans-serif;
+ font-size: (@font_size*1.3);
+ border:1px solid @bg_input_border;
+ background: @bg_input ;
+ .border-radius(5px);
+ .rounded(5px);
+
+ &:hover{
+ border:1px solid @bg_input_border_hover;
+ background: @bg_input_hover ;
+ }
+}
+
+
+
+// master central display
+form{
+ padding:0;
+
+ label { display: inline-block; font-weight: bold; line-height: 18px; margin: 5px 5px 5px 0; padding: 0 0 2px; text-align: left; min-width: 20%;}
+
+ fieldset legend { color:#666666; font-size:(@font_size*1.2); font-style:italic; font-weight:bold; padding:0 5px 0 20px;}
+
+ textarea{ vertical-align:baseline;}
+
+ p{
+
+ input[type="checkbox"] { float:right; }
+
+ select,
+ input[type="text"] {
+ margin:5px 15px;
+ }
+ select{
+ padding:1px 0 0 0;
+ height:(@lineheight * 1.3);
+ line-height:(@lineheight * 1.3);
+ }
+ }
+ p.new_product_img {
+ float:left;
+ padding:5px;
+ margin : 0 auto;
+ text-align:center;
+ width:98%;
+ border:1px solid @color_012;
+ .border-radius(5px,5px,5px,5px);
+
+ img{
+ margin:auto;
+ max-width: 300px;
+ }
+ }
+
+
+ ul.ui-tabs-nav {display: inline-block; margin: 0 ; padding: 1px; width: 99%;}
+
+ &.block_form,
+ .block_form {
+ .block_input{
+ text-shadow:0 1px 0 #fff;
+ width:94.9%;
+ margin:0 1px;
+ display:inline-block;
+ text-align: left;
+ background:#C9C9C9;
+ float:left;
+ line-height:18px;
+ padding:1px 5px 1px 5px;
+ border:1px solid @color_014;
+ .border-radius(5px);
+ .rounded(5px);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
+
+
+ span.value_edit {clear:both;display:inline-block; width:100%;}
+
+ br,
+ span.value_edit br{display:none;}
+
+ label br {display:inline-block;}
+
+ span.edit-input,
+ span.value_edit span.edit-input{float:left; display:inline-block; padding:0 12px;}
+
+ span.edit-input{
+ white-space:nowrap;
+
+ input{float: left;}
+
+ .edit-input-value-alternate {display:inline-block;width:20px; height: 20px;margin: 0 12px;}
+ .edit-input-value {padding-left:12px;}
+ /* remplacement true /false par icone */
+ .edit-input-value.Val-true ,
+ .edit-input-value.Val-false {font-size:0;}
+ .edit-input-value-alternate.Val-true {background:transparent url("../../img/1/check.png") left top no-repeat; }
+ .edit-input-value-alternate.Val-false {background:transparent url("../../img/1/busy.png") left top no-repeat;}
+ }
+ }
+
+ .block_input.tirroir {float:none;}
+
+ .tabs_lang{ float:left;}
+ }
+
+
+
+
+
+ fieldset {
+ margin: 0.1em ;
+ padding:0.1em;
+ border:none;
+
+ p {
+ margin: 0.1em;
+ padding:0.1em;
+ }
+
+ select,
+ input[type="text"] {
+ min-width:62%;
+ display:inline-block;
+
+ &.w_5 {
+ min-width:5%;
+ width:5%;
+ }
+ &.w_10 {
+ min-width:10%;
+ width:10%;
+ }
+ &.w_20 {
+ min-width:20%;
+ width:20%;
+ }
+ &.w_30 {
+ min-width:30%;
+ width:30%;
+ }
+ }
+
+ input.price,
+ input[type=text].price,
+ input[type=hidden].price{
+ width :120px;
+ min-width :120px;
+ text-align : right;
+ }
+
+
+ select option {display:block; float:none;clear:both;width:100%}
+
+ label { line-height: 18px; margin-right: 10px; display:inline-block; padding: 0 0 2px 0;}
+
+ ul{
+ list-style:none;
+ .rounded(5px);
+ }
+ // Cat list lors edition article ou cms
+ ul.LinkToView{
+ overflow: auto;
+ max-height: 160px;
+ background-color: #fff;
+ padding: 5px;
+ line-height: 15px;
+ border: 1px solid #666;
+ }
+ }
+
+ .block_field {
+ text-shadow:0 1px 0 #fff;
+ width:98.9%; margin:2px ;
+ display:inline-block;
+ text-align: left;
+ padding: 5px 3px;
+ float:left;
+
+ .tabs,
+ .tabs_lang{
+ margin:0 2px ;
+ display:inline-block;
+ text-align: left;
+ padding:0 5px;
+ float:left;
+ }
+
+ &.tabs_lang ul,
+ .tabs_lang ul.ui-tabs-nav,
+ .tabs_lang ul.ui-tabs-panel{display: inline-block; padding: 1px; width: 100%;}
+ }
+
+ .block_input label.inline { white-space:nowrap; width: 20%;}
+
+ .edit.col_right .block_input{
+ width:95%;
+
+ label{width:20%;text-align:left;font-weight:bold}
+ }
+
+ .block_input .hasDatepicker{ margin:0; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;line-height:30px; min-width:0;}
+
+ .input-multi input[type="checkbox"],
+ .input-multi input[type="radio"]{float:none;}
+
+
+}
Added: trunk/catalog/admin/includes/template/defaut/css/less/header.less
===================================================================
--- trunk/catalog/admin/includes/template/defaut/css/less/header.less (rev 0)
+++ trunk/catalog/admin/includes/template/defaut/css/less/header.less 2013-06-22 15:21:45 UTC (rev 4751)
@@ -0,0 +1,241 @@
+/**
+*/
+
+header#header {
+ background:@header_base_bg;
+ min-width:@display_max_width;
+ width:@display_width ;
+ margin:0 0;
+ position:fixed;
+ z-index:10;
+
+ div#headInfos {
+ display:inline-block;
+ height:@header_sub_height;
+ margin:0;
+ padding:0;
+ width:100%;
+ color:@color_011;
+ background:@header_info_bg;
+ .border-radius( 5px, 5px, 5px, 5px);
+ .rounded(5px);
+
+ h1 {display:inline; margin:0 2px; padding:0; line-height:@header_sub_height;}
+ h2 {display:inline; line-height:@header_sub_height; color:#FFFFFF; vertical-align:top;}
+
+ a,
+ span{padding-right:1em; color:@color_011; text-decoration:none; line-height:@header_sub_height; vertical-align:top;float:right;}
+
+ a:hover{text-decoration:underline;}
+ }
+}
+
+/**
+ * Nav Bar , master menu
+ * */
+nav {
+ margin-top:(@margin * 0.05);
+ background:transparent ;
+ height:(@lineheight * 1.55);
+
+
+ a,
+ a:link,
+ a:visited {
+ color: @nav_master_link;
+ text-decoration: none;
+ text-shadow:none;
+ }
+
+ a {
+ display:block;
+ text-decoration:none;
+ height:(@lineheight * 1.1);
+ text-align:center;
+ font:normal @font_size Verdana, Arial, sans-serif;
+ text-shadow: 0 1px 0 @nav_master_link_hover_shadow;
+
+ &:link,
+ &:visited {
+ color:@nav_master_link;
+ }
+
+ &:hover {
+ color:@nav_master_link_hover;
+ text-shadow: 0 1px 0 @nav_master_link_hover_shadow;
+ text-decoration:none;
+ }
+ }
+
+ .disabled{
+ display:none;
+
+ &:hover { display:none;}
+ }
+
+ .ssmenu a {
+ color: @submenu_link;
+ padding:(@padding_base * 0.2) 0 (@padding_base * 0.2) (@padding_base * 0.4);
+ text-decoration:none;
+ line-height:(@lineheight * 1.1);
+ border:none;
+ text-align:left;
+
+ &:hover {
+ background-color:@submenu_bg_hover;
+ color:@submenu_link_hover ;
+ text-shadow: 0 1px 0 @submenu_link_hover_shadow;
+ text-decoration:none;
+ }
+ }
+
+ ul{
+ list-style:none;
+
+ .ssmenu {
+ margin:0 1px 1px 0;
+ background:@submenu_bg;
+
+ .sub{
+ &:after{ content: " >>"; }
+ }
+
+ .ssmenu{
+ position:absolute;
+ top:-1px;
+ left:180px;
+ display:none;
+ z-index:15;
+
+ .sub{
+ &:after{ content: " >>"; }
+ }
+ }
+ }
+
+ li{
+ position:relative;
+ float:left;
+ padding: 0 5px;
+ height:(@lineheight * 1.55);
+
+ &:hover ul { display:block; }
+
+ ul{
+ position:absolute;
+ top:(@lineheight * 1.55);
+ left:0;
+ display:none;
+ z-index:10;
+
+ li{
+ float:none;
+ width:200px;
+
+ &:hover ul { display:block; }
+ }
+ }
+ }
+
+ .ssmenu li:hover ul.ssmenu,
+ .ssmenu li ul.ssmenu li:hover ul.ssmenu{ display:block }
+
+ .ssmenu li ul.ssmenu,
+ .ssmenu li ul.ssmenu li ul.ssmenu{ display:none; }
+ }
+
+ ul{
+// background : @header_info_bg;
+ .border-radius( 5px, 5px, 5px, 5px);
+ .rounded(5px);
+ .gradient( @header_info_bg, @header_info_bg , (@header_info_bg + #FFF )) ;
+ }
+
+ ul.fleft{
+ .border-radius( 5px, 5px, 5px, 5px);
+ .rounded(5px);
+
+
+ a{
+ padding-top:4px;
+ padding-left: 20px;
+ }
+ }
+
+ form{
+ margin:0;
+ padding:0;
+ }
+
+ /* Switcher */
+ p.themeSwitcher {
+ float:right;
+ margin:0;
+ padding:0 1em 0 0;
+ text-align:right;
+ color:@color_011;
+
+ select {
+ margin:2px;
+ padding:0;
+ vertical-align:middle;
+ width:100px;
+
+ option{
+ display:block;
+ color:@color_013;
+ font-size:(@font_size *0.9);
+ }
+ }
+ }
+
+
+}
+
+/* user bar */
+div#user {
+ margin-top:(@margin * 0.05);
+ background:@menu_user_bg ;
+ padding-right:10px;
+ height:@header_sub_height;
+
+
+ ul#MenuExts{
+ display:block;
+ height: @header_sub_height;
+ float:left;
+
+ li{
+ position:relative;
+ float:left;
+
+ height: @header_sub_height;
+ padding: 0 8px;
+ margin:0 1px;
+// background: none repeat-x scroll 0 0 @color_bg_menuexts;
+ border:none;
+ .border-radius( 5px, 5px, 5px, 5px);
+ .rounded(5px);
+ .gradient( @color_bg_menuexts, @color_bg_menuexts , (@color_bg_menuexts + #FFF )) ;
+ a {
+ display:block;
+ padding-top:4px; color:#000;
+ text-decoration:none;
+ text-shadow:none;
+ height:( @lineheight * 1.3);
+ text-align:center;
+ color:@color_011;
+
+ &:hover{
+ color:gray;
+ }
+ }
+ }
+ }
+
+
+}
+
+
+
+/* Specifique menu */
Added: trunk/catalog/admin/includes/template/defaut/css/less/styles.less
===================================================================
--- trunk/catalog/admin/includes/template/defaut/css/less/styles.less (rev 0)
+++ trunk/catalog/admin/includes/template/defaut/css/less/styles.less 2013-06-22 15:21:45 UTC (rev 4751)
@@ -0,0 +1,933 @@
+/**
+ * @ licence GPL *2005-2012 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 01/01/2012, 18:17
+ * @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ * @encode UTF-8
+ */
+
+/**
+ * Mixin
+ */
+
+.wrap () {
+ text-wrap: wrap;
+ white-space: pre-wrap;
+ white-space: -moz-pre-wrap;
+ word-wrap: break-word;
+}
+
+/**
+ * Retro-compatibilte oscommerce oscss < 2.xx
+ */
+/* info box block droit */
+.infoBoxHeading {
+ background-color: #ffffff;
+ border-width:0;
+ .rounded(5px);
+}
+.infoBoxContent{
+ border-width: 0px 1px 0px 1px;
+ border-color: #E6E6E6;
+ border-style: solid;
+ padding: 2px 2px 5px 10px;
+ font-size: 10px;
+ color: #000;
+ background-color: #f1f1f1;
+ list-style:none;
+ line-height:1.7em;
+ .rounded(5px);
+}
+.infoBoxContent li{clear:both; }
+
+
+
+
+
+
+
+
+/**
+ * Generalites
+ */
+
+
+*{
+ margin:0;
+ padding:0;
+ text-shadow:none;
+ border:0;
+}
+a :link,
+a:visited {text-decoration: underline; color:#000;}
+a:hover { text-decoration: none; }
+img { border:0 ; margin:0; padding:0; }
+h1 { font-size:(@font_size * 1) ; padding:(@padding_base * 2); }
+h2 { font-size:(@font_size * 1.2) ;}
+h3 {
+ clear:both;
+ color: @title_h3_color;
+ font-size: (@font_size * 1.9);
+ font-weight: bold;
+ padding: @padding_base 0 @padding_base (@padding_base * 1.2);
+ text-shadow: 0 1px 1px @title_h3_color_shadow ;
+}
+h4 { font-size: @font_size ;text-shadow:0 1px 0 #fff;}
+h5 { font-size: @font_size ;text-shadow:0 1px 0 #fff;}
+p {padding:1em;}
+ul {list-style:none;}
+th {
+ margin:2px 1px;
+ text-align: left;
+ padding: 2px @padding_base;
+ height:@lineheight;
+ line-height:(@lineheight * 0.7);
+}
+
+
+
+
+/**
+ * general class
+ */
+.error{ color:@field_required; }
+.alert{ color:#ae0405; }
+.fright{ float:right; }
+.fleft {float:left; }
+.tleft{text-align:left}
+.tright{text-align:right}
+.tcenter{text-align:center}
+.inline ,
+.inline *,
+div#central .inline *{ display:inline-block; }
+.nobr {white-space:nowrap;}
+
+.w_100 {width:99%;}
+.w_90 {width:89%;}
+.w_80 {width:79%;}
+.w_70 {width:69%;}
+.w_60 {width:59%;}
+.w_50 {width:49%;}
+.w_40 {width:39%;}
+.w_30 {width:29%;}
+.padd_w {padding-left:(@padding_base * 0.2); padding-right:(@padding_base * 0.2);}
+.padd_h {padding-top:(@padding_base * 0.2); padding-bottom:(@padding_base * 0.2);}
+.linkdoc {font-size:@font_size; font-weight:bold; }
+.clear ,
+.spacer,
+.separator{clear:both;}
+.fieldRequired { color: @field_required; }
+.smallText { font-size: (@font_size * 0.8); }
+.errorText { color: @field_required; }
+
+
+/* --- message box --- */
+.messageBox { font-family: Verdana, Arial, sans-serif; font-size: @font_size; padding:0;}
+.messageStack{ font-family: Verdana, Arial, sans-serif;}
+.messageStack li{padding:(@padding_base * 0.2);}
+.messageStackError,
+.messageStackWarning { background:@color_warning;}
+.messageStackSuccess { background:@color_success; }
+.messageStackInfo { background:@color_notice;}
+
+/* toogle item complet js action */
+h4.Ctrtirroir,
+h5.Ctrtirroir{ margin: 10px 0; padding: 0 0 0 (@padding_base * 2); font-size: (@font_size * 1.1); }
+.Ctrtirroir {
+ background:transparent url("../../../../../images/icons/icon_down.gif") left top no-repeat;
+ padding-left:20px;
+ height:@lineheight;
+}
+.Ctrtirroir.closed {background:transparent url("../../../../../images/icons/icon_arrow_right.gif") left top no-repeat; }
+fieldset ul.tirroir li { float: left; position: relative; width: 100%;}
+
+
+
+
+/* Section Notification */
+div#messageStack{
+ min-width:(@display_max_width * 0.75 ) ;
+ width:(@display_width * 0.75 ) ;
+ display:block;
+ position: fixed;
+ margin: 10px 1%;
+ right: 0;
+ top:0;
+ z-index:99;
+
+
+ p{
+ padding:0;
+ margin:0;
+ }
+
+ .item{
+ height: auto!important;
+ height: 25px;
+ min-height: 25px;
+ display:none;
+ padding: 0 0 0 30px;
+ margin: 2px 0 0 0;
+ font-size: 14px;
+ font-weight: bold;
+ line-height: 24px;
+
+ .rounded(5px);
+ .border-radius(5px,5px,5px,5px);
+
+
+ span.ButtonClose{
+ float:right;
+ display:inline-block;
+ min-width:25px;
+ height:25px;
+ margin:0 2px;
+ cursor : pointer;
+ background:transparent url("../../../../../images/check-off.png") center center no-repeat;
+ font-size:0;
+
+ &:hover{
+ opacity : 0.6;
+ }
+ }
+ }
+
+
+}
+
+
+
+
+
+
+
+
+body {
+ background:#faf9f7 ;
+ background-attachment:fixed;
+ font: normal @font_size Verdana, Arial, sans-serif;
+}
+
+
+/**
+ * Structure base html
+ * no specific forms (cf section forms )
+ */
+
+.configuration{
+ div#central{
+
+ div#ssmenu{
+ display: block;
+ height: ( @lineheight * 1.5);
+ line-height: ( @lineheight * 1.5);
+ padding: 5px 10px;
+ width: 100%;
+ }
+
+ div.box_right {
+ right:0;
+ width:39%;
+
+ ul{ list-style:none; }
+ }
+ }
+}
+
+// .page {
+ // div#central{
+ // }
+ // }
+
+ div#glob {
+ width:100%;
+ z-index:10;
+ height:100%;
+
+
+
+ div#central{
+ position:relative;
+ padding:10px 5px;
+ top:79px;
+ margin-bottom: 79px;
+// border-left: 1px solid black;
+// border-right: 1px solid black;
+// border-bottom: 1px solid black;
+ background:@color_011;
+
+ div.box_uniq {
+ width:100%;
+ float:left;
+ padding: 0;
+ background:none;
+ }
+
+ div.box_left { width:60%; float:left; }
+
+ div.box_right {
+ width:39%;
+ float:right;
+ }
+
+ h4{font-weight:bold; padding:15px 5px 8px; clear:both; }
+ }
+
+ }
+
+ div#center,
+ div#bas {
+ margin: 0 auto;
+ position: relative;
+ min-width:@display_max_width;
+ width:@display_width ;
+ }
+
+ div#bas {
+ // margin-top:8em;
+ clear:both;
+ height:25px;
+ background:@bas_bg;
+ color:@bas_bg_txt;
+
+ a,
+ a:link,
+ a:visited {
+ text-shadow : none;
+ padding: 4px 25px;
+ color:(@bas_bg_txt + #015);
+ }
+
+ }
+ footer {
+ background: @footer_bg;
+ clear:both;width:100%;
+ text-align:center;
+ color:@footer_bg_txt;
+
+ a,
+ a:link,
+ a:visited {
+ color: (@footer_bg_txt + #015);
+ text-decoration: none;
+
+ &:hover{
+ text-decoration: underline;
+ }
+ }
+ }
+
+
+
+
+ /**
+ * Bouton
+ */
+ .button,
+ select.button,
+ input[type=submit].button,
+ input[type=button].button,
+ button.button,
+ a.button{
+ display: inline-block;
+ font-family:Arial;
+ white-space:nowrap;
+ float:right;
+ color:@color_011;
+ vertical-align:middle;
+ border:1px solid #fff;
+ height: ( @lineheight * 1.6);
+ line-height: 25px;
+ margin:8px 20px;
+ text-shadow: none;
+
+ .rounded(5px);
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ }
+ input[type=image].button {
+ float:left;
+ height:( @lineheight * 1.3);
+ width:18px;
+ }
+
+ input.button,
+ button.button{font-size:@font_size; background:#ccc;padding:2px 5px; }
+
+
+ a.button{ padding:2px 5px; margin:10px 20px ;text-decoration:none; height:( @lineheight * 1.3) ; line-height:( @lineheight * 1.3);}
+ a.button:hover{color:@color_011;text-decoration:none; }
+
+ a.button,
+ select.button,
+ input.button,
+ button.button {
+ .gradient( @color_bouton_cl_1, @color_bouton_cl_2, @color_bouton_cl_3) ;
+ }
+
+ a.button.ActionYes,
+ input.button.ActionYes,
+ input[type=image].button.ActionYes,
+ input[type=submit].button.ActionYes,
+ button.button.ActionYes {
+ .gradient( @color_bouton_submit_cl_1, @color_bouton_submit_cl_2, @color_bouton_submit_cl_3) ;
+ }
+
+ a.button.ActionBack,
+ input[type=image].button.ActionBack,
+ button.button.ActionBack {
+ color:@color_011;
+ .gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_3, @color_bouton_back_cl_2) ;
+ }
+
+
+ input:hover.button,
+ button:hover.button{background:#797979;color:@color_011;}
+
+ a:hover.button,
+ input:hover.button,
+ button:hover.button {
+ .gradient( @color_bouton_cl_1, @color_bouton_cl_3, @color_bouton_cl_2) ;
+ opacity:0.6;
+ }
+
+ a:hover.button.ActionYes,
+ input:hover.button.ActionYes,
+ button:hover.button.ActionYes {
+ .gradient( @color_bouton_submit_cl_1, @color_bouton_submit_cl_3, @color_bouton_submit_cl_2) ;
+ color:black;
+ }
+
+ a.button.ActionBack,
+ input.button.ActionBack,
+ button.button.ActionBack {
+ color:@color_011;
+ .gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_2, @color_bouton_back_cl_3) ;
+ }
+
+ a:hover.button.ActionBack,
+ input:hover.button.ActionBack,
+ button:hover.button.ActionBack {
+ .gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_3, @color_bouton_back_cl_2) ;
+ }
+
+ input[type=image].button,
+ a.buttonimg img{ opacity:1;}
+
+ input[type=image]:hover.button ,
+ a:hover.buttonimg img,
+ a.buttonimg img:hover{ opacity:0.6;}
+
+ /* Spe buttons broswer img */
+ a.button.browser {height:24px;}
+ a.button img {vertical-align:middle;margin:0.3em 0.3em 0 0;}
+ .row_action a.button {margin:0;}
+
+
+ /* Block html content all bouton */
+ .button_nav{
+ clear:both;
+
+ form{
+ float:right;
+ width:100px;
+
+ p {margin:0;padding:0;}
+ }
+ }
+
+
+ /**
+ * Section for block widget in dashbord
+ */
+ .widget{
+ float: left;
+ margin: @margin ( @margin *0.5);
+ width: (100% - (@margin * 1) );
+ .rounded(5px);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ h3 {
+ color: @color_widget_title;
+ clear: both;
+ margin-bottom:@margin;
+ padding:5px 0 5px 5px;
+ .rounded(5px);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
+
+ a{
+ color: @color_widget_title;
+ text-decoration:none;
+
+ &:hover{
+ color: gray;
+ }
+ }
+ }
+
+ ol {padding-left:25px;}
+
+ .dataTableBase tr{
+ background-color: #F0F0F0;
+
+ th {
+ height: 20px;
+ line-height: 20px;
+ background : @color_widget_bg_th;
+ }
+
+ &:nth-child(odd) {
+ background-color: #D7D7D7;
+ }
+
+ a{
+ font-weight : bold;
+ color: @color_widget_bg_th;
+ }
+ }
+
+
+ /* sous menu en widget , specifique page conf et dashboard configuration */
+ div#ssmenu{
+ a {
+ background: none repeat scroll 0 0 #797979;
+ border-right: 1px solid #444444;
+ clear: both;
+ color: @color_011;
+ font-size: @font_size;
+ margin: 0 0 1px 25px;
+ padding: 5px 10px;
+ text-shadow: 0 1px 0 #000000;
+ width: 40%;
+
+ &:hover {
+ float:left;
+ margin:0;
+ background:#eee;
+ color:#000;
+ text-shadow: 0 1px 0 #fff;
+ }
+ }
+ }
+ }
+
+
+ .edit{
+ background:#eee;
+ background-attachment:none;
+ .border-radius(5px);
+ .rounded(5px);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ }
+
+
+
+
+ /**
+ * class qui rend element enfant visible au survol de l'element parent
+ */
+ .view.fils {display:none}
+ .view.fils.fleft {float:right;}
+ .view.fils.fright {float:left;}
+ .dataTableBase tr:hover .view.fils,
+ .dataTable tr:hover .view.fils,
+ .dataTableRow.Selected .view.fils,
+ .view.parent:hover .view.fils{display:block;height:13px}
+
+
+
+
+ /**
+ * Listing Filter for Datatable
+ */
+ div#central form#filters {
+ padding:0;
+ margin: 1em 0 ;
+ width:100%;
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ .border-radius( 5px, 5px, 5px, 5px);
+ .rounded(5px);
+
+ p.Ctrtirroir {
+ padding: 2px 10px 2px 20px;
+ font-size:(@font_size*1.2);
+ width:95.2%;
+ color: #000000;
+ font-weight: bold;
+
+ &:hover {
+ background-color: @bg_hover;
+ cursor:pointer;
+ }
+ }
+
+ div#filtre {
+ padding:0;
+ border:1px solid #AAAAAA;
+ background: transparent;
+
+ ul.ui-tabs-nav {
+ width:99.6%;
+
+ li{
+ line-height:1em;
+ width:auto;
+ }
+ }
+ }
+
+ fieldset label{width:auto;}
+
+ li.select{
+ color : @color_tab_text_selected ;
+ }
+ }
+
+
+
+ /**
+ * Forms
+ */
+
+ input.radioInput {width:30px;}
+
+ div#form_bt { width: 80%; margin: 1em 2em;}
+ ul.form_radio_inline{display:inline-block;}
+ .noselected{}
+ .selected{background:#f0d4bf;}
+ .color_type {display: inline-block; padding: 6px 0 6px 5px;background: none repeat scroll 0 0 transparent;}
+
+
+
+ div#central form#configuration p input[type="text"] { margin:5px 15px;width:60%; }
+
+ /* Select Categorie */
+ div#central #CurrentPathSelect *,
+ div#central #CurrentPathSelect form {
+ margin:@margin 0;
+ padding:0;
+ width:100%;
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ select#cPath {
+ margin:0;
+ font-size:(@font_size * 1.3);
+ color:black;
+ font-weight:bold;
+ padding:0.2em 0.6em;
+ height: (@lineheight * 1.8) ;
+
+ &:hover {background-color: @bg_hover;cursor:pointer; }
+
+ option {
+ margin:0;
+ background-color:#f5f5f5;
+ }
+ }
+ }
+
+
+ /**
+ * Section specific Orders page
+ */
+ .main-orders{
+ fieldset{
+ .border-radius(5px);
+ .rounded(5px);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ }
+
+ .box_uniq.block_form{
+ fieldset{
+ margin:1% 2%;
+ padding:0 1%;
+ }
+
+ .w_50 {
+ width:44%;
+ }
+ }
+
+ block_input{
+ br,
+ span.value_edit br{display:block;height:0;}
+ }
+
+ table.main-orders {
+ margin:1%;
+ width:98%;
+
+ thead tr th{
+ background:@color_013;
+ color:@color_011;
+ font-weight: normal;
+ text-shadow: none;
+ }
+
+ tr th{
+ margin:0;
+ background:#eee;
+ height:(@lineheight * 1.3);
+ line-height:(@lineheight * 0.5);
+ }
+ }
+
+ .block {
+ width: 46%;
+ margin:@margin (@margin / 2);
+ background:#c9c9c9;
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ }
+ }
+
+ /* Ajsutement customer page */
+ div#central .box_uniq.block_form.main-customers .block_input label{width:35%;}
+
+
+ /**
+ * External - plugin - others
+ */
+ div#fancybox-outer {
+ background:none;
+ border:none !important;
+
+ div#fancybox-content {
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
+ .border-radius(0,5px,5px,0);
+
+ h3{
+ color:@color_title_txt;
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
+ .border-radius(5px,0,0,5px);
+ }
+ }
+ }
+ /* popup form by fancy . complet independant external css file specific for fancy in /javascript/jquery.fancy */
+ div#fancybox-inner{
+ h3 {
+ color:@color_title_txt;
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
+ .border-radius(5px,0,0,5px);
+ }
+
+ form {
+ float:left;
+ position: relative;
+ top:20px;
+ padding: 0 0 30px;
+ margin:0 0 30px 0;
+
+ h3{ top: -25px;}
+
+ fieldset {
+ margin: 5px;
+ padding:5pxem;
+ border:none;
+
+ label { width: 100%; line-height: 18px; margin-right: 10px; display:inline-block; text-align: left; padding: 0 0 2px 0;}
+
+ select,
+ input[type="text"] { min-width:65%; display:inline-block;float:right;}
+
+ .button_nav {bottom: 0; position: absolute; right: 0 ; height:25px;}
+ }
+ }
+ }
+ // UI
+ /* Layout helpers */
+ .ui-dialog {
+ .ui-widget-header{
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
+ .border-radius(5px,0,0,5px);
+ }
+ .ui-dialog-content{
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
+ .border-radius(0,5px,5px,0);
+ }
+ }
+
+ .ui-helper-hidden { display: none; }
+ .ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+ .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: (@lineheight * 0.9); text-decoration: none; font-size: @font_size; list-style: none; }
+ .ui-helper-clearfix {
+ zoom: 1;
+
+ &:before,
+ &:after { content: ""; display: table; }
+ &:after { clear: both; }
+ }
+ .ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+ /* Interaction states */
+ .ui-state-default,
+ .ui-widget-content .ui-state-default,
+ .ui-widget-header .ui-state-default {
+ font-weight: normal;
+ color: @color_tab_text_default;
+ text-shadow : 0 1px 0 @color_tab_text_default_shadow;
+ border-bottom:2px solid @color_tabs_cl_1;
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
+
+ a,
+ a:link,
+ a:visited {
+ color: @color_tab_text_default;
+ text-decoration: none;
+ text-shadow : 0 1px 0 @color_tab_text_hover_shadow;
+ }
+ }
+
+ .ui-state-hover,
+ .ui-widget-content .ui-state-hover,
+ .ui-widget-header .ui-state-hover,
+ .ui-state-focus,
+ .ui-widget-content .ui-state-focus,
+ .ui-widget-header .ui-state-focus {
+ border-bottom:2px solid @color_tabs_cl_1;
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_3, @color_tabs_cl_2) ;
+ font-weight: normal;
+
+ a,
+ a:link,
+ a:visited {
+ color: @color_tab_text_hover;
+ text-decoration: none;
+ text-shadow : 0 1px 0 @color_tab_text_hover_shadow;
+ }
+ }
+
+ .ui-state-hover a,
+ .ui-state-hover a:hover {
+ color: @color_tab_text_selected;
+ text-decoration: none;
+
+ }
+
+ .ui-state-active,
+ .ui-widget-content .ui-state-active,
+ .ui-widget-header .ui-state-active {
+ border: 1px solid (@color_bg_gradient_base - 50);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
+ font-weight: normal;
+ color: @color_tab_text_selected;
+ border-bottom: 0 !important;
+
+ a,
+ a:link,
+ a:visited {
+ color: @color_tab_text_selected;
+ text-decoration: none;
+ }
+ }
+
+
+ .ui-widget :active { outline: none; }
+
+ // UI generic
+ .ui-widget {
+ font-family: Verdana,Arial,sans-serif;
+ font-size: (@font_size * 1.1);
+
+ .ui-widget { font-size: @font_size; }
+
+ }
+
+
+ .ui-widget-header {
+ border-radius: 0;
+ border-bottom: 1px solid #aaaaaa;
+ font-weight: bold;
+ }
+
+
+
+ // UI tabs
+ div#glob .ui-tabs {
+ position: relative;
+ padding: (@padding_base * 2);
+ zoom: 1;
+
+ .ui-tabs-nav {
+ display: inline-block;
+ margin: 0;
+ padding: 0;
+ width: 100%;
+
+ li {
+ list-style: none;
+ float: left;
+ position: relative;
+ top: 1px;
+ margin: 0 @padding_base 0 0;
+ padding: 0;
+ white-space: nowrap;
+ line-height : (@lineheight * 1.2);
+
+ a {
+ float: left;
+ padding: (@padding_base * 2) (@padding_base * 4);
+ text-decoration: none;
+ cursor: pointer;
+ font-size: (@font_size*1.3);
+ font-weight : bold;
+ }
+ }
+
+ .ui-tabs-selected {
+ margin-bottom: 0;
+ padding-bottom: 1px;
+ cursor: not-drop;
+ }
+ .ui-tabs-selected,
+ .ui-tabs-selected a,
+ .ui-state-disabled a,
+ .ui-state-processing a {
+ cursor: not-allowed !important;
+ text-shadow : 0 1px 0 @color_tab_text_selected_shadow;
+ }
+ }
+
+ .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; }
+
+ .ui-tabs-panel { display: block; border-width: 0; padding: (@padding_base * 0.1); background: none; }
+
+ .ui-tabs-hide { display: none !important; }
+
+ div.box_uniq { width:99%; }
+ }
+
+
+
+
+
+
+
+ // Toolips
+ .tooltip{
+ position:absolute;
+ z-index:999;
+ left:-9999px;
+ background-color:#dedede;
+ padding:5px;
+ border:1px solid #fff;
+ width:250px;
+
+ p{
+ margin:0;
+ padding:0;
+ color:#fff;
+ background-color:#222;
+ padding:(@padding_base * 0.1) (@padding_base * 0.5);
+ }
+ }
+
\ No newline at end of file
Added: trunk/catalog/admin/includes/template/oscss/css/less/header.less
===================================================================
--- trunk/catalog/admin/includes/template/oscss/css/less/header.less (rev 0)
+++ trunk/catalog/admin/includes/template/oscss/css/less/header.less 2013-06-22 15:21:45 UTC (rev 4751)
@@ -0,0 +1,219 @@
+/**
+ */
+
+header#header {
+ background:@header_base_bg;
+ min-width:@display_max_width;
+ width:@display_width ;
+ margin:0 0;
+ position:fixed;
+ z-index:10;
+
+ div#headInfos {
+ display:inline-block;
+ height:25px;
+ margin:0;
+ padding:0;
+ width:100%;
+ color:@color_011;
+ background:@header_info_bg;
+
+ h1 {display:inline; margin:0 2px; padding:0; line-height:25px;}
+ h2 {display:inline; line-height:25px; color:#FFFFFF; vertical-align:top;}
+
+ a,
+ span{padding-right:1em; color:@color_011; text-decoration:none; line-height:25px; vertical-align:top;float:right;}
+
+ a:hover{text-decoration:underline;}
+ }
+}
+
+/**
+ * Nav Bar , master menu
+ * */
+nav {
+ background:transparent ;
+ height:(@lineheight * 1.55);
+ border-top: 1px solid @nav_border;
+
+ a,
+ a:link,
+ a:visited {
+ color: @nav_master_link;
+ text-decoration: none;
+ text-shadow:none;
+ }
+
+ a {
+ display:inline-block;
+ text-decoration:none;
+ height:(@lineheight * 1.1);
+ text-align:center;
+ font:normal @font_size Verdana, Arial, sans-serif;
+ text-shadow: 0 1px 0 @nav_master_link_hover_shadow;
+
+ &:link,
+ &:visited {
+ color:@nav_master_link;
+ }
+
+ &:hover {
+ color:@nav_master_link_hover;
+ text-shadow: 0 1px 0 @nav_master_link_hover_shadow;
+ text-decoration:none;
+ }
+ }
+
+ .disabled{
+ display:none;
+
+ &:hover { display:none;}
+ }
+
+ .ssmenu a {
+ color: @submenu_link;
+ padding:(@padding_base * 0.2) 0 (@padding_base * 0.2) (@padding_base * 0.4);
+ text-decoration:none;
+ line-height:(@lineheight * 1.1);
+ border:none;
+ text-align:left;
+
+ &:hover {
+ background-color:@submenu_bg_hover;
+ color:@submenu_link_hover ;
+ text-shadow: 0 1px 0 @submenu_link_hover_shadow;
+ text-decoration:none;
+ width:88%;
+ }
+ }
+
+ ul{
+ list-style:none;
+
+ .ssmenu {
+ margin:0 1px 1px 0;
+ background:@submenu_bg;
+
+ .sub{
+ &:after{ content: " >>"; }
+ }
+ .ssmenu{
+ position:absolute;
+ top:-1px;
+ left:180px;
+ display:none;
+ z-index:15;
+
+ .sub{
+ &:after{ content: " >>"; }
+ }
+ }
+ }
+
+ li{
+ position:relative;
+ float:left;
+ padding: 0 5px;
+ height:(@lineheight * 1.55);
+
+ &:hover ul {
+ display:block;
+ }
+
+ ul{
+ position:absolute;
+ top:(@lineheight * 1.55);
+ left:0;
+ display:none;
+ z-index:10;
+
+ li{
+ float:none;
+ width:200px;
+ }
+ }
+ }
+
+ .ssmenu li:hover ul.ssmenu,
+ .ssmenu li ul.ssmenu li:hover ul.ssmenu{ display:block }
+
+ .ssmenu li ul.ssmenu,
+ .ssmenu li ul.ssmenu li ul.ssmenu{ display:none; }
+ }
+
+ ul.fleft{
+ .gradient( @color_menu_nav_cl_1, @color_menu_nav_cl_2 , @color_menu_nav_cl_3) ;
+
+ a{
+ padding-top:4px;
+ padding-left: 20px;
+ }
+ }
+
+ form{
+ margin:0;
+ padding:0;
+ }
+
+ /* Switcher */
+ p.themeSwitcher {
+ float:right;
+ margin:0;
+ padding:0 1em 0 0;
+ text-align:right;
+ color:@color_011;
+
+ select {
+ margin:2px;
+ padding:0;
+ vertical-align:middle;
+ width:100px;
+
+ option{
+ display:block;
+ color:@color_013;
+ font-size:(@font_size *0.9);
+ }
+ }
+ }
+
+
+}
+
+/* user bar */
+div#user {
+ background:@menu_user_bg ;
+ border-top: 1px solid @menu_user_border;
+ padding-right:10px;
+ height:25px;
+
+ ul#MenuExts{
+
+ li{
+ position:relative;
+ float:left;
+ background: none repeat-x scroll 0 0 @color_bg_menuexts;
+ height: 25px;
+ padding: 0 8px;
+ border-left:1px solid @menu_user_border;
+
+ a {
+ display:block;
+ padding-top:4px; color:#000;
+ text-decoration:none;
+ text-shadow:none;
+ height:( @lineheight * 1.3);
+ text-align:center;
+ color:@color_011;
+
+ &:hover{
+ color:gray;
+ }
+ }
+ }
+ }
+}
+
+
+
+/* Specifique menu */
Added: trunk/catalog/admin/includes/template/oscss/css/less/styles.less
===================================================================
--- trunk/catalog/admin/includes/template/oscss/css/less/styles.less (rev 0)
+++ trunk/catalog/admin/includes/template/oscss/css/less/styles.less 2013-06-22 15:21:45 UTC (rev 4751)
@@ -0,0 +1,1054 @@
+/**
+ * @ licence GPL *2005-2012 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 01/01/2012, 18:17
+ * @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ * @encode UTF-8
+ */
+
+/* Mixin */
+
+.wrap () {
+ text-wrap: wrap;
+ white-space: pre-wrap;
+ white-space: -moz-pre-wrap;
+ word-wrap: break-word;
+}
+
+/**
+ * Retro-compatibilte oscommerce oscss < 2.xx
+ */
+/* info box block droit */
+.infoBoxHeading {
+ background-color: #ffffff;
+ border-width:0;
+ .rounded(5px);
+}
+.infoBoxContent{
+ border-width: 0px 1px 0px 1px;
+ border-color: #E6E6E6;
+ border-style: solid;
+ padding: 2px 2px 5px 10px;
+ font-size: 10px;
+ color: #000;
+ background-color: #f1f1f1;
+ list-style:none;
+ line-height:1.7em;
+ .rounded(5px);
+}
+.infoBoxContent li{clear:both; }
+
+
+
+
+
+
+
+
+/**
+ * Generalite
+ */
+
+
+*{
+ margin:0;
+ padding:0;
+ text-shadow:none;
+ border:0;
+}
+a :link,
+a:visited {text-decoration: underline; color:#000;}
+a:hover { text-decoration: none; }
+img { border:0 ; margin:0; padding:0; }
+h1 { font-size:(@font_size * 1) ; padding:(@padding_base * 2); }
+h2 { font-size:(@font_size * 1.2) ;}
+h3 {
+ clear:both;
+ color: @title_h3_color;
+ font-size: (@font_size * 1.9);
+ font-weight: bold;
+ padding: @padding_base 0 @padding_base (@padding_base * 1.2);
+ text-shadow: 0 1px 1px @title_h3_color_shadow ;
+}
+h4 { font-size: @font_size ;text-shadow:0 1px 0 #fff;}
+h5 { font-size: @font_size ;text-shadow:0 1px 0 #fff;}
+p {padding:1em;}
+ul {list-style:none;}
+th {
+ margin:2px 1px;
+ text-align: left;
+ padding: 2px @padding_base;
+ height:@lineheight;
+ line-height:(@lineheight * 0.7);
+}
+
+
+
+
+/* general class */
+.error{ color:@field_required; }
+.alert{ color:#ae0405; }
+.fright{ float:right; }
+.fleft {float:left; }
+.tleft{text-align:left}
+.tright{text-align:right}
+.tcenter{text-align:center}
+.inline ,
+.inline *,
+div#central .inline *{ display:inline-block; }
+.nobr {white-space:nowrap;}
+
+.w_100 {width:99%;}
+.w_90 {width:89%;}
+.w_80 {width:79%;}
+.w_70 {width:69%;}
+.w_60 {width:59%;}
+.w_50 {width:49%;}
+.w_40 {width:39%;}
+.w_30 {width:29%;}
+.padd_w {padding-left:(@padding_base * 0.2); padding-right:(@padding_base * 0.2);}
+.padd_h {padding-top:(@padding_base * 0.2); padding-bottom:(@padding_base * 0.2);}
+.linkdoc {font-size:@font_size; font-weight:bold; }
+.clear ,
+.spacer,
+.separator{clear:both;}
+.fieldRequired { color: @field_required; }
+.smallText { font-size: (@font_size * 0.8); }
+.errorText { color: @field_required; }
+
+
...
[truncated message content] |
|
From: <os...@us...> - 2013-06-22 15:21:04
|
Revision: 4750
http://sourceforge.net/p/oscss/svn/4750
Author: oscim
Date: 2013-06-22 15:21:01 +0000 (Sat, 22 Jun 2013)
Log Message:
-----------
Add element missing
Added Paths:
-----------
trunk/catalog/admin/includes/javascript/dataTables.TableTools/as3/ZeroClipboard.as
trunk/catalog/admin/includes/javascript/dataTables.TableTools/as3/ZeroClipboardPdf.as
trunk/catalog/admin/includes/javascript/dataTables.TableTools/as3/lib/
trunk/catalog/admin/includes/javascript/dataTables.TableTools/css/TableTools.css
trunk/catalog/admin/includes/javascript/dataTables.TableTools/css/TableTools_JUI.css
trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/background.png
trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/collection.png
trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/collection_hover.png
trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/copy.png
trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/copy_hover.png
trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/csv.png
trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/csv_hover.png
trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/pdf.png
trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/pdf_hover.png
trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/print.png
trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/print_hover.png
trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/
trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/xls.png
trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/xls_hover.png
trunk/catalog/admin/includes/template/defaut/css/less/
trunk/catalog/admin/includes/template/defaut/languages/fr_FR.txt
trunk/catalog/admin/includes/template/oscss/css/less/
trunk/catalog/common/modules/core/email/history_internal.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/font/SourceSansPro-It.otf
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/as3/ZeroClipboard.as
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/as3/ZeroClipboard.as (rev 0)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/as3/ZeroClipboard.as 2013-06-22 15:21:01 UTC (rev 4750)
@@ -0,0 +1,221 @@
+/* Compile using: mxmlc --target-player=10.0.0 ZeroClipboard.as */
+package {
+ import flash.display.Stage;
+ import flash.display.Sprite;
+ import flash.display.LoaderInfo;
+ import flash.display.StageScaleMode;
+ import flash.events.*;
+ import flash.display.StageAlign;
+ import flash.display.StageScaleMode;
+ import flash.external.ExternalInterface;
+ import flash.system.Security;
+ import flash.utils.*;
+ import flash.system.System;
+ import flash.net.FileReference;
+ import flash.net.FileFilter;
+
+ public class ZeroClipboard extends Sprite {
+
+ private var domId:String = '';
+ private var button:Sprite;
+ private var clipText:String = 'blank';
+ private var fileName:String = '';
+ private var action:String = 'copy';
+ private var incBom:Boolean = true;
+ private var charSet:String = 'utf8';
+
+
+ public function ZeroClipboard() {
+ // constructor, setup event listeners and external interfaces
+ stage.scaleMode = StageScaleMode.EXACT_FIT;
+ flash.system.Security.allowDomain("*");
+
+ // import flashvars
+ var flashvars:Object = LoaderInfo( this.root.loaderInfo ).parameters;
+ domId = flashvars.id;
+
+ // invisible button covers entire stage
+ button = new Sprite();
+ button.buttonMode = true;
+ button.useHandCursor = true;
+ button.graphics.beginFill(0x00FF00);
+ button.graphics.drawRect(0, 0, stage.stageWidth, stage.stageHeight);
+ button.alpha = 0.0;
+ addChild(button);
+
+ button.addEventListener(MouseEvent.CLICK, clickHandler);
+ button.addEventListener(MouseEvent.MOUSE_OVER, function(event:Event):void {
+ ExternalInterface.call( 'ZeroClipboard_TableTools.dispatch', domId, 'mouseOver', null );
+ } );
+ button.addEventListener(MouseEvent.MOUSE_OUT, function(event:Event):void {
+ ExternalInterface.call( 'ZeroClipboard_TableTools.dispatch', domId, 'mouseOut', null );
+ } );
+ button.addEventListener(MouseEvent.MOUSE_DOWN, function(event:Event):void {
+ ExternalInterface.call( 'ZeroClipboard_TableTools.dispatch', domId, 'mouseDown', null );
+ } );
+ button.addEventListener(MouseEvent.MOUSE_UP, function(event:Event):void {
+ ExternalInterface.call( 'ZeroClipboard_TableTools.dispatch', domId, 'mouseUp', null );
+ } );
+
+ // External functions - readd whenever the stage is made active for IE
+ addCallbacks();
+ stage.addEventListener(Event.ACTIVATE, addCallbacks);
+
+ // signal to the browser that we are ready
+ ExternalInterface.call( 'ZeroClipboard_TableTools.dispatch', domId, 'load', null );
+ }
+
+ public function addCallbacks (evt:Event = null):void {
+ ExternalInterface.addCallback("setHandCursor", setHandCursor);
+ ExternalInterface.addCallback("clearText", clearText);
+ ExternalInterface.addCallback("setText", setText);
+ ExternalInterface.addCallback("appendText", appendText);
+ ExternalInterface.addCallback("setFileName", setFileName);
+ ExternalInterface.addCallback("setAction", setAction);
+ ExternalInterface.addCallback("setCharSet", setCharSet);
+ ExternalInterface.addCallback("setBomInc", setBomInc);
+ }
+
+
+ public function setCharSet(newCharSet:String):void {
+ if ( newCharSet == 'UTF16LE' ) {
+ charSet = newCharSet;
+ } else {
+ charSet = 'UTF8';
+ }
+ }
+
+ public function setBomInc(newBomInc:Boolean):void {
+ incBom = newBomInc;
+ }
+
+ public function clearText():void {
+ clipText = '';
+ }
+
+ public function appendText(newText:String):void {
+ clipText += newText;
+ }
+
+ public function setText(newText:String):void {
+ clipText = newText;
+ }
+
+ public function setFileName(newFileName:String):void {
+ fileName = newFileName;
+ }
+
+ public function setAction(newAction:String):void {
+ action = newAction;
+ }
+
+ public function setHandCursor(enabled:Boolean):void {
+ // control whether the hand cursor is shown on rollover (true)
+ // or the default arrow cursor (false)
+ button.useHandCursor = enabled;
+ }
+
+
+ private function clickHandler(event:Event):void {
+ var fileRef:FileReference = new FileReference();
+ fileRef.addEventListener(Event.COMPLETE, saveComplete);
+
+ if ( action == "save" ) {
+ /* Save as a file */
+ if ( charSet == 'UTF16LE' ) {
+ fileRef.save( strToUTF16LE(clipText), fileName );
+ } else {
+ fileRef.save( strToUTF8(clipText), fileName );
+ }
+ } else if ( action == "pdf" ) {
+ fileRef.save( "This instance of ZeroClipboard is not configured for PDF export. "+
+ "Please use the PDF export version.", fileName+".txt" );
+ } else {
+ /* Copy the text to the clipboard. Note charset and BOM have no effect here */
+ System.setClipboard( clipText );
+ ExternalInterface.call( 'ZeroClipboard_TableTools.dispatch', domId, 'complete', clipText );
+ }
+ }
+
+
+ private function saveComplete(event:Event):void {
+ ExternalInterface.call( 'ZeroClipboard_TableTools.dispatch', domId, 'complete', clipText );
+ }
+
+
+ private function getProp( prop:String, opts:Array ):String
+ {
+ var i:int, iLen:int;
+ for ( i=0, iLen=opts.length ; i<iLen ; i++ )
+ {
+ if ( opts[i].indexOf( prop+":" ) != -1 )
+ {
+ return opts[i].replace( prop+":", "" );
+ }
+ }
+ return "";
+ }
+
+
+ /*
+ * Function: strToUTF8
+ * Purpose: Convert a string to the output utf-8
+ * Returns: ByteArray
+ * Inputs: String
+ */
+ private function strToUTF8( str:String ):ByteArray {
+ var utf8:ByteArray = new ByteArray();
+
+ /* BOM first */
+ if ( incBom ) {
+ utf8.writeByte( 0xEF );
+ utf8.writeByte( 0xBB );
+ utf8.writeByte( 0xBF );
+ }
+ utf8.writeUTFBytes( str );
+
+ return utf8;
+ }
+
+
+ /*
+ * Function: strToUTF16LE
+ * Purpose: Convert a string to the output utf-16
+ * Returns: ByteArray
+ * Inputs: String
+ * Notes: The fact that this function is needed is a little annoying. Basically, strings in
+ * AS3 are UTF-16 (with surrogate pairs and everything), but characters which take up less
+ * than 8 bytes appear to be stored as only 8 bytes. This function effective adds the
+ * padding required, and the BOM
+ */
+ private function strToUTF16LE( str:String ):ByteArray {
+ var utf16:ByteArray = new ByteArray();
+ var iChar:uint;
+ var i:uint=0, iLen:uint = str.length;
+
+ /* BOM first */
+ if ( incBom ) {
+ utf16.writeByte( 0xFF );
+ utf16.writeByte( 0xFE );
+ }
+
+ while ( i < iLen ) {
+ iChar = str.charCodeAt(i);
+
+ if ( iChar < 0xFF ) {
+ /* one byte char */
+ utf16.writeByte( iChar );
+ utf16.writeByte( 0 );
+ } else {
+ /* two byte char */
+ utf16.writeByte( iChar & 0x00FF );
+ utf16.writeByte( iChar >> 8 );
+ }
+
+ i++;
+ }
+
+ return utf16;
+ }
+ }
+}
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/as3/ZeroClipboard.as
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/as3/ZeroClipboardPdf.as
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/as3/ZeroClipboardPdf.as (rev 0)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/as3/ZeroClipboardPdf.as 2013-06-22 15:21:01 UTC (rev 4750)
@@ -0,0 +1,310 @@
+/* Compile using: mxmlc --target-player=10.0.0 -static-link-runtime-shared-libraries=true -library-path+=lib ZeroClipboardPdf.as */
+package {
+ import flash.display.Stage;
+ import flash.display.Sprite;
+ import flash.display.LoaderInfo;
+ import flash.display.StageScaleMode;
+ import flash.events.*;
+ import flash.display.StageAlign;
+ import flash.display.StageScaleMode;
+ import flash.external.ExternalInterface;
+ import flash.system.Security;
+ import flash.utils.*;
+ import flash.system.System;
+ import flash.net.FileReference;
+ import flash.net.FileFilter;
+
+ /* PDF imports */
+ import org.alivepdf.pdf.PDF;
+ import org.alivepdf.data.Grid;
+ import org.alivepdf.data.GridColumn;
+ import org.alivepdf.layout.Orientation;
+ import org.alivepdf.layout.Size;
+ import org.alivepdf.layout.Unit;
+ import org.alivepdf.display.Display;
+ import org.alivepdf.saving.Method;
+ import org.alivepdf.fonts.FontFamily;
+ import org.alivepdf.fonts.Style;
+ import org.alivepdf.fonts.CoreFont;
+ import org.alivepdf.colors.RGBColor;
+
+ public class ZeroClipboard extends Sprite {
+
+ private var domId:String = '';
+ private var button:Sprite;
+ private var clipText:String = 'blank';
+ private var fileName:String = '';
+ private var action:String = 'copy';
+ private var incBom:Boolean = true;
+ private var charSet:String = 'utf8';
+
+
+ public function ZeroClipboard() {
+ // constructor, setup event listeners and external interfaces
+ stage.scaleMode = StageScaleMode.EXACT_FIT;
+ flash.system.Security.allowDomain("*");
+
+ // import flashvars
+ var flashvars:Object = LoaderInfo( this.root.loaderInfo ).parameters;
+ domId = flashvars.id;
+
+ // invisible button covers entire stage
+ button = new Sprite();
+ button.buttonMode = true;
+ button.useHandCursor = true;
+ button.graphics.beginFill(0x00FF00);
+ button.graphics.drawRect(0, 0, stage.stageWidth, stage.stageHeight);
+ button.alpha = 0.0;
+ addChild(button);
+
+ button.addEventListener(MouseEvent.CLICK, function(event:Event):void {
+ clickHandler(event);
+ } );
+ button.addEventListener(MouseEvent.MOUSE_OVER, function(event:Event):void {
+ ExternalInterface.call( 'ZeroClipboard_TableTools.dispatch', domId, 'mouseOver', null );
+ } );
+ button.addEventListener(MouseEvent.MOUSE_OUT, function(event:Event):void {
+ ExternalInterface.call( 'ZeroClipboard_TableTools.dispatch', domId, 'mouseOut', null );
+ } );
+ button.addEventListener(MouseEvent.MOUSE_DOWN, function(event:Event):void {
+ ExternalInterface.call( 'ZeroClipboard_TableTools.dispatch', domId, 'mouseDown', null );
+ } );
+ button.addEventListener(MouseEvent.MOUSE_UP, function(event:Event):void {
+ ExternalInterface.call( 'ZeroClipboard_TableTools.dispatch', domId, 'mouseUp', null );
+ } );
+
+ // External functions - readd whenever the stage is made active for IE
+ addCallbacks();
+ stage.addEventListener(Event.ACTIVATE, addCallbacks);
+
+ // signal to the browser that we are ready
+ ExternalInterface.call( 'ZeroClipboard_TableTools.dispatch', domId, 'load', null );
+ }
+
+ public function addCallbacks (evt:Event = null):void {
+ ExternalInterface.addCallback("setHandCursor", setHandCursor);
+ ExternalInterface.addCallback("clearText", clearText);
+ ExternalInterface.addCallback("setText", setText);
+ ExternalInterface.addCallback("appendText", appendText);
+ ExternalInterface.addCallback("setFileName", setFileName);
+ ExternalInterface.addCallback("setAction", setAction);
+ ExternalInterface.addCallback("setCharSet", setCharSet);
+ ExternalInterface.addCallback("setBomInc", setBomInc);
+ }
+
+
+ public function setCharSet(newCharSet:String):void {
+ if ( newCharSet == 'UTF16LE' ) {
+ charSet = newCharSet;
+ } else {
+ charSet = 'UTF8';
+ }
+ }
+
+ public function setBomInc(newBomInc:Boolean):void {
+ incBom = newBomInc;
+ }
+
+ public function clearText():void {
+ clipText = '';
+ }
+
+ public function appendText(newText:String):void {
+ clipText += newText;
+ }
+
+ public function setText(newText:String):void {
+ clipText = newText;
+ }
+
+ public function setFileName(newFileName:String):void {
+ fileName = newFileName;
+ }
+
+ public function setAction(newAction:String):void {
+ action = newAction;
+ }
+
+ public function setHandCursor(enabled:Boolean):void {
+ // control whether the hand cursor is shown on rollover (true)
+ // or the default arrow cursor (false)
+ button.useHandCursor = enabled;
+ }
+
+
+ private function clickHandler(event:Event):void {
+ var fileRef:FileReference = new FileReference();
+ fileRef.addEventListener(Event.COMPLETE, saveComplete);
+
+ if ( action == "save" ) {
+ /* Save as a file */
+ if ( charSet == 'UTF16LE' ) {
+ fileRef.save( strToUTF16LE(clipText), fileName );
+ } else {
+ fileRef.save( strToUTF8(clipText), fileName );
+ }
+ } else if ( action == "pdf" ) {
+ /* Save as a PDF */
+ var pdf:PDF = configPdf();
+ fileRef.save( pdf.save( Method.LOCAL ), fileName );
+ } else {
+ /* Copy the text to the clipboard. Note charset and BOM have no effect here */
+ System.setClipboard( clipText );
+ ExternalInterface.call( 'ZeroClipboard_TableTools.dispatch', domId, 'complete', clipText );
+ }
+ }
+
+
+ private function saveComplete(event:Event):void {
+ ExternalInterface.call( 'ZeroClipboard_TableTools.dispatch', domId, 'complete', clipText );
+ }
+
+
+ private function getProp( prop:String, opts:Array ):String
+ {
+ var i:int, iLen:int;
+ for ( i=0, iLen=opts.length ; i<iLen ; i++ )
+ {
+ if ( opts[i].indexOf( prop+":" ) != -1 )
+ {
+ return opts[i].replace( prop+":", "" );
+ }
+ }
+ return "";
+ }
+
+
+ private function configPdf():PDF
+ {
+ var
+ pdf:PDF,
+ i:int, iLen:int,
+ splitText:Array = clipText.split("--/TableToolsOpts--\n"),
+ opts:Array = splitText[0].split("\n"),
+ dataIn:Array = splitText[1].split("\n"),
+ aColRatio:Array = getProp( 'colWidth', opts ).split('\t'),
+ title:String = getProp( 'title', opts ),
+ message:String = getProp( 'message', opts ),
+ orientation:String = getProp( 'orientation', opts ),
+ size:String = getProp( 'size', opts ),
+ iPageWidth:int = 0,
+ dataOut:Array = [],
+ columns:Array = [],
+ headers:Array,
+ y:int = 0;
+
+ /* Create the PDF */
+ pdf = new PDF( Orientation[orientation.toUpperCase()], Unit.MM, Size[size.toUpperCase()] );
+ pdf.setDisplayMode( Display.FULL_WIDTH );
+ pdf.addPage();
+ iPageWidth = pdf.getCurrentPage().w-20;
+ pdf.textStyle( new RGBColor(0), 1 );
+
+ /* Add the title / message if there is one */
+ pdf.setFont( new CoreFont(FontFamily.HELVETICA), 14 );
+ if ( title != "" )
+ {
+ pdf.writeText(11, title+"\n");
+ }
+
+ pdf.setFont( new CoreFont(FontFamily.HELVETICA), 11 );
+ if ( message != "" )
+ {
+ pdf.writeText(11, message+"\n");
+ }
+
+ /* Data setup. Split up the headers, and then construct the columns */
+ for ( i=0, iLen=dataIn.length ; i<iLen ; i++ )
+ {
+ if ( dataIn[i] != "" )
+ {
+ dataOut.push( dataIn[i].split("\t") );
+ }
+ }
+ headers = dataOut.shift();
+
+ for ( i=0, iLen=headers.length ; i<iLen ; i++ )
+ {
+ columns.push( new GridColumn( " \n"+headers[i]+"\n ", i.toString(), aColRatio[i]*iPageWidth, 'C' ) );
+ }
+
+ var grid:Grid = new Grid(
+ dataOut, /* 1. data */
+ iPageWidth, /* 2. width */
+ 100, /* 3. height */
+ new RGBColor (0xE0E0E0), /* 4. headerColor */
+ new RGBColor (0xFFFFFF), /* 5. backgroundColor */
+ true, /* 6. alternateRowColor */
+ new RGBColor ( 0x0 ), /* 7. borderColor */
+ .1, /* 8. border alpha */
+ null, /* 9. joins */
+ columns /* 10. columns */
+ );
+
+ pdf.addGrid( grid, 0, y );
+ return pdf;
+ }
+
+
+ /*
+ * Function: strToUTF8
+ * Purpose: Convert a string to the output utf-8
+ * Returns: ByteArray
+ * Inputs: String
+ */
+ private function strToUTF8( str:String ):ByteArray {
+ var utf8:ByteArray = new ByteArray();
+
+ /* BOM first */
+ if ( incBom ) {
+ utf8.writeByte( 0xEF );
+ utf8.writeByte( 0xBB );
+ utf8.writeByte( 0xBF );
+ }
+ utf8.writeUTFBytes( str );
+
+ return utf8;
+ }
+
+
+ /*
+ * Function: strToUTF16LE
+ * Purpose: Convert a string to the output utf-16
+ * Returns: ByteArray
+ * Inputs: String
+ * Notes: The fact that this function is needed is a little annoying. Basically, strings in
+ * AS3 are UTF-16 (with surrogate pairs and everything), but characters which take up less
+ * than 8 bytes appear to be stored as only 8 bytes. This function effective adds the
+ * padding required, and the BOM
+ */
+ private function strToUTF16LE( str:String ):ByteArray {
+ var utf16:ByteArray = new ByteArray();
+ var iChar:uint;
+ var i:uint=0, iLen:uint = str.length;
+
+ /* BOM first */
+ if ( incBom ) {
+ utf16.writeByte( 0xFF );
+ utf16.writeByte( 0xFE );
+ }
+
+ while ( i < iLen ) {
+ iChar = str.charCodeAt(i);
+
+ if ( iChar < 0xFF ) {
+ /* one byte char */
+ utf16.writeByte( iChar );
+ utf16.writeByte( 0 );
+ } else {
+ /* two byte char */
+ utf16.writeByte( iChar & 0x00FF );
+ utf16.writeByte( iChar >> 8 );
+ }
+
+ i++;
+ }
+
+ return utf16;
+ }
+ }
+}
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/as3/ZeroClipboardPdf.as
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/css/TableTools.css
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/css/TableTools.css (rev 0)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/css/TableTools.css 2013-06-22 15:21:01 UTC (rev 4750)
@@ -0,0 +1,321 @@
+/*
+ * File: TableTools.css
+ * Description: Styles for TableTools 2
+ * Author: Allan Jardine (www.sprymedia.co.uk)
+ * Language: Javascript
+ * License: GPL v2 / 3 point BSD
+ * Project: DataTables
+ *
+ * Copyright 2009-2012 Allan Jardine, all rights reserved.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * CSS name space:
+ * DTTT DataTables TableTools
+ *
+ * Style sheet provides:
+ * CONTAINER TableTools container element and styles applying to all components
+ * BUTTON_STYLES Action specific button styles
+ * SELECTING Row selection styles
+ * COLLECTIONS Drop down list (collection) styles
+ * PRINTING Print display styles
+ */
+
+
+/*
+ * CONTAINER
+ * TableTools container element and styles applying to all components
+ */
+div.DTTT_container {
+ position: relative;
+ float: right;
+ margin-bottom: 1em;
+}
+
+button.DTTT_button,
+div.DTTT_button,
+a.DTTT_button {
+ position: relative;
+ float: left;
+ margin-right: 3px;
+ padding: 5px 8px;
+ border: 1px solid #999;
+ cursor: pointer;
+ *cursor: hand;
+ font-size: 0.88em;
+ color: black !important;
+
+ -webkit-border-radius: 2px;
+ -moz-border-radius: 2px;
+ -ms-border-radius: 2px;
+ -o-border-radius: 2px;
+ border-radius: 2px;
+
+ -webkit-box-shadow: 1px 1px 3px #ccc;
+ -moz-box-shadow: 1px 1px 3px #ccc;
+ -ms-box-shadow: 1px 1px 3px #ccc;
+ -o-box-shadow: 1px 1px 3px #ccc;
+ box-shadow: 1px 1px 3px #ccc;
+
+ /* Generated by http://www.colorzilla.com/gradient-editor/ */
+ background: #ffffff; /* Old browsers */
+ background: -webkit-linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* Chrome10+,Safari5.1+ */
+ background: -moz-linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* FF3.6+ */
+ background: -ms-linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* IE10+ */
+ background: -o-linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* Opera 11.10+ */
+ background: linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* W3C */
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f9f9f9',GradientType=0 ); /* IE6-9 */
+}
+
+
+/* Buttons are cunning border-box sizing - we can't just use that for A and DIV due to IE6/7 */
+button.DTTT_button {
+ height: 30px;
+ padding: 3px 8px;
+}
+
+.DTTT_button embed {
+ outline: none;
+}
+
+button.DTTT_button:hover,
+div.DTTT_button:hover,
+a.DTTT_button:hover {
+ border: 1px solid #666;
+ text-decoration: none !important;
+
+ -webkit-box-shadow: 1px 1px 3px #999;
+ -moz-box-shadow: 1px 1px 3px #999;
+ -ms-box-shadow: 1px 1px 3px #999;
+ -o-box-shadow: 1px 1px 3px #999;
+ box-shadow: 1px 1px 3px #999;
+
+ background: #f3f3f3; /* Old browsers */
+ background: -webkit-linear-gradient(top, #f3f3f3 0%,#e2e2e2 89%,#f4f4f4 100%); /* Chrome10+,Safari5.1+ */
+ background: -moz-linear-gradient(top, #f3f3f3 0%,#e2e2e2 89%,#f4f4f4 100%); /* FF3.6+ */
+ background: -ms-linear-gradient(top, #f3f3f3 0%,#e2e2e2 89%,#f4f4f4 100%); /* IE10+ */
+ background: -o-linear-gradient(top, #f3f3f3 0%,#e2e2e2 89%,#f4f4f4 100%); /* Opera 11.10+ */
+ background: linear-gradient(top, #f3f3f3 0%,#e2e2e2 89%,#f4f4f4 100%); /* W3C */
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f3f3f3', endColorstr='#f4f4f4',GradientType=0 ); /* IE6-9 */
+}
+
+button.DTTT_disabled,
+div.DTTT_disabled,
+a.DTTT_disabled {
+ color: #999;
+ border: 1px solid #d0d0d0;
+
+ background: #ffffff; /* Old browsers */
+ background: -webkit-linear-gradient(top, #ffffff 0%,#f9f9f9 89%,#fafafa 100%); /* Chrome10+,Safari5.1+ */
+ background: -moz-linear-gradient(top, #ffffff 0%,#f9f9f9 89%,#fafafa 100%); /* FF3.6+ */
+ background: -ms-linear-gradient(top, #ffffff 0%,#f9f9f9 89%,#fafafa 100%); /* IE10+ */
+ background: -o-linear-gradient(top, #ffffff 0%,#f9f9f9 89%,#fafafa 100%); /* Opera 11.10+ */
+ background: linear-gradient(top, #ffffff 0%,#f9f9f9 89%,#fafafa 100%); /* W3C */
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#fafafa',GradientType=0 ); /* IE6-9 */
+}
+
+
+
+/*
+ * BUTTON_STYLES
+ * Action specific button styles
+ * If you want images - comment this back in
+
+button.DTTT_button_csv,
+button.DTTT_button_xls,
+button.DTTT_button_copy,
+button.DTTT_button_pdf,
+button.DTTT_button_print {
+ padding-right: 0px;
+}
+
+button.DTTT_button_csv span,
+button.DTTT_button_xls span,
+button.DTTT_button_copy span,
+button.DTTT_button_pdf span,
+button.DTTT_button_print span {
+ display: inline-block;
+ height: 24px;
+ line-height: 24px;
+ padding-right: 30px;
+}
+
+
+button.DTTT_button_csv span { background: url(../images/csv.png) no-repeat bottom right; }
+button.DTTT_button_csv:hover span { background: url(../images/csv_hover.png) no-repeat center right; }
+
+button.DTTT_button_xls span { background: url(../images/xls.png) no-repeat center right; }
+button.DTTT_button_xls:hover span { background: #f0f0f0 url(../images/xls_hover.png) no-repeat center right; }
+
+button.DTTT_button_copy span { background: url(../images/copy.png) no-repeat center right; }
+button.DTTT_button_copy:hover span { background: #f0f0f0 url(../images/copy_hover.png) no-repeat center right; }
+
+button.DTTT_button_pdf span { background: url(../images/pdf.png) no-repeat center right; }
+button.DTTT_button_pdf:hover span { background: #f0f0f0 url(../images/pdf_hover.png) no-repeat center right; }
+
+button.DTTT_button_print span { background: url(../images/print.png) no-repeat center right; }
+button.DTTT_button_print:hover span { background: #f0f0f0 url(../images/print_hover.png) no-repeat center right; }
+
+ */
+
+button.DTTT_button_collection span {
+ padding-right: 17px;
+ background: url(../images/collection.png) no-repeat center right;
+}
+
+button.DTTT_button_collection:hover span {
+ padding-right: 17px;
+ background: #f0f0f0 url(../images/collection_hover.png) no-repeat center right;
+}
+
+
+/*
+ * SELECTING
+ * Row selection styles
+ */
+table.DTTT_selectable tbody tr {
+ cursor: pointer;
+ *cursor: hand;
+}
+
+table.dataTable tr.DTTT_selected.odd {
+ background-color: #9FAFD1;
+}
+
+table.dataTable tr.DTTT_selected.odd td.sorting_1 {
+ background-color: #9FAFD1;
+}
+
+table.dataTable tr.DTTT_selected.odd td.sorting_2 {
+ background-color: #9FAFD1;
+}
+
+table.dataTable tr.DTTT_selected.odd td.sorting_3 {
+ background-color: #9FAFD1;
+}
+
+
+table.dataTable tr.DTTT_selected.even {
+ background-color: #B0BED9;
+}
+
+table.dataTable tr.DTTT_selected.even td.sorting_1 {
+ background-color: #B0BED9;
+}
+
+table.dataTable tr.DTTT_selected.even td.sorting_2 {
+ background-color: #B0BED9;
+}
+
+table.dataTable tr.DTTT_selected.even td.sorting_3 {
+ background-color: #B0BED9;
+}
+
+
+/*
+ * COLLECTIONS
+ * Drop down list (collection) styles
+ */
+
+div.DTTT_collection {
+ width: 150px;
+ padding: 8px 8px 4px 8px;
+ border: 1px solid #ccc;
+ border: 1px solid rgba( 0, 0, 0, 0.4 );
+ background-color: #f3f3f3;
+ background-color: rgba( 255, 255, 255, 0.3 );
+ overflow: hidden;
+ z-index: 2002;
+
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ -ms-border-radius: 5px;
+ -o-border-radius: 5px;
+ border-radius: 5px;
+
+ -webkit-box-shadow: 3px 3px 5px rgba(0, 0, 0, 0.3);
+ -moz-box-shadow: 3px 3px 5px rgba(0, 0, 0, 0.3);
+ -ms-box-shadow: 3px 3px 5px rgba(0, 0, 0, 0.3);
+ -o-box-shadow: 3px 3px 5px rgba(0, 0, 0, 0.3);
+ box-shadow: 3px 3px 5px rgba(0, 0, 0, 0.3);
+}
+
+div.DTTT_collection_background {
+ background: transparent url(../images/background.png) repeat top left;
+ z-index: 2001;
+}
+
+div.DTTT_collection button.DTTT_button,
+div.DTTT_collection div.DTTT_button,
+div.DTTT_collection a.DTTT_button {
+ position: relative;
+ left: 0;
+ right: 0;
+
+ display: block;
+ float: none;
+ margin-bottom: 4px;
+
+ -webkit-box-shadow: 1px 1px 3px #999;
+ -moz-box-shadow: 1px 1px 3px #999;
+ -ms-box-shadow: 1px 1px 3px #999;
+ -o-box-shadow: 1px 1px 3px #999;
+ box-shadow: 1px 1px 3px #999;
+}
+
+
+/*
+ * PRINTING
+ * Print display styles
+ */
+
+.DTTT_print_info {
+ position: fixed;
+ top: 50%;
+ left: 50%;
+ width: 400px;
+ height: 150px;
+ margin-left: -200px;
+ margin-top: -75px;
+ text-align: center;
+ color: #333;
+ padding: 10px 30px;
+
+ background: #ffffff; /* Old browsers */
+ background: -webkit-linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* Chrome10+,Safari5.1+ */
+ background: -moz-linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* FF3.6+ */
+ background: -ms-linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* IE10+ */
+ background: -o-linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* Opera 11.10+ */
+ background: linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* W3C */
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f9f9f9',GradientType=0 ); /* IE6-9 */
+
+ opacity: 0.95;
+
+ border: 1px solid black;
+ border: 1px solid rgba(0, 0, 0, 0.5);
+
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ -ms-border-radius: 6px;
+ -o-border-radius: 6px;
+ border-radius: 6px;
+
+ -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.5);
+ -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.5);
+ -ms-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.5);
+ -o-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.5);
+ box-shadow: 0 3px 7px rgba(0, 0, 0, 0.5);
+}
+
+.DTTT_print_info h6 {
+ font-weight: normal;
+ font-size: 28px;
+ line-height: 28px;
+ margin: 1em;
+}
+
+.DTTT_print_info p {
+ font-size: 14px;
+ line-height: 20px;
+}
+
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/css/TableTools.css
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/css/TableTools_JUI.css
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/css/TableTools_JUI.css (rev 0)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/css/TableTools_JUI.css 2013-06-22 15:21:01 UTC (rev 4750)
@@ -0,0 +1,185 @@
+/*
+ * File: TableTools.css
+ * Description: Styles for TableTools 2 with JUI theming
+ * Author: Allan Jardine (www.sprymedia.co.uk)
+ * Language: Javascript
+ * License: LGPL / 3 point BSD
+ * Project: DataTables
+ *
+ * Copyright 2010 Allan Jardine, all rights reserved.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Notes:
+ * Generally speaking, please refer to the TableTools.css file - this file contains basic
+ * modifications to that 'master' stylesheet for ThemeRoller.
+ *
+ * CSS name space:
+ * DTTT DataTables TableTools
+ *
+ * Colour dictionary:
+ * Button border #d0d0d0
+ * Button border hover #999999
+ * Hover background #f0f0f0
+ * Action blue #4b66d9
+ *
+ * Style sheet provides:
+ * CONTAINER TableTools container element and styles applying to all components
+ * SELECTING Row selection styles
+ * COLLECTIONS Drop down list (collection) styles
+ * PRINTING Print display styles
+ * MISC Minor misc styles
+ */
+
+
+/*
+ * CONTAINER
+ * TableTools container element and styles applying to all components
+ */
+div.DTTT_container {
+ position: relative;
+ float: left;
+}
+
+.DTTT_button {
+ position: relative;
+ float: left;
+ margin-right: 3px;
+ padding: 3px 10px;
+ border: 1px solid #d0d0d0;
+ background-color: #fff;
+ color: #333 !important;
+ cursor: pointer;
+ *cursor: hand;
+}
+
+.DTTT_button::-moz-focus-inner {
+ border: none !important;
+ padding: 0;
+}
+
+
+
+/*
+ * SELECTING
+ * Row selection styles
+ */
+table.DTTT_selectable tbody tr {
+ cursor: pointer;
+ *cursor: hand;
+}
+
+table.dataTable tr.DTTT_selected.odd {
+ background-color: #9FAFD1;
+}
+
+table.dataTable tr.DTTT_selected.odd td.sorting_1 {
+ background-color: #9FAFD1;
+}
+
+table.dataTable tr.DTTT_selected.odd td.sorting_2 {
+ background-color: #9FAFD1;
+}
+
+table.dataTable tr.DTTT_selected.odd td.sorting_3 {
+ background-color: #9FAFD1;
+}
+
+
+table.dataTable tr.DTTT_selected.even {
+ background-color: #B0BED9;
+}
+
+table.dataTable tr.DTTT_selected.even td.sorting_1 {
+ background-color: #B0BED9;
+}
+
+table.dataTable tr.DTTT_selected.even td.sorting_2 {
+ background-color: #B0BED9;
+}
+
+table.dataTable tr.DTTT_selected.even td.sorting_3 {
+ background-color: #B0BED9;
+}
+
+
+/*
+ * COLLECTIONS
+ * Drop down list (collection) styles
+ */
+
+div.DTTT_collection {
+ width: 150px;
+ background-color: #f3f3f3;
+ overflow: hidden;
+ z-index: 2002;
+
+ box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+ -moz-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+ -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+}
+
+div.DTTT_collection_background {
+ background: url(../images/background.png) repeat top left;
+ z-index: 2001;
+}
+
+div.DTTT_collection button.DTTT_button,
+div.DTTT_collection div.DTTT_button,
+div.DTTT_collection a.DTTT_button {
+ float: none;
+ width: 100%;
+ margin-bottom: -0.1em;
+}
+
+
+/*
+ * PRINTING
+ * Print display styles
+ */
+
+.DTTT_print_info {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ width: 400px;
+ height: 150px;
+ margin-left: -200px;
+ margin-top: -75px;
+ text-align: center;
+ background-color: #3f3f3f;
+ color: white;
+ padding: 10px 30px;
+
+ opacity: 0.9;
+
+ border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+
+ box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+ -moz-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+ -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+}
+
+.DTTT_print_info h6 {
+ font-weight: normal;
+ font-size: 28px;
+ line-height: 28px;
+ margin: 1em;
+}
+
+.DTTT_print_info p {
+ font-size: 14px;
+ line-height: 20px;
+}
+
+
+/*
+ * MISC
+ * Minor misc styles
+ */
+
+.DTTT_disabled {
+ color: #999;
+}
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/css/TableTools_JUI.css
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/background.png
===================================================================
(Binary files differ)
Index: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/background.png
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/background.png 2013-06-22 15:20:23 UTC (rev 4749)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/background.png 2013-06-22 15:21:01 UTC (rev 4750)
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/background.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/collection.png
===================================================================
(Binary files differ)
Index: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/collection.png
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/collection.png 2013-06-22 15:20:23 UTC (rev 4749)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/collection.png 2013-06-22 15:21:01 UTC (rev 4750)
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/collection.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/collection_hover.png
===================================================================
(Binary files differ)
Index: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/collection_hover.png
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/collection_hover.png 2013-06-22 15:20:23 UTC (rev 4749)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/collection_hover.png 2013-06-22 15:21:01 UTC (rev 4750)
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/collection_hover.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/copy.png
===================================================================
(Binary files differ)
Index: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/copy.png
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/copy.png 2013-06-22 15:20:23 UTC (rev 4749)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/copy.png 2013-06-22 15:21:01 UTC (rev 4750)
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/copy.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/copy_hover.png
===================================================================
(Binary files differ)
Index: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/copy_hover.png
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/copy_hover.png 2013-06-22 15:20:23 UTC (rev 4749)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/copy_hover.png 2013-06-22 15:21:01 UTC (rev 4750)
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/copy_hover.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/csv.png
===================================================================
(Binary files differ)
Index: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/csv.png
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/csv.png 2013-06-22 15:20:23 UTC (rev 4749)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/csv.png 2013-06-22 15:21:01 UTC (rev 4750)
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/csv.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/csv_hover.png
===================================================================
(Binary files differ)
Index: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/csv_hover.png
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/csv_hover.png 2013-06-22 15:20:23 UTC (rev 4749)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/csv_hover.png 2013-06-22 15:21:01 UTC (rev 4750)
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/csv_hover.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/pdf.png
===================================================================
(Binary files differ)
Index: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/pdf.png
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/pdf.png 2013-06-22 15:20:23 UTC (rev 4749)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/pdf.png 2013-06-22 15:21:01 UTC (rev 4750)
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/pdf.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/pdf_hover.png
===================================================================
(Binary files differ)
Index: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/pdf_hover.png
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/pdf_hover.png 2013-06-22 15:20:23 UTC (rev 4749)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/pdf_hover.png 2013-06-22 15:21:01 UTC (rev 4750)
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/pdf_hover.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/print.png
===================================================================
(Binary files differ)
Index: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/print.png
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/print.png 2013-06-22 15:20:23 UTC (rev 4749)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/print.png 2013-06-22 15:21:01 UTC (rev 4750)
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/print.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/print_hover.png
===================================================================
(Binary files differ)
Index: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/print_hover.png
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/print_hover.png 2013-06-22 15:20:23 UTC (rev 4749)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/print_hover.png 2013-06-22 15:21:01 UTC (rev 4750)
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/print_hover.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/xls.png
===================================================================
(Binary files differ)
Index: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/xls.png
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/xls.png 2013-06-22 15:20:23 UTC (rev 4749)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/xls.png 2013-06-22 15:21:01 UTC (rev 4750)
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/xls.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/xls_hover.png
===================================================================
(Binary files differ)
Index: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/xls_hover.png
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/xls_hover.png 2013-06-22 15:20:23 UTC (rev 4749)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/xls_hover.png 2013-06-22 15:21:01 UTC (rev 4750)
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/xls_hover.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/catalog/admin/includes/template/defaut/languages/fr_FR.txt
===================================================================
--- trunk/catalog/admin/includes/template/defaut/languages/fr_FR.txt (rev 0)
+++ trunk/catalog/admin/includes/template/defaut/languages/fr_FR.txt 2013-06-22 15:21:01 UTC (rev 4750)
@@ -0,0 +1,21 @@
+<?php
+/**
+ @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 19/12/10, 17:50
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+/* Block admin */
+$lang['quicksearch products']='Produits';
+$lang['quicksearch categories']='Categories';
+$lang['quicksearch customers']='Customers';
+$lang['quicksearch orders']='Commande';
+$lang['recently viewed']='Récement vu';
+
+/* dbl menu */
+$lang['Admin menu']='Administration';
+$lang['Buyer menu']='Gestion';
+?>
\ No newline at end of file
Added: trunk/catalog/common/modules/core/email/history_internal.php
===================================================================
--- trunk/catalog/common/modules/core/email/history_internal.php (rev 0)
+++ trunk/catalog/common/modules/core/email/history_internal.php 2013-06-22 15:21:01 UTC (rev 4750)
@@ -0,0 +1,143 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @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 01/01/2013, 16:16
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class HistoryMail
+ @brief Thsi class stock and manipule email file saved on local Document dir
+*/
+
+Class internal
+ {
+
+ /**
+ @var name dir in Document dir used by class DatasFiles
+ */
+ private static $typedir = 'email';
+
+
+
+ public function __construct(){
+
+ }
+
+
+
+ /**
+ @param $cid int customers id
+ @param $subject string text subject
+ @param $cid int customers id
+
+ */
+ public static function AddMail($cid, $subject, $to, $toadd, $from, $fromadd , $content){
+
+ /// init DatasFiles for creat all base dir
+ $DF = new DatasFiles;
+
+ // obtain path for current user (based on id user)
+ $file=$DF->GetDoc(self::$typedir ,$cid);
+
+
+ // name file
+ // MAIL-yyyymmdd.hhiiss.(I|U).base64 subject
+ $mailfilename = $file.'.'.'I'.'.'.self::base64_url_encode($subject);
+// var_dump($cid, $subject, $to, $toadd, $from, $fromadd , $content);
+ // create fiel mail
+ $res = file_put_contents($mailfilename, "From: ".$to." <".$toadd.">
+ To: ".$from ." <".$fromadd.">
+ Subject: =?UTF-8?Q?".utf8_decode($subject)."?=
+ Date: ".date(DATE_RFC822)."\r\n".
+ "Message-ID: <".md5($content)."@".str_replace(' ','-',STORE_NAME).">
+ User-Agent: osCSS-2
+ MIME-Version: 1.0
+ Content-Type: text/plain; charset=\"UTF-8\" \r\n
+ ".$content."\r\n"."\r\n");
+// var_dump($mailfilename);
+ return $res;
+ }
+
+ /**
+ @param $cid int customers id
+ @return array( obj, obj , ...)
+ */
+ public function ListUserMail($cid){
+ $result = array();
+
+ // appels des emails
+ $DF = new DatasFiles;
+
+ $file=$DF->GetDoc(self::$typedir,$cid);
+
+ foreach(scan(dirname($file)) as $row){
+
+ if(preg_match('#MAIL-([0-9]{8}).([0-9]{6}).([A-Z]{1}).([a-z0-9]{4,})#i', $row, $match)) {
+
+
+ $date = preg_replace('#([0-9]{4})([0-9]{2})([0-9]{2}).([0-9]{2})([0-9]{2})([0-9]{2})#', '$1-$2-$3 $4:$5:$6', $match[1].'.'.$match[2]);
+
+ $subject = self::base64_url_decode($match[4]);
+
+ $n = new stdClass();
+ $n->originaldate = $date;
+ $n->date = tep_datetime_short($date);
+ $n->type = 'email';
+ $n->sens = $match[3];
+ $n->title = $subject;
+ $n->linkdoc = ' <a class="linkdoc" href="'.tep_href_link(FILENAME_MAIL, 'action=view&cID='.$cid.'&ID='.urlencode($row)).'">'.$subject.'</a> ';
+
+
+ $result[strtotime($date)]=$n;
+ }
+ }
+
+ krsort($result);
+ return $result;
+ }
+
+
+ /**
+ @param $cid int customers id
+ */
+ public static function ViewMail($cid, $uid){
+
+ $DF = new DatasFiles;
+ $file=$DF->GetDoc(self::$typedir,$cid);
+
+ $mInfo = new stdClass();
+ $mInfo->pathfile = dirname($file).'/'.urldecode($uid);
+
+
+ $tmp = file_get_contents($mInfo->pathfile );
+
+ $tmp2=explode('Content-Type: text/plain; charset="UTF-8"', $tmp );
+
+ foreach(explode("\n",$tmp2[0]) as $row){
+ if(preg_match('#.*From:.*([a-z0-9@_.-]*).*<([a-z0-9@_.-]*)>#', $row, $match))
+ $mInfo->from = $match[2];
+ if(preg_match('#.*Subject:(.*)#', $row, $match))
+ $mInfo->subject = $match[1];
+// var_dump( $row);
+ }
+ $mInfo->content = $tmp2[1];
+
+
+ return $mInfo;
+ }
+
+
+
+ private static function base64_url_encode($input) {
+ return strtr(base64_encode($input), '+/=', '-_,');
+ }
+
+ private static function base64_url_decode($input) {
+ return base64_decode(strtr($input, '-_,', '+/='));
+ }
+}
+
+
+?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/font/SourceSansPro-It.otf
===================================================================
(Binary files differ)
Index: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/font/SourceSansPro-It.otf
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/font/SourceSansPro-It.otf 2013-06-22 15:20:23 UTC (rev 4749)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/font/SourceSansPro-It.otf 2013-06-22 15:21:01 UTC (rev 4750)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/font/SourceSansPro-It.otf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-06-22 15:20:28
|
Revision: 4749
http://sourceforge.net/p/oscss/svn/4749
Author: oscim
Date: 2013-06-22 15:20:23 +0000 (Sat, 22 Jun 2013)
Log Message:
-----------
Add element missing
Added Paths:
-----------
trunk/catalog/admin/images/icons/vcard_icon.jpg
trunk/catalog/admin/includes/gabarit/orders/shipping/flat.view.gab
trunk/catalog/admin/includes/gabarit/orders/shipping/item.view.gab
trunk/catalog/admin/includes/javascript/dataTables.TableTools/as3/
trunk/catalog/admin/includes/javascript/dataTables.TableTools/css/
trunk/catalog/admin/includes/javascript/dataTables.TableTools/images/
trunk/catalog/admin/includes/javascript/dataTables.TableTools/swf/copy_csv_xls.swf
trunk/catalog/admin/includes/javascript/dataTables.TableTools/swf/copy_csv_xls_pdf.swf
trunk/catalog/admin/includes/javascript/modules/pages/cms_content.js.php
trunk/catalog/admin/includes/javascript/modules/pages/package.js.php
trunk/catalog/admin/includes/javascript/modules/pages/shipping.js.php
trunk/catalog/admin/includes/javascript/modules/products/
trunk/catalog/admin/includes/javascript/oscss.js
trunk/catalog/admin/includes/languages/fr_FR/modules/content/chapitres.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/usersNotif.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/customers_2product.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/shipping/flat.txt
trunk/catalog/admin/includes/template/defaut/css/
trunk/catalog/admin/includes/template/defaut/definition.less
trunk/catalog/admin/includes/template/defaut/languages/
trunk/catalog/admin/includes/template/oscss/css/
trunk/catalog/admin/includes/template/oscss/definition.less
trunk/catalog/common/classes/HistoryMail.php
trunk/catalog/common/classes/datetimeUtility.php
trunk/catalog/common/classes/shippingUtility.php
trunk/catalog/common/modules/core/email/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.less
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-account.less
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-categorie.less
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-content.less
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-order.less
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-product.less
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/datatype-generic.less
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/element.less
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/forms.less
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/generic.less
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/master.less
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/font/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/js/less-1.3.0.min.js
trunk/catalog/install/includes/language/en_EN/osc_status.txt
trunk/catalog/install/includes/sql/mysql/tables/osc_shipping_history.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_shipping_history.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_specials.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/
trunk/catalog/templates/defaut/includes/boxes/recently_viewed_content.php
trunk/catalog/templates/defaut/includes/gabarit/box.recently_viewed_content.gab
Added: trunk/catalog/admin/images/icons/vcard_icon.jpg
===================================================================
(Binary files differ)
Index: trunk/catalog/admin/images/icons/vcard_icon.jpg
===================================================================
--- trunk/catalog/admin/images/icons/vcard_icon.jpg 2013-06-22 15:19:16 UTC (rev 4748)
+++ trunk/catalog/admin/images/icons/vcard_icon.jpg 2013-06-22 15:20:23 UTC (rev 4749)
Property changes on: trunk/catalog/admin/images/icons/vcard_icon.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/catalog/admin/includes/gabarit/orders/shipping/flat.view.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/orders/shipping/flat.view.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/orders/shipping/flat.view.gab 2013-06-22 15:20:23 UTC (rev 4749)
@@ -0,0 +1,22 @@
+<?php
+/**
+ @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 19/11/11, 19:36
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+?>
+ <p class="block_input">
+
+ <?php echo flat::$current['title'] ?>
+ <br />
+ <?php echo sprintf(__('@flat text info min delai %s'), datetimeUtility::SecondInDay(flat::$current['min_delai'])) ?>
+ <br />
+ <?php echo sprintf(__('@flat text info remise provider shipping at %s'),flat::$current['date_remise_provider']) ?>
+ <br />
+ <?php echo sprintf(__('@flat text info estimation %s day and delivery for date %s'), flat::$current['delai'] , flat::$current['date_delivery'] ) ?>
+ </p>
Added: trunk/catalog/admin/includes/gabarit/orders/shipping/item.view.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/orders/shipping/item.view.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/orders/shipping/item.view.gab 2013-06-22 15:20:23 UTC (rev 4749)
@@ -0,0 +1,22 @@
+<?php
+/**
+ @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 19/11/11, 19:36
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+?>
+ <p class="block_input">
+
+ <?php echo item::$current['title'] ?>
+ <br />
+ <?php echo sprintf(__('@item text info min delai %s'), datetimeUtility::SecondInDay(item::$current['min_delai'])) ?>
+ <br />
+ <?php echo sprintf(__('@item text info remise provider shipping at %s'),item::$current['date_remise_provider']) ?>
+ <br />
+ <?php echo sprintf(__('@item text info estimation %s day and delivery for date %s'), item::$current['delai'] , item::$current['date_delivery'] ) ?>
+ </p>
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/swf/copy_csv_xls.swf
===================================================================
(Binary files differ)
Index: trunk/catalog/admin/includes/javascript/dataTables.TableTools/swf/copy_csv_xls.swf
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/swf/copy_csv_xls.swf 2013-06-22 15:19:16 UTC (rev 4748)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/swf/copy_csv_xls.swf 2013-06-22 15:20:23 UTC (rev 4749)
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/swf/copy_csv_xls.swf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/catalog/admin/includes/javascript/dataTables.TableTools/swf/copy_csv_xls_pdf.swf
===================================================================
(Binary files differ)
Index: trunk/catalog/admin/includes/javascript/dataTables.TableTools/swf/copy_csv_xls_pdf.swf
===================================================================
--- trunk/catalog/admin/includes/javascript/dataTables.TableTools/swf/copy_csv_xls_pdf.swf 2013-06-22 15:19:16 UTC (rev 4748)
+++ trunk/catalog/admin/includes/javascript/dataTables.TableTools/swf/copy_csv_xls_pdf.swf 2013-06-22 15:20:23 UTC (rev 4749)
Property changes on: trunk/catalog/admin/includes/javascript/dataTables.TableTools/swf/copy_csv_xls_pdf.swf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/catalog/admin/includes/javascript/modules/pages/cms_content.js.php
===================================================================
--- trunk/catalog/admin/includes/javascript/modules/pages/cms_content.js.php (rev 0)
+++ trunk/catalog/admin/includes/javascript/modules/pages/cms_content.js.php 2013-06-22 15:20:23 UTC (rev 4749)
@@ -0,0 +1,61 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @cms_content osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 28/12/11, 17:30
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+?>
+<?php if ( in_array(cms_content::$action, array('edit')) ): ?>
+ <script type="text/javascript"><!--
+
+(function(){ // début de scope local
+OSCSS_JSCORE.cms_content = OSCSS_JSCORE.cms_content || {};
+// déclaration de la classe de validation proprement dite
+OSCSS_JSCORE.cms_content.validation = {
+ // déclaration de nos variables statiques
+
+
+ // déclaration de nos méthodes
+ // Check
+ isValid:function( ) {
+
+ $("input#content_name").change(function(){
+ self.isValidKey( $(this) );
+ });
+ },
+
+
+ // Check
+ isValidKey:function( $current ) {
+ var stringKey = $current.val();
+
+ if(stringKey.length <= 3 )
+ return false;
+
+ $.get("<?php echo tep_get_http().DIR_WS_ADMIN .cms_content::FILENAME ?>",
+ { 'action': "isValidKey", 'cID' : <?php echo cms_content::$Id; ?>, 'forceajax' : true , 'stringkey': stringKey },
+ function(data) {
+ $current.replaceWith(data);
+ });
+ return true;
+ },
+
+
+};
+
+// trick JavaScript pour émuler le self:: en PHP : on utilise une variable locale
+var self = OSCSS_JSCORE.cms_content.validation;
+})(); // fin de scope locale
+
+ //--></script>
+
+
+<?php oscss_cstr::CallBack('OSCSS_JSCORE.cms_content.validation.isValid();'); // Active check key ?>
+
+
+<?php endif; ?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/javascript/modules/pages/package.js.php
===================================================================
--- trunk/catalog/admin/includes/javascript/modules/pages/package.js.php (rev 0)
+++ trunk/catalog/admin/includes/javascript/modules/pages/package.js.php 2013-06-22 15:20:23 UTC (rev 4749)
@@ -0,0 +1,123 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @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 28/12/11, 17:30
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+?>
+<?php if ( in_array(package::$action, array('source_add')) ): ?>
+ <script type="text/javascript"><!--
+
+(function(){ // début de scope local
+OSCSS_JSCORE.package = OSCSS_JSCORE.package || {};
+// déclaration de la classe de validation proprement dite
+OSCSS_JSCORE.package.validation = {
+ // déclaration de nos variables statiques
+
+
+ // déclaration de nos méthodes
+ // Check
+ isValid:function( ) {
+
+ $("input#key").change(function(){
+ self.isValidKey( $(this) );
+ });
+ $("input#repository").change(function(){
+ self.isValidUrl( $(this) );
+ });
+
+ $("form#masterforms").submit(function(){
+ return self.isValidConnected(
+ $("input#key"),
+ $("input#repository") ,
+ $("input[type='text']#useradd"),
+ $("input[type='text']#token")
+ );
+ });
+ },
+
+
+ // Check
+ isValidKey:function( $current ) {
+ var stringKey = $current.val();
+
+ if(stringKey.length <= 1 )
+ return false;
+
+ $.get("<?php echo tep_get_http().DIR_WS_ADMIN .package::FILENAME ?>",
+ { 'action': "isValidKey", 'type_data' : "source", 'forceajax' : true , 'stringkey': stringKey },
+ function(data) {
+ $current.replaceWith(data);
+ });
+ return true;
+ },
+
+ isValidUrl:function( $current ) {
+ var stringurl = $current.val();
+
+ if(stringurl.length <= 10 )
+ return false;
+
+ $.get("<?php echo tep_get_http().DIR_WS_ADMIN .package::FILENAME ?>",
+ { 'action': "isValidUrl", 'type_data' : "source", 'forceajax' : true , 'stringurl': stringurl },
+ function(data) {
+ $current.replaceWith(data);
+ });
+ return true;
+ },
+
+ isValidConnected:function( $key, $repository, $user, $token ) {
+
+ var error = false;
+
+ var stringKey = $key.val();
+ if( stringKey.length <= 1 ){
+ $key.addClass('inline error');
+ error = true;
+ }
+
+ var stringurl = $repository.val();
+ if(stringurl.length <= 10 ){
+ $repository.addClass('inline error');
+ error = true;
+ }
+
+ var stringuser = $user.val();
+ var stringtoken = $token.val();
+ if( stringuser.length >=1 && stringtoken.length >= 20 ){
+
+ $.get("<?php echo tep_get_http().DIR_WS_ADMIN .package::FILENAME ?>",
+ { 'action': "isValidConnected", 'type_data' : "source", 'forceajax' : true , 'stringurl': stringurl , 'stringuser': stringuser , 'stringtoken': stringtoken },
+ function(data) {
+ $current.replaceWith(data);
+ });
+ return true;
+
+ }
+ else if( stringuser.length ==0 && stringtoken.length ==0 )
+ return true;
+
+ if(error == true )
+ return false;
+
+
+ return false;
+ },
+};
+
+// trick JavaScript pour émuler le self:: en PHP : on utilise une variable locale
+var self = OSCSS_JSCORE.package.validation;
+})(); // fin de scope locale
+
+ //--></script>
+
+
+<?php oscss_cstr::CallBack('OSCSS_JSCORE.package.validation.isValid();'); // Active check key ?>
+
+
+<?php endif; ?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/javascript/modules/pages/shipping.js.php
===================================================================
--- trunk/catalog/admin/includes/javascript/modules/pages/shipping.js.php (rev 0)
+++ trunk/catalog/admin/includes/javascript/modules/pages/shipping.js.php 2013-06-22 15:20:23 UTC (rev 4749)
@@ -0,0 +1,109 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @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 10/08/12, 17:30
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+?>
+<?php if (shipping::$action == 'edit'): ?>
+
+ <script type="text/javascript"><!--
+
+(function(){ // début de scope local
+OSCSS_JSCORE.shipping = OSCSS_JSCORE.shipping || {};
+// déclaration de la classe de validation proprement dite
+OSCSS_JSCORE.shipping.utils = {
+ // déclaration de nos variables statiques
+
+
+ // déclaration de nos méthodes
+ // Check
+ Init:function( ) {
+
+
+
+ /// Edit and info payment
+ $("#multiaction").change( function () {
+ $.get("./aca.php", { 'action':"editmod",'action_type' : "pages", 'action_class' : "shipping", 'action_method' : "display_view" , 'modtype' : "payment", 'oID': "<?php echo (int)shipping::$oID ?>", 'mod': this.value },
+ function success(data) {
+ $("#modPay").html(data);
+ });
+ });
+
+
+ // starting the script on page load
+ $(document).ready(function(){
+ // loop for
+ $(".tirroir").each( function () {
+ $(this).hide();
+ });
+
+ });
+ },
+
+};
+
+// trick JavaScript pour émuler le self:: en PHP : on utilise une variable locale
+var self = OSCSS_JSCORE.shipping.utils;
+})(); // fin de scope locale
+
+ //--></script>
+
+
+<?php oscss_cstr::CallBack('OSCSS_JSCORE.shipping.utils.Init();'); // Active check key ?>
+
+
+<?php elseif (in_array( shipping::$action , array('multi','multi-action') ) ): ?>
+
+ <script type="text/javascript"><!--
+
+(function(){ // début de scope local
+OSCSS_JSCORE.shipping = OSCSS_JSCORE.shipping || {};
+// déclaration de la classe de validation proprement dite
+OSCSS_JSCORE.shipping.utils = {
+ // déclaration de nos variables statiques
+
+
+ // déclaration de nos méthodes
+ // Check
+ Init:function( ) {
+
+
+
+ /// Edit and info payment
+ $("#multiaction").change( function () {
+ $.get("./aca.php", { 'action':"editmod",'action_type' : "pages", 'action_class' : "shipping", 'action_method' : "display_view" , 'modtype' : "payment", 'oID': "<?php echo (int)shipping::$oID ?>", 'mod': this.value },
+ function success(data) {
+ $("#modPay").html(data);
+ });
+ });
+
+ // starting the script on page load
+ $(document).ready(function(){
+ // loop for
+ $(".tirroir").each( function () {
+ $(this).hide();
+ });
+
+ });
+ },
+
+};
+
+// trick JavaScript pour émuler le self:: en PHP : on utilise une variable locale
+var self = OSCSS_JSCORE.shipping.utils;
+})(); // fin de scope locale
+
+ //--></script>
+
+
+<?php oscss_cstr::CallBack('OSCSS_JSCORE.shipping.utils.Init();'); // Active check key ?>
+
+
+
+<?php endif; ?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/javascript/oscss.js
===================================================================
--- trunk/catalog/admin/includes/javascript/oscss.js (rev 0)
+++ trunk/catalog/admin/includes/javascript/oscss.js 2013-06-22 15:20:23 UTC (rev 4749)
@@ -0,0 +1,377 @@
+
+/**
+ * osCSS Notification replace display code php by javascript and no intrusive code
+ *
+ * Use
+ * Add line in instance
+ * OSCSS_JSCORE.utils.notif.AddNotif({indice : 1 ,style: 'toto' , message:"test 1"})
+ *
+ * force reload link and adjust for open in dialog box
+ * OSCSS_JSCORE.utils.AdjustLink.OpenInDialog();*
+ *
+ * Draw all message
+ *
+ * OSCSS_JSCORE.utils.notif.ViewNotif();
+ */
+
+OSCSS_JSCORE = {};
+
+(function(){ // début de scope local
+OSCSS_JSCORE.utils = OSCSS_JSCORE.utils || {};
+
+// Gestion des notification
+// déclaration de la classe de validation proprement dite
+OSCSS_JSCORE.utils.notif = {
+ // déclaration de nos variables statiques
+ settings : {
+ style:"",
+ message:"",
+ position:"bottom",
+ speed:500,
+ duration:1500
+ },
+ // adjust duration based on retrun messageStack class css
+ specialduration : {
+ messageStackSuccess : 1,
+ messageStackError : 5,
+ messageStackWarning : 3.5,
+ messageStackInfo : 2
+ },
+
+ // pile notification
+ notification : {},
+ // pile number notif
+ size :0,
+
+ Clean:function(){
+ self.size = 0;
+ self.notification = {};
+ },
+
+
+ // déclaration de nos méthodes
+ AddNotif:function( opts ) {
+
+ var opt = $.extend(self.settings,opts);
+
+ var name = 'messid_' + self.size;
+
+ self.notification[self.size++] = $.extend(opts, self.settings);
+ },
+
+ // Display all message and hide display by php
+ ViewNotif:function( opts ){
+
+ // on vérifie si il y'a déjà une div de notification
+ if($("#messageStack").length == 0){
+ //il n'y en a pas, on jQuery créé la barre de notification
+ $("body").append('<div id="messageStack"></div>');
+ }
+
+
+ /* Petite bonne pratique, stocker vos appel jQuery dans une variable
+ *pour faciliter le code et améliorer les performances de vos scripts */
+ var $pile = $("#messageStack");
+
+
+ /**
+ * Loop for add message in DOM
+ */
+ for (var nom_indice in self.notification){
+
+ // put in html modele
+ var e = $('<p id="messid' + self.notification[nom_indice].indice + '" class="' + self.notification[nom_indice].style + ' item">' + self.notification[nom_indice].message +'<span class="ButtonClose">Close</span></p>');
+
+ // add in master html block
+ $pile
+ .append(e);
+
+ // tout est prêt, on anime la notification
+ $("#messid" + self.notification[nom_indice].indice )
+ .fadeIn(self.notification[nom_indice].speed)
+ // on fait patienter jQuery
+ .delay( (self.notification[nom_indice].duration * self.specialduration[self.notification[nom_indice].style]) )
+ // et on masque la notification
+ .fadeOut(self.notification[nom_indice].speed);
+ }
+
+
+ // on gere le bouton close des popup d'alert
+ $('.ButtonClose').each(function(){
+ $(this).click(function () {
+ $(this).parent().hide();
+ });
+ });
+
+ // Hide html dipslay block write by php
+ if($(".messageStack").length > 0){
+ //on cache le retour php
+ $(".messageStack").hide();
+ }
+
+ // suppression de la pile
+ self.Clean();
+
+ },
+
+
+};
+// fin de classe
+// trick JavaScript pour émuler le self:: en PHP : on utilise une variable locale
+var self = OSCSS_JSCORE.utils.notif;
+
+
+
+
+
+
+// Gestion des notification
+// déclaration de la classe de validation proprement dite
+OSCSS_JSCORE.utils.AdjustLink = {
+ // déclaration de nos variables statiques
+ settings : {
+ },
+
+ // force link process and refresh this current html balise
+ AdjustForm:function(){
+ /** Hide image and report title label in input fields */
+ $('label').each(function(){
+ var $img = $('img:first', this);
+ // cache image code html (obsolete)
+ $img.hide();
+
+ $(this).next().attr('title', $(this).attr('title') );
+ });
+ },
+
+ // ADD tag forceajax | forceview
+ HrefFlag:function(){
+
+ //! Updat GET
+ $('a.buttonimg.fancy,a.button.fancy,form.fancy').each(function(){
+ var reg = /(forceajax)/gi;
+ if( ! reg.test( this.href) )
+ this.href +='&forceajax=true';
+ });
+ $('a.buttonimg.fancyView,a.button.fancyView,form.fancyView').each(function(){
+ var reg = /(forceview)/gi;
+ if( ! reg.test( this.href) )
+ this.href +='&forceview=true';
+ });
+
+ },
+
+ OpenInDialog:function(){
+
+ $('form.fancy,form.fancyView').ajaxForm({
+ success: function(responseText){
+ $.fancybox({'content':responseText});
+ }
+ });
+
+ //! Fancy exe
+ $('a.fancytext').fancybox({'overlayOpacity':0.6});
+ $('a.buttonimg.fancy,a.button.fancy,a.buttonimg.fancyView,a.button.fancyView').fancybox({
+ 'overlayOpacity':0.5,
+ autoDimensions:true,
+ showCloseButton:false,
+ changeSpeed:0,
+ titleShow:false,
+ 'hideOnOverlayClick': false
+ });
+
+ // $('a.fancytext,a.buttonimg.fancy,a.button.fancy,a.buttonimg.fancyView,a.button.fancyView').bind('click', function() {
+ // var $this = $(this);
+ // var outputHolder = $("<div id='.uimodal-output'></div>");
+ //
+ //
+ // $("body").append(outputHolder);
+ // outputHolder.load($this.attr("href"), null, function() {
+ // // whatever params you want
+ // outputHolder.dialog({
+ // open: function() {
+ // $("#btjsclose").click(function(){
+ // outputHolder.dialog('close');
+ // return false;
+ // });
+ // }
+ // });
+ // });
+ //
+ // return false;
+ // });
+ },
+
+
+ // force link process and refresh this current html balise
+ ajaxinline:function(){
+ /** Flag ajax process Used in row status */
+ $('a.ajaxinline').each(function(){
+ var current = $(this);
+ var reg = /(forceajax)/gi;
+ if( ! reg.test( this.href) )
+ var ref =this.href +='&forceajax=true';
+ else
+ var ref =this.href;
+
+ current.click(function() {
+ $.get(ref, function(data) {
+ current.replaceWith(data);
+ });
+ return false;
+ });
+ });
+ },
+
+
+ // active tabs in edit forms and display page.
+ BaseIntabs:function(){
+ // Tabs Exe
+ var $tabs = $('#tabs, .tabs').tabs({cookie: {expires:30}}).find('.ui-tabs-nav').sortable({axis:'x'});
+
+ // if(window.location.hash) {
+ // Fragment exists
+ // $tabs.tabs('select', window.location.hash);
+ // }
+
+ $('.tabs_lang').tabs().find('.ui-tabs-nav').sortable({axis:'x'});
+
+ },
+
+
+ // add checkbox for select all childs checkboxs in current rows
+ select_all:function(){
+ // Multi in datatable, for select all rows
+ $("#select_all").click(function(){
+ var checked_status = $("#select_all").is(':checked');
+ $("input[type='checkbox'].multi").each(function(){
+ if(checked_status == true)
+ this.checked = true;
+ else
+ this.checked = false;
+ });
+ });
+ },
+
+
+};
+// fin de classe
+
+
+
+
+// Gestion des notification
+// déclaration de la classe de validation proprement dite
+OSCSS_JSCORE.utils.AdjustForms = {
+ // déclaration de nos variables statiques
+ settings : {
+ },
+
+ // force link process and refresh this current html balise
+ AdjustLabel:function(){
+ /** Hide image and report title label in input fields */
+ $('label').each(function(){
+ var $img = $('img:first', this);
+
+// if($img.attr('class') =='imghelp' ){
+ var chaine = $img.attr('src');
+ var reg = /(icon_help.gif)/gi;
+ if (reg.test(chaine)){
+
+ // cache image code html (obsolete)
+ $img.hide();
+ }
+ var title = '';
+
+
+ if( $(this).attr('title') !== undefined)
+ title = $(this).attr('title');
+ else if( $img.attr('title') !== undefined)
+ title = $img.attr('title');
+
+
+ $(this).next().attr('title', title );
+
+ });
+ },
+
+};
+// fin de classe
+
+
+
+ // Gestion des notification
+ // déclaration de la classe de validation proprement dite
+ OSCSS_JSCORE.utils.preview = {
+
+ Init:function(){
+ OSCSS_JSCORE.utils.preview.Preview();
+ },
+
+ Preview:function(){
+ /// ScreenShot product in hover link products
+// this.screenshotPreview = function(){
+ /* CONFIG */
+
+ xOffset = 10;
+ yOffset = 30;
+
+ // these 2 variable determine popup's distance from the cursor
+ // you might want to adjust to get the right result
+
+ /* END CONFIG */
+ $("a.screenshot").hover(function(e){
+ this.t = this.title;
+ this.title = "";
+ var c = (this.t != "") ? "<br/>" + this.t : "";
+ $("body").append("<p id='screenshot'><img src='"+ this.rel +"' alt='url preview' />"+ c +"</p>");
+ $("#screenshot")
+ .css("top",(e.pageY - xOffset) + "px")
+ .css("left",(e.pageX + yOffset) + "px")
+ .fadeIn("fast");
+ },
+ function(){
+ this.title = this.t;
+ $("#screenshot").remove();
+ });
+ $("a.screenshot").mousemove(function(e){
+ $("#screenshot")
+ .css("top",(e.pageY - xOffset) + "px")
+ .css("left",(e.pageX + yOffset) + "px");
+ });
+// };
+ },
+
+
+ };
+ // fin de classe
+ // trick JavaScript pour émuler le self:: en PHP : on utilise une variable locale
+// var self = OSCSS_JSCORE.utils.preview;
+
+
+})(); // fin de scope local
+
+
+
+
+
+
+
+
+
+
+// init jquery
+$(function() {
+
+ //! slider block tirroir
+ $('.Ctrtirroir').each(function(){
+ $(this).click(function () {
+ $(this).next().slideToggle('slow');
+ $(this).toggleClass("closed");
+ });
+ //load force close
+ $(this).next().slideToggle('slow');
+ $(this).toggleClass("closed");
+ });
+
+});
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/content/chapitres.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/content/chapitres.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/content/chapitres.txt 2013-06-22 15:20:23 UTC (rev 4749)
@@ -0,0 +1,16 @@
+<?php
+/**
+ @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 12/02/2013, 21:47
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+/* BO */
+$lang['title graph sales']="Total des commandes" ;
+$lang['mois']="Mois" ;
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/usersNotif.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/usersNotif.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/usersNotif.txt 2013-06-22 15:20:23 UTC (rev 4749)
@@ -0,0 +1,54 @@
+<?php
+/**
+ @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 07/05/2012, 14:46
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['heading title usersNotif']="Notifications métiers" ;
+
+/* User Config */
+ $lang['heading title configuration']="Régler vos préférences de notifications" ;
+ $lang['intro text configuration']="Utiliser le bouton 'Nouvelle notification' pour obtenir des alertes sur les événement de la boutique \n la méthode vous permet de regler le mode de fonctionnement (sql , visible sur la panel d'administration; email pour recevoir un mail) vous pouvez regler un même événement pour plusieurs méthodes\n" ;
+
+ $lang['@usersNotif table heading notif id']="Id" ;
+ $lang['@usersNotif table heading type']="type" ;
+ $lang['@usersNotif table heading keys']="key" ;
+ $lang['@usersNotif table heading name']="link" ;
+ $lang['@usersNotif table heading date']="date" ;
+ $lang['@usersNotif table heading action']="Action" ;
+ $lang['@usersNotif table heading chknotif id']="Id" ;
+ $lang['@usersNotif table heading type']="type" ;
+// $lang['@usersNotif table heading chknotif_key']="Évènement" ;
+// $lang['@usersNotif table heading chknotif_method']="Méthode" ;
+// $lang['@usersNotif table heading chknotif_status']="Status" ;
+
+ $lang['image new notification']="Nouvelle notification" ;
+ $lang['image notification config list']="Configuration" ;
+ $lang['image notification list']="Évènements" ;
+
+/* New Notif User Config */
+
+$lang['heading notification view']="Détail notification" ;
+$lang['heading config edit']="Édition d'une configuration " ;
+$lang['text info key notif']="Action sur : " ;
+$lang['text info key method']="Méthode : " ;
+$lang['text info date notif']="Date : " ;
+$lang['text info content notif']="Contenu : " ;
+
+
+
+
+$lang['@adminNotif image reload mail']="Relancer" ;
+
+$lang['error in update notification']="Erreur lors de la mise à jour de la notification" ;
+$lang['success notification update']="Notification de mise à jour" ;
+$lang['error in insert notification']="Erreur lors de l'ajout de la notification" ;
+$lang['success notification insert']="Notification ajoutée" ;
+$lang['success notification delete']="Notification supprimée" ;
+
+$lang['success notif detail delete']="Notification supprimée" ;
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/customers_2product.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/customers_2product.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/customers_2product.txt 2013-06-22 15:20:23 UTC (rev 4749)
@@ -0,0 +1,26 @@
+<?php
+/**
+ @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 10/04/2012 , 15:00:00
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$lang['customers_2product heading title'] ="Meilleurs clients" ;
+$lang['customers_2product heading description'] ="La liste des sommes depensées par clients " ;
+
+
+$lang['customers_2product table heading product id'] ="produit n°" ;
+$lang['customers_2product table heading id'] ="N°" ;
+$lang['customers_2product table heading id'] ="N°" ;
+$lang['customers_2product table heading id'] ="N°" ;
+$lang['customers_2product table heading firstname'] ="Prénom" ;
+$lang['customers_2product table heading lastname'] ="Nom" ;
+$lang['customers_2product table heading email'] ="Email" ;
+$lang['customers_2product table heading ordernum'] ="nbr achats" ;
+$lang['customers_2product table heading ordersum'] ="Total" ;
+$lang['customers_2product table heading moycart'] ="panier moyen" ;
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/shipping/flat.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/shipping/flat.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/shipping/flat.txt 2013-06-22 15:20:23 UTC (rev 4749)
@@ -0,0 +1,39 @@
+<?php
+/**
+ @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 01/11/2012, 12:45
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+/* generic */
+$lang['module shipping flat text title']="Forfait" ;
+$lang['module shipping flat text description']="livraison au forfait" ;
+$lang['module shipping flat text way']="soit :" ;
+$lang['module shipping flat text title in shipping']="Forfait :" ;
+
+/* View in order */
+$lang['@flat text info min delai %s']="delai courant : %s jours";
+$lang['@flat text info remise provider shipping at %s']="date de remise au transporteur %s";
+$lang['@flat text info estimation %s day and delivery for date %s']="Estmiation à %s pour une livraison le %s";
+
+
+/* Section config */
+$lang['MODULE_SHIPPING_FLAT_COST_S'] = "Coût de livraison";
+$lang['MODULE_SHIPPING_FLAT_COST_L'] = "Le coût de livraison sera multiplié par le nombre d'articles dans la commande employant cette méthode.";
+$lang['MODULE_SHIPPING_FLAT_HANDLING_S'] = "Coûts de manutention";
+$lang['MODULE_SHIPPING_FLAT_HANDLING_L'] = "Majorer le prix, avec la valeur du coût de la manutention";
+$lang['MODULE_SHIPPING_FLAT_TAX_CLASS_S'] = "Type de taxe";
+$lang['MODULE_SHIPPING_FLAT_TAX_CLASS_L'] = "Employez la classe suivante de taxe sur les coûts de livraison.";
+$lang['MODULE_SHIPPING_FLAT_ZONE_S'] = "Zone de livraison";
+$lang['MODULE_SHIPPING_FLAT_ZONE_L'] = "Permettre seulement cette méthode de livraison pour la zone choisie.";
+$lang['MODULE_SHIPPING_FLAT_SORT_ORDER_S'] = "Ordre de tri";
+$lang['MODULE_SHIPPING_FLAT_SORT_ORDER_L'] = "Preciser la position de ce module par rapport aux autres";
+$lang['MODULE_SHIPPING_FLAT_ICON_S'] = "Icone";
+$lang['MODULE_SHIPPING_FLAT_ICON_L'] = "configurer un icone pour ce mode de livraison";
+$lang['MODULE_SHIPPING_FLAT_MIN_DELAI_S'] = "Delais de livraison";
+$lang['MODULE_SHIPPING_FLAT_MIN_DELAI_L'] = "Durée en jours min avant livraison";
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/template/defaut/definition.less
===================================================================
--- trunk/catalog/admin/includes/template/defaut/definition.less (rev 0)
+++ trunk/catalog/admin/includes/template/defaut/definition.less 2013-06-22 15:20:23 UTC (rev 4749)
@@ -0,0 +1,200 @@
+/**
+ * @ licence GPL *2005-2012 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 01/01/2012, 18:17
+ * @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ * @encode UTF-8
+ */
+
+/* define color generic , used in next define */
+// color
+@color_010 : #78222F;
+@color_012 : #ACAAAC;
+@color_014 : #D7D7D7;
+// blanc
+@color_011 : #FFFFFF;
+// noir
+@color_015 : #000000;
+@color_013 : #303030;
+@color_016 : #3F3F3F;
+
+// gardient red
+@color_020 : #AE0405 ;
+@color_021 : #AE0405 ;
+@color_022 : #FD3841 ;
+
+
+/* base dimension */
+@display_max_width : 900px;
+@display_width : 98% ;
+
+
+
+/* Normal Definition */
+@margin: 0.2em;
+@padding_base : 0.1em;
+@lineheight: 16px;
+@font_size : 11px;
+
+
+@the-border: 1px;
+@base-color: #111;
+@red: #842210; // Fields required
+
+// header
+ // header block
+ @header_base_bg :transparent ;
+ @header_info_bg : @color_015 ;
+ @header_sub_height : 25px ;
+ // menu user
+ @menu_user_bg : none;
+ @menu_user_border : @color_013 ;
+ // background menu exts, sub nav
+ @color_bg_menuexts : @color_013;
+
+// general title page
+@title_h3_color : @color_010;
+@title_h3_color_shadow : #444444 ;
+
+// Fields required
+@field_required : @red ;
+
+// message
+@color_warning : #FBE3E1 ;
+@color_success : #A1F7C2 ;
+@color_notice : #ECFF9C ;
+
+// General header
+
+// nav
+@nav_border : @color_011;
+@nav_master_link : @color_011;
+@nav_master_link_hover : #000000;
+@nav_master_link_hover_shadow : @color_011;
+
+@submenu_bg : @color_013;
+@submenu_bg_hover : #999;
+@submenu_link : #9C9A9B;
+@submenu_link_hover : @color_011;
+@submenu_link_hover_shadow : #000000;
+
+
+// color menu nav (gradient)
+@color_menu_nav_cl_1 : @color_020 ;
+@color_menu_nav_cl_2 : @color_021 ;
+@color_menu_nav_cl_3 : @color_022 ;
+
+
+
+
+// Central content
+ /**
+ * tabs
+ */
+ // color bouton classique (gradient)
+ @color_tabs_cl_1 : @color_020 ;
+ @color_tabs_cl_2 : @color_021 ;
+ @color_tabs_cl_3 : @color_022 ;
+ // tabs color text
+ @color_tab_text_default : gray;
+ @color_tab_text_default_shadow : #000;
+ @color_tab_text_selected : @color_020;
+ @color_tab_text_selected_shadow : @color_011;
+ @color_tab_text_hover : gray;
+ @color_tab_text_hover_shadow : #555555;
+
+
+
+
+ /**
+ * Button
+ */
+ // color bouton classique (gradient)
+ @color_bouton_cl_1 : @color_020 ;
+ @color_bouton_cl_2 : @color_021 ;
+ @color_bouton_cl_3 : @color_022 ;
+
+ // color bouton and link submit , confirm , valid (gradient)
+ @color_bouton_submit_cl_1 : #248DBC ;
+ @color_bouton_submit_cl_2 : #248DBC ;
+ @color_bouton_submit_cl_3 : #B0F1F7 ;
+
+ // color bouton and link back, annulate, retrun (gradient)
+ @color_bouton_back_cl_1 : #000000 ;
+ @color_bouton_back_cl_2 : #000000 ;
+ @color_bouton_back_cl_3 : #5C5A5D ;
+
+
+ /**
+ * widget
+ */
+ @color_widget_title : @color_010; // title
+ @color_widget_bg_th : @color_010; // th
+
+// block div edit / input gradient background
+@color_bg_gradient_base : #E4E4E4; // base color
+@color_bg_gradient_eob : 200; // deb gradient
+@color_bg_gradient_eon : 255; // end gradient
+
+
+
+
+// Table Datatable
+ //
+ @color_datatable_tr_th : @color_010 ;
+ @color_datatable_tr_th_txt : @color_011 ;
+ @datatable_color_txt :#000000 ; // couleur text dans les tableau
+
+ @bg_hover : #E6FF99; // hover row or filter
+ @bg_hover_txt : #000000; // hover row or filter
+
+ @bg_table_tr_odd : #F0F0F0;
+ @bg_table_tr_even : @color_014;
+ @color_sorting : #84509A; // cols sorting
+ @color_sorting_text : #A7A7A7; // col sorting text
+
+ @color_bg_ext_datatable :#E4E4E4 ; // bg header/footer datatable
+
+ // Split page / Pagination
+ @color_split : @color_010;
+ @color_split_active : @color_010;
+ @color_split_active_text : #FFFFFF;
+ @color_split_border_hover : @color_010;
+
+// FORM
+@bg_input : @color_011;
+@bg_input_border : @color_012;
+@bg_input_hover : #F0F0F0;
+@bg_input_border_hover : @color_010;
+
+
+
+
+
+
+// POPUP
+@color_title_txt : @color_011;
+
+
+// bas
+@bas_bg : @color_013 ;
+@bas_bg_txt : @color_011 ;
+// footer
+@footer_bg : transparent ;
+@footer_bg_txt : @color_015;
+
+// Load generic element and style
+@import "../defaut/css/less/element.less";
+@import "../defaut/css/less/forms.less";
+@import "../defaut/css/less/datatable.less";
+
+@import "../defaut/css/less/header.less";
+@import "../defaut/css/less/styles.less";
+
+
+
+body {
+ background:#e4e4e4 url(../../../images/back.jpg) repeat-x;
+}
Added: trunk/catalog/admin/includes/template/oscss/definition.less
===================================================================
--- trunk/catalog/admin/includes/template/oscss/definition.less (rev 0)
+++ trunk/catalog/admin/includes/template/oscss/definition.less 2013-06-22 15:20:23 UTC (rev 4749)
@@ -0,0 +1,200 @@
+/**
+ * @ licence GPL *2005-2012 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 01/01/2012, 18:17
+ * @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ * @encode UTF-8
+ */
+
+/* define color generic , used in next define */
+// color
+@color_010 : #78222F;
+@color_011 : #FFFFFF;
+@color_012 : #ACAAAC;
+@color_013 : #303030;
+@color_014 : #D7D7D7;
+@color_015 : #000000;
+@color_016 : #3F3F3F;
+
+// gardient red
+@color_020 : #AE0405 ;
+@color_021 : #AE0405 ;
+@color_022 : #FD3841 ;
+
+
+
+
+
+/* base dimension */
+@display_max_width : 900px;
+@display_width : 90% ;
+
+/* Normal Definition */
+@margin: 0.2em;
+@padding_base : 0.1em;
+@lineheight: 16px;
+@font_size : 11px;
+
+
+@the-border: 1px;
+@base-color: #111;
+@red: #842210; // Fields required
+
+
+// header block
+@header_base_bg :@color_015 ;
+@header_info_bg : @color_015 ;
+// menu user
+@menu_user_bg : #303030;
+@menu_user_border : #3F3F3F ;
+
+// general title page
+@title_h3_color : @color_010;
+@title_h3_color_shadow : #444444 ;
+
+// Fields required
+@field_required : @red ;
+
+// message
+@color_warning : #FBE3E1 ;
+@color_success : #A1F7C2 ;
+@color_notice : #ECFF9C ;
+
+// General header
+
+// nav
+@nav_border : @color_011;
+@nav_master_link : @color_011;
+@nav_master_link_hover : #000000;
+@nav_master_link_hover_shadow : @color_011;
+
+@submenu_bg : @color_013;
+@submenu_bg_hover : #999;
+@submenu_link : #9C9A9B;
+@submenu_link_hover : @color_011;
+@submenu_link_hover_shadow : #000000;
+
+
+// color menu nav (gradient)
+@color_menu_nav_cl_1 : @color_020 ;
+@color_menu_nav_cl_2 : @color_021 ;
+@color_menu_nav_cl_3 : @color_022 ;
+
+// background menu exts, sub nav
+@color_bg_menuexts : @color_010;
+
+
+// Central content
+ /**
+ * tabs
+ */
+ // color bouton classique (gradient)
+ @color_tabs_cl_1 : @color_020 ;
+ @color_tabs_cl_2 : @color_021 ;
+ @color_tabs_cl_3 : @color_022 ;
+ // tabs color text
+ @color_tab_text_default : #ffffff;
+ @color_tab_text_default_shadow : @color_011;
+ @color_tab_text_selected : @color_020;
+ @color_tab_text_selected_shadow : @color_011;
+ @color_tab_text_hover : #ffffff;
+ @color_tab_text_hover_shadow : #555555;
+
+
+
+
+ /**
+ * Button
+ */
+ // color bouton classique (gradient)
+ @color_bouton_cl_1 : @color_020 ;
+ @color_bouton_cl_2 : @color_021 ;
+ @color_bouton_cl_3 : @color_022 ;
+
+ // color bouton and link submit , confirm , valid (gradient)
+ @color_bouton_submit_cl_1 : #248DBC ;
+ @color_bouton_submit_cl_2 : #248DBC ;
+ @color_bouton_submit_cl_3 : #B0F1F7 ;
+
+ // color bouton and link back, annulate, retrun (gradient)
+ @color_bouton_back_cl_1 : #000000 ;
+ @color_bouton_back_cl_2 : #000000 ;
+ @color_bouton_back_cl_3 : #5C5A5D ;
+
+
+ /**
+ * widget
+ */
+ @color_widget_title : @color_010; // title
+ @color_widget_bg_th : @color_010; // th
+
+// block div edit / input gradient background
+@color_bg_gradient_base : #E4E4E4; // base color
+@color_bg_gradient_eob : 200; // deb gradient
+@color_bg_gradient_eon : 255; // end gradient
+
+
+// Table Datatable
+ //
+ @color_datatable_tr_th : @color_010 ;
+ @color_datatable_tr_th_txt : @color_011 ;
+ @datatable_color_txt :#000000 ; // couleur text dans les tableau
+
+ @bg_hover : #E6FF99; // hover row or filter
+ @bg_hover_txt : #000000; // hover row or filter
+
+ @bg_table_tr_odd : #F0F0F0;
+ @bg_table_tr_even : @color_014;
+ @color_sorting : #84509A; // cols sorting
+ @color_sorting_text : #A7A7A7;
+
+ @color_bg_ext_datatable :#E4E4E4 ; // bg header/footer datatable
+
+ //Split page / Pagination
+ @color_split : @color_010;
+ @color_split_active : @color_010;
+ @color_split_active_text : #FFFFFF;
+ @color_split_border_hover : @color_010;
+
+// FORM
+@bg_input : @color_011;
+@bg_input_border : @color_012;
+@bg_input_hover : #F0F0F0;
+@bg_input_border_hover : @color_010;
+
+
+
+/**
+ *
+ */
+
+
+
+
+// POPUP
+@color_title_txt : @color_011;
+
+// bas
+@bas_bg : @color_013 ;
+@bas_bg_txt : @color_011 ;
+// footer
+@footer_bg : #505050 ;
+@footer_bg_txt : @color_011;
+
+
+
+// Load generic element and style
+@import "../defaut/css/less/element.less";
+@import "../defaut/css/less/forms.less";
+@import "../defaut/css/less/datatable.less";
+
+@import "css/less/header.less";
+@import "css/less/styles.less";
+
+
+
+body {
+ background:#faf9f7 url("../oscss/img/1/body.jpg") left -80px repeat-x;
+}
Added: trunk/catalog/common/classes/HistoryMail.php
===================================================================
--- trunk/catalog/common/classes/HistoryMail.php (rev 0)
+++ trunk/catalog/common/classes/HistoryMail.php 2013-06-22 15:20:23 UTC (rev 4749)
@@ -0,0 +1,98 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @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 01/01/2013, 16:16
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class HistoryMail
+ @brief This class is manager call for methode in check or generate password proteced
+*/
+
+class HistoryMail {
+ /**
+ @var path childs module
+ */
+ const PATH_CHILDS_MOD = 'modules/core/email/';
+ /**
+ @var Prefix file in childs module
+ */
+ const PREFIX_FILE_CHILDS_MOD = 'history_';
+ /**
+ @var ressource Id current instance
+ */
+ protected static $_instance;
+ /**
+ @var object Childs mod instance
+ */
+ protected static $ChildMod = false;
+
+
+ /**
+ @brief constructor
+ */
+ protected function __construct(){
+ global $conf;
+
+ if(self::$ChildMod !=false) return ;
+
+ $file = self::PREFIX_FILE_CHILDS_MOD.$conf->HistoryMail.'.php';
+
+ if(!file_exists(DIR_FS_CATALOG.DIR_WS_COMMON.self::PATH_CHILDS_MOD.$file))
+ throw new Exception('Not found file history email module');
+
+ $current = $conf->HistoryMail;
+ require_once(DIR_FS_CATALOG.DIR_WS_COMMON.self::PATH_CHILDS_MOD.$file);
+
+ self::$ChildMod = new $current();
+ }
+
+ /**
+ @brief call current class
+ */
+ public static function getInstance(){
+ if(self::$_instance == null)
+ self::$_instance = new self();
+
+ return self::$_instance;
+ }
+
+ /**
+ @brief Force reset current instance class
+ */
+ public static function resetInstance(){
+ self::$_instance = null;
+ return self::getInstance();
+ }
+
+
+ /**
+ @brief
+ */
+ public function ListUserDir($cid){
+ self::getInstance();
+ return self::$ChildMod->ListUserMail($cid);
+ }
+
+
+ /**
+ @param $cid
+ @param $uid
+ */
+ public function ViewMail($cid,$uid){
+ self::getInstance();
+ return self::$ChildMod->ViewMail($cid,$uid);
+ }
+
+
+ /**
+ @brief
+ */
+ public function AddMail($cid, $to, $toadd, $from, $fromadd , $subject,$content){
+ self::getInstance();
+ return self::$ChildMod->AddMail($cid,$subject, $to, $toadd, $from, $fromadd , $content);
+ }
+}
+?>
Added: trunk/catalog/common/classes/datetimeUtility.php
===================================================================
--- trunk/catalog/common/classes/datetimeUtility.php (rev 0)
+++ trunk/catalog/common/classes/datetimeUtility.php 2013-06-22 15:20:23 UTC (rev 4749)
@@ -0,0 +1,199 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @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 06/02/11, 20:14
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class datetimeUtility
+*/
+class datetimeUtility {
+
+
+ /**
+ */
+ public static function date_long($raw_date) {
+ if ( ($raw_date == '1000-01-01 00:00:00') || ($raw_date == '') ) return false;
+
+ $year = (int)substr($raw_date, 0, 4);
+ $month = (int)substr($raw_date, 5, 2);
+ $day = (int)substr($raw_date, 8, 2);
+ $hour = (int)substr($raw_date, 11, 2);
+ $minute = (int)substr($raw_date, 14, 2);
+ $second = (int)substr($raw_date, 17, 2);
+
+ return self::_strftime(DATE_FORMAT_LONG, mktime($hour, $minute, $second, $month, $day, $year));
+ }
+
+ /**
+ @brief Output a raw date string in the selected locale date format
+ @param $raw_date needs to be in this format: YYYY-MM-DD HH:MM:SS
+ NOTE: Includes a workaround for dates before 01/01/1970 that fail on windows servers
+ */
+ public static function date_short($raw_date) {
+ if ( ($raw_date == '1000-01-01 00:00:00') || ($raw_date == '') ) return false;
+
+ $year = substr($raw_date, 0, 4);
+ $month = (int)substr($raw_date, 5, 2);
+ $day = (int)substr($raw_date, 8, 2);
+ $hour = (int)substr($raw_date, 11, 2);
+ $minute = (int)substr($raw_date, 14, 2);
+ $second = (int)substr($raw_date, 17, 2);
+
+ if (@date('Y', mktime($hour, $minute, $second, $month, $day, $year)) == $year) return date(DATE_FORMAT, mktime($hour, $minute, $second, $month, $day, $year));
+ else return str_replace('2037', $year, date(DATE_FORMAT, mktime($hour, $minute, $second, $month, $day, 2037)));
+ }
+
+ /**
+ */
+ public static function datetime_short($raw_datetime) {
+ if ( ($raw_datetime == '1000-01-01 00:00:00') || ($raw_datetime == '') ) return false;
+
+ $year = (int)substr($raw_datetime, 0, 4);
+ $month = (int)substr($raw_datetime, 5, 2);
+ $day = (int)substr($raw_datetime, 8, 2);
+ $hour = (int)substr($raw_datetime, 11, 2);
+ $minute = (int)substr($raw_datetime, 14, 2);
+ $second = (int)substr($raw_datetime, 17, 2);
+
+ return self::_strftime(DATE_TIME_FORMAT, mktime($hour, $minute, $second, $month, $day, $year));
+ }
+
+
+ /**
+ Réecriture des dates dans des formats correctes pour la langue
+ */
+ protected static function _strftime($format, $timestamp=false) {
+ if (!$timestamp) $timestamp = time();
+ $pattern = array(
+ '%a'=>array('const'=>'NameOf_DAY_MINI','ftime'=>'%w'),
+ '%A'=>array('const'=>'NameOf_DAY','ftime'=>'%w'),
+ '%b'=>array('const'=>'NameOf_MONTH_MINI','ftime'=>'%m'),
+ '%B'=>array('const'=>'NameOf_MONTH','ftime'=>'%m')
+ );
+ foreach ($pattern as $code=>$infos)
+ if (preg_match("/$code/",$format) && defined($infos['const'].'_'.strftime($infos['ftime'], $timestamp)))
+ $format = preg_replace("/$code/", constant($infos['const'].'_'.strftime($infos['ftime'], $timestamp)), $format);
+
+ return strFtime($format, $timestamp);
+ }
+
+ /**
+ @brief Convert Timestamp in date format
+ @param $Timestamp unix time stamp
+ */
+ public static function timestamp_short($Timestamp){
+ return date(DATE_FORMAT, $Timestamp);
+ }
+
+ /**
+ @brief Convert Timestamp in date format
+ @param $Timestamp unix time stamp
+ */
+ public static function timestamp_long($Timestamp){
+ return date(PHP_DATE_TIME_FORMAT, $Timestamp);
+ }
+
+ /**
+ @brief Convert Timestamp in date format
+ @param $Timestamp unix time stamp
+ */
+ public static function SecondInDay($value){
+ return (int)( $value / 86400);
+ }
+
+ /**
+ @fn IntervalDayOpened($debut, $fin, $with_saterday = false, $with_sunday = false, $activ_paques = true)
+ @brief Calcul du nombre de jour necessaire à la livraison en ne prenant en compte que les jour ouvrable/ouvré
+ @param $debut int timestamp start date
+ @param $fin int timestamp end date
+ @param $with_saterday boolean true for use day in delivery
+ @param $with_sunday boolean true for use day in delivery
+ @param $activ_paques boolean treu for not use day in delivery
+ */
+ public static function IntervalDayOpened($debut, $fin, $with_saterday = false, $with_sunday = false, $activ_paques = true) {
+ $totOuvrables = 0;
+
+ // Comptabilise le nombre de jours ouvrable necessaire à la livraison
+ $i=0;
+ for ($day = $debut; $day < $fin; ($day += 86400)) {
+ if(!self::DayIsOpened($day, $with_saterday , $with_sunday , $activ_paques ) )
+ $fin += 86400;
+
+ $i++;
+ if($i>100)
+ return false;
+ }
+ return ($fin - $debut) / 86400;
+ }
+
+ /**
+ @brief return next prev opened day
+ @param $day timestamp
+ */
+ public static function NextDayOpened($date, $with_saterday = false, $with_sunday = false, $activ_paques = true){
+ if(empty($date))
+ $date = time();
+
+ for ($i = 0; $i < 7; $i++) {
+ $tmp_d = ($date + ( 86400 * $i )) ;
+ if( self::DayIsOpened( $tmp_d , $with_saterday , $with_sunday , $activ_paques ) )
+ return $tmp_d;
+ }
+
+ return false;
+ }
+
+ /**
+ @brief check if current day is opened for current country (cf master file current language)
+ @param $day timestamp
+ @return boolean true OK/ false KO
+ */
+ public static function DayIsOpened($day, $with_saterday = false, $with_sunday = true, $activ_paques = false){
+ $totOuvrables = 0;
+ $day_en = strtolower(date('D', $day)); // mon-tue-wen-thu-fri-sat-sun
+
+ if ($day_en == 'sat' || $day_en == 'sun') {
+ switch (true) {
+ case ($with_sunday == false && $with_saterday == false) :
+ $totOuvrables++; // Comptabilise le samedi ET le dimanche
+ break;
+ case ($with_sunday == false && $with_saterday == true && $day_en == 'sun') :
+ $totOuvrables++; // Comptabilise uniquement le dimanche
+ break;
+ case ($with_saterday == false && $with_sunday === true && $day_en === 'sat') :
+ $totOuvrables++; // Comptabilise uniquement le samedi
+ break;
+ }
+ }
+ else {
+ // Définition des dates fériées fixes
+ $jour = date('d', $day);
+ $mois = date('m', $day);
+ $an = date('Y', $day);
+
+
+ foreach(explode(';',CALENDAR_PUBLIC_HOLIDAY) as $row)
+ if($row == $jour.'/'.$mois)
+ $totOuvrables++;
+
+ if($activ_paques) {
+ // Pâques
+ $paques = easter_date($an); // retourne un timestamp UNIX pour Pâques
+ if (date('d', $paques) == $jour && date('m', $paques) == $mois) $totOuvrables++;
+ // Ascension
+ $ascension = $paques + 39;
+ if (date('d', $ascension) == $jour && date('m', $ascension) == $mois) $totOuvrables++;
+ // Pentecote
+ $pentecote = $paques + 50;
+ if (date('d', $pentecote) == $jour && date('m', $pentecote) == $mois) $totOuvrables++;
+ }
+
+ }
+
+ return ($totOuvrables==0)? true : false ;
+ }
+}
+?>
\ No newline at end of file
Added: trunk/catalog/common/classes/shippingUtility.php
===================================================================
--- trunk/catalog/common/classes/shippingUtility.php (rev 0)
+++ trunk/catalog/common/classes/shippingUtility.php 2013-06-22 15:20:23 UTC (rev 4749)
@@ -0,0 +1,52 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @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.0
+ @date 06/02/11, 20:14
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class shippingUtility
+*/
+class shippingUtility {
+
+ /**
+ @fn getDelai()
+ @brief delai_livraison BOC
+ if time is supp at 12h , add 1 days
+ @param $delai_date timestamp for number days of delai
+ @param $with_saterday boolean
+ @return array(
+ delai (in day)
+ date_liv (date)
+ )
+ */
+ public static function getDelai($delai, $with_saterday = false) {
+ $totOuvrables = 0;
+
+ $time = time();
+ $heure = (int)date("H", $time);
+
+ // Départ de la livraison le jour même ou le lendemain selon l'heure (12h00)
+ $date_depart = ($heure > 12) ? $time + 86400: $time;
+ $date_depart = datetimeUtility::NextDayOpened($date_depart, $with_saterday, false, true);
+
+ $date_livraison = $date_depart + (int)$delai;
+
+ // Comptabilise le nombre de jours
+ $totOuvrables = datetimeUtility::IntervalDayOpened($date_depart, $date_livraison, $with_saterday, false, true);
+
+ // On ajoute les jour ouvrables + control jour ouvrable
+ $date_livraison = datetimeUtility::NextDayOpened( ( $date_depart + ($totOuvrables * 86400) ), $with_saterday, false, true);
+
+
+ return array(
+ 'delai' => (int)( $date_livraison - $date_depart ) / 86400,
+ 'date_dep' => date(DATE_FORMAT, $date_depart),
+ 'date_liv' => date(DATE_FORMAT, $date_livraison),
+ );
+ }
+
+}
+?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.less
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.less (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.less 2013-06-22 15:20:23 UTC (rev 4749)
@@ -0,0 +1,379 @@
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+
+
+
+nav{
+ position: absolute;
+ width: inherit;
+
+ background: #000;
+ .border-radius(5px,5px,5px,5px);
+
+ ul {
+ margin: 0 auto;
+ width: inherit;
+
+ list-style: none;
+
+
+ li {
+ float: left;
+
+ a {
+// font:20px "SourceSansPro",Arial;
+ display: inline-block;
+ margin-right: 20px;
+ padding: 0 10px;
+ line-height: 44px;
+
+// font-size: 16px;
+ font-weight: normal;
+ line-height: 44px;
+ text-align: center;
+ text-decoration: none;
+ color: #b4e3ec;
+
+ &:hover{
+ color: #fff;
+ }
+ }
+
+ &.selected a{
+ color: #fff;
+ }
+ }
+ }
+}
+
+
+
+
+
+header#top{
+ height:105px;
+
+
+
+ div#logo {
+ width:250px;
+ float:left;
+
+ p,
+ h1 {
+ padding: 20px 0;
+ color: #FFF;
+ font-size: 28px;
+ }
+ }
+
+ div#top_bar {
+ float:left;
+ position:relative;
+ left:260px;
+ width: 450px;
+ padding:0;
+ height:45px;
+
+ background: black;
+ .border-radius(0,5px,5px,0);
+
+ div{
+ float:left;
+
+ .boxe{
+ header{display:none;}
+ margin:0.5em 0.5em;
+ }
+
+ &.languages,
+ &#currenciesBox {
+ padding-top:0.4em;
+
+ a{
+ padding:0 0.15em;
+ border:1px solid transparent;
+ .border-radius(5px,5px,5px,5px);
+
+ img{
+ padding-top:0.15em;
+ }
+
+ &:hover{
+ text-decoration:none;
+ background: @bg_input_hover ;
+ border:1px solid @bg_input_border_hover;
+ .border-radius(5px,5px,5px,5px);
+ }
+
+ &.Selected{
+ color:@bg_input_hover;
+ cursor: default;
+
+ &:hover{
+ background: transparent ;
+ border:1px solid transparent;
+ }
+ }
+ }
+ }
+
+ &.search_suggest div#search_suggest{
+ position:absolute;
+ z-index:99999;
+ margin-top:10px;
+
+// padding:0;
+ background:#DDEEEE;
+ border:1px solid white;
+ .border-radius(5px,5px,5px,5px);
+
+ a{
+ color:black;
+ font-size:0.8em;
+ }
+
+ ul{
+ width:250px;
+// padding:0.5em;
+ list-style:circle;
+
+
+ li{
+// padding:
+ }
+
+ .smenufull_arbas,
+ .smenufull_arhaut{
+ display:none;
+ }
+ }
+ }
+
+ }
+ }
+}
+
+
+
+
+
+
+
+
+/*
+ * Slider Home page
+ */
+
+
+
+section#intro {
+ margin-top: 57px;
+ width: inherit;
+ background: #778899 url("../images/introbkg.png") repeat-x;
+ .background-size(100%);
+ .border-radius(5px,5px,5px,5px);
+
+ section{
+ width:100%;
+ }
+
+ ul li {
+ width:960px;
+ height:220px;
+ margin:0;
+ padding:0;
+
+ .one.product section.outerblock {
+ height:inherit;
+ width:inherit;
+ }
+ }
+
+ h1,
+ h2,
+ p {
+ position: relative;
+ z-index: 9999;
+ width: 800px;
+ padding: ...
[truncated message content] |
|
From: <os...@us...> - 2013-06-22 15:19:20
|
Revision: 4748
http://sourceforge.net/p/oscss/svn/4748
Author: oscim
Date: 2013-06-22 15:19:16 +0000 (Sat, 22 Jun 2013)
Log Message:
-----------
Add element missing
Added Paths:
-----------
trunk/catalog/admin/includes/gabarit/ggsitemap/display_view.construct.gab
trunk/catalog/admin/includes/gabarit/ggsitemap/display_view.page.gab
trunk/catalog/admin/includes/gabarit/mail/display_view.create.gab
trunk/catalog/admin/includes/gabarit/mail/display_view.list.gab
trunk/catalog/admin/includes/gabarit/mail/display_view.mail.view.gab
trunk/catalog/admin/includes/gabarit/orders/filter.products.gab
trunk/catalog/admin/includes/gabarit/orders/shipping/
trunk/catalog/admin/includes/gabarit/shipping/display_view.multi-action.gab
trunk/catalog/admin/includes/gabarit/usersNotif/display_view.listing.gab
trunk/catalog/admin/includes/gabarit/usersNotif/display_view.view.gab
Added: trunk/catalog/admin/includes/gabarit/ggsitemap/display_view.construct.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/ggsitemap/display_view.construct.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/ggsitemap/display_view.construct.gab 2013-06-22 15:19:16 UTC (rev 4748)
@@ -0,0 +1,17 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.0.9
+ @date 22/06/10, 18:12
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('heading title'); ?></h3>
+
+<div class="box_left">
+ <?php foreach(ggsitemap::$list as $item): ?>
+ <p><?php echo $item ?></p>
+ <?php endforeach; ?>
+</div>
\ No newline at end of file
Added: trunk/catalog/admin/includes/gabarit/ggsitemap/display_view.page.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/ggsitemap/display_view.page.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/ggsitemap/display_view.page.gab 2013-06-22 15:19:16 UTC (rev 4748)
@@ -0,0 +1,41 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 14/11/10, 14:19
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('heading title'); ?></h3>
+
+<div class="box_left">
+ <p><strong><?php echo __('overview title google sitemaps'); ?></strong></p>
+
+ <p><?php echo __('overview google sitemaps'); ?></p>
+
+ <p><strong><?php echo __('instructions title google sitemaps'); ?></strong></p>
+
+ <p>
+ <span style="color:#FF0000"><?php echo __('instructions step1 google sitemaps'); ?></span>
+ <?php echo __('instructions click google sitemaps'); ?>
+ </p>
+ <a class="button fright splitPageLink fancytext iframe" href="<?php echo tep_href_link(ggsitemap::FILENAME, 'action=construct&forceview','NONSSL');?>"><strong><?php echo __('exec google sitemaps'); ?></strong></a>
+ <br /><br /><br /><br /><br />
+
+ <p><?php echo __('instructions note google sitemaps'); ?></p>
+ <br />
+ <p>
+ <span style="color:#FF0000"><?php echo __('instructions step2 google sitemaps'); ?></span>
+ <?php echo __('instructions end2 google sitemaps'); ?>
+ </p>
+
+ <a class="button fright splitPageLink" href="javascript:(void 0)" onclick="window.open('<?php echo ggsitemap::GenerateSubmitURL();?>','google','resizable=1,statusbar=5,width=400,height=200,top=0,left=50,scrollbars=yes')"><strong><?php echo __('exec google sitemaps2'); ?></strong></a>
+</div>
+
+<div class="box_right">
+ <h4><?php echo __('whatis title google sitemaps'); ?></h4>
+ <p><?php echo __('whatis text google sitemaps'); ?></p>
+ <p><?php echo __('whatis register google sitemaps'); ?><strong><a href="https://www.google.com/accounts/ServiceLogin" class="splitPageLink"><?php echo __('exec google sitemaps'); ?></a></strong>.</p>
+</div>
\ No newline at end of file
Added: trunk/catalog/admin/includes/gabarit/mail/display_view.create.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/mail/display_view.create.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/mail/display_view.create.gab 2013-06-22 15:19:16 UTC (rev 4748)
@@ -0,0 +1,100 @@
+<?php
+/**
+ @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 07/05/2012, 14:46
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $oscss;
+
+?>
+<h3><?php echo __('heading title') ?></h3>
+
+<!-- PREVIEW -->
+<?php if (mail::$action == 'preview') : ?>
+ <div class="box_uniq">
+<div class="edit">
+ <?php echo tep_draw_form('mail', FILENAME_MAIL, 'action=send_email_to_user'); ?>
+ <p><?php echo mail::repost() ?></p>
+ <table class="dataTableBase">
+ <tr>
+ <td class="smallText"><strong><?php echo __('text customer'); ?></strong> <?php echo mail::sendto(); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText"><strong><?php echo __('text from'); ?></strong> <?php echo htmlspecialchars(stripslashes($_POST['from'])); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText"><strong><?php echo __('text subject'); ?></strong> <?php echo htmlspecialchars(stripslashes($_POST['subject'])); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText"><strong><?php echo __('text message'); ?></strong><br /><div id="iframe"><?php echo nl2br(strip_tags(stripslashes($_POST['message_form']))); ?></div></td>
+ </tr>
+ </table>
+ <?php echo tep_image_submit('button_send_mail.gif', __('image send email')); ?>
+ </form>
+</div>
+ </div>
+
+<?php else: ?>
+ <!-- FORM -->
+
+ <?php echo tep_draw_form('mail', FILENAME_MAIL, 'action=preview'); ?>
+
+ <div class="box_left">
+ <div class="edit">
+ <fieldset class="block_field">
+ <p class="block_input">
+ <label for="customers_email_address" class="main"><?php echo __('text customer'); ?></label>
+ <?php echo mail::get_list_customers() ?>
+ </p>
+
+ <p class="block_input">
+ <label for="from"><?php echo __('text from'); ?></label>
+ <?php echo tep_draw_input_field('from','', mail::$list->from); ?>
+ </p>
+
+ <p class="block_input">
+ <label for="subject"><?php echo __('text subject'); ?></label>
+ <?php echo tep_draw_input_field('subject','',mail::$list->subject); ?>
+ </p>
+
+ <p class="block_input">
+ <label for="p_format"><?php echo __('text format'); ?></label>
+ <?php echo tep_draw_pull_down_menu('p_format', array(array('id'=>'HTML', 'text'=>'html'),array('id'=>'TEXT', 'text'=>'text')), (isset($_POST['customer']) ? $_POST['customer'] : ''));?>
+ </p>
+
+ <br style="clear:both" />
+ <p class="block_uniq tcenter">
+ <label for="message"><?php echo __('text message'); ?></label>
+ <br style="clear:both" />
+ <?php echo $oscss->_call(BO_WISIWYG_SELECTED,'_draw','message_form','800','400',mail::$list->content); ?>
+ </p>
+
+ </fieldset>
+
+ <br class="clear" />
+ </div>
+ </div>
+
+
+ <div class="box_right">
+ <div class="edit">
+
+ <fieldset class="block_field">
+ <p><?php echo __('txt usage code in mail') ?></p>
+ <div class="button_nav">
+ <?php if (mail::$action == 'preview')echo '<a class="button" href="' . tep_href_link(FILENAME_MAIL) . '">' . IMAGE_CANCEL . '</a> '; ?>
+ <?php echo tep_image_submit('button_send_mail.gif', __('image preview')); ?>
+ </div>
+ </fieldset>
+ <br class="clear" />
+ </div>
+ </div>
+
+
+ </form>
+
+<?php endif; ?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/gabarit/mail/display_view.list.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/mail/display_view.list.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/mail/display_view.list.gab 2013-06-22 15:19:16 UTC (rev 4748)
@@ -0,0 +1,49 @@
+<?php
+/**
+ @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 07/05/2012, 14:46
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $oscss;
+
+?>
+
+<div class="box_uniq">
+
+ <h3><?php echo __('@mail heading title list mail for one user') ?></h3>
+
+<div class="button_nav">
+ <a class="button" href="<?php echo tep_href_link(FILENAME_CUSTOMERS,'action=noedit&cID='.(int)$_GET['cID']) ?>"><?php echo __('@mail customers fiche') ?></a>
+ <a class="button" href="<?php echo tep_href_link(FILENAME_CUSTOMERS,'action=edit&cID='.(int)$_GET['cID']) ?>"><?php echo __('@mail customers edit') ?></a>
+ <a class="button " href="<?php echo tep_href_link(mail::FILENAME,'action=create&customers='.mail::$mInfo->customers->email_address) ?>"><?php echo __('@mail new message') ?></a>
+</div>
+
+ <table class="dataTable">
+ <thead>
+ <tr>
+ <th><?php echo __('@mail table heading date'); ?></th>
+ <th><?php echo __('@mail table heading sens'); ?></th>
+ <th><?php echo __('@mail table heading subject'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach(mail::$mInfo->list as $item){ ?>
+ <tr class="view parent dataTableRow" >
+ <td><strong><?php echo $item->date; ?></strong></td>
+ <td><?php echo $item->sens; ?></td>
+ <td >
+<!-- <span class="view fils fright"> -->
+ <?php echo $item->linkdoc; ?>
+<!-- </span> -->
+ </td>
+ </tr>
+ <?php } ?>
+ </tbody>
+ </table>
+</div>
+
+
Added: trunk/catalog/admin/includes/gabarit/mail/display_view.mail.view.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/mail/display_view.mail.view.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/mail/display_view.mail.view.gab 2013-06-22 15:19:16 UTC (rev 4748)
@@ -0,0 +1,48 @@
+<?php
+/**
+ @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 01/01/2013, 16:16
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $oscss;
+
+// $res =
+
+// print_r(mail::$mInfo->customers);
+?>
+<h3><?php echo __('@mail heading title view mail') ?></h3>
+
+
+
+ <div class="box_uniq">
+<div class="button_nav">
+ <a class="button" href="<?php echo tep_href_link(mail::FILENAME,'action=list&cID='.(int)$_GET['cID']) ?>"><?php echo __('@mail list message customers') ?></a>
+ <a class="button" href="<?php echo tep_href_link(mail::FILENAME,'action=reply&customers='.mail::$mInfo->customers->email_address.'&ID='.$_GET['ID']) ?>"><?php echo __('@mail reply message') ?></a>
+</div>
+
+<div class="edit">
+
+ <table class="" style="width:100%">
+
+ <tr>
+ <td class="smallText"><strong><?php echo __('text from'); ?></strong> <?php echo htmlspecialchars(stripslashes(mail::$mInfo->from)); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText"><strong><?php echo __('text subject'); ?></strong> <?php echo htmlspecialchars(stripslashes(mail::$mInfo->subject)); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText"><strong><?php echo __('text message'); ?></strong><br /><iframe id="iframe" style="width:100%; height:350px" src="<?php echo tep_href_link('document.php','mod=mail&cID='.(int)$_GET['cID'].'&uid='.$_GET['ID'].'') ?>"></iframe></td>
+ </tr>
+
+
+ </table>
+ <?php //echo tep_image_submit('button_send_mail.gif', __('image send email')); ?>
+
+</div>
+ </div>
+
+
Added: trunk/catalog/admin/includes/gabarit/orders/filter.products.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/orders/filter.products.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/orders/filter.products.gab 2013-06-22 15:19:16 UTC (rev 4748)
@@ -0,0 +1,23 @@
+<?php
+/**
+ @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 22/04/2012 ,22:50:08
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $languages_id;
+
+$DB = Database::getInstance();
+$r = $DB->query($sql= "SELECT DISTINCT p.products_id as id, pd.products_name as text FROM ".TABLE_ORDERS_PRODUCTS." p LEFT JOIN ".TABLE_PRODUCTS_DESCRIPTION." pd ON(p.products_id = pd.products_id AND pd.language_id = '".$languages_id."') WHERE pd.products_name IS NOT NULL ");
+?>
+<fieldset>
+ <p >
+ <label for="filters[products]"><?php echo __('@orders text restrict products'); ?></label>
+ <?php echo tep_draw_pull_down_menu('filters[products]', array_merge( array(array('id'=>'', 'text'=>'--')),$r->fetchAllAssoc() ), @$_SESSION['filters']['orders']['products'] ) ; ?>
+ </p>
+</fieldset>
+
+
Added: trunk/catalog/admin/includes/gabarit/shipping/display_view.multi-action.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/shipping/display_view.multi-action.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/shipping/display_view.multi-action.gab 2013-06-22 15:19:16 UTC (rev 4748)
@@ -0,0 +1,58 @@
+<?php
+/**
+ @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 04/03/2012, 11:35
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+ global $mutliactionmenu, $mutliactionchoose;
+// print_r($_POST);
+?>
+<div class="box_uniq block_form main-shipping">
+
+<?php echo tep_draw_form('shipping', shipping::FILENAME, tep_get_all_get_params(array('oID', 'action','forceajax','forceview')) .'action=multi-confirm'); ?>
+ <div>
+
+ Not implemented in this current version
+
+ <p class="block_input">
+ <label for="notify"><?php echo __('@shipping multi action choose'); ?></label>
+ <?php echo $_POST['multiaction']; ?>
+ </p>
+
+ <p class="block_input">
+ <label for="status"><?php echo __('@shipping multi entry status'); ?></label>
+ <?php echo tep_draw_pull_down_menu('status', $mutliactionchoose, ''); ?>
+ </p>
+
+
+ <ul class="block_input">
+ <?php if(isset($_POST['action_multi']) && is_array($_POST['action_multi']) )
+ foreach($_POST['action_multi'] as $oid=>$txt ): ?>
+ <li><?php echo tep_draw_hidden_field('action_multi['.$oid.']', 'action_multi_'.$oid.'', $oid, true).' '.sprintf(__('shipping update n %s') , $oid ) ?></li>
+ <?php endforeach; ?>
+ </ul>
+
+
+ <?php if(isset($_POST['notify']) && $_POST['notify']=='on'): ?>
+ <div class="block_input">
+ <label for="notify"><?php echo __('text info multi notify'); ?></label>
+ <?php echo tep_draw_textarea_field('comments', '', '30', '5', '','style="width:100%"'); ?>
+ </div>
+ <?php endif; ?>
+
+
+ </div>
+
+
+
+ <div class="button_nav">
+ <?php echo tep_image_submit('button_delete.gif', __('image modify multi'), ' onclick="$.fancybox.close();" ') ;?>
+ <?php echo tep_js_back(tep_href_link(shipping::FILENAME), IMAGE_CANCEL);?>
+ </div>
+
+</form>
+</div>
Added: trunk/catalog/admin/includes/gabarit/usersNotif/display_view.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/usersNotif/display_view.listing.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/usersNotif/display_view.listing.gab 2013-06-22 15:19:16 UTC (rev 4748)
@@ -0,0 +1,65 @@
+<?php
+/**
+ @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 09/12/2012, 10:34
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('heading title'); ?></h3>
+
+ <div class="button_nav">
+ <?php printf(CsrtAction::getLink('button_nav', __('image notification config list') ), '', tep_href_link(usersNotif::FILENAME, 'action=config') ,'' ); ?>
+ </div>
+
+<div class="box_uniq">
+ <?php echo tep_draw_form('multi', usersNotif::FILENAME, 'action=multi', 'post') ?>
+ <table class="dataTable">
+ <thead>
+ <tr>
+ <th colspan="2"><?php echo __('table heading notif id'); ?></th>
+ <th><?php echo __('table heading type'); ?></th>
+ <th class="tcenter"><?php echo __('table heading keys'); ?></th>
+ <th class="tcenter"><?php echo __('table heading date'); ?></th>
+ <th class="row_action"><?php echo __('table heading action'); ?></th>
+ </tr>
+ </thead>
+ <tfoot>
+ <tr>
+ <td colspan="2"><?php echo tep_draw_checkbox_field('select_all', 'select_all' ); ?></td>
+ <td colspan="4"><?php printf(CsrtAction::getButton('button_action', IMAGE_DELETE, 'delete'), '', ' name="delete" ' ); ?></td>
+ </tr>
+ </tfoot>
+ <tbody>
+ <?php foreach(usersNotif::$list as $notif): ?>
+ <tr class="view parent dataTableRow <?php if ((!isset($_GET['mID'])) || ($_GET['mID'] == $notif['admin_id']) ) echo "Selected"; ?>" >
+ <td><?php echo tep_draw_checkbox_field('multi['.$notif['notif_id'].']', 'multi_'.$notif['notif_id'] ,'','','','class="multi"' ); ?></td>
+ <td><?php echo $notif['notif_id']; ?></td>
+ <td><?php echo ($notif['notif_type']==0)? __('type user') : __('type group') ; ?></td>
+ <td class="tcenter"><?php echo $notif['notif_key']; ?></td>
+ <td class="tcenter"><?php echo tep_datetime_short($notif['notif_date']); ?></td>
+ <td class="w_20">
+ <?php
+ printf(
+ CsrtAction::getFormat('row_action'),
+ ((isset($notif['customers_id']) && !empty($notif['customers_id']) )
+ ?tep_customers_row_action($notif['customers_id'], array('origin'=>usersNotif::FILENAME))
+ : (!empty($notif['user_email'])? ' <a href="mailto:'.$notif['user_email'].'" >'.$notif['user'].'</a>' : '')
+ ),
+
+// sprintf(CsrtAction::getLink('row_action_right', __('@usersNotif image reload mail'), 'reload'), '', tep_href_link(FILENAME_MAIL, 'customer='..'action=usemod&mod=usersNotif&id=' . $notif['notif_id'] . '') ,'' ).
+ sprintf(CsrtAction::getLink('row_action_right', IMAGE_VIEW, 'view'), 'fancyView', tep_href_link(usersNotif::FILENAME, 'nID=' . $notif['notif_id'] . '&action=view') ,'' ).
+ sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), '', tep_href_link(usersNotif::FILENAME, 'nID=' . $notif['notif_id'] . '&action=delete') ,'' )
+
+ );
+ ?>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+ </form>
+</div>
\ No newline at end of file
Added: trunk/catalog/admin/includes/gabarit/usersNotif/display_view.view.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/usersNotif/display_view.view.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/usersNotif/display_view.view.gab 2013-06-22 15:19:16 UTC (rev 4748)
@@ -0,0 +1,15 @@
+<?php
+/**
+ @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.0
+ @date 11/02/11, 09:43
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+?>
+<div class="box_uniq">
+ <?php echo usersNotif::get_right_bar(); ?>
+</div>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-06-22 15:18:41
|
Revision: 4747
http://sourceforge.net/p/oscss/svn/4747
Author: oscim
Date: 2013-06-22 15:18:36 +0000 (Sat, 22 Jun 2013)
Log Message:
-----------
Add element missing
add base begin/commit transaction in sqlproduct class
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/drivers/sqlproduct.php
Added Paths:
-----------
trunk/catalog/admin/includes/classes/drivers/sqlcontentextra.php
trunk/catalog/admin/includes/gabarit/ggsitemap/
trunk/catalog/admin/includes/gabarit/mail/
trunk/catalog/admin/includes/gabarit/usersNotif/
trunk/catalog/admin/includes/modules/pages/usersNotif.php
trunk/catalog/admin/includes/modules/shipping/flat.php
Added: trunk/catalog/admin/includes/classes/drivers/sqlcontentextra.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcontentextra.php (rev 0)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcontentextra.php 2013-06-22 15:18:36 UTC (rev 4747)
@@ -0,0 +1,174 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @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 12/02/2013, 20:11
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+
+*/
+
+
+
+
+class sqlcontentextra
+ implements ModSqlDataDriver{
+
+
+ /**
+ @brief create new ligne in table configuration
+ */
+ public static function create($option){
+
+// if(!isset($option['key'])) return 'key';
+
+ if(isset($option['id'])) $sql_data_array['content_id'] = $option['id'];
+ if(isset($option['key'])) $sql_data_array['cat_key'] = strtoupper($option['key']);
+ if(isset($option['value'])) $sql_data_array['cat_value '] = $option['value'];
+
+
+ $res=tep_db_perform(TABLE_CONTENT_EXTRA, $sql_data_array);
+
+ if(!$res)
+ return $res;
+ else
+ return $res->__get('insertId');
+ }
+
+
+
+ /**
+ @brief update ligne in table configuration
+ */
+ public static function update($option){
+
+// if(!isset($option['id'])) return ' id';
+
+ $where ='';
+ if(isset($option['id'])) $where .="AND content_id = '".(int)$option['id']."' ";
+ if(isset($option['key'])) $where .="AND cat_key = '".(string)strtoupper(tep_db_input($option['key']))."' ";
+
+ if(isset($option['id'])) $sql_data_array['content_id'] = $option['id'];
+ if(isset($option['key'])) $sql_data_array['cat_key'] = $option['key'];
+ if(isset($option['value'])) $sql_data_array['cat_value '] = $option['value'];
+
+
+
+
+ $res=tep_db_perform(TABLE_CONTENT_EXTRA, $sql_data_array, 'update' , substr($where,3) );
+
+ return $res;
+ }
+
+ /**
+ @brief load ligne in table configuration
+ @param option array
+ id => row id int (configuration_id)
+ key => string key (configuration_key)
+ group_id => group_id int (configuration_group_id)
+
+ @return
+
+ object(stdClass)[13]
+ public 'id' => string '1' (length=1)
+
+ OR
+ array(
+ object(stdClass)[13]
+ ...
+ object(stdClass)[13]
+ ..
+ )
+
+ */
+ public static function fetch($option,$shortkey=false){
+ $DB=Database::getInstance();
+
+ $sql ="";
+ if(isset($option['id'])) $sql .="AND content_id = '".(int)$option['id']."' ";
+ if(isset($option['key'])) $sql .="AND cat_key = '".(string)strtoupper(tep_db_input($option['key']))."' ";
+
+ if($sql =='')
+ return false;
+
+ $sql ="SELECT * FROM ".TABLE_CONTENT_EXTRA." WHERE ".substr($sql,3);
+
+ $res=$DB->query($sql);
+
+ $num = $res->__get('numRows');
+
+ if($num == 1){
+ $result=$res->fetchAssoc();
+ return ((!$shortkey)? $result : self::CleanKey($result));
+ }
+ elseif($num > 1){
+ $array=array();
+
+ foreach($res->fetchAllAssoc() as $result)
+ $array[]= ((!$shortkey)? $result : self::CleanKey($result));
+
+ return $array;
+ }
+
+ return false;
+ }
+
+ /**
+ @brief delete row
+ */
+ public static function delete($option){
+ $DB=Database::getInstance();
+
+ $sql ="";
+ if(isset($option['id'])) $sql .="AND content_id = '".(int)$option['id']."' ";
+ if(isset($option['key'])) $sql .="AND cat_key = '".(string)tep_db_input($option['key'])."' ";
+
+ if(strlen($sql)==0)
+ return false;
+
+ $sql ="DELETE FROM ".TABLE_CONTENT_EXTRA." WHERE ".substr($sql,3);
+
+ $res=$DB->query($sql);
+
+ return $res;
+ }
+
+ /**
+ @fn CleanKey()
+ @brief Clean string name key
+ */
+ private static function CleanKey($array){
+
+ $object= new stdclass();
+
+ foreach($array as $key=>$value){
+
+ $object->$key = $value;
+ }
+
+ return $object;
+ }
+
+ /**
+ @brief
+ @return array empty
+ */
+ public static function Specimen($shortkey=false){
+
+ $par = array(
+ 'content_id' =>-1,
+ 'cat_key' =>'',
+ 'cat_value' =>'',
+
+ );
+
+ return ((!$shortkey)? $par : self::CleanKey($par));
+ }
+
+}
+
+
+
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/classes/drivers/sqlproduct.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlproduct.php 2013-06-22 08:11:54 UTC (rev 4746)
+++ trunk/catalog/admin/includes/classes/drivers/sqlproduct.php 2013-06-22 15:18:36 UTC (rev 4747)
@@ -41,9 +41,12 @@
self::getInstance();
$DB=Database::getInstance();
-
+ $error=0;
// if(!isset($option['key'])) return 'key';
+ $DB->beginTransaction();
+
+
$languages_id = $option['language_id'];
$type = (isset($option['type']))? $option['type'] : 1;
@@ -57,24 +60,36 @@
);
$resobj=tep_db_perform(TABLE_PRODUCTS, $sql_data_array);
+ if(!$resobj){
+ $DB->rollbackTransaction();
+ return false;
+ }
+
$products_id = $resobj->__get('insertId');
+ $res = $DB->query("insert into " . TABLE_PRODUCTS_TO_CATEGORIES . " (products_id, categories_id) values ('" . (int)$products_id . "', '".ORPHELIN_COLLECTOR."')");
+ if(!$res)
+ $error++;
- $DB->query("insert into " . TABLE_PRODUCTS_TO_CATEGORIES . " (products_id, categories_id) values ('" . (int)$products_id . "', '".ORPHELIN_COLLECTOR."')");
-
$list_languages=tep_get_languages();
for ($i=0, $n=sizeof($list_languages); $i<$n; $i++) {
$language_id = $list_languages[$i]['id'];
$sql_data_array = array('products_name' => '','products_id' => $products_id, 'language_id' => $language_id);
$res=tep_db_perform(TABLE_PRODUCTS_DESCRIPTION, $sql_data_array);
+ if(!$res)
+ $error++;
}
- if($products_id > 0)
- return $products_id;
- else
- return false;
+ if( $error > 0){
+ $DB->rollbackTransaction();
+ return false;
+ }
+ else{
+ $DB->commitTransaction();
+ return $products_id;
+ }
}
/**
@@ -84,8 +99,9 @@
self::getInstance();
$DB=Database::getInstance();
+ $error=0;
- if(/*!isset($option['action']) &&*/ !isset($option['id'])) return ' id';
+ if(/* !isset($option['action']) &&*/ !isset($option['id'])) return ' id';
$list_languages=tep_get_languages();
$where ='';
@@ -100,7 +116,7 @@
$post['products_id'] = $products_id;
$sql_data_array = $option['sqlarray'];
- if(! self::fetch($option))
+ if(! self::fetch($option) )
$action = 'insert_product';
else
$action = 'update_product';
@@ -108,6 +124,8 @@
/// Call ACA module put post var
self::$modules->load_post_values($post);
+ $DB->beginTransaction();
+
/**
TODO Check des clef des array pour verifier que celle ci existe dans specimen
*/
@@ -115,16 +133,19 @@
$sql_data_array = array_merge($sql_data_array, self::$modules->get_insert_table_products());
- tep_db_perform(TABLE_PRODUCTS, $sql_data_array);
+ if( !tep_db_perform(TABLE_PRODUCTS, $sql_data_array) )
+ $error++;
}
elseif ($action == 'update_product') {
$sql_data_array['products_last_modified'] ='now()';
$sql_data_array = array_merge($sql_data_array, self::$modules->get_update_table_products());
- tep_db_perform(TABLE_PRODUCTS, $sql_data_array, 'update', "products_id = '" . (int)$products_id . "'");
+ if( ! tep_db_perform(TABLE_PRODUCTS, $sql_data_array, 'update',"products_id = '" . (int)$products_id . "'") )
+ $error++;
}
+
/**
TODO Couplage avec MLinkto + datatype actif
*/
@@ -139,7 +160,7 @@
}
if( DataTypes::is_active('featured')) {
if(count($post['linkto']['featured']) > 0)
- sqlfeatured::AddLinkTo(
+ $r = sqlfeatured::AddLinkTo(
array(
'datatype'=> 'product',
'id'=> $products_id,
@@ -147,7 +168,7 @@
)
);
else
- sqlfeatured::AddLinkTo(
+ $r = sqlfeatured::AddLinkTo(
array(
'datatype'=> 'product',
'id'=> $products_id,
@@ -155,6 +176,8 @@
)
);
+// if($r == false)
+// $error++;
}
@@ -186,32 +209,40 @@
for ($i=0, $n=sizeof($list_languages); $i<$n; $i++) {
$language_id = $list_languages[$i]['id'];
-
$sql_data_array = array('products_name' => tep_db_prepare_input($post['products_name'][$language_id]) );
if ($action == 'insert_product') {
- $insert_sql_data = array('products_id' => $products_id, 'language_id' => $language_id);
+ $insert_sql_data = array('products_id' => $products_id, 'language_id' => $language_id);
- $sql_data_array = array_merge($sql_data_array, $insert_sql_data);
- // ACA START INSERT IN PRODUCT_DESCRIPTION TABLE
- $sql_data_array = array_merge($sql_data_array, self::$modules->get_insert_table_products_description ($language_id));
+ $sql_data_array = array_merge($sql_data_array, $insert_sql_data);
+ // ACA START INSERT IN PRODUCT_DESCRIPTION TABLE
+ $sql_data_array = array_merge($sql_data_array, self::$modules->get_insert_table_products_description ($language_id));
- tep_db_perform(TABLE_PRODUCTS_DESCRIPTION, $sql_data_array);
+ if( !tep_db_perform(TABLE_PRODUCTS_DESCRIPTION, $sql_data_array) )
+ $error++;
}
elseif ($action == 'update_product') {
- // ACA START UPDATE PRODUCT_DESCRIPTION TABLE
- $sql_data_array = array_merge($sql_data_array, self::$modules->get_update_table_products_description ($language_id));
+ // ACA START UPDATE PRODUCT_DESCRIPTION TABLE
+ $sql_data_array = array_merge($sql_data_array, self::$modules->get_update_table_products_description ($language_id));
- tep_db_perform(TABLE_PRODUCTS_DESCRIPTION, $sql_data_array, 'update', " products_id = '" . (int)$products_id . "' and language_id = '" . (int)$language_id . "' ");
+ if( ! tep_db_perform(TABLE_PRODUCTS_DESCRIPTION, $sql_data_array, 'update', " products_id = '" . (int)$products_id . "' and language_id = '" . (int)$language_id . "' ") )
+ $error++;
}
}
- /// Call ACA module afetr update
+ /// Call ACA module after update
self::$modules->after_update ($products_id);
- return 1;
+ if( $error > 0){
+ $DB->rollbackTransaction();
+ return false;
+ }
+ else{
+ $DB->commitTransaction();
+ return 1;
+ }
}
/**
@@ -376,8 +407,8 @@
'products_id' => '', // auto incremente
'products_type' => '', // int (0 : default)
- 'products_name' => '', // depend language table
- 'products_description' => '', // depend language table
+ 'products_name' => '', // depend language table
+ 'products_description' => '', // depend language table
'products_url' => '',
'products_quantity' => '',
@@ -435,27 +466,27 @@
$sql = "INSERT INTO " . TABLE_PRODUCTS . " (
- products_type,
- products_quantity,
+ products_type,
+ products_quantity,
products_model,
- products_image,
- products_price,
- products_date_added,
- products_date_available,
- products_weight,
- products_status,
- products_tax_class_id,
+ products_image,
+ products_price,
+ products_date_added,
+ products_date_available,
+ products_weight,
+ products_status,
+ products_tax_class_id,
manufacturers_id
) VALUES (
'" . tep_db_input($product['products_type']) . "',
'" . tep_db_input($product['products_quantity']) . "',
- '" . tep_db_input($product['products_model']) . "',
- '" . tep_db_input($product['products_image']) . "',
- '" . tep_db_input($product['products_price']) . "',
- now(),
- " . (empty($product['products_date_available']) ? "null" : "'" . tep_db_input($product['products_date_available']) . "'") . ",
- '" . tep_db_input($product['products_weight']) . "', '0',
- '" . (int)$product['products_tax_class_id'] . "',
+ '" . tep_db_input($product['products_model']) . "',
+ '" . tep_db_input($product['products_image']) . "',
+ '" . tep_db_input($product['products_price']) . "',
+ now(),
+ " . (empty($product['products_date_available']) ? "null" : "'" . tep_db_input($product['products_date_available']) . "'") . ",
+ '" . tep_db_input($product['products_weight']) . "', '0',
+ '" . (int)$product['products_tax_class_id'] . "',
'" . (int)$product['manufacturers_id'] . "')";
$resobj=$DB->query( $sql );
Added: trunk/catalog/admin/includes/modules/pages/usersNotif.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/usersNotif.php (rev 0)
+++ trunk/catalog/admin/includes/modules/pages/usersNotif.php 2013-06-22 15:18:36 UTC (rev 4747)
@@ -0,0 +1,728 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @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 09/12/2012, 10:34
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class usersNotif
+*/
+error_reporting(E_ALL);
+class usersNotif
+ extends ModTwo /// new abstract class for nextgen module
+ implements
+ InterfaceModule,
+ ExtModConfig,
+ InterfacedTJsonS,
+ InterfacedInnerHtml{
+ /**
+ @def FILENAME
+ */
+ const FILENAME =FILENAME_USERSNOTIF;
+
+// public static $code;
+
+// public static $action;
+ /**
+ @var int current id
+ */
+ public static $Id;
+ /**
+ @var $listConfig array list for config current user
+ */
+ public static $listConfig=array();
+ /**
+ @var $list array list for alert and notification for current user
+ */
+ public static $list=array();
+ /**
+ @var $Info object detail one notification
+ */
+ public static $Info;
+ /**
+ @var $XmlBase object xml simple parser result
+ */
+ protected static $XmlBase;
+ /**
+ @var array info all tabs for filter listings
+ */
+ public static $allfields = array();
+ /**
+ class constructor
+ */
+ public function __construct() {
+ self::GetConf();
+// self::loadXml();
+ }
+
+
+ /**
+ @brief Load , adjust and define var environement exe for module
+ Is use in module and class abstract for init value config this module
+ */
+ public static function GetConf(){
+ global $languages_id;
+
+ self::$code=__CLASS__;
+
+ self::$action=(isset($_REQUEST['action'])? (string)$_REQUEST['action'] : 'listing' );
+ self::$Id=(isset($_REQUEST['cID'])? (int)$_REQUEST['cID'] : 0 );
+
+ /**
+ @remarks define var execution sql in GetDBValue()
+ */
+ self::$InitInfo['adjust']=array(
+ 'languages_id'=>$languages_id,
+ 'page'=>1,
+ 'rowbyp'=>10,
+ 'sOrder'=>'',
+ 'sWhere'=>'',
+ );
+
+
+ if((self::$action =='' || self::$action =='listing') && !defined('JSONSTATMENT') )
+ //! active datatable in ajax, precise les GET necessaire
+ define('JSONSTATMENT', 'ModTwo=true&mod=page&type='.self::$code.
+ (isset(parent::$action)?'&action='.parent::$action : '' ).
+ (isset(self::$Id)?'&file='.self::$Id : '' )
+ );
+
+
+ /**
+ @remarks this define col theader title, and ajust html code
+ Just for Edit listing
+ */
+// self::$allfields = array();
+ self::$allfields['notif_id']=array(
+ 'sort'=>true,
+ 'alias'=>'notif_id',
+ 'text'=>__('@usersNotif table heading notif id'),
+ 'width'=>'2%',
+ 'class'=>'tcenter',
+ 'default'=>true,
+ );
+ self::$allfields['notif_type']= array(
+ 'sort'=>true,
+ 'alias'=>'type',
+ 'text'=>__('@usersNotif table heading type'),
+ );
+ self::$allfields['notif_key']= array(
+ 'sort'=>true,
+ 'alias'=>'nkeys',
+ 'text'=>__('@usersNotif table heading keys'),
+ 'default'=>true,
+ 'width'=>'18%',
+ );
+// self::$allfields['notif_text']= array(
+// 'sort'=>true,
+// 'alias'=>'text',
+// 'text'=>__('@usersNotif table heading text'),
+// 'default'=>true,
+// // 'width'=>'18%',
+// );
+ self::$allfields['notif_date']= array(
+ 'sort'=>true,
+ 'alias'=>'date',
+ 'text'=>__('@usersNotif table heading date'),
+ 'default'=>true,
+ 'width'=>'8%',
+ );
+
+
+
+
+ /**
+ @remarks Construct all list , fields , th/td
+ */
+ self::$InitInfo['theader']['listing']=array(
+ array('width'=>'2%', 'class'=>'tcenter', 'txt'=>' ' ),
+ array('width'=>'2%', 'class'=>'tcenter', 'txt'=>' ' ),
+ );
+ self::$InitInfo['tfooter']['listing']=self::$InitInfo['theader']['listing'];
+
+ self::$InitInfo['modele']['listing']=array(
+ 0=>false,
+ 1=>false,
+ );
+
+
+ // min fields and not view directly colonne fields
+ $listfield = ' notif_id as id, ';
+
+ // put in
+ if(isset($_SESSION['filters'][__CLASS__]['allfields']))
+ $_SESSION['filters']['allfields'] = $_SESSION['filters'] [__CLASS__]['allfields'];
+ else
+ $_SESSION['filters']['allfields'] = array();
+
+ $in_session = $_SESSION['filters']['allfields'];
+
+ $i = 0;
+ // check and appli
+ foreach(self::$allfields as $key=>$row){
+ $clean = substr($key, (strpos($key, '.')+1));
+
+ if(is_array($row)){
+ $txt = $row['text'];
+ $alias = (isset($row['alias'])? $row['alias'] : $clean);
+ $css = (isset($row['class'])? $row['class'] : 'tcenter');
+ $width = (isset($row['width'])? $row['width'] : '5%');
+ }
+ else{
+ $txt = $row;
+ $alias = $clean;
+ $css = 'tcenter';
+ $width = '5%';
+ }
+
+ if(
+ ( isset($in_session[$alias]) && (string)$in_session[$alias] == 'on' )
+ || ( count($in_session) <=1 && ( is_array($row) && isset($row['default']) && $row['default'] == true) )
+ ) {
+ $_SESSION['filters']['allfields'][$alias] = 'on';
+ /**
+ @remarks this define col theader title, and ajust html code
+ */
+ self::$InitInfo['theader']['listing'][]= array( 'width'=>$width, 'class'=>$css, 'txt'=>$txt);
+ self::$InitInfo['tfooter']['listing'][]= array( 'width'=>$width, 'class'=>$css, 'txt'=>$txt );
+ /**
+ @remarks this define col in table, and if is possible sort
+ */
+ self::$InitInfo['modele']['listing'][$alias]=((isset($row['sort']) && $row['sort'] == true) ? true : false );
+
+ if($clean !=$alias)
+ $listfield .=$key.' as '.$alias.',';
+ else
+ $listfield .=$key.',';
+ $i++;
+ }
+ }
+
+
+ self::$InitInfo['modele']['listing']['action']=false;
+ self::$InitInfo['theader']['listing']['action']= array( 'class'=>'row_action', 'txt'=>__('@usersNotif table heading action') );
+ self::$InitInfo['tfooter']['listing']['action']= array( 'class'=>'row_action', 'txt'=>__('@usersNotif table heading action') );
+
+ // add subligne in tfooter for multi action
+ if(!isset(self::$InitInfo['tfooter']['listing_multi'])) {
+ self::$InitInfo['tfooter']['listing_multi'] = array();
+ self::$InitInfo['tfooter']['listing_multi'][] = array( 'colspan' => 2, 'class'=>'row_action', 'txt'=>tep_draw_checkbox_field('select_all', 'select_all' ) );
+ self::$InitInfo['tfooter']['listing_multi'][] = array( 'colspan' => ($i+1), 'class'=>'row_action', 'txt'=>sprintf(CsrtAction::getButton('button_action', IMAGE_DELETE, 'delete'), '', ' name="multi_action" ' ) );
+ }
+
+ self::$InitInfo['allfields']['listing'] = self::$allfields ;
+
+
+
+
+
+ /**
+ @remarks Put detail for listing methode
+ */
+ self::$InitInfo['adjust']['listfields'] = substr($listfield, 0,-1);
+
+ /**
+ @remarks Active forms filter
+ */
+ self::$InitInfo['tfilter']['listing'] = array();
+ self::$InitInfo['tfilter']['listing'][]=array( 'type'=>'listfield' );
+
+
+ return true;
+ }
+
+
+ public function check_action($actions){
+ global $messageStack, $oscss;
+
+ self::$action=$actions;
+ $DB=Database::getInstance();
+
+ switch (self::$action) {
+
+ /**
+ @remarks specific save in session value filters
+ */
+ case 'filters':
+ $_SESSION['filters'] =array();
+
+
+ foreach($_POST['filters']['listfield'] as $key=>$row){
+ if( $row =='on' )
+ $_SESSION['filters'][__CLASS__]['allfields'][$key] = 'on';
+ else
+ unset($_SESSION['filters'][__CLASS__]['allfields'][$key]);
+ }
+
+
+ tep_redirect(tep_href_link(self::FILENAME));
+ break;
+
+
+
+
+ /**
+ @remarks action multi
+ */
+ case 'multi':
+
+ if(isset($_POST['action_multi']) && is_array($_POST['action_multi']) )
+
+ foreach($_POST['action_multi'] as $k=>$v) {
+
+ echo $nID=tep_db_prepare_input($k);
+
+ $r=$DB->query($sql="DELETE FROM ".TABLE_ADMIN_NOTIFICATION." WHERE notif_id='".(int)$nID."' AND ( ( notif_type='0' and user_id='".$_SESSION['login_id']."') OR (notif_type='1' and user_id='".$_SESSION['login_groups_id']."') ) LIMIT 1");
+
+ }
+
+ tep_redirect(tep_href_link(self::FILENAME));
+ break;
+
+
+ case 'delete':
+ $nID=tep_db_prepare_input($_GET['cID']);
+
+ if( $DB->query($sql="DELETE FROM ".TABLE_ADMIN_NOTIFICATION." WHERE notif_id='".(int)$nID."' AND ( ( notif_type='0' and user_id='".$_SESSION['login_id']."') OR (notif_type='1' and user_id='".$_SESSION['login_groups_id']."') ) LIMIT 1") )
+ $messageStack->add_session(__('success notif detail delete'), 'success');
+
+ tep_redirect(tep_href_link(self::FILENAME));
+ break;
+ default:
+
+ }
+
+ return self::$action;
+ }
+
+ public function get_header(){ return false;}
+
+
+
+ /**
+ @fn featured::GetDBValue();
+ @brief return DB value adapted for current action
+ Use self::action for determine switch
+ @return
+ */
+ public static function GetDBValue(){
+
+ $DB=Database::getInstance();
+
+
+ $action=self::$action;
+
+ switch ($action) {
+
+ /**
+ @remarks Ajax View result
+ */
+ case 'setflag':
+ break;
+ case 'viewflag':
+ break;
+
+
+ /**
+ @remarks Normal View Page
+ */
+ case 'view':
+// global $language_id;
+//
+// if( (int)self::$Id > 0) {
+// self::$Info = sqlcontent::fetch(array('id'=>self::$Id,'language_id'=>$language_id), true);
+// }
+// else{
+// self::$Info = sqlcontent::Specimen(true);
+// }
+//
+// if (!isset(self::$Info->status)) self::$Info->status = '1';
+// switch (self::$Info->status) {
+// case '0': self::$enabled_status = false; self::$disabled_status = true; break;
+// case '1':
+// default: self::$enabled_status = true; self::$disabled_status = false;
+// }
+ $DB=Database::getInstance();
+ $res=$DB->query($sql="SELECT notif_id,notif_type,user_id,notif_key,notif_data,notif_text, notif_date FROM ".TABLE_ADMIN_NOTIFICATION." WHERE notif_id='".(int)self::$Id ."' AND ( ( notif_type='0' and user_id='".$_SESSION['login_id']."') OR (notif_type='1' and user_id='".$_SESSION['login_groups_id']."') )");
+ self::$Info=new objectInfo($res->fetchAssoc());
+
+ break;
+
+ default:
+
+
+ /**
+ @remarks retrun object load one inventaire
+ */
+ global $query_numrows, $languages_id;
+ $adjust=new objectInfo(self::$InitInfo['adjust']);
+
+
+ /**
+ @remarks replace id by name col
+ */
+ if(!empty($adjust->sWhere)) {
+
+ foreach(self::$allfields as $key=>$row){
+ if(is_array($row) && isset($row['alias']) ){
+ $k[] = '#[(]'.$row['alias'].'[)]#i';
+ $k[] = '# '.$row['alias'].' #i';
+ $k[] = '# \.'.$row['alias'].'#i';
+
+ $v[] = '('.$key.')';
+ $v[] = ' '.$key.' ';
+ $v[] = '.'.$key.' ';
+ }
+ }
+
+ if(isset($k))
+ $adjust->sWhere = preg_replace($k,$v, $adjust->sWhere);
+ }
+
+
+ $query_raw = "SELECT ".$adjust->listfields.", notif_data FROM " . TABLE_ADMIN_NOTIFICATION . " " ;
+
+ $query_raw .="WHERE ( notif_type='0' and user_id='".$_SESSION['login_id']."') OR (notif_type='1' and user_id='".$_SESSION['login_groups_id']."') ";
+ $query_raw .=((strlen($adjust->sWhere)>4) ? " ".substr($adjust->sWhere, 3) : '');
+
+
+ $query_raw .=" ORDER BY ".((!empty($adjust->sOrder)) ? $adjust->sOrder : ' notif_date DESC ');
+
+ $_split = new splitPageResults($adjust->page, $adjust->rowbyp, $query_raw, $query_numrows);
+ $_query = $DB->query($query_raw);
+
+ $res=self::FormatDBValue($_query);
+
+ return $res;
+
+ }
+ }
+
+
+
+ public static function load_db_config($ID){
+ $DB=Database::getInstance();
+ $res=$DB->query($sql="SELECT * FROM ".TABLE_NOTIFICATION." WHERE chknotif_id='".(int)$ID."' AND ( ( chknotif_uniq='0' and chknotif_user='".$_SESSION['login_id']."') OR (chknotif_uniq='1' and chknotif_user='".$_SESSION['login_groups_id']."') )");
+ self::$Info=new objectInfo($res->fetchAssoc());
+ }
+
+
+
+ /**
+ @fn display_view()
+ @brief this methode is switch for call gabarit action
+ */
+ public function display_view(){
+ $action=self::$action;
+
+ switch ($action) {
+
+ /**
+ @remarks Ajax View result
+ */
+// case 'setflag':
+// return self::RowStatus(array('status'=>(int)$_GET['flag'], 'id'=>(int)self::$Id));
+// break;
+// case 'viewflag':
+// return self::RowHidden(array('hidden'=>(int)$_GET['flag'], 'id'=>(int)self::$Id));
+// break;
+
+
+ /**
+ @remarks Normal View Page
+ */
+
+// case 'delete':
+// self::GetDBValue(self::$Id);
+// return MGabCont::CallGab(self::$action,__FUNCTION__,__CLASS__);
+// break;
+ case 'view':
+ self::GetDBValue(self::$Id);
+ return tep_get_include_contents(self::$code.'/display_view.view');
+ break;
+ default:
+ self::$list=self::tep_get_list();
+ /// use master gabarit
+ MGabCont::SetCurrentName(__CLASS__);
+ return MGabCont::CallGab('listing',__FUNCTION__,self::MASTER);
+ }
+
+ }
+
+
+
+
+ /** public static InterfacedTJsonS */
+
+
+
+
+ /**
+ @fn tep_get_list($page=1,$rowbyp=10,$sOrder='',$sWhere='',$options='')
+ @brief Constructeur listing element cms content
+ @param $page integer default(1) split page
+ @param $rowbyp integer default(10) nbr line in page
+ @param $sOrder string | null
+ @param $sWhere string | null
+ @param $options array
+ @return Array
+ */
+ 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 ; //= count($res);
+
+ return $res;
+ }
+
+
+
+ /** static InterfacedInnerHtml */
+
+ /**
+ @fn detail_row_page($id)
+ @brief call Ajax , detail of line in listing
+ @param $id int content_id
+ */
+ public static function detail_row_page($id){
+ self::$action ='detail';
+
+ self::GetConf();
+
+ self::$Id= (int)$id;
+
+ self::GetDBValue();
+
+ return MGabCont::CallGab('inline','display_view',__CLASS__);
+
+ }
+
+ /**
+ @fn get_item_action($content)
+ @brief private model for row action
+ @param $content array
+ */
+ public static function ButtonRowsActions($content){
+ return sprintf(
+ CsrtAction::getFormat('row_action'),
+ '' ,
+ sprintf(CsrtAction::getLink('row_action_right', IMAGE_VIEW, 'view'), 'fancy', tep_href_link(self::FILENAME, 'cID=' . $content['id'] . '&action=view') ,'' ).
+ sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), '', tep_href_link(self::FILENAME, 'cID=' . $content['id'] . '&action=delete') ,'' )
+ );
+ }
+
+
+ /**
+ @brief return Filename
+ */
+ public static function GetFILENAME(){
+ return self::FILENAME;
+ }
+
+
+ /**
+ @brief redefine model
+ */
+ public static function tep_get_modele(){
+ self::GetConf();
+ return self::$InitInfo['modele']['listing'];
+ }
+
+
+ /**
+ @brief format db value for display page
+ @param $_query ressource db sql
+ @return array
+ */
+ private static function FormatDBValue($_query){
+ $DB=Database::getInstance();
+ $res=array();
+
+ switch (self::$action) {
+ case 'edit';
+ global $query_numrows,$languages_id;
+
+ break;
+ case 'listing':
+ global $query_numrows,$languages_id;
+
+ while ($item = $_query->fetchAssoc()) {
+ $ord = array();
+ $item[1]=tep_draw_checkbox_field('action_multi['.$item['id'].']','action_mutli_'.$item['id'],$item['id'],'','','class="multi"');
+
+ foreach(self::$InitInfo['modele']['listing'] as $k=>$row){
+ if($k == 'action') $ord[$k]=self::ButtonRowsActions($item);
+ elseif(in_array($k,array('date') ) )$ord[$k]=((isset($item[$k]) && $item[$k] !='1000-01-01 00:00:00' )? tep_date_short($item[$k]) : '' );
+ else $ord[$k]=$item[$k];
+ }
+
+ $ord[0]=$item['id'];
+
+
+ $res[]=$ord;
+ }
+ break;
+ }
+
+ return $res;
+ }
+
+
+ public static function get_right_bar(){
+ $heading=$contents=array();
+
+ switch(self::$action){
+
+ case 'view':
+// self::load_db_values((int)$_GET['nID']);
+
+ $heading[] = array('text' => __('heading notification view') );
+ $contents[] = array('text' => '<label>' . __('text info key notif') . '</label>' . self::$Info->notif_key);
+ $contents[] = array('text' => '<label>' . __('text info date notif') . '</label>' . tep_datetime_short(self::$Info->notif_date) );
+ $contents=array_merge($contents, self::detailSupll(self::$Info->notif_data));
+ $contents[] = array('text' => '<label>' . __('text info content notif') . '</label>' . self::$Info->notif_text);
+
+ $contents[] = array('class'=>'button_nav','text' =>
+ sprintf(CsrtAction::getLink('button_nav', IMAGE_DELETE), 'ActionYes', tep_href_link(usersNotif::FILENAME, 'nID=' . self::$Info->notif_id . '&action=delete') ,'' ).
+ tep_js_back(tep_href_link(self::FILENAME, 'nID=' . self::$Info->notif_id ), IMAGE_BACK)
+ );
+ break;
+ default:
+ }
+
+ if ( (tep_not_null($heading)) && (tep_not_null($contents)) ) {
+ $box = new box;
+ return $box->infoBox($heading, $contents);
+ }
+ }
+
+
+/** Specific module */
+
+ /**
+ @fn detailSupll($data)
+ @brief display content supp in data
+ @param $data string GET
+ @return array $contents
+ */
+ private static function detailSupll($data){
+ if(empty($data)) return array();
+ $array=tep_extrac_querystring($data);
+ $contents=array();
+
+ foreach($array as $k=>$item)
+ if(tep_not_null($item)) {
+ switch($k) {
+ case 'customers_id';
+ $contents[] = array('text' => tep_customers_row_action($item) );
+ break;
+ default:
+ $contents[] = array('text' => '<label>' . $k . ' : </label>' . $item );
+ }
+ }
+
+ return $contents;
+ }
+
+ /**
+ @fn loadNotifUser()
+ @brief call user notification current user
+ */
+ private static function loadNotifUser(){
+ if(is_array(self::$list) && count(self::$list)>0 ) return self::$list;
+ $DB=Database::getInstance();
+ $res=$DB->query($sql="SELECT notif_id,notif_type,user_id,notif_key,notif_data,notif_text,notif_date FROM ".TABLE_ADMIN_NOTIFICATION." WHERE ( notif_type='0' and user_id='".$_SESSION['login_id']."') OR (notif_type='1' and user_id='".$_SESSION['login_groups_id']."') ORDER BY notif_date ASC");
+
+ $list=$res->fetchAllAssoc();
+
+ foreach($list as $notif){
+ if(isset($notif['notif_data'])) self::$list[]=array_merge((array)$notif, (array)tep_extrac_querystring($notif['notif_data']));
+ else self::$list[]=$notif;
+ }
+ return self::$list;
+ }
+
+
+
+ /**
+ @fn loadXml()
+ @brief load xml base method and action defaut
+ */
+// private static function loadXml(){
+// global $messageStack;
+//
+// $FeedUrl = DIR_FS_ROOT_DOCS.'admin/data/notification_src.xml';
+//
+// if(!$SimpleParser = @simplexml_load_file($FeedUrl))
+// $messageStack->add_session( __('Flux introuvable'), 'error');
+//
+// self::$XmlBase = $SimpleParser;
+// }
+
+ /**
+ @fn XmlMethod()
+ @brief call method possible for alert
+ @return array for tep_pulldown
+ */
+// private static function XmlMethod(){
+// if(!is_object(self::$XmlBase)) return array();
+// $array=array();
+//
+// foreach(self::$XmlBase->method->mode as $item)
+// $array[]=array('id'=>(string)$item,'text'=>(string)$item);
+//
+// return $array;
+// }
+
+ /**
+ @fn XmlAction()
+ @brief call action possible for alert
+ @return array for tep_pulldown
+ */
+// private static function XmlAction(){
+// if(!is_object(self::$XmlBase)) return array();
+// $array=array();
+//
+// foreach(self::$XmlBase->metier->action as $item)
+// $array[]=array('id'=>(string)$item,'text'=>(string)$item);
+//
+// return $array;
+// }
+
+ /**
+ @fn CountNotif()
+ @brief call count notification for current user
+ */
+ public static function CountNotif(){
+ self::loadNotifUser();
+ return count(self::$list);
+ }
+
+/** Interface module */
+
+ function check() { return false; }
+ function install() { return false; }
+ function remove() { return false; }
+ function keys() { return false; }
+}
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/modules/shipping/flat.php
===================================================================
--- trunk/catalog/admin/includes/modules/shipping/flat.php (rev 0)
+++ trunk/catalog/admin/includes/modules/shipping/flat.php 2013-06-22 15:18:36 UTC (rev 4747)
@@ -0,0 +1,222 @@
+<?php
+/**
+ @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 111/05/2012, 12:45
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+
+
+class flat {
+ /**
+ @var code, name classe
+ */
+ public $code;
+ /**
+ @var title
+ */
+ public $title;
+ /**
+ @var string , description
+ */
+ public $description;
+ /**
+ @var
+ */
+ public $icon;
+ /**
+ @var position for user module
+ */
+ public $sort_order;
+ /**
+ @var
+ */
+ public $tax_class;
+ /**
+ @var activate module
+ */
+ public $enabled = true;
+ /**
+ @var use in gabarit file
+ */
+ public static $current;
+ /**
+ @var use shipping/delivery saterday
+ */
+ public $with_saterday = false;
+ /**
+ @var use shipping/delivery sunday
+ */
+ public $with_sunday = false;
+
+
+ /**
+ @brief class constructor
+ */
+ public function __construct() {
+ $this->code =__CLASS__;
+ $this->title = __('module shipping flat text title');
+ $this->description = __('module shipping flat text description');
+ $this->sort_order = (defined('MODULE_SHIPPING_FLAT_SORT_ORDER')? MODULE_SHIPPING_FLAT_SORT_ORDER : 0) ;
+ $this->icon = ( (defined('MODULE_SHIPPING_FLAT_ICON') && tep_not_null('MODULE_SHIPPING_FLAT_ICON') ) ? MODULE_SHIPPING_FLAT_ICON : '');
+ $this->tax_class = (defined('MODULE_SHIPPING_FLAT_TAX_CLASS')?MODULE_SHIPPING_FLAT_TAX_CLASS: 0);
+ $delai = (defined('MODULE_SHIPPING_FLAT_MIN_DELAI')? MODULE_SHIPPING_FLAT_MIN_DELAI: 0);
+
+
+ self::$current= array(
+ 'id' => $this->code,
+ 'title' => $this->title,
+ 'icon'=>tep_image($this->icon, $this->title),
+ 'with_saterday' => $this->with_saterday,
+ 'min_delai' => $delai,
+ );
+
+ $array = shippingUtility::getDelai( $delai );
+
+ self::$current['delai'] = $array['delai'];
+ self::$current['date_remise_provider'] = $array['date_dep'];
+ self::$current['date_delivery'] = $array['date_liv'];
+ }
+
+
+ /**
+ @brief after save table order, adjust modules data save
+ @param $id int order id
+ */
+ public function after_update($id){
+
+ if(empty($id) || (int)$id >0 ){
+ return true;
+ }
+
+// exit;
+ return false;
+ }
+
+ /**
+ @brief load specific data modules
+ */
+ public function load_post_values(){
+ }
+
+ /**
+ @brief load specific data modules
+ */
+ public function load_db_value(){
+ }
+
+ /**
+ @brief retrun html view data modules
+ */
+ public function display_view(){
+// if (tep_not_null(orders::$order->info['cc_type']) || tep_not_null(orders::$order->info['cc_owner']) )
+
+
+
+ return MGabCont::CallGab('view','shipping/'.__CLASS__,'orders');
+ }
+
+ /**
+ @brief retrun html view form data modules
+ */
+ public function display_edit(){
+ return MGabCont::CallGab('edit','shipping/'.__CLASS__,'orders');
+ }
+
+
+ public function get_error() {
+ return false;
+ }
+
+
+ /**
+ @remarks implements InterfaceModule depend
+ if module twin in backoffice, report all content install in the other module
+ public function check() {return true;}
+ public function install() {return true;}
+ public function remove() {return true;}
+ public function keys() {return array(); }
+ */
+
+ /**
+ @fn check()
+ @brief test if count all var , and keys is equal
+ @return boolean true/false
+ */
+ public function check() {
+ if (!isset($this->_check)) {
+ $check_query = tep_db_query("select configuration_value from " . TABLE_CONFIGURATION . " where configuration_key LIKE 'MODULE_SHIPPING_FLAT%' ");
+ if( tep_db_num_rows($check_query) == count($this->keys()) ) $this->_check=true;
+ else {
+ $this->remove();
+ $this->_check=false;
+ }
+ }
+ return $this->_check;
+ }
+
+
+ /**
+ @fn keys()
+ @return array all key configuration define by this module
+ */
+ public function keys() {
+ return array(
+ 'MODULE_SHIPPING_FLAT_COST',
+ 'MODULE_SHIPPING_FLAT_HANDLING',
+ 'MODULE_SHIPPING_FLAT_TAX_CLASS',
+ 'MODULE_SHIPPING_FLAT_ZONE',
+ 'MODULE_SHIPPING_FLAT_MIN_DELAI',
+ 'MODULE_SHIPPING_FLAT_SORT_ORDER',
+ 'MODULE_SHIPPING_FLAT_ICON'
+ );
+ }
+
+ /**
+ @fn install()
+ @brief add all configuration
+ @note
+ - Modules can emarquer sql installation instructions, however, in the case of transverse information, or dependent of an extension, preferring the implementation of an extension, file with sql independent
+ - please, pefix all var configuration by 'MODULE_OT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content install in the other module
+ - Not use language in DB , but function :__()
+ for MODULE_TOTO_ST
+ var title MODULE_TOTO_ST_S (small description)
+ var description MODULE_TOTO_ST_L (long description)
+ */
+ public function install() {
+ $DB=Database::getInstance();
+
+ $DB->query($sql="INSERT IGNORE INTO " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('MODULE_SHIPPING_FLAT_COST_S', 'MODULE_SHIPPING_FLAT_COST', '2.50', 'MODULE_SHIPPING_FLAT_COST_L', '6', '0', now())");
+
+ $DB->query("INSERT IGNORE INTO " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('MODULE_SHIPPING_FLAT_HANDLING_S', 'MODULE_SHIPPING_FLAT_HANDLING', '', 'MODULE_SHIPPING_FLAT_HANDLING_L', '6', '0', now())");
+
+ $DB->query("INSERT IGNORE INTO " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added, use_function,set_function) values ('MODULE_SHIPPING_FLAT_TAX_CLASS_S', 'MODULE_SHIPPING_FLAT_TAX_CLASS', '', 'MODULE_SHIPPING_FLAT_TAX_CLASS_L', '6', '0', now(),'tep_get_tax_class_title', 'tep_cfg_pull_down_tax_classes(')");
+
+ $DB->query("INSERT IGNORE INTO " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added, use_function,set_function) values ('MODULE_SHIPPING_FLAT_MIN_DELAI_S', 'MODULE_SHIPPING_FLAT_MIN_DELAI', '172800', 'MODULE_SHIPPING_FLAT_MIN_DELAI_L', '6', '0', now(),'tep_get_delai_title', 'tep_cfg_pull_down_delai(' ) ");
+
+ $DB->query("INSERT IGNORE INTO " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added, use_function,set_function) values ('MODULE_SHIPPING_FLAT_ZONE_S', 'MODULE_SHIPPING_FLAT_ZONE', '', 'MODULE_SHIPPING_FLAT_ZONE_L', '6', '0', now(),'tep_get_zone_class_title', 'tep_cfg_pull_down_zone_shipping(')");
+
+ $DB->query("INSERT IGNORE INTO " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('MODULE_SHIPPING_FLAT_SORT_ORDER_S', 'MODULE_SHIPPING_FLAT_SORT_ORDER', '', 'MODULE_SHIPPING_FLAT_SORT_ORDER_L', '6', '0', now())");
+
+ $DB->query("INSERT IGNORE INTO " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added,set_function) values ('MODULE_SHIPPING_FLAT_ICON_S', 'MODULE_SHIPPING_FLAT_ICON', '', 'MODULE_SHIPPING_FLAT_ICON_L', '6', '0', now(),'tep_cfg_choose_img(')");
+ }
+
+ /**
+ @fn remove()
+ @brief delete all configuration
+ @note
+ - please, pefix all var configuration by 'MODULE_PAYMENT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content remove in the other module
+ */
+ public function remove() {
+ $DB=Database::getInstance();
+ $DB->query("delete from " . TABLE_CONFIGURATION . " where configuration_key in ('" . implode("', '", $this->keys()) . "')");
+ }
+
+}
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-06-22 08:12:08
|
Revision: 4746
http://sourceforge.net/p/oscss/svn/4746
Author: oscim
Date: 2013-06-22 08:11:54 +0000 (Sat, 22 Jun 2013)
Log Message:
-----------
Upgrade trunk by 2.1.1 rc new base for dev
Modified Paths:
--------------
trunk/catalog/Documents/modeles/pdf/harry/harry.php
trunk/catalog/Documents/modeles/pdf/harry/publicCustomers/delivery.php
trunk/catalog/Documents/modeles/pdf/harry/publicCustomers/invoice.php
trunk/catalog/Documents/modeles/pdf/harry/publicCustomers/packingslip.php
trunk/catalog/account.php
trunk/catalog/admin/cronfile.php
trunk/catalog/admin/document.php
trunk/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/edit.php
trunk/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/fns_tinybrowser.php
trunk/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/tinybrowser.php
trunk/catalog/admin/includes/appli_top_Test.php
trunk/catalog/admin/includes/application_bottom.php
trunk/catalog/admin/includes/application_top.php
trunk/catalog/admin/includes/boxes/002_admin.php
trunk/catalog/admin/includes/boxes/00_hidden.php
trunk/catalog/admin/includes/boxes/01_configuration.php
trunk/catalog/admin/includes/boxes/04_tools.php
trunk/catalog/admin/includes/boxes/05_customers.php
trunk/catalog/admin/includes/boxes/07_catalog.php
trunk/catalog/admin/includes/boxes/08_cms.php
trunk/catalog/admin/includes/boxes/09_commercial.php
trunk/catalog/admin/includes/boxes/10_orders.php
trunk/catalog/admin/includes/class.interfaces.php
trunk/catalog/admin/includes/classes/DataFileSql.php
trunk/catalog/admin/includes/classes/GraphLoader.php
trunk/catalog/admin/includes/classes/GraphUtility.php
trunk/catalog/admin/includes/classes/MGabCont.php
trunk/catalog/admin/includes/classes/MLinkTo.php
trunk/catalog/admin/includes/classes/ModTwo.php
trunk/catalog/admin/includes/classes/aca.php
trunk/catalog/admin/includes/classes/categorieUtility.php
trunk/catalog/admin/includes/classes/configUtility.php
trunk/catalog/admin/includes/classes/customerUtility.php
trunk/catalog/admin/includes/classes/dataTableInnerHTML.php
trunk/catalog/admin/includes/classes/dataTableJsonStatment.php
trunk/catalog/admin/includes/classes/drivers/productsACA.php
trunk/catalog/admin/includes/classes/drivers/sqladminextra.php
trunk/catalog/admin/includes/classes/drivers/sqladmingroups.php
trunk/catalog/admin/includes/classes/drivers/sqladminmenu.php
trunk/catalog/admin/includes/classes/drivers/sqladminuser.php
trunk/catalog/admin/includes/classes/drivers/sqlamattribute2template.php
trunk/catalog/admin/includes/classes/drivers/sqlamtemplate.php
trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php
trunk/catalog/admin/includes/classes/drivers/sqlcategoriesextra.php
trunk/catalog/admin/includes/classes/drivers/sqlcip.php
trunk/catalog/admin/includes/classes/drivers/sqlcip_modfiles.php
trunk/catalog/admin/includes/classes/drivers/sqlconfiguration.php
trunk/catalog/admin/includes/classes/drivers/sqlcontent.php
trunk/catalog/admin/includes/classes/drivers/sqlcountries.php
trunk/catalog/admin/includes/classes/drivers/sqlcustomer.php
trunk/catalog/admin/includes/classes/drivers/sqlcustomersextrafileds.php
trunk/catalog/admin/includes/classes/drivers/sqlfeatured.php
trunk/catalog/admin/includes/classes/drivers/sqlgeozone.php
trunk/catalog/admin/includes/classes/drivers/sqlimage.php
trunk/catalog/admin/includes/classes/drivers/sqlnavigation_links.php
trunk/catalog/admin/includes/classes/drivers/sqlorder.php
trunk/catalog/admin/includes/classes/drivers/sqlproduct.php
trunk/catalog/admin/includes/classes/drivers/sqlproductattribute.php
trunk/catalog/admin/includes/classes/drivers/sqlproductoption.php
trunk/catalog/admin/includes/classes/drivers/sqlproductoptionvalue.php
trunk/catalog/admin/includes/classes/drivers/sqlproductoptionvalue2option.php
trunk/catalog/admin/includes/classes/drivers/sqlproductsextrafields.php
trunk/catalog/admin/includes/classes/drivers/sqlservices.php
trunk/catalog/admin/includes/classes/drivers/sqlshipping.php
trunk/catalog/admin/includes/classes/drivers/sqlstatus.php
trunk/catalog/admin/includes/classes/drivers/sqlzones.php
trunk/catalog/admin/includes/classes/drivers/sqlzonetogeozone.php
trunk/catalog/admin/includes/classes/emailUtility.php
trunk/catalog/admin/includes/classes/fileUtility.php
trunk/catalog/admin/includes/classes/imageUtility.php
trunk/catalog/admin/includes/classes/localizationUtility.php
trunk/catalog/admin/includes/classes/menu.php
trunk/catalog/admin/includes/classes/modulesUtility.php
trunk/catalog/admin/includes/classes/navigationHistory.php
trunk/catalog/admin/includes/classes/osCSS_BackupProcess.php
trunk/catalog/admin/includes/classes/osCSS_export.php
trunk/catalog/admin/includes/classes/osCSS_messageStack.php
trunk/catalog/admin/includes/classes/oscss_DBIndex.php
trunk/catalog/admin/includes/classes/oscss_acl.php
trunk/catalog/admin/includes/classes/oscss_cstr.php
trunk/catalog/admin/includes/classes/productUtility.php
trunk/catalog/admin/includes/classes/tableBlock.php
trunk/catalog/admin/includes/classes/tracked_stock.php
trunk/catalog/admin/includes/classes/worldUtility.php
trunk/catalog/admin/includes/content/aca.central.inc
trunk/catalog/admin/includes/content/aca.top.inc
trunk/catalog/admin/includes/content/configuration.central.inc
trunk/catalog/admin/includes/content/configuration.top.inc
trunk/catalog/admin/includes/content/modules.top.inc
trunk/catalog/admin/includes/content/page.top.inc
trunk/catalog/admin/includes/database_tables.php
trunk/catalog/admin/includes/exts/PHPlot/drivers.php
trunk/catalog/admin/includes/exts/login/oscss.php
trunk/catalog/admin/includes/exts/package/CIP.php
trunk/catalog/admin/includes/exts/package/CipUtility.php
trunk/catalog/admin/includes/exts/package/ci_tag.class.php
trunk/catalog/admin/includes/exts/package/cip_modfiles.php
trunk/catalog/admin/includes/exts/package/packageInstaller.php
trunk/catalog/admin/includes/exts/package/packageRepository.php
trunk/catalog/admin/includes/exts/package/packageUtility.php
trunk/catalog/admin/includes/exts/package/tags/add2end.php
trunk/catalog/admin/includes/exts/package/tags/add2endlg.php
trunk/catalog/admin/includes/exts/package/tags/addfile.php
trunk/catalog/admin/includes/exts/package/tags/addfilelg.php
trunk/catalog/admin/includes/exts/package/tags/addfilename.php
trunk/catalog/admin/includes/exts/package/tags/addlangdef.php
trunk/catalog/admin/includes/exts/package/tags/config.php
trunk/catalog/admin/includes/exts/package/tags/depend.php
trunk/catalog/admin/includes/exts/package/tags/description.php
trunk/catalog/admin/includes/exts/package/tags/extractzip.php
trunk/catalog/admin/includes/exts/package/tags/filesql.php
trunk/catalog/admin/includes/exts/package/tags/modifytable.class.php
trunk/catalog/admin/includes/exts/package/tags/requirements.php
trunk/catalog/admin/includes/exts/package/tags/sql.php
trunk/catalog/admin/includes/filenames.php
trunk/catalog/admin/includes/footer.php
trunk/catalog/admin/includes/functions/general.php
trunk/catalog/admin/includes/functions/html_output.php
trunk/catalog/admin/includes/functions/lib.configuration.php
trunk/catalog/admin/includes/functions/lib.orders.php
trunk/catalog/admin/includes/gabarit/CheckCore/display_view.view.gab
trunk/catalog/admin/includes/gabarit/MGabCont/display_view.delete.gab
trunk/catalog/admin/includes/gabarit/MGabCont/display_view.listing.gab
trunk/catalog/admin/includes/gabarit/MGabCont/filter.categorie.gab
trunk/catalog/admin/includes/gabarit/MGabCont/filter.dates.gab
trunk/catalog/admin/includes/gabarit/MGabCont/filter.featured.gab
trunk/catalog/admin/includes/gabarit/MGabCont/filter.language.gab
trunk/catalog/admin/includes/gabarit/MGabCont/filter.listfield.gab
trunk/catalog/admin/includes/gabarit/MGabCont/filter.subtype.gab
trunk/catalog/admin/includes/gabarit/adminAccount/display_view.page.gab
trunk/catalog/admin/includes/gabarit/adminGroup/display_view.define_group.gab
trunk/catalog/admin/includes/gabarit/adminGroup/display_view.delete.gab
trunk/catalog/admin/includes/gabarit/adminGroup/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/adminGroup/display_view.listing.gab
trunk/catalog/admin/includes/gabarit/adminNotif/display_view.config.gab
trunk/catalog/admin/includes/gabarit/adminUsers/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/adminUsers/display_view.listing.gab
trunk/catalog/admin/includes/gabarit/attributes/display_view.options.delete.gab
trunk/catalog/admin/includes/gabarit/attributes/display_view.options.edit.gab
trunk/catalog/admin/includes/gabarit/attributes/display_view.values.delete.gab
trunk/catalog/admin/includes/gabarit/attributes/display_view.values.edit.gab
trunk/catalog/admin/includes/gabarit/backup/display_view.backup.gab
trunk/catalog/admin/includes/gabarit/backup/display_view.restore.gab
trunk/catalog/admin/includes/gabarit/backup/display_view.restorelocal.gab
trunk/catalog/admin/includes/gabarit/backup/display_view.viewalldb.gab
trunk/catalog/admin/includes/gabarit/categories/display_view.delete.gab
trunk/catalog/admin/includes/gabarit/categories/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/categories/display_view.inline.gab
trunk/catalog/admin/includes/gabarit/categories/display_view.new_light.gab
trunk/catalog/admin/includes/gabarit/categories/rightto.edit.gab
trunk/catalog/admin/includes/gabarit/cms_content/display_view.delete.gab
trunk/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/cms_content/display_view.inline.gab
trunk/catalog/admin/includes/gabarit/cms_content/display_view.new.gab
trunk/catalog/admin/includes/gabarit/configuration/datatypeaccount.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/datatypeproduct.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modadminconfig.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modcorecache.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modcustextra/draw.delete.gab
trunk/catalog/admin/includes/gabarit/configuration/modcustextra/draw.edit.gab
trunk/catalog/admin/includes/gabarit/configuration/modcustextra/draw.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/moddownloads.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modexpedition.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modimages.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modmail.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modmembres.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modorder.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modpayment.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.delete.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.delete.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.edit.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.new.gab
trunk/catalog/admin/includes/gabarit/configuration/modseourl.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modstatus.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modstock.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modtemplate.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/my_boutique.listing.gab
trunk/catalog/admin/includes/gabarit/countries/display_view.delete.gab
trunk/catalog/admin/includes/gabarit/countries/display_view.delete_zone.gab
trunk/catalog/admin/includes/gabarit/countries/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/countries/display_view.edit_zone.gab
trunk/catalog/admin/includes/gabarit/cronjob/display_view.delete.gab
trunk/catalog/admin/includes/gabarit/cronjob/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/cronjob/display_view.listing.gab
trunk/catalog/admin/includes/gabarit/customers/address_book/display_view.tabs.gab
trunk/catalog/admin/includes/gabarit/customers/address_book/inline.delete.gab
trunk/catalog/admin/includes/gabarit/customers/address_book/inline.edit.gab
trunk/catalog/admin/includes/gabarit/customers/display_view.delete.gab
trunk/catalog/admin/includes/gabarit/customers/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/customers/display_view.inline.gab
trunk/catalog/admin/includes/gabarit/customers/history/display_edit.noedit.gab
trunk/catalog/admin/includes/gabarit/featureds/display_view.delete.gab
trunk/catalog/admin/includes/gabarit/featureds/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/featureds/rightto.edit.gab
trunk/catalog/admin/includes/gabarit/geo_zones/display_view.delete.gab
trunk/catalog/admin/includes/gabarit/geo_zones/display_view.deletesub.gab
trunk/catalog/admin/includes/gabarit/geo_zones/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/geo_zones/display_view.listing.gab
trunk/catalog/admin/includes/gabarit/geo_zones/display_view.new.gab
trunk/catalog/admin/includes/gabarit/graphs_stats.page.gab
trunk/catalog/admin/includes/gabarit/header_tags.form.gab
trunk/catalog/admin/includes/gabarit/held_orders/display_view.recup_order.gab
trunk/catalog/admin/includes/gabarit/mail.page.gab
trunk/catalog/admin/includes/gabarit/navigation_links/display_view.delete.gab
trunk/catalog/admin/includes/gabarit/navigation_links/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/newsletters/display_view.confirm_send.gab
trunk/catalog/admin/includes/gabarit/newsletters/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/newsletters/display_view.inline.gab
trunk/catalog/admin/includes/gabarit/newsletters/display_view.listing.gab
trunk/catalog/admin/includes/gabarit/newsletters/display_view.preview.gab
trunk/catalog/admin/includes/gabarit/newsletters/display_view.send.gab
trunk/catalog/admin/includes/gabarit/newsletters/display_view.sendtest.gab
trunk/catalog/admin/includes/gabarit/newslettersModeles/display_view.delete.gab
trunk/catalog/admin/includes/gabarit/newslettersModeles/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/newslettersModeles/display_view.listing.gab
trunk/catalog/admin/includes/gabarit/newslettersModeles/display_view.preview.gab
trunk/catalog/admin/includes/gabarit/orders/display_view.delete.gab
trunk/catalog/admin/includes/gabarit/orders/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/orders/display_view.inline.gab
trunk/catalog/admin/includes/gabarit/orders/display_view.multi.gab
trunk/catalog/admin/includes/gabarit/orders/filter.clause.gab
trunk/catalog/admin/includes/gabarit/orders/payment/cod.edit.gab
trunk/catalog/admin/includes/gabarit/orders/payment/cod.view.gab
trunk/catalog/admin/includes/gabarit/orders/payment/moneyorder.edit.gab
trunk/catalog/admin/includes/gabarit/orders/payment/moneyorder.view.gab
trunk/catalog/admin/includes/gabarit/package/display_view.package.config.gab
trunk/catalog/admin/includes/gabarit/package/display_view.package.configedit.gab
trunk/catalog/admin/includes/gabarit/package/display_view.package.detail.gab
trunk/catalog/admin/includes/gabarit/package/display_view.package.install.gab
trunk/catalog/admin/includes/gabarit/package/display_view.package.listing.gab
trunk/catalog/admin/includes/gabarit/package/display_view.package.remove.gab
trunk/catalog/admin/includes/gabarit/package/display_view.package.upload.gab
trunk/catalog/admin/includes/gabarit/package/display_view.source.edit.gab
trunk/catalog/admin/includes/gabarit/package/display_view.source.listing.gab
trunk/catalog/admin/includes/gabarit/products/desc_base/display_edit.edit.gab
trunk/catalog/admin/includes/gabarit/products/display_view.copy_to.gab
trunk/catalog/admin/includes/gabarit/products/display_view.delete.gab
trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/products/display_view.new.gab
trunk/catalog/admin/includes/gabarit/products/filter.clause.gab
trunk/catalog/admin/includes/gabarit/products/products_extra/display_edit.edit.gab
trunk/catalog/admin/includes/gabarit/products/stock.listing.gab
trunk/catalog/admin/includes/gabarit/recover_cart_sales/display_view.processconfirm.gab
trunk/catalog/admin/includes/gabarit/services/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/shipping/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/shipping/display_view.multi.gab
trunk/catalog/admin/includes/header.php
trunk/catalog/admin/includes/javascript/dataTables.TableTools/ZeroClipboard/ZeroClipboard.js
trunk/catalog/admin/includes/javascript/dataTables.TableTools/js/TableTools.min.js
trunk/catalog/admin/includes/javascript/jquery.dataTables.min.js
trunk/catalog/admin/includes/javascript/modules/pages/adminGroup.js.php
trunk/catalog/admin/includes/javascript/modules/pages/adminUsers.js.php
trunk/catalog/admin/includes/javascript/modules/pages/customers.js.php
trunk/catalog/admin/includes/javascript/modules/pages/orders.js.php
trunk/catalog/admin/includes/javascript/modules/pages/products.js.php
trunk/catalog/admin/includes/languages/fr_FR/boxes/002_admin.php
trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php
trunk/catalog/admin/includes/languages/fr_FR/boxes/04_tools.php
trunk/catalog/admin/includes/languages/fr_FR/boxes/05_customers.php
trunk/catalog/admin/includes/languages/fr_FR/boxes/07_catalog.php
trunk/catalog/admin/includes/languages/fr_FR/boxes/08_cms.php
trunk/catalog/admin/includes/languages/fr_FR/boxes/09_commercial.php
trunk/catalog/admin/includes/languages/fr_FR/boxes/10_orders.php
trunk/catalog/admin/includes/languages/fr_FR/configuration.php
trunk/catalog/admin/includes/languages/fr_FR/fr_FR.php
trunk/catalog/admin/includes/languages/fr_FR/login.php
trunk/catalog/admin/includes/languages/fr_FR/modeles/email/mouton/add_customer.txt
trunk/catalog/admin/includes/languages/fr_FR/modeles/email/mouton/admin_account.txt
trunk/catalog/admin/includes/languages/fr_FR/modeles/email/mouton/admin_members.txt
trunk/catalog/admin/includes/languages/fr_FR/modeles/email/mouton/admin_members_new.txt
trunk/catalog/admin/includes/languages/fr_FR/modeles/pdf/harry/harry.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/aca_header_tags.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/account/account_extra.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/account/address_book.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/account/history.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_0.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_10.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_11.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_128.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_14.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_15.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_2.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_20.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_21.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_22.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_24.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_25.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_27.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_8.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeaccount.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeproduct.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modadminconfig.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modcustextra.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/moddownloads.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modexpedition.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modimages.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modlangue.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modmail.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modmembres.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modorder.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modpayment.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modprodextra.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modseourl.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modstatus.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modstock.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modtemplate.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/my_boutique.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/cronjob/customers_birthday.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/cronjob/relance_order.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/filters.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/generic/CheckCore.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/graph_stats/NewCustomers.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/graph_stats/Sales.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/newsletters/new_products.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/newsletters/newsletter.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/adminAccount.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/adminGroup.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/adminNotif.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/adminUsers.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/attributes.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/backup.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/countries.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cronjob.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/currencies.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/featureds.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/geo_zones.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/graphs_stats.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/held_orders.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/index.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/mail.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/navigation_links.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/newsletters.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/newslettersModeles.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/package.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/rapport.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/recover_cart_sales.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/services.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/shipping.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/stock.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/payment/cod.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/payment/moneyorder.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/products/desc_base.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/products/products_extra.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/customers_purchase.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/newsletters.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/products_purchased.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/products_viewed.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/whos_online.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/shipping/item.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/shipping/spu.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/AdminGroupsNew.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/AdminUsersLast.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/CategorieLast.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/ContentLast.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/CrondJoblast.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/CustomerLast.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/HelpConfig.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/ImagesLast.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/NewCustomersStats.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/NewslettersLastModified.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/NewslettersLastNew.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/NewslettersModelesLastModified.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/NewslettersModelesLastNew.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/NewslettersWizzard.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/Notification.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/ProductsLast.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/SsMenuConfig.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/brief_config.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/currencies_update_server.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/homeStats.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/homeStock.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/orderLast.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/orderLastinvoice.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/orderLastservice.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/orderLastshipp.txt
trunk/catalog/admin/includes/modules/account/account_extra.php
trunk/catalog/admin/includes/modules/account/address_book.php
trunk/catalog/admin/includes/modules/account/history.php
trunk/catalog/admin/includes/modules/configuration/datatypeaccount.php
trunk/catalog/admin/includes/modules/configuration/datatypeproduct.php
trunk/catalog/admin/includes/modules/configuration/modadminconfig.php
trunk/catalog/admin/includes/modules/configuration/modcorecache.php
trunk/catalog/admin/includes/modules/configuration/modcustextra.php
trunk/catalog/admin/includes/modules/configuration/moddownloads.php
trunk/catalog/admin/includes/modules/configuration/modexpedition.php
trunk/catalog/admin/includes/modules/configuration/modimages.php
trunk/catalog/admin/includes/modules/configuration/modlangue.php
trunk/catalog/admin/includes/modules/configuration/modmail.php
trunk/catalog/admin/includes/modules/configuration/modmembres.php
trunk/catalog/admin/includes/modules/configuration/modorder.php
trunk/catalog/admin/includes/modules/configuration/modpayment.php
trunk/catalog/admin/includes/modules/configuration/modprodextra.php
trunk/catalog/admin/includes/modules/configuration/modseourl.php
trunk/catalog/admin/includes/modules/configuration/modstatus.php
trunk/catalog/admin/includes/modules/configuration/modstock.php
trunk/catalog/admin/includes/modules/configuration/modsysinfo.php
trunk/catalog/admin/includes/modules/configuration/modtemplate.php
trunk/catalog/admin/includes/modules/configuration/my_boutique.php
trunk/catalog/admin/includes/modules/content/header_tags.php
trunk/catalog/admin/includes/modules/cronjob/clean_cache_dir.php
trunk/catalog/admin/includes/modules/cronjob/customers_birthday.php
trunk/catalog/admin/includes/modules/cronjob/ggsitemap_refresh.php
trunk/catalog/admin/includes/modules/cronjob/relance_order.php
trunk/catalog/admin/includes/modules/generic/CheckCore.php
trunk/catalog/admin/includes/modules/generic/SvnUpdate.php
trunk/catalog/admin/includes/modules/graph_stats/NewCustomers.php
trunk/catalog/admin/includes/modules/graph_stats/Sales.php
trunk/catalog/admin/includes/modules/newsletters/new_products.php
trunk/catalog/admin/includes/modules/newsletters/newsletter.php
trunk/catalog/admin/includes/modules/pages/adminAccount.php
trunk/catalog/admin/includes/modules/pages/adminGroup.php
trunk/catalog/admin/includes/modules/pages/adminNotif.php
trunk/catalog/admin/includes/modules/pages/adminUsers.php
trunk/catalog/admin/includes/modules/pages/attributes.php
trunk/catalog/admin/includes/modules/pages/backup.php
trunk/catalog/admin/includes/modules/pages/browser.php
trunk/catalog/admin/includes/modules/pages/categories.php
trunk/catalog/admin/includes/modules/pages/cms_content.php
trunk/catalog/admin/includes/modules/pages/countries.php
trunk/catalog/admin/includes/modules/pages/cronjob.php
trunk/catalog/admin/includes/modules/pages/currencies.php
trunk/catalog/admin/includes/modules/pages/customers.php
trunk/catalog/admin/includes/modules/pages/featureds.php
trunk/catalog/admin/includes/modules/pages/geo_zones.php
trunk/catalog/admin/includes/modules/pages/ggsitemap.php
trunk/catalog/admin/includes/modules/pages/graphs_stats.php
trunk/catalog/admin/includes/modules/pages/header_tags.php
trunk/catalog/admin/includes/modules/pages/held_orders.php
trunk/catalog/admin/includes/modules/pages/index.php
trunk/catalog/admin/includes/modules/pages/mail.php
trunk/catalog/admin/includes/modules/pages/navigation_links.php
trunk/catalog/admin/includes/modules/pages/newsletters.php
trunk/catalog/admin/includes/modules/pages/newslettersModeles.php
trunk/catalog/admin/includes/modules/pages/orders.php
trunk/catalog/admin/includes/modules/pages/package.php
trunk/catalog/admin/includes/modules/pages/plugins.php
trunk/catalog/admin/includes/modules/pages/products.php
trunk/catalog/admin/includes/modules/pages/rapport.php
trunk/catalog/admin/includes/modules/pages/recover_cart_sales.php
trunk/catalog/admin/includes/modules/pages/services.php
trunk/catalog/admin/includes/modules/pages/shipping.php
trunk/catalog/admin/includes/modules/pages/stock.php
trunk/catalog/admin/includes/modules/payment/cod.php
trunk/catalog/admin/includes/modules/payment/moneyorder.php
trunk/catalog/admin/includes/modules/products/desc_base.php
trunk/catalog/admin/includes/modules/products/header_tags.php
trunk/catalog/admin/includes/modules/products/products_extra.php
trunk/catalog/admin/includes/modules/rapport/customers_purchase.php
trunk/catalog/admin/includes/modules/rapport/newsletters.php
trunk/catalog/admin/includes/modules/rapport/products_purchased.php
trunk/catalog/admin/includes/modules/rapport/products_viewed.php
trunk/catalog/admin/includes/modules/rapport/whos_online.php
trunk/catalog/admin/includes/modules/shipping/item.php
trunk/catalog/admin/includes/modules/shipping/spu.php
trunk/catalog/admin/includes/modules/template_export/expeditor.php
trunk/catalog/admin/includes/modules/template_pdf/entete_shop.php
trunk/catalog/admin/includes/modules/template_pdf/invoice.php
trunk/catalog/admin/includes/modules/template_pdf/labels.php
trunk/catalog/admin/includes/modules/template_pdf/packingslip.php
trunk/catalog/admin/includes/modules/template_pdf/packingslip_and_invoice.php
trunk/catalog/admin/includes/template/defaut/data/icon_set.xml
trunk/catalog/admin/includes/template/defaut/gabarit-1.php
trunk/catalog/admin/includes/template/defaut/header-1.php
trunk/catalog/admin/includes/template/defaut/inc/init_theme-1.php
trunk/catalog/admin/includes/template/defaut/inc/init_theme-2.php
trunk/catalog/admin/includes/template/defaut/inc/lib_general-1.js
trunk/catalog/admin/includes/template/defaut/inc/preload-1.php
trunk/catalog/admin/includes/template/defaut/login-panel.css
trunk/catalog/admin/includes/template/defaut/password_forgotten.php
trunk/catalog/admin/includes/template/defaut/stylesheet-1.css
trunk/catalog/admin/includes/template/oscss/data/icon_set.xml
trunk/catalog/admin/includes/template/oscss/gabarit-1.php
trunk/catalog/admin/includes/template/oscss/header-1.php
trunk/catalog/admin/includes/template/oscss/inc/init_theme-1.php
trunk/catalog/admin/includes/template/oscss/inc/lib_general-1.js
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
trunk/catalog/admin/includes/widget/AdminGroupsNew.php
trunk/catalog/admin/includes/widget/AdminUsersLast.php
trunk/catalog/admin/includes/widget/CategorieLast.php
trunk/catalog/admin/includes/widget/ContentLast.php
trunk/catalog/admin/includes/widget/CrondJoblast.php
trunk/catalog/admin/includes/widget/CustomerLast.php
trunk/catalog/admin/includes/widget/HelpConfig.php
trunk/catalog/admin/includes/widget/ImagesLast.php
trunk/catalog/admin/includes/widget/NewslettersLastModified.php
trunk/catalog/admin/includes/widget/NewslettersLastNew.php
trunk/catalog/admin/includes/widget/NewslettersModelesLastModified.php
trunk/catalog/admin/includes/widget/NewslettersModelesLastNew.php
trunk/catalog/admin/includes/widget/NewslettersWizzard.php
trunk/catalog/admin/includes/widget/Notification.php
trunk/catalog/admin/includes/widget/ProductsLast.php
trunk/catalog/admin/includes/widget/SsMenuConfig.php
trunk/catalog/admin/includes/widget/brief_config.php
trunk/catalog/admin/includes/widget/currencies_update_server.php
trunk/catalog/admin/includes/widget/homeNews.php
trunk/catalog/admin/includes/widget/homeStats.php
trunk/catalog/admin/includes/widget/homeStock.php
trunk/catalog/admin/includes/widget/orderLast.php
trunk/catalog/admin/includes/widget/orderLastinvoice.php
trunk/catalog/admin/includes/widget/orderLastservice.php
trunk/catalog/admin/includes/widget/orderLastshipp.php
trunk/catalog/admin/includes/widget/salesStats.php
trunk/catalog/admin/index.php
trunk/catalog/admin/password_forgotten.php
trunk/catalog/advanced_search.php
trunk/catalog/checkout.php
trunk/catalog/checkout_payment_address.php
trunk/catalog/checkout_process.php
trunk/catalog/checkout_shipping.php
trunk/catalog/checkout_shipping_address.php
trunk/catalog/common/class.interfaces.php
trunk/catalog/common/classes/DataTypes.php
trunk/catalog/common/classes/DatasFiles.php
trunk/catalog/common/classes/ExtraUtility.php
trunk/catalog/common/classes/NewslettersUtility.php
trunk/catalog/common/classes/PHPMailer.php
trunk/catalog/common/classes/PasswordUtility.php
trunk/catalog/common/classes/datatype_drivers/Data_categorie.php
trunk/catalog/common/classes/datatype_drivers/Data_content.php
trunk/catalog/common/classes/datatype_drivers/Data_customer.php
trunk/catalog/common/classes/datatype_drivers/Data_diver.php
trunk/catalog/common/classes/datatype_drivers/Data_error.php
trunk/catalog/common/classes/datatype_drivers/Data_featured.php
trunk/catalog/common/classes/datatype_drivers/Data_home.php
trunk/catalog/common/classes/datatype_drivers/Data_product.php
trunk/catalog/common/classes/formUtility.php
trunk/catalog/common/classes/fpdf.php
trunk/catalog/common/classes/image_ratio.php
trunk/catalog/common/classes/imgratio_drivers/Carre.php
trunk/catalog/common/classes/language.php
trunk/catalog/common/classes/notification.php
trunk/catalog/common/classes/order.php
trunk/catalog/common/classes/osCSS_Cache.php
trunk/catalog/common/classes/osCSS_CacheLib.php
trunk/catalog/common/classes/osCSS_pdf.php
trunk/catalog/common/classes/price.php
trunk/catalog/common/classes/shoppingCart.php
trunk/catalog/common/classes/sql_drivers/DB_Mysql.php
trunk/catalog/common/classes/sql_drivers/DB_Mysqli.php
trunk/catalog/common/functions/pdf_output.php
trunk/catalog/common/modules/core/password/Pass_Classic.php
trunk/catalog/common/modules/core/password/Pass_Md5.php
trunk/catalog/common/modules/core/password/Pass_Sha1.php
trunk/catalog/common/modules/core/seo_modrewrite/SeoR_byfolder.php
trunk/catalog/common/modules/core/seo_modrewrite/SeoR_classic.php
trunk/catalog/common/modules/core/seo_modrewrite/SeoR_no.php
trunk/catalog/create_account.php
trunk/catalog/document.php
trunk/catalog/download.php
trunk/catalog/iframe.php
trunk/catalog/includes/appli_top_Test.php
trunk/catalog/includes/application_bottom.php
trunk/catalog/includes/application_top.php
trunk/catalog/includes/classes/AbstractAcaModule.php
trunk/catalog/includes/classes/Stock.php
trunk/catalog/includes/classes/breadcrumb.php
trunk/catalog/includes/classes/category_tree.php
trunk/catalog/includes/classes/checkout_process.php
trunk/catalog/includes/classes/core_page/account.php
trunk/catalog/includes/classes/core_page/checkout.php
trunk/catalog/includes/classes/core_page/contact.php
trunk/catalog/includes/classes/core_page/customer.php
trunk/catalog/includes/classes/core_page/develop.php
trunk/catalog/includes/classes/core_page/generic.php
trunk/catalog/includes/classes/core_page/javascript.php
trunk/catalog/includes/classes/core_page/listing.php
trunk/catalog/includes/classes/core_page/overlay/oscss_boxes.php
trunk/catalog/includes/classes/core_page/overlay/oscss_modules.php
trunk/catalog/includes/classes/core_page/overlay/oscss_plugins.php
trunk/catalog/includes/classes/drivers/data/categorie.php
trunk/catalog/includes/classes/drivers/data/content.php
trunk/catalog/includes/classes/drivers/data/product.php
trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php
trunk/catalog/includes/classes/navigation_history.php
trunk/catalog/includes/classes/order_total.php
trunk/catalog/includes/classes/pad_base.php
trunk/catalog/includes/classes/pad_base_multi.php
trunk/catalog/includes/classes/page.php
trunk/catalog/includes/classes/payment.php
trunk/catalog/includes/classes/shopping_cart_action.php
trunk/catalog/includes/classes/split_page_results.php
trunk/catalog/includes/database_tables.php
trunk/catalog/includes/filenames.php
trunk/catalog/includes/functions/general.php
trunk/catalog/includes/functions/html_output.php
trunk/catalog/includes/functions/initialize.php
trunk/catalog/includes/functions/template.php
trunk/catalog/includes/functions/validations.php
trunk/catalog/includes/inc_base_conf.php
trunk/catalog/includes/inc_base_lib.php
trunk/catalog/includes/inc_base_lib_min.php
trunk/catalog/includes/js/address_book.js.php
trunk/catalog/includes/js/checkout_address.js.php
trunk/catalog/includes/js/checkout_payment.js.php
trunk/catalog/includes/js/shopping_cart.js.php
trunk/catalog/includes/languages/fr_FR/account.php
trunk/catalog/includes/languages/fr_FR/advanced_search.php
trunk/catalog/includes/languages/fr_FR/boxes/categories.txt
trunk/catalog/includes/languages/fr_FR/boxes/myaccount.txt
trunk/catalog/includes/languages/fr_FR/boxes/tags.txt
trunk/catalog/includes/languages/fr_FR/checkout_payment.php
trunk/catalog/includes/languages/fr_FR/checkout_shipping.php
trunk/catalog/includes/languages/fr_FR/checkout_success.php
trunk/catalog/includes/languages/fr_FR/contact_us.php
trunk/catalog/includes/languages/fr_FR/create_account.php
trunk/catalog/includes/languages/fr_FR/create_account_success.php
trunk/catalog/includes/languages/fr_FR/fr_FR.php
trunk/catalog/includes/languages/fr_FR/home.php
trunk/catalog/includes/languages/fr_FR/login.php
trunk/catalog/includes/languages/fr_FR/modeles/email/mouton/add_customer.txt
trunk/catalog/includes/languages/fr_FR/modeles/email/mouton/create_account.txt
trunk/catalog/includes/languages/fr_FR/modeles/email/mouton/create_account_confirm.txt
trunk/catalog/includes/languages/fr_FR/modeles/email/mouton/password_forgotten.txt
trunk/catalog/includes/languages/fr_FR/modules/account/address_book.txt
trunk/catalog/includes/languages/fr_FR/modules/account/history.txt
trunk/catalog/includes/languages/fr_FR/modules/order_total/ot_shipping.txt
trunk/catalog/includes/languages/fr_FR/modules/payment/cod.txt
trunk/catalog/includes/languages/fr_FR/modules/payment/moneyorder.txt
trunk/catalog/includes/languages/fr_FR/modules/products/desc_base.txt
trunk/catalog/includes/languages/fr_FR/modules/products/products_extra.txt
trunk/catalog/includes/languages/fr_FR/modules/shipping/flat.txt
trunk/catalog/includes/languages/fr_FR/modules/shipping/item.txt
trunk/catalog/includes/languages/fr_FR/modules/shipping/spu.txt
trunk/catalog/includes/languages/fr_FR/new_sent_email_confirm.php
trunk/catalog/includes/languages/fr_FR/password_forgotten.php
trunk/catalog/includes/languages/fr_FR/triggers/cart_totaux.txt
trunk/catalog/includes/modules/account/address_book.php
trunk/catalog/includes/modules/account/history.php
trunk/catalog/includes/modules/also_purchased_products.php
trunk/catalog/includes/modules/checkout/PrCgu.php
trunk/catalog/includes/modules/checkout/PrConfirmation.php
trunk/catalog/includes/modules/checkout/PrPayment.php
trunk/catalog/includes/modules/checkout/PrShipping.php
trunk/catalog/includes/modules/downloads.php
trunk/catalog/includes/modules/featured.php
trunk/catalog/includes/modules/listing.php
trunk/catalog/includes/modules/listing_cat.php
trunk/catalog/includes/modules/listing_featured.php
trunk/catalog/includes/modules/listing_manufacturer_products.php
trunk/catalog/includes/modules/listing_pages.php
trunk/catalog/includes/modules/new_products.php
trunk/catalog/includes/modules/order_total/ot_shipping.php
trunk/catalog/includes/modules/order_total/ot_subtotal.php
trunk/catalog/includes/modules/order_total/ot_tax.php
trunk/catalog/includes/modules/order_total/ot_total.php
trunk/catalog/includes/modules/payment/cod.php
trunk/catalog/includes/modules/payment/moneyorder.php
trunk/catalog/includes/modules/product_listing.php
trunk/catalog/includes/modules/products/desc_base.php
trunk/catalog/includes/modules/shipping/flat.php
trunk/catalog/includes/modules/shipping/item.php
trunk/catalog/includes/modules/shipping/spu.php
trunk/catalog/includes/modules/upcoming_products.php
trunk/catalog/includes/triggers/cart_line.inc
trunk/catalog/includes/triggers/cart_line_delete.inc
trunk/catalog/includes/triggers/cart_totaux.inc
trunk/catalog/includes/triggers/create_account.inc
trunk/catalog/includes/triggers/discount_coupon.inc
trunk/catalog/includes/triggers/search_suggest.inc
trunk/catalog/index.php
trunk/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/boxe.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/footer.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.slideshow.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/sidebar.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/ssheader.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/Sitemap.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/configuration.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/boxes/categories.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/404.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_edit.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_history_info.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_newsletters.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_password.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/advanced_search.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_before_process.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_payment.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_payment_address.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_shipping.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_shipping_address.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_success.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/contact_us.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/content.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/create_account.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/create_account_success.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/home.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/index_listing.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/info_shopping_cart.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/login.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/new_sent_email_confirm.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/page.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/sitemap.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/template.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/address_book.display_view.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/address_book.form_delete.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/address_book.form_edit.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/address_book_details.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.categories.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.currencies.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.recently_viewed.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.specials.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.tags.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.whats_new.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/triggers/cart_totaux.inc
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/template.php
trunk/catalog/install/includes/application.php
trunk/catalog/install/includes/classes/core.php
trunk/catalog/install/includes/content/core.base.php
trunk/catalog/install/includes/content/core.configuration.php
trunk/catalog/install/includes/content/core.installdb.php
trunk/catalog/install/includes/content/core.modes.php
trunk/catalog/install/includes/content/core.template_sample.php
trunk/catalog/install/includes/functions/database.php
trunk/catalog/install/includes/functions/html_output.php
trunk/catalog/install/includes/language/en_EN/install.base.txt
trunk/catalog/install/includes/language/en_EN/oscss_config.txt
trunk/catalog/install/includes/language/fr_FR/install.base.txt
trunk/catalog/install/includes/language/fr_FR/osc_status.txt
trunk/catalog/install/includes/modele/admin_configure.txt
trunk/catalog/install/includes/modele/configure.txt
trunk/catalog/install/includes/modele/htaccess.txt
trunk/catalog/install/includes/sql/mysql/data/20_osc_status.sql
trunk/catalog/install/includes/sql/mysql/data/40_osc_categories.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_admin_m_files.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders_products.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders_products.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_options.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_services.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_specials.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/data/91_osc_configuration.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/20_osc_status.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_m_files_to_right.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_categories.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_orders_products.sql
trunk/catalog/login.php
trunk/catalog/logoff.php
trunk/catalog/password_forgotten.php
trunk/catalog/popup_image.php
trunk/catalog/redirect.php
trunk/catalog/templates/defaut/Childs_tpl/boxe.php
trunk/catalog/templates/defaut/Childs_tpl/footer.php
trunk/catalog/templates/defaut/Childs_tpl/header.php
trunk/catalog/templates/defaut/Childs_tpl/module.php
trunk/catalog/templates/defaut/Childs_tpl/module.slideshow.php
trunk/catalog/templates/defaut/Childs_tpl/sidebar.php
trunk/catalog/templates/defaut/Childs_tpl/ssheader.php
trunk/catalog/templates/defaut/cfg/init.php
trunk/catalog/templates/defaut/includes/boxes/categories.php
trunk/catalog/templates/defaut/includes/boxes/categories_dropdown.php
trunk/catalog/templates/defaut/includes/boxes/categories_tab_menu.php
trunk/catalog/templates/defaut/includes/boxes/cms_last_post.php
trunk/catalog/templates/defaut/includes/boxes/information.php
trunk/catalog/templates/defaut/includes/boxes/myaccount.php
trunk/catalog/templates/defaut/includes/boxes/recently_viewed.php
trunk/catalog/templates/defaut/includes/boxes/search_suggest.php
trunk/catalog/templates/defaut/includes/boxes/selections.php
trunk/catalog/templates/defaut/includes/boxes/shopping_cart_short.php
trunk/catalog/templates/defaut/includes/boxes/specials.php
trunk/catalog/templates/defaut/includes/boxes/tags.php
trunk/catalog/templates/defaut/includes/boxes/very_viewed.php
trunk/catalog/templates/defaut/includes/boxes/whats_new.php
trunk/catalog/templates/defaut/includes/content/account.php
trunk/catalog/templates/defaut/includes/content/account_history_info.php
trunk/catalog/templates/defaut/includes/content/advanced_search.php
trunk/catalog/templates/defaut/includes/content/checkout_cgu.php
trunk/catalog/templates/defaut/includes/content/checkout_confirmation.php
trunk/catalog/templates/defaut/includes/content/checkout_payment.php
trunk/catalog/templates/defaut/includes/content/checkout_payment_address.php
trunk/catalog/templates/defaut/includes/content/checkout_shipping.php
trunk/catalog/templates/defaut/includes/content/checkout_shipping_address.php
trunk/catalog/templates/defaut/includes/content/checkout_success.php
trunk/catalog/templates/defaut/includes/content/contact_us.php
trunk/catalog/templates/defaut/includes/content/content.php
trunk/catalog/templates/defaut/includes/content/create_account_success.php
trunk/catalog/templates/defaut/includes/content/home.php
trunk/catalog/templates/defaut/includes/content/index_listing.php
trunk/catalog/templates/defaut/includes/content/listing_best_sellers.php
trunk/catalog/templates/defaut/includes/content/listing_products_new.php
trunk/catalog/templates/defaut/includes/content/listing_small_price.php
trunk/catalog/templates/defaut/includes/content/listing_specials.php
trunk/catalog/templates/defaut/includes/content/new_sent_email_confirm.php
trunk/catalog/templates/defaut/includes/content/page.php
trunk/catalog/templates/defaut/includes/content/product_info.php
trunk/catalog/templates/defaut/includes/content/shopping_cart.php
trunk/catalog/templates/defaut/includes/content/sitemap.php
trunk/catalog/templates/defaut/includes/gabarit/address_book/display_view.delete.gab
trunk/catalog/templates/defaut/includes/gabarit/address_book/display_view.edit.gab
trunk/catalog/templates/defaut/includes/gabarit/address_book/display_view.page.gab
trunk/catalog/templates/defaut/includes/gabarit/address_book_details.gab
trunk/catalog/templates/defaut/includes/gabarit/box.myaccount.gab
trunk/catalog/templates/defaut/includes/gabarit/box.recently_viewed.gab
trunk/catalog/templates/defaut/includes/gabarit/box.specials.gab
trunk/catalog/templates/defaut/includes/gabarit/box.tags.gab
trunk/catalog/templates/defaut/includes/gabarit/box.whats_new.gab
trunk/catalog/templates/defaut/includes/gabarit/history/account.display_view.page.gab
trunk/catalog/templates/defaut/includes/gabarit/history/box_view.gab
trunk/catalog/templates/defaut/includes/gabarit/product/advanced_search.other.input.gab
trunk/catalog/templates/defaut/includes/plugins/generic/lazyload/includes_header.php
trunk/catalog/templates/defaut/includes/plugins/generic/slider/includes_header.php
trunk/catalog/templates/defaut/includes/plugins/product/slimbox/includes_header.php
trunk/catalog/templates/defaut/includes/plugins/product/uicoretabs/includes_header.php
trunk/catalog/templates/defaut/template.php
Modified: trunk/catalog/Documents/modeles/pdf/harry/harry.php
===================================================================
--- trunk/catalog/Documents/modeles/pdf/harry/harry.php 2013-06-16 15:31:12 UTC (rev 4745)
+++ trunk/catalog/Documents/modeles/pdf/harry/harry.php 2013-06-22 08:11:54 UTC (rev 4746)
@@ -1,6 +1,6 @@
<?php
/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @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
Modified: trunk/catalog/Documents/modeles/pdf/harry/publicCustomers/delivery.php
===================================================================
--- trunk/catalog/Documents/modeles/pdf/harry/publicCustomers/delivery.php 2013-06-16 15:31:12 UTC (rev 4745)
+++ trunk/catalog/Documents/modeles/pdf/harry/publicCustomers/delivery.php 2013-06-22 08:11:54 UTC (rev 4746)
@@ -1,6 +1,6 @@
<?php
/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @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
@@ -36,7 +36,7 @@
$hauteur_block = $pdf->DrawTypeAndRef($le_Y , tep_correct_entitie_put_pdf(__('dl print doc type delivery')) , 'BL-'.$obj_shipping->row_id );
- /// add other info
+ /// add other info
$pdf->SetFont($pdf->font,'I',9);
$width = 70 ;
$coor_X = ( $pdf->page_width - $width - $pdf->page_marge );
@@ -54,7 +54,7 @@
/**
EOB -- subheader
*/
-
+
$le_Y=($le_Y+$pdf->line_height);
$hauteur_block= $pdf->line_height ;
//Draw Box for Order Number, Date & Payment method
@@ -67,7 +67,7 @@
$pdf->SetTextColor(0);
$pdf->SetFont($pdf->font,'',8);
- $hauteur_block= ($hauteur_block -1) ; // force min inter height line
+ $hauteur_block= ($hauteur_block -1) ; // force min inter height line
$coor_X = ( ( $pdf->page_width / 2)+( $pdf->block_marge ) );
$le_Y += 2;
$pdf->SetXY( ($coor_X + $pdf->block_padding ) , $le_Y);
@@ -120,7 +120,7 @@
/**
- Block detail delivery
+ Block detail delivery
*/
//Fields Name position
@@ -238,14 +238,51 @@
/* Check for product line overflow*/
$item_count++;
- if ((is_long($item_count / 32) && $i >= 20) || ($i == 20)){
+ $maxligne = 28;
+ if ((is_long($item_count / 32) && $i >= $maxligne) || ($i == $maxligne)){
$pdf->AddPage();
//Fields Name position
$Y_Fields_Name_position = 125;
//Table position, under Fields Name
$Y_Table_Position = 70;
- output_table_heading($Y_Table_Position-$hauteur_block_r);
- if ($i == 20) $item_count = 1;
+// output_table_heading($Y_Table_Position-$hauteur_block_r);
+
+ //First create each Field Name
+ //Gray color filling each Field Name box
+ $pdf->SetFillColor($pdf->bg_color_1);
+ //Bold Font for Field Name
+ $...
[truncated message content] |
|
From: <os...@us...> - 2013-06-16 15:31:16
|
Revision: 4745
http://sourceforge.net/p/oscss/svn/4745
Author: oscim
Date: 2013-06-16 15:31:12 +0000 (Sun, 16 Jun 2013)
Log Message:
-----------
code improvement for the management of the data datatype of categories
Modified Paths:
--------------
branches/2.1.1/catalog/includes/classes/category_tree.php
Modified: branches/2.1.1/catalog/includes/classes/category_tree.php
===================================================================
--- branches/2.1.1/catalog/includes/classes/category_tree.php 2013-06-16 06:22:28 UTC (rev 4744)
+++ branches/2.1.1/catalog/includes/classes/category_tree.php 2013-06-16 15:31:12 UTC (rev 4745)
@@ -4,7 +4,7 @@
*\portion code Copyright (c) 2002 osCommerce
*\package osCSS-2 <www http://www.oscss.org>
*\version 2.1.1
- *\date 10/05/2012, 08:18
+ *\date 16/06/2013, 08:18
*\author oscim <mail aur...@os...> <www http://www.oscim.fr>
*\encode UTF-8
*\group boxes
@@ -19,7 +19,7 @@
*/
class category_tree {
- var $root_category_id = 0,
+ public $root_category_id = 0,
$max_level = 0,
$data = array(),
@@ -46,7 +46,9 @@
$show_category_product_count = false,
$category_product_count_start_string = ' (',
$category_product_count_end_string = ')';
-
+ /**
+ @var name datatype for current list categorie or default datatype
+ */
protected $datatype = '';
/**
@@ -59,17 +61,14 @@
$this->SetDatatype($datatype);
// if (_cst_bool('SHOW_COUNTS')) $this->show_category_product_count = true;
- if ($osCSS_Cache->read('categorie-tree-' . $language.'-type', 720)) {
+ if ($osCSS_Cache->read('categorie-tree-' . $language.'-type-'.$this->datatype, 720)) {
$this->data = $osCSS_Cache->getCache();
}
else {
$this->data = array();
- $sql = " and c.categories_hidden='1' ";
+ $sql = " AND c.categories_hidden='1' ";
- if(tep_not_null($this->datatype))
- $sql .= "AND categories_datatype = '".$this->datatype."' ";
- else
- $sql .= "AND categories_datatype = '".DATATYPES_DEFAULT_NOSELECTED."' ";
+ $sql .= "AND categories_datatype = '".$this->datatype."' ";
categorie::add_where_query($sql);
$list = categorie::get_query('','','',array('limit'=>0));
@@ -256,9 +255,14 @@
// }
// }
- public function SetDatatype($datatype) {
- $this->datatype = $datatype;
+ /**
+ * \fn SetDatatype($datatype)
+ * @param $datatype string codename for datatype
+ */
+ private function SetDatatype($datatype='') {
+ $this->datatype = (tep_not_null($datatype) ? $datatype : DATATYPES_DEFAULT_NOSELECTED );
}
+
/**
* \fn setRootCategoryID($root_category_id)
* @param $root_category_id int
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-06-16 06:22:31
|
Revision: 4744
http://sourceforge.net/p/oscss/svn/4744
Author: oscim
Date: 2013-06-16 06:22:28 +0000 (Sun, 16 Jun 2013)
Log Message:
-----------
Fix delete echo debug
Modified Paths:
--------------
branches/2.1.1/catalog/includes/classes/drivers/data/categorie.php
Modified: branches/2.1.1/catalog/includes/classes/drivers/data/categorie.php
===================================================================
--- branches/2.1.1/catalog/includes/classes/drivers/data/categorie.php 2013-06-16 06:21:38 UTC (rev 4743)
+++ branches/2.1.1/catalog/includes/classes/drivers/data/categorie.php 2013-06-16 06:22:28 UTC (rev 4744)
@@ -188,7 +188,7 @@
//! soit id soit sherach name key
self::add_where_query((tep_not_null($id) && is_numeric($id) ? " AND c.categories_id = '" . (int)$id . "' ": (!empty($search)?" AND cd.categories_name LIKE '%" . tep_db_input($search) . "%' ":'') ));
$sql=self::cstr_query( (isset($option['orderby'])?(string)$option['orderby']:''),(isset($option['limit'])?(int)$option['limit']:''),(array)@$option) ;
-echo $sql;
+
$content_query = $DB->query($sql);
self::reset_query();
return self::statment_query($content_query,$exclude,$search);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-06-16 06:21:41
|
Revision: 4743
http://sourceforge.net/p/oscss/svn/4743
Author: oscim
Date: 2013-06-16 06:21:38 +0000 (Sun, 16 Jun 2013)
Log Message:
-----------
re write sql query categorie list
Modified Paths:
--------------
branches/2.1.1/catalog/includes/classes/drivers/data/categorie.php
Modified: branches/2.1.1/catalog/includes/classes/drivers/data/categorie.php
===================================================================
--- branches/2.1.1/catalog/includes/classes/drivers/data/categorie.php 2013-06-16 06:19:57 UTC (rev 4742)
+++ branches/2.1.1/catalog/includes/classes/drivers/data/categorie.php 2013-06-16 06:21:38 UTC (rev 4743)
@@ -4,7 +4,7 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 01/01/2012, 18:17
+ @date 14/06/2013, 18:17
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@file driver.categorie.php
@@ -155,7 +155,7 @@
* @param $option
*/
protected static function cstr_query($orderby='', $limit='', $option=''){
- $query="SELECT c.categories_id, parent_id, cd.categories_description, c.categories_image, cd.categories_name,c.categories_datatype, sortchids , sortchids_datatype, categories_status, categories_hidden FROM " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd WHERE " . DataForceStatus(" c.categories_status='1' AND ") . " c.categories_id = cd.categories_id AND cd.language_id = '" . self::$lg_id . "' ";
+ $query="SELECT c.categories_id, parent_id, cd.categories_description, c.categories_image, cd.categories_name,c.categories_datatype, sortchids , sortchids_datatype, categories_status, categories_hidden FROM " . TABLE_CATEGORIES . " c LEFT JOIN " . TABLE_CATEGORIES_DESCRIPTION . " cd ON (c.categories_id = cd.categories_id AND cd.language_id = '" . self::$lg_id . "' ) WHERE " . DataForceStatus(" c.categories_status='1' ") . " ";
$query .=self::$where_query;
$query .=' ORDER BY ' .(!tep_not_null($orderby)? ' c.sort_order, cd.categories_name ASC ' : $orderby) ;
@@ -188,7 +188,7 @@
//! soit id soit sherach name key
self::add_where_query((tep_not_null($id) && is_numeric($id) ? " AND c.categories_id = '" . (int)$id . "' ": (!empty($search)?" AND cd.categories_name LIKE '%" . tep_db_input($search) . "%' ":'') ));
$sql=self::cstr_query( (isset($option['orderby'])?(string)$option['orderby']:''),(isset($option['limit'])?(int)$option['limit']:''),(array)@$option) ;
-
+echo $sql;
$content_query = $DB->query($sql);
self::reset_query();
return self::statment_query($content_query,$exclude,$search);
@@ -245,11 +245,11 @@
private static function countChidlsAll($category_id, $datatype, $status=1){
$count_c = 0;
- if($status ==0)
+ if($status ==0)
return 0;
// check if class defined and autorised in conf
- if(class_exists($datatype) && DataTypes::is_active($datatype) )
+ if(class_exists($datatype) && DataTypes::is_active($datatype) )
$count_c=$datatype::get_count_in_category((int)$category_id);
return (($count_c >0 )? 1 : 0);
@@ -336,7 +336,7 @@
/**
@brief Extra for categorie
@param $id categorie id int
- @param $key string or null for generic extra
+ @param $key string or null for generic extra
*/
public static function GetExtra($id, $key=''){
$DB=Database::getInstance();
@@ -345,7 +345,7 @@
if(!$_q->__get('numRows'))
return false;
-
+
$res = $_q->fetchAssoc();
return unserialize($res['cat_value']) ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-06-16 06:20:01
|
Revision: 4742
http://sourceforge.net/p/oscss/svn/4742
Author: oscim
Date: 2013-06-16 06:19:57 +0000 (Sun, 16 Jun 2013)
Log Message:
-----------
Fix data sample error
Modified Paths:
--------------
branches/2.1.1/catalog/install/includes/sql/mysql/data/40_osc_categories.sql
Modified: branches/2.1.1/catalog/install/includes/sql/mysql/data/40_osc_categories.sql
===================================================================
--- branches/2.1.1/catalog/install/includes/sql/mysql/data/40_osc_categories.sql 2013-06-16 06:11:52 UTC (rev 4741)
+++ branches/2.1.1/catalog/install/includes/sql/mysql/data/40_osc_categories.sql 2013-06-16 06:19:57 UTC (rev 4742)
@@ -15,7 +15,7 @@
insert into osc_categories ( categories_id , categories_datatype, categories_image , parent_id , sort_order , date_added , categories_status ) values ( '1', '' ,NULL , '0', NULL , NOW(), '1' );
-insert into osc_categories ( categories_id , categories_datatype, categories_image , parent_id , sort_order , date_added , categories_status ) values ( '2', 'content,' ,NULL , '0', NULL , NOW(), '1' );
+insert into osc_categories ( categories_id , categories_datatype, categories_image , parent_id , sort_order , date_added , categories_status ) values ( '2', 'content' ,NULL , '0', NULL , NOW(), '1' );
insert into osc_categories ( categories_id , categories_datatype, categories_image , parent_id , sort_order , date_added , categories_status ) values ( '3', '' ,NULL , '0', NULL , NOW(), '0' );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-06-16 06:11:55
|
Revision: 4741
http://sourceforge.net/p/oscss/svn/4741
Author: oscim
Date: 2013-06-16 06:11:52 +0000 (Sun, 16 Jun 2013)
Log Message:
-----------
Fix sql in search
Modified Paths:
--------------
branches/2.1.1/catalog/common/classes/datatype_drivers/Data_content.php
Modified: branches/2.1.1/catalog/common/classes/datatype_drivers/Data_content.php
===================================================================
--- branches/2.1.1/catalog/common/classes/datatype_drivers/Data_content.php 2013-06-15 12:44:10 UTC (rev 4740)
+++ branches/2.1.1/catalog/common/classes/datatype_drivers/Data_content.php 2013-06-16 06:11:52 UTC (rev 4741)
@@ -220,7 +220,7 @@
$this->listing_sql['tables'] = " FROM " . TABLE_CONTENT . " ".$this->p." ";
$this->listing_sql['tables'] .=" LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " ".$this->p."d ON(".$this->p.".content_id = ".$this->p."d.content_id AND ".$this->p."d.language_id = '" . (int)$languages_id . "' ) ";
- $this->listing_sql['tables'] .=" LEFT JOIN " . TABLE_CONTENT_TO_CATEGORIES . " ".$this->p."2c using(content_id) ";
+ $this->listing_sql['tables'] .=" LEFT JOIN " . TABLE_CONTENT_TO_CATEGORIES . " ".$this->p."2c ON(".$this->p."2c.content_id = ".$this->p.".content_id) ";
$this->listing_sql['tables'] .= " LEFT JOIN " . TABLE_CATEGORIES . " cat ON( ".$this->p."2c.categories_id = cat.categories_id and cat.categories_status='1' ) ";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-06-15 12:44:13
|
Revision: 4740
http://sourceforge.net/p/oscss/svn/4740
Author: oscim
Date: 2013-06-15 12:44:10 +0000 (Sat, 15 Jun 2013)
Log Message:
-----------
Fix bug display data and status
Modified Paths:
--------------
branches/2.1.1/catalog/includes/modules/featured.php
Modified: branches/2.1.1/catalog/includes/modules/featured.php
===================================================================
--- branches/2.1.1/catalog/includes/modules/featured.php 2013-06-14 06:22:40 UTC (rev 4739)
+++ branches/2.1.1/catalog/includes/modules/featured.php 2013-06-15 12:44:10 UTC (rev 4740)
@@ -4,7 +4,7 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 09/05/2012, 08:18
+ @date 12/06/2013, 08:18
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@brief module base new products
@@ -15,7 +15,7 @@
@example CallSpecififcfeatruedbykey
- in file init.php precise
+ in file init.php precise
$this->add_var_page('featured_key','home_slideshow');
*/
@@ -41,7 +41,7 @@
- // type simple
+ // type simple
$sql = "SELECT fda.datatype_id as id, datatype , featured_title FROM ".TABLE_FEATURED_DATA." fda ".
" LEFT JOIN ". TABLE_FEATURED_DESCRIPTION." fd ON(fd.featured_id = fda.featured_id AND languages_id = '".$languages_id."' ) ".
" LEFT JOIN ". TABLE_FEATURED." f ON(fda.featured_id = f.row_id ) ".
@@ -73,7 +73,7 @@
$p=array();
- // exit if no result
+ // exit if no result
if( $res == false || $res->__get('numRows') <= 0)
return null;
@@ -85,9 +85,10 @@
if( DataTypes::is_active($dt)){
$pd = $dt::get_item($featured['id']);
- // $pd->aca=$aca_listing->return_db_min($featured['products_id']);
- $pd->type = $dt;
- $p[]=$pd;
+ if($pd !=false) {
+ $pd->type = $dt;
+ $p[]=$pd;
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-06-14 06:22:43
|
Revision: 4739
http://sourceforge.net/p/oscss/svn/4739
Author: oscim
Date: 2013-06-14 06:22:40 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
Fix
Modified Paths:
--------------
branches/2.1.1/catalog/includes/classes/pad_base.php
Modified: branches/2.1.1/catalog/includes/classes/pad_base.php
===================================================================
--- branches/2.1.1/catalog/includes/classes/pad_base.php 2013-06-11 08:06:39 UTC (rev 4738)
+++ branches/2.1.1/catalog/includes/classes/pad_base.php 2013-06-14 06:22:40 UTC (rev 4739)
@@ -322,59 +322,59 @@
$txt = ' ( ' . __('attribute text equal') . $currencies->display_price( $show_price , tep_get_tax_rate($this->products_tax_class_id)) .')';
}
-// echo $show_price;
+var_dump( $show_price );
/** Price / option value */
- if ($products_options['options_values_price'] != '0' && $this->display_TextDetailForAdjustPrice) {
+ if (/*$products_options['options_values_price'] != '0' &&*/ $this->display_TextDetailForAdjustPrice) {
$products_options_array[sizeof($products_options_array)-1]['text'] .=$txt;
}
/** */
if($this->actual_price_pull_down){
//Option prices will displayed as a final product price. This can (currently) only be used with a satisfying result if you have only one option per product.
- // in case price lowers, don't add values, subtract.
- // force float (in case) using the 0.0;
-// switch($products_options['price_prefix']){
-// case 'x':
-// $show_price = 0.0 + ($this->products_original_price * $products_options['options_values_price']);
-// break;
-// case '/':
-// if($products_options['options_values_price']<=0) $products_options['options_values_price'] = 1;
-// $show_price = 0.0 + ($this->products_original_price / $products_options['options_values_price']);
-// break;
-// case '+':
-// $show_price = 0.0 + $this->products_original_price + $products_options['options_values_price'];
-// break;
-// case '-':
-// $show_price = 0.0 + $this->products_original_price - $products_options['options_values_price'];
-// break;
-// case '=':
-// $show_price = 0.0 + $products_options['options_values_price'];
-// break;
-// default:
-// $show_price = 0.0 + $this->products_original_price ;
-// }
-// if ($products_options['price_prefix'] == '-') $show_price = 0.0 + $this->products_original_price - $products_options['options_values_price'];
-// else $show_price = 0.0 + $this->products_original_price + $products_options['options_values_price'];
+ // in case price lowers, don't add values, subtract.
+ // force float (in case) using the 0.0;
+ // switch($products_options['price_prefix']){
+ // case 'x':
+ // $show_price = 0.0 + ($this->products_original_price * $products_options['options_values_price']);
+ // break;
+ // case '/':
+ // if($products_options['options_values_price']<=0) $products_options['options_values_price'] = 1;
+ // $show_price = 0.0 + ($this->products_original_price / $products_options['options_values_price']);
+ // break;
+ // case '+':
+ // $show_price = 0.0 + $this->products_original_price + $products_options['options_values_price'];
+ // break;
+ // case '-':
+ // $show_price = 0.0 + $this->products_original_price - $products_options['options_values_price'];
+ // break;
+ // case '=':
+ // $show_price = 0.0 + $products_options['options_values_price'];
+ // break;
+ // default:
+ // $show_price = 0.0 + $this->products_original_price ;
+ // }
+ // if ($products_options['price_prefix'] == '-') $show_price = 0.0 + $this->products_original_price - $products_options['options_values_price'];
+ // else $show_price = 0.0 + $this->products_original_price + $products_options['options_values_price'];
-// $products_options_array[sizeof($products_options_array)-1]['text'] .= ' '.$currencies->display_price( $show_price, tep_get_tax_rate($this->products_tax_class_id)).' ';
-// $products_options_array[sizeof($products_options_array)-1]['text'] .= ' (' . $products_options['price_prefix'] . $currencies->display_price($products_options['options_values_price'], tep_get_tax_rate($this->products_tax_class_id)) .')';
- $products_options_array[sizeof($products_options_array)-1]['price'] =$currencies->display_price( $show_price, tep_get_tax_rate($this->products_tax_class_id));
- $products_options_array[sizeof($products_options_array)-1]['prefix'] =$products_options['price_prefix'];
- $products_options_array[sizeof($products_options_array)-1]['adjust'] =$products_options['options_values_price'];
+ // $products_options_array[sizeof($products_options_array)-1]['text'] .= ' '.$currencies->display_price( $show_price, tep_get_tax_rate($this->products_tax_class_id)).' ';
+ // $products_options_array[sizeof($products_options_array)-1]['text'] .= ' (' . $products_options['price_prefix'] . $currencies->display_price($products_options['options_values_price'], tep_get_tax_rate($this->products_tax_class_id)) .')';
+ $products_options_array[sizeof($products_options_array)-1]['price'] =$currencies->display_price( $show_price, tep_get_tax_rate($this->products_tax_class_id));
+ $products_options_array[sizeof($products_options_array)-1]['prefix'] =$products_options['price_prefix'];
+ $products_options_array[sizeof($products_options_array)-1]['adjust'] =$products_options['options_values_price'];
}
- else{ //Display the option prices as differece prices with +/- prefix as usually
- if ($products_options['options_values_price'] != '0') {
- $products_options_array[sizeof($products_options_array)-1]['price'] = $this->products_original_price;
- $products_options_array[sizeof($products_options_array)-1]['prefix'] ='';
- }
- }
+ else{ //Display the option prices as differece prices with +/- prefix as usually
+ // if ($products_options['options_values_price'] != '0') {
+ $products_options_array[sizeof($products_options_array)-1]['price'] = $currencies->display_price( $show_price, tep_get_tax_rate($this->products_tax_class_id));
+ $products_options_array[sizeof($products_options_array)-1]['prefix'] ='';
+ // }
+ }
- $products_options_array[sizeof($products_options_array)-1]['original_price'] = $this->products_org_price;
+ $products_options_array[sizeof($products_options_array)-1]['original_price'] = $this->products_org_price;
- if(empty($selected))$selected=$products_options['products_options_values_id'];
+ if(empty($selected))$selected=$products_options['products_options_values_id'];
}
if (isset($cart->contents[$this->products_id]['attributes'][$products_options_name['products_options_id']])) $selected = $cart->contents[$this->products_id]['attributes'][$products_options_name['products_options_id']];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-06-11 08:06:54
|
Revision: 4738
http://sourceforge.net/p/oscss/svn/4738
Author: oscim
Date: 2013-06-11 08:06:39 +0000 (Tue, 11 Jun 2013)
Log Message:
-----------
Clean code and normalise code
Modified Paths:
--------------
branches/2.1.1/catalog/includes/classes/pad_base.php
Modified: branches/2.1.1/catalog/includes/classes/pad_base.php
===================================================================
--- branches/2.1.1/catalog/includes/classes/pad_base.php 2013-06-11 05:22:51 UTC (rev 4737)
+++ branches/2.1.1/catalog/includes/classes/pad_base.php 2013-06-11 08:06:39 UTC (rev 4738)
@@ -42,9 +42,7 @@
\li pad_base constructor
\li _SetConfigurationProperties set local properties from DB config constants
\li draw draw the product attributes
- \li _draw_table_start draw start of the table to enclose the attributes display
\li _draw__attributes draw attributes
- \li _draw_table_end draw end of the table to enclose the attributes display
\li _draw_js_stock_array draw a Javascript array of in stock attribute combinations
\li _build_attributes_array build an array of the attributes for the product
\li _build_attributes_combinations build an array of the attribute combinations for the product
@@ -63,13 +61,31 @@
* \brief process calcul attribute for product
*/
class pad_base {
+ /**
+ @var int id current product
+ */
public $products_id;
+ /**
+ @var int id tax current product
+ */
public $products_tax_class_id;
- public $show_out_of_stock;
- public $mark_out_of_stock;
- public $out_of_stock_msgline;
- public $no_add_out_of_stock;
+ /**
+ @var boolean config display ans check
+ */
+ public $stock_check = false;
+ public $show_out_of_stock = false;
+ public $mark_out_of_stock = false;
+ public $out_of_stock_msgline = false;
+ public $no_add_out_of_stock = false;
+ /**
+ @var boolean active js for adjust master price product on click option
+ */
+ public $actual_price_pull_down = false;
+ /**
+ @var boolean true for view text in line value option for precise adjust price ; default is false
+ */
+ private $display_TextDetailForAdjustPrice = false;
/**
* \fn pad_base($products_id=0, $class_master='')
@@ -113,19 +129,13 @@
$this->no_add_out_of_stock = _cst_bool($prefix . 'NO_ADD_OUT_OF_STOCK');
$this->stock_check = _cst_bool('STOCK_CHECK');
}
- else {
- $this->show_out_of_stock = false;
- $this->mark_out_of_stock = false;
- $this->out_of_stock_msgline = false;
- $this->no_add_out_of_stock = false;
- $this->stock_check = false;
- }
$this->actual_price_pull_down = _cst_bool($prefix . 'ACTUAL_PRICE_PULL_DOWN');
$this->up_master=0;
// compte nbr caractére ligne / max leng / attribut texte
$this->count_lg_txt=false;
+
}
@@ -166,35 +176,20 @@
public function draw() {
$attributes=$this->the_attributes;
if (sizeof($attributes)==0) return false;
+
+ //! utilise la function de la class appelante, en rempacement de celle ci
+ if($this->class_master !=false && method_exists($this->class_master, 'draw') )
+ return $this->class_master->draw();
+
$out= '<h4>'.TEXT_PRODUCT_OPTIONS.'</h4>'.
- $this->_draw_table_start().
- $this->out.
- $this->_draw_table_end();
+ '<ul class="production_option list">'.
+ $this->out.
+ '</ul>';
return $out;
}
- /**
- * \fn _draw_table_start()
- * \brief
- Draws the start of a table to wrap the product attributes display.
- Intended for class internal use only.
- @returns: string: HTML for start of table
- */
- protected function _draw_table_start() {
- return '<ul class="production_option list">';
- }
- /**
- * \fn _draw_table_end()
- * \brief
- Draws the end of a table to wrap the product attributes display.
- Intended for class internal use only.
- @returns: string: HTML for end of table
- */
- protected function _draw_table_end() {
- return '</ul>';
- }
/**
* \fn _draw_attributes($attrib)
@@ -216,9 +211,9 @@
//! boucle adapt sortie
for ($a=0, $s=sizeof($item['ovals']); $a<$s; $a++) {
- $mode_img[]=$mod=(!empty($item['ovals'][$a]['thumbnail'])? true : false);
- $item['ovals'][$a]['text']=($mod)? tep_image($item['ovals'][$a]['thumbnail'], $item['ovals'][$a]['text']):$item['ovals'][$a]['text'];
- $mode_url[]=(!empty($item['ovals'][$a]['url'])? true : false);
+ $mode_img[]=$mod=(!empty($item['ovals'][$a]['thumbnail'])? true : false);
+ $item['ovals'][$a]['text']=($mod)? tep_image($item['ovals'][$a]['thumbnail'], $item['ovals'][$a]['text']):$item['ovals'][$a]['text'];
+ $mode_url[]=(!empty($item['ovals'][$a]['url'])? true : false);
}
//! js exe inline
@@ -279,8 +274,8 @@
$products_options_array = array();
$selected='';
- $products_options_query = tep_db_query("select pov.products_options_values_id, pov.products_options_values_name,pov.products_options_values_thumbnail,pa.products_options_values_url, pa.options_values_price, pa.price_prefix from " . TABLE_PRODUCTS_ATTRIBUTES . " pa, " . TABLE_PRODUCTS_OPTIONS_VALUES . " pov where pa.products_id = '" . (int)$this->products_id . "' and pa.options_id = '" . (int)$products_options_name['products_options_id'] . "' and pa.options_values_id = pov.products_options_values_id and pov.language_id = '" . (int)$languages_id . "' order by products_options_sort_order ASC");
-
+ $products_options_query = tep_db_query($sql="select pov.products_options_values_id, pov.products_options_values_name,pov.products_options_values_thumbnail,pa.products_options_values_url, pa.options_values_price, pa.price_prefix from " . TABLE_PRODUCTS_ATTRIBUTES . " pa, " . TABLE_PRODUCTS_OPTIONS_VALUES . " pov where pa.products_id = '" . (int)$this->products_id . "' and pa.options_id = '" . (int)$products_options_name['products_options_id'] . "' and pa.options_values_id = pov.products_options_values_id and pov.language_id = '" . (int)$languages_id . "' order by products_options_sort_order ASC");
+// echo $sql;
while ($products_options = tep_db_fetch_array($products_options_query)) {
$products_options_array[] = array('id' => $products_options['products_options_values_id'],
'text' => $products_options['products_options_values_name'],
@@ -311,6 +306,7 @@
break;
case '+':
$show_price = 0.0 + $this->products_org_price + $products_options['options_values_price'];
+
$txt =' ( ' . __('attribute text major') . $currencies->display_price( $show_price , tep_get_tax_rate($this->products_tax_class_id)) .')';
break;
case '-':
@@ -330,9 +326,8 @@
/** Price / option value */
- if ($products_options['options_values_price'] != '0') {
+ if ($products_options['options_values_price'] != '0' && $this->display_TextDetailForAdjustPrice) {
$products_options_array[sizeof($products_options_array)-1]['text'] .=$txt;
-// ' (' . $products_options['price_prefix'] . $currencies->display_price($products_options['options_values_price'], tep_get_tax_rate($this->products_tax_class_id)) .')';
}
/** */
if($this->actual_price_pull_down){
@@ -412,7 +407,8 @@
$field ='';
//! utilise la function de la class appelante, en rempacement de celle ci
- if($this->class_master !=false && method_exists($this->class_master, '_draw_type_att') ) return $this->class_master->_draw_type_att($array,$js);
+ if($this->class_master !=false && method_exists($this->class_master, '_draw_type_att') )
+ return $this->class_master->_draw_type_att($array,$js);
$selected=(tep_not_null($array['default']))? $array['default'] : '';
@@ -428,7 +424,6 @@
$field .= tep_draw_pull_down_radio('id['.$array['oid'].']','id_'.$array['oid'],$array['ovals'],$selected,$js);
break;
case '4': //Checkbox
-var_dump(__FILE__ . __LINE__ );
$field .= tep_draw_pull_down_checkbox('id['.$array['oid'].'][]','id_'.$array['oid'],$array['ovals'],$selected,$js);
break;
case '1': // Select
@@ -697,6 +692,8 @@
$out.=" var master2 = $('#price_master .price').html(); \n"; // document.getElementById('price_master');\n";
// $out.=" alert(master2); \n";
$tableau_JS="Tableau2";
+
+
$out.= sprintf("%s = new Array();\n",$tableau_JS);
for($i=0, $m=count($attributes); $i< $m; $i++){
$out.= sprintf("%s[%s]= new Array();\n",$tableau_JS, $i);
@@ -714,7 +711,7 @@
$out.=" tab = ".$tableau_JS."[idn] ;\n";
$out.=" var actuel = ".$rp." ;"; //parseFloat(master2) ;\n";
// $out.=" var actuell = strlen(actuel); \n";
- $out.=" alert(actuel) \n";
+// $out.=" alert(actuel) \n";
// $out.=" if ( pile_price != actuel ){;\n";
// $out.=" if(pile_prefix == '-' ) actuel = parseFloat(master2.innerHTML)+ parseFloat(pile_price) ;\n";
// $out.=" else actuel = parseFloat(master2.innerHTML)-parseFloat(pile_price) ;\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-06-11 05:22:54
|
Revision: 4737
http://sourceforge.net/p/oscss/svn/4737
Author: oscim
Date: 2013-06-11 05:22:51 +0000 (Tue, 11 Jun 2013)
Log Message:
-----------
Fix bug shopping cart
Fix css in less for default template backoffice
Fix adjust price by attribute product in frontoffice
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/template/defaut/css/less/forms.less
branches/2.1.1/catalog/common/classes/shoppingCart.php
branches/2.1.1/catalog/includes/classes/pad_base.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/css/less/forms.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/css/less/forms.less 2013-06-11 05:18:08 UTC (rev 4736)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/css/less/forms.less 2013-06-11 05:22:51 UTC (rev 4737)
@@ -3,21 +3,21 @@
-input,
-select,
-textarea,
-button {
+input,
+select,
+textarea,
+button {
padding:(@padding_base * 0.3) ;
- font-family: Verdana,Arial,sans-serif;
- font-size: (@font_size*1.3);
+ font-family: Verdana,Arial,sans-serif;
+ font-size: (@font_size*1.3);
border:1px solid @bg_input_border;
- background: @bg_input ;
+ background: @bg_input ;
.border-radius(5px);
.rounded(5px);
-
+
&:hover{
border:1px solid @bg_input_border_hover;
- background: @bg_input_hover ;
+ background: @bg_input_hover ;
}
}
@@ -26,20 +26,20 @@
// master central display
form{
padding:0;
-
+
label { display: inline-block; font-weight: bold; line-height: 18px; margin: 5px 5px 5px 0; padding: 0 0 2px; text-align: left; min-width: 20%;}
-
+
fieldset legend { color:#666666; font-size:(@font_size*1.2); font-style:italic; font-weight:bold; padding:0 5px 0 20px;}
-
+
textarea{ vertical-align:baseline;}
-
- p{
-
+
+ p{
+
input[type="checkbox"] { float:right; }
-
+
select,
- input[type="text"] {
- margin:5px 15px;
+ input[type="text"] {
+ margin:5px 15px;
}
select{
padding:1px 0 0 0;
@@ -48,30 +48,31 @@
}
}
p.new_product_img {
- float:left;
- padding:5px;
+ float:left;
+ padding:5px;
margin : 0 auto;
- text-align:center;
+ text-align:center;
width:98%;
- border:1px solid @color_012;
+ border:1px solid @color_012;
.border-radius(5px,5px,5px,5px);
-
+
img{
margin:auto;
max-width: 300px;
}
}
-
-
+
+
ul.ui-tabs-nav {display: inline-block; margin: 0 ; padding: 1px; width: 99%;}
-
+
+ &.block_form,
.block_form {
.block_input{
text-shadow:0 1px 0 #fff;
- width:94.9%;
- margin:0 1px;
- display:inline-block;
- text-align: left;
+ width:94.9%;
+ margin:0 1px;
+ display:inline-block;
+ text-align: left;
background:#C9C9C9;
float:left;
line-height:18px;
@@ -80,23 +81,23 @@
.border-radius(5px);
.rounded(5px);
.bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
-
-
+
+
span.value_edit {clear:both;display:inline-block; width:100%;}
-
+
br,
span.value_edit br{display:none;}
-
+
label br {display:inline-block;}
-
+
span.edit-input,
span.value_edit span.edit-input{float:left; display:inline-block; padding:0 12px;}
-
+
span.edit-input{
white-space:nowrap;
-
+
input{float: left;}
-
+
.edit-input-value-alternate {display:inline-block;width:20px; height: 20px;margin: 0 12px;}
.edit-input-value {padding-left:12px;}
/* remplacement true /false par icone */
@@ -106,29 +107,29 @@
.edit-input-value-alternate.Val-false {background:transparent url("../../img/1/busy.png") left top no-repeat;}
}
}
-
+
.block_input.tirroir {float:none;}
-
+
.tabs_lang{ float:left;}
}
-
-
-
-
-
+
+
+
+
+
fieldset {
- margin: 0.1em ;
- padding:0.1em;
- border:none;
-
- p {
+ margin: 0.1em ;
+ padding:0.1em;
+ border:none;
+
+ p {
margin: 0.1em;
padding:0.1em;
}
-
+
select,
- input[type="text"] {
- min-width:62%;
+ input[type="text"] {
+ min-width:62%;
display:inline-block;
&.w_5 {
@@ -148,69 +149,69 @@
width:30%;
}
}
-
- input.price,
- input[type=text].price,
+
+ input.price,
+ input[type=text].price,
input[type=hidden].price{
- width :120px;
+ width :120px;
min-width :120px;
text-align : right;
}
-
-
+
+
select option {display:block; float:none;clear:both;width:100%}
-
+
label { line-height: 18px; margin-right: 10px; display:inline-block; padding: 0 0 2px 0;}
-
- ul{
+
+ ul{
list-style:none;
.rounded(5px);
}
- // Cat list lors edition article ou cms
+ // Cat list lors edition article ou cms
ul.LinkToView{
- overflow: auto;
- max-height: 160px;
- background-color: #fff;
- padding: 5px;
- line-height: 15px;
- border: 1px solid #666;
+ overflow: auto;
+ max-height: 160px;
+ background-color: #fff;
+ padding: 5px;
+ line-height: 15px;
+ border: 1px solid #666;
}
}
-
+
.block_field {
text-shadow:0 1px 0 #fff;
- width:98.9%; margin:2px ;
- display:inline-block;
- text-align: left;
- padding: 5px 3px;
+ width:98.9%; margin:2px ;
+ display:inline-block;
+ text-align: left;
+ padding: 5px 3px;
float:left;
-
+
.tabs,
.tabs_lang{
- margin:0 2px ;
- display:inline-block;
- text-align: left;
- padding:0 5px;
+ margin:0 2px ;
+ display:inline-block;
+ text-align: left;
+ padding:0 5px;
float:left;
}
-
+
&.tabs_lang ul,
.tabs_lang ul.ui-tabs-nav,
.tabs_lang ul.ui-tabs-panel{display: inline-block; padding: 1px; width: 100%;}
}
-
+
.block_input label.inline { white-space:nowrap; width: 20%;}
-
+
.edit.col_right .block_input{
width:95%;
-
+
label{width:20%;text-align:left;font-weight:bold}
}
-
+
.block_input .hasDatepicker{ margin:0; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;line-height:30px; min-width:0;}
-
+
.input-multi input[type="checkbox"],
.input-multi input[type="radio"]{float:none;}
-
-
+
+
}
Modified: branches/2.1.1/catalog/common/classes/shoppingCart.php
===================================================================
--- branches/2.1.1/catalog/common/classes/shoppingCart.php 2013-06-11 05:18:08 UTC (rev 4736)
+++ branches/2.1.1/catalog/common/classes/shoppingCart.php 2013-06-11 05:22:51 UTC (rev 4737)
@@ -157,7 +157,7 @@
while ($attributes = $attributes_query->fetchAssoc()) {
- // specific mode txt type option product
+ // specific mode txt type option product
if ($attributes['type'] == 2){
$this->contents[$products['products_id']]['attributes'][$attributes['products_options_id']] = $attributes['products_options_value_id'];
$this->contents[$products['products_id']]['attributes_values'][$attributes['products_options_id']] = $attributes['products_options_value_text'];
@@ -221,10 +221,9 @@
else {
$this->contents[$products_id_string] = array('qty' => $qty);
if(!empty($special_class)) $this->contents[$products_id_string]['special_class'] = $special_class;
- // insert into database
- if (tep_session_is_registered('customer_id')){
+
if (is_array($attributes)) {
reset($attributes);
while (list($option, $value) = each($attributes)) {
@@ -257,9 +256,10 @@
}
}
- tep_db_query("insert into " . TABLE_CUSTOMERS_BASKET . " (customers_id, products_id, customers_basket_quantity, customers_basket_date_added) values ('" . (int)$customer_id . "', '" . tep_db_input($products_id_string) . "', '" . $qty . "', '" . date('Ymd') . "')");
+ // insert into database
+ if (tep_session_is_registered('customer_id'))
+ tep_db_query("insert into " . TABLE_CUSTOMERS_BASKET . " (customers_id, products_id, customers_basket_quantity, customers_basket_date_added) values ('" . (int)$customer_id . "', '" . tep_db_input($products_id_string) . "', '" . $qty . "', '" . date('Ymd') . "')");
- }
}
// assign a temporary unique ID to the order contents to prevent hack attempts during the checkout procedure
$this->cartID = $this->generate_cart_id();
@@ -431,13 +431,13 @@
// 'group' => (isset($this->contents[$products_id]['group'])? (array)$this->contents[$products_id]['group'] : false),
);
-// if(isset($tmp['group']['id']))
+// if(isset($tmp['group']['id']))
// $products_array[$tmp['group']['id']][] = $tmp;
// else
// $products_array['nogroup'][] = $tmp;
}
}
-
+
// print_r($products_array);
// exit;
// ksort($products_array);
@@ -621,7 +621,7 @@
//! modification par les modules order total
$products[$i]=$this->process_cart($products[$i]);
- if(isset($products[$i]['group']['id']))
+ if(isset($products[$i]['group']['id']))
$products_array[$products[$i]['group']['id']][] = $products[$i];
else
$products_array['nogroup'][] = $products[$i];
Modified: branches/2.1.1/catalog/includes/classes/pad_base.php
===================================================================
--- branches/2.1.1/catalog/includes/classes/pad_base.php 2013-06-11 05:18:08 UTC (rev 4736)
+++ branches/2.1.1/catalog/includes/classes/pad_base.php 2013-06-11 05:22:51 UTC (rev 4737)
@@ -301,20 +301,20 @@
// if ($products_options['options_values_price'] != '0')
switch($products_options['price_prefix']){
case 'x':
- $show_price = 0.0 + ( (float)$this->products_original_price * (float)$products_options['options_values_price']);
+ $show_price = 0.0 + ( (float)$this->products_org_price * (float)$products_options['options_values_price']);
$txt = ' ( ' . __('attribute text total') .' '. $currencies->display_price($show_price) .')';
break;
case '/':
if($products_options['options_values_price']<=0) $products_options['options_values_price'] = 1;
- $show_price = 0.0 + ($this->products_original_price / $products_options['options_values_price']);
+ $show_price = 0.0 + ($this->products_org_price / $products_options['options_values_price']);
$txt =' ( ' . __('attribute text total') . $currencies->display_price( $show_price , tep_get_tax_rate($this->products_tax_class_id)) .')';
break;
case '+':
- $show_price = 0.0 + $this->products_original_price + $products_options['options_values_price'];
+ $show_price = 0.0 + $this->products_org_price + $products_options['options_values_price'];
$txt =' ( ' . __('attribute text major') . $currencies->display_price( $show_price , tep_get_tax_rate($this->products_tax_class_id)) .')';
break;
case '-':
- $show_price = 0.0 + $this->products_original_price - $products_options['options_values_price'];
+ $show_price = 0.0 + $this->products_org_price - $products_options['options_values_price'];
$txt =' ( ' . __('attribute text minor') . $currencies->display_price( $show_price , tep_get_tax_rate($this->products_tax_class_id)) .')';
break;
// case '=':
@@ -322,7 +322,7 @@
// $txt =' ( ' . __('attribute text equal') . $currencies->display_price( $show_price , tep_get_tax_rate($this->products_tax_class_id)) .')';
// break;
default:
- $show_price = 0.0 + $this->products_original_price ;
+ $show_price = 0.0 + $this->products_org_price ;
$txt = ' ( ' . __('attribute text equal') . $currencies->display_price( $show_price , tep_get_tax_rate($this->products_tax_class_id)) .')';
}
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php 2013-06-11 05:18:08 UTC (rev 4736)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php 2013-06-11 05:22:51 UTC (rev 4737)
@@ -82,7 +82,7 @@
<td class="cart-line desc" <?php if(!isset($product['group_linking']) && !$product['group'] ) echo 'colspan="2" ' ?>>
<?php echo $product['name'] ;?><span id="ajaxcarttext<?php echo $i; ?>"><?php echo $product['alert_stock'] ;?></span>
</td>
-
+
<td class="cart-line puht tcenter">
<?php echo $currencies->format($product['price']) ;?>
</td>
@@ -97,7 +97,7 @@
<td class="cart-line taxe tcenter">
<span><?php echo tep_get_tax_rate($product['tax_class_id']) ;?> </span>
</td>
-
+
<td class="cart-line tottaxe tright">
<span id="ajaxcarttaxe<?php echo $i; ?>" class="cartPrice"> <?php echo$currencies->format( ($product['final_price_ttc'] - $product['final_price']) ) ;?> </span>
</td>
@@ -158,7 +158,7 @@
<?php echo '<a class="Bt navBt link" href="' . $navigation->GetBack() . '">' . IMAGE_BUTTON_CONTINUE_SHOPPING . '</a>'; ?>
<?php if ($cart->ContinueButton()): ?>
- <?php echo '<a class="Bt navBt link" href="' . tep_href_link(FILENAME_CHECKOUT, '', 'SSL') . '">' . IMAGE_BUTTON_CHECKOUT . '</a>'; ?>
+ <?php echo '<a class="Bt navBt link" href="' . tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL') . '">' . IMAGE_BUTTON_CHECKOUT . '</a>'; ?>
<?php endif ?>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-06-11 05:18:11
|
Revision: 4736
http://sourceforge.net/p/oscss/svn/4736
Author: oscim
Date: 2013-06-11 05:18:08 +0000 (Tue, 11 Jun 2013)
Log Message:
-----------
Fix
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt
Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt 2013-06-01 18:26:59 UTC (rev 4735)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt 2013-06-11 05:18:08 UTC (rev 4736)
@@ -36,6 +36,7 @@
$lang['text sort order']="Ordre de tri :" ;
$lang['text edit datatype categorie']="Datatype actif pour cette categorie" ;
$lang['input datatype value none']="aucun datatype specifique" ;
+ $lang['view in menu']="Voir dans le menu" ;
/* New light */
$lang['image add cat and edit']="Créer et editer" ;
@@ -52,6 +53,14 @@
$lang['@categorie link %s to %s'] = "Catégories" ;
+/* message */
+ $lang['@categorie create'] = "Catégorie crée" ;
+ $lang['save categorie %s success'] = "Catégorie n°%s enregsitrée" ;
+ $lang['error catalog image directory not writeable %s']="Erreur : Impossible d'écrire dans le répertoire d'images : %s " ;
+ $lang['error catalog image directory does not exist %s']="Erreur : Le répertoire d'images n'existe pas : %s " ;
+ $lang['error cannot move category to parent']="Erreur : La catégorie ne peut pas être déplacée dans la sous-catégorie." ;
+
+
/* other */
$lang['text categories']="Catégories :" ;
$lang['text subcategories']="Sous-catégories :" ;
@@ -86,10 +95,6 @@
$lang['empty category']="Catégorie vide" ;
$lang['text delete image cat']="Aucune image" ;
$lang['text how to copy']="Méthode de copie :" ;
-$lang['view in menu']="Voir dans le menu" ;
-$lang['error catalog image directory not writeable %s']="Erreur : Impossible d'écrire dans le répertoire d'images : %s " ;
-$lang['error catalog image directory does not exist %s']="Erreur : Le répertoire d'images n'existe pas : %s " ;
-$lang['error cannot move category to parent']="Erreur : La catégorie ne peut pas être déplacée dans la sous-catégorie." ;
$lang['image preview public']="Prévisualiser page public" ;
$lang['image view public']="Voir page public" ;
$lang['text categories status']="Status " ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-06-01 18:27:04
|
Revision: 4735
http://sourceforge.net/p/oscss/svn/4735
Author: oscim
Date: 2013-06-01 18:26:59 +0000 (Sat, 01 Jun 2013)
Log Message:
-----------
Fix style and coquille in sample public template
Modified Paths:
--------------
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/Sitemap.css
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-order.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-product.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/datatype-generic.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/generic.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/master.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/template.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.currencies.gab
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/template.php
Removed Paths:
-------------
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.php 2013-05-02 18:54:03 UTC (rev 4734)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.php 2013-06-01 18:26:59 UTC (rev 4735)
@@ -19,12 +19,12 @@
</header>
<?php endif; ?>
-<div class="module">
+<!-- <div class="module"> -->
<section class="module">
<?php if($load->module =='child' && tep_not_null($themodule->module_db->title) ) : ?>
<header>
- <h4 class="module title"><?php echo unhtmlentities($themodule->module_db->title) ;?></h4>
+ <h4 class="main title"><?php echo unhtmlentities($themodule->module_db->title) ;?></h4>
</header>
<?php endif; ?>
@@ -136,9 +136,9 @@
<?php endforeach; ?>
</ul>
- </section>
+
<?php if ( isset($themodule->module_db->split) && ($themodule->module_db->split->number_of_rows > 0)&& (in_array(PREV_NEXT_BAR_LOCATION ,array('2','3') )) ) { ?>
<section id="splitPageBottom" class="splitnav">
<p class="sP1"><?php echo $themodule->module_db->split->display_count(TEXT_DISPLAY_NUMBER_OF); ?></p>
@@ -146,5 +146,6 @@
</section>
<?php } ?>
<br class="clear" />
-</div>
+
+ </section>
<?php ?>
\ No newline at end of file
Deleted: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css 2013-05-02 18:54:03 UTC (rev 4734)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css 2013-06-01 18:26:59 UTC (rev 4735)
@@ -1,44 +0,0 @@
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @subpackage Template 2cShopHtml5Oscim
- @package osCSS-2 <www http://www.oscss.org>
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
-
-
-/* Hx tags */
-
-/* ------------ Structure ------------ */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/* Bottom */
-
- /* footer */
-
-
-
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.less 2013-05-02 18:54:03 UTC (rev 4734)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.less 2013-06-01 18:26:59 UTC (rev 4735)
@@ -57,7 +57,7 @@
header#top{
- height:130px;
+ height:105px;
@@ -73,7 +73,7 @@
}
}
- div #top_bar {
+ div#top_bar {
float:left;
position:relative;
left:260px;
@@ -87,6 +87,75 @@
div{
float:left;
+ .boxe{
+ header{display:none;}
+ margin:0.5em 0.5em;
+ }
+
+ &.languages,
+ &#currenciesBox {
+ padding-top:0.4em;
+
+ a{
+ padding:0 0.15em;
+ border:1px solid transparent;
+ .border-radius(5px,5px,5px,5px);
+
+ img{
+ padding-top:0.15em;
+ }
+
+ &:hover{
+ text-decoration:none;
+ background: @bg_input_hover ;
+ border:1px solid @bg_input_border_hover;
+ .border-radius(5px,5px,5px,5px);
+ }
+
+ &.Selected{
+ color:@bg_input_hover;
+ cursor: default;
+
+ &:hover{
+ background: transparent ;
+ border:1px solid transparent;
+ }
+ }
+ }
+ }
+
+ &.search_suggest div#search_suggest{
+ position:absolute;
+ z-index:99999;
+ margin-top:10px;
+
+// padding:0;
+ background:#DDEEEE;
+ border:1px solid white;
+ .border-radius(5px,5px,5px,5px);
+
+ a{
+ color:black;
+ font-size:0.8em;
+ }
+
+ ul{
+ width:250px;
+// padding:0.5em;
+ list-style:circle;
+
+
+ li{
+// padding:
+ }
+
+ .smenufull_arbas,
+ .smenufull_arhaut{
+ display:none;
+ }
+ }
+ }
+
}
}
}
@@ -98,6 +167,12 @@
+/*
+ * Slider Home page
+ */
+
+
+
section#intro {
margin-top: 57px;
width: inherit;
@@ -105,7 +180,22 @@
.background-size(100%);
.border-radius(5px,5px,5px,5px);
+ section{
+ width:100%;
+ }
+ ul li {
+ width:960px;
+ height:220px;
+ margin:0;
+ padding:0;
+
+ .one.product section.outerblock {
+ height:inherit;
+ width:inherit;
+ }
+ }
+
h1,
h2,
p {
@@ -139,16 +229,62 @@
}
}
+
+ ol#controls {
+ float: right;
+ height: 28px;
+ padding: 0;
+ position: relative;
+ right: 0;
+ text-align: right;
+ top: -30px;
+
+ li {
+ float: left;
+ height: 28px;
+ line-height: 28px;
+ list-style: none outside none;
+ margin: 0 10px 0 0;
+ padding: 0;
+
+
+ a {
+ height: 28px;
+ line-height: 28px;
+ padding: 0 10px;
+ text-decoration: none;
+ border:1px solid white;
+ .border-radius(5px,5px,5px,5px);
+
+ :focus{
+ }
+ }
+
+ &.current a{
+ background: none repeat scroll 0 0 #0FA4C5;
+ color: #FFFFFF;
+ text-decoration: underline;
+
+ &:hover {
+ background: none repeat scroll 0 0 #11BCE1;
+ }
+ }
+ }
+
+ }
}
+/*
+ * BreadCrumb
+ */
nl#breadcrumbs {
- margin-top: 12px;
+ margin-top: 5px;
margin-bottom: 2px;
clear: both;
float: left;
height: 25px;
- padding: 1.1em 0;
+ padding: 0.5em 0;
position: relative;
top: 22px;
width: inherit;
@@ -160,6 +296,9 @@
font-weight:
bold;color: #777;
+ &:hover{
+ color:black;
+ }
}
}
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/Sitemap.css
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/Sitemap.css 2013-05-02 18:54:03 UTC (rev 4734)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/Sitemap.css 2013-06-01 18:26:59 UTC (rev 4735)
@@ -11,41 +11,6 @@
Site Map Styles
------------------------------------------------------------ */
-##primaryNav {list-style:none;}
-/* -------- Top Level --------- */
-#primaryNav { margin: 0; float: left; width: 100%;list-style:none; }
-#primaryNav #home { display: block; float: none; background: #ffffff url('../images/sitmap/L1-left.png') center bottom no-repeat; position: relative; z-index: 2; padding: 0 0 30px 0; }
-#primaryNav li {list-style:none; float: left; background: url('../images/sitmap/L1-center.png') center top no-repeat; padding: 30px 0; margin-top: -30px; }
-#primaryNav li.rows {clear:both}
-#primaryNav li a { margin: 0 20px 0 0; padding: 10px 0; display: block; text-decoration:none;font-size: 12px; font-weight: bold; text-align: center; color: #504b4b; background: #6fa8b2 url('../images/sitmap/white-highlight.png') top left repeat-x; border: 2px solid #44808b; -moz-border-radius: 5px; -webkit-border-radius: 5px; -webkit-box-shadow: rgba(0,0,0,0.5) 2px 2px 2px; -moz-box-shadow: rgba(0,0,0,0.5) 2px 2px 2px; /* FF 3.5+ */ }
-#primaryNav li a:hover { background-color: #e2f4fd; border-color: #97bdcf; }
-#primaryNav li:last-child { background: url('../images/sitmap/L1-right.png') center top no-repeat; }
-#primaryNav li a:link:before,
-#primaryNav li a:visited:before { color: #78a9c0; }
-/* -------- Second Level --------- */
-#primaryNav li li { width: 100%; clear: left; margin-top: 0; padding: 10px 0 0 0; background: url('../images/sitmap/vertical-line.png') center bottom repeat-y; }
-#primaryNav li li a { background-color: #cee3ac; border-color: #b8da83; }
-#primaryNav li li a:hover { border-color: #94b75f; background-color: #e7f1d7; }
-#primaryNav li li:first-child { padding-top: 30px; }
-#primaryNav li li:last-child { background: url('../images/sitmap/vertical-line.png') center bottom repeat-y; }
-#primaryNav li li a:link:before,
-#primaryNav li li a:visited:before { color: #8faf5c; }
-/* -------- Third Level --------- */
-#primaryNav li li ul { margin: 10px 0 0 0; width: 100%; float: right; padding: 9px 0 10px 0; background: #ffffff url('../images/sitmap/L3-ul-top.png') center top no-repeat; }
-#primaryNav li li li { background: url('../images/sitmap/L3-center.png') left center no-repeat; padding: 5px 0; }
-#primaryNav li li li a { background-color: #fff7aa; border-color: #e3ca4b; font-size: 12px; padding: 5px 0; width: 80%; float: right; }
-#primaryNav li li li a:hover { background-color: #fffce5; border-color: #d1b62c; }
-#primaryNav li li li:first-child { padding: 15px 0 5px 0; background: url('../images/sitmap/L3-li-top.png') left center no-repeat; }
-#primaryNav li li li:last-child { background: url('../images/sitmap/L3-bottom.png') left center no-repeat; }
-#primaryNav li li li a:link:before,
-#primaryNav li li li a:visited:before { color: #ccae14; font-size: 9px; }
-/* ------ Utility Navigation ------------- */
-#utilityNav { float: right; max-width: 50%; margin-right: 10px; }
-#utilityNav li { float: left; margin-bottom: 10px; }
-#utilityNav li a { margin: 0 10px 0 0; padding: 5px 10px; display: block; border: 2px solid #e3ca4b; font-size: 12px; font-weight: bold; text-align: center; color: black; background: #fff7aa url('../images/sitmap/white-highlight.png') top left repeat-x; -moz-border-radius: 5px; -webkit-border-radius: 5px; -webkit-box-shadow: rgba(0,0,0,0.5) 2px 2px 2px; -moz-box-shadow: rgba(0,0,0,0.5) 2px 2px 2px; /* FF 3.5+ */ }
-#utilityNav li a:hover { background-color: #fffce5; border-color: #d1b62c; }
-#utilityNav li a:link:before,
-#utilityNav li a:visited:before { color: #ccae14; font-size: 9px; margin-bottom: 3px; }
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-order.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-order.less 2013-05-02 18:54:03 UTC (rev 4734)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-order.less 2013-06-01 18:26:59 UTC (rev 4735)
@@ -182,20 +182,9 @@
}
}
-// ul.cart{
-// font-size:12px;
-// font-weight:bold;
-// color:#000;
-//
-// li{
-// font-size:10px;
-// font-weight:bold;
-//
-// a{color:#000;font-size:10px;}
-// }
-// }
+
/* -- panier -- */
@@ -214,6 +203,7 @@
section#Box-shopping_cart_short{
width:60%;
+ float: right;
header{
position:absolute;
@@ -238,24 +228,31 @@
.cart_icon{
position:relative;
- top:20px;
}
- a {color:#000;font-size:10px;}
- }
-
- ul {
- float:inherit;
- list-style:none;
- padding:0;
- li{
- font-size:12px;
+ ul {
+ float:inherit;
+ list-style:none;
+ padding:0;
+
+ li{
+ font-size:11px;
+ line-height:13px;
+ }
}
+
+
+ a{
+ color:#000;
+ font-weight:bold;
+ font-size:1.2em;
+
+ &:hover{
+ color:gray;
+ }
+ }
}
-
}
-
-
}
@@ -298,7 +295,6 @@
li{
display:inline-block;
- height:50px;
margin:0 0 0 -3px;
padding:0;
width:122px;
@@ -341,6 +337,10 @@
span{
color:#b3e050;
}
+
+ &.start{
+ width:50px;
+ }
}
}
}
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-product.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-product.less 2013-05-02 18:54:03 UTC (rev 4734)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-product.less 2013-06-01 18:26:59 UTC (rev 4735)
@@ -114,15 +114,48 @@
}
}
- div.in_tabs{
+
+ /*
+ * Loop sub mod
+ */
+ section.childsmod{
clear:both;
+ margin-top: 0.5em;
p {
- padding:2em;
+ padding:0.5em 2em;
color: #555;
font-size: 0.8em;
}
}
+
+
+ /*
+ * Extra critere
+ */
+ .criteres{
+ table {
+ border-collapse: collapse;
+
+ td{
+ display: table;
+ width:100%;
+ border:1px solid #DCDBDB;
+
+ label{
+ display: table-cell;
+ width:30%;
+ background:#DCDBDB;
+ padding-left:0.5em;
+ margin-left:0.5em;
+ }
+
+ .values{
+ padding-left:0.5em;
+ }
+ }
+ }
+ }
}
@@ -135,6 +168,13 @@
// name of generic module
&.dataproduct{
.module {
+
+ header{
+ h4{
+ border-bottom:1px solid #00A3C5;
+ }
+ }
+
// .outerblock {
// height: 158px;
// }
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/datatype-generic.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/datatype-generic.less 2013-05-02 18:54:03 UTC (rev 4734)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/datatype-generic.less 2013-06-01 18:26:59 UTC (rev 4735)
@@ -46,7 +46,7 @@
margin-top: 0;
background:transparent url("../images/bg_header.jpg") no-repeat top left;
.border-radius(5px,5px,5px,5px);
-
+ .background-size(100%);
}
h2 {
@@ -54,6 +54,10 @@
margin-top: 10px;
}
+ h3 {
+ padding-left: 10px;
+ margin-top: 10px;
+ }
p,
.textMain p {
@@ -75,6 +79,21 @@
clear:both;
float:none;
+ .in_tabs{
+ padding:0;
+ border:none;
+
+ .tabNavigation{
+
+ background: #00A3C5;
+
+ li a{
+ padding:0.2em 0.5em;
+ font-size: 0.9em;
+ }
+ }
+ }
+
/*
* View specificity in sub section data
*/
@@ -96,13 +115,13 @@
section {
margin: 10px 12px 0 0;
- padding: 0 0 10px 0;
+ padding: 0 0 5px 0;
background-color: #fff;
.border-radius(5px,5px,5px,5px);
header h3 {
padding-left: 10px;
- margin: 10px 0px;
+ margin: 5px 0px;
background: url("../images/introbkg.png") repeat-x scroll bottom right #778899;
color:#fff;
@@ -154,11 +173,10 @@
h4.title {
- font-size: 1.5em;
+ font-size: 1.3em;
font-weight:bold;
- margin:1.2em;
+ margin:0.5em 0;
color:#0E9FC0;
-
}
ul {
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/generic.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/generic.less 2013-05-02 18:54:03 UTC (rev 4734)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/generic.less 2013-06-01 18:26:59 UTC (rev 4735)
@@ -256,4 +256,136 @@
+/*
+ * Sitemap
+ */
+/*
+ * Specific In section checkout and cart
+ */
+body#Page_sitemap div#main-tpl,
+.Type_checkout div#main-tpl {
+ aside {
+ width:0;
+ display:none;
+ }
+
+ div#content {
+ width:100%;
+ padding-right:0;
+ padding-left:0;
+
+ /*
+ * view
+ */
+ }
+}
+
+/*
+ * Detail reel sitemap
+ */
+
+ul#primaryNav {
+ list-style:none;
+ margin:20px 0 0 0;
+ float: left;
+ width: 100%;
+ list-style:none;
+
+
+ li {
+
+ /* -------- Top Level --------- */
+
+ list-style:none;
+ float: left;
+ background: url('../images/sitmap/L1-center.png') center top no-repeat;
+ padding: 30px 0;
+ margin-top: -30px;
+
+ a {
+ margin: 0 20px 0 0;
+ padding: 10px 0;
+ display: block;
+ text-decoration:none;
+ font-size: 12px;
+ font-weight: bold;
+ text-align: center;
+ color: #504b4b;
+ background: #6fa8b2 url('../images/sitmap/white-highlight.png') top left repeat-x;
+ border: 2px solid #44808b;
+ .border-radius(5px,5px,5px,5px);
+
+ &:hover { background-color: #e2f4fd; border-color: #97bdcf; }
+
+ &:link:before,
+ &:visited:before { color: #78a9c0; }
+ }
+
+ &:last-child { background: url('../images/sitmap/L1-right.png') center top no-repeat; }
+
+ .rows {clear:both}
+
+
+ /* -------- Second Level --------- */
+
+ li {
+ width: 100%;
+ clear: left;
+ margin-top: 0;
+ padding: 10px 0 0 0;
+ background: url('../images/sitmap/vertical-line.png') center bottom repeat-y;
+
+ a {
+ background-color: #cee3ac;
+ border-color: #b8da83;
+
+ &:hover {
+ border-color: #94b75f;
+ background-color: #e7f1d7;
+
+ }
+
+ &:link:before,
+ &:visited:before { color: #8faf5c; }
+ }
+
+ &:first-child { padding-top: 30px; }
+
+ &:last-child { background: url('../images/sitmap/vertical-line.png') center bottom repeat-y; }
+
+ /* -------- Third Level --------- */
+
+ ul {
+ margin: 10px 0 0 0;
+ width: 100%;
+ float: right;
+ padding: 9px 0 10px 0;
+ background: #ffffff url('../images/sitmap/L3-ul-top.png') center top no-repeat;
+
+ li {
+ background: url('../images/sitmap/L3-center.png') left center no-repeat;
+ padding: 5px 0;
+
+ a {
+ background-color: #fff7aa;
+ border-color: #e3ca4b;
+ font-size: 12px;
+ padding: 5px 0;
+ width: 80%;
+ float: right;
+
+ &:hover { background-color: #fffce5; border-color: #d1b62c; }
+
+ &:link:before,
+ &:visited:before { color: #ccae14; font-size: 9px; }
+ }
+
+ &:first-child { padding: 15px 0 5px 0; background: url('../images/sitmap/L3-li-top.png') left center no-repeat; }
+
+ &:last-child { background: url('../images/sitmap/L3-bottom.png') left center no-repeat; }
+ }
+ }
+ }
+ }
+}
Deleted: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2013-05-02 18:54:03 UTC (rev 4734)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2013-06-01 18:26:59 UTC (rev 4735)
@@ -1,22 +0,0 @@
-/**
- @ licence GPL 2005-2011 The osC*S*S developers - osCSS Open Source E-commerce
- @subpackage Template 2cShopHtml5Oscim
- @package osCSS-2 <www http://www.oscss.org>
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- */
-
-
-
-
-/* Hx tags */
-
-
-
-
-
-
-
-
-
-
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/master.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/master.less 2013-05-02 18:54:03 UTC (rev 4734)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/master.less 2013-06-01 18:26:59 UTC (rev 4735)
@@ -40,17 +40,31 @@
@lineheight: 16px;
@font_size : 11px;
-
+/*
+ * Normalize function
+ */
@import "element.less";
+/*
+ * Define form
+ */
@import "forms.less";
-
+/*
+ * Other def core
+ */
@import "generic.less";
+/*
+ * Content footer , header , breacrumb (nl) , menu (nav) slide intro
+ */
@import "BottomTop.less";
-
+/*
+ * genric format page
+ */
@import "datatype-generic.less";
-
+/*
+ * Specific format page by type
+ */
@import "article-product.less";
@import "article-categorie.less";
@import "article-content.less";
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php 2013-05-02 18:54:03 UTC (rev 4734)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php 2013-06-01 18:26:59 UTC (rev 4735)
@@ -127,10 +127,13 @@
break;
case 'cart':
- $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));
+var_dump(__line__);
+ $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 'checkout':
$this->oscss_boxes->_add('checkout_progressbar', 'progressbar');
break;
@@ -186,6 +189,7 @@
break;
+ case 'diver':
case 'none':
default:
@@ -199,9 +203,15 @@
// precise si module utilisé comme pleine page
switch(self::oscss_body_id()){
+
case '404':
$this->oscss_modules->_add(FILENAME_NEW_PRODUCTS,'center',array('sort'=>60));
break;
+
+ case 'Page_shopping_cart':
+ $this->oscss_boxes->_add('checkout_progressbar', 'progressbar');
+ break;
+
case 'Page_listing_small_price':
case 'Page_listing_best_sellers':
case 'Page_listing_specials':
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php 2013-05-02 18:54:03 UTC (rev 4734)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php 2013-06-01 18:26:59 UTC (rev 4735)
@@ -21,69 +21,62 @@
?>
<header>
- <h1 class="content title <?php echo $language ;?> productName"><?php echo $product_info['products_name']; ?></h1>
+ <h1 class="title product<?php echo $language ;?> productName"><?php echo $product_info['products_name']; ?></h1>
</header>
-<div id="productInfo">
+<section id="productInfo" class="main product">
+
<?php $page->messageStack->_draw('review');?>
-<?php if (_test_bool($product_info)) { ?>
- <div class="infoText"><?php echo TEXT_PRODUCT_NOT_FOUND; ?></div>
-
- <div class="navBt">
- <?php echo '<a class="navBt" href="' . tep_href_link(FILENAME_DEFAULT) . '">' . IMAGE_BUTTON_CONTINUE . '</a>'; ?>
- </div>
-
-<?php } else { ?>
-
-
-
- <?php if (tep_not_null($product_info['products_image'])) { ?>
-<!-- <div id="productImagesGlb" > -->
+ <?php if (tep_not_null($product_info['products_image'])): ?>
<figure class="images">
<div id="productImage">
- <?php /** Le block principal de l'image du produit. */ ?>
- <?php if ( ($replace=$page->prop_ctrl('products_image', $product_info['products_image'])) !=false) echo $replace($product_info, 'lightbox' , $page->_conf_value('HEADING_IMAGE_WIDTH'), $page->_conf_value('HEADING_IMAGE_HEIGHT'));
- else { ?>
- <script type="text/javascript"><!--
- document.write('<?php echo '<p><a href="' . tep_href_link(FILENAME_POPUP_IMAGE, 'pID=' . $product_info['products_id']) . '" onclick="popupWindow(this.href); return false" >' . tep_image(DIR_WS_IMAGES . $product_info['products_image'], addslashes($product_info['products_name']), $page->_conf_value('HEADING_IMAGE_WIDTH'), $page->_conf_value('HEADING_IMAGE_HEIGHT'), ' id="image_master" ') . '</a></p>'; ?>');
- //--></script>
- <noscript>
- <?php echo '<p><a href="' . tep_href_link(DIR_WS_IMAGES . $product_info['products_image']) . '">' . tep_image(DIR_WS_IMAGES . $product_info['products_image'], $product_info['products_name'], $page->_conf_value('HEADING_IMAGE_WIDTH'), $page->_conf_value('HEADING_IMAGE_HEIGHT'), ' id="image_master" ') . '</a><br /><a href="' . tep_href_link(DIR_WS_IMAGES . $product_info['products_image']) . '">' . TEXT_CLICK_TO_ENLARGE . '</a></p>'; ?>
- </noscript>
- <?php } ?>
+ <?php /** Le block principal de l'image du produit. */ ?>
+ <?php if ( ($replace=$page->prop_ctrl('products_image', $product_info['products_image'])) !=false) echo $replace($product_info, 'lightbox' , $page->_conf_value('HEADING_IMAGE_WIDTH'), $page->_conf_value('HEADING_IMAGE_HEIGHT'));
+ else { ?>
+ <script type="text/javascript"><!--
+ document.write('<?php echo '<p><a href="' . tep_href_link(FILENAME_POPUP_IMAGE, 'pID=' . $product_info['products_id']) . '" onclick="popupWindow(this.href); return false" >' . tep_image(DIR_WS_IMAGES . $product_info['products_image'], addslashes($product_info['products_name']), $page->_conf_value('HEADING_IMAGE_WIDTH'), $page->_conf_value('HEADING_IMAGE_HEIGHT'), ' id="image_master" ') . '</a></p>'; ?>');
+ //--></script>
+ <noscript>
+ <?php echo '<p><a href="' . tep_href_link(DIR_WS_IMAGES . $product_info['products_image']) . '">' . tep_image(DIR_WS_IMAGES . $product_info['products_image'], $product_info['products_name'], $page->_conf_value('HEADING_IMAGE_WIDTH'), $page->_conf_value('HEADING_IMAGE_HEIGHT'), ' id="image_master" ') . '</a><br /><a href="' . tep_href_link(DIR_WS_IMAGES . $product_info['products_image']) . '">' . TEXT_CLICK_TO_ENLARGE . '</a></p>'; ?>
+ </noscript>
+ <?php } ?>
</div>
<?php /** Liste des images dans la pile des images du produits (toutes les images) */ ?>
<div id="productImagelistMini">
- <ul>
- <?php if(is_array($page->product->pile_img)) foreach($page->product->pile_img as $img) : ?>
- <li>
- <?php /*if ( ($replace=$page->prop_ctrl('products_image', $img)) !=false) echo $replace($product_info);
- else {*/ ?>
- <?php echo '<a class="lightbox" rel="lightbox-view" href="' . tep_image(DIR_WS_IMAGES . $img, $product_info['products_name'], $page->_conf_value('POPUP_IMAGE_WIDTH'), $page->_conf_value('POPUP_IMAGE_HEIGHT'), "", true) . '" onmouseover="change_image_master(\'' . tep_image(DIR_WS_IMAGES . $img, $product_info['products_name'], $page->_conf_value('HEADING_IMAGE_WIDTH'),$page->_conf_value('HEADING_IMAGE_HEIGHT') ,"", true) . '\',\'' . tep_image(DIR_WS_IMAGES . $img, $product_info['products_name'],$page->_conf_value('POPUP_IMAGE_WIDTH'), $page->_conf_value('POPUP_IMAGE_HEIGHT'), "", true) . '\')" rel="example_group">' . tep_image(DIR_WS_IMAGES . $img, $product_info['products_name'], $page->_conf_value('STACK_IMAGE_WIDTH'), $page->_conf_value('STACK_IMAGE_HEIGHT')) . '</a>'; ?>
- <?php /*}*/ ?>
- </li>
- <?php endforeach; ?>
- </ul>
+ <?php if(is_array($page->product->pile_img)): ?>
+ <ul>
+ <?php foreach($page->product->pile_img as $img) : ?>
+ <li>
+ <?php /*if ( ($replace=$page->prop_ctrl('products_image', $img)) !=false) echo $replace($product_info);
+ else {*/ ?>
+ <?php echo '<a class="lightbox" rel="lightbox-view" href="' . tep_image(DIR_WS_IMAGES . $img, $product_info['products_name'], $page->_conf_value('POPUP_IMAGE_WIDTH'), $page->_conf_value('POPUP_IMAGE_HEIGHT'), "", true) . '" onmouseover="change_image_master(\'' . tep_image(DIR_WS_IMAGES . $img, $product_info['products_name'], $page->_conf_value('HEADING_IMAGE_WIDTH'),$page->_conf_value('HEADING_IMAGE_HEIGHT') ,"", true) . '\',\'' . tep_image(DIR_WS_IMAGES . $img, $product_info['products_name'],$page->_conf_value('POPUP_IMAGE_WIDTH'), $page->_conf_value('POPUP_IMAGE_HEIGHT'), "", true) . '\')" rel="example_group">' . tep_image(DIR_WS_IMAGES . $img, $product_info['products_name'], $page->_conf_value('STACK_IMAGE_WIDTH'), $page->_conf_value('STACK_IMAGE_HEIGHT')) . '</a>'; ?>
+ <?php /*}*/ ?>
+ </li>
+ <?php endforeach; ?>
+ </ul>
+ <?php endif; ?>
</div>
</figure>
- <?php } ?>
+ <?php endif; ?>
- <div class="ExtraFields">
- <ul>
- <?php foreach($product_info['extra'] as $k=>$row): /*print_r($row);*/?>
- <li><?php echo ExtraUtility::DisplayRow($row, true, '%s'); ?></li>
- <?php endforeach; ?>
- </ul>
+ <?php if(count($product_info['extra'])> 0 ): ?>
+ <div class="ExtraFields">
+ <ul>
+ <?php foreach($product_info['extra'] as $k=>$row): /*print_r($row);*/?>
+ <li><?php echo ExtraUtility::DisplayRow($row, true, '%s'); ?></li>
+ <?php endforeach; ?>
+ </ul>
+ </div>
+ <?php endif; ?>
+
+ <div id="productInfoSpec">
+ <p class="productModel"><?php echo $product_info['products_model']; ?></p>
+ <p id="price_master" class="productPrice"><?php echo print_products_price_rv($product_info); ?></p>
</div>
- <div id="productInfoSpec">
- <p class="productModel"><?php echo $product_info['products_model']; ?></p>
- <p id="price_master" class="productPrice"><?php echo print_products_price_rv($product_info); ?></p>
- </div>
-
<?php if (_test_bool($product_info['action']['buy'])): ?>
<!-- this product is avaible for add cart -->
@@ -111,9 +104,9 @@
<?php endif ; ?>
- <?php if (tep_not_null($product_info['products_url'])) { ?>
+ <?php if (tep_not_null($product_info['products_url'])): ?>
<p id="productUrl"><?php echo sprintf(TEXT_MORE_INFORMATION, tep_href_link(FILENAME_REDIRECT, 'action=url&goto=' . urlencode($product_info['products_url']), 'NONSSL', true, false)); ?></p>
- <?php } ?>
+ <?php endif;?>
<?php if ($product_info['products_date_available'] > date('Y-m-d H:i:s')): ?>
@@ -121,12 +114,11 @@
<?php endif;?>
- <p id="productDateAdded" class="date"><?php echo sprintf(TEXT_DATE_ADDED, tep_date_long($product_info['products_date_added'])); ?></p>
+ <p id="productDateAdded" class="date"><?php echo sprintf(TEXT_DATE_ADDED, tep_date_long($product_info['products_date_added'])); ?></p>
<div id="productInfoBack" class="navBt">
<?php echo '<a class="navBt" href="javascript: history.go(-1)">' . IMAGE_BUTTON_BACK . '</a>'; ?>
</div>
-<?php } ?>
-</div>
\ No newline at end of file
+</section>
\ No newline at end of file
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php 2013-05-02 18:54:03 UTC (rev 4734)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php 2013-06-01 18:26:59 UTC (rev 4735)
@@ -27,7 +27,7 @@
<table class="invoice invoiceDetails" cellspacing="0" >
<tr>
- <th class="cart-header desc tleft"><?php echo TABLE_HEADING_PRODUCTS; ?></th>
+ <th colspan="2" class="cart-header desc tleft"><?php echo TABLE_HEADING_PRODUCTS; ?></th>
<th class="cart-header puht tcenter"><?php echo HEADING_PRODUCTS_PRICE_U; ?></th>
<th class="cart-header qty tcenter"><?php echo HEADING_PRODUCTS_QTY; ?></th>
<th class="cart-header taxe tcenter"><?php echo HEADING_PRODUCTS_TAXE; ?></th>
@@ -41,35 +41,74 @@
<?php echo $DCart->hidden ; ?>
- <?php foreach($DCart->products as $i=>$product): ?>
- <tr id="cart-line-<?php echo $i; ?>" class="cart-line <?php echo ($i%2)?'pair':'impair'; ?>">
- <td class="cart-line desc">
- <?php echo $product['name'] ;?><span id="ajaxcarttext<?php echo $i; ?>"><?php echo $product['alert_stock'] ;?></span>
- </td>
- <td class="cart-line puht tcenter">
- <?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_hidden_field('products_id[]', $product['id']) ; ?>
- </td>
- <td class="cart-line taxe tcenter">
- <?php echo tep_get_tax_rate($product['tax_class_id']) ;?> </span>
- </td>
- <td class="cart-line tottaxe tright">
- <span id="ajaxcarttaxe<?php echo $i; ?>" class="cartPrice"> <?php echo$currencies->format( ($product['final_price_ttc'] - $product['final_price']) ) ;?> </span>
- </td>
- <td class="cart-line totttc tright">
- <span id="ajaxcartPrice<?php echo $i; ?>" class="cartPrice"> <?php echo $currencies->format(tep_add_tax($product['final_price'], tep_get_tax_rate($product['tax_class_id'])) *$product['quantity'] ) ;?> </span>
- </td>
- <td class="cart-line tcenter">
- <span id="ajaxcartdel<?php echo $i; ?>"> <?php echo tep_draw_checkbox_field('cart_delete['.$i.']','CartDel_'.$i, $i, false, 'class="CartDel" ');?> </span>
- </td>
- </tr>
+ <?php $prev=null; foreach($DCart->products as $i=>$product): /*print_r($product);*/?>
+ <?php if($prev != $product['group']['id'] && $product['group'] !=false) : $prev = $product['group']['id']; ?>
+ <tr id="cart-line-<?php echo $i; ?>" class="cart-line <?php echo ($i%2)?'pair':'impair'; ?>">
+ <td colspan="2" class="cart-line desc">
+ <?php echo $product['group']['name'] ;?><span id="ajaxcarttext<?php echo $i; ?>"><?php echo $product['alert_stock'] ;?></span>
+ </td>
+ <td class="cart-line puht tcenter" rowspan="<?php echo ($product['group']['count']); ?>">
+ <?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_hidden_field('products_id[]', $product['id']) ; ?>
+ </td>
+ <td class="cart-line taxe tcenter" rowspan="<?php echo ($product['group']['count']); ?>">
+ <span><?php //echo tep_get_tax_rate($product['tax_class_id']) ;?> </span>
+ </td>
+ <td class="cart-line tottaxe tright" rowspan="<?php echo ($product['group']['count']); ?>">
+ <span id="ajaxcarttaxe<?php echo $i; ?>" class="cartPrice"> <?php echo$currencies->format( ($product['final_price_ttc'] - $product['final_price']) ) ;?> </span>
+ </td>
+ <td class="cart-line totttc tright" rowspan="<?php echo ($product['group']['count']); ?>">
+ <span id="ajaxcartPrice<?php echo $i; ?>" class="cartPrice"> <?php echo $currencies->format(tep_add_tax($product['final_price'], tep_get_tax_rate($product['tax_class_id'])) *$product['quantity'] ) ;?> </span>
+ </td>
+ <td class="cart-line tcenter">
+ <span id="ajaxcartdel<?php echo $i; ?>"> <?php echo tep_draw_checkbox_field('cart_delete['.$i.']','CartDel_'.$i, $i, false, 'class="CartDel" ');?> </span>
+ </td>
+ </tr>
+ <?php endif; ?>
+ <tr id="cart-line-<?php echo $i; ?>" class="cart-line <?php echo ($i%2)?'pair':'impair'; ?>">
+ <?php if(isset($product['group_linking']) || $product['group'] !=false ): ?>
+ <td class="cart-line group">
+ <?php echo $product['group_linking']; ?>
+ </td>
+ <?php endif; ?>
+
+ <td class="cart-line desc" <?php if(!isset($product['group_linking']) && !$product['group'] ) echo 'colspan="2" ' ?>>
+ <?php echo $product['name'] ;?><span id="ajaxcarttext<?php echo $i; ?>"><?php echo $product['alert_stock'] ;?></span>
+ </td>
+
+ <td class="cart-line puht tcenter">
+ <?php echo $currencies->format($product['price']) ;?>
+ </td>
+ <?php if($product['group'] ==false): ?>
+ <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_hidden_field('products_id[]', $product['id']) ; ?>
+ </td>
+
+ <td class="cart-line taxe tcenter">
+ <span><?php echo tep_get_tax_rate($product['tax_class_id']) ;?> </span>
+ </td>
+
+ <td class="cart-line tottaxe tright">
+ <span id="ajaxcarttaxe<?php echo $i; ?>" class="cartPrice"> <?php echo$currencies->format( ($product['final_price_ttc'] - $product['final_price']) ) ;?> </span>
+ </td>
+ <td class="cart-line totttc tright">
+ <span id="ajaxcartPrice<?php echo $i; ?>" class="cartPrice"> <?php echo $currencies->format(tep_add_tax($product['final_price'], tep_get_tax_rate($product['tax_class_id'])) *$product['quantity'] ) ;?> </span>
+ </td>
+ <?php endif; ?>
+ <td class="cart-line tcenter">
+ <span id="ajaxcartdel<?php echo $i; ?>"> <?php echo tep_draw_checkbox_field('cart_delete['.$i.']','CartDel_'.$i, $i, false, 'class="CartDel" ');?> </span>
+ </td>
+ </tr>
<?php endforeach; ?>
</table>
@@ -119,7 +158,7 @@
<?php echo '<a class="Bt navBt link" href="' . $navigation->GetBack() . '">' . IMAGE_BUTTON_CONTINUE_SHOPPING . '</a>'; ?>
<?php if ($cart->ContinueButton()): ?>
- <?php echo '<a class="Bt navBt link" href="' . tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL') . '">' . IMAGE_BUTTON_CHECKOUT . '</a>'; ?>
+ <?php echo '<a class="Bt navBt link" href="' . tep_href_link(FILENAME_CHECKOUT, '', 'SSL') . '">' . IMAGE_BUTTON_CHECKOUT . '</a>'; ?>
<?php endif ?>
</div>
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/template.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/template.php 2013-05-02 18:54:03 UTC (rev 4734)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/template.php 2013-06-01 18:26:59 UTC (rev 4735)
@@ -9,14 +9,17 @@
@encode UTF-8
*/
?>
-<div id="privacy">
- <h2 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE; ?></h2>
+<header>
+ <h1 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE; ?></h1>
+</header>
+<section id="privacy">
+
<div class="infoText"><?php echo TEXT_INFORMATION; ?></div>
<div class="navBt">
<?php echo '<a class="navBt" href="' . tep_href_link(FILENAME_DEFAULT) . '">' . IMAGE_BUTTON_CONTINUE . '</a>'; ?>
</div>
-</div>
\ No newline at end of file
+</section>
\ No newline at end of file
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.currencies.gab
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.currencies.gab 2013-05-02 18:54:03 UTC (rev 4734)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.currencies.gab 2013-06-01 18:26:59 UTC (rev 4735)
@@ -12,6 +12,6 @@
?>
<div id="currencies" class="selectMenu currencies">
<?php foreach($currencies_array as $k=>$item): ?>
- <a href="<?php echo tep_href_link(basename($_SERVER['REQUEST_URI']), 'currency='.$item['id']) ?>" class="<?php if($currency==$item['id']) echo 'Selected' ?>"><?php echo $item['symbol'] ?></a>
+ <a href="<?php echo tep_href_link('', 'currency='.$item['id']) ?>" class="<?php if($currency==$item['id']) echo 'Selected' ?>"><?php echo $item['symbol'] ?></a>
<?php endforeach; ?>
</div>
\ No newline at end of file
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2013-05-02 18:54:03 UTC (rev 4734)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2013-06-01 18:26:59 UTC (rev 4735)
@@ -5,45 +5,3 @@
* @author oscim <mail aur...@os...> <www http://www.oscim.fr>
* @encode UTF-8
*/
-
-/* @import url("Css/BottomTop.css"); */
-/* @import url("Css/Sitemap.css"); */
-/**
- * Le fichier habillage doit contenir l'ensemble des elements de style , couleur , mise en forme
- * La totalite des contenu de type structure (position des boite et structuration du flux) doit ce situer dans ce fichier
- */
-/* @import url("Css/habillage.css"); */
-
-/**
- * S tyle commun et permanent. **
- * Ce fichier est appelé dans le tiny du backoffice
- */
-
-fieldest,
-fieldset.ListFilterType,
-fieldset.manufacturerFilter {border:0;font-size:0.9em;padding:0.5em}
-
-
-
-
-
-
-/* Standard width*/
-#main_container {width:960px;}
-
-
-
-#Box-currencies {display:none;}
-
-
-/* Slider */
-#slider ul li {width:960px;
- height:220px;
- margin:0;
- padding:0;
-}
-
-#slider ul li.one.product section.outerblock {
- height:inherit;
- width:inherit;
-}
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/template.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/template.php 2013-05-02 18:54:03 UTC (rev 4734)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/template.php 2013-06-01 18:26:59 UTC (rev 4735)
@@ -48,15 +48,13 @@
<?php /** Page cms de contenu (Page_home, .. ), ou page contenu dans content */
if(( $page->oscss_body_id()!='Page_contact_us' ) &&
(($conti=tep_get_cms_content($page->oscss_body_id(), true,
- '<header>
- <h1 class="content title '.$language.'">%s</h1>
- </header>
- <div class="prod_box_big">
- <div class="top_prod_box_big"></div>
- <div class="center_prod_box_big">%s</div>
- <div class="bottom_prod_box_big"></div>
- </div>'
- )) !=false ) ): ?>
+ '<header>
+ <h1 class="title content '.$language.'">%s</h1>
+ </header>
+ <section class="main content">
+ %s
+ </section>'
+ )) !=false ) ): ?>
<?php echo $conti; ?>
<?php else: ?>
<?php require_once($page->oscss_content()); ?>
@@ -71,32 +69,30 @@
<?php endif; ?>
<?php endif; ?>
- <?php if($page->is_page_type('product') && $modules=$ACA->display_view($_GET['products_id']) ): /** Boucle des modules aca actif */ ?>
- <div class="prod_box_big">
- <div class="center_prod_box_big">
- <div id="in_tabs" class="in_tabs">
- <ul id="tablist" class="tabNavigation">
- <?php /** ACA module */ foreach($modules as $k =>$v){ foreach($v as $kt=>$vt){ $i++; echo '<li style="display:inline"><a href="#in_tabs'.$i.$kt.'">'.$vt->title.'</a> </li>'; } } ?>
- </ul>
- <?php reset($modules); $i=1;
- foreach($modules as $k=>$v)
- foreach($v as $kt=>$vt){ $i++; ?>
- <div id="in_tabs<?php echo $i.$kt ?>" class="tabcontent">
- <?php /** ACA module */ echo unhtmlentities($vt->content); ?>
- <br style="clear:both" />
- </div>
- <?php } ?>
- </div>
- </div>
- </div>
+ <?php if($page->GetPageType() !='checkout' && is_object($ACA) && $modules=$ACA->display_view($page->GetVar('current_id'))): /** Boucle des modules aca actif */ ?>
+ <section class="childsmod <?php echo $page->the_type(); ?>">
+ <div id="in_tabs" class="in_tabs">
+ <ul id="tablist" class="tabNavigation">
+ <?php /** ACA module */ foreach($modules as $k =>$v){ foreach($v as $kt=>$vt){ $i++; echo '<li style="display:inline"><a href="#in_tabs'.$i.$kt.'">'.$vt->title.'</a> </li>'; } } ?>
+ </ul>
+ <?php reset($modules); $i=1;
+ foreach($modules as $k=>$v)
+ foreach($v as $kt=>$vt){ $i++; ?>
+ <div id="in_tabs<?php echo $i.$kt ?>" class="tabcontent">
+ <?php /** ACA module */ echo unhtmlentities($vt->content); ?>
+ <br style="clear:both" />
+ </div>
+ <?php } ?>
+ </div>
+ </section>
<?php endif; ?>
</article>
<?php if($load->module =='child') : ?>
<article class="" >
- <header>
- <h3 class="content title <?php echo $language ;?>"><?php echo ''; ?></h3>
- </header>
+<!-- <header>
+ <h3 class="content title <?php echo $language ;?>"><?php echo ''; ?></h3>
+ </header>-->
<?php while($themodule=templ_draw_list('type=modules&pile=center')): /** Appel des module (new_products, product_listing ...) */ $load->module='child' ?>
<section id="<?php echo $themodule->id ?>" class="<?php echo $themodule->css_class.' data'.$themodule->module_db->type; ?> ">
<?php include($page->the_var('PathChildGab').'module.php'); ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-05-02 18:54:08
|
Revision: 4734
http://sourceforge.net/p/oscss/svn/4734
Author: oscim
Date: 2013-05-02 18:54:03 +0000 (Thu, 02 May 2013)
Log Message:
-----------
Fix php notice
Fix bug transmit action in order_total submodule shopping_cart_action
Fix bug mod rewrite byfolder
Add in shopping cart sort by group
Fix ExtraUtility display result in value stocked on list
Modified Paths:
--------------
branches/2.1.1/catalog/common/classes/ExtraUtility.php
branches/2.1.1/catalog/common/classes/datatype_drivers/Data_diver.php
branches/2.1.1/catalog/common/classes/shoppingCart.php
branches/2.1.1/catalog/common/modules/core/seo_modrewrite/SeoR_byfolder.php
branches/2.1.1/catalog/includes/classes/AbstractAcaModule.php
branches/2.1.1/catalog/includes/classes/drivers/data/product.php
branches/2.1.1/catalog/includes/classes/shopping_cart_action.php
branches/2.1.1/catalog/includes/modules/order_total/ot_shipping.php
branches/2.1.1/catalog/includes/modules/order_total/ot_tax.php
Modified: branches/2.1.1/catalog/common/classes/ExtraUtility.php
===================================================================
--- branches/2.1.1/catalog/common/classes/ExtraUtility.php 2013-05-02 15:20:40 UTC (rev 4733)
+++ branches/2.1.1/catalog/common/classes/ExtraUtility.php 2013-05-02 18:54:03 UTC (rev 4734)
@@ -135,13 +135,21 @@
case 2:
case 3:
case 4:
- foreach($rows->select_values as $k=>$item)
- if($rows->input_value == $k) $input .= $item['text'];
+ if(isset($rows->select_values) && is_array($rows->select_values)){
+ foreach($rows->select_values as $k=>$item)
+ if($rows->input_value == $k) $input .= $item['text'];
+ }
+ else
+ $input .= substr($rows->input_value,0, -1);
break;
case 6:
case 7:
- foreach($rows->select_values as $k=>$item)
- $input .= $item['text'];
+ if(isset($rows->select_values) && is_array($rows->select_values)){
+ foreach($rows->select_values as $k=>$item)
+ if(in_array($item['id'], $rows->input_value))$input .= $item['text'];
+ }
+ else
+ $input .= substr($rows->input_value,0, -1);
break;
/**
@remarks textarea input
@@ -152,6 +160,8 @@
default:
$input .= $rows->input_value;
}
+
+ $input = '<span class="values">'.$input.'</span>';
}
else
switch((int)$rows->input_type) {
@@ -176,6 +186,7 @@
case 3: // checkbox
$cnt = 1; /*$name, $id='', $value = '', $parameters = '', $required = false, $type = 'text'*/
$input = '<ul>';
+
foreach($rows->values_list as $k=>$item) {
$input .= '<li>';
$input .= '<span class="values">'. formUtility::draw_input_field('fields_' . $rows->id . '[' . $k.']','fields_' . $rows->id . '_' . $k, 'on', ( ( !empty($rows->input_value) && in_array($k, (array)explode(',',$rows->input_value)))?' checked="checked" ': '' ), $rows->required_status , 'checkbox').$item. $flag_r.'</span>';
Modified: branches/2.1.1/catalog/common/classes/datatype_drivers/Data_diver.php
===================================================================
--- branches/2.1.1/catalog/common/classes/datatype_drivers/Data_diver.php 2013-05-02 15:20:40 UTC (rev 4733)
+++ branches/2.1.1/catalog/common/classes/datatype_drivers/Data_diver.php 2013-05-02 18:54:03 UTC (rev 4734)
@@ -77,7 +77,7 @@
}
/**
- @brief test si al page est du type produits
+ @brief test si la page est du type produits
@param $mode le type de control (page/cpath/seo)
*/
function is_type($mode='unique'){
@@ -97,7 +97,7 @@
/**
- @brief calcul du cpath specifique a ce tyep de donnée
+ @brief calcul du cpath specifique a ce type de donnée
*/
function GetcPath(){
return '';
Modified: branches/2.1.1/catalog/common/classes/shoppingCart.php
===================================================================
--- branches/2.1.1/catalog/common/classes/shoppingCart.php 2013-05-02 15:20:40 UTC (rev 4733)
+++ branches/2.1.1/catalog/common/classes/shoppingCart.php 2013-05-02 18:54:03 UTC (rev 4734)
@@ -223,8 +223,8 @@
if(!empty($special_class)) $this->contents[$products_id_string]['special_class'] = $special_class;
// insert into database
if (tep_session_is_registered('customer_id')){
- tep_db_query("insert into " . TABLE_CUSTOMERS_BASKET . " (customers_id, products_id, customers_basket_quantity, customers_basket_date_added) values ('" . (int)$customer_id . "', '" . tep_db_input($products_id_string) . "', '" . $qty . "', '" . date('Ymd') . "')");
+
if (is_array($attributes)) {
reset($attributes);
while (list($option, $value) = each($attributes)) {
@@ -256,6 +256,9 @@
}
}
}
+
+ tep_db_query("insert into " . TABLE_CUSTOMERS_BASKET . " (customers_id, products_id, customers_basket_quantity, customers_basket_date_added) values ('" . (int)$customer_id . "', '" . tep_db_input($products_id_string) . "', '" . $qty . "', '" . date('Ymd') . "')");
+
}
}
// assign a temporary unique ID to the order contents to prevent hack attempts during the checkout procedure
@@ -361,11 +364,11 @@
// assign a temporary unique ID to the order contents to prevent hack attempts during the checkout procedure
$this->cartID = $this->generate_cart_id();
return true;
- }
+ }
- function remove_all() {
- $this->reset();
- }
+ function remove_all() {
+ $this->reset();
+ }
/**
*
@@ -389,8 +392,7 @@
Utilisé dans tous les recap panier/order/checkcout
*/
function get_products() {
-// print_r($this->contents);
-// exit;
+
global $languages_id,$price;
if (!is_array($this->contents)) return false;
$products_array = array();
@@ -412,6 +414,7 @@
'model' => $product_obj->products_model,
'image' => $product_obj->products_image,
'track_stock' => $product_obj->track_stock,
+
'price' => (($special)? $res_price['sprice_ht'] :$res_price['price_ht']),
'quantity' => $product['qty'],
'weight' => $product_obj->products_weight +( isset($this->contents[$products_id]['attributes']) ?(float)product::get_attributes_weight($products_id, $this->contents[$products_id]['attributes']) : 0) ,
@@ -422,10 +425,28 @@
'tax_class_id' => $product_obj->products_tax_class_id,
'attributes' => (isset($this->contents[$products_id]['attributes']) ? $this->contents[$products_id]['attributes'] : ''),
'attributes_values' => (isset($this->contents[$products_id]['attributes_values']) ? $this->contents[$products_id]['attributes_values'] : ''),
+
'special_class'=> (isset($this->contents[$products_id]['special_class'])? $this->contents[$products_id]['special_class'] : ''),
+
+// 'group' => (isset($this->contents[$products_id]['group'])? (array)$this->contents[$products_id]['group'] : false),
);
+
+// if(isset($tmp['group']['id']))
+// $products_array[$tmp['group']['id']][] = $tmp;
+// else
+// $products_array['nogroup'][] = $tmp;
}
}
+
+// print_r($products_array);
+// exit;
+// ksort($products_array);
+
+// $list = array();
+// foreach($products_array as $grp)
+// foreach($grp as $line)
+// $list[] = $line;
+
return $products_array;
}
@@ -542,7 +563,7 @@
$products=array();
$any_out_of_stock = 0;
$hidden='';
-
+ $products_array =array();
if ($this->count_contents() > 0) {
$products = $this->get_products();
@@ -599,9 +620,21 @@
}
//! modification par les modules order total
$products[$i]=$this->process_cart($products[$i]);
+
+ if(isset($products[$i]['group']['id']))
+ $products_array[$products[$i]['group']['id']][] = $products[$i];
+ else
+ $products_array['nogroup'][] = $products[$i];
}
+
+ krsort($products_array);
+
+ $list = array();
+ foreach($products_array as $grp)
+ foreach($grp as $line)
+ $list[] = $line;
}
- $this->DC->products=$products;
+ $this->DC->products=$list;
$this->DC->hidden=$hidden;
$this->DC->any_out_of_stock=$any_out_of_stock;
return $this->DC;
Modified: branches/2.1.1/catalog/common/modules/core/seo_modrewrite/SeoR_byfolder.php
===================================================================
--- branches/2.1.1/catalog/common/modules/core/seo_modrewrite/SeoR_byfolder.php 2013-05-02 15:20:40 UTC (rev 4733)
+++ branches/2.1.1/catalog/common/modules/core/seo_modrewrite/SeoR_byfolder.php 2013-05-02 18:54:03 UTC (rev 4734)
@@ -68,6 +68,9 @@
unset($tans['%_ext_%']);
}
+ if(/*$id !=(int)$id && */strlen($id) >6 && substr($id,-4) =='.php')
+ $id=substr($id,0,-4);
+
$replace = array(
$lang,
$key,
Modified: branches/2.1.1/catalog/includes/classes/AbstractAcaModule.php
===================================================================
--- branches/2.1.1/catalog/includes/classes/AbstractAcaModule.php 2013-05-02 15:20:40 UTC (rev 4733)
+++ branches/2.1.1/catalog/includes/classes/AbstractAcaModule.php 2013-05-02 18:54:03 UTC (rev 4734)
@@ -243,7 +243,7 @@
* @param $class string le nom de la class appelé, ou vide pour toutes les class enfants
* @param $actions string $actions['action']
*/
- public function after_check_action($class='',$actions){
+ public function after_check_action($class='',$actions=''){
$s='';
if (!empty($class)) {
if (isset($this->modules[$class]) && $this->modules[$class]->enabled and (method_exists($class, 'after_check_action' ))){
@@ -343,7 +343,7 @@
$list_mod[$class] = $cl[$class]->sort_order;
asort($list_mod);
foreach($list_mod as $class=>$s){
- $this->modules[$class] =$cl[$class];
+ $this->modules[$class] =$cl[$class];
}
unset($cl);unset($list_mod);
}
Modified: branches/2.1.1/catalog/includes/classes/drivers/data/product.php
===================================================================
--- branches/2.1.1/catalog/includes/classes/drivers/data/product.php 2013-05-02 15:20:40 UTC (rev 4733)
+++ branches/2.1.1/catalog/includes/classes/drivers/data/product.php 2013-05-02 18:54:03 UTC (rev 4734)
@@ -166,7 +166,7 @@
/**
* \fn get_extra_product($products_id, $key='')
*/
- public static function get_extra_product($products_id, $key='') {return productData::get_extra_product($products_id, $key); }
+ public static function get_extra_product($products_id, $key='') {return productData::GetExtraFields($products_id, $key); }
/**
* \fn get_count_products_in_category($category_id, $include_inactive = false)
*/
@@ -216,7 +216,7 @@
$product['title']=(tep_not_null($content['products_model'])?$content['products_model']:$content['products_name']);
$product['name']=$content['products_name'];
- $product['extra']=self::get_extra_product($content['products_id']);
+ $product['extra']=self::GetExtraFields($content['products_id']);
$product['action']['buy']= (!Stock::check_inline(array('quantity'=>1, 'id'=>$content['products_id'], 'track_stock'=>(int)$content['track_stock'], 'attributes'=>array(), 'current_quantity'=>(int)$content['products_quantity']))?'true':'false');
@@ -340,20 +340,20 @@
)
)
*/
- public static function get_extra_product($product_id, $key=''){
+ public static function GetExtraFields($_id, $key=''){
$array= array();
- if(isset(self::$object_data[(int)$product_id]) && isset(self::$object_data[(int)$product_id]->extra) && empty($key) )$array= self::$object_data[(int)$product_id]->extra;
+ if(isset(self::$object_data[(int)$_id]) && isset(self::$object_data[(int)$_id]->extra) && empty($key) )$array= self::$object_data[(int)$_id]->extra;
else {
$DB=Database::getInstance();
$array=array();
- $sql = "SELECT e.epf_id, e.epf_input_type,e.epf_key, epf_show_in_listing, epf_advanced_search, e.epf_active_value_language , l.epf_label, l.epf_format as input_format, p2epf.products_extra_fields_value as value FROM " . TABLE_PRODUCTS_TO_PRODUCTS_EXTRA_FIELDS . " p2epf , " . TABLE_PRODUCTS_EXTRA_FIELDS . " e JOIN " . TABLE_PRODUCTS_EXTRA_FIELDS_LABELS . " l ON e.epf_id = l.epf_id WHERE p2epf.products_extra_fields_id=e.epf_id AND products_id = '" . (int)$product_id . "' AND l.languages_id='".self::$lg_id."' AND epf_special_mod='".$key."' ORDER BY epf_order ASC " ;
+ $sql = "SELECT e.epf_id, e.epf_input_type,e.epf_key, epf_show_in_listing, epf_advanced_search, e.epf_active_value_language , l.epf_label, l.epf_format as input_format, p2epf.products_extra_fields_value as value FROM " . TABLE_PRODUCTS_TO_PRODUCTS_EXTRA_FIELDS . " p2epf , " . TABLE_PRODUCTS_EXTRA_FIELDS . " e JOIN " . TABLE_PRODUCTS_EXTRA_FIELDS_LABELS . " l ON e.epf_id = l.epf_id WHERE p2epf.products_extra_fields_id=e.epf_id AND products_id = '" . (int)$_id . "' AND ( l.languages_id='".self::$lg_id."' OR l.languages_id= 0) AND epf_special_mod='".$key."' ORDER BY epf_order ASC " ;
$epf_query = $DB->query($sql);
while( $e = $epf_query->fetchAssoc() ) {
- $val = $DB->query( $sql ="SELECT p2epf.products_extra_fields_value as value FROM " . TABLE_PRODUCTS_TO_PRODUCTS_EXTRA_FIELDS . " p2epf WHERE p2epf.products_extra_fields_id=".$e['epf_id']." AND products_id = '" . (int)$product_id . "' AND languages_id='". (($e['epf_active_value_language']==1 && !in_array( (int)$e['epf_input_type'] , array(4,2)) )? self::$lg_id : 0)."' ");
+ $val = $DB->query( $sql ="SELECT p2epf.products_extra_fields_value as value FROM " . TABLE_PRODUCTS_TO_PRODUCTS_EXTRA_FIELDS . " p2epf WHERE p2epf.products_extra_fields_id=".$e['epf_id']." AND products_id = '" . (int)$_id . "' AND languages_id='". (($e['epf_active_value_language']==1 && !in_array( (int)$e['epf_input_type'] , array(4,2)) )? self::$lg_id : 0)."' ");
$result = $val->fetchAssoc();
switch((int)$e['epf_input_type'] ) {
@@ -371,7 +371,6 @@
$val = $result['value'];
}
-
$array[ (!empty($e['epf_key'])?$e['epf_key'] :$e['epf_id']) ]=new objectInfo( array(
'label'=>(string)$e['epf_label'],
'name'=>(string)$e['epf_label'], // obsolete
@@ -390,8 +389,8 @@
}
- if(!isset(self::$object_data[(int)$product_id]))self::$object_data[(int)$product_id]=new objectInfo(array());
- self::$object_data[(int)$product_id]->extra = $array;
+ if(!isset(self::$object_data[(int)$_id]))self::$object_data[(int)$_id]=new objectInfo(array());
+ self::$object_data[(int)$_id]->extra = $array;
}
return $array;
Modified: branches/2.1.1/catalog/includes/classes/shopping_cart_action.php
===================================================================
--- branches/2.1.1/catalog/includes/classes/shopping_cart_action.php 2013-05-02 15:20:40 UTC (rev 4733)
+++ branches/2.1.1/catalog/includes/classes/shopping_cart_action.php 2013-05-02 18:54:03 UTC (rev 4734)
@@ -139,7 +139,6 @@
global $page, $cart;
$this->action=$action;
- if(!in_array($this->action,self::$actionCart))return;
/// force login for shopping cart
if (!_cst_bool('NO_SHOPPING_CART_FOR_GUEST') && !tep_session_is_registered('customer_id') ) {
@@ -155,6 +154,9 @@
$page->add_object('order_total_modules',$order_total_modules);
}
+ // protected action card by flag autorised action
+ if(!in_array($this->action,self::$actionCart))
+ return;
if (_cst_bool('DISPLAY_CART')|| $action=='update_product') {
$goto = FILENAME_SHOPPING_CART;
@@ -171,13 +173,13 @@
Si action, pas de suite , redirect contenu dans l'action
Les action des modules ot_xxx doivent avoir une methode shopping_cart_action
*/
- $href=$order_total_modules->shopping_cart_action();
+ $href=$order_total_modules->shopping_cart_action('',$action);
if(!$href)
switch ($action) {
- default:
- $this->$action();
- if(!isset($_GET['noredirect'])) tep_redirect(tep_href_link($goto, tep_get_all_get_params($parameters)));
+ default:
+ $this->$action();
+ if(!isset($_GET['noredirect'])) tep_redirect(tep_href_link($goto, tep_get_all_get_params($parameters)));
}
}
Modified: branches/2.1.1/catalog/includes/modules/order_total/ot_shipping.php
===================================================================
--- branches/2.1.1/catalog/includes/modules/order_total/ot_shipping.php 2013-05-02 15:20:40 UTC (rev 4733)
+++ branches/2.1.1/catalog/includes/modules/order_total/ot_shipping.php 2013-05-02 18:54:03 UTC (rev 4734)
@@ -49,6 +49,12 @@
$this->output = array();
$this->pre_output = array();
+
+ global $currencies, $cart;
+ if(is_object($cart) && $cart->get_content_type() =='virtual'){
+ $this->enabled = false;
+ return false;
+ }
}
function process() {
Modified: branches/2.1.1/catalog/includes/modules/order_total/ot_tax.php
===================================================================
--- branches/2.1.1/catalog/includes/modules/order_total/ot_tax.php 2013-05-02 15:20:40 UTC (rev 4733)
+++ branches/2.1.1/catalog/includes/modules/order_total/ot_tax.php 2013-05-02 18:54:03 UTC (rev 4734)
@@ -48,7 +48,7 @@
$this->description = __('module order total tax description');
$this->sort_order = (defined('MODULE_ORDER_TOTAL_TAX_SORT_ORDER')) ? MODULE_ORDER_TOTAL_TAX_SORT_ORDER : 4 ;
$this->enabled = true;
- $this->shopping_cart=true; // active mode process
+ $this->shopping_cart=false; // active mode process
$this->output = array();
$this->pre_output = array();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-05-02 15:20:45
|
Revision: 4733
http://sourceforge.net/p/oscss/svn/4733
Author: oscim
Date: 2013-05-02 15:20:40 +0000 (Thu, 02 May 2013)
Log Message:
-----------
Fix bug using sort order in array key
Modified Paths:
--------------
branches/2.1.1/catalog/includes/classes/order_total.php
Modified: branches/2.1.1/catalog/includes/classes/order_total.php
===================================================================
--- branches/2.1.1/catalog/includes/classes/order_total.php 2013-04-30 20:11:28 UTC (rev 4732)
+++ branches/2.1.1/catalog/includes/classes/order_total.php 2013-05-02 15:20:40 UTC (rev 4733)
@@ -1,10 +1,10 @@
<?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
+ \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 29/11/10, 11:33
+ \date 29/04/13, 11:33
\author oscim <mail aur...@os...> <www http://www.oscim.fr>
\encode UTF-8
\class order_total
@@ -26,12 +26,12 @@
$this->modules=array();
$this->list_mod=array();
-// print_r(MODULE_ORDER_TOTAL_INSTALLED);
+
foreach(parent::initialise_type('MODULE_ORDER_TOTAL_INSTALLED','order_total') as $class){
$cl[$class]=new $class ();
- $list_mod[$cl[$class]->sort_order] = $class ;
+ $list_mod[] = $class ;
}
-// print_r($list_mod);
+
if (isset($_SESSION['sppc_customer_group_id']) && $_SESSION['sppc_customer_group_id'] != '0') $customer_group_id = $_SESSION['sppc_customer_group_id'];
else $customer_group_id = '0';
@@ -41,7 +41,7 @@
if(!isset($list_mod) ||!is_array($list_mod) || count($list_mod)==0) return false;
ksort($list_mod);
-// print_r($list_mod);
+
foreach($list_mod as $s=>$class){
if ( count($temp_ot_array)==0 || in_array($class.'.php', $temp_ot_array ) ) $GLOBALS[$class]=$this->modules[$class] =$cl[$class];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-04-30 20:11:33
|
Revision: 4732
http://sourceforge.net/p/oscss/svn/4732
Author: oscim
Date: 2013-04-30 20:11:28 +0000 (Tue, 30 Apr 2013)
Log Message:
-----------
Fix css class used in html code
Add recently viewed content
Normalize html code in boxes
Modified Paths:
--------------
branches/2.1.1/catalog/common/classes/datatype_drivers/Data_content.php
branches/2.1.1/catalog/common/classes/datatype_drivers/Data_product.php
branches/2.1.1/catalog/common/classes/price.php
branches/2.1.1/catalog/includes/functions/template.php
branches/2.1.1/catalog/templates/defaut/Childs_tpl/module.php
branches/2.1.1/catalog/templates/defaut/includes/boxes/recently_viewed.php
branches/2.1.1/catalog/templates/defaut/includes/boxes/shopping_cart_short.php
branches/2.1.1/catalog/templates/defaut/includes/boxes/very_viewed.php
branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.recently_viewed.gab
branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.specials.gab
branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.whats_new.gab
branches/2.1.1/catalog/templates/defaut/template.php
Added Paths:
-----------
branches/2.1.1/catalog/templates/defaut/includes/boxes/recently_viewed_content.php
branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.recently_viewed_content.gab
Modified: branches/2.1.1/catalog/common/classes/datatype_drivers/Data_content.php
===================================================================
--- branches/2.1.1/catalog/common/classes/datatype_drivers/Data_content.php 2013-04-30 19:41:42 UTC (rev 4731)
+++ branches/2.1.1/catalog/common/classes/datatype_drivers/Data_content.php 2013-04-30 20:11:28 UTC (rev 4732)
@@ -322,6 +322,28 @@
$page->add_var_page('content',$content);
$page->add_var_page('current_id',@$_GET['content']);
+
+ /**
+ Specifique au bloite récement vu. Enregistrement désactivier si OSCSS__B_RECENTLY_VIEWED et a false
+ */
+ if($page->_conf_value('OSCSS__B_RECENTLY_VIEWED')) {
+ if (!tep_session_is_registered('recently_viewed'))
+ $_SESSION['recently_viewed'] =array();
+
+ if (!isset($_SESSION['recently_viewed']['content']))
+ $_SESSION['recently_viewed']['content'] ='';
+
+ $recently_viewed = $_SESSION['recently_viewed']['content'];
+
+ $check_not_duplicate = (int)$_GET['content'];
+ $temp_recent = $recently_viewed;
+ if (preg_match('/'.$check_not_duplicate.';/', $temp_recent ) ) $recently_viewed = preg_replace('/'.$check_not_duplicate.';/',"",$temp_recent);
+ $recently_viewed = (int)$_GET['content'] . ';' . $recently_viewed ;
+
+ $_SESSION['recently_viewed']['content'] = $recently_viewed;
+ }
+
+
return $page_content;
break;
default:
Modified: branches/2.1.1/catalog/common/classes/datatype_drivers/Data_product.php
===================================================================
--- branches/2.1.1/catalog/common/classes/datatype_drivers/Data_product.php 2013-04-30 19:41:42 UTC (rev 4731)
+++ branches/2.1.1/catalog/common/classes/datatype_drivers/Data_product.php 2013-04-30 20:11:28 UTC (rev 4732)
@@ -465,16 +465,24 @@
Specifique au bloite récement vu. Enregistrement désactivier si OSCSS__B_RECENTLY_VIEWED et a false
*/
if($page->_conf_value('OSCSS__B_RECENTLY_VIEWED')) {
- $recently_viewed = '';
- if (!tep_session_is_registered('recently_viewed')){
- tep_session_register('recently_viewed');
- $recently_viewed = (int)$_GET['products_id'] . ';';
- }
+ if (!tep_session_is_registered('recently_viewed'))
+ $_SESSION['recently_viewed'] =array();
+
+ if (!isset($_SESSION['recently_viewed']['product']))
+ $_SESSION['recently_viewed']['product'] ='';
+
+
+ $recently_viewed = $_SESSION['recently_viewed']['product'];
+
$check_not_duplicate = (int)$_GET['products_id'];
+
$temp_recent = $recently_viewed;
- if (preg_match('/'.$check_not_duplicate.'/', $temp_recent ) ) $recently_viewed = preg_replace('/'.$check_not_duplicate.'/',"",$temp_recent);
+ if (preg_match('/'.$check_not_duplicate.';/', $temp_recent ) ) $recently_viewed = preg_replace('/'.$check_not_duplicate.';/',"",$temp_recent);
$recently_viewed = (int)$_GET['products_id'] . ';' . $recently_viewed ;
+
+ $_SESSION['recently_viewed']['product'] = $recently_viewed;
}
+
$page->product->pile_img[]=$product_info['products_image'];
$page_content = $page->force_content('product_info.php');
Modified: branches/2.1.1/catalog/common/classes/price.php
===================================================================
--- branches/2.1.1/catalog/common/classes/price.php 2013-04-30 19:41:42 UTC (rev 4731)
+++ branches/2.1.1/catalog/common/classes/price.php 2013-04-30 20:11:28 UTC (rev 4732)
@@ -73,7 +73,7 @@
Gabarit prix normal
*/
protected static $modele = array( 'price_model' => array( 'text'=>'%pprice', // Modèle Brut
- 'html'=>'<span class="price">%pprice</span>', // Modèle HTML
+ 'html'=>'<span class="normalprice">%pprice</span>', // Modèle HTML
'rss'=>' <price>%pprice</price>' // Modèle rss
),
'special_model'=> array( 'text'=>'%sprice', // Modèle Brut
Modified: branches/2.1.1/catalog/includes/functions/template.php
===================================================================
--- branches/2.1.1/catalog/includes/functions/template.php 2013-04-30 19:41:42 UTC (rev 4731)
+++ branches/2.1.1/catalog/includes/functions/template.php 2013-04-30 20:11:28 UTC (rev 4732)
@@ -193,4 +193,19 @@
if(!isset($modules[$mod])) return;
return unhtmlentities($modules[$mod][0]->content);
}
+
+/**
+@brief truncate section but after " "
+*/
+function truncate($text, $leng=0){
+ if($leng <= 0)
+ return $text;
+
+ $lgt=strlen($text);
+
+ if($leng>=$lgt)
+ return $text;
+
+ return substr($text, 0,( $leng + strpos($text," ",$leng)) );
+}
?>
\ No newline at end of file
Modified: branches/2.1.1/catalog/templates/defaut/Childs_tpl/module.php
===================================================================
--- branches/2.1.1/catalog/templates/defaut/Childs_tpl/module.php 2013-04-30 19:41:42 UTC (rev 4731)
+++ branches/2.1.1/catalog/templates/defaut/Childs_tpl/module.php 2013-04-30 20:11:28 UTC (rev 4732)
@@ -58,7 +58,7 @@
<?php } ?>
<?php if (tep_not_null($ele->products_price) && $page->_draw_in_page('PRODUCT_LIST_PRICE')) { ?>
- <p class="price prod">
+ <p class="price product">
<?php echo print_products_price_rv($ele) ?>
</p>
<?php } ?>
Modified: branches/2.1.1/catalog/templates/defaut/includes/boxes/recently_viewed.php
===================================================================
--- branches/2.1.1/catalog/templates/defaut/includes/boxes/recently_viewed.php 2013-04-30 19:41:42 UTC (rev 4731)
+++ branches/2.1.1/catalog/templates/defaut/includes/boxes/recently_viewed.php 2013-04-30 20:11:28 UTC (rev 4732)
@@ -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.0
- @date 26/01/11, 15:13
+ @version 2.1.1
+ @date 29/04/2013, 15:13
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*\group boxes
@@ -12,22 +12,47 @@
*\dir includes/boxes/
*\brief display list product recently viewed
*/
-global $recently_viewed,$recent_products;
+global $page,$recent_products;
+
+ //! @remarks depend Data_product active
+ if( ! DataTypes::is_active('product'))
+ return false;
+ //! @remarks cf config
+ if( ! $page->_conf_value('OSCSS__B_RECENTLY_VIEWED'))
+ return false;
+
$count=0;
-if($page->_conf_value('OSCSS__B_RECENTLY_VIEWED') && isset($recently_viewed)&& tep_not_null($recently_viewed) ) {
+
+if(tep_session_is_registered('recently_viewed') )
+ $recently_viewed = $_SESSION['recently_viewed']['product'];
+
+if( isset($recently_viewed)&& tep_not_null($recently_viewed) ) {
$rec_products = explode(';',$recently_viewed );
$recent_products = array();
- if (count($rec_products) >1) {
+
+ if (count($rec_products) >=1) {
$s = '<div id="recently_viewed_inbox">'."\n".'<ul>'."\n";;
foreach ($rec_products as $recent) {
- if (strlen($recent) >0 && $count<=$page->_conf_value('MAX_DISPLAY_RECENTLY_VIEWED') && ( ($recent_info_values = product_info($recent)) !=false) && ( !isset($_GET['products_id']) || (isset($_GET['products_id']) && $_GET['products_id'] !=$recent)) ) {
- $recent_products[]=arrayInfo($recent_info_values);
- $count++;
+
+ if (strlen($recent) >0 && $count<=$page->_conf_value('MAX_DISPLAY_RECENTLY_VIEWED') && ( !isset($_GET['products_id']) || (isset($_GET['products_id']) && $_GET['products_id'] !=$recent)) ) {
+
+ $recent_info_values = product::get_item((int)$recent, true);
+
+ if($recent_info_values !=false) {
+ $recent_products[]=arrayInfo($recent_info_values);
+ $count++;
+ }
}
}
$s .= '</ul>'."\n".'</div>'."\n";
- $array= array('title'=>__('box heading viewed products'),'content'=>tep_output_string_protected(tep_get_include_contents('box.recently_viewed'),false,true));
+ $array= array(
+ 'type'=>'product',
+ 'title'=>__('box heading viewed products'),
+ 'content'=>tep_output_string_protected(tep_get_include_contents('box.recently_viewed'),false,true)
+ );
}
+ else
+ return false;
}
?>
\ No newline at end of file
Added: branches/2.1.1/catalog/templates/defaut/includes/boxes/recently_viewed_content.php
===================================================================
--- branches/2.1.1/catalog/templates/defaut/includes/boxes/recently_viewed_content.php (rev 0)
+++ branches/2.1.1/catalog/templates/defaut/includes/boxes/recently_viewed_content.php 2013-04-30 20:11:28 UTC (rev 4732)
@@ -0,0 +1,57 @@
+<?php
+/**
+ @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 29/04/2013, 15:13
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ *\group boxes
+ *\file recently_viewed.php
+ *\dir includes/boxes/
+ *\brief display list product recently viewed
+*/
+global $page,$recent_content;
+
+ //! @remarks depend Data_product active
+ if( ! DataTypes::is_active('content'))
+ return false;
+ //! @remarks cf config
+ if( ! $page->_conf_value('OSCSS__B_RECENTLY_VIEWED'))
+ return false;
+
+$count=0;
+
+
+if(tep_session_is_registered('recently_viewed') )
+ $recently_viewed = $_SESSION['recently_viewed']['content'];
+
+if( isset($recently_viewed)&& tep_not_null($recently_viewed) ) {
+ $rec_products = explode(';',$recently_viewed );
+ $recent_products = array();
+
+ if (count($rec_products) >=1) {
+ $s = '<div id="recently_viewed_inbox">'."\n".'<ul>'."\n";;
+ foreach ($rec_products as $recent) {
+ if (strlen($recent) >0 && $count<=$page->_conf_value('MAX_DISPLAY_RECENTLY_VIEWED') && ( !isset($_GET['content']) || (isset($_GET['content']) && (int)$_GET['content'] !=$recent)) ) {
+ $recent_info_values = content::get_item((int)$recent, true);
+
+ if($recent_info_values !=false) {
+ $recent_content[]=$recent_info_values;
+ $count++;
+ }
+ }
+ }
+ $s .= '</ul>'."\n".'</div>'."\n";
+
+ $array= array(
+ 'type'=>'content',
+ 'title'=>__('box heading viewed content'),
+ 'content'=>tep_output_string_protected(tep_get_include_contents('box.recently_viewed_content'),false,true)
+ );
+ }
+ else
+ return false;
+}
+?>
\ No newline at end of file
Modified: branches/2.1.1/catalog/templates/defaut/includes/boxes/shopping_cart_short.php
===================================================================
--- branches/2.1.1/catalog/templates/defaut/includes/boxes/shopping_cart_short.php 2013-04-30 19:41:42 UTC (rev 4731)
+++ branches/2.1.1/catalog/templates/defaut/includes/boxes/shopping_cart_short.php 2013-04-30 20:11:28 UTC (rev 4732)
@@ -21,5 +21,9 @@
$total_nb_products_with_qty += $products[$i]['quantity'];
}
$title='<a href="'.tep_href_link(FILENAME_SHOPPING_CART).'">'.__('box heading shopping cart').'</a>';
- $array=array('title'=>tep_output_string_protected($title,false,true),'content'=>tep_get_include_contents('box.cart.short'));
+ $array=array(
+ 'type'=>'shoppingcart',
+ 'title'=>tep_output_string_protected($title,false,true),
+ 'content'=>tep_get_include_contents('box.cart.short')
+ );
?>
Modified: branches/2.1.1/catalog/templates/defaut/includes/boxes/very_viewed.php
===================================================================
--- branches/2.1.1/catalog/templates/defaut/includes/boxes/very_viewed.php 2013-04-30 19:41:42 UTC (rev 4731)
+++ branches/2.1.1/catalog/templates/defaut/includes/boxes/very_viewed.php 2013-04-30 20:11:28 UTC (rev 4732)
@@ -16,9 +16,6 @@
//! @remarks depend Data_product active
if( ! DataTypes::is_active('product'))
return false;
- //! @remarks cf config
- if( ! $page->_conf_value('OSCSS__B_RECENTLY_VIEWED'))
- return false;
$DB=Database::getInstance();
$languages_id=$page->the_var('languages_id');
Modified: branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.recently_viewed.gab
===================================================================
--- branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.recently_viewed.gab 2013-04-30 19:41:42 UTC (rev 4731)
+++ branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.recently_viewed.gab 2013-04-30 20:11:28 UTC (rev 4732)
@@ -3,27 +3,44 @@
@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.0
- @date 26/01/11, 15:13
+ @version 2.1.1
+ @date 26/04/2013, 15:13
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
global $recent_products,$language;
?>
- <ul class="boxes recently_viewed">
- <?php foreach ($recent_products as $item):?>
- <li class="boxes item">
- <span class="boxes product_title">
- <a href="<?php echo tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $item['products_id']) ?>"><?php echo $item['products_name'] ?></a>
- </span>
- <br />
- <span class="boxes product_img">
- <a href="<?php echo tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $item['products_id']) ?>"><?php echo tep_image(DIR_WS_IMAGES . $item['products_image'], '', $page->_conf_value('SIDEBAR_IMG_WIDTH'), $page->_conf_value('SIDEBAR_IMG_HEIGHT') ) ?></a>
- </span>
- <br />
- <span class="boxes prod_price">
- <?php echo print_products_price_rv($item) ?>
- </span>
- </li>
- <?php endforeach; ?>
- </ul>
+<div class="inner-boxe">
+ <?php if(count($recent_products)>1): ?>
+ <ul class="recently_viewed">
+ <?php foreach ($recent_products as $item):?>
+ <li class="item">
+ <span class="title product">
+ <a href="<?php echo tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $item['products_id']) ?>"><?php echo $item['products_name'] ?></a>
+ </span>
+
+ <span class="img product">
+ <a href="<?php echo tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $item['products_id']) ?>"><?php echo tep_image(DIR_WS_IMAGES . $item['products_image'], '', $page->_conf_value('SIDEBAR_IMG_WIDTH'), $page->_conf_value('SIDEBAR_IMG_HEIGHT') ) ?></a>
+ </span>
+
+ <span class="price product">
+ <?php echo print_products_price_rv($item) ?>
+ </span>
+ </li>
+ <?php endforeach; ?>
+ </ul>
+ <?php else:
+ $item = $recent_products[0]; ?>
+ <p class="title product">
+ <a href="<?php echo tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $item['products_id']) ?>"><?php echo $item['products_name'] ?></a>
+ </p>
+
+ <p class="img product">
+ <a href="<?php echo tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $item['products_id']) ?>"><?php echo tep_image(DIR_WS_IMAGES . $item['products_image'], '', $page->_conf_value('SIDEBAR_IMG_WIDTH'), $page->_conf_value('SIDEBAR_IMG_HEIGHT') ) ?></a>
+ </p>
+
+ <p class="price product">
+ <?php echo print_products_price_rv($item) ?>
+ </p>
+ <?php endif; ?>
+</div>
\ No newline at end of file
Added: branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.recently_viewed_content.gab
===================================================================
--- branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.recently_viewed_content.gab (rev 0)
+++ branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.recently_viewed_content.gab 2013-04-30 20:11:28 UTC (rev 4732)
@@ -0,0 +1,38 @@
+<?php
+/**
+ @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 26/04/2013, 15:13
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $recent_content,$language;
+?>
+<div class="inner-boxe">
+ <?php if(count($recent_content)>1): ?>
+ <ul class="recently_viewed">
+ <?php foreach ($recent_content as $item):?>
+ <li class="item">
+ <span class="title content">
+ <a href="<?php echo $item->href ?>"><?php echo $item->title ?></a>
+ </span>
+
+ <span class="preview content">
+ <?php echo truncate(strip_tags(unhtmlentities($item->original)), 100) ?>
+ </span>
+ </li>
+ <?php endforeach; ?>
+ </ul>
+ <?php else:
+ $item = $recent_content[0]; ?>
+ <p class="title content">
+ <a href="<?php echo $item->href ?>"><?php echo $item->title ?></a>
+ </p>
+
+ <p class="preview content">
+ <?php echo truncate(strip_tags(unhtmlentities($item->original)), 100) ?>
+ </p>
+ <?php endif; ?>
+</div>
\ No newline at end of file
Modified: branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.specials.gab
===================================================================
--- branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.specials.gab 2013-04-30 19:41:42 UTC (rev 4731)
+++ branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.specials.gab 2013-04-30 20:11:28 UTC (rev 4732)
@@ -3,24 +3,24 @@
@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.0
- @date 26/01/11, 15:13
+ @version 2.1.1
+ @date 26/04/2013, 15:13
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
global $random_product,$page;
?>
-<p class="boxes specials">
- <span class="boxes product_title">
+<div class="inner-boxe">
+ <p class="title product">
<a href="<?php echo tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $random_product['products_id']) ?>"><?php echo $random_product['products_name'] ?></a>
- </span>
- <br/>
- <span class="boxes product_img">
+ </p>
+
+ <p class="img product">
<a href="<?php echo tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $random_product["products_id"]) ?>">
<?php echo tep_image(DIR_WS_IMAGES . $random_product['products_image'], '', $page->_conf_value('SIDEBAR_IMG_WIDTH'), $page->_conf_value('SIDEBAR_IMG_HEIGHT')) ?></a>
- </span>
- <br/>
- <span class="boxes prod_price productSpecialPrice">
+ </p>
+
+ <p class="price product">
<?php echo print_products_price_rv($random_product) ?>
- </span>
-</p>
\ No newline at end of file
+ </p>
+</div>
\ No newline at end of file
Modified: branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.whats_new.gab
===================================================================
--- branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.whats_new.gab 2013-04-30 19:41:42 UTC (rev 4731)
+++ branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.whats_new.gab 2013-04-30 20:11:28 UTC (rev 4732)
@@ -3,24 +3,23 @@
@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.0
- @date 26/01/11, 15:13
+ @version 2.1.1
+ @date 26/04/2013, 15:13
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
global $random_product,$page;
?>
-<p class="boxes whats_new">
- <span class="boxes product_title">
- <a href="<?php echo tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $random_product['products_id']) ?>"><?php echo $random_product['products_name'] ?></a>
- </span>
- <br/>
- <span class="boxes product_img">
- <a href="<?php echo tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $random_product["products_id"]) ?>">
- <?php echo tep_image(DIR_WS_IMAGES . $random_product['products_image'], '', $page->_conf_value('SIDEBAR_IMG_WIDTH'), $page->_conf_value('SIDEBAR_IMG_HEIGHT')) ?></a>
- </span>
- <br/>
- <span class="boxes prod_price">
- <?php echo print_products_price_rv($random_product) ?>
- </span>
-</p>
\ No newline at end of file
+<div class="inner-boxe">
+ <p class="title product">
+ <a href="<?php echo tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $random_product['products_id']) ?>"><?php echo $random_product['products_name'] ?></a>
+ </p>
+ <p class="img product">
+ <a href="<?php echo tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $random_product['products_id']) ?>">
+ <?php echo tep_image(DIR_WS_IMAGES . $random_product['products_image'], '', $page->_conf_value('SIDEBAR_IMG_WIDTH'), $page->_conf_value('SIDEBAR_IMG_HEIGHT')) ?>
+ </a>
+ </p>
+ <p class="price product">
+ <?php echo print_products_price_rv($random_product) ?>
+ </p>
+</div>
\ No newline at end of file
Modified: branches/2.1.1/catalog/templates/defaut/template.php
===================================================================
--- branches/2.1.1/catalog/templates/defaut/template.php 2013-04-30 19:41:42 UTC (rev 4731)
+++ branches/2.1.1/catalog/templates/defaut/template.php 2013-04-30 20:11:28 UTC (rev 4732)
@@ -4,7 +4,7 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 04/03/2012, 21:54
+ @date 26/04/2013, 21:54
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@@ -64,7 +64,7 @@
<?php if($load->module !='child') : ?>
<?php /* Force draw here content module load by require */ ?>
<?php while($themodule=templ_draw_list('type=modules&pile=fullscreen')): /** Appel des module (new_products, product_listing ...) */ ?>
- <section id="<?php echo $themodule->id ?>" class="<?php echo $themodule->css_class; ?> ">
+ <section id="<?php echo $themodule->id ?>" class="<?php echo $themodule->css_class.' data'.$themodule->module_db->type; ?> ">
<?php include($page->the_var('PathChildGab').'module.php'); ?>
</section>
<?php endwhile; ?>
@@ -98,7 +98,7 @@
<h3 class="content title <?php echo $language ;?>"><?php echo ''; ?></h3>
</header>
<?php while($themodule=templ_draw_list('type=modules&pile=center')): /** Appel des module (new_products, product_listing ...) */ $load->module='child' ?>
- <section id="<?php echo $themodule->id ?>" class="<?php echo $themodule->css_class; ?> ">
+ <section id="<?php echo $themodule->id ?>" class="<?php echo $themodule->css_class.' data'.$themodule->module_db->type; ?> ">
<?php include($page->the_var('PathChildGab').'module.php'); ?>
</section>
<?php endwhile; ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-04-30 19:41:48
|
Revision: 4731
http://sourceforge.net/p/oscss/svn/4731
Author: oscim
Date: 2013-04-30 19:41:42 +0000 (Tue, 30 Apr 2013)
Log Message:
-----------
template in install move all css in less file
Modified Paths:
--------------
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/boxe.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/sidebar.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/ssheader.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-account.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-categorie.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-product.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/datatype-generic.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/forms.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/generic.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/master.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/boxes/categories.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/template.php
Added Paths:
-----------
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-content.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-order.less
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/boxe.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/boxe.php 2013-04-30 15:17:39 UTC (rev 4730)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/boxe.php 2013-04-30 19:41:42 UTC (rev 4731)
@@ -7,7 +7,7 @@
@encode UTF-8
*/
?>
-<section id="Box-<?php echo $boxe->name_clean; ?>" class="boxe">
+<section id="Box-<?php echo $boxe->name_clean; ?>" class="boxe <?php echo 'data'.$boxe->type ?>">
<header>
<h3 class="boxe title"><?php echo unhtmlentities($boxe->title) ;?></h3>
</header>
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.php 2013-04-30 15:17:39 UTC (rev 4730)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.php 2013-04-30 19:41:42 UTC (rev 4731)
@@ -9,6 +9,8 @@
@encode UTF-8
*/
global $load;
+
+// print_r($themodule);
?>
<?php if($load->module !='child') : ?>
@@ -47,79 +49,90 @@
*/
foreach($themodule->module_db->content as $ele): ?>
+ <li class="one <?php echo $ele->type ?>">
+
<?php if($ele->type =='product'): /** PRODUCTS */ ?>
- <li class="one product">
- <section class="outerblock">
- <div class="innerblock">
- <?php if ($page->_draw_in_page('PRODUCT_LIST_NAME')) { ?>
- <p class="title product"><?php echo '<a href="' . $ele->href . '" title="header=['.$ele->products_name.'] body=[ ] fade=[on]">' . $ele->products_name . '</a>' ;?></p>
- <?php } ?>
+ <section class="outerblock">
+ <div class="innerblock">
+ <?php if (tep_not_null($ele->products_price) && $page->_draw_in_page('PRODUCT_LIST_PRICE')) { ?>
+ <p class="price product">
+ <?php echo print_products_price_rv($ele) ?>
+ </p>
+ <?php } ?>
- <?php if ($page->_draw_in_page('PRODUCT_LIST_IMAGE')) { ?>
- <p class="img product"><?php echo '<a href="' . $ele->href . '" title="header=['.$ele->products_name.'] body=[ ] fade=[on]" >' . tep_image(DIR_WS_IMAGES . @$ele->products_image, $ele->products_name, $page->_conf_value('SMALL_IMAGE_WIDTH'), $page->_conf_value('SMALL_IMAGE_HEIGHT')) . '</a>' ; ?></p>
- <?php } ?>
+ <?php if ($page->_draw_in_page('PRODUCT_LIST_NAME')) { ?>
+ <p class="title product">
+ <?php echo '<a href="' . $ele->href . '" title="header=['.$ele->products_name.'] body=[ ] fade=[on]">' . $ele->products_name . '</a>' ;?>
+ </p>
+ <?php } ?>
- <?php if (tep_not_null($ele->products_price) && $page->_draw_in_page('PRODUCT_LIST_PRICE')) { ?>
- <p class="price prod">
- <?php echo print_products_price_rv($ele) ?>
- </p>
- <?php } ?>
+ <?php if ($page->_draw_in_page('PRODUCT_LIST_IMAGE')) { ?>
+ <p class="img product">
+ <?php echo '<a href="' . $ele->href . '" title="header=['.$ele->products_name.'] body=[ ] fade=[on]" >' . tep_image(DIR_WS_IMAGES . @$ele->products_image, $ele->products_name, $page->_conf_value('SMALL_IMAGE_WIDTH'), $page->_conf_value('SMALL_IMAGE_HEIGHT')) . '</a>' ; ?>
+ </p>
+ <?php } ?>
- <div class="innerblock-more">
- <?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->products_id)) != 0): ?>
- <p><a class="submitBt" href="<?php echo $ele->href ?>" ><img border="0" class="left_bt" title="" alt="" src="<?php echo $page->getPathTemplate() ?>images/carticon.png"></a></p>
+ <div class="innerblock-more">
+ <?php if ( $page->_draw_in_page('PRODUCT_LIST_BUY_NOW')) { ?>
- <?php /** @remarks If buy possible and attribute */ ?>
+ <?php /** @remarks If buy possible and attribute , force choose attribute */ ?>
- <?php elseif (_test_bool($ele->action['buy'] )) : ?>
- <?php echo tep_draw_form($themodule->id.'cart_quantity'.$ele->products_id, tep_href_link(FILENAME_DEFAULT, tep_get_all_get_params(array('action')) . 'action=add_product')); ?>
- <p>
- <?php echo tep_draw_hidden_field('products_id', $ele->products_id). tep_draw_hidden_field('products_quantity', '1'); ?>
- <input title="header=[<?php echo __('add to cart') ?>] body=[ ] fade=[on]" type="image" src="<?php echo $page->getPathTemplate() ?>images/carticon.png" onclick="this.form.submit()"/>
- </p>
- </form>
- <?php endif; ?>
- <?php } ?>
+ <?php if (_test_bool($ele->action['buy'] ) && count(product_attribut_info($ele->products_id)) != 0): ?>
+ <p><a class="submitBt" href="<?php echo $ele->href ?>" ><img border="0" class="left_bt" title="" alt="" src="<?php echo $page->getPathTemplate() ?>images/carticon.png"></a></p>
+ <?php /** @remarks If buy possible and attribute */ ?>
- <a class="details prod" href="<?php echo $ele->href ?>" title="header=[<?php echo __('view more') ?>] body=[ ] fade=[on]"><?php echo __('more') ?></a>
- </div>
- </div>
- </section>
- </li>
+ <?php elseif (_test_bool($ele->action['buy'] )) : ?>
+ <?php echo tep_draw_form($themodule->id.'cart_quantity'.$ele->products_id, tep_href_link(FILENAME_DEFAULT, tep_get_all_get_params(array('action')) . 'action=add_product')); ?>
+ <p>
+ <?php echo tep_draw_hidden_field('products_id', $ele->products_id). tep_draw_hidden_field('products_quantity', '1'); ?>
+ <input title="header=[<?php echo __('add to cart') ?>] body=[ ] fade=[on]" type="image" src="<?php echo $page->getPathTemplate() ?>images/carticon.png" onclick="this.form.submit()"/>
+ </p>
+ </form>
+ <?php endif; ?>
+ <?php } ?>
+
+
+ <a class="details product" href="<?php echo $ele->href ?>" title="header=[<?php echo __('view more') ?>] body=[ ] fade=[on]"><?php echo __('more') ?></a>
+ </div>
+ </div>
+ </section>
+
+
<?php elseif($ele->type =='content') : /** POSTS */ ?>
- <dl class="listing contents <?php echo $page->page_content_clean() ?>">
- <dt class="listing_s">
- <a id="<?php echo $ele->id; ?>" href="<?php echo $ele->href ; ?>" ><?php echo $ele->title ?></a>
- </dt>
- </dl>
+ <section class="outerblock">
+ <div class="innerblock">
+ <p class="title content">
+ <a href="<?php echo $ele->href ; ?>" ><?php echo $ele->title ?></a>
+ </p>
+ <p class="preview content">
+ <?php echo truncate(strip_tags(unhtmlentities($ele->original)), 100) ?>
+ </p>
+ </div>
+ </section>
<?php elseif($ele->type =='categorie'): /** CATEGORIES */ ?>
- <li class="one categorie">
- <section class="outerblock">
- <div class="innerblock">
- <p class="title categorie">
- <a href="<?php echo $ele->href ?>"> <?php echo $ele->categories_name ;?></a>
- </p>
- <p class="img categorie">
- <?php echo '<a href="' . $ele->href. '">' . tep_image(DIR_WS_IMAGES . $ele->categories_image, $ele->categories_name, $page->_conf_value('SUBCATEGORY_IMAGE_WIDTH'), $page->_conf_value('SUBCATEGORY_IMAGE_HEIGHT')) . '</a>' ;?>
- </p>
- </div>
- </section>
- </li>
+ <section class="outerblock">
+ <div class="innerblock">
+ <p class="title categorie">
+ <a href="<?php echo $ele->href ?>"> <?php echo $ele->categories_name ;?></a>
+ </p>
+ <p class="img categorie">
+ <?php echo '<a href="' . $ele->href. '">' . tep_image(DIR_WS_IMAGES . $ele->categories_image, $ele->categories_name, $page->_conf_value('SUBCATEGORY_IMAGE_WIDTH'), $page->_conf_value('SUBCATEGORY_IMAGE_HEIGHT')) . '</a>' ;?>
+ </p>
+ </div>
+ </section>
- <?php else : /** Other */ ?>
- <dl class="listing contents <?php echo $page->page_content_clean() ?>">
- <dt class="listing_s">
- <a id="<?php echo $ele->id; ?>" href="<?php echo $ele->href ; ?>" ><?php echo $ele->title ?></a>
- </dt>
- </dl>
- <?php endif; ?>
-
+ <?php else : /** Other */ ?>
+ <dl class="listing contents <?php echo $page->page_content_clean() ?>">
+ <dt class="listing_s">
+ <a id="<?php echo $ele->id; ?>" href="<?php echo $ele->href ; ?>" ><?php echo $ele->title ?></a>
+ </dt>
+ </dl>
+ <?php endif; ?>
+ </li>
<?php endforeach; ?>
</ul>
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/sidebar.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/sidebar.php 2013-04-30 15:17:39 UTC (rev 4730)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/sidebar.php 2013-04-30 19:41:42 UTC (rev 4731)
@@ -12,15 +12,15 @@
<?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 include('boxe.php'); ?>
+
<?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"> -->
+ if (!$page->is_page_here($boxe->name_clean) ) : ?>
+
<?php include('boxe.php'); ?>
-<!-- </div> -->
+
<?php endif; endwhile; ?>
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/ssheader.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/ssheader.php 2013-04-30 15:17:39 UTC (rev 4730)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/ssheader.php 2013-04-30 19:41:42 UTC (rev 4731)
@@ -28,10 +28,10 @@
@remarks Call widget boxe serach suggest
*/
$boxe =$page->oscss_boxes->_return('Widget_search_suggest'); ?>
- <div id="<?php echo $boxe->name_clean; ?>Box" class="<?php echo $boxe->name_clean; ?>">
- <section id="Box-<?php echo $boxe->name_clean; ?>" class="boxe">
- <?php echo unhtmlentities($boxe->content) ?>
- </section>
+ <div id="<?php echo $boxe->name_clean; ?>Box" class="<?php echo $boxe->name_clean; ?> <?php echo 'data'.$boxe->type ?>">
+ <section id="Box-<?php echo $boxe->name_clean; ?>" class="boxe">
+ <?php echo unhtmlentities($boxe->content) ?>
+ </section>
</div>
<div class="languages">
@@ -47,7 +47,7 @@
<?php while($boxe=templ_draw_list('type=boxes&pile=header')):
if (!$page->is_page_here($boxe->name_clean) ) : ?>
- <div id="<?php echo $boxe->name_clean; ?>Box" class="deroul l_158">
+ <div id="<?php echo $boxe->name_clean; ?>Box" class="boxe <?php echo 'data'.$boxe->type ?>">
<?php include('boxe.php'); ?>
</div>
<?php endif; endwhile; ?>
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.less 2013-04-30 15:17:39 UTC (rev 4730)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.less 2013-04-30 19:41:42 UTC (rev 4731)
@@ -27,7 +27,7 @@
float: left;
a {
- font:20px "SourceSansPro",Arial;
+// font:20px "SourceSansPro",Arial;
display: inline-block;
margin-right: 20px;
padding: 0 10px;
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-account.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-account.less 2013-04-30 15:17:39 UTC (rev 4730)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-account.less 2013-04-30 19:41:42 UTC (rev 4731)
@@ -7,8 +7,47 @@
*/
+body#Page_create_account{
+
+
+ form {
+ fieldset{
+ margin-bottom:1em;
+ padding:0 2%;
+
+ legend{
+ border-bottom:1px solid #009FC2;
+ margin-left:0;
+ padding-left:2%;
+ width:96%;
+ }
+
+ p{
+ clear:both;
+ padding-left:2%;
+
+ span.inputvalue{
+ display: inline;
+ float: inherit;
+ white-space: normal;
+ }
+
+ span.messageStackError{
+ display: inline-block;
+ float:left;
+ text-align:left;
+ width:100%;
+ color:red;
+ }
+ }
+ }
+ }
+}
+
+
+
/*
* Adjust block article specific data product
*/
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-categorie.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-categorie.less 2013-04-30 15:17:39 UTC (rev 4730)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-categorie.less 2013-04-30 19:41:42 UTC (rev 4731)
@@ -13,19 +13,96 @@
/*
* Adjust block article specific data product
*/
-article.categorie{
+article{
- figure{
- display: block;
- float: right;
- width: 49%;
- padding-top:0.9em;
- text-align:center;
- background: url("../images/bg_product.png") 0px 0px no-repeat;
+ /*
+ * Detail One Categorie.
+ */
+ &.categorie{
+
+ figure{
+ display: block;
+ float: right;
+ width: 49%;
+ padding-top:0.9em;
+ text-align:center;
+ background: url("../images/bg_product.png") 0px 0px no-repeat;
+ }
+
+ div#headingCatTxt{
+ float: left;
+ width: 48%;
+ }
}
- div#headingCatTxt{
- float: left;
- width: 48%;
+
+
+ /*
+ * Section in listing
+ */
+ section{
+
+ // name of generic module
+ &.datacategorie{
+ .module {
+ .outerblock {
+ height: 158px;
+ }
+
+ .innerblock {
+ height: 135px;
+
+ p {
+ padding-bottom:0;
+
+ &.title{
+ height:21px;
+ }
+ }
+ }
+ }
+ }
}
+}
+
+
+/*
+ * sidebar --aside--
+ */
+aside{
+
+ section {
+ &.datacategorie{
+
+ ul{
+ margin-left: 12px;
+ padding-left: 12px;
+ list-style: square;
+ color: #0e9fc0;
+
+ li {
+ padding-top: 0;
+ padding-bottom: 14px;
+ border-bottom: 1px #0e9fc0 dotted;
+
+ a {
+ display: block;
+ text-decoration: none;
+ color: #000;
+ font-size: 16px;
+ font-variant: small-caps;
+
+ &:hover {
+ text-decoration: underline;
+ }
+ }
+
+ ul li{
+ border-bottom: none;
+ padding: 5px;
+ }
+ }
+ }
+ }
+ }
}
\ No newline at end of file
Added: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-content.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-content.less (rev 0)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-content.less 2013-04-30 19:41:42 UTC (rev 4731)
@@ -0,0 +1,94 @@
+/**
+ * @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ * @subpackage Template 2cShopHtml5Oscim
+ * @package osCSS-2 <www http://www.oscss.org>
+ * @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ * @encode UTF-8
+ */
+
+
+
+
+
+/*
+ * Adjust block article specific data product
+ */
+article{
+
+ /*
+ * Detail One Categorie.
+ */
+ &.content{
+
+ figure{
+ display: block;
+ float: right;
+ width: 49%;
+ padding-top:0.9em;
+ text-align:center;
+ background: url("../images/bg_product.png") 0px 0px no-repeat;
+ }
+
+ div#headingCatTxt{
+ float: left;
+ width: 48%;
+ }
+ }
+
+
+
+ /*
+ * Section in listing
+ */
+ section{
+
+ // name of generic module
+ &.datacontent{
+ .module {
+ .outerblock {
+ height: 158px;
+ }
+
+ .innerblock {
+ height: 135px;
+
+ p {
+ padding-bottom:0;
+
+ &.title{
+ height:21px;
+ }
+
+ &.preview {
+ font-size: 0.85em;
+ line-height: 1.2em;
+ padding: 0;
+ text-align: justify;
+ }
+ }
+ }
+ }
+ }
+ }
+}
+
+
+/*
+ * sidebar --aside--
+ */
+aside{
+
+ section {
+ &.datacontent{
+
+ p {
+ &.preview {
+ font-size: 0.85em;
+ line-height: 1.2em;
+ padding: 0 12px;
+ text-align: justify;
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
Added: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-order.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-order.less (rev 0)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-order.less 2013-04-30 19:41:42 UTC (rev 4731)
@@ -0,0 +1,423 @@
+/**
+ * @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ * @subpackage Template 2cShopHtml5Oscim
+ * @package osCSS-2 <www http://www.oscss.org>
+ * @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ * @encode UTF-8
+ */
+
+
+
+
+
+
+
+/*
+ * Specific In section checkout and cart
+ */
+body#Page_shopping_cart div#main-tpl,
+.Type_checkout div#main-tpl {
+ aside {
+ width:0;
+ display:none;
+ }
+
+ div#content {
+ width:100%;
+ padding-right:0;
+ padding-left:0;
+ }
+}
+
+
+
+
+
+/*
+ * Adjust block article specific data product
+ */
+article{
+
+ /*
+ * Detail One Categorie.
+ */
+ &.checkout{
+
+ h2{
+ margin-left:2%;
+ width:90%;
+ border-bottom:3px solid #009FC2;
+ }
+
+ h3{
+ margin-left:4%;
+ width:85%;
+ border-bottom:2px solid #009FC2;
+ }
+
+
+
+ .contentBox{
+ float:left;
+ width:48%;
+ padding:0.5em;
+
+
+
+ // payment method
+ .methodSelect{
+ float:none;
+ display:inline-block;
+ width:100%;
+ vertical-align:middle;
+ height:60px;
+
+ label{
+ width:90%;
+
+ .methodName{
+
+ float:right;
+ margin-top: 25px;
+ width:80%;
+
+ }
+ .methodIcon{
+ float:left;
+
+ img{
+ max-width:100px;
+ max-height:60px;
+ }
+ }
+ }
+ input[type=radio]{
+ float:right;
+ margin-top: 25px;
+ }
+ }
+
+
+ // shipping method
+ .nameMethod{
+ display:inline-block;
+ width:100%;
+
+ .methodTitle{
+ display:inline-block;
+ width:20%;
+ }
+
+ .methodDateDelivery{
+ display:inline-block;
+ width:210px;
+ }
+
+ .methodPrice{
+ display:inline-block;
+ width:50px;
+ }
+
+ input[type=radio]{
+ float:right;
+ }
+ }
+ }
+
+
+ div.paymentInformation{
+ clear:both;
+ width:100%;
+ padding-top:1em;
+ }
+
+ .shippingComment{
+ clear:both;
+ }
+ }
+
+}
+
+
+
+/* -- panier -- */
+
+.invoice {background: url("../images/bg_product.png") 0px 0px no-repeat;}
+
+/*checkout */
+div.orderProcess p.checkoutComment {clear:both;}
+div.orderProcess fieldset {clear:both;}
+
+
+
+
+
+/*
+ * Segment sous tot in cart page
+ */
+.SubTotal ul{
+ float:right;
+ padding:2em 1em 2em 0 ;
+ height:50px;
+ list-style:none;
+ background: url("../images/bg_soustotal.png") top right no-repeat;
+
+ li{
+ span{
+ &.value{
+ display:inline-block;
+ width:150px;
+ font-size:1.5em;
+ text-align:right;
+
+ }
+
+ &.text{
+ display:inline-block;
+ width:100px;
+ font-size:0.8em;
+ color:#888;
+ }
+ }
+ }
+}
+
+// ul.cart{
+// font-size:12px;
+// font-weight:bold;
+// color:#000;
+//
+// li{
+// font-size:10px;
+// font-weight:bold;
+//
+// a{color:#000;font-size:10px;}
+// }
+// }
+
+
+/* -- panier -- */
+
+
+
+.block {clear:both;margin-top:100px;}
+
+
+
+/* panier short */
+div#shopping_cart_shortBox {
+ position:absolute;
+ height:100px;
+ top:45px;
+ width:400px;
+ font-size:0.5em;
+
+ section#Box-shopping_cart_short{
+ width:60%;
+
+ header{
+ position:absolute;
+ }
+
+ h3 {
+ padding:0;
+ margin-bottom:10px;
+ font-size:12px;
+ }
+
+ span {
+ padding:0;
+ margin-bottom:10px;
+ padding:0 2em;
+ }
+
+ .cart_details{
+ width:100%;
+ float:right;
+ padding-left:0.5em;
+
+ .cart_icon{
+ position:relative;
+ top:20px;
+ }
+ a {color:#000;font-size:10px;}
+ }
+
+ ul {
+ float:inherit;
+ list-style:none;
+ padding:0;
+
+ li{
+ font-size:12px;
+ }
+ }
+
+ }
+
+
+}
+
+
+
+/*
+ * Specific display CGU/CGV
+ */
+
+div.CguView {
+ width:100%;
+ overflow:auto;
+ height:150px;
+ text-align: justify;
+ border:1px solid black;
+ background:white;
+}
+
+
+
+
+/*
+ * etapes de la commande - barre verte du haut --
+ */
+div#progress {
+ margin: 0 auto;
+ width:650px;
+
+
+ a,
+ span {
+ color:#847676;
+ text-decoration:none;
+
+ }
+
+ ul.checkoutBar {
+ margin:20px 0 0 0 ;
+ padding:0;
+
+
+ li{
+ display:inline-block;
+ height:50px;
+ margin:0 0 0 -3px;
+ padding:0;
+ width:122px;
+
+ a,
+ span{
+ position:relative;
+ display:inline-block;
+ top:-20px;
+ left:45px;
+ width:150px;
+ text-align:center;
+ white-space:nowrap;
+ }
+
+ &.start{
+ width:50px;
+
+ a,
+ span{
+ left:-30px;
+ width:150px;
+ }
+ }
+
+ &.end{
+ width:139px;
+
+ a,
+ span{
+ left:30px;
+ width:150px;
+ }
+ }
+
+ &.currentCheckoutBar{
+ width:139px;
+
+ a,
+ span{
+ color:#b3e050;
+ }
+ }
+ }
+ }
+}
+
+
+
+
+/*
+ *
+ */
+table{
+
+ &.invoice{
+ clear:both;
+ background:none;
+ margin:10px 1%;
+ width: 98%;
+
+ &.invoiceDetails,
+ &.invoiceTotal,
+ &.invoiceHistory{
+ margin-top:0;
+ margin-bottom:0;
+ border-collapse:collapse;
+ border: 1px solid gray;
+ }
+
+ &.invoiceTotal {
+ border-top: none;
+ width:60%;
+ float:right;
+ }
+
+ &.invoiceHistory{
+ position:relative;
+ top:10px;
+ }
+
+
+ thead th{
+ margin:10px 0;
+ background:gray;
+ border-left: 1px solid gray;
+ }
+
+ tbody td{
+ border-left: 1px solid gray;
+
+ &.totttc {
+ width:84px;
+ text-align:right;
+ }
+ }
+
+ .cart-header {
+ padding:0.5em;
+ background:#eee;border:1px solid #fff;
+
+ }
+ .cart-line {
+ padding:0.5em;
+ border:1px solid #eee;
+
+ input{
+ padding:0.5em;
+ border:1px solid #eee;font-weight:bold;
+ }
+ .puht {
+ font-weight:bold;font-size:0.8em;
+ }
+ .totttc {
+ font-weight:bold;font-size:1.2em;
+ }
+ }
+
+ }
+
+}
+
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-product.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-product.less 2013-04-30 15:17:39 UTC (rev 4730)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-product.less 2013-04-30 19:41:42 UTC (rev 4731)
@@ -9,6 +9,34 @@
+/*
+ * Specific block price
+ */
+// p#price_master,
+.price{
+ font-family:"SourceSansPro",Arial;
+ font-size:1.7em;
+ font-weight:bold;
+ color:black;
+ padding:0 5px;
+// background:;
+// border:1px solid #0E9FC0;
+// .border-radius(5px, 5px, 5px, 5px);
+
+ .tax_symbol {
+ font-size:0.4em;
+ }
+
+ del {
+ font-size:0.6em;
+ }
+ del:after {
+ content: "\D";
+ }
+}
+
+
+
form input[type=text]#products_quantity,
form input[type=text].CartQty{
width:25px;
@@ -20,72 +48,153 @@
/*
* Adjust block article specific data product
*/
-article.product{
-
- header{
+article{
+ &.product{
- a {
- font-size: 14px;
- font-style: italic;
- color: #777;
+ header{
- &:hover {
- text-decoration: none;
- color: #000;
+ a {
+ font-size: 14px;
+ font-style: italic;
+ color: #777;
+
+ &:hover {
+ text-decoration: none;
+ color: #000;
+ }
}
}
- }
-
- figure{
- display: block;
- float: left;
- width: 50%;
- p{
- text-align:center;
+ figure{
+ display: block;
+ float: left;
+ width: 50%;
- a {
- color: #0e9fc0;
+ p{
+ text-align:center;
- &:hover {
- color: #000;
+ a {
+ color: #0e9fc0;
+
+ &:hover {
+ color: #000;
+ }
}
}
- }
- ul{
- list-style:none;
+ ul{
+ list-style:none;
+
+ li{
+ float:left;
+ }
+ }
- li{
- float:left;
+ div#productImagelistMini{
+ height:70px;
}
+
+ div#productImage {
+ height:200px;
+
+ }
}
- div#productImagelistMini{
- height:70px;
+
+ p#price_master {
+ font-family:"SourceSansPro",Arial;
+ font-weight:bold;
+ font-size:2em;
+
+ del{
+ font-size:0.6em;
+ }
+ del:after {
+ content: "\D";
+ }
}
- div#productImage {
- height:200px;
+ div.in_tabs{
+ clear:both;
+ p {
+ padding:2em;
+ color: #555;
+ font-size: 0.8em;
+ }
}
}
- .productPrice {
- font-weight:bold;
- font-size:2em;
-
- }
- div.in_tabs{
- clear:both;
+ /*
+ * Section in listing
+ */
+ section{
- p {
- padding:2em;
- color: #555;
- font-size: 0.8em;
+ // name of generic module
+ &.dataproduct{
+ .module {
+// .outerblock {
+// height: 158px;
+// }
+
+ .innerblock {
+// height: 135px;
+
+ p {
+ padding-bottom:0;
+
+ &.price,
+ &.title{
+ height:42px;
+ }
+ }
+
+ .title,
+ .innerblock-more {
+ display:none;
+ }
+ .price {
+ display:block;
+ }
+
+ &:hover{
+
+ .title,
+ .innerblock-more {
+ display:block;
+ }
+
+ .price {
+ display:none;
+ }
+ }
+ }
+ }
}
}
}
+
+
+
+/*
+ * sidebar --aside--
+ */
+aside{
+
+ section {
+ &.dataproduct{
+
+ p {
+ &.preview {
+ font-size: 0.85em;
+ line-height: 1.2em;
+ padding: 0 12px;
+ text-align: justify;
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/datatype-generic.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/datatype-generic.less 2013-04-30 15:17:39 UTC (rev 4730)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/datatype-generic.less 2013-04-30 19:41:42 UTC (rev 4731)
@@ -6,11 +6,36 @@
* @encode UTF-8
*/
-article h1/*,
-.product h2,
-.product h1*/ {
+
+
+/*
+ * Structure generic
+ * SubSection is in article-xxx.less
+ */
+
+div#main-tpl {
+ clear:both;
+
+ div#content {
+ float: right;
+ width: 74%;
+ margin:10px 0 10px 0;
+ padding:0 0 0 0;
+ background:#fff url("../images/bg_content.jpg") no-repeat top right;
+ .border-radius(5px,5px,5px,5px);
+
+ /*
+ * ...
+ */
}
+
+ /*
+ * SubSection is --aside-- (generic.less)
+ */
+}
+
+
/* article */
article {
@@ -50,25 +75,70 @@
clear:both;
float:none;
- &.listing_cat{
- .module {
- .outerblock {
- height: 158px;
- }
+ /*
+ * View specificity in sub section data
+ */
+ }
+}
+
+
+
+
+
+/*
+ * sidebar --aside--
+ */
+aside{
+ float: left;
+ width: 26%;
+ margin:0;
+ padding:0;
+
+ section {
+ margin: 10px 12px 0 0;
+ padding: 0 0 10px 0;
+ background-color: #fff;
+ .border-radius(5px,5px,5px,5px);
+
+ header h3 {
+ padding-left: 10px;
+ margin: 10px 0px;
+ background: url("../images/introbkg.png") repeat-x scroll bottom right #778899;
+ color:#fff;
+
+ .border-radius(5px,5px,5px,5px);
+ }
+
+ // h3 {
+ // padding-left: 10px;
+ // margin: 2px 0px;
+ // text-align:center;
+ // // background: url("../images/introbkg.png") repeat-x scroll bottom right #778899;
+ // // color:#fff;
+ //
+ // .border-radius(5px,5px,5px,5px);
+ // }
+
+ ol,
+ ul{
+ margin-left: 12px;
+ padding-left: 12px;
+ list-style: disc;
+ color: #0e9fc0;
- .innerblock {
- height: 135px;
+ li {
+ padding-top: 0;
- p {
- padding-bottom:0;
-
- &.title{
- height:21px;
- }
+ a {
+ color: #000;
+ font-size: 1em;
}
}
}
- }
+
+ div.inner-boxe{
+ text-align:center;
+ }
}
}
@@ -76,10 +146,6 @@
-
-
-
-
/*
* Detail --Row module--
*/
@@ -111,7 +177,7 @@
}
.outerblock {
- height: 245px;
+ height: 197px;
padding: 12px;
width: 90%;
font-size: 1em;
@@ -120,8 +186,9 @@
}
.innerblock {
- height: 220px;
+ height: 170px;
padding: 12px;
+ border:1px solid transparent;
font-size: 1em;
text-align:center;
background: url("../images/bg_product_list.png") 0px 0px no-repeat;
@@ -139,6 +206,7 @@
padding-bottom:0.2em;
&.title{
+ padding-top:0;
height:41px;
a{
@@ -183,7 +251,17 @@
}
}
+
+
+
+ &:hover{
+ text-decoration:none;
+ border:1px solid @bg_input_border_hover;
+// background: @bg_input_hover ;
+ }
}
-}
\ No newline at end of file
+}
+
+
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/forms.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/forms.less 2013-04-30 15:17:39 UTC (rev 4730)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/forms.less 2013-04-30 19:41:42 UTC (rev 4731)
@@ -32,7 +32,16 @@
form{
padding:0;
- label { display: inline-block; font-weight: bold; line-height: 18px; margin: 5px 5px 5px 0; padding: 0 0 2px; text-align: left; min-width: 20%;}
+ label {
+ display: inline-block;
+ font-weight: bold;
+ line-height: 18px;
+ margin: 5px 5px 5px 0;
+ padding: 0 0 2px;
+ text-align: left;
+ min-width: 35%;
+
+ }
fieldset legend { color:#666666; font-size:(@font_size*1.2); font-style:italic; font-weight:bold; padding:0 5px 0 20px;}
@@ -40,82 +49,85 @@
p{
- input[type="checkbox"] { float:right; }
+ input[type="checkbox"] { margin: 0 0 0 50%; }
select,
+ input[type="password"],
input[type="text"] {
- margin:5px 15px;
+ margin:5px 0;
}
select{
padding:1px 0 0 0;
height:(@lineheight * 1.3);
line-height:(@lineheight * 1.3);
}
- }
- p.new_product_img {
- float:left;
- padding:5px;
- margin : 0 auto;
- text-align:center;
- width:98%;
- border:1px solid @color_012;
- .border-radius(5px,5px,5px,5px);
- img{
- margin:auto;
- max-width: 300px;
- }
+ span.inputvalue{display:block; float:left;white-space: nowrap;}
}
+// p.new_product_img {
+// float:left;
+// padding:5px;
+// margin : 0 auto;
+// text-align:center;
+// width:98%;
+// border:1px solid @color_012;
+// .border-radius(5px,5px,5px,5px);
+//
+// img{
+// margin:auto;
+// max-width: 300px;
+// }
+// }
ul.ui-tabs-nav {display: inline-block; margin: 0 ; padding: 1px; width: 99%;}
- .block_form {
- .block_input{
- text-shadow:0 1px 0 #fff;
- width:94.9%;
- margin:0 1px;
- display:inline-block;
- text-align: left;
- background:#C9C9C9;
- float:left;
- line-height:18px;
- padding:1px 5px 1px 5px;
- border:1px solid @color_014;
- .border-radius(5px);
- .rounded(5px);
- .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
-
-
- span.value_edit {clear:both;display:inline-block; width:100%;}
-
- br,
- span.value_edit br{display:none;}
-
- label br {display:inline-block;}
-
- span.edit-input,
- span.value_edit span.edit-input{float:left; display:inline-block; padding:0 12px;}
-
- span.edit-input{
- white-space:nowrap;
-
- input{float: left;}
-
- .edit-input-value-alternate {display:inline-block;width:20px; height: 20px;margin: 0 12px;}
- .edit-input-value {padding-left:12px;}
- /* remplacement true /false par icone */
- .edit-input-value.Val-true ,
- .edit-input-value.Val-false {font-size:0;}
- .edit-input-value-alternate.Val-true {background:transparent url("../../img/1/check.png") left top no-repeat; }
- .edit-input-value-alternate.Val-false {background:transparent url("../../img/1/busy.png") left top no-repeat;}
- }
- }
-
- .block_input.tirroir {float:none;}
-
- .tabs_lang{ float:left;}
- }
+// .block_form {
+// .block_input{
+// text-shadow:0 1px 0 #fff;
+// width:94.9%;
+// margin:0 1px;
+// display:inline-block;
+// text-align: left;
+// background:#C9C9C9;
+// float:left;
+// line-height:18px;
+// padding:1px 5px 1px 5px;
+// border:1px solid @color_014;
+// .border-radius(5px);
+// .rounded(5px);
+// .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
+//
+//
+// span.value_edit {clear:both;display:inline-block; width:100%;}
+//
+// br,
+// span.value_edit br{display:none;}
+//
+// label br {display:inline-block;}
+//
+// span.edit-input,
+// span.value_edit span.edit-input{float:left; display:inline-block; padding:0 12px;}
+//
+// span.edit-input{
+// white-space:nowrap;
+//
+// input{float: left;}
+//
+// .edit-input-value-alternate {display:inline-block;width:20px; height: 20px;margin: 0 12px;}
+// .edit-input-value {padding-left:12px;}
+// /* remplacement true /false par icone */
+// .edit-input-value.Val-true ,
+// .edit-input-value.Val-false {font-size:0;}
+// .edit-input-value-alternate.Val-true {background:transparent url("../../img/1/check.png") left top no-repeat; }
+// .edit-input-value-alternate.Val-false {background:transparent url("../../img/1/busy.png") left top no-repeat;}
+// }
+// }
+//
+// .block_input.tirroir {float:none;}
+//
+// .tabs_lang{ float:left;}
+// }
@@ -133,9 +145,9 @@
select,
input[type="text"] {
- min-width:62%;
+ min-width:52%;
display:inline-block;
-
+/*
&.w_5 {
min-width:5%;
width:5%;
@@ -151,18 +163,18 @@
&.w_30 {
min-width:30%;
width:30%;
- }
+ }*/
}
- input.price,
+/* input.price,
input[type=text].price,
input[type=hidden].price{
width :120px;
min-width :120px;
text-align : right;
}
+ */
-
select option {display:block; float:none;clear:both;width:100%}
label { line-height: 18px; margin-right: 10px; display:inline-block; padding: 0 0 2px 0;}
@@ -182,36 +194,36 @@
}
}
- .block_field {
- text-shadow:0 1px 0 #fff;
- width:98.9%; margin:2px ;
- display:inline-block;
- text-align: left;
- padding: 5px 3px;
- float:left;
-
- .tabs,
- .tabs_lang{
- margin:0 2px ;
- display:inline-block;
- text-align: left;
- padding:0 5px;
- float:left;
- }
-
- &.tabs_lang ul,
- .tabs_lang ul.ui-tabs-nav,
- .tabs_lang ul.ui-tabs-panel{display: inline-block; padding: 1px; width: 100%;}
- }
+// .block_field {
+// text-shadow:0 1px 0 #fff;
+// width:98.9%; margin:2px ;
+// display:inline-block;
+// text-align: left;
+// padding: 5px 3px;
+// float:left;
+//
+// .tabs,
+// .tabs_lang{
+// margin:0 2px ;
+// display:inline-block;
+// text-align: left;
+// padding:0 5px;
+// float:left;
+// }
+//
+// &.tabs_lang ul,
+// .tabs_lang ul.ui-tabs-nav,
+// .tabs_lang ul.ui-tabs-panel{display: inline-block; padding: 1px; width: 100%;}
+// }
- .block_input label.inline { white-space:nowrap; width: 20%;}
-
- .edit.col_right .block_input{
- width:95%;
-
- label{width:20%;text-align:left;font-weight:bold}
- }
-
+// .inputBlock label.inline { white-space:nowrap; width: 20%;}
+//
+// .edit.col_right .block_input{
+// width:95%;
+//
+// label{width:20%;text-align:left;font-weight:bold}
+// }
+//
.block_input .hasDatepicker{ margin:0; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;line-height:30px; min-width:0;}
.input-multi input[type="checkbox"],
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/generic.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/generic.less 2013-04-30 15:17:39 UTC (rev 4730)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/generic.less 2013-04-30 19:41:42 UTC (rev 4731)
@@ -7,12 +7,58 @@
*/
+.font-face("SourceSansPro", "../font/SourceSansPro-It");
+
+/* supp du fond sur iframe pour block wisiwing */
+body.mceContentBody ,
+iframe#wysiwygmessage{ background:#f0f0ee; clear:both; width:650px; }
+body.mceContentBody .gabarit{border: 1px solid black; background:white; margin:5px 0;}
+/* Gabarit pour edition */
+.central {float:left; width:100%; }
+.colonne_gd{ width:330px;}
+.colonne_small{ width:200px;}
+.col_equal { width:270px;}
+.fright{ float:right; }
+.fleft{float:left;}
+.tcenter {text-align:center}
+.tright {text-align:right}
+
+
+
+
+/* reset */
+* { margin: 0; padding: 0; }
+br.clear {height:0; width:0;}
+
+
+/* render html5 elements as block */
+header,
+footer,
+section,
+aside,
+nav,
+article,
+nl{ display: block; }
+
+
+
+html:lang(fr-ca) { quotes: '« ' ' »' }
+html:lang(de) { quotes: '»' '«' '\2039' '\203A' }
+:lang(fr) > Q { quotes: '« ' ' »' }
+:lang(de) > Q { quotes: '»' '«' '\2039' '\203A' }
+
+
+
+
+
+
+
/* standard body */
body {
margin: 0 auto;
width: 960px;
- font: 14px/20px "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
+ font: 14px/20px Verdana, Arial, sans-serif;
background: #eee;
}
@@ -25,16 +71,19 @@
padding: 20px 0;
color: #FFF;
font-size: 28px;
+// font-family:"SourceSansPro",Arial;
}
h2 {
padding: 20px 0;
font-size: 24px;
+// font-family:"SourceSansPro",Arial;
}
h3 {
padding: 10px 0;
font-size: 18px;
+// font-family:"SourceSansPro",Arial;
}
ul,ol {
@@ -84,113 +133,19 @@
}
-
-
-
-
-
-
-
-
-
/*
- * sidebar --aside--
+ *
*/
-aside{
- float: left;
- width: 26%;
- margin:0;
- padding:0;
+table{
+ width:100%;
- section {
- margin: 10px 12px 0 0;
- padding: 0 0 10px 0;
- background-color: #fff;
- .border-radius(5px,5px,5px,5px);
-
- header h3 {
- padding-left: 10px;
- margin: 10px 0px;
- background: url("../images/introbkg.png") repeat-x scroll bottom right #778899;
- color:#fff;
-
- .border-radius(5px,5px,5px,5px);
- }
-
-// h3 {
-// padding-left: 10px;
-// margin: 2px 0px;
-// text-align:center;
-// // background: url("../images/introbkg.png") repeat-x scroll bottom right #778899;
-// // color:#fff;
-//
-// .border-radius(5px,5px,5px,5px);
-// }
-
- ul {
- margin-left: 12px;
- padding-left: 12px;
- list-style: square;
- color: #0e9fc0;
-
- li {
- padding-top: 0;
- padding-bottom: 14px;
- border-bottom: 1px #0e9fc0 dotted;
-
- a {
- display: block;
- text-decoration: none;
- color: #000;
- font-size: 16px;
- font-variant: small-caps;
-
- &:hover {
- text-decoration: underline;
- }
- }
-
- ul li{
- border-bottom: none;
- padding: 5px;
- }
- }
- }
-
- div.inner-boxe{
- text-align:center;
- }
- }
}
-/*
- * Specific dispay CGU/CGV
- */
-div.CguView {
- width:100%;
- overflow:auto;
- height:150px;
- text-align: justify;
- border:1px solid black;
- background:white;
-}
-/*
- * Specific block price
- */
-.price{
- font-size:1.2em;
- font-weight:bold;
-
- .tax_symbol {
- font-size:0.4em;
- }
-}
-
/*
* Paginate
*/
@@ -218,7 +173,7 @@
background: none repeat scroll 0 0 padding-box #FFFFFF;
border: 1px solid #ACAAAC;
.border-radius(5px,5px,5px,5px);
- font-family: Verdana,Arial,sans-serif;
+// font-family: Verdana,Arial,sans-serif;
font-size: 14.3px;
font-weight:normal;
color:black;
@@ -261,7 +216,7 @@
background: none repeat scroll 0 0 padding-box #FFFFFF;
border: 1px solid #ACAAAC;
.border-radius(5px,5px,5px,5px);
- font-family: Verdana,Arial,sans-serif;
+// font-family: Verdana,Arial,sans-serif;
font-size: 14.3px;
font-weight:normal;
color:black;
@@ -300,55 +255,5 @@
-/*
- *
- */
-table{
- width:100%;
-
- &.invoice{
- clear:both;
- background:none;
- margin:10px 1%;
- width: 98%;
-
- &.invoiceDetails,
- &.invoiceTotal,
- &.invoiceHistory{
- margin-top:0;
- margin-bottom:0;
- border-collapse:collapse;
- border: 1px solid gray;
- }
-
- &.invoiceTotal {
- border-top: none;
- width:60%;
- float:right;
- }
-
- &.invoiceHistory{
- position:relative;
- top:10px;
- }
-
-
- thead th{
- margin:10px 0;
- background:gray;
- border-left: 1px solid gray;
- }
-
- tbody td{
- border-left: 1px solid gray;
-
- &.totttc {
- width:84px;
- text-align:right;
- }
- }
- }
-
-}
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2013-04-30 15:17:39 UTC (rev 4730)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2013-04-30 19:41:42 UTC (rev 4731)
@@ -13,9 +13,6 @@
-fieldest,
-fieldset.ListFilterType,
-fieldset.manufacturerFilter {border:0;font-size:0.9em;padding:0.5em}
@@ -23,37 +20,3 @@
-
- /* end of column configuration */
-
-
-
-
- /* -- panier -- */
-
- .invoice {background: url("../images/bg_product.png") 0px 0px no-repeat;}
- .cart-header {background:#eee;border:1px solid #fff;}
- .cart-line {border:1px solid #eee;}
- .cart-line input{border:1px solid #eee;font-weight:bold;}
- .cart-line .puht {font-weight:bold;font-size:0.8em;}
- .cart-line .totttc {font-weight:bold;font-size:1.2em;}
- #TotCart{list-style:none;background: url("../images/bg_soustotal.png") top right no-repeat; -moz-border-radius: 5px; -webkit-border-radius: 5px;}
- #TotCart li span.value{font-size:1.5em;text-align:right;}
- #TotCart li span.text{font-size:0.8em;color:#888;}
-
- /* panier short */
- #shopping_cart_shortBox {font-size:0.5em;}
-
- #Box-shopping_cart_short h3 {font-size:12px;}
- #Box-shopping_cart_short span {font-size:12px;}
- #Box-shopping_cart_short ul,
- #Box-shopping_cart_short ul li ul {list-style:none;}
- #Box-shopping_cart_short ul li ul,
- #Box-shopping_cart_short ul li,
- ul.cart{font-size:12px;font-weight:bold;color:#000;}
- #Box-shopping_cart_short ul li span,
- ul.cart li{font-size:10px;font-weight:bold;}
- ul.cart a,
- .cart_details a {color:#000;font-size:10px;}
-
-
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/master.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/master.less 2013-04-30 15:17:39 UTC (rev 4730)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/master.less 2013-04-30 19:41:42 UTC (rev 4731)
@@ -48,86 +48,23 @@
@import "BottomTop.less";
+
@import "datatype-generic.less";
+
@import "article-product.less";
@import "article-categorie.less";
+@import "article-content.less";
+@import "article-order.less";
+
@import "article-account.less";
-.font-face("SourceSansPro", "../font/SourceSansPro-It");
-/* reset */
-* { margin: 0; padding: 0; }
-br.clear {height:0; width:0;}
-/* render html5 elements as block */
-header,
-footer,
-section,
-aside,
-nav,
-article,
-nl{ display: block; }
-del {font-size:0.6em;}
-html:lang(fr-ca) { quotes: '« ' ' »' }
-html:lang(de) { quotes: '»' '«' '\2039' '\203A' }
-:lang(fr) > Q { quotes: '« ' ' »' }
-:lang(de) > Q { quotes: '»' '«' '\2039' '\203A' }
-
-
-
-
-
-
-/*
- * Structure generic
- */
-
-div#main-tpl {
- clear:both;
-
- div#content {
- float: right;
- width: 74%;
- margin:10px 0 10px 0;
- padding:0 0 0 0;
- background:#fff url("../images/bg_content.jpg") no-repeat top right;
- .border-radius(5px,5px,5px,5px);
-
- /*
- * SubSection is in dadatype-xxx.less
- */
- }
-
- /*
- * SubSection is --aside-- (generic.less)
- */
-}
-
-
-
-
-
-/*
- * Specific In section checkout and cart
- */
-body#Page_shopping_cart div#main-tpl,
-.Type_checkout div#main-tpl {
- aside {
- width:0;
- display:none;
- }
-
- div#content {
- width:100%;
- padding-right:0;
- padding-left:0;
- }
-}
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php 2013-04-30 15:17:39 UTC (rev 4730)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php 2013-04-30 19:41:42 UTC (rev 4731)
@@ -144,14 +144,23 @@
case 'content':
// $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
$this->oscss_boxes->_add('categories', 'sidebar');
+ //
+ $this->oscss_boxes->_add('recently_viewed_content', 'sidebar', array('cache'=>false));
break;
case 'product':
-// $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
$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;
@@ -160,8 +169,16 @@
case 'categorie':
// $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
$this->oscss_boxes->_add('categories', 'sidebar');
- $this->oscss_boxes->_add('manufacturers', 'sidebar');
+// $this->oscss_boxes->_add('manufacturers', 'sidebar');
+ //
+ $this->oscss_boxes->_add('recently_viewed', 'sidebar', array('cache'=>false));
+ // required specials exts
+ $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+ //
+ $this->oscss_boxes->_add('whats_new', 'sidebar', array('cache'=>false));
+
+ $this->oscss_boxes->_add('very_viewed', 'sidebar', array('cache'=>false));
$load->module = 'child';
@@ -173,7 +190,10 @@
default:
$this->oscss_boxes->_add('categories', 'sidebar');
+ //
+ $this->oscss_boxes->_add('recently_viewed', 'sidebar', array('cache'=>false));
$this->oscss_boxes->_add('whats_new', 'sidebar', array('cache'=>false));
+ // required specials exts
$this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/boxes/categories.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/boxes/categories.php 2013-04-30 15:17:39 UTC (rev 4730)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/boxes/categories.php 2013-04-30 19:41:42 UTC (rev 4731)
@@ -40,5 +40,9 @@
// $osCSS_Cache->writeBuffer($s);
// }
// else $s= $osCSS_Cache->getCache();
- $array=array('title'=>__('categories menu'),'content'=>tep_output_string_protected($s,false,true));
+ $array=array(
+ 'type'=>'categorie',
+ 'title'=>__('categories menu'),
+ 'content'=>tep_output_string_protected($s,false,true)
+ );
?>
\ No newline at end of file
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2013-04-30 15:17:39 UTC (rev 4730)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2013-04-30 19:41:42 UTC (rev 4731)
@@ -12,158 +12,30 @@
* Le fichier habillage doit contenir l'ensemble des elements de style , couleur , mise en forme
* La totalite des contenu de type structure (position des boite et structuration du flux) doit ce situer dans ce fichier
*/
-@import url("Css/habillage.css");
+/* @import url("Css/habillage.css"); */
/**
* S tyle commun et permanent. **
* Ce fichier est appelé dans le tiny du backoffice
*/
+fieldest,
+fieldset.ListFilterType,
+fieldset.manufacturerFilter {border:0;font-size:0.9em;padding:0.5em}
-/* supp du fond sur iframe pour block wisiwing */
-body.mceContentBody ,
-iframe#wysiwygmessage{ background:#f0f0ee; clear:both; width:650px; }
-body.mceContentBody .gabarit{border: 1px solid black; background:white; margin:5px 0;}
-/* Gabarit pour edition */
-.central {float:left; width:100%; }
-.colonne_gd{ width:330px;}
-.colonne_small{ width:200px;}
-.col_equal { width:270px;}
-.fright{ float:right; }
-.fleft{float:left;}
-.tcenter {text-align:center}
-.tright {text-align:right}
-/* Generalite*/
-
-
-
-
-
-
-
-
-
-
-/* .navBt, */
-
-
/* Standard width*/
#main_container {width:960px;}
-
-
-
-
-/* Hx tags */
-
-
-
-
-
-
-
-
-/* form p{width:100%;display:block; float:left;} */
-form label {width:25%; /*display:block; float:left;padding:0 1em;*/}
-form span.inputvalue{display:block; float:left;white-space: nowrap;}
-/*form select,
-form input[type=checkbox] ,
-form input[type=radio] ,
-form input[type=password] ,
-form input[type=text] {width:250px;}*/
-
-
-
-
-
-/* end of column configuration */
-
-
-
-
-
-/* #headingCatImg {height:220px;} */
-
-
-
-
-
-
-
-
-/* #productDescription p { padding:2em;color: #555;font-size: 0.8em;} */
-
-
-/* article.product.single .prod_box_big {padding:2em; clear:both;} */
-/* -- panier -- */
-
-.cart-header {padding:0.5em;}
-.cart-line {padding:0.5em;}
-.cart-line input{padding:0.5em;}
-#TotCart{float:right; padding:2em 0 ; height:50px;}
-#TotCart li span.value{display:inline-block;width:150px;}
-#TotCart li span.text{display:inline-block;width:100px;}
-.block {clear:both;margin-top:100px;}
-/* a.link {padding: 2em; } */
-
-
-/* panier short */
-#shopping_cart_shortBox {position:absolute;height:100px;top:45px;width:400px;}
-
-#Box-shopping_cart_short h3 {padding:0;margin-bottom:10px;}
-#Box-shopping_cart_short span {padding:0;margin-bottom:10px;padding:0 2em;}
-#Box-shopping_cart_short *,
-.cart_details * {float:left;padding-left:0.5em;}
-#Box-shopping_cart_short ul,
-#Box-shopping_cart_short ul li ul {float:none;list-style:none;}
-/* #Box-shopping_cart_short ul li ul,#Box-shopping_cart_short ul li,ul.cart{float:left;} */
-
-
-/*box header*/
-
#Box-currencies {display:none;}
-/*checkout */
-div.orderProcess p.checkoutComment {clear:both;}
-div.orderProcess fieldset {clear:both;}
-
-
-/* Account page */
-
-
-
-/* etapes de la commande - barre verte du haut --*/
-div#progress { margin: 0 auto; width:650px}
-ul.checkoutBar { margin:20px 0 0 0 ;padding:0;}
-ul.checkoutBar li{/*background:url("images/progress_empty.gif") no-repeat scroll right top transparent;*/ display:inline-block; height:50px; margin:0 0 0 -3px; padding:0; width:122px;}
-ul.checkoutBar li a,
-ul.checkoutBar li span{position:relative; display:inline-block; top:-20px; left:45px; width:150px; text-align:center; white-space:nowrap;}
-/* ul.checkoutBar li.barCheck{background:url("images/progress.gif") no-repeat scroll right 2px transparent; }*/
-
-ul.checkoutBar li.start{/*background:url("images/progress_start.gif") no-repeat scroll right top transparent;*/ width:50px;}
-ul.checkoutBar li.start a,
-ul.checkoutBar li.start span{left:-30px; width:150px; }
-ul.checkoutBar li.end{/*background:url("images/progress_end.gif") no-repeat scroll right 2px transparent;*/ width:139px;}
-ul.checkoutBar li.end a,
-ul.checkoutBar li.end span{left:30px; width:150px; }
-
-li.barCheck a,
-li.barCheck span {color:#847676; text-decoration:none}
-
-li.currentCheckoutBar a,
-li.currentCheckoutBar span{color:#b3e050;}
-
-li.end.currentCheckoutBar {/*background:url("images/progress_end_full.gif") no-repeat scroll right 2px transparent;*/ width:139px;}
-
-
/* Slider */
#slider ul li {width:960px;
height:220px;
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/template.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/template.php 2013-04-30 15:17:39 UTC (rev 4730)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/template.php 2013-04-30 19:41:42 UTC (rev 4731)
@@ -4,7 +4,7 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 04/03/2012, 21:54
+ @date 26/04/2013, 21:54
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@@ -64,7 +64,7 @@
<?php if($load->module !='child') : ?>
<?php /* Force draw here content module load by require */ ?>
<?php while($themodule=templ_draw_list('type=modules&pile=center')): /** Appel des module (new_products, product_listing ...) */ ?>
- <section id="<?php echo $themodule->id ?>" class="<?php echo $themodule->css_class; ?> ">
+ <section id="<?php echo $themodule->id ?>" class="<?php echo $themodule->css_class.' data'.$themodule->module_db->type; ?> ">
<?php include($page->the_var('PathChildGab').'module.php'); ?>
</section>
<?php endwhile; ?>
@@ -98,9 +98,9 @@
<h3 class="content title <?php echo $language ;?>"><?php echo ''; ?></h3>
</header>
<?php while($themodule=templ_draw_list('type=modules&pile=center')): /** Appel des module (new_products, product_listing ...) */ $load->module='child' ?>
- <section id="<?php echo $themodule->id ?>" class="<?php echo $themodule->css_class; ?> ">
- <?php include($page->the_var('PathChildGab').'module.php'); ?>
- </section>
+ <section id="<?php echo $themodule->id ?>" class="<?php echo $themodule->css_class.' data'.$themodule->module_db->type; ?> ">
+ <?php include($page->the_var('PathChildGab').'module.php'); ?>
+ </section>
<?php endwhile; ?>
</article>
<?php endif; ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-04-30 15:17:43
|
Revision: 4730
http://sourceforge.net/p/oscss/svn/4730
Author: oscim
Date: 2013-04-30 15:17:39 +0000 (Tue, 30 Apr 2013)
Log Message:
-----------
Fix no display if not title in row
Modified Paths:
--------------
branches/2.1.1/catalog/common/classes/datatype_drivers/Data_content.php
Modified: branches/2.1.1/catalog/common/classes/datatype_drivers/Data_content.php
===================================================================
--- branches/2.1.1/catalog/common/classes/datatype_drivers/Data_content.php 2013-04-28 19:48:08 UTC (rev 4729)
+++ branches/2.1.1/catalog/common/classes/datatype_drivers/Data_content.php 2013-04-30 15:17:39 UTC (rev 4730)
@@ -76,7 +76,7 @@
" LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " ".$this->p."d ON( ".$this->p."d.content_id = ".$this->p.".content_id AND ".$this->p."d.language_id = '" . (int)$languages_id . "' ) ".
"";
- $this->listing_sql['where'] = " WHERE ".DataForceStatus(" ".$this->p.".content_status='1' ")." ";
+ $this->listing_sql['where'] = " WHERE ".DataForceStatus(" ".$this->p.".content_status='1' ")." AND ".$this->p."d.content_title <>'' ";
$this->listing_sql['sort'] = " ".$this->p."d.content_title ";
$this->listing_sql['base_key'] = "content_id ";
$this->listing_sql['col_count'] = " ".$this->p.".content_id ";
@@ -219,12 +219,12 @@
$this->listing_sql['col_count'] = " ".$this->p.".content_id ";
$this->listing_sql['tables'] = " FROM " . TABLE_CONTENT . " ".$this->p." ";
- $this->listing_sql['tables'] .=" LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " ".$this->p."d using(content_id) ";
+ $this->listing_sql['tables'] .=" LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " ".$this->p."d ON(".$this->p.".content_id = ".$this->p."d.content_id AND ".$this->p."d.language_id = '" . (int)$languages_id . "' ) ";
$this->listing_sql['tables'] .=" LEFT JOIN " . TABLE_CONTENT_TO_CATEGORIES . " ".$this->p."2c using(content_id) ";
$this->listing_sql['tables'] .= " LEFT JOIN " . TABLE_CATEGORIES . " cat ON( ".$this->p."2c.categories_id = cat.categories_id and cat.categories_status='1' ) ";
- $this->listing_sql['where'] = " WHERE ".DataForceStatus(" ".$this->p.".content_status='1' ")." AND ".$this->p."d.language_id = '" . (int)$languages_id . "' AND ".$this->p.".content_type = '" . (isset($_REQUEST['subtype'])? (int)$_REQUEST['subtype'] : 1) . "' ";
+ $this->listing_sql['where'] = " WHERE ".DataForceStatus(" ".$this->p.".content_status='1' ")." AND ".$this->p.".content_type = '" . (isset($_REQUEST['subtype'])? (int)$_REQUEST['subtype'] : 1) . "' AND ".$this->p."d.content_title <>'' ";
if (isset($_GET['categories_id']) && tep_not_null($_GET['categories_id'])) {
if (isset($_GET['inc_subcat']) && ($_GET['inc_subcat'] == '1')) {
@@ -239,7 +239,7 @@
$this->listing_sql['where'] .= ")";
} else {
- $this->listing_sql['where'] .= " and ".$this->p."2c.content_id = ".$this->p.".content_id and ".$this->p."2c.content_id = ".$this->p."d.content_id and ".$this->p."d.language_id = '" . (int)$languages_id . "' and p2c.categories_id = '" . (int)$_GET['categories_id'] . "'";
+ $this->listing_sql['where'] .= " and ".$this->p."2c.content_id = ".$this->p.".content_id and ".$this->p."2c.content_id = ".$this->p."d.content_id and ".$this->p."d.language_id = '" . (int)$languages_id . "' and ".$this->p."2c.categories_id = '" . (int)$_GET['categories_id'] . "'";
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
