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...> - 2011-12-10 14:38:17
|
Revision: 3944
http://oscss.svn.sourceforge.net/oscss/?rev=3944&view=rev
Author: oscim
Date: 2011-12-10 14:38:11 +0000 (Sat, 10 Dec 2011)
Log Message:
-----------
FS#906
Modified Paths:
--------------
trunk/catalog/admin/includes/filenames.php
trunk/catalog/includes/filenames.php
Modified: trunk/catalog/admin/includes/filenames.php
===================================================================
--- trunk/catalog/admin/includes/filenames.php 2011-12-10 14:34:28 UTC (rev 3943)
+++ trunk/catalog/admin/includes/filenames.php 2011-12-10 14:38:11 UTC (rev 3944)
@@ -79,6 +79,7 @@
define('FILENAME_CONTACT_US', 'contact.php');
define('FILENAME_SHOPPING_CART', 'shopping_cart.php');
define('FILENAME_TEMPLATE', 'template.php');
+define('FILENAME_HOME', 'home.php');
// define the filenames used in the project
?>
\ No newline at end of file
Modified: trunk/catalog/includes/filenames.php
===================================================================
--- trunk/catalog/includes/filenames.php 2011-12-10 14:34:28 UTC (rev 3943)
+++ trunk/catalog/includes/filenames.php 2011-12-10 14:38:11 UTC (rev 3944)
@@ -38,6 +38,7 @@
define('FILENAME_DEFAULT', 'index.php');
define('FILENAME_DOWNLOAD', 'download.php');
define('FILENAME_INFO_SHOPPING_CART', 'info_shopping_cart.php');
+ define('FILENAME_HOME', 'home.php');
define('FILENAME_LOGIN', 'login.php');
define('FILENAME_LOGOFF', 'logoff.php');
define('FILENAME_PASSWORD_FORGOTTEN', 'password_forgotten.php');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-10 14:34:34
|
Revision: 3943
http://oscss.svn.sourceforge.net/oscss/?rev=3943&view=rev
Author: oscim
Date: 2011-12-10 14:34:28 +0000 (Sat, 10 Dec 2011)
Log Message:
-----------
correction coquille fr
am?\195?\169lioration retour informations lors des actions sur les utilisateurs du backoffice. doublement de l'information par l'envoi d'un email a l'administrateur du site
Correction chargement des fichiers de langue du backoffice lors de l'appel au template d'email specifique a l'admin
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/emailUtility.php
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modmail.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/adminUsers.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt
trunk/catalog/admin/includes/modules/pages/adminUsers.php
trunk/catalog/admin/includes/modules/pages/orders.php
Modified: trunk/catalog/admin/includes/classes/emailUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/emailUtility.php 2011-12-10 12:53:14 UTC (rev 3942)
+++ trunk/catalog/admin/includes/classes/emailUtility.php 2011-12-10 14:34:28 UTC (rev 3943)
@@ -166,7 +166,7 @@
@include(DIR_FS_CATALOG.DIR_WS_LANGUAGES . $language .'/'.DIR_MODELES . self::TYPE_EMAIL . USE_MODELE_EMAIL.'/' .substr($template, 0, strlen($template)-4) .'.txt');
$dir = DIR_FS_ROOT_DOCS . self::$PATH_DOCS_EMAIL . self::PATH_PUBLICCUSTOMERS ;
}
- elseif( file_exists( DIR_FS_ROOT_DOCS . self::$PATH_DOCS_EMAIL . DOCS_ADMINUSER . $template) ){
+ elseif( file_exists( DIR_FS_ROOT_DOCS . self::$PATH_DOCS_EMAIL . self::DOCS_ADMINUSER . $template) ){
@include(DIR_FS_ADMIN.DIR_WS_LANGUAGES . $language .'/'.DIR_MODELES . self::TYPE_EMAIL . USE_MODELE_EMAIL.'/'.substr($template, 0, strlen($template)-4) .'.txt');
$dir = DIR_FS_ROOT_DOCS . self::$PATH_DOCS_EMAIL .self:: DOCS_ADMINUSER ;
}
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modmail.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modmail.txt 2011-12-10 12:53:14 UTC (rev 3942)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modmail.txt 2011-12-10 14:34:28 UTC (rev 3943)
@@ -10,10 +10,10 @@
*/
-$lang['heading modmail configuration']="Configuration des emails" ;
+$lang['heading modmail configuration']="Configuration des e mails" ;
-$lang['modmail legend htmlmode']="Utiliser des emails au format html" ;
-$lang['modmail legend method']="Methode" ;
+$lang['modmail legend htmlmode']="Utiliser des e mails au format html" ;
+$lang['modmail legend method']="Méthode" ;
$lang['modmail legend other']="Autres" ;
@@ -27,30 +27,30 @@
*/
$lang['SEND_EMAILS_S']="Activation des emails" ;
-$lang['SEND_EMAILS_L']="Permettre l'envoi des emails. Si vous descativez l'envoi d'email, la partie boutique n'expedira plus aucun email. Le backoffice pourra neanmoins envoyer les emails propre au fonctionement de la partie privé " ;
+$lang['SEND_EMAILS_L']="Permettre l'envoi des e mails. Si vous désactivez l'envoi d'émail, la partie boutique n'expedira plus aucun émail. Le back-office pourra néanmoins envoyer les e mails propre au fonctionnement de la partie privé " ;
-$lang['ENTRY_EMAIL_ADDRESS_CHECK_S']="Vérifier l'adresse email par le DNS" ;
-$lang['ENTRY_EMAIL_ADDRESS_CHECK_L']="Vérifier l'adresse email au travers un serveur DNS. Cette verification sera effectué dans toutes les pages, public et ou privé qui manipule des adresse email clients" ;
+$lang['ENTRY_EMAIL_ADDRESS_CHECK_S']="Vérifier l'adresse émail par le DNS" ;
+$lang['ENTRY_EMAIL_ADDRESS_CHECK_L']="Vérifier l'adresse émail au travers un serveur DNS. Cette vérification sera effectué dans toutes les pages, public et ou privé qui manipule des adresse émail clients" ;
-$lang['EMAIL_TRANSPORT_S']="Méthode de transport d'email" ;
-$lang['EMAIL_TRANSPORT_L']="Définit si le serveur utilise une connexion locale à sendmail ou une connexion SMTP par TCP/IP. Les Serveurs Windows et MacOS devraient codifier SMTP." ;
+$lang['EMAIL_TRANSPORT_S']="Méthode de transport d’émail" ;
+$lang['EMAIL_TRANSPORT_L']="Définit si le serveur utilise une connexion locale à sendmail ou une connexion SMTP par TCP/IP. Les Serveurs Windows et Mac Os devraient codifier SMTP." ;
-$lang['SMTP_MAIL_SERVER_S']="Url serveur SMTP" ;
-$lang['SMTP_MAIL_SERVER_L']="Définit l'url du serveur SMTP, si le méthode de transport choisie est le smtp, par défaut : localhost " ;
+$lang['SMTP_MAIL_SERVER_S']="URL serveur SMTP" ;
+$lang['SMTP_MAIL_SERVER_L']="Définit l’URL du serveur SMTP, si le méthode de transport choisie est le smtp, par défaut : localhost " ;
$lang['SMTP_PORT_NUMBER_S']="Port sur serveur SMTP" ;
$lang['SMTP_PORT_NUMBER_L']="Précise le port utilisé pour le serveur smtp, par défaut : 25" ;
-$lang['SMTP_SENDMAIL_FROM_S']="Email expediteur , via SMTP" ;
-$lang['SMTP_SENDMAIL_FROM_L']="Precise l'adresse de l'expéditeur, avec la méthode SMTP" ;
+$lang['SMTP_SENDMAIL_FROM_S']="Émail expéditeur , via SMTP" ;
+$lang['SMTP_SENDMAIL_FROM_L']="Précise l'adresse de l'expéditeur, avec la méthode SMTP" ;
$lang['SMTP_FROMEMAIL_NAME_S']="Nom d'expéditeur via SMTP" ;
$lang['SMTP_FROMEMAIL_NAME_L']="Précise le nom lors de l'envoi via SMTP" ;
-$lang['EMAIL_LINEFEED_S']="Saut de ligne en-tête des emails" ;
+$lang['EMAIL_LINEFEED_S']="Saut de ligne en-tête des é-mails" ;
$lang['EMAIL_LINEFEED_L']="Définit les caractères utilisés pour séparer les en-têtes des emails." ;
$lang['EMAIL_USE_HTML_S']="Utiliser MIME HTML pour l'envoi des emails" ;
$lang['EMAIL_USE_HTML_L']="Envoie les emails au format html (true) ou texte brut (false)." ;
$lang['USE_MODELE_EMAIL_S']="Modele de Gabarit des emails" ;
-$lang['USE_MODELE_EMAIL_L']="Choissiser le modele des gabarit d'email. Ce modele fournis l'ensmeble des gabarits d'emails necessaire au fonctionnement. Vous pouvez creer Ajouter/ ajsuter ces modeles. Il sont situés dans le dossier Documents" ;
+$lang['USE_MODELE_EMAIL_L']="Choissiser le modele des gabarit d'email. Ce modele fournis l'ensmeble des gabarits d'emails necessaire au fonctionnement. Vous pouvez creer Ajouter/ ajuster ces modèles. Il sont situés dans le dossier Documents" ;
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/adminUsers.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/adminUsers.txt 2011-12-10 12:53:14 UTC (rev 3942)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/adminUsers.txt 2011-12-10 14:34:28 UTC (rev 3943)
@@ -31,6 +31,41 @@
$lang['text info group']="Niveau du groupe : " ;
$lang['text none']="choix du groupe" ;
+
+
+/** message action result */
+ /* send mail */
+ $lang['send mail for %s ok']="Envoi de l'email à %s : ok" ;
+ $lang['error in process send mail for %s']="Erreur lors de l'envoi de l'email à %s" ;
+
+ /* create/update user */
+ $lang['error in process for save user']="Erreur lors de l'enregistrement de l'utilisateur" ;
+ $lang['process for save user %s ok']="L'enregistrement de l'utilisateur est terminé" ;
+
+ /* delet user */
+ $lang['error in process for delete user']="Erreur durant la suppression de l'utilisateur" ;
+ $lang['delete user %s ok']="l'utilisateur %s à était supprimé " ;
+
+
+/** Title email send notif */
+ /* internal notification */
+ /* delet user */
+ $lang['delete compte for admin']="Suppression d'un compte utilisateur" ;
+ $lang["this post is inform you in action delete user %s in you'r shop"]="Ce message vous informe de la suppression d'un compte utilisateur privé de votre boutique. Il n'a qu'un but de control de votre boutique. L'utilisateur supprimé est %s " ;
+
+ /* create user */
+ $lang['subject copy creat new compte for admin']="[Copy] création d'un nouvel utilisateur" ;
+
+ /* user notify */
+ /* create user */
+ $lang['subject email text subject create account']="Création de votre compte" ;
+
+ /* update user */
+ $lang['subject email text subject update account']="Modification de votre compte" ;
+
+
+
+
$lang['text info error email used']="Cette adresse Email est déjà utilisée " ;
$lang['js alert firstname']="Requis : Prénom " ;
$lang['your firstname must consist of at least 3 characters']="Votre prénom doit contenir au moins 3 caractères" ;
@@ -42,6 +77,6 @@
$lang['js alert email used']=" Adresse Email déjà utilisée ! " ;
$lang['js alert level']=" Requis : Un niveau de groupe " ;
-$lang['email text subject']="Modification de votre compte" ;
-$lang['email text subject create account']="Création de votre compte" ;
+
+
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt 2011-12-10 12:53:14 UTC (rev 3942)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt 2011-12-10 14:34:28 UTC (rev 3943)
@@ -66,6 +66,7 @@
$lang['entry ip']="Adresse IP : " ;
$lang['entry telephone number']="Tél. : " ;
$lang['entry email address']="Email : " ;
+$lang['entry shipping address actived']="Utilisation d'une adresse de livraison" ;
$lang['heading title search name']="Nom : " ;
$lang['heading title search montant']="Montant : " ;
$lang['not this status']="Sauf " ;
Modified: trunk/catalog/admin/includes/modules/pages/adminUsers.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/adminUsers.php 2011-12-10 12:53:14 UTC (rev 3942)
+++ trunk/catalog/admin/includes/modules/pages/adminUsers.php 2011-12-10 14:34:28 UTC (rev 3943)
@@ -10,7 +10,7 @@
@class adminUsers
*/
-error_reporting(E_ALL);
+
class adminUsers
implements ExtModPage, InterfaceModule {
@@ -63,128 +63,167 @@
}
if (in_array($_POST['admin_email_address'], $stored_email)) {
- tep_redirect(tep_href_link(self::FILENAME, 'error=email&action=new_member'));
+ tep_redirect(tep_href_link(self::FILENAME, 'error=email&action=new_member'));
}
- else {
+ else {
+ /// generated random password
+ $makePassword = self::randomize();
- $makePassword = self::randomize();
+ /// array map for sql save
+ $_data_array = array('groups_id' => tep_db_prepare_input($_POST['admin_groups_id']),
+ 'firstname' => tep_db_prepare_input($_POST['admin_firstname']),
+ 'lastname' => tep_db_prepare_input($_POST['admin_lastname']),
+ 'email_address' => tep_db_prepare_input($_POST['admin_email_address']),
+ 'password' => tep_encrypt_password($makePassword),
+ );
+ /// db exec
+ $_id=sqladminuser::create($_data_array);
- $_data_array = array('groups_id' => tep_db_prepare_input($_POST['admin_groups_id']),
- 'firstname' => tep_db_prepare_input($_POST['admin_firstname']),
- 'lastname' => tep_db_prepare_input($_POST['admin_lastname']),
- 'email_address' => tep_db_prepare_input($_POST['admin_email_address']),
- 'password' => tep_encrypt_password($makePassword),
- );
+ /// return mail and display for result db exec
+ if($_id <= 0)
+ $messageStack->add_session(__('error in process for save user'), 'error');
+ else {
- $_id=sqladminuser::create($_data_array);
+ $messageStack->add_session(sprintf(__('process for save user %s ok'), $_id ), 'success');
- $myarray = array(
- 'email_use_html'=>_cst_bool('EMAIL_USE_HTML'),
- 'links'=>HTTP_SERVER . DIR_WS_ADMIN,
- 'admin_firstname'=>$_POST['admin_firstname'],
- 'admin_email_address'=>$_POST['admin_email_address'],
- 'hiddenPassword'=>$makePassword,
- 'message'=>''
- );
+ $myarray = array(
+ 'email_use_html'=>_cst_bool('EMAIL_USE_HTML'),
+ 'links'=>HTTP_SERVER . DIR_WS_ADMIN,
+ 'admin_firstname'=>tep_db_prepare_input($_POST['admin_firstname']),
+ 'admin_email_address'=>$_POST['admin_email_address'],
+ 'hiddenPassword'=>$makePassword,
+ 'message'=>''
+ );
- $message_final=tep_post_prepare_email('admin_members_new.tpl',$language,$myarray);
+ $message_final=tep_post_prepare_email('admin_members_new.tpl',$language,$myarray);
- //! envoi a l'user
- tep_mail($_POST['admin_firstname'] , $_POST['admin_email_address'],__('email text subject create account'), $message_final, STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS);
+ //! envoi a l'user
+ if( ! tep_mail(tep_db_prepare_input($_POST['admin_firstname']) , $_POST['admin_email_address'],__('subject email text subject create account'), $message_final, STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS) )
+ $messageStack->add_session(sprintf(__('error in process send mail for %s'), tep_db_prepare_input($_POST['admin_firstname']) .' '. tep_db_prepare_input($_POST['admin_email_address']) ), 'error');
+ else
+ $messageStack->add_session(sprintf(__('send mail for %s ok'), tep_db_prepare_input($_POST['admin_firstname']) .' '. tep_db_prepare_input($_POST['admin_email_address']) ), 'success');
- //! copy au porp mag
- tep_mail(STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS,__('creat new compte for admin'), $message_final);
+ //! copy owner shop
+ if(! tep_mail(STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS,__('subject copy creat new compte for admin'), $message_final))
+ $messageStack->add_session(sprintf(__('error in process send mail for %s'), STORE_OWNER .' '. STORE_OWNER_EMAIL_ADDRESS ), 'error');
+ else
+ $messageStack->add_session(sprintf(__('send mail for %s ok'), STORE_OWNER .' '. STORE_OWNER_EMAIL_ADDRESS ), 'success');
+ }
- tep_redirect(tep_href_link(self::FILENAME));
- }
- break;
- case 'member_edit':
- $admin_id = tep_db_prepare_input($_POST['admin_id']);
- $hiddenPassword = '-hidden-';
- $stored_email[] = 'NONE';
+ tep_redirect(tep_href_link(self::FILENAME));
+ }
+ break;
+ case 'member_edit':
+ $admin_id = tep_db_prepare_input($_POST['admin_id']);
+ $hiddenPassword = '-hidden-';
+ $stored_email[] = 'NONE';
- $check_email_query = tep_db_query("select admin_email_address from " . TABLE_ADMIN . " where admin_id <> " . $admin_id . "");
- while ($check_email = tep_db_fetch_array($check_email_query)) {
- $stored_email[] = $check_email['admin_email_address'];
- }
+ $check_email_query = tep_db_query("select admin_email_address from " . TABLE_ADMIN . " where admin_id <> " . $admin_id . "");
+ while ($check_email = tep_db_fetch_array($check_email_query)) {
+ $stored_email[] = $check_email['admin_email_address'];
+ }
- if (in_array($_POST['admin_email_address'], $stored_email)) {
- tep_redirect(tep_href_link(self::FILENAME, 'page=' . $page . 'mID=' . $_GET['mID'] . '&error=email&action=edit_member'));
- }
- else {
- $sql_data_array = array('id' => $admin_id,
- 'groups_id' => tep_db_prepare_input($_POST['admin_groups_id']),
- 'firstname' => tep_db_prepare_input($_POST['admin_firstname']),
- 'lastname' => tep_db_prepare_input($_POST['admin_lastname']),
- 'email_address' => tep_db_prepare_input($_POST['admin_email_address']),
- 'url_openid' => tep_db_prepare_input($_POST['url_openid']),
- );
+ if (in_array($_POST['admin_email_address'], $stored_email)) {
+ tep_redirect(tep_href_link(self::FILENAME, 'page=' . $page . 'mID=' . $_GET['mID'] . '&error=email&action=edit_member'));
+ }
+ else {
+ $sql_data_array = array('id' => $admin_id,
+ 'groups_id' => tep_db_prepare_input($_POST['admin_groups_id']),
+ 'firstname' => tep_db_prepare_input($_POST['admin_firstname']),
+ 'lastname' => tep_db_prepare_input($_POST['admin_lastname']),
+ 'email_address' => tep_db_prepare_input($_POST['admin_email_address']),
+ 'url_openid' => tep_db_prepare_input($_POST['url_openid']),
+ );
- if(!sqladminuser::update($_data_array) )
- $messageStack->add(__('error in process for save user :'), 'error');
- else {
+ if(!sqladminuser::update($sql_data_array) )
+ $messageStack->add(__('error in process for save user'), 'error');
+ else {
- $myarray = array(
- 'email_use_html'=>_cst_bool('EMAIL_USE_HTML'),
- 'links'=>HTTP_SERVER . DIR_WS_ADMIN,
- 'admin_firstname'=>$_POST['admin_firstname'],
- 'admin_email_address'=>$_POST['admin_email_address'],
- 'url_openid'=>$_POST['url_openid'],
- 'hiddenPassword'=>$hiddenPassword,
- 'message'=>''
- );
- $message_final=tep_post_prepare_email('admin_members.tpl',$language,$myarray);
+ $messageStack->add_session(sprintf(__('process for save user %s ok'), $admin_id ), 'success');
- tep_mail($_POST['admin_firstname'] . ' ' . $_POST['admin_lastname'], $_POST['admin_email_address'],__('email text subject'), $message_final, STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS);
- }
+ $myarray = array(
+ 'email_use_html'=>_cst_bool('EMAIL_USE_HTML'),
+ 'links'=>HTTP_SERVER . DIR_WS_ADMIN,
+ 'admin_firstname'=>$_POST['admin_firstname'],
+ 'admin_email_address'=>$_POST['admin_email_address'],
+ 'url_openid'=>$_POST['url_openid'],
+ 'hiddenPassword'=>$hiddenPassword,
+ 'message'=>''
+ );
+ $message_final=tep_post_prepare_email('admin_members.tpl',$language,$myarray);
- tep_redirect(tep_href_link(self::$url_redirect, 'mID=' . $admin_id));
- }
+ tep_mail($_POST['admin_firstname'] . ' ' . $_POST['admin_lastname'], $_POST['admin_email_address'],__('subject email text subject update account'), $message_final, STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS);
+ }
+
+ tep_redirect(tep_href_link(self::$url_redirect, 'mID=' . $admin_id));
+ }
break;
case 'member_delete':
$admin_id = tep_db_prepare_input($_POST['admin_id']);
- sqladminuser::delete(array('id'=>$admin_id));
+ $res = sqladminuser::delete(array('id'=>$admin_id));
+ if($res <= 0)
+ $messageStack->add_session(__('error in process for delete user'), 'error');
+ else {
+
+ $messageStack->add_session(sprintf(__('delete user %s ok'),$admin_id ), 'success');
+
+ $myarray = array(
+ 'email_use_html'=>_cst_bool('EMAIL_USE_HTML'),
+ 'links'=>HTTP_SERVER . DIR_WS_ADMIN,
+ 'message'=>sprintf(__("this post is inform you in action delete user %s in you'r shop"), $admin_id)
+ );
+
+ $message_final=tep_post_prepare_email('admin_internal_member_delete.tpl',$language,$myarray);
+
+ //! copy owner shop
+ if(! tep_mail(STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS,__('delete compte for admin'), $message_final))
+ $messageStack->add_session(sprintf(__('error in process send mail for %s'), STORE_OWNER .' '. STORE_OWNER_EMAIL_ADDRESS ), 'error');
+ else
+ $messageStack->add_session(sprintf(__('send mail for %s ok'), STORE_OWNER .' '. STORE_OWNER_EMAIL_ADDRESS ), 'success');
+ }
+
+
tep_redirect(tep_href_link(self::FILENAME, 'page=' . $page));
break;
- case 'setflag':
+ case 'setflag':
- if($_GET['gPath']==1) tep_redirect(tep_href_link(self::FILENAME, 'gPath=' . $_GET['gPath'] .'&action=define_group'));
- if(isset($_GET['admin_boxes_id'])) {
- $ID=$_GET['admin_boxes_id'].'.php';
- $key='admin_files_name';
- $where= " and admin_files_is_boxes='1' ";
- } else {
- $ID=$_GET['admin_files_id'];
- $key='admin_files_id';
- $where=" and admin_files_is_boxes='0' ";
- }
+ if($_GET['gPath']==1) tep_redirect(tep_href_link(self::FILENAME, 'gPath=' . $_GET['gPath'] .'&action=define_group'));
+ if(isset($_GET['admin_boxes_id'])) {
+ $ID=$_GET['admin_boxes_id'].'.php';
+ $key='admin_files_name';
+ $where= " and admin_files_is_boxes='1' ";
+ } else {
+ $ID=$_GET['admin_files_id'];
+ $key='admin_files_id';
+ $where=" and admin_files_is_boxes='0' ";
+ }
- $define_files_query = tep_db_query($sql="select * from " . TABLE_ADMIN_FILES . " where ".$key."='".$ID."' ".$where." LIMIT 1");
- $define_files = tep_db_fetch_array($define_files_query);
+ $define_files_query = tep_db_query($sql="select * from " . TABLE_ADMIN_FILES . " where ".$key."='".$ID."' ".$where." LIMIT 1");
+ $define_files = tep_db_fetch_array($define_files_query);
- $t=explode(',',$define_files['admin_groups_id']);
+ $t=explode(',',$define_files['admin_groups_id']);
- if($_GET['flag'] ==0) {
- foreach($t as $v)
- if($_GET['gPath'] != $v && !empty($v) )$ts[]=$v;
- }
- elseif(!in_array($_GET['gPath'] ,$t)) {
- $ts=$t;
- $ts[]=$_GET['gPath'];
- }
- else $ts=$t;
+ if($_GET['flag'] ==0) {
+ foreach($t as $v)
+ if($_GET['gPath'] != $v && !empty($v) )$ts[]=$v;
+ }
+ elseif(!in_array($_GET['gPath'] ,$t)) {
+ $ts=$t;
+ $ts[]=$_GET['gPath'];
+ }
+ else $ts=$t;
- $define_files_query = tep_db_query($sql="update " . TABLE_ADMIN_FILES . " set admin_groups_id = '".implode(',',$ts)."' where admin_files_id='".$define_files['admin_files_id']."'");
+ $define_files_query = tep_db_query($sql="update " . TABLE_ADMIN_FILES . " set admin_groups_id = '".implode(',',$ts)."' where admin_files_id='".$define_files['admin_files_id']."'");
- tep_redirect(tep_href_link(self::FILENAME, 'gPath=' . $_GET['gPath'] .'&action=define_group'));
+ tep_redirect(tep_href_link(self::FILENAME, 'gPath=' . $_GET['gPath'] .'&action=define_group'));
break;
default:
Modified: trunk/catalog/admin/includes/modules/pages/orders.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/orders.php 2011-12-10 12:53:14 UTC (rev 3942)
+++ trunk/catalog/admin/includes/modules/pages/orders.php 2011-12-10 14:34:28 UTC (rev 3943)
@@ -332,6 +332,8 @@
$opt['status'] = $order->info['orders_status_id'];
$opt['post'] = $_POST;
$opt['mod'][$type] = $_POST['mod'][$type] ;
+// print_r($opt);
+// exit;
if(!sqlorder::update($opt))
$messageStack->add_session(__('error order not update mod'), 'warning');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-10 12:53:20
|
Revision: 3942
http://oscss.svn.sourceforge.net/oscss/?rev=3942&view=rev
Author: oscim
Date: 2011-12-10 12:53:14 +0000 (Sat, 10 Dec 2011)
Log Message:
-----------
FS#803
Modified Paths:
--------------
trunk/catalog/admin/includes/modules/pages/adminUsers.php
Modified: trunk/catalog/admin/includes/modules/pages/adminUsers.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/adminUsers.php 2011-12-10 12:43:50 UTC (rev 3941)
+++ trunk/catalog/admin/includes/modules/pages/adminUsers.php 2011-12-10 12:53:14 UTC (rev 3942)
@@ -265,11 +265,12 @@
public static function get_right_bar(){
- global $language;
+ global $language, $conf;
$heading = array();
$contents = array();
$DB=Database::getInstance();
+
switch (self::$action) {
case 'new_member':
$groups_array = array(array('id' => '0', 'text' => __('text none')));
@@ -289,6 +290,10 @@
$contents[] = array('class' => 'block_input','text' => '<label for="admin_lastname">' . __('text info lastname') . '</label>' . tep_draw_input_field('admin_lastname','','','',true));
$contents[] = array('class' => 'block_input','text' => '<label for="admin_email_address">' . __('text info email') . '</label>' . tep_draw_input_field('admin_email_address','','','',true));
+ if(in_array('openid',explode(';',$conf->login)))
+ $contents[] = array('class' => 'block_input','text' => '<label for="url_openid">' . __('text info url_openid') . '</label>' . tep_draw_input_field('url_openid','', ''));
+
+
$contents[] = array('class' => 'block_input','text' => '<label for="admin_groups_id">' . __('text info group') . '</label>' . tep_draw_pull_down_menu('admin_groups_id', $groups_array, '0'));
$contents[] = array('class' => 'button_nav','text' => tep_image_submit('button_insert.gif', IMAGE_INSERT) . ' <a class="button" href="' . tep_href_link(self::FILENAME) . '">' . IMAGE_CANCEL . '</a>');
@@ -303,10 +308,13 @@
$contents[] = array('class' => 'block_input','text' => '<label for="admin_firstname">' . __('text info firstname') . '</label>' . tep_draw_input_field('admin_firstname','', self::$mInfo->admin_firstname) . tep_draw_hidden_field('admin_id', '', self::$mInfo->admin_id));
$contents[] = array('class' => 'block_input','text' => '<label for="admin_lastname">' . __('text info lastname') . '</label>' . tep_draw_input_field('admin_lastname','', self::$mInfo->admin_lastname));
$contents[] = array('class' => 'block_input','text' => '<label for="admin_email_address">' . __('text info email') . '</label>' . tep_draw_input_field('admin_email_address','', self::$mInfo->admin_email_address));
- $contents[] = array('class' => 'block_input','text' => '<label for="url_openid">' . __('text info url_openid') . '</label>' . tep_draw_input_field('url_openid','', self::$mInfo->url_openid));
- if (self::$mInfo->admin_id == 1) {
+
+ if(in_array('openid',explode(';',$conf->login)))
+ $contents[] = array('class' => 'block_input','text' => '<label for="url_openid">' . __('text info url_openid') . '</label>' . tep_draw_input_field('url_openid','', self::$mInfo->url_openid));
+
+ if (self::$mInfo->admin_id == 1)
$contents[] = array('class' => 'block_input','text' => tep_draw_hidden_field('admin_groups_id', '', self::$mInfo->admin_groups_id));
- } else {
+ else {
$groups_array = array(array('id' => '0','class' => 'block_input', 'text' => __('text none')));
$groups_query = tep_db_query("select admin_groups_id, admin_groups_name from " . TABLE_ADMIN_GROUPS);
while ($groups = tep_db_fetch_array($groups_query)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-10 12:43:56
|
Revision: 3941
http://oscss.svn.sourceforge.net/oscss/?rev=3941&view=rev
Author: oscim
Date: 2011-12-10 12:43:50 +0000 (Sat, 10 Dec 2011)
Log Message:
-----------
coquille FS#905
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/drivers/sqlorder.php
Modified: trunk/catalog/admin/includes/classes/drivers/sqlorder.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlorder.php 2011-12-08 14:24:53 UTC (rev 3940)
+++ trunk/catalog/admin/includes/classes/drivers/sqlorder.php 2011-12-10 12:43:50 UTC (rev 3941)
@@ -160,13 +160,14 @@
/// update shipping address
if(isset($option['delivery'])) {
+ $row = new objectInfo($option['delivery']);
if(!isset($row->activate) || empty($row->activate) )
$shipping = false ;
else
$shipping = true ;
- $row = new objectInfo($option['delivery']);
+
if($shipping){
$sql_data_array['delivery_name'] = (string)(!empty($row->name)) ? tep_db_prepare_input($row->name) : '' ;
$sql_data_array['delivery_company'] = (string)(!empty($row->company)) ? tep_db_prepare_input($row->company) : '' ;
@@ -216,7 +217,11 @@
self::$comment[] = __('orders inline comment update method payment');
break;
case 'shipping':
- if($shipping) {
+
+ /**
+ TODO Add no methode force
+ */
+// if($shipping) {
$sql_data_array['class_shipping'] = (string)$row ;
/// force check and save module payment selected
@@ -228,9 +233,9 @@
TODO Add in history
*/
self::$comment[] = __('orders inline comment update method delivery');
- }
- else
- $sql_data_array['class_shipping'] = (string)'';
+// }
+// else
+// // $sql_data_array['class_shipping'] = (string)'';
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-08 14:25:00
|
Revision: 3940
http://oscss.svn.sourceforge.net/oscss/?rev=3940&view=rev
Author: oscim
Date: 2011-12-08 14:24:53 +0000 (Thu, 08 Dec 2011)
Log Message:
-----------
suite correct theme
Modified Paths:
--------------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/404.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php 2011-12-06 20:50:22 UTC (rev 3939)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php 2011-12-08 14:24:53 UTC (rev 3940)
@@ -174,6 +174,16 @@
$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));
+
+
+ // 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;
+ default:
+ }
+
}
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/404.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/404.php 2011-12-06 20:50:22 UTC (rev 3939)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/404.php 2011-12-08 14:24:53 UTC (rev 3940)
@@ -27,7 +27,4 @@
<div class="textMain"><?php echo TEXT_MAIN ; ?></div>
- <div class="banner_main">
- <?php $page->oscss_modules->_add(FILENAME_NEW_PRODUCTS,'center'); ?>
- </div>
</div>
\ No newline at end of file
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-12-06 20:50:22 UTC (rev 3939)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-12-08 14:24:53 UTC (rev 3940)
@@ -155,10 +155,10 @@
form label {width:35%; 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;}
+form input[type=checkbox] ,
+form input[type=radio] ,
+form input[type=password] ,
+form input[type=text] {width:250px;}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-06 20:50:29
|
Revision: 3939
http://oscss.svn.sourceforge.net/oscss/?rev=3939&view=rev
Author: oscim
Date: 2011-12-06 20:50:22 +0000 (Tue, 06 Dec 2011)
Log Message:
-----------
suite correct theme
Modified Paths:
--------------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/create_account.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/login.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
trunk/catalog/install/includes/modele/htaccess.txt
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2011-12-06 17:31:59 UTC (rev 3938)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2011-12-06 20:50:22 UTC (rev 3939)
@@ -218,8 +218,8 @@
}
- #headingCatImg { background: url("images/bg_product.png") 0px 0px no-repeat;}
- .innerblock { background: url("images/bg_product_list.png") 0px 0px no-repeat;}
+ #headingCatImg { background: url("../images/bg_product.png") 0px 0px no-repeat;}
+ .innerblock { background: url("../images/bg_product_list.png") 0px 0px no-repeat;}
@@ -227,13 +227,13 @@
/* -- panier -- */
- .invoice {background: url("images/bg_product.png") 0px 0px no-repeat;}
+ .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{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;}
Modified: 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.php 2011-12-06 17:31:59 UTC (rev 3938)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/create_account.php 2011-12-06 20:50:22 UTC (rev 3939)
@@ -26,30 +26,30 @@
<fieldset>
<legend><?php echo CATEGORY_PERSONAL; ?></legend>
<?php if (_cst_bool('ACCOUNT_GENDER')): ?>
- <p>
+ <p class="inputBlock">
<label><?php echo ENTRY_GENDER; ?></label>
<?php echo tep_draw_radio_field('gender','male','m') . ' ' . MALE . ' ' . tep_draw_radio_field('gender','female','f') . ' ' . FEMALE . ' ' . tep_draw_radio_field('gender','mlle','l') . ' ' . MLLE .' ' . (tep_not_null(ENTRY_GENDER_TEXT) ? '<span class="notice">' . ENTRY_GENDER_TEXT . '</span>': ''); ?>
<?php $page->messageStack->_draw_inline('gender'); ?>
</p>
<?php endif; ?>
- <p>
+ <p class="inputBlock">
<label for="firstname"><?php echo ENTRY_FIRST_NAME; ?></label>
<?php echo tep_draw_input_field('firstname','firstname') . ' ' . (tep_not_null(ENTRY_FIRST_NAME_TEXT) ? '<span class="notice">' . ENTRY_FIRST_NAME_TEXT . '</span>': ''); ?>
<?php $page->messageStack->_draw_inline('firstname'); ?>
</p>
- <p>
+ <p class="inputBlock">
<label for="lastname"><?php echo ENTRY_LAST_NAME; ?></label>
<?php echo tep_draw_input_field('lastname','lastname') . ' ' . (tep_not_null(ENTRY_LAST_NAME_TEXT) ? '<span class="notice">' . ENTRY_LAST_NAME_TEXT . '</span>': ''); ?>
<?php $page->messageStack->_draw_inline('lastname'); ?>
</p>
<?php if (_cst_bool('ACCOUNT_DOB')) { ?>
- <p>
+ <p class="inputBlock">
<label for="dob"><?php echo ENTRY_DATE_OF_BIRTH; ?></label>
<?php echo tep_draw_input_field('dob','dob') . ' ' . (tep_not_null(ENTRY_DATE_OF_BIRTH_TEXT) ? '<span class="notice">' . ENTRY_DATE_OF_BIRTH_TEXT . '</span>': ''); ?>
<?php $page->messageStack->_draw_inline('dob'); ?>
</p>
<?php } ?>
- <p>
+ <p class="inputBlock">
<label for="email_address"><?php echo ENTRY_EMAIL_ADDRESS; ?></label>
<?php echo tep_draw_input_field('email_address','email_address') . ' ' . (tep_not_null(ENTRY_EMAIL_ADDRESS_TEXT) ? '<span class="notice">' . ENTRY_EMAIL_ADDRESS_TEXT . '</span>': ''); ?>
<?php $page->messageStack->_draw_inline('email_address'); ?>
@@ -59,11 +59,11 @@
<?php if (_cst_bool('ACCOUNT_COMPANY')): ?>
<fieldset>
<legend><?php echo CATEGORY_COMPANY; ?></legend>
- <p>
+ <p class="inputBlock">
<label for="company"><?php echo ENTRY_COMPANY; ?></label>
<?php echo tep_draw_input_field('company','company') . ' ' . (tep_not_null(ENTRY_COMPANY_TEXT) ? '<span class="notice">' . ENTRY_COMPANY_TEXT . '</span>': ''); ?>
</p>
- <p>
+ <p class="inputBlock">
<label for="company"><?php echo ENTRY_COMPANY_TAX_ID; ?></label>
<?php echo tep_draw_input_field('company_tax_id','company_tax_id') . ' ' . (tep_not_null(ENTRY_COMPANY_TAX_ID_TEXT) ? '<span class="notice">' . ENTRY_COMPANY_TAX_ID_TEXT . '</span>': ''); ?>
</p>
@@ -72,37 +72,43 @@
<fieldset>
<legend><?php echo CATEGORY_ADDRESS; ?></legend>
- <p>
+ <p class="inputBlock">
<label for="street_address"><?php echo ENTRY_STREET_ADDRESS; ?></label>
<?php echo tep_draw_input_field('street_address','street_address') . ' ' . (tep_not_null(ENTRY_STREET_ADDRESS_TEXT) ? '<span class="notice">' . ENTRY_STREET_ADDRESS_TEXT . '</span>': ''); ?>
<?php $page->messageStack->_draw_inline('street_address'); ?>
</p>
<?php if (_cst_bool('ACCOUNT_SUBURB')): ?>
- <p>
+ <p class="inputBlock">
<label for="suburb"><?php echo ENTRY_SUBURB; ?></label>
<?php echo tep_draw_input_field('suburb','suburb') . ' ' . (tep_not_null(ENTRY_SUBURB_TEXT) ? '<span class="notice">' . ENTRY_SUBURB_TEXT . '</span>': ''); ?>
</p>
<?php endif; ?>
- <p>
- <label for="postcode"><?php echo ENTRY_POST_CODE; ?></label>
- <?php echo tep_draw_input_field('postcode','postcode') . ' ' . (tep_not_null(ENTRY_POST_CODE_TEXT) ? '<span class="notice">' . ENTRY_POST_CODE_TEXT . '</span>': ''); ?>
- <?php $page->messageStack->_draw_inline('postcode'); ?>
+ <p class="inputBlock">
+ <label for="postcode"><?php echo ENTRY_POST_CODE; ?></label>
+ <span class="inputvalue">
+ <?php echo tep_draw_input_field('postcode','postcode') . ' ' . (tep_not_null(ENTRY_POST_CODE_TEXT) ? '<span class="notice">' . ENTRY_POST_CODE_TEXT . '</span>': ''); ?>
+ </span>
+ <?php $page->messageStack->_draw_inline('postcode'); ?>
</p>
<p>
- <label for="city"><?php echo ENTRY_CITY; ?></label>
- <?php echo tep_draw_input_field('city','city') . ' ' . (tep_not_null(ENTRY_CITY_TEXT) ? '<span class="notice">' . ENTRY_CITY_TEXT . '</span>': ''); ?>
- <?php $page->messageStack->_draw_inline('city'); ?>
+ <label for="city"><?php echo ENTRY_CITY; ?></label>
+ <span class="inputvalue">
+ <?php echo tep_draw_input_field('city','city') . ' ' . (tep_not_null(ENTRY_CITY_TEXT) ? '<span class="notice">' . ENTRY_CITY_TEXT . '</span>': ''); ?>
+ </span>
+ <?php $page->messageStack->_draw_inline('city'); ?>
</p>
<?php if (_cst_bool('ACCOUNT_COUNTRY')): ?>
- <p>
- <label><?php echo ENTRY_COUNTRY; ?></label>
- <?php echo tep_get_country_list('country','country') . ' ' . (tep_not_null(ENTRY_COUNTRY_TEXT) ? '<span class="notice">' . ENTRY_COUNTRY_TEXT . '</span>': ''); ?>
- <?php $page->messageStack->_draw_inline('country'); ?>
+ <p class="inputBlock">
+ <label><?php echo ENTRY_COUNTRY; ?></label>
+ <span class="inputvalue">
+ <?php echo tep_get_country_list('country','country') . ' ' . (tep_not_null(ENTRY_COUNTRY_TEXT) ? '<span class="notice">' . ENTRY_COUNTRY_TEXT . '</span>': ''); ?>
+ </span>
+ <?php $page->messageStack->_draw_inline('country'); ?>
</p>
<?php endif; ?>
<?php if (_cst_bool('ACCOUNT_STATE')): ?>
- <p>
+ <p class="inputBlock">
<label for="state"><?php echo ENTRY_STATE; ?></label>
<?php
if ($process == true) {
@@ -129,15 +135,17 @@
<fieldset>
<legend><?php echo CATEGORY_CONTACT; ?></legend>
- <p>
+ <p class="inputBlock">
<label for="telephone"><?php echo ENTRY_TELEPHONE_NUMBER; ?></label>
<?php echo tep_draw_input_field('telephone','telephone') . ' ' . (tep_not_null(ENTRY_TELEPHONE_NUMBER_TEXT) ? '<span class="notice">' . ENTRY_TELEPHONE_NUMBER_TEXT . '</span>': ''); ?>
<?php $page->messageStack->_draw_inline('telephone'); ?>
</p>
<?php if (_cst_bool('ACCOUNT_FAXNUM')): ?>
- <p>
- <label for="fax"><?php echo ENTRY_FAX_NUMBER; ?></label>
- <?php echo tep_draw_input_field('fax','fax') . ' ' . (tep_not_null(ENTRY_FAX_NUMBER_TEXT) ? '<span class="notice">' . ENTRY_FAX_NUMBER_TEXT . '</span>': ''); ?>
+ <p class="inputBlock">
+ <label for="fax"><?php echo ENTRY_FAX_NUMBER; ?></label>
+ <span class="inputvalue">
+ <?php echo tep_draw_input_field('fax','fax') . ' ' . (tep_not_null(ENTRY_FAX_NUMBER_TEXT) ? '<span class="notice">' . ENTRY_FAX_NUMBER_TEXT . '</span>': ''); ?>
+ </span>
</p>
<?php endif; ?>
</fieldset>
@@ -149,23 +157,27 @@
<fieldset>
<legend><?php echo CATEGORY_OPTIONS; ?></legend>
- <p>
- <label for="newsletter"><?php echo ENTRY_NEWSLETTER; ?></label>
+ <p class="inputBlock input-large">
+ <label for="newsletter" ><?php echo ENTRY_NEWSLETTER; ?></label>
<?php echo tep_draw_checkbox_field('newsletter','newsletter','1') . ' ' . (tep_not_null(ENTRY_NEWSLETTER_TEXT) ? '<span class="notice">' . ENTRY_NEWSLETTER_TEXT . '</span>': ''); ?>
</p>
</fieldset>
<fieldset>
- <legend><?php echo CATEGORY_PASSWORD; ?></legend>
- <p>
- <label for="password"><?php echo ENTRY_PASSWORD; ?></label>
- <?php echo tep_draw_password_field('password','password') . ' ' . (tep_not_null(ENTRY_PASSWORD_TEXT) ? '<span class="notice">' . ENTRY_PASSWORD_TEXT . '</span>': ''); ?>
- <?php $page->messageStack->_draw_inline('password'); ?>
- </p>
- <p>
- <label for="confirmation"><?php echo ENTRY_PASSWORD_CONFIRMATION; ?></label>
- <?php echo tep_draw_password_field('confirmation','confirmation') . ' ' . (tep_not_null(ENTRY_PASSWORD_CONFIRMATION_TEXT) ? '<span class="notice">' . ENTRY_PASSWORD_CONFIRMATION_TEXT . '</span>': ''); ?>
- <?php $page->messageStack->_draw_inline('confirmation'); ?>
- </p>
+ <legend><?php echo CATEGORY_PASSWORD; ?></legend>
+ <p class="inputBlock">
+ <label for="password"><?php echo ENTRY_PASSWORD; ?></label>
+ <span class="inputvalue">
+ <?php echo tep_draw_password_field('password','password') . ' ' . (tep_not_null(ENTRY_PASSWORD_TEXT) ? '<span class="notice">' . ENTRY_PASSWORD_TEXT . '</span>': ''); ?>
+ </span>
+ <?php $page->messageStack->_draw_inline('password'); ?>
+ </p>
+ <p class="inputBlock">
+ <label for="confirmation"><?php echo ENTRY_PASSWORD_CONFIRMATION; ?></label>
+ <span class="inputvalue">
+ <?php echo tep_draw_password_field('confirmation','confirmation') . ' ' . (tep_not_null(ENTRY_PASSWORD_CONFIRMATION_TEXT) ? '<span class="notice">' . ENTRY_PASSWORD_CONFIRMATION_TEXT . '</span>': ''); ?>
+ <?php $page->messageStack->_draw_inline('confirmation'); ?>
+ </span>
+ </p>
</fieldset>
<p class="formBt ieExtractFieldset">
<?php echo tep_draw_hidden_field('action','process'); ?>
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/login.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/login.php 2011-12-06 17:31:59 UTC (rev 3938)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/login.php 2011-12-06 20:50:22 UTC (rev 3939)
@@ -35,12 +35,12 @@
<fieldset class="returningCustomer">
<legend><?php echo TEXT_RETURNING_CUSTOMER; ?></legend>
- <p>
+ <p class="inputBlock">
<label for="email_address"><?php echo ENTRY_EMAIL_ADDRESS; ?></label>
<?php echo tep_draw_input_field('email_address','email_address'); ?>
</p>
- <p>
+ <p class="inputBlock">
<label for="password"><?php echo ENTRY_PASSWORD; ?></label>
<?php echo tep_draw_password_field('password'); ?>
</p>
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-12-06 17:31:59 UTC (rev 3938)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-12-06 20:50:22 UTC (rev 3939)
@@ -151,208 +151,214 @@
padding-bottom: 20px;
}
+form p{width:100%;display:block; float:left;}
+form label {width:35%; 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;}
+ /* content and sidebar layout */
+ #main-tpl {clear:both;}
-/* content and sidebar layout */
-#main-tpl {clear:both;}
+ #content {
+ float: right;
+ width: 71.3%;
+ margin:10px 0 10px 0;
+ padding:5px 12px 0 12px;
+ }
-#content {
- float: right;
- width: 71.3%;
- margin:10px 0 10px 0;
- padding:5px 12px 0 12px;
+ aside {
+ float: left;
+ width: 26%;
+ margin:0;
+ padding:0;
+ }
-}
+ /* article */
-aside {
- float: left;
- width: 26%;
- margin:0;
- padding:0;
-}
+ article {
+ clear:both;
+ }
-/* article */
+ .textMain p {padding:0.5em;font-size:0.9em;}
-article {
- clear:both;
-}
-.textMain p {padding:0.5em;font-size:0.9em;}
+ article h1/*,
+ .product h2,
+ .product h1*/ {
+ padding-left: 10px;
+ margin-top: 10px;
+ }
+ article h1/*,
+ .product h1,
+ .regular h2*/ {
+ padding-left: 10px;
+ margin-top: 12px;
+ }
-article h1/*,
-.product h2,
-.product h1*/ {
- padding-left: 10px;
- margin-top: 10px;
-}
-article h1/*,
-.product h1,
-.regular h2*/ {
- padding-left: 10px;
- margin-top: 12px;
-}
+ /* sidebar */
+ aside section {
+ margin: 10px 12px 0 0;
+ padding: 10px 15px;
+ }
+ aside section ul {
+ margin-left: 12px;
+ padding-left: 12px;
+ }
-/* sidebar */
-aside section {
- margin: 10px 12px 0 0;
- padding: 10px 15px;
-}
+ aside section ul li {
+ padding-top: 10px;
+ padding-bottom: 22px;
+ }
-aside section ul {
- margin-left: 12px;
- padding-left: 12px;
-}
+ aside section ul li a {
+ display: block;
+ }
-aside section ul li {
- padding-top: 10px;
- padding-bottom: 22px;
-}
+ aside section header h3 {
+ padding-left: 10px;
+ margin: 10px 0px;
+ }
-aside section ul li a {
- display: block;
-}
-aside section header h3 {
- padding-left: 10px;
- margin: 10px 0px;
-}
+ /* columns */
+ article div.module {
+ clear:both;
+ }
-/* columns */
+ .module ul {
+ width: 110%;
+ padding: 0;
+ margin: 0;
+ }
-article div.module {
- clear:both;
-}
+ .module ul li {
+ display: inline;
+ float: left;
+ margin: 0 17px 12px 0;
+ padding: 0;
+ width: 216px;
+ }
-.module ul {
- width: 110%;
- padding: 0;
- margin: 0;
-}
+ .module .outerblock {
+ height: 255px;
+ padding: 12px;
+ width: 90%;
+ }
-.module ul li {
- display: inline;
- float: left;
- margin: 0 17px 12px 0;
- padding: 0;
- width: 216px;
-}
+ .module .innerblock {
+ height: 220px;
+ padding: 12px;
+ }
-.module .outerblock {
- height: 255px;
- padding: 12px;
- width: 90%;
-}
-.module .innerblock {
- height: 220px;
- padding: 12px;
-}
+ .module .innerblock p {
+ padding-bottom:0.2em;
+ }
+ .module .innerblock p.title{
+ height:41px;
+ }
+ .module .innerblock p.title a{
+ text-decoration: none;
+ font-size: 1.3em;
+ }
+ .module .innerblock p.img{
+ height:100px;
+ }
-.module .innerblock p {
- padding-bottom:0.2em;
-}
+ .module .innerblock .innerblock-more{
+ height:35px;
+ }
+ .module .innerblock .innerblock-more *{
+ float:left;
+ padding:5px 0 0 5px;
+ }
+ .module .innerblock .innerblock-more a.details{
+ display:inline-block;
+ margin-top:15px;
+ padding:3px 12px;
+ float:right;
+ }
+ .module .innerblock .innerblock-more a.details:hover{
+ display:inline-block;
+ margin-top:15px;
+ padding:3px 12px;
+ float:right;
+ }
-.module .innerblock p.title{
- height:41px;
-}
-.module .innerblock p.title a{
- text-decoration: none;
- font-size: 1.3em;
-}
-.module .innerblock p.img{
- height:100px;
-}
+ .module .splitnav{clear:both;}
-.module .innerblock .innerblock-more{
- height:35px;
-}
-.module .innerblock .innerblock-more *{
- float:left;
- padding:5px 0 0 5px;
-}
-.module .innerblock .innerblock-more a.details{
- display:inline-block;
- margin-top:15px;
- padding:3px 12px;
- float:right;
-}
-.module .innerblock .innerblock-more a.details:hover{
- display:inline-block;
- margin-top:15px;
- padding:3px 12px;
- float:right;
-}
+ /* end of column configuration */
-.module .splitnav{clear:both;}
-/* end of column configuration */
+ article.product.single figure{
+ display: block;
+ float: left;
+ width: 50%;
+ }
+ #productInfo {padding:2em;}
+ .module {padding-top:1em;}
+ article.product.single figure ul{
+ display:inline;
+ }
+ article.product.single figure ul li{
+ float:left;
+ margin:5px 5px;
+ }
-article.product.single figure{
- display: block;
- float: left;
- width: 50%;
-}
-#productInfo {padding:2em;}
-.module {padding-top:1em;}
+ #headingCatImg {height:220px;}
+ .innerblock { height:220px;}
+ #productImagelistMini{ height:70px;}
-article.product.single figure ul{
- display:inline;
-}
-article.product.single figure ul li{
- float:left;
- margin:5px 5px;
-}
+ .tax_symbol {font-size:0.4em;}
-#headingCatImg {height:220px;}
-.innerblock { height:220px;}
-#productImagelistMini{ height:70px;}
+ #price_master {font-weight:bold;font-size:2em;}
+ .price {font-size:1.4em;font-weight:bold;}
+ .CartQty{ width:15px;}
-.tax_symbol {font-size:0.4em;}
+ #productDescription p { padding:2em;color: #555;font-size: 0.8em;}
+ #productImage {height:200px;}
-#price_master {font-weight:bold;font-size:2em;}
-.price {font-size:1.4em;font-weight:bold;}
-.CartQty{ width:15px;}
+ .prod_box_big {padding:2em;}
+ /* -- panier -- */
-#productDescription p { padding:2em;color: #555;font-size: 0.8em;}
-#productImage {height:200px;}
+ .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; }
-.prod_box_big {padding:2em;}
-/* -- panier -- */
+ /* panier short */
+ #shopping_cart_shortBox {position:absolute;height:100px;top:45px;width:400px;}
-.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; }
+ #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 {list-style:none;}
+ #Box-shopping_cart_short ul li ul,#Box-shopping_cart_short ul li,ul.cart{float:left;}
-/* 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 {list-style:none;}
-#Box-shopping_cart_short ul li ul,#Box-shopping_cart_short ul li,ul.cart{float:left;}
+ /*box header*/
-
-/*box header*/
-
-#Box-currencies {display:none;}
\ No newline at end of file
+ #Box-currencies {display:none;}
\ No newline at end of file
Modified: trunk/catalog/install/includes/modele/htaccess.txt
===================================================================
--- trunk/catalog/install/includes/modele/htaccess.txt 2011-12-06 17:31:59 UTC (rev 3938)
+++ trunk/catalog/install/includes/modele/htaccess.txt 2011-12-06 20:50:22 UTC (rev 3939)
@@ -136,6 +136,7 @@
## Retro-compatibilité
## Account specific pages
+ RewriteRule ^create_account.(php|html)$ create_account.php?%{QUERY_STRING} [L,QSA]
RewriteRule ^(.*)account.(php|html)$ account.php?%{QUERY_STRING} [L,QSA]
RewriteRule ^(.*)account(_([a-z_]*)).(php|html)$ account.php?action=$3&%{QUERY_STRING} [L,QSA]
RewriteRule ^address_([a-z_]*).php$ account.php?aca_mod=address_book&aca_type=account&aca_action=display_view&%{QUERY_STRING}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-06 17:32:06
|
Revision: 3938
http://oscss.svn.sourceforge.net/oscss/?rev=3938&view=rev
Author: oscim
Date: 2011-12-06 17:31:59 +0000 (Tue, 06 Dec 2011)
Log Message:
-----------
coquille
Modified Paths:
--------------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2011-12-05 13:42:03 UTC (rev 3937)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2011-12-06 17:31:59 UTC (rev 3938)
@@ -34,332 +34,336 @@
font-size: 18px;
}
ul {list-style:none;}
-fieldest,form,fieldset.ListFilterType,fieldset.manufacturerFilter {border:0;font-size:0.9em;padding:0.5em}
-del {font-size:0.6em;}
+fieldest,
+form,
+ fieldset.ListFilterType,
+ fieldset.manufacturerFilter {border:0;font-size:0.9em;padding:0.5em}
+ del {font-size:0.6em;}
-.messageStack {
- color: #FFF;
- background-color: #f18f7e;
- /* curved border radius */
- -webkit-border-radius: 5px;
- -webkit-border-radius: 5px;
-}
+ .messageStack {
+ color: #FFF;
+ background-color: #f18f7e;
+ /* curved border radius */
+ -webkit-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ }
-div.CguView {
- text-align: justify;
- border:1px solid black;
- background:white;
-}
+ div.CguView {
+ text-align: justify;
+ border:1px solid black;
+ background:white;
+ }
-a {text-decoration:none; color:#0E9FC0; font-weight:bold;font-size:1.2em;}
+ a {text-decoration:none; color:#0E9FC0; font-weight:bold;font-size:1.2em;}
-/* content and sidebar layout */
+ /* content and sidebar layout */
-#content {
- background:#fff url(images/bg_content.jpg) no-repeat top right;
- /* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
-}
+ #content {
+ background:#fff url("../images/bg_content.jpg") no-repeat top right;
+ /* curved border radius */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ }
-/* article */
+ /* article */
-.product header p, .blogPost header p a {
- font-size: 14px;
- font-style: italic;
- color: #777;
-}
+ .product header p, .blogPost header p a {
+ font-size: 14px;
+ font-style: italic;
+ color: #777;
+ }
-.product p a {
- color: #0e9fc0;
-}
+ .product p a {
+ color: #0e9fc0;
+ }
-.product p a:hover {
- color: #000;
-}
+ .product p a:hover {
+ color: #000;
+ }
-.product header p a:hover {
- text-decoration: none;
- color: #000;
-}
+ .product header p a:hover {
+ text-decoration: none;
+ color: #000;
+ }
-article h1/*,
-.product h2,
-.product h1*/ {
- background:transparent url(images/bg_header.jpg) no-repeat top left;
- /* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
-}
+ article h1/*,
+ .product h2,
+ .product h1*/ {
+ background:transparent url("../images/bg_header.jpg") no-repeat top left;
+ /* curved border radius */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ }
-/* sidebar */
-aside section {
- background-color: #fff;
+ /* sidebar */
+ aside section {
+ background-color: #fff;
- /* curved border radius */
- -webkit-border-radius: 5px;
- -webkit-border-radius: 5px;
-}
+ /* curved border radius */
+ -webkit-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ }
-aside section ul {
- list-style: square;
- color: #0e9fc0;
-}
+ aside section ul {
+ list-style: square;
+ color: #0e9fc0;
+ }
-aside section ul li {
- border-bottom: 1px #0e9fc0 dotted;
-}
+ aside section ul li {
+ border-bottom: 1px #0e9fc0 dotted;
+ }
-aside section ul li a {
- text-decoration: none;
- color: #000;
- font-size: 16px;
- font-variant: small-caps;
-}
+ aside section ul li a {
+ text-decoration: none;
+ color: #000;
+ font-size: 16px;
+ font-variant: small-caps;
+ }
-aside section ul li a:hover {
- text-decoration: underline;
-}
+ aside section ul li a:hover {
+ text-decoration: underline;
+ }
-aside section header h3 {
- background: url("../images/introbkg.png") repeat-x scroll bottom right #778899;
- color:#fff;
- /* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
-}
+ aside section header h3 {
+ background: url("../images/introbkg.png") repeat-x scroll bottom right #778899;
+ color:#fff;
+ /* curved border radius */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ }
-aside section div.inner-boxe{
- text-align:center;
-}
+ aside section div.inner-boxe{
+ text-align:center;
+ }
-/* columns */
+ /* columns */
-.module h4.title {font-size: 1.5em;font-weight:bold;margin:1.2em;color:#0E9FC0;}
+ .module h4.title {font-size: 1.5em;font-weight:bold;margin:1.2em;color:#0E9FC0;}
-.module ul {
- list-style: none;
-}
+ .module ul {
+ list-style: none;
+ }
-.module .outerblock {
- font-size: 1em;
- background: #dee;
- /* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
-}
+ .module .outerblock {
+ font-size: 1em;
+ background: #dee;
+ /* curved border radius */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ }
-.module .innerblock {
- font-size: 1em;
+ .module .innerblock {
+ font-size: 1em;
- text-align:center;
- /* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
-}
+ text-align:center;
+ /* curved border radius */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ }
-.module .innerblock img {
- border: none;
-}
+ .module .innerblock img {
+ border: none;
+ }
-.module .innerblock a {
- color: #0e9fc0;
-}
+ .module .innerblock a {
+ color: #0e9fc0;
+ }
-.module .innerblock h2 {
- font-size: 16px;
-}
+ .module .innerblock h2 {
+ font-size: 16px;
+ }
-.module .innerblock .innerblock-more{
- text-align:left;
-}
+ .module .innerblock .innerblock-more{
+ text-align:left;
+ }
-.module .innerblock .innerblock-more a.details{
- color:#fff;
- background:#0E9FC0;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
-}
+ .module .innerblock .innerblock-more a.details{
+ color:#fff;
+ background:#0E9FC0;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ }
-.module .innerblock .innerblock-more a.details:hover{
- color:#0E9FC0;
- background:#fff;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
-}
+ .module .innerblock .innerblock-more a.details:hover{
+ color:#0E9FC0;
+ background:#fff;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ }
-.boxe { -moz-border-radius: 5px;-webkit-border-radius: 5px}
+ .boxe { -moz-border-radius: 5px;-webkit-border-radius: 5px}
-/* end of column configuration */
+ /* end of column configuration */
-article.product.single figure p{
- text-align:center;
-}
-article.product.single figure ul{
- list-style:none;
-}
+ article.product.single figure p{
+ text-align:center;
+ }
+ article.product.single figure ul{
+ list-style:none;
+ }
-#headingCatImg { background: url("images/bg_product.png") 0px 0px no-repeat;}
-.innerblock { background: url("images/bg_product_list.png") 0px 0px no-repeat;}
+ #headingCatImg { background: url("images/bg_product.png") 0px 0px no-repeat;}
+ .innerblock { background: url("images/bg_product_list.png") 0px 0px no-repeat;}
-/* -- panier -- */
+ /* -- 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;}
+ .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;}
+ /* 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;}
+ #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;}
-/* Section habillage Top.css */
+ /* Section habillage Top.css */
-/*header {
- } */ * *
+ /*header {
+ } */ *
- #logo p,
- #logo h1 {
- color: #FFF;
- font-size: 28px;
- }
+ #logo p,
+ #logo h1 {
+ color: #FFF;
+ font-size: 28px;
+ }
- /* #top_bar {
- } */ * *
+ /* #top_bar {
+ } */ *
- nav {
- background: url("../images/navbg.png") no-repeat top right #000;
- /* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
+ nav {
+ background: url("../images/navbg.png") no-repeat top right #000;
+ /* curved border radius */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ }
- nav ul {
- list-style: none;
- }
+ nav ul {
+ list-style: none;
+ }
- nav ul li a {
- font-size: 16px;
- font-weight: bold;
- line-height: 44px;
- text-align: center;
- text-decoration: none;
- color: #b4e3ec;
- }
+ nav ul li a {
+ font-size: 16px;
+ font-weight: bold;
+ line-height: 44px;
+ text-align: center;
+ text-decoration: none;
+ color: #b4e3ec;
+ }
- nav ul li a:hover {
- color: #fff;
- }
+ nav ul li a:hover {
+ color: #fff;
+ }
- nav ul li.selected a {
- color: #fff;
- }
+ nav ul li.selected a {
+ color: #fff;
+ }
- div#top_bar {
- -moz-border-radius: 0px 0px 10px 10px;
- background: url("../images/navbg.png") repeat scroll 0 0 transparent;
- }
+ div#top_bar {
+ -moz-border-radius: 0px 0px 10px 10px;
+ background: url("../images/navbg.png") repeat scroll 0 0 transparent;
+ }
- section#intro {
- background: #778899 url("../images/introbkg.png") repeat-x;
+ section#intro {
+ background: #778899 url("../images/introbkg.png") repeat-x;
- /* background size */
- -webkit-background-size: 100%;
- -o-background-size: 100%;
- -khtml-background-size: 100%;
+ /* background size */
+ -webkit-background-size: 100%;
+ -o-background-size: 100%;
+ -khtml-background-size: 100%;
- /* curved border radius */
- -webkit-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
+ /* curved border radius */
+ -webkit-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ }
- #intro h1,
- #intro h2 {
- font-weight: normal;
- color: #333;
- }
+ #intro h1,
+ #intro h2 {
+ font-weight: normal;
+ color: #333;
+ }
- #intro p {
- color: #5D4A3D;
- }
+ #intro p {
+ color: #5D4A3D;
+ }
- /* Footer habillage section*/
- /* footer */
- footer {
- background: #778899 url("../images/footer.png") repeat-x;
- color: #fff;
+ /* Footer habillage section*/
+ /* footer */
+ footer {
+ background: #778899 url("../images/footer.png") repeat-x;
+ color: #fff;
- /* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
+ /* curved border radius */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ }
- footer p {
- text-align: right;
- font-size: 11px;
- }
+ footer p {
+ text-align: right;
+ font-size: 11px;
+ }
- footer a {
- color: #999;
- }
+ footer a {
+ color: #999;
+ }
- footer a:hover {
- color: #FFF;
- text-decoration: none;
- }
+ footer a:hover {
+ color: #FFF;
+ text-decoration: none;
+ }
- footer div.right_footer { text-align:right;}
+ footer div.right_footer { text-align:right;}
- footer div.center_footer{
- text-align:left;font-size:0.8em;
- }
- footer a {text-decoration: none;}
\ No newline at end of file
+ footer div.center_footer{
+ text-align:left;font-size:0.8em;
+ }
+ footer a {text-decoration: none;}
\ 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...> - 2011-12-05 13:42:13
|
Revision: 3937
http://oscss.svn.sourceforge.net/oscss/?rev=3937&view=rev
Author: oscim
Date: 2011-12-05 13:42:03 +0000 (Mon, 05 Dec 2011)
Log Message:
-----------
suite amelioration du nouveau template public
Modified Paths:
--------------
trunk/catalog/includes/languages/fr_FR/modules/order_total/ot_tax.txt
trunk/catalog/includes/modules/order_total/ot_tax.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
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/sample.css
Added Paths:
-----------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/triggers/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/triggers/cart_totaux.inc
Modified: trunk/catalog/includes/languages/fr_FR/modules/order_total/ot_tax.txt
===================================================================
--- trunk/catalog/includes/languages/fr_FR/modules/order_total/ot_tax.txt 2011-12-05 12:32:42 UTC (rev 3936)
+++ trunk/catalog/includes/languages/fr_FR/modules/order_total/ot_tax.txt 2011-12-05 13:42:03 UTC (rev 3937)
@@ -10,4 +10,5 @@
*/
$lang['module order total tax title']="TVA" ;
$lang['module order total tax description']="Commande TVA" ;
+$lang['ot_tax tot cart taxe']="Total taxes" ;
?>
\ No newline at end of file
Modified: trunk/catalog/includes/modules/order_total/ot_tax.php
===================================================================
--- trunk/catalog/includes/modules/order_total/ot_tax.php 2011-12-05 12:32:42 UTC (rev 3936)
+++ trunk/catalog/includes/modules/order_total/ot_tax.php 2011-12-05 13:42:03 UTC (rev 3937)
@@ -3,8 +3,8 @@
@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 09/01/11, 12:43
+ @version 2.1.1
+ @date 05/12/11, 12:43
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -19,8 +19,9 @@
$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->output = array();
+ $this->pre_output = array();
}
public function process() {
@@ -37,6 +38,30 @@
}
}
+ /**
+ @remarks shopping_cart
+ */
+ public function show_list_total() {
+ global $currencies, $cart;
+
+ $value=0;
+ foreach($cart->get_products() as $row){
+ $value += ($row['total_line_ttc'] - $row['total_line'] );
+ }
+
+ if ($value > 0) {
+ $this->pre_output = new objectInfo(
+ array(
+ 'text'=>__('ot_tax tot cart taxe'),
+ 'value' => $value)
+ );
+ }
+
+
+ return $this->pre_output;
+ }
+
+
public function check() {
if (!isset($this->_check)) {
$check_query = tep_db_query("select configuration_value from " . TABLE_CONFIGURATION . " where configuration_key = 'MODULE_ORDER_TOTAL_TAX_SORT_ORDER'");
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2011-12-05 12:32:42 UTC (rev 3936)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2011-12-05 13:42:03 UTC (rev 3937)
@@ -1,313 +1,365 @@
/**
- @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
-*/
+ @ 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
+ */
/* standard body */
- body {
+body {
font: 14px/20px "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
- background: #ff8300;
- }
+ background: #eee;
+}
/* standard alignments */
- img { border: none; }
- .center { text-align: center; }
+img { border: none; }
+.center { text-align: center; }
/* Hx tags */
- h1 {
+h1 {
color: #FFF;
font-size: 28px;
- }
+}
- h2 {
+h2 {
font-size: 24px;
- }
+}
- h3 {
+h3 {
font-size: 18px;
- }
- ul {list-style:none;}
- fieldest,form,fieldset.ListFilterType,fieldset.manufacturerFilter {border:0;font-size:0.9em;padding:0.5em}
- del {font-size:0.6em;}
-
- .messageStack {
- color: #FFF;
- background-color: #f18f7e;
-/* curved border radius */
- -webkit-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
-
+}
+ul {list-style:none;}
+fieldest,form,fieldset.ListFilterType,fieldset.manufacturerFilter {border:0;font-size:0.9em;padding:0.5em}
+del {font-size:0.6em;}
- div.CguView {
+.messageStack {
+ color: #FFF;
+ background-color: #f18f7e;
+ /* curved border radius */
+ -webkit-border-radius: 5px;
+ -webkit-border-radius: 5px;
+}
+
+
+div.CguView {
text-align: justify;
border:1px solid black;
background:white;
- }
+}
- a {text-decoration:none; color:#0E9FC0; font-weight:bold;font-size:1.2em;}
+a {text-decoration:none; color:#0E9FC0; font-weight:bold;font-size:1.2em;}
/* content and sidebar layout */
#content {
- background-color: #fff;
-
-/* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
+ background:#fff url(images/bg_content.jpg) no-repeat top right;
+ /* curved border radius */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
/* article */
.product header p, .blogPost header p a {
- font-size: 14px;
- font-style: italic;
- color: #777;
- }
+ font-size: 14px;
+ font-style: italic;
+ color: #777;
+}
.product p a {
- color: #0e9fc0;
- }
+ color: #0e9fc0;
+}
.product p a:hover {
- color: #000;
- }
+ color: #000;
+}
.product header p a:hover {
- text-decoration: none;
- color: #000;
- }
+ text-decoration: none;
+ color: #000;
+}
article h1/*,
.product h2,
.product h1*/ {
- background-color: #B4E3EC;
-/* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
+ background:transparent url(images/bg_header.jpg) no-repeat top left;
+ /* curved border radius */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+}
/* sidebar */
aside section {
- background-color: #fff;
+ background-color: #fff;
- /* curved border radius */
- -webkit-border-radius: 5px;
- -webkit-border-radius: 5px;
+ /* curved border radius */
+ -webkit-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
aside section ul {
- list-style: square;
- color: #0e9fc0;
- }
+ list-style: square;
+ color: #0e9fc0;
+}
aside section ul li {
- border-bottom: 1px #0e9fc0 dotted;
- }
+ border-bottom: 1px #0e9fc0 dotted;
+}
aside section ul li a {
- text-decoration: none;
- color: #000;
- font-size: 16px;
- font-variant: small-caps;
- }
+ text-decoration: none;
+ color: #000;
+ font-size: 16px;
+ font-variant: small-caps;
+}
aside section ul li a:hover {
- text-decoration: underline;
- }
+ text-decoration: underline;
+}
aside section header h3 {
- background: url("../images/introbkg.png") repeat-x scroll bottom right #778899;
- color:#fff;
-/* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
+ background: url("../images/introbkg.png") repeat-x scroll bottom right #778899;
+ color:#fff;
+ /* curved border radius */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+}
aside section div.inner-boxe{
- text-align:center;
+ text-align:center;
}
/* columns */
+.module h4.title {font-size: 1.5em;font-weight:bold;margin:1.2em;color:#0E9FC0;}
+
.module ul {
- list-style: none;
+ list-style: none;
}
.module .outerblock {
- font-size: 1em;
- background: #dee;
-/* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
+ font-size: 1em;
+ background: #dee;
+ /* curved border radius */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+}
.module .innerblock {
- font-size: 1em;
+ font-size: 1em;
- text-align:center;
-/* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
+ text-align:center;
+ /* curved border radius */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
.module .innerblock img {
- border: none;
+ border: none;
}
.module .innerblock a {
- color: #0e9fc0;
+ color: #0e9fc0;
}
.module .innerblock h2 {
- font-size: 16px;
+ font-size: 16px;
}
.module .innerblock .innerblock-more{
- text-align:left;
+ text-align:left;
}
+
+.module .innerblock .innerblock-more a.details{
+ color:#fff;
+ background:#0E9FC0;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+}
+
+.module .innerblock .innerblock-more a.details:hover{
+ color:#0E9FC0;
+ background:#fff;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+}
+
+
+
+
+.boxe { -moz-border-radius: 5px;-webkit-border-radius: 5px}
+
/* end of column configuration */
article.product.single figure p{
- text-align:center;
+ text-align:center;
}
article.product.single figure ul{
- list-style:none;
+ list-style:none;
}
+#headingCatImg { background: url("images/bg_product.png") 0px 0px no-repeat;}
+.innerblock { background: url("images/bg_product_list.png") 0px 0px no-repeat;}
+
+
+/* -- 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;}
+
+
/* Section habillage Top.css */
- /*header {
- }*/
+/*header {
+ } */ * *
- #logo p,
- #logo h1 {
- color: #FFF;
- font-size: 28px;
- }
+ #logo p,
+ #logo h1 {
+ color: #FFF;
+ font-size: 28px;
+ }
- /* #top_bar {
- }*/
+ /* #top_bar {
+ } */ * *
nav {
- background: url("../images/navbg.png") no-repeat top right #000;
- /* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
+ background: url("../images/navbg.png") no-repeat top right #000;
+ /* curved border radius */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
- nav ul {
- list-style: none;
- }
+ nav ul {
+ list-style: none;
+ }
- nav ul li a {
- font-size: 16px;
- font-weight: bold;
- line-height: 44px;
- text-align: center;
- text-decoration: none;
- color: #b4e3ec;
- }
+ nav ul li a {
+ font-size: 16px;
+ font-weight: bold;
+ line-height: 44px;
+ text-align: center;
+ text-decoration: none;
+ color: #b4e3ec;
+ }
- nav ul li a:hover {
- color: #fff;
- }
+ nav ul li a:hover {
+ color: #fff;
+ }
- nav ul li.selected a {
- color: #fff;
- }
+ nav ul li.selected a {
+ color: #fff;
+ }
div#top_bar {
- -moz-border-radius: 0px 0px 10px 10px;
- background: url("../images/navbg.png") repeat scroll 0 0 transparent;
+ -moz-border-radius: 0px 0px 10px 10px;
+ background: url("../images/navbg.png") repeat scroll 0 0 transparent;
}
section#intro {
- background: #778899 url("../images/introbkg.png") repeat-x;
+ background: #778899 url("../images/introbkg.png") repeat-x;
- /* background size */
- -webkit-background-size: 100%;
- -o-background-size: 100%;
- -khtml-background-size: 100%;
+ /* background size */
+ -webkit-background-size: 100%;
+ -o-background-size: 100%;
+ -khtml-background-size: 100%;
- /* curved border radius */
- -webkit-border-radius: 5px;
- -webkit-border-radius: 5px;
+ /* curved border radius */
+ -webkit-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
- #intro h1,
- #intro h2 {
- font-weight: normal;
- color: #333;
- }
+ #intro h1,
+ #intro h2 {
+ font-weight: normal;
+ color: #333;
+ }
- #intro p {
- color: #5D4A3D;
- }
+ #intro p {
+ color: #5D4A3D;
+ }
-/* Footer habillage section*/
-/* footer */
-footer {
- background: #778899 url("../images/footer.png") repeat-x;
- color: #fff;
+ /* Footer habillage section*/
+ /* footer */
+ footer {
+ background: #778899 url("../images/footer.png") repeat-x;
+ color: #fff;
- /* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
+ /* curved border radius */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ }
-footer p {
- text-align: right;
- font-size: 11px;
- }
+ footer p {
+ text-align: right;
+ font-size: 11px;
+ }
-footer a {
- color: #999;
- }
+ footer a {
+ color: #999;
+ }
-footer a:hover {
- color: #FFF;
- text-decoration: none;
- }
+ footer a:hover {
+ color: #FFF;
+ text-decoration: none;
+ }
-footer div.right_footer { text-align:right;}
+ footer div.right_footer { text-align:right;}
-footer div.center_footer{
-text-align:left;font-size:0.8em;
-}
-footer a {text-decoration: none;}
\ No newline at end of file
+ footer div.center_footer{
+ text-align:left;font-size:0.8em;
+ }
+ footer a {text-decoration: none;}
\ No newline at end of file
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php 2011-12-05 12:32:42 UTC (rev 3936)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php 2011-12-05 13:42:03 UTC (rev 3937)
@@ -64,7 +64,7 @@
<li>
<?php /*if ( ($replace=$page->prop_ctrl('products_image', $img)) !=false) echo $replace($product_info);
else {*/ ?>
- <?php echo '<a class="lightbox" rel="lightbox" 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 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; ?>
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php 2011-12-05 12:32:42 UTC (rev 3936)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php 2011-12-05 13:42:03 UTC (rev 3937)
@@ -1,11 +1,10 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage 2cShopHtml5Oscim
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 20/10/11, 11:14
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @date 16/09/10, 21:54
@encode UTF-8
*/
$page->add_var_page('SMALL_IMAGE_WIDTH_CART', '30');
@@ -78,12 +77,12 @@
<div class="SubTotal">
<ul id="TotCart">
<?php foreach($cart->show_list_total() as $i=>$tot): ?>
- <li><?php printf('<span>%s </span> %s' ,$tot->text, $currencies->format($tot->value)); ?></li>
+ <li><?php printf('<span>%s </span><span class="value"> %s </span>' ,$tot->text, $currencies->format($tot->value)); ?></li>
<?php endforeach; ?>
<?php if($cart->get_content_type() !='virtual'): ?>
<li id="ajaxcartWeight" class="cartWeight">
- <?php echo '<span>' . SUB_TITLE_WEIGHT_TOTAL .'</span>' . $cart->show_weight().' '.UNIT_WEIGHT_NAME; ?>
+ <?php echo '<span class="text">' . SUB_TITLE_WEIGHT_TOTAL .'</span><span class="value">' . $cart->show_weight().' '.UNIT_WEIGHT_NAME.'</span>'; ?>
</li>
<?php endif; ?>
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/triggers/cart_totaux.inc
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/triggers/cart_totaux.inc (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/triggers/cart_totaux.inc 2011-12-05 13:42:03 UTC (rev 3937)
@@ -0,0 +1,26 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @date 16/09/10, 21:54
+ @encode UTF-8
+*/
+
+
+ global $cart;
+
+ if (is_object($cart) && $cart->count_contents() > 0) {
+
+ foreach($cart->show_list_total() as $i=>$tot) {
+ $det .= '<li>'. sprintf('<span>%s </span> <span class="value">%s</span>' ,$tot->text, $currencies->format($tot->value)) .'</li>' ;
+ }
+
+ $det .= '<li><span class="text">'.__('box shopping cart weight').'</span> <span class="value">'.$cart->show_weight().' '.UNIT_WEIGHT_NAME.'</span></li>'."\n";
+ }
+
+
+ echo $det;
+
+?>
\ No newline at end of file
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-12-05 12:32:42 UTC (rev 3936)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-12-05 13:42:03 UTC (rev 3937)
@@ -1,36 +1,40 @@
/**
- @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
-*/
+ @ licence GPL 2005-2011 The o**sCSS 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
+ */
@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");
/**
- Style commun et permanent.
- Ce fichier est appelé dans le tiny du backoffice
+ S tyle commun et permanent. **
+ Ce fichier est appelé dans le tiny du backoffice
-*/
+ */
/* 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;}
+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}
+.tcenter {text-align:center}
+.tright {text-align:right}
@@ -47,19 +51,19 @@
/* Block debugg public template */
- #develop{
- opacity:0.4;
- filter:alpha(opacity=40); /* For IE8 and earlier */
- color:black;
- line-height:17px;
- background:white none repeat scroll 0 0
- ; border:1px solid black;
- padding:1em;
- position:fixed;
- right:0;
- top:0;
- }
- #develop p {padding:0; margin:0;}
+#develop{
+ opacity:0.4;
+ filter:alpha(opacity=40); /* For IE8 and earlier */
+ color:black;
+ line-height:17px;
+ background:white none repeat scroll 0 0
+ ; border:1px solid black;
+ padding:1em;
+ position:fixed;
+ right:0;
+ top:0;
+}
+#develop p {padding:0; margin:0;}
@@ -85,69 +89,67 @@
/* Squelette & dim */
/* reset */
- * { margin: 0; padding: 0; }
- br.clear {height:0; width:0;}
+* { margin: 0; padding: 0; }
+b r.clear {height:0; width:0;}**
/* render html5 elements as block */
- header,
- footer,
- section,
- aside,
- nav,
- article,
- nl{ display: block; }
-
+header,
+footer,
+section,
+aside,
+nav,
+article,
+nl{ display: block; }
+
/* standard body */
- body {
- margin: 0 auto;
- width: 960px;
- font: 14px/20px "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
- background: #eee;
- }
+body {
+ margin: 0 auto;
+ width: 960px;
+}
- table { width:100%}
+table { width:100%}
- ul{padding-left:20px;}
+ul{padding-left:20px;}
/* standard alignments */
- .alignleft { float: left; }
+.alignleft { float: left; }
- img { border: none; }
- img.alignleft { margin: 5px 10px 0 0; }
- .alignright { float: right; }
- img.alignright { margin: 5px 0 0 10px; }
- .center { text-align: center; }
+img { border: none; }
+img.alignleft { margin: 5px 10px 0 0; }
+.alignright { float: right; }
+img.alignright { margin: 5px 0 0 10px; }
+.center { text-align: center; }
/* Standard width*/
- #main_container {width:960px;}
+#main_container {width:960px;}
- .messageStack *{list-style:none; margin:0; padding:0;}
- .messageStack {margin:5px 0; padding:0;}
- .messageStack li{padding:5px 12px;}
+.messageStack *{list-style:none; margin:0; padding:0;}
+.messageStack {margin:5px 0; padding:0;}
+.messageStack li{padding:5px 12px;}
- div.CguView {
+div.CguView {
width:100%;
overflow:auto;
height:150px;
- }
+}
/* Hx tags */
h1 {
- padding: 20px 0;
- }
+ padding: 20px 0;
+}
h2 {
- padding: 20px 0;
- }
+ padding: 20px 0;
+}
h3 {
- padding: 10px 0;
- }
+ padding: 10px 0;
+}
p {
- padding-bottom: 20px;
- }
+ padding-bottom: 20px;
+}
@@ -161,25 +163,25 @@
#content {
- float: right;
- width: 71.3%;
- margin:10px 0 10px 0;
- padding:5px 12px 0 12px;
- background:#fff url(images/bg_content.jpg) no-repeat top right;
+ float: right;
+ width: 71.3%;
+ margin:10px 0 10px 0;
+ padding:5px 12px 0 12px;
+
}
aside {
- float: left;
- width: 26%;
- margin:0;
- padding:0;
- }
+ float: left;
+ width: 26%;
+ margin:0;
+ padding:0;
+}
/* article */
article {
- clear:both;
- }
+ clear:both;
+}
.textMain p {padding:0.5em;font-size:0.9em;}
@@ -187,128 +189,119 @@
article h1/*,
.product h2,
.product h1*/ {
- padding-left: 10px;
- margin-top: 10px;
- background:url(images/bg_header.jpg) no-repeat top left;
- }
+ padding-left: 10px;
+ margin-top: 10px;
+}
article h1/*,
.product h1,
.regular h2*/ {
- padding-left: 10px;
- margin-top: 12px;
- }
+ padding-left: 10px;
+ margin-top: 12px;
+}
-.module h4.title {font-size: 1.5em;font-weight:bold;margin:1.2em;color:#0E9FC0;}
/* sidebar */
aside section {
- margin: 10px 12px 0 0;
- padding: 10px 15px;
+ margin: 10px 12px 0 0;
+ padding: 10px 15px;
}
aside section ul {
- margin-left: 12px;
- padding-left: 12px;
- }
+ margin-left: 12px;
+ padding-left: 12px;
+}
aside section ul li {
- padding-top: 10px;
- padding-bottom: 22px;
- }
+ padding-top: 10px;
+ padding-bottom: 22px;
+}
aside section ul li a {
- display: block;
- }
+ display: block;
+}
aside section header h3 {
- padding-left: 10px;
- margin: 10px 0px;
- }
+ padding-left: 10px;
+ margin: 10px 0px;
+}
/* columns */
article div.module {
-clear:both;
+ clear:both;
}
.module ul {
- width: 110%;
- padding: 0;
- margin: 0;
+ width: 110%;
+ padding: 0;
+ margin: 0;
}
.module ul li {
- display: inline;
- float: left;
- margin: 0 17px 12px 0;
- padding: 0;
- width: 216px;
+ display: inline;
+ float: left;
+ margin: 0 17px 12px 0;
+ padding: 0;
+ width: 216px;
}
.module .outerblock {
- height: 255px;
- padding: 12px;
- width: 90%;
- }
+ height: 255px;
+ padding: 12px;
+ width: 90%;
+}
.module .innerblock {
- height: 220px;
- padding: 12px;
+ height: 220px;
+ padding: 12px;
}
.module .innerblock p {
- padding-bottom:0.2em;
+ padding-bottom:0.2em;
}
.module .innerblock p.title{
- height:41px;
+ height:41px;
}
.module .innerblock p.title a{
- text-decoration: none;
- font-size: 1.3em;
+ text-decoration: none;
+ font-size: 1.3em;
}
.module .innerblock p.img{
- height:100px;
+ height:100px;
}
.module .innerblock .innerblock-more{
- height:35px;
+ height:35px;
}
.module .innerblock .innerblock-more *{
-float:left;
-padding:5px 0 0 5px;
+ float:left;
+ padding:5px 0 0 5px;
}
.module .innerblock .innerblock-more a.details{
- display:inline-block;
- margin-top:15px;
- padding:3px 12px;
- float:right;
- color:#fff;
- background:#0E9FC0;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
+ display:inline-block;
+ margin-top:15px;
+ padding:3px 12px;
+ float:right;
}
.module .innerblock .innerblock-more a.details:hover{
- display:inline-block;
- margin-top:15px;
- padding:3px 12px;
- float:right;
- color:#0E9FC0;
- background:#fff;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
+ display:inline-block;
+ margin-top:15px;
+ padding:3px 12px;
+ float:right;
}
.module .splitnav{clear:both;}
+
/* end of column configuration */
-.boxe { -moz-border-radius: 5px;-webkit-border-radius: 5px}
+
article.product.single figure{
display: block;
float: left;
@@ -318,15 +311,15 @@
.module {padding-top:1em;}
article.product.single figure ul{
- display:inline;
+ display:inline;
}
article.product.single figure ul li{
- float:left;
- margin:5px 5px;
+ float:left;
+ margin:5px 5px;
}
-#headingCatImg { background: url("images/bg_product.png") 0px 0px no-repeat;height:220px;}
-.innerblock { background: url("images/bg_product_list.png") 0px 0px no-repeat;height:220px;}
+#headingCatImg {height:220px;}
+.innerblock { height:220px;}
#productImagelistMini{ height:70px;}
.tax_symbol {font-size:0.4em;}
@@ -341,29 +334,25 @@
.prod_box_big {padding:2em;}
/* -- panier -- */
-.invoice {background: url("images/bg_product.png") 0px 0px no-repeat;}
-.cart-header {background:#eee;padding:0.5em;border:1px solid #fff;}
-.cart-line {padding:0.5em;border:1px solid #eee;}
-.cart-line input{padding:0.5em;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;float:right;background: url("images/bg_soustotal.png") top right no-repeat; padding:2em; -moz-border-radius: 5px; -webkit-border-radius: 5px;height:50px;}
-#TotCart li {font-size:1.5em;}
-#TotCart li span,#TotCart li#ajaxcartWeight {font-size:0.8em;color:#888;}
-.block {clear:both;;margin-top:100px;}
+.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;font-size:0.5em;top:45px;width:400px;}
+#shopping_cart_shortBox {position:absolute;height:100px;top:45px;width:400px;}
-#Box-shopping_cart_short h3 {padding:0;font-size:12px;margin-bottom:10px;}
-#Box-shopping_cart_short span {padding:0;font-size:12px;margin-bottom:10px;padding:0 2em;}
+#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 {list-style:none;}
-#Box-shopping_cart_short ul li ul,#Box-shopping_cart_short ul li,ul.cart{float:left;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;}
+#Box-shopping_cart_short ul li ul,#Box-shopping_cart_short ul li,ul.cart{float:left;}
+
/*box header*/
#Box-currencies {display:none;}
\ 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...> - 2011-12-05 12:32:52
|
Revision: 3936
http://oscss.svn.sourceforge.net/oscss/?rev=3936&view=rev
Author: oscim
Date: 2011-12-05 12:32:42 +0000 (Mon, 05 Dec 2011)
Log Message:
-----------
correction mineurs fichier de langue
Modified Paths:
--------------
trunk/catalog/includes/languages/fr_FR/create_account.php
trunk/catalog/includes/languages/fr_FR/fr_FR.php
trunk/catalog/includes/languages/fr_FR/shopping_cart.php
Modified: trunk/catalog/includes/languages/fr_FR/create_account.php
===================================================================
--- trunk/catalog/includes/languages/fr_FR/create_account.php 2011-12-04 19:11:59 UTC (rev 3935)
+++ trunk/catalog/includes/languages/fr_FR/create_account.php 2011-12-05 12:32:42 UTC (rev 3936)
@@ -9,7 +9,7 @@
@encode UTF-8
*/
define('NAVBAR_TITLE',"Créer un compte" );
-define('HEADING_TITLE',"Information de mon compte" );
+define('HEADING_TITLE',"Créer un compte" );
define('TEXT_ORIGIN_LOGIN',"<strong class=\"notice\">REMARQUE :</strong> Si vous avez déjà un compte chez nous, veuillez vous connecter à la page <a href=\"%s\">d'ouverture de session</a>." );
define('EMAIL_SUBJECT',"Bienvenue sur %s ");
define('EMAIL_SUBJECT_CONFIRM',"Compte à confirmé sur %s ");
Modified: trunk/catalog/includes/languages/fr_FR/fr_FR.php
===================================================================
--- trunk/catalog/includes/languages/fr_FR/fr_FR.php 2011-12-04 19:11:59 UTC (rev 3935)
+++ trunk/catalog/includes/languages/fr_FR/fr_FR.php 2011-12-05 12:32:42 UTC (rev 3936)
@@ -200,7 +200,7 @@
define('ENTRY_LAST_NAME_TEXT',"*" );
define('ENTRY_DATE_OF_BIRTH',"Date de naissance :" );
define('ENTRY_DATE_OF_BIRTH_ERROR',"Votre date de naissance doit avoir ce format : JJ/MM/AAAA (ex. 21/05/1970)" );
-define('ENTRY_DATE_OF_BIRTH_TEXT',"* (ex. 21/05/1970)" );
+define('ENTRY_DATE_OF_BIRTH_TEXT'," (ex. 21/05/1970)" );
define('ENTRY_EMAIL_ADDRESS',"Adresse e-mail :" );
define('ENTRY_EMAIL_ADDRESS_ERROR',"Votre adresse e-mail doit contenir un minimum de " . ENTRY_EMAIL_ADDRESS_MIN_LENGTH . " caractères." );
define('ENTRY_EMAIL_ADDRESS_CHECK_ERROR',"Votre adresse e-mail ne semble pas être valide - veuillez effectuer toutes les corrections nécessaires." );
Modified: trunk/catalog/includes/languages/fr_FR/shopping_cart.php
===================================================================
--- trunk/catalog/includes/languages/fr_FR/shopping_cart.php 2011-12-04 19:11:59 UTC (rev 3935)
+++ trunk/catalog/includes/languages/fr_FR/shopping_cart.php 2011-12-05 12:32:42 UTC (rev 3936)
@@ -8,7 +8,7 @@
@encode UTF-8
*/
define('NAVBAR_TITLE',"Contenu du panier" );
-define('HEADING_TITLE',"Qu'y a t'il dans mon panier ?" );
+define('HEADING_TITLE',"Mon panier " );
define('TABLE_HEADING_REMOVE',"Supprimer" );
define('TABLE_HEADING_PRODUCTS',"Produit(s)" );
define('HEADING_PRODUCTS_TAXE',"Taxe" );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j4...@us...> - 2011-12-04 19:12:05
|
Revision: 3935
http://oscss.svn.sourceforge.net/oscss/?rev=3935&view=rev
Author: j4k
Date: 2011-12-04 19:11:59 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Calage divers et about du shopping cart short dans le header
Modified Paths:
--------------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/ssheader.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.cart.short.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/template.php
Added Paths:
-----------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/bg_shopping_short.jpg
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/shoppingcart.png
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/ssheader.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/ssheader.php 2011-12-04 16:58:13 UTC (rev 3934)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/ssheader.php 2011-12-04 19:11:59 UTC (rev 3935)
@@ -18,7 +18,7 @@
<h1><a href="<?php echo tep_href_link() ?>"><img src="<?php echo STORE_LOGO ?>" alt="<?php echo STORE_NAME ?>" title="<?php echo STORE_NAME ?>" /></a></h1>
<?php else : ?>
<p><a href="<?php echo tep_href_link() ?>"><img src="<?php echo STORE_LOGO ?>" alt="<?php echo STORE_NAME ?>" title="<?php echo STORE_NAME ?>" /></a></p>
- <?php endif; ?>
+ <?php endif; ?>
</div>
@@ -45,6 +45,12 @@
</section>
</div>
+ <?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">
+ <?php include('boxe.php'); ?>
+ </div>
+ <?php endif; endwhile; ?>
</div>
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css 2011-12-04 16:58:13 UTC (rev 3934)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css 2011-12-04 19:11:59 UTC (rev 3935)
@@ -107,7 +107,7 @@
padding:0;
height:45px;
}
- div#top_bar div{float:left; padding:12px;}
+ div#top_bar div{float:left;}
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2011-12-04 16:58:13 UTC (rev 3934)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2011-12-04 19:11:59 UTC (rev 3935)
@@ -33,6 +33,7 @@
h3 {
font-size: 18px;
}
+ ul {list-style:none;}
fieldest,form,fieldset.ListFilterType,fieldset.manufacturerFilter {border:0;font-size:0.9em;padding:0.5em}
del {font-size:0.6em;}
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php 2011-12-04 16:58:13 UTC (rev 3934)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php 2011-12-04 19:11:59 UTC (rev 3935)
@@ -114,6 +114,7 @@
case 'home':
+ $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
$this->oscss_boxes->_add('whats_new', 'sidebar', array('cache'=>false));
$this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
@@ -135,16 +136,19 @@
break;
case 'content':
+ $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
$this->oscss_boxes->_add('categories', 'sidebar');
break;
case 'product':
+ $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
$this->oscss_boxes->_add('categories', 'sidebar');
$this->oscss_boxes->_add('manufacturer_info', 'sidebar');
$this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
break;
case 'listing':
+ $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
$this->oscss_boxes->_add('categories', 'sidebar');
$this->oscss_boxes->_add('manufacturers', 'sidebar');
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/bg_shopping_short.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/bg_shopping_short.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/shoppingcart.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/shoppingcart.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.cart.short.gab
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.cart.short.gab 2011-12-04 16:58:13 UTC (rev 3934)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.cart.short.gab 2011-12-04 19:11:59 UTC (rev 3935)
@@ -11,7 +11,7 @@
global $total_nb_products_with_qty, $currencies,$cart,$template;
?>
<div class="cart_details">
-
+ <div class="cart_icon"><img width="48" height="48" title="" alt="" src="<?php echo tep_get_httpdir().'templates/'.$template.'/' ?>images/shoppingcart.png" /></div>
<?php if(is_object($cart) &&$cart->count_contents() > 0): ?>
<ul>
<li>
@@ -32,5 +32,5 @@
<li><?php echo __('box shopping cart empty') ?></li>
</ul>
<?php endif; ?>
+
</div>
-<div class="cart_icon"><a title="" href="<?php echo tep_href_link(FILENAME_SHOPPING_CART) ?>"><img width="48" height="48" title="" alt="" src="<?php echo tep_get_httpdir().'templates/'.$template.'/' ?>images/shoppingcart.png" /></a></div>
\ No newline at end of file
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-12-04 16:58:13 UTC (rev 3934)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-12-04 19:11:59 UTC (rev 3935)
@@ -307,7 +307,7 @@
.module .splitnav{clear:both;}
/* end of column configuration */
-.boxe { -moz-border-radius: 5px;-webkit-border-radius: 5px;}
+.boxe { -moz-border-radius: 5px;-webkit-border-radius: 5px}
article.product.single figure{
display: block;
@@ -349,6 +349,21 @@
.cart-line .totttc {font-weight:bold;font-size:1.2em;}
#TotCart{list-style:none;float:right;background: url("images/bg_soustotal.png") top right no-repeat; padding:2em; -moz-border-radius: 5px; -webkit-border-radius: 5px;height:50px;}
#TotCart li {font-size:1.5em;}
-#TotCart li span,#TotCart li#ajaxcartWeight {font-size:0.8em;}
+#TotCart li span,#TotCart li#ajaxcartWeight {font-size:0.8em;color:#888;}
.block {clear:both;;margin-top:100px;}
-a.link {padding: 2em; }
\ No newline at end of file
+a.link {padding: 2em; }
+
+/* panier short */
+#shopping_cart_shortBox {position:absolute;height:100px;font-size:0.5em;top:45px;width:400px;}
+
+#Box-shopping_cart_short h3 {padding:0;font-size:12px;margin-bottom:10px;}
+#Box-shopping_cart_short span {padding:0;font-size:12px;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 {list-style:none;}
+#Box-shopping_cart_short ul li ul,#Box-shopping_cart_short ul li,ul.cart{float:left;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;}
+
+/*box header*/
+
+#Box-currencies {display:none;}
\ No newline at end of file
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/template.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/template.php 2011-12-04 16:58:13 UTC (rev 3934)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/template.php 2011-12-04 19:11:59 UTC (rev 3935)
@@ -29,7 +29,7 @@
<?php /** Retour d'erreur checkup sur la boutique */
echo $page->messageStack->_draw('header'); ?>
-
+ <?php echo $page->tep_get_sidebar('Childs_tpl/ssheader') ?>
<div id="main_container">
<?php /** Section appel sous-header unifié */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j4...@us...> - 2011-12-04 16:58:19
|
Revision: 3934
http://oscss.svn.sourceforge.net/oscss/?rev=3934&view=rev
Author: j4k
Date: 2011-12-04 16:58:13 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
un peu de style dans le panier et autres calages
Modified Paths:
--------------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
Added Paths:
-----------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/bg_content.jpg
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/bg_header.jpg
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/bg_header.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/bg_soustotal.png
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2011-12-04 15:24:51 UTC (rev 3933)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2011-12-04 16:58:13 UTC (rev 3934)
@@ -124,7 +124,8 @@
}
aside section header h3 {
- background-color: #B4E3EC;
+ background: url("../images/introbkg.png") repeat-x scroll bottom right #778899;
+ color:#fff;
/* curved border radius */
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/bg_content.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/bg_content.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/bg_header.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/bg_header.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/bg_header.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/bg_header.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/bg_soustotal.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/bg_soustotal.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-12-04 15:24:51 UTC (rev 3933)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-12-04 16:58:13 UTC (rev 3934)
@@ -165,6 +165,7 @@
width: 71.3%;
margin:10px 0 10px 0;
padding:5px 12px 0 12px;
+ background:#fff url(images/bg_content.jpg) no-repeat top right;
}
aside {
@@ -188,6 +189,7 @@
.product h1*/ {
padding-left: 10px;
margin-top: 10px;
+ background:url(images/bg_header.jpg) no-repeat top left;
}
article h1/*,
@@ -226,7 +228,6 @@
-
/* columns */
article div.module {
@@ -282,7 +283,7 @@
float:left;
padding:5px 0 0 5px;
}
-.module .innerblock .innerblock-more a.details, a.navBT{
+.module .innerblock .innerblock-more a.details{
display:inline-block;
margin-top:15px;
padding:3px 12px;
@@ -292,6 +293,16 @@
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
}
+.module .innerblock .innerblock-more a.details:hover{
+ display:inline-block;
+ margin-top:15px;
+ padding:3px 12px;
+ float:right;
+ color:#0E9FC0;
+ background:#fff;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+}
.module .splitnav{clear:both;}
/* end of column configuration */
@@ -328,3 +339,16 @@
#productImage {height:200px;}
.prod_box_big {padding:2em;}
+/* -- panier -- */
+
+.invoice {background: url("images/bg_product.png") 0px 0px no-repeat;}
+.cart-header {background:#eee;padding:0.5em;border:1px solid #fff;}
+.cart-line {padding:0.5em;border:1px solid #eee;}
+.cart-line input{padding:0.5em;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;float:right;background: url("images/bg_soustotal.png") top right no-repeat; padding:2em; -moz-border-radius: 5px; -webkit-border-radius: 5px;height:50px;}
+#TotCart li {font-size:1.5em;}
+#TotCart li span,#TotCart li#ajaxcartWeight {font-size:0.8em;}
+.block {clear:both;;margin-top:100px;}
+a.link {padding: 2em; }
\ 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...> - 2011-12-04 15:24:57
|
Revision: 3933
http://oscss.svn.sourceforge.net/oscss/?rev=3933&view=rev
Author: oscim
Date: 2011-12-04 15:24:51 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
coquille arrondi taxe panier sur theme
Modified Paths:
--------------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php 2011-12-04 15:09:49 UTC (rev 3932)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php 2011-12-04 15:24:51 UTC (rev 3933)
@@ -58,7 +58,7 @@
<?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 ($product['final_price_ttc'] - $product['final_price']) ;?> </span>
+ <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>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-04 15:09:55
|
Revision: 3932
http://oscss.svn.sourceforge.net/oscss/?rev=3932&view=rev
Author: oscim
Date: 2011-12-04 15:09:49 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
coquille lors redirection apres ajout panier
Modified Paths:
--------------
trunk/catalog/includes/classes/shopping_cart_action.php
Modified: trunk/catalog/includes/classes/shopping_cart_action.php
===================================================================
--- trunk/catalog/includes/classes/shopping_cart_action.php 2011-12-04 15:02:18 UTC (rev 3931)
+++ trunk/catalog/includes/classes/shopping_cart_action.php 2011-12-04 15:09:49 UTC (rev 3932)
@@ -160,8 +160,8 @@
$goto = FILENAME_SHOPPING_CART;
$parameters = array('action', 'cPath', 'products_id', 'pid');
} else {
- $b=basename($_SERVER['REQUEST_URI']);
- $goto = substr($b,0,strpos($b,'?') ) ;
+ $b=basename($_SERVER['PHP_SELF']);
+ $goto =( (strpos('?', $b) ===false )? $b : substr($b,0,strpos($b,'?') ) );
$parameters = array('action', 'pid','language');
unset($b);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j4...@us...> - 2011-12-04 15:02:24
|
Revision: 3931
http://oscss.svn.sourceforge.net/oscss/?rev=3931&view=rev
Author: j4k
Date: 2011-12-04 15:02:18 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Coquille orthographe
Modified Paths:
--------------
trunk/catalog/admin/includes/languages/fr_FR/modules/generic/CheckCore.txt
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/languages/fr_FR.txt
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/generic/CheckCore.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/generic/CheckCore.txt 2011-12-04 14:26:16 UTC (rev 3930)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/generic/CheckCore.txt 2011-12-04 15:02:18 UTC (rev 3931)
@@ -15,7 +15,7 @@
/// text button menu
$lang['CheckCore view alerts']="Controle" ;
/// line warning alert and link for detail
-$lang['CheckCore warning, check files or folders %s']="Attention, revoir les droit d'accés à certain fichiers ou dossiers <a href=\"%s\"> voir le detail </a> " ;
+$lang['CheckCore warning, check files or folders %s']="Attention, revoir les droit d'accés à certain fichiers ou dossiers <a href=\"%s\"> voir le détail </a> " ;
///
$lang['CheckCore heading title']="Controles" ;
/// test
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/languages/fr_FR.txt
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/languages/fr_FR.txt 2011-12-04 14:26:16 UTC (rev 3930)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/languages/fr_FR.txt 2011-12-04 15:02:18 UTC (rev 3931)
@@ -46,7 +46,7 @@
$lang['text article deja dans vos favoris']= 'Cet article est déjà dans vos favoris';
$lang['add to cart']= 'Mettre dans le panier';
$lang['add to wishlist']= 'Ajouter aux favoris';
-$lang['view more']= 'Voir le detail';
+$lang['view more']= 'Voir le détail';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j4...@us...> - 2011-12-04 14:26:22
|
Revision: 3930
http://oscss.svn.sourceforge.net/oscss/?rev=3930&view=rev
Author: j4k
Date: 2011-12-04 14:26:16 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Ajout de class="lightbox" rel="lightbox" sur les vignettes pour ajouter la lightbox
Modified Paths:
--------------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php 2011-12-04 13:59:45 UTC (rev 3929)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php 2011-12-04 14:26:16 UTC (rev 3930)
@@ -64,7 +64,7 @@
<li>
<?php /*if ( ($replace=$page->prop_ctrl('products_image', $img)) !=false) echo $replace($product_info);
else {*/ ?>
- <?php echo '<a class="fancy" 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 echo '<a class="lightbox" rel="lightbox" 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; ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j4...@us...> - 2011-12-04 13:59:51
|
Revision: 3929
http://oscss.svn.sourceforge.net/oscss/?rev=3929&view=rev
Author: j4k
Date: 2011-12-04 13:59:45 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
On continue les motifs du template par de?\204?\129faut
Modified Paths:
--------------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/cart.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/carticon.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/introbkg.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/navbg.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
Added Paths:
-----------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/bg_product.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/bg_product_list.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/footer.png
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css 2011-12-04 13:58:14 UTC (rev 3928)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css 2011-12-04 13:59:45 UTC (rev 3929)
@@ -40,7 +40,7 @@
nav {
position: absolute;
width: inherit;
- height:45px;
+
}
@@ -50,8 +50,8 @@
width: inherit;
}
- #intro .intro.content {padding: 12px;color:#fff;}
- #intro .intro.content div{padding: 12px;font-size: 0.9em; font-weight:bold;}
+ #intro .intro.content {padding: 12px;color:#fff;-webkit-border-radius: 5px; -webkit-border-radius: 5px;height:190px;}
+ #intro .intro.content div{padding: 12px;font-size: 0.9em; font-weight:bold; width:750px;}
nl#breadcrumbs {
@@ -136,7 +136,6 @@
/* footer */
footer {
clear: both;
- width: 960px;
height:60px;
margin-bottom: 10px;
padding:1.5em;
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2011-12-04 13:58:14 UTC (rev 3928)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2011-12-04 13:59:45 UTC (rev 3929)
@@ -33,7 +33,9 @@
h3 {
font-size: 18px;
}
-
+ fieldest,form,fieldset.ListFilterType,fieldset.manufacturerFilter {border:0;font-size:0.9em;padding:0.5em}
+ del {font-size:0.6em;}
+
.messageStack {
color: #FFF;
background-color: #f18f7e;
@@ -41,15 +43,15 @@
-webkit-border-radius: 5px;
-webkit-border-radius: 5px;
}
+
-
div.CguView {
text-align: justify;
border:1px solid black;
background:white;
}
- a {text-decoration:none; color:#555; font-weight:bold;font-size:1.2em;}
+ a {text-decoration:none; color:#0E9FC0; font-weight:bold;font-size:1.2em;}
/* content and sidebar layout */
@@ -152,7 +154,7 @@
.module .innerblock {
font-size: 1em;
- background: #fff;
+
text-align:center;
/* curved border radius */
-moz-border-radius: 5px;
@@ -211,7 +213,7 @@
nav {
- background: url("../images/navbg.png");
+ background: url("../images/navbg.png") no-repeat top right #000;
/* curved border radius */
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
@@ -279,7 +281,7 @@
/* Footer habillage section*/
/* footer */
footer {
- background: #222;
+ background: #778899 url("../images/footer.png") repeat-x;
color: #fff;
/* curved border radius */
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/bg_product.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/bg_product.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/bg_product_list.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/bg_product_list.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/cart.png
===================================================================
(Binary files differ)
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/carticon.png
===================================================================
(Binary files differ)
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/footer.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/footer.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/introbkg.png
===================================================================
(Binary files differ)
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/navbg.png
===================================================================
(Binary files differ)
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-12-04 13:58:14 UTC (rev 3928)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-12-04 13:59:45 UTC (rev 3929)
@@ -194,10 +194,10 @@
.product h1,
.regular h2*/ {
padding-left: 10px;
- margin: 12px 0;
+ margin-top: 12px;
}
-.module h4.title {font-size: 1.5em;font-weight:bold;margin:1.2em;}
+.module h4.title {font-size: 1.5em;font-weight:bold;margin:1.2em;color:#0E9FC0;}
/* sidebar */
aside section {
@@ -282,26 +282,30 @@
float:left;
padding:5px 0 0 5px;
}
-.module .innerblock .innerblock-more a.details{
+.module .innerblock .innerblock-more a.details, a.navBT{
display:inline-block;
- line-height:25px;
- padding-top:15px;
- padding-right:12px;
+ margin-top:15px;
+ padding:3px 12px;
float:right;
+ color:#fff;
+ background:#0E9FC0;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
.module .splitnav{clear:both;}
/* end of column configuration */
+.boxe { -moz-border-radius: 5px;-webkit-border-radius: 5px;}
-
article.product.single figure{
display: block;
float: left;
width: 50%;
}
+#productInfo {padding:2em;}
+.module {padding-top:1em;}
-
article.product.single figure ul{
display:inline;
}
@@ -310,8 +314,11 @@
margin:5px 5px;
}
+#headingCatImg { background: url("images/bg_product.png") 0px 0px no-repeat;height:220px;}
+.innerblock { background: url("images/bg_product_list.png") 0px 0px no-repeat;height:220px;}
#productImagelistMini{ height:70px;}
+.tax_symbol {font-size:0.4em;}
#price_master {font-weight:bold;font-size:2em;}
.price {font-size:1.4em;font-weight:bold;}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j4...@us...> - 2011-12-04 13:58:20
|
Revision: 3928
http://oscss.svn.sourceforge.net/oscss/?rev=3928&view=rev
Author: j4k
Date: 2011-12-04 13:58:14 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
On continue les motifs du template par de?\204?\129faut
Modified Paths:
--------------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css 2011-12-04 11:39:04 UTC (rev 3927)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css 2011-12-04 13:58:14 UTC (rev 3928)
@@ -50,7 +50,7 @@
width: inherit;
}
- #intro .intro.content {padding: 12px;}
+ #intro .intro.content {padding: 12px;color:#fff;}
#intro .intro.content div{padding: 12px;font-size: 0.9em; font-weight:bold;}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-04 11:39:11
|
Revision: 3927
http://oscss.svn.sourceforge.net/oscss/?rev=3927&view=rev
Author: oscim
Date: 2011-12-04 11:39:04 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
coquille sur chemin dans les regle de rewrite, Force use %WS_DOCUMENT_ROOT%
Modified Paths:
--------------
trunk/catalog/install/includes/modele/htaccess.txt
Modified: trunk/catalog/install/includes/modele/htaccess.txt
===================================================================
--- trunk/catalog/install/includes/modele/htaccess.txt 2011-12-04 11:28:46 UTC (rev 3926)
+++ trunk/catalog/install/includes/modele/htaccess.txt 2011-12-04 11:39:04 UTC (rev 3927)
@@ -120,11 +120,12 @@
## Home Et index Ou Home = index
## Force Unique Home page
- RewriteRule ^(home.php)(.*)$ /www/dev/oscss/2.1.1/01/trunk/catalog/ [R=301]
- RewriteRule ^(d/index/index-home.html)$ /www/dev/oscss/2.1.1/01/trunk/catalog/ [R=301]
+ RewriteRule ^((home|index).(php|html))(.*)$ %WS_DOCUMENT_ROOT% [R=301]
+ RewriteRule ^(d/index/index-home.html)$ %WS_DOCUMENT_ROOT% [R=301]
+ RewriteRule ^(d/index/index.html)$ %WS_DOCUMENT_ROOT% [R=301]
RewriteCond %{QUERY_STRING} =''
- RewriteRule ^(index)\.(php|html)$ /www/dev/oscss/2.1.1/01/trunk/catalog/ [R=301]
+ RewriteRule ^(index)\.(php|html)$ %WS_DOCUMENT_ROOT% [R=301]
## Home page & index page; two distinct page
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-04 11:28:52
|
Revision: 3926
http://oscss.svn.sourceforge.net/oscss/?rev=3926&view=rev
Author: oscim
Date: 2011-12-04 11:28:46 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
coquille prix sortie default html
Modified Paths:
--------------
trunk/catalog/includes/functions/html_output.php
Modified: trunk/catalog/includes/functions/html_output.php
===================================================================
--- trunk/catalog/includes/functions/html_output.php 2011-12-04 11:08:41 UTC (rev 3925)
+++ trunk/catalog/includes/functions/html_output.php 2011-12-04 11:28:46 UTC (rev 3926)
@@ -221,7 +221,8 @@
* @param $product_info array
* @return string
*/
-function print_products_price_rv($product_info,$style='text'){ // fonction obsolète dans le corps d'oscss2 (cf class price)
+function print_products_price_rv($product_info,$style='html'){
+ // fonction obsolète dans le corps d'oscss2 (cf class price)
global $price;
if(is_object($product_info))
return $price->print_products_price($product_info->products_id,$style);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-04 11:08:47
|
Revision: 3925
http://oscss.svn.sourceforge.net/oscss/?rev=3925&view=rev
Author: oscim
Date: 2011-12-04 11:08:41 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
coquille logique
Modified Paths:
--------------
trunk/catalog/includes/classes/drivers/data/categorie.php
Modified: trunk/catalog/includes/classes/drivers/data/categorie.php
===================================================================
--- trunk/catalog/includes/classes/drivers/data/categorie.php 2011-12-04 10:38:26 UTC (rev 3924)
+++ trunk/catalog/includes/classes/drivers/data/categorie.php 2011-12-04 11:08:41 UTC (rev 3925)
@@ -302,7 +302,7 @@
else $products['total']= 0;
$products_count += $products['total'];
- if(!isset(self::$object_data[$category_id]) || !self::get_item($category_id)) return false;
+ if(!isset(self::$object_data[$category_id]) && !self::get_item($category_id)) return false;
self::$object_data[$category_id]->count_products=(int)$products_count;
self::add_where_query(" AND parent_id = '" . (int)$category_id . "' ");
@@ -330,7 +330,7 @@
else $products['total']= 0;
$products_count += $products['total'];
- if(!isset(self::$object_data[$category_id]) || !self::get_item($category_id)) return false;
+ if(!isset(self::$object_data[$category_id]) && !self::get_item($category_id)) return false;
self::$object_data[$category_id]->count_products=(int)$products_count;
self::add_where_query(" AND parent_id = '" . (int)$category_id . "' ");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-04 10:38:32
|
Revision: 3924
http://oscss.svn.sourceforge.net/oscss/?rev=3924&view=rev
Author: oscim
Date: 2011-12-04 10:38:26 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Suite report des module de hash de mdp
correction coquille PasswordUtility
Suppression lib function dans le frontoffice
Modified Paths:
--------------
trunk/catalog/common/classes/PasswordUtility.php
Added Paths:
-----------
trunk/catalog/common/modules/core/password/Pass_Md5.php
trunk/catalog/common/modules/core/password/Pass_Sha1.php
Removed Paths:
-------------
trunk/catalog/includes/functions/password_funcs.php
Modified: trunk/catalog/common/classes/PasswordUtility.php
===================================================================
--- trunk/catalog/common/classes/PasswordUtility.php 2011-12-04 10:10:09 UTC (rev 3923)
+++ trunk/catalog/common/classes/PasswordUtility.php 2011-12-04 10:38:26 UTC (rev 3924)
@@ -38,12 +38,12 @@
if(self::$ChildMod !=false) return ;
- $file = self::PREFIX_FILE_CHILDS_MOD.$conf->modPassword;
+ $file = self::PREFIX_FILE_CHILDS_MOD.$conf->ModPassword.'.php';
if(!file_exists(DIR_WS_COMMON.self::PATH_CHILDS_MOD.$file))
throw new Exception('Not found file password module');
- $current = $conf->modPassword;
+ $current = $conf->ModPassword;
require_once(DIR_WS_COMMON.self::PATH_CHILDS_MOD.$file);
self::$ChildMod = new $current();
@@ -73,6 +73,7 @@
@page login.php(public)
*/
public function validate_password($plain, $encrypted){
+ self::getInstance();
return self::$ChildMod->validate_password($plain, $encrypted);
}
@@ -81,6 +82,7 @@
@page create_account.php|password_forgotent.php(public)
*/
public function encrypt_password($plain){
+ self::getInstance();
return self::$ChildMod->encrypt_password($plain);
}
Added: trunk/catalog/common/modules/core/password/Pass_Md5.php
===================================================================
--- trunk/catalog/common/modules/core/password/Pass_Md5.php (rev 0)
+++ trunk/catalog/common/modules/core/password/Pass_Md5.php 2011-12-04 10:38:26 UTC (rev 3924)
@@ -0,0 +1,35 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2011 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 08/12/11, 16:16
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class Md5
+*/
+
+class Md5 {
+
+ /**
+ @brief This funstion validates a plain text password with an encrpyted password
+ */
+ public function validate_password($plain, $encrypted) {
+ if (tep_not_null($plain) && tep_not_null($encrypted)) {
+ if (md5($plain) == $encrypted ) return true;
+ }
+ return false;
+ }
+
+ /**
+ @brief This function makes a new password from a plaintext password.
+ */
+ public function encrypt_password($plain) {
+ $password = md5( $plain) ;
+ return $password;
+ }
+
+}
+
+?>
\ No newline at end of file
Added: trunk/catalog/common/modules/core/password/Pass_Sha1.php
===================================================================
--- trunk/catalog/common/modules/core/password/Pass_Sha1.php (rev 0)
+++ trunk/catalog/common/modules/core/password/Pass_Sha1.php 2011-12-04 10:38:26 UTC (rev 3924)
@@ -0,0 +1,35 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2011 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 08/12/11, 16:16
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class Sha1
+*/
+
+class Sha1 {
+
+ /**
+ @brief This funstion validates a plain text password with an encrpyted password
+ */
+ public function validate_password($plain, $encrypted) {
+ if (tep_not_null($plain) && tep_not_null($encrypted)) {
+ if (sha1($plain) == $encrypted ) return true;
+ }
+ return false;
+ }
+
+ /**
+ @brief This function makes a new password from a plaintext password.
+ */
+ public function encrypt_password($plain) {
+ $password = sha1( $plain) ;
+ return $password;
+ }
+
+}
+
+?>
\ No newline at end of file
Deleted: trunk/catalog/includes/functions/password_funcs.php
===================================================================
--- trunk/catalog/includes/functions/password_funcs.php 2011-12-04 10:10:09 UTC (rev 3923)
+++ trunk/catalog/includes/functions/password_funcs.php 2011-12-04 10:38:26 UTC (rev 3924)
@@ -1,38 +0,0 @@
-<?php
-/**
-
- @package oscss-Codev <www http://www.oscss.org>
- @version Rc-3
- @date 22/12/09 16:24
- @author oscim - <mail aur...@os...> <www http://www.oscim.fr>
-*/
-
-/**
- This funstion validates a plain text password with an encrpyted password
- @page login.php
-*/
- function tep_validate_password($plain, $encrypted) {
- if (tep_not_null($plain) && tep_not_null($encrypted)) {
- // split apart the hash / salt
- $stack = explode(':', $encrypted);
- if (sizeof($stack) != 2) return false;
- if (md5($stack[1] . $plain) == $stack[0]) return true;
- }
- return false;
- }
-
-/**
- This function makes a new password from a plaintext password.
- @page create_account.php|password_forgotent.php
-*/
- function tep_encrypt_password($plain) {
- $password = '';
-
- for ($i=0; $i<10; $i++)
- $password .= tep_rand();
-
- $salt = substr(md5($password), 0, 2);
- $password = md5($salt . $plain) . ':' . $salt;
- return $password;
- }
-?>
\ 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...> - 2011-12-04 10:10:16
|
Revision: 3923
http://oscss.svn.sourceforge.net/oscss/?rev=3923&view=rev
Author: oscim
Date: 2011-12-04 10:10:09 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
[BO] correction coquille svnupdate, et force utilisation get_svn_core de generale.php
[FO] deport des functions de control de passord dans des ficheir externe, et refonte des functions en module
Ajout d'une class de centralisation et d'un selecteu dans le configure pour determiner le type de mots de passe utilis?\195?\169
Modified Paths:
--------------
trunk/catalog/admin/includes/functions/general.php
trunk/catalog/admin/includes/modules/generic/SvnUpdate.php
trunk/catalog/includes/appli_top_Test.php
trunk/catalog/includes/application_top.php
trunk/catalog/includes/classes/core_page/customer.php
trunk/catalog/install/includes/modele/configure.txt
trunk/catalog/password_forgotten.php
Added Paths:
-----------
trunk/catalog/common/classes/PasswordUtility.php
trunk/catalog/common/modules/
trunk/catalog/common/modules/core/
trunk/catalog/common/modules/core/password/
trunk/catalog/common/modules/core/password/Pass_Classic.php
Modified: trunk/catalog/admin/includes/functions/general.php
===================================================================
--- trunk/catalog/admin/includes/functions/general.php 2011-12-03 22:31:28 UTC (rev 3922)
+++ trunk/catalog/admin/includes/functions/general.php 2011-12-04 10:10:09 UTC (rev 3923)
@@ -566,7 +566,7 @@
$SimpleParser = simplexml_load_file($file);
if($name=='all')
- return (string)$SimpleParser;
+ return $SimpleParser;
elseif(!isset($SimpleParser->$name))
die(__('Erreur récuperation tag '.$name)) ;
else
Modified: trunk/catalog/admin/includes/modules/generic/SvnUpdate.php
===================================================================
--- trunk/catalog/admin/includes/modules/generic/SvnUpdate.php 2011-12-03 22:31:28 UTC (rev 3922)
+++ trunk/catalog/admin/includes/modules/generic/SvnUpdate.php 2011-12-04 10:10:09 UTC (rev 3923)
@@ -31,13 +31,13 @@
const REDIRECT = FILENAME_PACKAGE;
/// version module
- var $version='2.1.0';
+ public $version='2.1.0';
public static $code;
- var $title;
- var $description;
- var $sort_order;
- var $enabled;
+ public $title;
+ public $description;
+ public $sort_order;
+ public $enabled;
/**
*/
@@ -64,7 +64,7 @@
$svnupdate=0;
if(!tep_session_is_registered('svnupdate')) {
- $info = $this->get_info_core(DIR_FS_CATALOG.self::$FILEPATH_SVN_CORE, 'all');
+ $info = get_info_core(DIR_FS_CATALOG.self::$FILEPATH_SVN_CORE, 'all');
self::$actu_rev= (int)$info->svn;
self::$URL_OSCSS_ORG_TRAC = $info->urloscssorgtrac;
@@ -104,7 +104,7 @@
@author oscim <mail os...@os...> <www http://www.oscim.fr>
*/
public function draw_form(){
- if((int)self::$actu_rev==0) self::$actu_rev=$this->get_info_core(DIR_FS_CATALOG.self::$FILEPATH_SVN_CORE);
+ if((int)self::$actu_rev==0) self::$actu_rev=get_info_core(DIR_FS_CATALOG.self::$FILEPATH_SVN_CORE);
if((int)self::$current_rev==0) self::$current_rev=$this->get_current_rev(self::$URL_OSCSS_GET_REV);
if(isset($_POST['ACTU_REV']))$S=$this->exe_update($_POST['ACTU_REV'],$_POST['CURENT_REV']);
@@ -123,21 +123,7 @@
else $dest .= $str;
}
- /**
- Recuperation des element de svn basé sur le fichier oscss.version.xml
- @package oscss-2 <www http://www.oscss.org>
- @date 15/05/10, 16:19
- @author oscim <mail os...@os...> <www http://www.oscim.fr>
- */
- private function get_info_core($file,$name='svn'){
- global $messageStack;
- if(!file_exists($file)) return $messageStack->add( __("Erreur récupération fichier"), 'error' );
- $SimpleParser = @simplexml_load_file($file);
- if(!isset($SimpleParser->$name)) $messageStack->add( __("Erreur récupération n° révision courant"), 'error' );
- else return $SimpleParser->$name;
- }
-
/**
Recup current version svn, basé sur ViewVC fournis pas Sourceforge , vieVC 1.0.5
@author oscim <mail os...@os...> <www http://www.oscim.fr>
@@ -213,7 +199,7 @@
private function new_version_xml($curent_rev, $corre_rev){
- $SimpleParser = $this->get_info_core(DIR_FS_CATALOG.self::$FILEPATH_SVN_CORE, 'all');
+ $SimpleParser = get_info_core(DIR_FS_CATALOG.self::$FILEPATH_SVN_CORE, 'all');
$SimpleParser->svn = (int)$curent_rev;
Added: trunk/catalog/common/classes/PasswordUtility.php
===================================================================
--- trunk/catalog/common/classes/PasswordUtility.php (rev 0)
+++ trunk/catalog/common/classes/PasswordUtility.php 2011-12-04 10:10:09 UTC (rev 3923)
@@ -0,0 +1,88 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2011 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/12/11, 16:16
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class PasswordUtility
+ @brief This class is manager call for methode in check or generate password proteced
+*/
+
+class PasswordUtility {
+ /**
+ @var path childs module
+ */
+ const PATH_CHILDS_MOD = 'modules/core/password/';
+ /**
+ @var Prefix file in childs module
+ */
+ const PREFIX_FILE_CHILDS_MOD = 'Pass_';
+ /**
+ @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->modPassword;
+
+ if(!file_exists(DIR_WS_COMMON.self::PATH_CHILDS_MOD.$file))
+ throw new Exception('Not found file password module');
+
+ $current = $conf->modPassword;
+ require_once(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 This funstion validates a plain text password with an encrpyted password
+ @page login.php(public)
+ */
+ public function validate_password($plain, $encrypted){
+ return self::$ChildMod->validate_password($plain, $encrypted);
+ }
+
+ /**
+ @brief This function makes a new password from a plaintext password.
+ @page create_account.php|password_forgotent.php(public)
+ */
+ public function encrypt_password($plain){
+ return self::$ChildMod->encrypt_password($plain);
+ }
+
+}
+?>
Added: trunk/catalog/common/modules/core/password/Pass_Classic.php
===================================================================
--- trunk/catalog/common/modules/core/password/Pass_Classic.php (rev 0)
+++ trunk/catalog/common/modules/core/password/Pass_Classic.php 2011-12-04 10:10:09 UTC (rev 3923)
@@ -0,0 +1,44 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2011 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 08/12/11, 16:16
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class Classic
+*/
+
+class Classic {
+
+ /**
+ @brief This funstion validates a plain text password with an encrpyted password
+ */
+ protected function validate_password($plain, $encrypted) {
+ if (tep_not_null($plain) && tep_not_null($encrypted)) {
+ // split apart the hash / salt
+ $stack = explode(':', $encrypted);
+ if (sizeof($stack) != 2) return false;
+ if (md5($stack[1] . $plain) == $stack[0]) return true;
+ }
+ return false;
+ }
+
+ /**
+ @brief This function makes a new password from a plaintext password.
+ */
+ protected function encrypt_password($plain) {
+ $password = '';
+
+ for ($i=0; $i<10; $i++)
+ $password .= tep_rand();
+
+ $salt = substr(md5($password), 0, 2);
+ $password = md5($salt . $plain) . ':' . $salt;
+ return $password;
+ }
+
+}
+
+?>
\ No newline at end of file
Modified: trunk/catalog/includes/appli_top_Test.php
===================================================================
--- trunk/catalog/includes/appli_top_Test.php 2011-12-03 22:31:28 UTC (rev 3922)
+++ trunk/catalog/includes/appli_top_Test.php 2011-12-04 10:10:09 UTC (rev 3923)
@@ -50,6 +50,10 @@
error_reporting(0);
}
error_reporting(E_ALL);
+
+ // force config in object, by stdclass
+ $conf = (object)$conf;
+
/// attribut produits ameliorer
define('UPLOAD_PREFIX', 'upload_');
define('TEXT_PREFIX', 'txt_');
Modified: trunk/catalog/includes/application_top.php
===================================================================
--- trunk/catalog/includes/application_top.php 2011-12-03 22:31:28 UTC (rev 3922)
+++ trunk/catalog/includes/application_top.php 2011-12-04 10:10:09 UTC (rev 3923)
@@ -40,6 +40,10 @@
error_reporting(0);
}
+
+ // force config in object, by stdclass
+ $conf = (object)$conf;
+
/// attribut produits ameliorer
define('UPLOAD_PREFIX', 'upload_');
define('TEXT_PREFIX', 'txt_');
Modified: trunk/catalog/includes/classes/core_page/customer.php
===================================================================
--- trunk/catalog/includes/classes/core_page/customer.php 2011-12-03 22:31:28 UTC (rev 3922)
+++ trunk/catalog/includes/classes/core_page/customer.php 2011-12-04 10:10:09 UTC (rev 3923)
@@ -39,7 +39,6 @@
protected function __construct($customer_id=''){
if(!empty($customer_id)) $this->the_customer($customer_id);
- if(!function_exists('tep_validate_password')) require_once(DIR_WS_FUNCTIONS.'password_funcs.php');
return $this->customer;
}
@@ -167,10 +166,7 @@
$check_customer_query = $DB->query("select customers_id,customers_password from " . TABLE_CUSTOMERS . " where customers_email_address = '" . tep_db_input($email_address) . "' ");
$check_customer = $check_customer_query->fetchAssoc();
- /// include the password crypto functions
- if(!function_exists('tep_validate_password')) require(DIR_WS_FUNCTIONS . 'password_funcs.php');
-
- return (!tep_validate_password($password, $check_customer['customers_password'])? false : (int)$check_customer['customers_id'] ) ;
+ return (!PasswordUtility::validate_password($password, $check_customer['customers_password'])? false : (int)$check_customer['customers_id'] ) ;
}
@@ -191,7 +187,7 @@
$resul=array_merge($pass,$resul);
/// include the password crypto functions
- require_once(DIR_WS_FUNCTIONS . 'password_funcs.php');
+// require_once(DIR_WS_FUNCTIONS . 'password_funcs.php');
if (_cst_bool('CUSTOMER_FORCE_UCWORDS')) {
$resul['lastname']=ucwords($resul['lastname']);
@@ -209,7 +205,7 @@
'customers_telephone' => $resul['telephone'],
'customers_fax' => $resul['fax'],
'customers_newsletter' => $resul['newsletter'],
- 'customers_password' => tep_encrypt_password($resul['password']),
+ 'customers_password' =>PasswordUtility::encrypt_password($resul['password']),
'customers_group_ra'=> $check_customer['customers_group_id'],
'customers_language'=> $this->languages_id,
'customers_status'=> (_cst_bool('ACCOUNT_FORCE_ACTIV_MAIL')? 2 : 1)
@@ -433,7 +429,7 @@
$_confirmation = tep_db_prepare_input($_post['password_confirmation']);
if ($this->checkPasswordProcess($_current, $_new, $_confirmation) ) {
- tep_db_query("update " . TABLE_CUSTOMERS . " set customers_password = '" . tep_encrypt_password($_new) . "' where customers_id = '" . $this->customer_id . "'");
+ tep_db_query("update " . TABLE_CUSTOMERS . " set customers_password = '" . PasswordUtility::encrypt_password($_new) . "' where customers_id = '" . $this->customer_id . "'");
tep_db_query("update " . TABLE_CUSTOMERS_INFO . " set customers_info_date_account_last_modified = now() where customers_info_id = '" . $this->customer_id . "'");
@@ -676,7 +672,7 @@
$check_customer_query = tep_db_query("select customers_password from " . TABLE_CUSTOMERS . " where customers_id = '" . $this->customer_id . "'");
$check_customer = tep_db_fetch_array($check_customer_query);
- if (tep_validate_password($current, $check_customer['customers_password'])) {
+ if (PasswordUtility::validate_password($current, $check_customer['customers_password'])) {
self::PassmessageStack('account', SUCCESS_PASSWORD_UPDATED, 'success');
return true;
}
Modified: trunk/catalog/install/includes/modele/configure.txt
===================================================================
--- trunk/catalog/install/includes/modele/configure.txt 2011-12-03 22:31:28 UTC (rev 3922)
+++ trunk/catalog/install/includes/modele/configure.txt 2011-12-04 10:10:09 UTC (rev 3923)
@@ -1,101 +1,110 @@
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package oscss-2 <www http://www.oscss.org>
- @version %CURRENT_VERSION%
- @date %CREATE_DATE%
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @package oscss-2 <www http://www.oscss.org>
+ @version %CURRENT_VERSION%
+ @date %CREATE_DATE%
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
*/
- /**
- * \brief as active / inactive cache and error return
- * @var boolean default:false
- */
- define('OSCSS_DEBUG', true);
- /**
- * \brief as active view query in error requet sql
- * @var boolean default:false
- */
- define('OSCSS_SHOW_QUERIES', true);
- /**
- * \brief as active / incative garbage collector error
- * @var boolean default: true
- */
- define('OSCSS_GARBAGE_ERROR', true);
+ /**
+ * \brief as active / inactive cache and error return
+ * @var boolean default:false
+ */
+ define('OSCSS_DEBUG', true);
+ /**
+ * \brief as active view query in error requet sql
+ * @var boolean default:false
+ */
+ define('OSCSS_SHOW_QUERIES', true);
+ /**
+ * \brief as active / incative garbage collector error
+ * @var boolean default: true
+ */
+ define('OSCSS_GARBAGE_ERROR', true);
-// Define the webserver and path parameters
-// * DIR_FS_* = Filesystem directories (local/physical)
-// * DIR_WS_* = Webserver directories (virtual/URL)
+ // Define the webserver and path parameters
+ // * DIR_FS_* = Filesystem directories (local/physical)
+ // * DIR_WS_* = Webserver directories (virtual/URL)
- define('HTTP_SERVER', '%HTTP_SERVER%'); // eg, http://localhost - should not be empty for productive servers
- define('HTTPS_SERVER', '%HTTPS_SERVER%'); // eg, https://localhost - should not be empty for productive servers
- define('ENABLE_SSL', %ENABLE_SSL%); // secure webserver for checkout procedure?
- define('HTTP_COOKIE_DOMAIN', '%HTTP_COOKIE_DOMAIN%');
- define('HTTPS_COOKIE_DOMAIN', '%HTTPS_COOKIE_DOMAIN%');
- define('HTTP_COOKIE_PATH', '%HTTP_COOKIE_PATH%');
- define('HTTPS_COOKIE_PATH', '%HTTPS_COOKIE_PATH%');
- define('DIR_WS_HTTP_CATALOG', '%HTTP_CATALOG%');
- define('DIR_WS_HTTPS_CATALOG', '%HTTP_CATALOG%');
+ define('HTTP_SERVER', '%HTTP_SERVER%'); // eg, http://localhost - should not be empty for productive servers
+ define('HTTPS_SERVER', '%HTTPS_SERVER%'); // eg, https://localhost - should not be empty for productive servers
+ define('ENABLE_SSL', %ENABLE_SSL%); // secure webserver for checkout procedure?
+ define('HTTP_COOKIE_DOMAIN', '%HTTP_COOKIE_DOMAIN%');
+ define('HTTPS_COOKIE_DOMAIN', '%HTTPS_COOKIE_DOMAIN%');
+ define('HTTP_COOKIE_PATH', '%HTTP_COOKIE_PATH%');
+ define('HTTPS_COOKIE_PATH', '%HTTPS_COOKIE_PATH%');
+ define('DIR_WS_HTTP_CATALOG', '%HTTP_CATALOG%');
+ define('DIR_WS_HTTPS_CATALOG', '%HTTP_CATALOG%');
- define('DIR_CLASSES', 'classes/');
- define('DIR_FUNCTIONS', 'functions/');
- define('DIR_FONTS', 'fonts/');
- define('DIR_MODELES', 'modeles/');
+ define('DIR_CLASSES', 'classes/');
+ define('DIR_FUNCTIONS', 'functions/');
+ define('DIR_FONTS', 'fonts/');
+ define('DIR_MODELES', 'modeles/');
- define('DIR_WS_IMAGES', 'images/');
- define('DIR_WS_ICONS', DIR_WS_IMAGES . 'icons/');
- define('DIR_WS_INCLUDES', 'includes/');
- define('DIR_WS_BOXES', DIR_WS_INCLUDES . 'boxes/');
- define('DIR_WS_FUNCTIONS', DIR_WS_INCLUDES . DIR_FUNCTIONS);
- define('DIR_WS_CLASSES', DIR_WS_INCLUDES . DIR_CLASSES);
- define('DIR_WS_MODULES', DIR_WS_INCLUDES . 'modules/');
- define('DIR_WS_LANGUAGES', DIR_WS_INCLUDES . 'languages/');
- define('DIR_WS_TRIGGERS', DIR_WS_INCLUDES . 'triggers/');
- define('DIR_WS_DOWNLOAD_PUBLIC', 'pub/');
+ define('DIR_WS_IMAGES', 'images/');
+ define('DIR_WS_ICONS', DIR_WS_IMAGES . 'icons/');
+ define('DIR_WS_INCLUDES', 'includes/');
+ define('DIR_WS_BOXES', DIR_WS_INCLUDES . 'boxes/');
+ define('DIR_WS_FUNCTIONS', DIR_WS_INCLUDES . DIR_FUNCTIONS);
+ define('DIR_WS_CLASSES', DIR_WS_INCLUDES . DIR_CLASSES);
+ define('DIR_WS_MODULES', DIR_WS_INCLUDES . 'modules/');
+ define('DIR_WS_LANGUAGES', DIR_WS_INCLUDES . 'languages/');
+ define('DIR_WS_TRIGGERS', DIR_WS_INCLUDES . 'triggers/');
+ define('DIR_WS_DOWNLOAD_PUBLIC', 'pub/');
- define('DIR_FS_CATALOG', '%FS_DOCUMENT_ROOT%');
- define('DIR_FS_ROOT_DOCS', '%FS_ROOT_DOCS%');
+ define('DIR_FS_CATALOG', '%FS_DOCUMENT_ROOT%');
+ define('DIR_FS_ROOT_DOCS', '%FS_ROOT_DOCS%');
- define('DIR_FS_CATALOG_IMAGES', DIR_FS_CATALOG . 'images/');
- define('DIR_FS_CATALOG_MODULES', DIR_FS_CATALOG . 'includes/modules/');
- define('DIR_FS_CATALOG_LANGUAGES', DIR_FS_CATALOG . 'includes/languages/');
- define('DIR_FS_CATALOG_TEMPLATE', DIR_FS_CATALOG . 'templates/');
+ define('DIR_FS_CATALOG_IMAGES', DIR_FS_CATALOG . 'images/');
+ define('DIR_FS_CATALOG_MODULES', DIR_FS_CATALOG . 'includes/modules/');
+ define('DIR_FS_CATALOG_LANGUAGES', DIR_FS_CATALOG . 'includes/languages/');
+ define('DIR_FS_CATALOG_TEMPLATE', DIR_FS_CATALOG . 'templates/');
-// public docs
- define('DIR_FS_DOWNLOAD', DIR_FS_CATALOG . 'download/');
- define('DIR_FS_DOWNLOAD_PUBLIC', DIR_FS_CATALOG . 'pub/');
+ // public docs
+ define('DIR_FS_DOWNLOAD', DIR_FS_CATALOG . 'download/');
+ define('DIR_FS_DOWNLOAD_PUBLIC', DIR_FS_CATALOG . 'pub/');
-// Documents
- define('DIR_FS_SESSIONS', DIR_FS_ROOT_DOCS . 'public/sessions/');
- define('DIR_FS_WORK', DIR_FS_ROOT_DOCS . 'public/oscss_data/');
+ // Documents
+ define('DIR_FS_SESSIONS', DIR_FS_ROOT_DOCS . 'public/sessions/');
+ define('DIR_FS_WORK', DIR_FS_ROOT_DOCS . 'public/oscss_data/');
-// Template System files
- define('DIR_FS_TEMPLATES', DIR_FS_CATALOG . 'templates/');
- define('DIR_WS_TEMPLATES', 'templates/');
+ // Template System files
+ define('DIR_FS_TEMPLATES', DIR_FS_CATALOG . 'templates/');
+ define('DIR_WS_TEMPLATES', 'templates/');
-// Common
- define('DIR_WS_COMMON', 'common/');
- define('DIR_WS_COMMON_FUNCTIONS', DIR_WS_COMMON . DIR_FUNCTIONS);
- define('DIR_WS_COMMON_FONTS', DIR_WS_COMMON . DIR_FONTS);
- define('DIR_WS_COMMON_CLASSES', DIR_WS_COMMON . DIR_CLASSES);
- define('DIR_WS_COMMON_IMAGES', DIR_WS_TEMPLATES . 'layout/');
+ // Common
+ define('DIR_WS_COMMON', 'common/');
+ define('DIR_WS_COMMON_FUNCTIONS', DIR_WS_COMMON . DIR_FUNCTIONS);
+ define('DIR_WS_COMMON_FONTS', DIR_WS_COMMON . DIR_FONTS);
+ define('DIR_WS_COMMON_CLASSES', DIR_WS_COMMON . DIR_CLASSES);
+ define('DIR_WS_COMMON_IMAGES', DIR_WS_TEMPLATES . 'layout/');
-// define our database connection
- define('DB_CONNECTOR', '%DBMOTOR%');
- define('DB_MOTOR', '%DBMOTOR%');
- define('DB_MOTOR_TYPE', '%DBMOTOR_TYPE%');
- define('DB_PORT', '%DBMOTOR_PORT%');
- define('DB_CHARSET', '%DBMOTOR_CHARSET%');
- define('DB_SERVER', '%DB_SERVER%'); // eg, localhost - should not be empty for productive servers
- define('DB_SERVER_USERNAME', '%DB_SERVER_USERNAME%');
- define('DB_SERVER_PASSWORD', '%DB_SERVER_PASSWORD%');
- define('DB_DATABASE', '%DB_DATABASE%');
- define('DB_TABLE_PREFIX', '%DB_TABLE_PREFIX%');
- define('USE_PCONNECT', '%USE_PCONNECT%'); // use persisstent connections?
- define('STORE_SESSIONS', '%STORE_SESSIONS%'); // leave empty '' for default handler or set to 'mysql'
+ // define our database connection
+ define('DB_CONNECTOR', '%DBMOTOR%');
+ define('DB_MOTOR', '%DBMOTOR%');
+ define('DB_MOTOR_TYPE', '%DBMOTOR_TYPE%');
+ define('DB_PORT', '%DBMOTOR_PORT%');
+ define('DB_CHARSET', '%DBMOTOR_CHARSET%');
+ define('DB_SERVER', '%DB_SERVER%'); // eg, localhost - should not be empty for productive servers
+ define('DB_SERVER_USERNAME', '%DB_SERVER_USERNAME%');
+ define('DB_SERVER_PASSWORD', '%DB_SERVER_PASSWORD%');
+ define('DB_DATABASE', '%DB_DATABASE%');
+ define('DB_TABLE_PREFIX', '%DB_TABLE_PREFIX%');
+ define('USE_PCONNECT', '%USE_PCONNECT%'); // use persisstent connections?
+ define('STORE_SESSIONS', '%STORE_SESSIONS%'); // leave empty '' for default handler or set to 'mysql'
- /**
- @var Security key
- @brief use by offline mode
- */
- $SecuKey='%SECURE_KEY%';
+ /**
+ @var Security key
+ @brief use by offline mode
+ */
+ $SecuKey='%SECURE_KEY%';
+
+ /**
+ @ var Define class use for encrypt pa*ssword
+ Value possible:
+ - Classic normal in oscommerce mode
+ - Md5 special for acces by other mode
+ - Sha1 new mode
+ */
+ $conf['ModPassword'] = 'Classic';
Modified: trunk/catalog/password_forgotten.php
===================================================================
--- trunk/catalog/password_forgotten.php 2011-12-03 22:31:28 UTC (rev 3922)
+++ trunk/catalog/password_forgotten.php 2011-12-04 10:10:09 UTC (rev 3923)
@@ -29,14 +29,11 @@
$u=$cust->the_customer($customers_id);
$user=$cust->detail_long_cust();
- /// include the password crypto functions
- require_once(DIR_WS_FUNCTIONS . 'password_funcs.php');
-
/**
* TODO: Utiliser class page.customer.php
*/
$user['password']=$new_password = tep_create_random_value(ENTRY_PASSWORD_MIN_LENGTH);
- $crypted_password = tep_encrypt_password($new_password);
+ $crypted_password = PasswordUtility::encrypt_password($new_password);
$DB->query("update " . TABLE_CUSTOMERS . " set customers_password = '" . tep_db_input($crypted_password) . "' where customers_id = '" . (int)$user['customers_id'] . "'");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-03 22:31:36
|
Revision: 3922
http://oscss.svn.sourceforge.net/oscss/?rev=3922&view=rev
Author: oscim
Date: 2011-12-03 22:31:28 +0000 (Sat, 03 Dec 2011)
Log Message:
-----------
correction alignement css
Correction coquille
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
trunk/catalog/install/includes/modele/configure.txt
Modified: trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab 2011-12-03 18:59:45 UTC (rev 3921)
+++ trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab 2011-12-03 22:31:28 UTC (rev 3922)
@@ -50,19 +50,19 @@
<ul>
<?php if(products::CheckClassProduct('CLASS_DATE_AVAIBLE')): ?>
<li class="block_input">
- <label for="products_date_available"><?php echo __('text products date available'); ?></label>
+ <label class="inline" for="products_date_available"><?php echo __('text products date available'); ?></label>
<?php echo tep_draw_input_field('products_date_available', '', tep_not_null(products::$pInfo->products_date_available) ? tep_date_short(products::$pInfo->products_date_available) : '', ' maxlength="10" size="10"') . tep_draw_hidden_field('bt_products_date_available') . ' ' . __('text products date format'); ?>
</li>
<?php endif; ?>
<?php if(products::CheckClassProduct('CLASS_MODELE')): ?>
<li class="block_input">
- <label for="products_model"><?php echo __('text products model'); ?></label>
+ <label class="inline" for="products_model"><?php echo __('text products model'); ?></label>
<?php echo tep_draw_input_field('products_model','', products::$pInfo->products_model); ?>
</li>
<?php endif; ?>
<?php if(products::CheckClassProduct('CLASS_SORTORDER')): ?>
<li class="block_input">
- <label for="products_ordered"><?php echo __('text products ordered'); ?></label>
+ <label class="inline" for="products_ordered"><?php echo __('text products ordered'); ?></label>
<?php echo tep_draw_input_field('products_ordered','', products::$pInfo->products_ordered); ?>
</li>
<?php endif; ?>
@@ -76,7 +76,7 @@
<?php if(products::CheckClassProduct('CLASS_WEIGHT')): ?>
<li class="block_input">
- <label for="products_weight"><?php echo __('text products weight'); ?></label>
+ <label class="inline" for="products_weight"><?php echo __('text products weight'); ?></label>
<?php echo tep_draw_input_field('products_weight','', products::$pInfo->products_weight).' '.UNIT_WEIGHT_NAME; ?>
</li>
<?php endif; ?>
@@ -89,15 +89,15 @@
<ul>
<li style="clear:both"></li>
<li class="block_input">
- <label for="products_tax_class_id"><?php echo __('text products tax class'); ?></label>
+ <label class="inline" for="products_tax_class_id"><?php echo __('text products tax class'); ?></label>
<?php echo tep_draw_pull_down_menu('products_tax_class_id', products::$tax_class_array, products::$pInfo->products_tax_class_id, 'onchange="updateGross()"').'<span class="required">*</span>'; ?><br />
</li>
<li class="block_input">
- <label for="products_price"><?php echo __('text products price net'); ?></label>
+ <label class="inline" for="products_price"><?php echo __('text products price net'); ?></label>
<?php echo tep_draw_input_field('products_price','', products::$pInfo->products_price, 'onkeyup="updateGross()"').'<span class="required">*</span>'; ?>
</li>
<li class="block_input">
- <label for="products_price_gross"><?php echo __('text products price gross'); ?></label>
+ <label class="inline" for="products_price_gross"><?php echo __('text products price gross'); ?></label>
<?php echo tep_draw_input_field('products_price_gross','', products::$pInfo->products_price, 'onkeyup="updateNet()"'); ?>
</li>
@@ -136,7 +136,7 @@
<ul>
<?php foreach (products::$pInfo->products_sppc as $sppcGpId => $sppcInfos): ?>
<li class="block_input">
- <label for="<?php echo 'sppcprice_' . $sppcGpId; ?>"><?php
+ <label class="inline" for="<?php echo 'sppcprice_' . $sppcGpId; ?>"><?php
echo tep_draw_checkbox_field('sppcoption[' . $sppcGpId . ']', '', 'sppcoption[' . $sppcGpId . ']',$sppcInfos['sppcprice']!=''?1:0) . ' ' . $sppcInfos['sppcname']; ?>
</label><?php
echo tep_draw_input_field('sppcprice[' . $sppcGpId . ']','', $sppcInfos['sppcprice']); ?>
@@ -151,7 +151,7 @@
</li>
<li class="block_input">
- <label for="products_price_gross"><?php echo __('text products final price'); ?></label>
+ <label class="inline" for="products_price_gross"><?php echo __('text products final price'); ?></label>
<?php echo tep_draw_input_field('products_price_final','', products::$pInfo->products_price, 'disabled="disabled"'); ?>
</li>
@@ -166,15 +166,17 @@
<?php if( _cst_bool('STOCK_CHECK') && products::CheckClassProduct('CLASS_STOCK')): /** Si Class de stock defini, les prix sont pris en charge par un onglet */ ?>
<fieldset class="block_field">
<legend><?php echo __('text legend stock'); ?></legend>
- <label><?php echo __('table heading stock'); ?></label>
- <?php echo tep_draw_pull_down_menu('track_stock', products::$track_stock , products::$pInfo->track_stock); ?>
- <br />
- <?php if(products::$product_investigation['has_tracked_options'] or products::$product_investigation['stock_entries_count'] > 0) :?>
- <a class="button fancyView iframe" href="<?php echo tep_href_link(FILENAME_STOCK, 'product_id=' . products::$pInfo->products_id.'&origin='.tep_href_link(products::FILENAME))?>"><?php echo __('txt stock') ?></a>
- <?php elseif(products::$pInfo->track_stock==1): ?>
- <label for="products_quantity"><?php echo __('text products quantity'); ?></label>
- <?php echo tep_draw_input_field('products_quantity','', products::$pInfo->products_quantity) ; ?><br />
- <?php endif; ?>
+ <div class="block_input">
+ <label class="inline"><?php echo __('table heading stock'); ?></label>
+ <?php echo tep_draw_pull_down_menu('track_stock', products::$track_stock , products::$pInfo->track_stock); ?>
+ <br style="clear:both;" />
+ <?php if(products::$product_investigation['has_tracked_options'] or products::$product_investigation['stock_entries_count'] > 0) :?>
+ <a class="button fancyView iframe" href="<?php echo tep_href_link(FILENAME_STOCK, 'product_id=' . products::$pInfo->products_id.'&origin='.tep_href_link(products::FILENAME))?>"><?php echo __('txt stock') ?></a>
+ <?php elseif(products::$pInfo->track_stock==1): ?>
+ <label class="inline" for="products_quantity"><?php echo __('text products quantity'); ?></label>
+ <?php echo tep_draw_input_field('products_quantity','', products::$pInfo->products_quantity) ; ?><br />
+ <?php endif; ?>
+ </div>
</fieldset>
<?php endif; ?>
Modified: trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2011-12-03 18:59:45 UTC (rev 3921)
+++ trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2011-12-03 22:31:28 UTC (rev 3922)
@@ -1,76 +1,77 @@
/**
- @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.0.9
- @date 23/06/10, 17:42
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
+ @ 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.1
+ @date 23/06/10, 17:42
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ */
body { background:#faf9f7 url(img/1/body.jpg) repeat-x; color:#000; margin:0; padding:0; font: normal 11px Verdana, Arial, sans-serif; }
html { height: 100%;}
/* prepend */
- * {margin:0;padding:0}
- a:link,
- a:visited {text-decoration: underline; color:#000;}
- a:hover { text-decoration: none; }
- img { border-width:0 ; margin:0; padding:0; }
- h1 { font-size: 2em ; padding:1em; }
- h1 img {border-width:0 ; margin:0; padding:0;}
- h2 { font-size: 1.2em ;text-shadow:0 1px 0 #fff;}
- h3 { font-size: 1.2em ;text-shadow:0 1px 0 #fff;color:#666;}
- h4 { font-size: 1em ;text-shadow:0 1px 0 #fff;}
- h5 { font-size: 1em ;text-shadow:0 1px 0 #fff;}
- p {padding:1em;}
- ul {list-style:none;}
- #central li {padding-left:0;cursor:pointer;margin:0.1em 0;}
- th { text-shadow:0 1px 0 #fff;-moz-border-radius:6px; -webkit-border-radius:6px; margin:2px 1px; text-align: left; padding: 0 5px;line-height:30px;}
+* {margin:0;padding:0}
+a :link, *
+a:visited {text-decoration: underline; color:#000;}
+a:hover { text-decoration: none; }
+img { border-width:0 ; margin:0; padding:0; }
+h1 { font-size: 2em ; padding:1em; }
+h1 img {border-width:0 ; margin:0; padding:0;}
+h2 { font-size: 1.2em ;text-shadow:0 1px 0 #fff;}
+h3 { font-size: 1.2em ;text-shadow:0 1px 0 #fff;color:#666;}
+h4 { font-size: 1em ;text-shadow:0 1px 0 #fff;}
+h5 { font-size: 1em ;text-shadow:0 1px 0 #fff;}
+p {padding:1em;}
+ul {list-style:none;}
+#central li {padding-left:0;cursor:pointer;margin:0.1em 0;}
+th { text-shadow:0 1px 0 #fff;-moz-border-radius:6px; -webkit-border-radius:6px; margin:2px 1px; text-align: left; padding: 0 5px;line-height:30px;}
/* form defintion generale */
- #form_bt { width: 80%; margin: 1em 2em;}
- input.radioInput {width:30px;}
- fieldset { margin: 1em 2em; padding:1em; border:none; }
- fieldset p { margin: 1em 0 0 0; }
- fieldset input[type="text"] { min-width:65%; display:inline-block;}
- fieldset label { width: 70%; line-height: 18px; margin-right: 10px; display:inline-block; text-align: right; padding: 0 0 2px 0;}
- fieldset ul { list-style:none;}
- ul.form_radio_inline{display:inline-block;}
- .spacer {clear:both;}
- .noselected{}
- .selected{background:#f0d4bf;}
+#form_bt { width: 80%; margin: 1em 2em;}
+input.radioInput {width:30px;}
+fieldset { margin: 1em 2em; padding:1em; border:none; }
+fieldset p { margin: 1em 0 0 0; }
+fieldset select,
+fieldset input[type="text"] { min-width:65%; display:inline-block;}
+fieldset label { width: 70%; line-height: 18px; margin-right: 10px; display:inline-block; text-align: right; padding: 0 0 2px 0;}
+fieldset ul { list-style:none;}
+ul.form_radio_inline{display:inline-block;}
+.spacer {clear:both;}
+.noselected{}
+.selected{background:#f0d4bf;}
/* general class */
- .error{ color:red; }
- .info{ color:blue;}
- div.info{ color:black;padding:10px 2px; border:2px solid #3A3B35; -moz-border-radius:6px; -webkit-border-radius:6px; background:#73756A;}
- .alert{ color:#ae0405; }
- .fright{ float:right; }
- .fleft {float:left; }
- .tleft{text-align:left}
- .tright{text-align:right}
- .tcenter{text-align:center}
- .inline { display:inline-block; }
- .inline * { display:inline-block; }
- .nobr {white-space:nowrap;}
- #central form {padding:0.5em 1em;}
- .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:10px; padding-right:10px;}
- .padd_h {padding-top:10px; padding-bottom:10px;}
+.error{ color:red; }
+.info{ color:blue;}
+div.info{ color:black;padding:10px 2px; border:2px solid #3A3B35; -moz-border-radius:6px; -webkit-border-radius:6px; background:#73756A;}
+.alert{ color:#ae0405; }
+.fright{ float:right; }
+.fleft {float:left; }
+.tleft{text-align:left}
+.tright{text-align:right}
+.tcenter{text-align:center}
+.inline { display:inline-block; }
+.inline * { display:inline-block; }
+.nobr {white-space:nowrap;}
+#central form {padding:0.5em 1em;}
+.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:10px; padding-right:10px;}
+.padd_h {padding-top:10px; padding-bottom:10px;}
/* buttons */
- .button,
- select.button,
- input[type=submit].button,
- input[type=button].button,
- button.button,
- a.button{
+.button,
+select.button,
+input[type=submit].button,
+input[type=button].button,
+button.button,
+a.button{
display: inline-block;
font-family:Arial;
white-space:nowrap;
@@ -86,432 +87,432 @@
-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5);
margin:8px 20px;
text-shadow: none;
- }
- input[type=image].button {
+}
+input[type=image].button {
float:left;
height:18px;
width:18px;
- }
+}
- input.button,
- button.button{font-size:11px; background:#ccc;padding:2px 5px; }
+input.button,
+button.button{font-size:11px; background:#ccc;padding:2px 5px; }
- a.button{ background:#eee; padding:2px 5px; margin:10px 20px ;text-decoration:none;height:18px; line-height:18px;}
- a.button:hover{background:#797979; color:white;text-decoration:none; }
+a.button{ background:#eee; padding:2px 5px; margin:10px 20px ;text-decoration:none;height:18px; line-height:18px;}
+a.button:hover{background:#797979; color:white;text-decoration:none; }
- a.button,
- select.button,
- input.button,
- button.button {background:#df1217 url(img/1/button.jpg) left top repeat-x;}
+a.button,
+select.button,
+input.button,
+button.button {background:#df1217 url(img/1/button.jpg) left top repeat-x;}
- a.button.ActionYes,
- input.button.ActionYes,
- input[type=image].button.ActionYes,
- input[type=submit].button.ActionYes,
- button.button.ActionYes {background:#ccc url(img/1/button-submit.jpg) left top repeat-x;}
+a.button.ActionYes,
+input.button.ActionYes,
+input[type=image].button.ActionYes,
+input[type=submit].button.ActionYes,
+button.button.ActionYes {background:#ccc url(img/1/button-submit.jpg) left top repeat-x;}
- a.button.ActionBack,
- input[type=image].button.ActionBack,
- button.button.ActionBack {background:#ccc url(img/1/button-back.jpg) left top repeat-x;}
+a.button.ActionBack,
+input[type=image].button.ActionBack,
+button.button.ActionBack {background:#ccc url(img/1/button-back.jpg) left top repeat-x;}
- input:hover.button,
- button:hover.button{background:#797979;color:white;}
+input:hover.button,
+button:hover.button{background:#797979;color:white;}
- a:hover.button,
- input:hover.button,
- button:hover.button {background:#ccc url(img/1/button.jpg) left -40px repeat-x; opacity:0.6;}
+a:hover.button,
+input:hover.button,
+button:hover.button {background:#ccc url(img/1/button.jpg) left -40px repeat-x; opacity:0.6;}
- a:hover.button.ActionYes,
- input:hover.button.ActionYes,
- button:hover.button.ActionYes {background:#ccc url(img/1/button-submit.jpg) left -40px repeat-x; color:black;}
+a:hover.button.ActionYes,
+input:hover.button.ActionYes,
+button:hover.button.ActionYes {background:#ccc url(img/1/button-submit.jpg) left -40px repeat-x; color:black;}
- a.button.ActionBack,
- input.button.ActionBack,
- button.button.ActionBack {background:#ccc url(img/1/button-back.jpg) left -40px repeat-x;}
+a.button.ActionBack,
+input.button.ActionBack,
+button.button.ActionBack {background:#ccc url(img/1/button-back.jpg) left -40px repeat-x;}
- input[type=image].button,
- a.buttonimg img{ opacity:1;}
+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;}
+input[type=image]:hover.button ,
+a:hover.buttonimg img,
+a.buttonimg img:hover{ opacity:0.6;}
- /* Spe buttons broswer img */
- a.button.browser {height:28px;}
- a.button img {vertical-align:middle;margin:0.3em 0.3em 0 0;}
- .row_action a.button {margin:0;}
+/* Spe buttons broswer img */
+a.button.browser {height:28px;}
+a.button img {vertical-align:middle;margin:0.3em 0.3em 0 0;}
+.row_action a.button {margin:0;}
/* --- message box --- */
- .messageBox { font-family: Verdana, Arial, sans-serif; font-size: 10px; padding:0;}
- .messageStack{ font-family: Verdana, Arial, sans-serif;}
- .messageStack li{padding:2px 0;}
- .messageStackError,
- .messageStackWarning { background:#fbe3e1;}
- .messageStackSuccess { background:transparent url(img/1/menu_bg_success.jpg) left top repeat-x; }
- .messageStackNotice { background:transparent url(img/1/menu_bg_success.jpg) left top repeat-x;}
+.messageBox { font-family: Verdana, Arial, sans-serif; font-size: 10px; padding:0;}
+.messageStack{ font-family: Verdana, Arial, sans-serif;}
+.messageStack li{padding:2px 0;}
+.messageStackError,
+.messageStackWarning { background:#fbe3e1;}
+.messageStackSuccess { background:transparent url(img/1/menu_bg_success.jpg) left top repeat-x; }
+.messageStackNotice { background:transparent url(img/1/menu_bg_success.jpg) left top repeat-x;}
/* Onglet */
- .tabPage { position: relative; top: 0; z-index: 0; }
+.tabPage { position: relative; top: 0; z-index: 0; }
/* Class apercu ligne au survol */
- .dataTableRow{background-color: #F0F1F1;height:3em;}
- .dataTableRow:hover,
- .dataTableBase tr:hover,
- .dataTable tr:hover{ background-color: #E6FF99; cursor: pointer; }
- .dataTableRow.Selected,
- .dataTableBase tr.Selected ,
- .dataTable tr.Selected { background-color: #fff;border-bottom:1px solid #ccc;}
- .dataTableRow td.hierac_enfant {padding-left:0.7em;}
+.dataTableRow{background-color: #F0F1F1;height:3em;}
+.dataTableRow:hover,
+.dataTableBase tr:hover,
+.dataTable tr:hover{ background-color: #E6FF99; cursor: pointer; }
+.dataTableRow.Selected,
+.dataTableBase tr.Selected ,
+.dataTable tr.Selected { background-color: #fff;border-bottom:1px solid #ccc;}
+.dataTableRow td.hierac_enfant {padding-left:0.7em;}
/* class qui rend element enfant visible au survol de l'element parent*/
- .view.fils {display:none}
- .dataTableBase tr:hover .view.fils,
- .dataTable tr:hover .view.fils,
- .dataTableRow.Selected .view.fils,
- .view.parent:hover .view.fils{display:block;height:18px}
+.view.fils {display:none}
+.dataTableBase tr:hover .view.fils,
+.dataTable tr:hover .view.fils,
+.dataTableRow.Selected .view.fils,
+.view.parent:hover .view.fils{display:block;height:18px}
- .dataTable a.button,
- .dataTable input[type=submit].button,
- .dataTable input[type=image].button,
- .dataTable button.button {margin:0;}
+.dataTable a.button,
+.dataTable input[type=submit].button,
+.dataTable input[type=image].button,
+.dataTable button.button {margin:0;}
/* sort by*/
- .sort_by { clear:both;display:block; text-align:center; width:100%}
- .sort_by .Selected { border-bottom:2px solid red;}
+.sort_by { clear:both;display:block; text-align:center; width:100%}
+.sort_by .Selected { border-bottom:2px solid red;}
/* Bouton bas page*/
- .button_nav{clear:both;}
- .button_nav form{float:right; width:100px;}
- .button_nav form p {margin:0;padding:0;}
+.button_nav{clear:both;}
+.button_nav form{float:right; width:100px;}
+.button_nav form p {margin:0;padding:0;}
/* */
- #row_by_page_select option {display:block;}
+#row_by_page_select option {display:block;}
/* Structure */
- #glob {background:transparent url(img/1/black.jpg) repeat-x ; width:100%; background-attachment:fixed; z-index:10; height:100%;}
- #center { margin: 0 auto; position: relative; min-width:900px;width:90%;max-width:1200px; }
- #header {background:black; min-width:900px;width:90%;max-width:1200px; margin:0 0; position:fixed; z-index:10;}
+#glob {background:transparent url(img/1/black.jpg) repeat-x ; width:100%; background-attachment:fixed; z-index:10; height:100%;}
+#center { margin: 0 auto; position: relative; min-width:900px;width:90%;max-width:1200px; }
+#header {background:black; min-width:900px;width:90%;max-width:1200px; margin:0 0; position:fixed; z-index:10;}
- #central { position:relative; padding:10px 5px; top:73px;border-left: 1px solid black;
- border-right: 1px solid black;border-bottom: 1px solid black;background:white; }
- #central div.box_uniq { width:99%; float:left; }
- #central div.box_left { width:60%; float:left; }
+#central { position:relative; padding:10px 5px; top:73px;border-left: 1px solid black;
+border-right: 1px solid black;border-bottom: 1px solid black;background:white; }
+#central div.box_uniq { width:99%; float:left; }
+#central div.box_left { width:60%; float:left; }
- #central div.box_right {border:1px solid #ACAAAC; width:39%; float:right; background:#f1f1f1; background-color: #ffffff;-moz-border-radius:6px; -webkit-border-radius: 6px;}
- .configuration #central div.box_right { right:0; width:39%; }
- .configuration #central div.box_right ul{ list-style:none; }
- #bas { margin-top:8em; clear:both; height:25px; background:black;color:white;}
- div#footer { background:#303030; clear:both;width:100%; text-align:center;color:white;}
+#central div.box_right {border:1px solid #ACAAAC; width:39%; float:right; background:#f1f1f1; background-color: #ffffff;-moz-border-radius:6px; -webkit-border-radius: 6px;}
+.configuration #central div.box_right { right:0; width:39%; }
+.configuration #central div.box_right ul{ list-style:none; }
+#bas { margin-top:8em; clear:both; height:25px; background:black;color:white;}
+div#footer { background:#303030; clear:both;width:100%; text-align:center;color:white;}
/* menu Fonctionnement tiroir */
- #menutitre, #menutitre ul { padding:0; margin:0; list-style:none;}
- #menutitre li { position:relative; float:left; padding: 0 5px; background:transparent url(img/1/bg-nav.jpg) repeat-x ; height:25px;}
- #menutitre li ul { list-style:none; position:absolute; top:25px; left:0; display:none; z-index:10; }
- #menutitre ul li { float:none; width:200px; background:#303030 ;}
- #menutitre ul.ssmenu li a{color:#9C9A9B;text-shadow: none;}
- #menutitre li:hover ul { display:block; }
- #menutitre a { display:block; padding-top:4px;padding-left: 20px; color:white; text-decoration:none; height:18px; text-align:center; font:normal 11px Verdana, Arial, sans-serif; }
- #menutitre .disabled, #menutitre .disabled:hover { display:none;}
- #menutitre .disabled ul li a,
- #menutitre .disabled ul li a:hover { display:none; }
- #menutitre a:hover { color:#000; text-decoration:none; }
- #menutitre a.active { text-decoration:none; }
- #menutitre .ssmenu { margin:0 1px 1px 0; background:#ccc; text-decoration:none; white-space:nowrap; border-left:1px solid #747474;}
- #menutitre li ul.ssmenu li ul.ssmenu,
- #menutitre li ul.ssmenu li ul.ssmenu li ul.ssmenu{list-style:none; position:absolute; top:-1px; left:180px; display:none; z-index:15; }
- #menutitre li ul.ssmenu li:hover ul.ssmenu,
- #menutitre li ul.ssmenu li ul.ssmenu li:hover ul.ssmenu{ display:block }
- #menutitre .ssmenu a { color:#000; padding:2px 0px 2px 26px; text-decoration:none; line-height:20px; border:none; width:154px; text-align:left; }
- #menutitre .ssmenu a:hover { background-color:#999; color:#fff;text-shadow: 0 1px 0 #000; text-decoration:none; }
- div.menuSeparator { padding:2px 10px; display:block; background:#888; border-bottom:1px solid #ccc; font-size:12px; color:#FFF; line-height:14px; clear:both; }
- #ssmenu a { float:left; padding:5px 10px; margin:0;font-size:10px;background:#797979;color:white;text-shadow: 0 1px 0 #000;border-right:1px solid #444;}
- #ssmenu a:hover { float:left; padding:5px 10px ; margin:0;font-size:10px;background:#eee;color:#000;text-shadow: 0 1px 0 #fff;-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5);-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5);}
- #menu_theme * {display:block;}
+#menutitre, #menutitre ul { padding:0; margin:0; list-style:none;}
+#menutitre li { position:relative; float:left; padding: 0 5px; background:transparent url(img/1/bg-nav.jpg) repeat-x ; height:25px;}
+#menutitre li ul { list-style:none; position:absolute; top:25px; left:0; display:none; z-index:10; }
+#menutitre ul li { float:none; width:200px; background:#303030 ;}
+#menutitre ul.ssmenu li a{color:#9C9A9B;text-shadow: none;}
+#menutitre li:hover ul { display:block; }
+#menutitre a { display:block; padding-top:4px;padding-left: 20px; color:white; text-decoration:none; height:18px; text-align:center; font:normal 11px Verdana, Arial, sans-serif; }
+#menutitre .disabled, #menutitre .disabled:hover { display:none;}
+#menutitre .disabled ul li a,
+#menutitre .disabled ul li a:hover { display:none; }
+#menutitre a:hover { color:#000; text-decoration:none; }
+#menutitre a.active { text-decoration:none; }
+#menutitre .ssmenu { margin:0 1px 1px 0; background:#ccc; text-decoration:none; white-space:nowrap; border-left:1px solid #747474;}
+#menutitre li ul.ssmenu li ul.ssmenu,
+#menutitre li ul.ssmenu li ul.ssmenu li ul.ssmenu{list-style:none; position:absolute; top:-1px; left:180px; display:none; z-index:15; }
+#menutitre li ul.ssmenu li:hover ul.ssmenu,
+#menutitre li ul.ssmenu li ul.ssmenu li:hover ul.ssmenu{ display:block }
+#menutitre .ssmenu a { color:#000; padding:2px 0px 2px 26px; text-decoration:none; line-height:20px; border:none; width:154px; text-align:left; }
+#menutitre .ssmenu a:hover { background-color:#999; color:#fff;text-shadow: 0 1px 0 #000; text-decoration:none; }
+div.menuSeparator { padding:2px 10px; display:block; background:#888; border-bottom:1px solid #ccc; font-size:12px; color:#FFF; line-height:14px; clear:both; }
+#ssmenu a { float:left; padding:5px 10px; margin:0;font-size:10px;background:#797979;color:white;text-shadow: 0 1px 0 #000;border-right:1px solid #444;}
+#ssmenu a:hover { float:left; padding:5px 10px ; margin:0;font-size:10px;background:#eee;color:#000;text-shadow: 0 1px 0 #fff;-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5);-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5);}
+#menu_theme * {display:block;}
- /* sous menu en widget */
- #central #SsMenuConfig #ssmenu {background:none;}
- #SsMenuConfig #ssmenu a { background: none repeat scroll 0 0 #797979; border-right: 1px solid #444444; clear: both; color: white; font-size: 10px; margin: 0 0 1px 25px; padding: 5px 10px; text-shadow: 0 1px 0 #000000; width: 40%;}
- #SsMenuConfig #ssmenu a:hover { float:left; padding:5px 10px ; margin:0;font-size:10px;background:#eee;color:#000;text-shadow: 0 1px 0 #fff;-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5);-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5);}
+/* sous menu en widget */
+#central #SsMenuConfig #ssmenu {background:none;}
+#SsMenuConfig #ssmenu a { background: none repeat scroll 0 0 #797979; border-right: 1px solid #444444; clear: both; color: white; font-size: 10px; margin: 0 0 1px 25px; padding: 5px 10px; text-shadow: 0 1px 0 #000000; width: 40%;}
+#SsMenuConfig #ssmenu a:hover { float:left; padding:5px 10px ; margin:0;font-size:10px;background:#eee;color:#000;text-shadow: 0 1px 0 #fff;-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5);-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5);}
/* Habillage */
- /* header */
- #headInfos {display:inline-block; height:25px; margin:0; padding:0;width:100%; color:white;}
- #headInfos h1 {display:inline; margin:0 2px; padding:0; line-height:25px;}
- #headInfos h2 {display:inline; line-height:25px; color:white; vertical-align:top;}
- #headInfos a,
- #headInfos span{padding-right:1em; color:white; text-decoration:none; line-height:25px; vertical-align:top;float:right;}
- #headInfos a:hover{text-decoration:underline;}
- #menubar{ background:transparent ; height:25px; border-top: 1px solid #fff;}
- #menubar li.account {padding-right:8px;}
- /* user bar */
- #user { background:transparent ;border-top: 1px solid #fff; padding-right:10px; height:25px;}
- #user ul#MenuExts li { background:transparent url(img/1/bg_header.jpg) repeat-x ;padding:0 8px;}
- #user ul#MenuExts li a {color:white;}
- #user ul#MenuExts li a:hover{color:gray;}
- #user li { position:relative; float:left;}
- #user a { display:block; padding-top:4px; color:#000; text-decoration:none; text-shadow:none; height:18px; text-align:center; font:normal 11px Verdana, Arial, sans-serif; }
- /* Switcher */
- p.themeSwitcher { float:right; margin:0; padding:2px 1em 0 0; text-align:right; width:250px; }
- p.themeSwitcher select { vertical-align:middle; font-size:0.9em; width:100px; }
- /* Bookmark */
- #menubookmark p.themeSwitcher select option,
- #menurecently p.themeSwitcher select#recently_viewed option {display:block;}
+/* header */
+#headInfos {display:inline-block; height:25px; margin:0; padding:0;width:100%; color:white;}
+#headInfos h1 {display:inline; margin:0 2px; padding:0; line-height:25px;}
+#headInfos h2 {display:inline; line-height:25px; color:white; vertical-align:top;}
+#headInfos a,
+#headInfos span{padding-right:1em; color:white; text-decoration:none; line-height:25px; vertical-align:top;float:right;}
+#headInfos a:hover{text-decoration:underline;}
+#menubar{ background:transparent ; height:25px; border-top: 1px solid #fff;}
+#menubar li.account {padding-right:8px;}
+/* user bar */
+#user { background:transparent ;border-top: 1px solid #fff; padding-right:10px; height:25px;}
+#user ul#MenuExts li { background:transparent url(img/1/bg_header.jpg) repeat-x ;padding:0 8px;}
+#user ul#MenuExts li a {color:white;}
+#user ul#MenuExts li a:hover{color:gray;}
+#user li { position:relative; float:left;}
+#user a { display:block; padding-top:4px; color:#000; text-decoration:none; text-shadow:none; height:18px; text-align:center; font:normal 11px Verdana, Arial, sans-serif; }
+/* Switcher */
+p.themeSwitcher { float:right; margin:0; padding:2px 1em 0 0; text-align:right; width:250px; }
+p.themeSwitcher select { vertical-align:middle; font-size:0.9em; width:100px; }
+/* Bookmark */
+#menubookmark p.themeSwitcher select option,
+#menurecently p.themeSwitcher select#recently_viewed option {display:block;}
- /* content */
- #central h3{ font-size:15px; font-weight:bold; margin:0 0 10px; padding:0 5px 10px 3px; clear:both; }
- #central h4{font-weight:bold; padding:15px 5px 8px; clear:both; }
- /* Block formulaire central */
- #central .block_form { -moz-border-radius:6px; -webkit-border-radius:6px; width:99%; margin:0;padding:5px 0.2em 10px 0.2em; display:inline-block; text-align: left; background:#C9C9C9;}
- #central .block_form .tabs_lang{width:98%; float:left;}
- #central .block_form div.tabPage {padding-left:0; padding-right:0;}
- #central .block_form .block_input,
- #central form .block_input { text-shadow:0 1px 0 #fff;-moz-border-radius:6px; -webkit-border-radius:6px; width:98%; margin:2px 1px; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;line-height:30px;}
+/* content */
+#central h3{ font-size:15px; font-weight:bold; margin:0 0 10px; padding:0 5px 10px 3px; clear:both; }
+#central h4{font-weight:bold; padding:15px 5px 8px; clear:both; }
+/* Block formulaire central */
+#central .block_form { -moz-border-radius:6px; -webkit-border-radius:6px; width:99%; margin:0;padding:5px 0.2em 10px 0.2em; display:inline-block; text-align: left; background:#C9C9C9;}
+#central .block_form .tabs_lang{width:98%; float:left;}
+#central .block_form div.tabPage {padding-left:0; padding-right:0;}
+#central .block_form .block_input,
+#central form .block_input { text-shadow:0 1px 0 #fff;-moz-border-radius:6px; -webkit-border-radius:6px; width:98%; margin:2px 1px; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;line-height:30px;}
/* input[type="radio"] */
- #central .block_input span.value_edit {display:block; width:100%; clear:both;}
+#central .block_input span.value_edit {display:block; width:100%; clear:both;}
- #central .block_form .block_input span.value_edit {display:inline-block; width:100%;}
- #central .block_form .block_input br,
- #central .block_form .block_input span.value_edit br{display:none;}
- #central .block_form .block_input span.edit-input,
- #central .block_form .block_input span.value_edit span.edit-input{float:left; display:inline-block; padding:0 12px;}
- #central .block_form .block_input span.edit-input .edit-input-value-alternate {float:left; display:inline-block; padding:0 12px;width:25px; height: 25px;}
+#central .block_form .block_input span.value_edit {display:inline-block; width:100%;}
+#central .block_form .block_input br,
+#central .block_form .block_input span.value_edit br{display:none;}
+#central .block_form .block_input span.edit-input,
+#central .block_form .block_input span.value_edit span.edit-input{float:left; display:inline-block; padding:0 12px;}
+#central .block_form .block_input span.edit-input .edit-input-value-alternate {float:left; display:inline-block; padding:0 12px;width:25px; height: 25px;}
- /* DEB Non intrusif */
- /* remplacement true /false par icone */
- #central .block_form .block_input span.edit-input .edit-input-value .Val-true ,
- #central .block_form .block_input span.edit-input .edit-input-value .Val-false {font-size:0;}
- #central .block_form .block_input span.edit-input .edit-input-value-alternate.Val-true {background:transparent url(img/1/check.png) left top no-repeat; }
- #central .block_form .block_input span.edit-input .edit-input-value-alternate.Val-false {background:transparent url(img/1/busy.png) left top no-repeat;}
+/* DEB Non intrusif */
+/* remplacement true /false par icone */
+#central .block_form .block_input span.edit-input .edit-input-value .Val-true ,
+#central .block_form .block_input span.edit-input .edit-input-value .Val-false {font-size:0;}
+#central .block_form .block_input span.edit-input .edit-input-value-alternate.Val-true {background:transparent url(img/1/check.png) left top no-repeat; }
+#central .block_form .block_input span.edit-input .edit-input-value-alternate.Val-false {background:transparent url(img/1/busy.png) left top no-repeat;}
- /** Col status in tables - Replace status number by img */
- .dataTable tr td .edit-input-value .Val.img,
- .dataTableBase tr td .edit-input-value .Val.img { display: block; height: 16px; margin: auto; width: 16px;}
+/** Col status in tables - Replace status number by img */
+.dataTable tr td .edit-input-value .Val.img,
+.dataTableBase tr td .edit-input-value .Val.img { display: block; height: 16px; margin: auto; width: 16px;}
- .dataTable tr td .edit-input-value .Flag-0.txt,
- .dataTableBase tr td .edit-input-value .Flag-0.txt,
- .dataTable tr td .edit-input-value .Val-0.txt,
- .dataTableBase tr td .edit-input-value .Val-0.txt { display:none}
+.dataTable tr td .edit-input-value .Flag-0.txt,
+.dataTableBase tr td .edit-input-value .Flag-0.txt,
+.dataTable tr td .edit-input-value .Val-0.txt,
+.dataTableBase tr td .edit-input-value .Val-0.txt { display:none}
- .dataTable tr td .edit-input-value .Flag-0.img,
- .dataTableBase tr td .edit-input-value .Flag-0.img{background:transparent url("../../../images/icons/icon_status_red.gif") left top no-repeat}
- .dataTable tr td .edit-input-value .Val-0.img,
- .dataTableBase tr td .edit-input-value .Val-0.img { width: 10px; background:transparent url("../../../images/icons/icon_view_red.gif") left top no-repeat}
+.dataTable tr td .edit-input-value .Flag-0.img,
+.dataTableBase tr td .edit-input-value .Flag-0.img{background:transparent url("../../../images/icons/icon_status_red.gif") left top no-repeat}
+.dataTable tr td .edit-input-value .Val-0.img,
+.dataTableBase tr td .edit-input-value .Val-0.img { width: 10px; background:transparent url("../../../images/icons/icon_view_red.gif") left top no-repeat}
- .dataTable tr td .edit-input-value .Flag-1.txt,
- .dataTableBase tr td .edit-input-value .Flag-1.txt,
- .dataTable tr td .edit-input-value .Val-1.txt,
- .dataTableBase tr td .edit-input-value .Val-1.txt { display:none}
+.dataTable tr td .edit-input-value .Flag-1.txt,
+.dataTableBase tr td .edit-input-value .Flag-1.txt,
+.dataTable tr td .edit-input-value .Val-1.txt,
+.dataTableBase tr td .edit-input-value .Val-1.txt { display:none}
- .dataTable tr td .edit-input-value .Flag-1.img,
- .dataTableBase tr td .edit-input-value .Flag-1.img{background:transparent url("../../../images/icons/icon_status_green.gif") left top no-repeat}
- .dataTable tr td .edit-input-value .Val-1.img,
- .dataTableBase tr td .edit-input-value .Val-1.img {width: 10px; background:transparent url("../../../images/icons/icon_view_green.gif") left top no-repeat}
- /* FIN Non intrusif */
+.dataTable tr td .edit-input-value .Flag-1.img,
+.dataTableBase tr td .edit-input-value .Flag-1.img{background:transparent url("../../../images/icons/icon_status_green.gif") left top no-repeat}
+.dataTable tr td .edit-input-value .Val-1.img,
+.dataTableBase tr td .edit-input-value .Val-1.img {width: 10px; background:transparent url("../../../images/icons/icon_view_green.gif") left top no-repeat}
+/* FIN Non intrusif */
- /* Ajsutement Page Orders*/
- #central .box_uniq.block_form.main-orders fieldset{margin:10px 0 0 0;padding:0 5px;}
+/* Ajsutement Page Orders*/
+#central .box_uniq.block_form.main-orders fieldset{margin:10px 0 0 0;padding:0 5px;}
- #central div.main-orders.block {background:#c9c9c9; -moz-border-radius: 6px 6px 6px 6px;}
+#central div.main-orders.block {background:#c9c9c9; -moz-border-radius: 6px 6px 6px 6px;}
- #central .block_form.main-orders .block_input br,
- #central .block_form.main-orders .block_input span.value_edit br{display:block;height:0;}
+#central .block_form.main-orders .block_input br,
+#central .block_form.main-orders .block_input span.value_edit br{display:block;height:0;}
- #central table.main-orders {width:100%;}
- #central table.main-orders thead tr th{background:#303030; color:white;}
- #central table.main-orders tr th{background:#eee; height:20px;line-height: 20px; }
- #central table.main-orders tr th a{margin:0;}
+#central table.main-orders {width:100%;}
+#central table.main-orders thead tr th{background:#303030; color:white;}
+#central table.main-orders tr th{background:#eee; height:20px;line-height: 20px; }
+#central table.main-orders tr th a{margin:0;}
- /* Ajsutement customer page */
- #central .box_uniq.block_form.main-customers .block_input label{width:35%;}
+/* Ajsutement customer page */
+#central .box_uniq.block_form.main-customers .block_input label{width:35%;}
- /* central form .block_input */
- #central form .block_input .hasDatepicker{ margin:0; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;line-height:30px; min-width:0;}
- #central form .block_field { text-shadow:0 1px 0 #fff;-moz-border-radius:6px; -webkit-border-radius:6px; min-width:96%; width:96.5%; max-width:97%; margin:2px ; display:inline-block; text-align: left; padding: 5px; float:left;background:#eee;}
- #central form .block_field.tabs_lang{width:96.9%}
- #central form .block_field.tabs_lang ul.ui-tabs-nav{padding:0; margin:0 -5px;}
- #central form .block_field.tabs_lang ul.ui-tabs-panel{padding:0; margin:0 -5px;}
- #central form .edit.col_right .block_input{width:95%;}
- #central form .edit.col_right .block_input label{width:20%;text-align:left;font-weight:bold}
- #central form p.new_product_img { float:left; padding:5px; margin : 0 auto;text-align:center; width:98%;}
- #central form p.new_product_img img{ -moz-border-radius:6px; -webkit-border-radius: 6px; border:1px solid #ACAAAC; margin:1px}
- #central form fieldset legend { color:#666666; font-size:1.2em; font-style:italic; font-weight:bold; padding:0 5px 0 20px;}
- #central form p select,
- #central form p input[type="text"] { margin:5px 15px; min-width:200px; }
- #central form p input[type="radio"],
- #central form p input[type="checkbox"] { float:right; margin:5px 15px; width:20px; }
+/* central form .block_input */
+#central form .block_input .hasDatepicker{ margin:0; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;line-height:30px; min-width:0;}
+#central form .block_field { text-shadow:0 1px 0 #fff;-moz-border-radius:6px; -webkit-border-radius:6px; min-width:96%; width:96.5%; max-width:97%; margin:2px ; display:inline-block; text-align: left; padding: 5px; float:left;background:#eee;}
+#central form .block_field.tabs_lang{width:96.9%}
+#central form .block_field.tabs_lang ul.ui-tabs-nav{padding:0; margin:0 -5px;}
+#central form .block_field.tabs_lang ul.ui-tabs-panel{padding:0; margin:0 -5px;}
+#central form .edit.col_right .block_input{width:95%;}
+#central form .edit.col_right .block_input label{width:20%;text-align:left;font-weight:bold}
+#central form p.new_product_img { float:left; padding:5px; margin : 0 auto;text-align:center; width:98%;}
+#central form p.new_product_img img{ -moz-border-radius:6px; -webkit-border-radius: 6px; border:1px solid #ACAAAC; margin:1px}
+#central form fieldset legend { color:#666666; font-size:1.2em; font-style:italic; font-weight:bold; padding:0 5px 0 20px;}
+#central form p select,
+#central form p input[type="text"] { margin:5px 15px; min-width:200px; }
+#central form p input[type="radio"],
+#central form p input[type="checkbox"] { float:right; margin:5px 15px; width:20px; }
- #central form .input-multi input[type="radio"]{float:none;}
+#central form .input-multi input[type="radio"]{float:none;}
- #central form#configuration p input[type="text"] { margin:5px 15px;width:60%; }
+#central form#configuration p input[type="text"] { margin:5px 15px;width:60%; }
- #central form 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%;}
- #central form .block_input label.inline { white-space:nowrap; width: 20%;}
- #central form textarea{ vertical-align:baseline;}
+#central form 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%;}
+#central form .block_input label.inline { white-space:nowrap; width: 20%;}
+#central form textarea{ vertical-align:baseline;}
- #central .label.text {font-weight:bold;margin:0 5px;}
- #central #ssmenu {background:#797979; height: 2.2em;-moz-border-radius:6px; -webkit-border-radius: 6px;padding-left:0.5em;margin:1em;}
- /* data table */
- .dataTableBase,
- .dataTableSearch,
- .dataTable{ width:100%; border-width:0; -moz-border-radius:6px; -webkit-border-radius: 6px; border:1px solid #ACAAAC;}
- .dataTableBase tbody,
- .dataTableSearch tbody,
- .dataTable tbody {background-color: #f1f1f1;}
- .dataTableBase thead tr,
- .dataTableSearch thead tr,
- .dataTable thead tr{border-top-color: #FFFFFF; border-bottom-color: #525552; border-left-color: #FFFFFF; border-right-color: #525552; border-style: solid; border-width: 1px;}
- .dataTableBase tr,
- .dataTableSearch tr,
- .dataTable tr{border:1px solid transparent;cursor:default}
- .dataTableBase th,
- .dataTableSearch th,
- .dataTable th{ background-color: #303030; font-size:1em; font-weight:bold; text-align:center; color:white; text-shadow:none; }
- .dataTableBase tr td,
- .dataTableSearch tr td,
- .dataTable tr td{ color: #000000;padding: 2px; font-size: 10px;cursor:default;text-shadow:0 1px 0 #fff;}
- .dataTableBase td.row_action,
- .dataTableSearch td.row_action,
- .dataTable td.row_action { width:150px; text-align:right;}
- .dataTableBase td.row_action_large,
- .dataTableSearch td.row_action_large,
- .dataTable td.row_action_large { width:250px; text-align:right;}
- .dataTableBase td.row_customers,
- .dataTableSearch td.row_customers,
- .dataTable td.row_customers { width:250px; text-align:left;}
- /* Block formulaire central block right */
- #central .box_right form .block_input { -moz-border-radius:6px; -webkit-border-radius:6px; width:97%; margin:2px 1px; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;}
- #central .box_right form label {width:20%;text-align:left;font-weight:bold}
- #central .box_right form fieldset .button_nav input[type="text"].block_input {min-width:200; }
+#central .label.text {font-weight:bold;margin:0 5px;}
+#central #ssmenu {background:#797979; height: 2.2em;-moz-border-radius:6px; -webkit-border-radius: 6px;padding-left:0.5em;margin:1em;}
+/* data table */
+.dataTableBase,
+.dataTableSearch,
+.dataTable{ width:100%; border-width:0; -moz-border-radius:6px; -webkit-border-radius: 6px; border:1px solid #ACAAAC;}
+.dataTableBase tbody,
+.dataTableSearch tbody,
+.dataTable tbody {background-color: #f1f1f1;}
+.dataTableBase thead tr,
+.dataTableSearch thead tr,
+.dataTable thead tr{border-top-color: #FFFFFF; border-bottom-color: #525552; border-left-color: #FFFFFF; border-right-color: #525552; border-style: solid; border-width: 1px;}
+.dataTableBase tr,
+.dataTableSearch tr,
+.dataTable tr{border:1px solid transparent;cursor:default}
+.dataTableBase th,
+.dataTableSearch th,
+.dataTable th{ background-color: #303030; font-size:1em; font-weight:bold; text-align:center; color:white; text-shadow:none; }
+.dataTableBase tr td,
+.dataTableSearch tr td,
+.dataTable tr td{ color: #000000;padding: 2px; font-size: 10px;cursor:default;text-shadow:0 1px 0 #fff;}
+.dataTableBase td.row_action,
+.dataTableSearch td.row_action,
+.dataTable td.row_action { width:150px; text-align:right;}
+.dataTableBase td.row_action_large,
+.dataTableSearch td.row_action_large,
+.dataTable td.row_action_large { width:250px; text-align:right;}
+.dataTableBase td.row_customers,
+.dataTableSearch td.row_customers,
+.dataTable td.row_customers { width:250px; text-align:left;}
+/* Block formulaire central block right */
+#central .box_right form .block_input { -moz-border-radius:6px; -webkit-border-radius:6px; width:97%; margin:2px 1px; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;}
+#central .box_right form label {width:20%;text-align:left;font-weight:bold}
+#central .box_right form fieldset .button_nav input[type="text"].block_input {min-width:200; }
- /* footer */
- #bas a {padding: 4px 25px;color:white;}
- #bas a.oscommerce { background: transparent url(img/1/oscss.png) 0px 2px no-repeat; text-decoration:none; }
- #bas a.oscss { background: transparent url(img/1/oscss.png) 0px 2px no-repeat; text-decoration:none; }
- #bas a.oscim { background: transparent url(img/1/ico_oscim_20.png) 0px 2px no-repeat; text-decoration:none; }
- #footer a {color:white;}
+/* footer */
+#bas a {padding: 4px 25px;color:white;}
+#bas a.oscommerce { background: transparent url(img/1/oscss.png) 0px 2px no-repeat; text-decoration:none; }
+#bas a.oscss { background: transparent url(img/1/oscss.png) 0px 2px no-repeat; text-decoration:none; }
+#bas a.oscim { background: transparent url(img/1/ico_oscim_20.png) 0px 2px no-repeat; text-decoration:none; }
+#footer a {color:white;}
/* Specifique page diverse */
- /* account */
- .formArea { background-color: #f1f9fe; border-color: #7b9ebd; border-style: solid; border-width: 1px; }
- .formAreaTitle { font-family: Tahoma, Verdana, Arial, sans-serif; font-size: 12px; font-weight: bold; }
+/* account */
+.formArea { background-color: #f1f9fe; border-color: #7b9ebd; border-style: solid; border-width: 1px; }
+.formAreaTitle { font-family: Tahoma, Verdana, Arial, sans-serif; font-size: 12px; font-weight: bold; }
- /* attributes */
- .attributes-odd { background-color: #f4f7fd; }
- .attributes-even { background-color: #ffffff; }
+/* attributes */
+.attributes-odd { background-color: #f4f7fd; }
+.attributes-even { background-color: #ffffff; }
/* info box block droit */
- .infoBoxHeading { background-color: #ffffff; border-width:0; -moz-border-radius:6px; -webkit-border-radius: 6px;}
- .infoBoxContent{ -moz-border-radius:0 0 4px 4px; -webkit-border-radius: 0 0 4px 4px;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;}
- .infoBoxContent li{clear:both; }
- .infoBoxContent li.ui-state-default {clear:none; }
+.infoBoxHeading { background-color: #ffffff; border-width:0; -moz-border-radius:6px; -webkit-border-radius: 6px;}
+.infoBoxContent{ -moz-border-radius:0 0 4px 4px; -webkit-border-radius: 0 0 4px 4px;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;}
+.infoBoxContent li{clear:both; }
+.infoBoxContent li.ui-state-default {clear:none; }
/* PAge sPECIFIQUE*/
- /* widjet homePage */
- #homestats { background:transparent url(../../../images/stats.gif) bottom right no-repeat; }
- #homestats dd {margin-left: 14em; padding: 3px; margin-bottom: 5px; line-height: 1.5em}
- #homestats dt {float:left; width: 13em; padding: 3px; line-height: 1.5em; text-align:right; font-weight:bold;}
- #homestats dl {padding: 5px 0 10px 5px;}
- #homeNews { background:transparent url(img/1/header_feed.png) bottom right no-repeat; }
- #homeNews dl {padding: 5px 0 10px 5px;}
- #homeNews dt {padding: 3px; font-size:12px; font-weight:bold;}
- #homeNews dt span.date {font-size:9px; color:gray;}
- #homeNews dd {padding: 3px; margin-bottom: 5px;}
- #homeNews dt a {text-decoration:none; color:#545683;}
- #homeNews dt a:hover {color:#9D9FBF;}
+/* widjet homePage */
+#homestats { background:transparent url(../../../images/stats.gif) bottom right no-repeat; }
+#homestats dd {margin-left: 14em; padding: 3px; margin-bottom: 5px; line-height: 1.5em}
+#homestats dt {float:left; width: 13em; padding: 3px; line-height: 1.5em; text-align:right; font-weight:bold;}
+#homestats dl {padding: 5px 0 10px 5px;}
+#homeNews { background:transparent url(img/1/header_feed.png) bottom right no-repeat; }
+#homeNews dl {padding: 5px 0 10px 5px;}
+#homeNews dt {padding: 3px; font-size:12px; font-weight:bold;}
+#homeNews dt span.date {font-size:9px; color:gray;}
+#homeNews dd {padding: 3px; margin-bottom: 5px;}
+#homeNews dt a {text-decoration:none; color:#545683;}
+#homeNews dt a:hover {color:#9D9FBF;}
- /* statistqiue et rapport*/
- table.dataTable.stat.stock tr {margin:2px; position:relative }
- #central.stats tr.OutofStock{background:#d95017;}
- #central.stats td.OutofStockAttrib {background:#d95017;}
- #central.stats tr.attribute.stock td table{margin-left:10px; width:96%;}
- #central.stats tr.dataTableRow.attribute.stock { border-left:1px solid black; }
- #central.stats table tr table { margin:0; padding:0; border:0; }
+/* statistqiue et rapport*/
+table.dataTable.stat.stock tr {margin:2px; position:relative }
+#central.stats tr.OutofStock{background:#d95017;}
+#central.stats td.OutofStockAttrib {background:#d95017;}
+#central.stats tr.attribute.stock td table{margin-left:10px; width:96%;}
+#central.stats tr.dataTableRow.attribute.stock { border-left:1px solid black; }
+#central.stats table tr table { margin:0; padding:0; border:0; }
- /* Module CMS/DESC */
- #central form .cms_desc .block_input { margin : 10px; }
- #central form .cms_desc .block_input p{ line-height : 16px; margin : auto; padding : auto; }
- #central form .cms_desc .block_input h3{ line-height : 20px; border:none; font-size:15px; margin:auto; padding : auto; }
+/* Module CMS/DESC */
+#central form .cms_desc .block_input { margin : 10px; }
+#central form .cms_desc .block_input p{ line-height : 16px; margin : auto; padding : auto; }
+#central form .cms_desc .block_input h3{ line-height : 20px; border:none; font-size:15px; margin:auto; padding : auto; }
- /* Cat list lors edition article ou cms */
- #central #cat_list_in_edit {overflow: auto; max-height: 160px; background-color: #fff; padding: 5px; line-height: 15px; border: 1px solid #666; -moz-border-radius:6px;}
+/* Cat list lors edition article ou cms */
+#central #cat_list_in_edit {overflow: auto; max-height: 160px; background-color: #fff; padding: 5px; line-height: 15px; border: 1px solid #666; -moz-border-radius:6px;}
- /*--sales stats box --*/
- #salesStats .BarGraph { background: url(img/1/horizontal_line.png) bottom left; border-bottom: 1px solid #333; font: 9px Helvetica, Geneva, sans-serif; height: 50px; width:230px; margin: 1em 1em 2em 1em; padding: 0; position: relative;color:#000;font-weight:bold; }
- #salesStats .BarGraph li { width: 11px; }
- #salesStats .BarGraph li.p0{margin:0 0 -3px 16px;color:#FFF;}
+/*--sales stats box --*/
+#salesStats .BarGraph { background: url(img/1/horizontal_line.png) bottom left; border-bottom: 1px solid #333; font: 9px Helvetica, Geneva, sans-serif; height: 50px; width:230px; margin: 1em 1em 2em 1em; padding: 0; position: relative;color:#000;font-weight:bold; }
+#salesStats .BarGraph li { width: 11px; }
+#salesStats .BarGraph li.p0{margin:0 0 -3px 16px;color:#FFF;}
- /* Adress */
- .ViewAddress {padding:5px; }
+/* Adress */
+.ViewAddress {padding:5px; }
/* Widget */
- #customerStats ul{min-height:70px; background:transparent url(img/1/header_stats.png) no-repeat bottom right;}
- #orderStats ul{min-height:70px;background:transparent url(img/1/header_orders.png) no-repeat bottom right;}
- #customerInfos p{min-height:70px;background:transparent url(img/1/header_infos.png) no-repeat bottom right;}
- #salesStats p{float:left;min-height:50px;margin:0 auto;background:transparent url(img/1/header_sales.png) no-repeat bottom right;}
+#customerStats ul{min-height:70px; background:transparent url(img/1/header_stats.png) no-repeat bottom right;}
+#orderStats ul{min-height:70px;background:transparent url(img/1/header_orders.png) no-repeat bottom right;}
+#customerInfos p{min-height:70px;background:transparent url(img/1/header_infos.png) no-repeat bottom right;}
+#salesStats p{float:left;min-height:50px;margin:0 auto;background:transparent url(img/1/header_sales.png) no-repeat bottom right;}
/* #orderStats,
- #customerStats,
- #customerInfos { height: 110px; }*/
- #orderStats ul,
- #customerStats ul,
+ # customerStats, *
+#customerInfos { height: 110px; }*/
+#orderStats ul,
+#customerStats ul,
/* #salesStats ul { list-style-type:none; margin:0 0 0 2px; padding:0;} */
/* Widget BOX */
- #header .adminBlock {width:250px;}
- .box,
- .graph{width:95%;}
- .adminBlock,.box {float:left;margin:10px;background:#e4e4e4 url(../../../images/back.jpg) repeat-x;}
- .adminBlock h3,
- .box h3 { margin: 0;height:15px; background:transparent url(img/1/menu_bg.jpg) repeat-x ; padding:0.3em;}
- .adminBlock ul,
- .box ul,
- .box p,
- .box dl { list-style-type:none; margin:0 0 0 2px; padding:0 10px 10px 10px ;}
- .box dt {padding-left:10px}
- .adminBlock .tirroir { clear:both; color:#000; z-index:99;border:1px solid #dedede;border-left:1px solid #fff; border-right:1px solid #ccc;}
+#header .adminBlock {width:250px;}
+.box,
+.graph{width:95%;}
+.adminBlock,.box {float:left;margin:10px;background:#e4e4e4 url(../../../images/back.jpg) repeat-x;}
+.adminBlock h3,
+.box h3 { margin: 0;height:15px; background:transparent url(img/1/menu_bg.jpg) repeat-x ; padding:0.3em;}
+.adminBlock ul,
+.box ul,
+.box p,
+.box dl { list-style-type:none; margin:0 0 0 2px; padding:0 10px 10px 10px ;}
+.box dt {padding-left:10px}
+.adminBlock .tirroir { clear:both; color:#000; z-index:99;border:1px solid #dedede;border-left:1px solid #fff; border-right:1px solid #ccc;}
- #headInfos .adminBlock .tirroir ul,
- #headInfos .adminBlock .tirroir ul li {clear:both;}
- #headInfos .adminBlock .tirroir a,
- #headInfos .adminBlock .tirroir a:hover {clear:both;color:black;}
- .adminBlock h3:hover .tirroir{color:black; }
+#headInfos .adminBlock .tirroir ul,
+#headInfos .adminBlock .tirroir ul li {clear:both;}
+#headInfos .adminBlock .tirroir a,
+#headInfos .adminBlock .tirroir a:hover {clear:both;color:black;}
+.adminBlock h3:hover .tirroir{color:black; }
/* Widget block header admin*/
- .adminBlock {margin:0;}
+.adminBlock {margin:0;}
/* general Divers */
- #content { margin-top: 2em;}
- div.separator { height:0; margin:0; padding: 0; clear:both; visibility:hidden;}
- .specialPrice { color: #ff0000; }
- .oldPrice { text-decoration: line-through; }
- .fieldRequired { color: #ff0000; }
- .smallText { font-size: 0.8em; }
- .errorText { color: #ff0000; }
- div.editBlock { background-color: #DFDFDF; }
- .block { display:block; background: transparent url(img/1/menu_bg.jpg) repeat-x; border-color:#fff #dedede #dedede #fff; border-style:solid; border-width:1px; color:#000; padding:3px; }
- table.titleTag input { width: 500px; }
- table.descTag textarea ,table.keywordTag textarea { width: 500px;height:100px;}
- td.main img,
- td.smallText img,
- td.infoBoxContent img {vertical-align: baseline;}
+#content { margin-top: 2em;}
+div.separator { height:0; margin:0; padding: 0; clear:both; visibility:hidden;}
+.specialPrice { color: #ff0000; }
+.oldPrice { text-decoration: line-through; }
+.fieldRequired { color: #ff0000; }
+.smallText { font-size: 0.8em; }
+.errorText { color: #ff0000; }
+div.editBlock { background-color: #DFDFDF; }
+.block { display:block; background: transparent url(img/1/menu_bg.jpg) repeat-x; border-color:#fff #dedede #dedede #fff; border-style:solid; border-width:1px; color:#000; padding:3px; }
+table.titleTag input { width: 500px; }
+table.descTag textarea ,table.keywordTag textarea { width: 500px;height:100px;}
+td.main img,
+td.smallText img,
+td.infoBoxContent img {vertical-align: baseline;}
/* MEnu ADmin Habillage icone */
Modified: trunk/catalog/install/includes/modele/configure.txt
===================================================================
--- trunk/catalog/install/includes/modele/configure.txt 2011-12-03 18:59:45 UTC (rev 3921)
+++ trunk/catalog/install/includes/modele/configure.txt 2011-12-03 22:31:28 UTC (rev 3922)
@@ -99,5 +99,3 @@
@brief use by offline mode
*/
$SecuKey='%SECURE_KEY%';
-
- ?>
\ 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: <j4...@us...> - 2011-12-03 18:59:51
|
Revision: 3921
http://oscss.svn.sourceforge.net/oscss/?rev=3921&view=rev
Author: j4k
Date: 2011-12-03 18:59:45 +0000 (Sat, 03 Dec 2011)
Log Message:
-----------
Modification du the?\204?\128me de couleur et calage de plusieurs e?\204?\129le?\204?\129ments
Modified Paths:
--------------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css 2011-12-03 17:17:41 UTC (rev 3920)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css 2011-12-03 18:59:45 UTC (rev 3921)
@@ -51,6 +51,7 @@
}
#intro .intro.content {padding: 12px;}
+ #intro .intro.content div{padding: 12px;font-size: 0.9em; font-weight:bold;}
nl#breadcrumbs {
@@ -59,13 +60,13 @@
clear: both;
float: left;
height: 25px;
- padding: 5px 12px;
+ padding: 1.5em;
position: relative;
top: 22px;
width: inherit;
}
+ nl#breadcrumbs a { text-decoration:none; padding:1em;font-size:1.5em;font-weight: bold;color: #777; }
-
/* ------------ Habillage ------------ */
/* voir fichier Habillage.css */
@@ -136,16 +137,23 @@
footer {
clear: both;
width: 960px;
- height:80px;
+ height:60px;
margin-bottom: 10px;
-
+ padding:1.5em;
}
footer p {
- padding-right: 20px;
+ padding: 2em;
}
-
-
- footer div {margin:0; padding:0; width:33%; float:left; display:block; height:100%; }
\ No newline at end of file
+ footer div.left_footer {margin:0; padding:0; width:0; float:left; display:block; height:100%; }
+ footer div.center_footer {margin:0; padding:0; width:33%%; float:left; display:block; height:100%; }
+ footer div.right_footer a{font-size: 1.2em; color:#fff; padding:1.2em; }
+ footer div.right_footer a:hover{font-size: 1.2em; color:#B4E3EC; padding:1.2em; }
+
+
+
+
+
+
\ No newline at end of file
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2011-12-03 17:17:41 UTC (rev 3920)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2011-12-03 18:59:45 UTC (rev 3921)
@@ -38,8 +38,8 @@
color: #FFF;
background-color: #f18f7e;
/* curved border radius */
- -moz-border-radius: 20px;
- -webkit-border-radius: 20px;
+ -webkit-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
@@ -49,17 +49,17 @@
background:white;
}
+ a {text-decoration:none; color:#555; font-weight:bold;font-size:1.2em;}
-
/* content and sidebar layout */
#content {
- background-color: #f2f2f2;
+ background-color: #fff;
/* curved border radius */
- -moz-border-radius: 20px;
- -webkit-border-radius: 20px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
/* article */
@@ -88,27 +88,17 @@
.product h1*/ {
background-color: #B4E3EC;
/* curved border radius */
- -moz-border-radius: 10px;
- -webkit-border-radius: 10px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
-article h1/*,
-.product h1,
-.regular h2*/ {
- color: black;
- background-color: #B4E3EC;
-/* curved border radius */
- -moz-border-radius: 10px;
- -webkit-border-radius: 10px;
- }
-
/* sidebar */
aside section {
- background-color: #f2f2f2;
+ background-color: #fff;
/* curved border radius */
- -moz-border-radius: 20px;
- -webkit-border-radius: 20px;
+ -webkit-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
aside section ul {
@@ -134,8 +124,8 @@
aside section header h3 {
background-color: #B4E3EC;
/* curved border radius */
- -moz-border-radius: 10px;
- -webkit-border-radius: 10px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
@@ -154,10 +144,10 @@
.module .outerblock {
font-size: 1em;
- background: #0e9fc0;
+ background: #dee;
/* curved border radius */
- -moz-border-radius: 10px;
- -webkit-border-radius: 10px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
.module .innerblock {
@@ -165,8 +155,8 @@
background: #fff;
text-align:center;
/* curved border radius */
- -moz-border-radius: 10px;
- -webkit-border-radius: 10px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
.module .innerblock img {
@@ -223,8 +213,8 @@
nav {
background: url("../images/navbg.png");
/* curved border radius */
- -moz-border-radius: 10px;
- -webkit-border-radius: 10px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
nav ul {
@@ -251,7 +241,7 @@
div#top_bar {
- -moz-border-radius: 10px 10px 10px 10px;
+ -moz-border-radius: 0px 0px 10px 10px;
background: url("../images/navbg.png") repeat scroll 0 0 transparent;
}
@@ -266,8 +256,8 @@
/* curved border radius */
- -moz-border-radius: 20px;
- -webkit-border-radius: 20px;
+ -webkit-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
@@ -293,8 +283,8 @@
color: #fff;
/* curved border radius */
- -moz-border-radius: 10px;
- -webkit-border-radius: 10px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
footer p {
@@ -311,8 +301,9 @@
text-decoration: none;
}
-footer div { text-align:left;}
+footer div.right_footer { text-align:right;}
footer div.center_footer{
-text-align:center;
-}
\ No newline at end of file
+text-align:left;font-size:0.8em;
+}
+footer a {text-decoration: none;}
\ No newline at end of file
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-12-03 17:17:41 UTC (rev 3920)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-12-03 18:59:45 UTC (rev 3921)
@@ -94,14 +94,14 @@
aside,
nav,
article,
- nl{ display: block; }
-
+ nl{ display: block; }
+
/* standard body */
body {
margin: 0 auto;
width: 960px;
font: 14px/20px "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
- background: #ff8300;
+ background: #eee;
}
table { width:100%}
@@ -180,9 +180,9 @@
clear:both;
}
+.textMain p {padding:0.5em;font-size:0.9em;}
-
article h1/*,
.product h2,
.product h1*/ {
@@ -197,6 +197,8 @@
margin: 12px 0;
}
+.module h4.title {font-size: 1.5em;font-weight:bold;margin:1.2em;}
+
/* sidebar */
aside section {
margin: 10px 12px 0 0;
@@ -219,7 +221,7 @@
aside section header h3 {
padding-left: 10px;
- margin-top: 10px;
+ margin: 10px 0px;
}
@@ -265,6 +267,10 @@
.module .innerblock p.title{
height:41px;
}
+.module .innerblock p.title a{
+ text-decoration: none;
+ font-size: 1.3em;
+}
.module .innerblock p.img{
height:100px;
}
@@ -304,7 +310,14 @@
margin:5px 5px;
}
+#productImagelistMini{ height:70px;}
+#price_master {font-weight:bold;font-size:2em;}
+.price {font-size:1.4em;font-weight:bold;}
+.CartQty{ width:15px;}
-.CartQty{ width:15px;}
\ No newline at end of file
+#productDescription p { padding:2em;color: #555;font-size: 0.8em;}
+#productImage {height:200px;}
+
+.prod_box_big {padding:2em;}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-03 17:17:47
|
Revision: 3920
http://oscss.svn.sourceforge.net/oscss/?rev=3920&view=rev
Author: oscim
Date: 2011-12-03 17:17:41 +0000 (Sat, 03 Dec 2011)
Log Message:
-----------
correction suite
Modified Paths:
--------------
trunk/catalog/includes/classes/page.php
trunk/catalog/index.php
Modified: trunk/catalog/includes/classes/page.php
===================================================================
--- trunk/catalog/includes/classes/page.php 2011-12-01 21:08:06 UTC (rev 3919)
+++ trunk/catalog/includes/classes/page.php 2011-12-03 17:17:41 UTC (rev 3920)
@@ -4,7 +4,7 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 17/10/11, 10:44
+ @date 06/12/11, 10:44
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
\class page
@@ -456,7 +456,7 @@
$this->CurrentPageInit($p_content);
/// include start the breadcrumb trail
- $page->new_class('breadcrumb');
+ $this->new_class('breadcrumb');
/// initialise beradcumb
$this->breadcrumb->add(HEADER_TITLE_TOP, tep_get_httpdir() );
$this->breadcrumb->add(HEADER_TITLE_CATALOG, tep_href_link(FILENAME_DEFAULT));
Modified: trunk/catalog/index.php
===================================================================
--- trunk/catalog/index.php 2011-12-01 21:08:06 UTC (rev 3919)
+++ trunk/catalog/index.php 2011-12-03 17:17:41 UTC (rev 3920)
@@ -44,25 +44,26 @@
* \section Page Error
*/
if(isset($_GET['ServerError'])){
- switch((int)$_GET['ServerError']){
- case 404:
- $page->init('404.php',$language);
- $page_content = $page->force_content('404.php');
- break;
+ switch((int)$_GET['ServerError']){
+ case 404:
+ $page->init('404.php',$language);
+ $breadcrumb=$page->return_object('breadcrumb');
+ $page_content = $page->force_content('404.php');
+ break;
- default:
- /**
- @remarks Alert and log
- */
- //! gestionnaire d'erreur
- $errorHandler = osC_ErrorHandler::start();
- // fichier de log d'erreur http
- $errorHandler->attachFileWriter(DIR_FS_ROOT_DOCS.'public/logs/server-http.log');
- trigger_error(sprintf(__FILE__.'::'.__LINE__.' Error type %s : SERVER: %s', (int)$_GET['ServerError'], print_r($_SERVER, true) ) , E_USER_ERROR);
+ default:
+ /**
+ @remarks Alert and log
+ */
+ //! gestionnaire d'erreur
+ $errorHandler = osC_ErrorHandler::start();
+ // fichier de log d'erreur http
+ $errorHandler->attachFileWriter(DIR_FS_ROOT_DOCS.'public/logs/server-http.log');
+ trigger_error(sprintf(__FILE__.'::'.__LINE__.' Error type %s : SERVER: %s', (int)$_GET['ServerError'], print_r($_SERVER, true) ) , E_USER_ERROR);
- header("HTTP/1.0 301 Moved Permanently");
- tep_redirect(tep_href_link(''));
- }
+ header("HTTP/1.0 301 Moved Permanently");
+ tep_redirect(tep_href_link(''));
+ }
}
elseif ($category_depth == 'top') {
@@ -72,6 +73,7 @@
*/
if (isset($_GET['customers_id']) ) {
$page->init('customers.php',$language);
+ $breadcrumb=$page->return_object('breadcrumb');
$aca_account=$account=$page->new_class('account',$customer_id);
$account=$page->_call('customer','the_customer');
@@ -100,43 +102,44 @@
$p=(string)tep_db_prepare_input(basename($_GET['d']));
$page->init($p,$language);
+ $breadcrumb=$page->return_object('breadcrumb');
- switch ($p){
- case 'form.php':
- case 'contact.php':
- $pp=substr($p, 0, -strlen($page->ext));
- $page->new_class($pp);
- $page->force_content($pp.'_'.$page->_call($pp,'the_form').$page->ext);
- if (isset($_GET['action'])) $page->_call($pp,'action');
- break;
- default:
- if (isset($_GET['content']) && !is_numeric($_GET['content'])){
- $pp=(int)tep_db_prepare_input($_GET['content']);
- $page->new_class($pp);
- $page->force_content('page'.$page->ext);
- $page->force_gabarit('content');
- $page->_call($pp,'page');
- }
- /** Module aca */
- elseif (isset($_GET['aca_mod']) && !is_numeric($_GET['aca_mod']) && isset($_GET['aca_type']) && isset($_GET['aca_action'])){
- $module=(string)tep_db_prepare_input($_GET['aca_mod']);
- $type=(string)tep_db_prepare_input($_GET['aca_type']);
- $aca=$page->new_class($type);
- $aca_module=$page->_call($type,'ret_modules');
- /* cf content/page.php */
- $page->force_content('page'.$page->ext);
+ switch ($p){
+ case 'form.php':
+ case 'contact.php':
+ $pp=substr($p, 0, -strlen($page->ext));
+ $page->new_class($pp);
+ $page->force_content($pp.'_'.$page->_call($pp,'the_form').$page->ext);
+ if (isset($_GET['action'])) $page->_call($pp,'action');
+ break;
+ default:
+ if (isset($_GET['content']) && !is_numeric($_GET['content'])){
+ $pp=(int)tep_db_prepare_input($_GET['content']);
+ $page->new_class($pp);
+ $page->force_content('page'.$page->ext);
+ $page->force_gabarit('content');
+ $page->_call($pp,'page');
+ }
+ /** Module aca */
+ elseif (isset($_GET['aca_mod']) && !is_numeric($_GET['aca_mod']) && isset($_GET['aca_type']) && isset($_GET['aca_action'])){
+ $module=(string)tep_db_prepare_input($_GET['aca_mod']);
+ $type=(string)tep_db_prepare_input($_GET['aca_type']);
+ $aca=$page->new_class($type);
+ $aca_module=$page->_call($type,'ret_modules');
+ /* cf content/page.php */
+ $page->force_content('page'.$page->ext);
- if (isset($_GET['action']) ) {
- $action=(string)tep_db_prepare_input($_GET['action']);
- if ($aca_module[$module]->check_action($action) ) {
- /** Exe == true */
- $aca_module[$module]->after_check_action($action);
-// tep_redirect(tep_href_link(FILENAME_PRODUCT_INFO, tep_get_all_get_params(array('action'))));
- }
- }
+ if (isset($_GET['action']) ) {
+ $action=(string)tep_db_prepare_input($_GET['action']);
+ if ($aca_module[$module]->check_action($action) ) {
+ /** Exe == true */
+ $aca_module[$module]->after_check_action($action);
+ // tep_redirect(tep_href_link(FILENAME_PRODUCT_INFO, tep_get_all_get_params(array('action'))));
+ }
+ }
+ }
}
- }
}
@@ -144,6 +147,7 @@
else {
$page->init('home.php',$language);
+ $breadcrumb=$page->return_object('breadcrumb');
// $page->force_content('home.php');
}
@@ -199,6 +203,7 @@
*/
if (/*$category_depth == 'products' &&*/ isset($_GET['products_id']) ) {
$page->init('product_info.php',$language);
+ $breadcrumb=$page->return_object('breadcrumb');
/** init aca module */
$aca_product=$page->new_class('product',true);
@@ -247,6 +252,7 @@
*/
elseif(isset($_GET['content']) && ( is_int($_GET['content']) || is_numeric($_GET['content'])) ){
$page->init('content.php',$language);
+ $breadcrumb=$page->return_object('breadcrumb');
$page_content = $page->force_content('content.php');
}
@@ -267,29 +273,30 @@
*/
elseif (in_array($category_depth,array( 'products', 'pages', 'nested')) ) {
- $page->init(basename(__FILE__),$language);
+ $page->init(basename(__FILE__),$language);
+ $breadcrumb=$page->return_object('breadcrumb');
- $listing=listing::getInstance();
- $listing->_reset();
- $listing_split = $listing->listing(@$_GET['type_object'],$category_depth);
+ $listing=listing::getInstance();
+ $listing->_reset();
+ $listing_split = $listing->listing(@$_GET['type_object'],$category_depth);
- /// get the categorie name and put it on the header
- if (isset($_GET['manufacturers_id'])) {
- $man=$DB->query("select * from " . TABLE_MANUFACTURERS . " m where m.manufacturers_id = '" . (int)$_GET['manufacturers_id'] . "' ");
- $manuf= $man->fetchAssoc();
- tep_db_free_result($man);
- $image = $manuf['manufacturers_image'];
- $page->breadcrumb->add($manuf['manufacturers_name'], tep_href_link(FILENAME_DEFAULT, 'manufacturers_id=' . $_GET['manufacturers_id']));
- $page->add_var_page('manufacturers',$manuf);
- }
+ /// get the categorie name and put it on the header
+ if (isset($_GET['manufacturers_id'])) {
+ $man=$DB->query("select * from " . TABLE_MANUFACTURERS . " m where m.manufacturers_id = '" . (int)$_GET['manufacturers_id'] . "' ");
+ $manuf= $man->fetchAssoc();
+ tep_db_free_result($man);
+ $image = $manuf['manufacturers_image'];
+ $page->breadcrumb->add($manuf['manufacturers_name'], tep_href_link(FILENAME_DEFAULT, 'manufacturers_id=' . $_GET['manufacturers_id']));
+ $page->add_var_page('manufacturers',$manuf);
+ }
- $listing_query = $DB->query($listing_split->sql_query);
- $page_content = $page->force_content('index_listing.php');
+ $listing_query = $DB->query($listing_split->sql_query);
+ $page_content = $page->force_content('index_listing.php');
}
else
$page->init(basename(__FILE__),$language);
-
+ $breadcrumb=$page->return_object('breadcrumb');
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
