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...> - 2012-07-15 14:27:08
|
Revision: 4520
http://oscss.svn.sourceforge.net/oscss/?rev=4520&view=rev
Author: oscim
Date: 2012-07-15 14:27:02 +0000 (Sun, 15 Jul 2012)
Log Message:
-----------
correction coquille dans l'appel des page cms complementaire aux formulaire de contact
Modified Paths:
--------------
branches/2.1.1/catalog/templates/defaut/includes/content/contact_us.php
Modified: branches/2.1.1/catalog/templates/defaut/includes/content/contact_us.php
===================================================================
--- branches/2.1.1/catalog/templates/defaut/includes/content/contact_us.php 2012-07-15 14:24:36 UTC (rev 4519)
+++ branches/2.1.1/catalog/templates/defaut/includes/content/contact_us.php 2012-07-15 14:27:02 UTC (rev 4520)
@@ -1,10 +1,10 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 13/02/11, 11:14
+ @version 2.1.1
+ @date 15/07/2012, 11:14
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -15,14 +15,14 @@
<h2 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE; ?></h2>
<?php if (isset($_GET['action']) && ($_GET['action'] == 'success')) : ?>
- <div class="infoText"> <?php tep_draw_txt_block('page_contact_us_success') ?></div>
+ <div class="infoText"> <?php echo tep_get_cms_content('page_contact_us_success') ?></div>
<div class="navBt">
<?php echo '<a class="navBt" href="' . tep_href_link(FILENAME_DEFAULT) . '">' . IMAGE_BUTTON_CONTINUE . '</a>'; ?>
</div>
<?php else :?>
- <?php tep_draw_txt_block('Page_contact_us') ?>
+ <?php echo tep_get_cms_content('Page_contact_us') ?>
<?php echo tep_draw_form('contact_us', tep_href_link(FILENAME_CONTACT_US, 'action=send')); ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-15 14:24:44
|
Revision: 4519
http://oscss.svn.sourceforge.net/oscss/?rev=4519&view=rev
Author: oscim
Date: 2012-07-15 14:24:36 +0000 (Sun, 15 Jul 2012)
Log Message:
-----------
correction coquille sur le liens de retour
Modified Paths:
--------------
trunk/extensions/RESTRICTACCES_stable/catalog/includes/modules/categories/RestrictAcces.php
Modified: trunk/extensions/RESTRICTACCES_stable/catalog/includes/modules/categories/RestrictAcces.php
===================================================================
--- trunk/extensions/RESTRICTACCES_stable/catalog/includes/modules/categories/RestrictAcces.php 2012-07-14 21:53:26 UTC (rev 4518)
+++ trunk/extensions/RESTRICTACCES_stable/catalog/includes/modules/categories/RestrictAcces.php 2012-07-15 14:24:36 UTC (rev 4519)
@@ -1,9 +1,9 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 07/06/10, 14:43
+ @version 2.1.1
+ @date 15/07/2012, 14:43
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class desc_base
@@ -43,9 +43,9 @@
if(isset($this->content['RESTRICT_ACCESS_BASE'])) {
if(!tep_session_is_registered('customer_id') && $this->content['RESTRICT_ACCESS_BASE']==2) {
- $navigation=navigation_history::getInstance();
- $navigation->set_snapshot();
- tep_redirect(FILENAME_LOGIN);
+ $navigation=navigation_history::getInstance();
+ $navigation->set_snapshot();
+ tep_redirect(tep_href_link(FILENAME_LOGIN));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-14 21:53:32
|
Revision: 4518
http://oscss.svn.sourceforge.net/oscss/?rev=4518&view=rev
Author: oscim
Date: 2012-07-14 21:53:26 +0000 (Sat, 14 Jul 2012)
Log Message:
-----------
correction erreur ds modele du genercode
correction clef unique sur table fulltag
Modified Paths:
--------------
trunk/catalog/install/includes/sql/mysql/tables/osc_full_tag.sql
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/_DATATYPE_REPLACE_/header_tags.php
trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_full_tag.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_full_tag.sql 2012-07-13 14:14:21 UTC (rev 4517)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_full_tag.sql 2012-07-14 21:53:26 UTC (rev 4518)
@@ -16,7 +16,8 @@
tag_id int(11) NOT NULL auto_increment,
page_type varchar(30) NOT NULL,
page_id varchar(30) default NULL,
- PRIMARY KEY (tag_id)
+ PRIMARY KEY (tag_id),
+ UNIQUE KEY page_type (page_type,page_id)
) DEFAULT CHARSET=utf8 ;
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/_DATATYPE_REPLACE_/header_tags.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/_DATATYPE_REPLACE_/header_tags.php 2012-07-13 14:14:21 UTC (rev 4517)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/_DATATYPE_REPLACE_/header_tags.php 2012-07-14 21:53:26 UTC (rev 4518)
@@ -54,7 +54,7 @@
$this->code = __CLASS__ ;
$this->title = __('module acapro headertags text title');
$this->description = __('module acapro headertags text description');
- $this->sort_order = (defined('MODULE__DATATYPE_REPLACE__HEADERTAGS_SORT_ORDER'))?MODULE__DATATYPE_REPLACE__HEADERTAGS_SORT_ORDER : 0;
+ $this->sort_order = (defined('MODULE__DATATYPE_REPLACE_MAJ__HEADERTAGS_SORT_ORDER'))?MODULE__DATATYPE_REPLACE_MAJ__HEADERTAGS_SORT_ORDER : 0;
$this->enabled = true;
self::$pInfo= new objectInfo (array());
@@ -67,7 +67,7 @@
@brief UP db
*/
public function after_update ($content_id) {
- self::$pInfo=parent::load_db_base($content_id, 'content');
+ self::$pInfo=parent::load_db_base($content_id, '_DATATYPE_REPLACE_');
$myarray=array('page_type' => '_DATATYPE_REPLACE_',
'page_id' => $content_id);
@@ -100,7 +100,7 @@
*/
public static function load_db_values ($content_id) {
$arr ['content_id'] = $content_id;
- $arr=array_merge(array('content_id'=>$content_id) ,parent::load_db_values ($content_id, 'content') );
+ $arr=array_merge(array('content_id'=>$content_id) ,parent::load_db_values ($content_id, '_DATATYPE_REPLACE_') );
self::$pInfo->objectInfo($arr);
}
@@ -117,7 +117,7 @@
public function install() { return false; }
public function remove() { return false; }
public function keys() {
- return array( 'MODULE__DATATYPE_REPLACE__HEADERTAGS_SORT_ORDER');
+ return array( 'MODULE__DATATYPE_REPLACE_MAJ__HEADERTAGS_SORT_ORDER');
}
}
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php 2012-07-13 14:14:21 UTC (rev 4517)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php 2012-07-14 21:53:26 UTC (rev 4518)
@@ -96,21 +96,30 @@
}
/**
- @brief test si al page est du type produits
+ @brief test si al page est du type _DATATYPE_REPLACE_
@param $mode le type de control (page/cpath/seo)
+ @return boolean true / false
*/
function is_type($mode='unique'){
switch(strtolower($mode)){
+ /*
+ Active la recherche pour ce type de donnée
+ */
case 'search':
if(isset($_GET['data']) && $_GET['data'] == $this->DataType )
return true;
break;
+ /*
+ Active la liaison avec les categorie
+ */
case 'cpath':
if( isset($_GET['_DATATYPE_REPLACE_']) && is_numeric($_GET['_DATATYPE_REPLACE_']) )
return true;
break;
+ /*
+ Page Feed unique
+ */
case 'unique':
-// default:
if(isset($_GET['_DATATYPE_REPLACE_']) && ( is_int($_GET['_DATATYPE_REPLACE_']) || is_numeric($_GET['_DATATYPE_REPLACE_'])) )
return true;
break;
@@ -204,7 +213,7 @@
@brief calcul du cpath specifique a ce tyep de donnée
*/
function FO_load_page(){
- global $aca_product,$product_info, $page__DATATYPE_REPLACE_, $language, $cPath;
+ global $aca_product,$product_info, $page__DATATYPE_REPLACE_, $language, $cPath, $languages_id;;
$page = page::getInstance();
$DB=Database::getInstance();
@@ -219,7 +228,7 @@
// calcul extra actived for search
$allextraactived = array();
- $query = $DB->query("SELECT epf_id, epf_uses_value_list, epf_active_value_language FROM " . TABLE_PRODUCTS_EXTRA_FIELDS . " WHERE epf_status = '1' AND epf_advanced_search = '1' ");
+ $query = $DB->query("SELECT epf_id, epf_uses_value_list, epf_active_value_language FROM " . TABLE__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS . " WHERE epf_status = '1' AND epf_advanced_search = '1' ");
$allextraactived = $query->fetchAllAssoc();
foreach($allextraactived as $row)
@@ -242,7 +251,7 @@
$this->listing_sql['tables'] .= " LEFT JOIN " . TABLE_CATEGORIES . " cat ON( ".$this->p."2c.categories_id = cat.categories_id and cat.categories_status='1' ) ";
/// Add search in Extra value
- $this->listing_sql['tables'] .= " LEFT JOIN " . TABLE__DATATYPE_REPLACE_MAJ__TO__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS . " p2pef ON(p2pef._DATATYPE_REPLACE__id = p."._DATATYPE_REPLACE_."_id AND ( p2pef.languages_id = '" . (int)$languages_id . "' OR p2pef.languages_id = '0' ) ) ";
+ $this->listing_sql['tables'] .= " LEFT JOIN " . TABLE__DATATYPE_REPLACE_MAJ__TO__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS . " p2pef ON(p2pef._DATATYPE_REPLACE__id = ".$this->p."._DATATYPE_REPLACE__id AND ( p2pef.languages_id = '" . (int)$languages_id . "' OR p2pef.languages_id = '0' ) ) ";
if(in_array(true, (array)$use_value_list))
$this->listing_sql['tables'] .= " LEFT JOIN " . TABLE__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS_VALUES . " pefv ON(pefv.epf_id = p2pef._DATATYPE_REPLACE__extra_fields_id AND ( pefv.languages_id = '" . (int)$languages_id . "' OR pefv.languages_id = '0' ) ) ";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-13 14:14:31
|
Revision: 4517
http://oscss.svn.sourceforge.net/oscss/?rev=4517&view=rev
Author: oscim
Date: 2012-07-13 14:14:21 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/extensions/SPECIALS_stable/install.xml
Modified: trunk/extensions/SPECIALS_stable/install.xml
===================================================================
--- trunk/extensions/SPECIALS_stable/install.xml 2012-07-13 13:23:43 UTC (rev 4516)
+++ trunk/extensions/SPECIALS_stable/install.xml 2012-07-13 14:14:21 UTC (rev 4517)
@@ -17,7 +17,7 @@
<file name="admin/includes/gabarit/specials/display_view.edit.gab" />
<!-- <file name="admin/includes/gabarit/specials.newChoose.gab" /> -->
<file name="admin/includes/gabarit/specials/display_view.delete.gab" />
- <file name="admin/includes/gabarit/products.display_view.inline.gab" />
+ <file name="admin/includes/gabarit/specials/products.display_view.inline.gab" />
<file name="admin/includes/javascript/modules/pages/specials.js.php" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-13 13:23:50
|
Revision: 4516
http://oscss.svn.sourceforge.net/oscss/?rev=4516&view=rev
Author: oscim
Date: 2012-07-13 13:23:43 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
correction
Modified Paths:
--------------
trunk/catalog/admin/includes/modules/pages/navigation_links.php
Modified: trunk/catalog/admin/includes/modules/pages/navigation_links.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/navigation_links.php 2012-07-13 12:36:34 UTC (rev 4515)
+++ trunk/catalog/admin/includes/modules/pages/navigation_links.php 2012-07-13 13:23:43 UTC (rev 4516)
@@ -12,7 +12,7 @@
class navigation_links
extends ModTwo /// new abstract class for nextgen module
- implements
+ implements
InterfaceModule,
/*IntModTwo, */ /// new interface module for nextgen module
ExtModConfig {
@@ -77,7 +77,7 @@
/**
@remarks not load if not first init
*/
- if(!defined('JSONSTATMENT')){
+ if(!defined('JSONSTATMENT')){
if(self::$action =='' || self::$action =='listing')
//! active datatable in ajax, precise les GET necessaire
@@ -126,14 +126,14 @@
);
- self::$allfields['c.customers_status'] = array(
- 'sort'=>true,
- 'alias'=>'customers_status',
- 'text'=>__('@tasks table heading customers_status'),
- 'default'=>true,
+// self::$allfields['c.customers_status'] = array(
+// 'sort'=>true,
+// 'alias'=>'customers_status',
+// 'text'=>__('@tasks table heading customers_status'),
+// 'default'=>true,
+//
+// );
- );
-
/* Db parent */
self::$allfields['c.parent_id'] = array(
'sort'=>true,
@@ -522,6 +522,17 @@
foreach(self::$InitInfo['modele']['listing'] as $k=>$row)
if($k == 'action') $ord[$k]=self::ButtonRowsActions($item);
elseif($k == 'status') $ord[$k]=self::RowStatus($item);
+ elseif($k =='customers_status'){
+ $result = sqlstatus::fetch(array(
+ 'type'=>'customers_restrict_access',
+ 'language_id'=>(int)$languages_id,
+ 'status'=>1,
+ 'id'=> $item['customers_status'],
+ ),
+ true
+ );
+ $ord[$k]= (( $result !=false) ? $result->name : '' );
+ }
else $ord[$k]=$item[$k];
$res[]=$ord;
@@ -643,9 +654,9 @@
- /**
- @remarks implements InterfaceModule depend
- if module twin in backoffice, report all content install in the other module
+ /**
+ @remarks implements InterfaceModule depend
+ if module twin in backoffice, report all content install in the other module
public function check() {return true;}
public function install() {return true;}
public function remove() {return true;}
@@ -654,7 +665,7 @@
/**
@fn check()
- @brief test if count all var , and keys is equal
+ @brief test if count all var , and keys is equal
@return boolean true/false
*/
function check() { return false; }
@@ -662,19 +673,19 @@
/**
@fn keys()
- @return array all key configuration define by this module
+ @return array all key configuration define by this module
*/
function keys() { return false; }
/**
@fn install()
- @brief add all configuration
- @note
+ @brief add all configuration
+ @note
- Modules can emarquer sql installation instructions, however, in the case of transverse information, or dependent of an extension, preferring the implementation of an extension, file with sql independent
- please, pefix all var configuration by 'MODULE_OT__MODTYPENAME_MAJ_'
- if module twin in backoffice, report all content install in the other module
- - Not use language in DB , but function :__()
- for MODULE_TOTO_ST
+ - Not use language in DB , but function :__()
+ for MODULE_TOTO_ST
var title MODULE_TOTO_ST_S (small description)
var description MODULE_TOTO_ST_L (long description)
*/
@@ -683,9 +694,9 @@
/**
@fn remove()
@brief delete all configuration
- @note
+ @note
- please, pefix all var configuration by 'MODULE_PAYMENT__MODTYPENAME_MAJ_'
- - if module twin in backoffice, report all content remove in the other module
+ - if module twin in backoffice, report all content remove in the other module
*/
function remove() { return false; }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-13 12:36:40
|
Revision: 4515
http://oscss.svn.sourceforge.net/oscss/?rev=4515&view=rev
Author: oscim
Date: 2012-07-13 12:36:34 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
coquille lors suppression dune page de contenu
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/gabarit/cms_content/display_view.delete.gab
branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php
Modified: branches/2.1.1/catalog/admin/includes/gabarit/cms_content/display_view.delete.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/cms_content/display_view.delete.gab 2012-07-13 07:41:34 UTC (rev 4514)
+++ branches/2.1.1/catalog/admin/includes/gabarit/cms_content/display_view.delete.gab 2012-07-13 12:36:34 UTC (rev 4515)
@@ -8,15 +8,16 @@
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
+
?>
<div class="box_uniq">
<h3><?php echo __('text info heading delete content'); ?></h3>
- <?php echo tep_draw_form('content', cms_content::FILENAME, 'cID=' . cms_content::$cInfo->content_id . '&action=deleteconfirm') ?>
+ <?php echo tep_draw_form('content', cms_content::FILENAME, 'cID=' . cms_content::$Id . '&action=deleteconfirm') ?>
<p><?php echo __('text info delete content intro') ?></p>
- <p><?php echo cms_content::$cInfo->content_name ; ?></p>
+ <p><?php echo cms_content::$Info->content_name ; ?></p>
<div class="button_nav">
- <?php echo tep_image_submit('button_delete.gif', IMAGE_DELETE) .tep_js_back(tep_href_link(cms_content::FILENAME, 'cID=' . cms_content::$cInfo->content_id), IMAGE_CANCEL); ?>
+ <?php echo tep_image_submit('button_delete.gif', IMAGE_DELETE) .tep_js_back(tep_href_link(cms_content::FILENAME, 'cID=' . cms_content::$Info->content_id), IMAGE_CANCEL); ?>
</div>
</form>
</div>
\ No newline at end of file
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php 2012-07-13 07:41:34 UTC (rev 4514)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php 2012-07-13 12:36:34 UTC (rev 4515)
@@ -618,6 +618,7 @@
case 'edit':
case 'new':
global $language_id;
+
if( (int)self::$Id > 0) {
self::$Info = sqlcontent::fetch(array('id'=>self::$Id,'language_id'=>$language_id), true);
}
@@ -717,6 +718,7 @@
*/
case 'delete':
+ self::GetDBValue(self::$Id);
return MGabCont::CallGab(self::$action,__FUNCTION__,__CLASS__);
break;
case 'edit':
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-13 07:41:43
|
Revision: 4514
http://oscss.svn.sourceforge.net/oscss/?rev=4514&view=rev
Author: oscim
Date: 2012-07-13 07:41:34 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
correction date();
Modified Paths:
--------------
branches/2.1.1/catalog/install/includes/language/en_EN/install.base.txt
Modified: branches/2.1.1/catalog/install/includes/language/en_EN/install.base.txt
===================================================================
--- branches/2.1.1/catalog/install/includes/language/en_EN/install.base.txt 2012-07-12 06:49:13 UTC (rev 4513)
+++ branches/2.1.1/catalog/install/includes/language/en_EN/install.base.txt 2012-07-13 07:41:34 UTC (rev 4514)
@@ -8,6 +8,9 @@
@encode UTF-8
*/
+@setlocale(LC_TIME, 'en_EN.UTF-8');
+if(function_exists('date_default_timezone_set'))
+ date_default_timezone_set('Europe/London');
// core
$lang['etape core.base']='Welcome';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-12 06:49:20
|
Revision: 4513
http://oscss.svn.sourceforge.net/oscss/?rev=4513&view=rev
Author: oscim
Date: 2012-07-12 06:49:13 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
correction coquille
FS#1094
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/classes/fileUtility.php
branches/2.1.1/catalog/admin/includes/modules/pages/navigation_links.php
branches/2.1.1/catalog/includes/triggers/search_suggest.inc
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/configuration.php
branches/2.1.1/catalog/install/includes/language/fr_FR/install.base.txt
Modified: branches/2.1.1/catalog/admin/includes/classes/fileUtility.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/fileUtility.php 2012-07-11 14:08:08 UTC (rev 4512)
+++ branches/2.1.1/catalog/admin/includes/classes/fileUtility.php 2012-07-12 06:49:13 UTC (rev 4513)
@@ -28,7 +28,7 @@
}
/**
- @brief block process in other class if result in loop process content error
+ @brief block process in other class if result in loop process content error
@param bool true, block messageSatck
*/
public static function CfgComport($value){
@@ -119,7 +119,7 @@
@fn _unlink($source)
@brief recusrive delete folder and files
@param $source absolute path
- @return boolean false for error
+ @return boolean false for error
*/
public static function _unlink($source){
if (file_exists($source) && is_writeable($source))
@@ -133,11 +133,13 @@
@fn _mkdir($path)
@brief recusrive create folder
@param $path absolute path
- @return boolean false for error
+ @return boolean false for error
*/
public static function _mkdir($path) {
- $path = dirname($path);
+ if(strpos($path, '.'))
+ $path = dirname($path);
+
if(strpos($path,DIR_FS_DOCUMENT_ROOT) ===0){
$testpath = DIR_FS_DOCUMENT_ROOT;
$listdir = str_replace( DIR_FS_DOCUMENT_ROOT, '', $path );
@@ -163,9 +165,10 @@
}
// if (!is_writeable($testpath))
- if( self::_chmod($path, '0755') ){
- self::ComportForError(__CLASS__.'->'.__FUNCTION__.'::'.__LINE__.__('error folder not writable for current user'). $path, 'error');
+ if( ! self::_chmod($path, 0766) ){
+ self::ComportForError(__CLASS__.'->'.__FUNCTION__.'::'.__LINE__.__('error folder not writable for current user').' '. $path, 'error');
}
+
}
return true;
@@ -174,8 +177,8 @@
/**
@fn _chmod($path, $mod=0777)
@brief chmod
- @param $path absolute path
- @param $mod
+ @param $path absolute path
+ @param $mod
@return boolean true for ok or false
*/
public static function _chmod($path, $mod=0777) {
@@ -183,11 +186,11 @@
if (is_dir($path) && $path!='/') {
self::_chmod(dirname($path));
- if(!@chmod($path, (int)$mod))
+ if(!@chmod($path, (int)$mod))
return false;
}
elseif(file_exists($path) && $path!='/') {
- if(!@chmod($path, (int)$mod))
+ if(!@chmod($path, (int)$mod))
return false;
}
return true;
@@ -203,7 +206,7 @@
while(($file =self::_scandir($d)) !== false) {
if ($file != "." && $file != "..") {
$typepath = $mypath . "/" . $file ;
- if (filetype ($typepath) == 'dir')
+ if (filetype ($typepath) == 'dir')
self::_chown($typepath, $uid, $gid);
self::_chmod($typepath, $uid);
@@ -217,7 +220,7 @@
@brief Copy repertoire recursif
@param $src absolute path
@param $dst absolute path
- @return boolean true if ok
+ @return boolean true if ok
*/
public static function _copy($src,$dst){
@@ -266,9 +269,9 @@
$arrScanCache=array();
static $arrScanCache;
- if( ! is_dir($strFolder))
+ if( ! is_dir($strFolder))
$strFolder = dirname($strFolder);
- if (substr($strFolder, -1, 1) != '/')
+ if (substr($strFolder, -1, 1) != '/')
$strFolder .= '/';
// Load from cache
@@ -291,7 +294,7 @@
@return bool
*/
public static function equal_files($file1, $file2) {
- if (is_file($file1) && is_file($file2))
+ if (is_file($file1) && is_file($file2))
return (md5_file($file1) == md5_file($file2));
return false;
}
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/navigation_links.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/navigation_links.php 2012-07-11 14:08:08 UTC (rev 4512)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/navigation_links.php 2012-07-12 06:49:13 UTC (rev 4513)
@@ -126,14 +126,14 @@
);
- self::$allfields['c.customers_status'] = array(
- 'sort'=>true,
- 'alias'=>'customers_status',
- 'text'=>__('@tasks table heading customers_status'),
- 'default'=>true,
+// self::$allfields['c.customers_status'] = array(
+// 'sort'=>true,
+// 'alias'=>'customers_status',
+// 'text'=>__('@tasks table heading customers_status'),
+// 'default'=>true,
+//
+// );
- );
-
/* Db parent */
self::$allfields['c.parent_id'] = array(
'sort'=>true,
@@ -522,6 +522,17 @@
foreach(self::$InitInfo['modele']['listing'] as $k=>$row)
if($k == 'action') $ord[$k]=self::ButtonRowsActions($item);
elseif($k == 'status') $ord[$k]=self::RowStatus($item);
+ elseif($k =='customers_status'){
+ $result = sqlstatus::fetch(array(
+ 'type'=>'customers_restrict_access',
+ 'language_id'=>(int)$languages_id,
+ 'status'=>1,
+ 'id'=> $item['customers_status'],
+ ),
+ true
+ );
+ $ord[$k]= (( $result !=false) ? $result->name : '' );
+ }
else $ord[$k]=$item[$k];
$res[]=$ord;
Modified: branches/2.1.1/catalog/includes/triggers/search_suggest.inc
===================================================================
--- branches/2.1.1/catalog/includes/triggers/search_suggest.inc 2012-07-11 14:08:08 UTC (rev 4512)
+++ branches/2.1.1/catalog/includes/triggers/search_suggest.inc 2012-07-12 06:49:13 UTC (rev 4513)
@@ -59,7 +59,7 @@
if(!$pd )
continue;
- echo '<a href="'.tep_href_link($pd->href).'">'.$pd->title.'</a>'."\n";
+ echo '<a href="'.$pd->href.'">'.$pd->title.'</a>'."\n";
}
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/configuration.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/configuration.php 2012-07-11 14:08:08 UTC (rev 4512)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/configuration.php 2012-07-12 06:49:13 UTC (rev 4513)
@@ -39,7 +39,7 @@
ResetConfigKey('PLUGIN_PRODUCT_INSTALLED');
AddConfigInKey('PLUGIN_GENERIC_INSTALLED','lazyload.php');
-AddConfigInKey('PLUGIN_GENERIC_INSTALLED','slider .php');
+AddConfigInKey('PLUGIN_GENERIC_INSTALLED','slider.php');
AddConfigInKey('PLUGIN_PRODUCT_INSTALLED','slimbox.php');
AddConfigInKey('PLUGIN_PRODUCT_INSTALLED','uicoretabs.php');
Modified: branches/2.1.1/catalog/install/includes/language/fr_FR/install.base.txt
===================================================================
--- branches/2.1.1/catalog/install/includes/language/fr_FR/install.base.txt 2012-07-11 14:08:08 UTC (rev 4512)
+++ branches/2.1.1/catalog/install/includes/language/fr_FR/install.base.txt 2012-07-12 06:49:13 UTC (rev 4513)
@@ -8,6 +8,9 @@
@encode UTF-8
*/
+@setlocale(LC_TIME, 'fr_FR.UTF-8');
+if(function_exists('date_default_timezone_set'))
+ date_default_timezone_set('Europe/Paris');
// core
$lang['etape core.base']="Bienvenue" ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-11 14:08:18
|
Revision: 4512
http://oscss.svn.sourceforge.net/oscss/?rev=4512&view=rev
Author: oscim
Date: 2012-07-11 14:08:08 +0000 (Wed, 11 Jul 2012)
Log Message:
-----------
coquille
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/fileUtility.php
Modified: trunk/catalog/admin/includes/classes/fileUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/fileUtility.php 2012-07-11 08:30:15 UTC (rev 4511)
+++ trunk/catalog/admin/includes/classes/fileUtility.php 2012-07-11 14:08:08 UTC (rev 4512)
@@ -136,8 +136,10 @@
@return boolean false for error
*/
public static function _mkdir($path) {
- $path = dirname($path);
+ if(strpos($path, '.'))
+ $path = dirname($path);
+
if(strpos($path,DIR_FS_DOCUMENT_ROOT) ===0){
$testpath = DIR_FS_DOCUMENT_ROOT;
$listdir = str_replace( DIR_FS_DOCUMENT_ROOT, '', $path );
@@ -163,9 +165,10 @@
}
// if (!is_writeable($testpath))
- if( self::_chmod($path, '0755') ){
- self::ComportForError(__CLASS__.'->'.__FUNCTION__.'::'.__LINE__.__('error folder not writable for current user'). $path, 'error');
+ if( ! self::_chmod($path, 0766) ){
+ self::ComportForError(__CLASS__.'->'.__FUNCTION__.'::'.__LINE__.__('error folder not writable for current user').' '. $path, 'error');
}
+
}
return true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-11 08:30:25
|
Revision: 4511
http://oscss.svn.sourceforge.net/oscss/?rev=4511&view=rev
Author: oscim
Date: 2012-07-11 08:30:15 +0000 (Wed, 11 Jul 2012)
Log Message:
-----------
coquille
Modified Paths:
--------------
trunk/catalog/includes/triggers/search_suggest.inc
Modified: trunk/catalog/includes/triggers/search_suggest.inc
===================================================================
--- trunk/catalog/includes/triggers/search_suggest.inc 2012-07-10 18:25:14 UTC (rev 4510)
+++ trunk/catalog/includes/triggers/search_suggest.inc 2012-07-11 08:30:15 UTC (rev 4511)
@@ -51,18 +51,18 @@
else
$key = $subtype. '_id';
- if(!isset($_array[$key]) )
+ if(!isset($_array[$key]) )
continue;
$pd=$subtype::get_item($_array[$key]);
- if(!$pd )
+ if(!$pd )
continue;
- echo '<a href="'.tep_href_link($pd->href).'">'.$pd->title.'</a>'."\n";
+ echo '<a href="'.$pd->href.'">'.$pd->title.'</a>'."\n";
}
-
+
}
?>
\ 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...> - 2012-07-10 18:25:23
|
Revision: 4510
http://oscss.svn.sourceforge.net/oscss/?rev=4510&view=rev
Author: oscim
Date: 2012-07-10 18:25:14 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
suppression obsolete
Removed Paths:
-------------
tags/arelease/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-10 15:00:43
|
Revision: 4509
http://oscss.svn.sourceforge.net/oscss/?rev=4509&view=rev
Author: oscim
Date: 2012-07-10 15:00:37 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
correction FS#1095
Modified Paths:
--------------
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/sitemap.php
branches/2.1.1/catalog/templates/defaut/includes/content/sitemap.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/sitemap.php
trunk/catalog/templates/defaut/includes/content/sitemap.php
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/sitemap.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/sitemap.php 2012-07-10 12:31:52 UTC (rev 4508)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/sitemap.php 2012-07-10 15:00:37 UTC (rev 4509)
@@ -22,8 +22,8 @@
<ul id="primaryNav" class="col4">
<!-- <li id="home"><?php echo HTTP_SERVER ?></li> -->
- <li class="rows"><a href="?cPath=0"><?php echo BOX_HEADING_CATEGORIES; ?></a>
- <?php echo in_menu_cat('ParentGroupString=ul&catID=0&max_level=3'); ?>
+ <li class="rows"><a href=""><?php echo BOX_HEADING_CATEGORIES; ?></a>
+ <?php echo in_menu_cat('ParentGroupString=ul&catID=0&max_level=3&datatype=product'); ?>
</li>
<li>
Modified: branches/2.1.1/catalog/templates/defaut/includes/content/sitemap.php
===================================================================
--- branches/2.1.1/catalog/templates/defaut/includes/content/sitemap.php 2012-07-10 12:31:52 UTC (rev 4508)
+++ branches/2.1.1/catalog/templates/defaut/includes/content/sitemap.php 2012-07-10 15:00:37 UTC (rev 4509)
@@ -7,18 +7,18 @@
@date 08/05/2012, 21:57
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
- @brief Sitmap website
- @note
- For construct Categorie and sub cat use in_menu_cat() and put param
- view lib/template.php for detail function
- @example in_menu_cat for sitemap
+ @brief Sitmap website
+ @note
+ For construct Categorie and sub cat use in_menu_cat() and put param
+ view lib/template.php for detail function
+ @example in_menu_cat for sitemap
in_menu_cat('ParentGroupString=ul&catID=0&max_level=3&datatype=product');
- - ParentGroupString for encadre listby ul html balise
- - catID is int root id
- - max_level int profondeur
- - datatype for force list specifical datatype
+ - ParentGroupString for encadre listby ul html balise
+ - catID is int root id
+ - max_level int profondeur
+ - datatype for force list specifical datatype
*/
?>
<div id="sitemap">
@@ -27,8 +27,8 @@
<ul id="primaryNav" class="col4">
<!-- <li id="home"><?php echo HTTP_SERVER ?></li> -->
- <li><a href="?cPath=0"><?php echo BOX_HEADING_CATEGORIES; ?></a>
- <?php
+ <li><a href=""><?php echo BOX_HEADING_CATEGORIES; ?></a>
+ <?php
echo in_menu_cat('ParentGroupString=ul&catID=0&max_level=3&datatype=product'); ?>
</li>
<li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, '', 'SSL') . '">' . PAGE_ACCOUNT . '</a>'; ?>
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/sitemap.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/sitemap.php 2012-07-10 12:31:52 UTC (rev 4508)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/sitemap.php 2012-07-10 15:00:37 UTC (rev 4509)
@@ -22,8 +22,8 @@
<ul id="primaryNav" class="col4">
<!-- <li id="home"><?php echo HTTP_SERVER ?></li> -->
- <li class="rows"><a href="?cPath=0"><?php echo BOX_HEADING_CATEGORIES; ?></a>
- <?php echo in_menu_cat('ParentGroupString=ul&catID=0&max_level=3'); ?>
+ <li class="rows"><a href=""><?php echo BOX_HEADING_CATEGORIES; ?></a>
+ <?php echo in_menu_cat('ParentGroupString=ul&catID=0&max_level=3&datatype=products'); ?>
</li>
<li>
Modified: trunk/catalog/templates/defaut/includes/content/sitemap.php
===================================================================
--- trunk/catalog/templates/defaut/includes/content/sitemap.php 2012-07-10 12:31:52 UTC (rev 4508)
+++ trunk/catalog/templates/defaut/includes/content/sitemap.php 2012-07-10 15:00:37 UTC (rev 4509)
@@ -7,18 +7,18 @@
@date 08/05/2012, 21:57
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
- @brief Sitmap website
- @note
- For construct Categorie and sub cat use in_menu_cat() and put param
- view lib/template.php for detail function
- @example in_menu_cat for sitemap
+ @brief Sitmap website
+ @note
+ For construct Categorie and sub cat use in_menu_cat() and put param
+ view lib/template.php for detail function
+ @example in_menu_cat for sitemap
in_menu_cat('ParentGroupString=ul&catID=0&max_level=3&datatype=product');
- - ParentGroupString for encadre listby ul html balise
- - catID is int root id
- - max_level int profondeur
- - datatype for force list specifical datatype
+ - ParentGroupString for encadre listby ul html balise
+ - catID is int root id
+ - max_level int profondeur
+ - datatype for force list specifical datatype
*/
?>
<div id="sitemap">
@@ -27,8 +27,8 @@
<ul id="primaryNav" class="col4">
<!-- <li id="home"><?php echo HTTP_SERVER ?></li> -->
- <li><a href="?cPath=0"><?php echo BOX_HEADING_CATEGORIES; ?></a>
- <?php
+ <li><a href=""><?php echo BOX_HEADING_CATEGORIES; ?></a>
+ <?php
echo in_menu_cat('ParentGroupString=ul&catID=0&max_level=3&datatype=product'); ?>
</li>
<li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, '', 'SSL') . '">' . PAGE_ACCOUNT . '</a>'; ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-10 12:32:01
|
Revision: 4508
http://oscss.svn.sourceforge.net/oscss/?rev=4508&view=rev
Author: oscim
Date: 2012-07-10 12:31:52 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
Added Paths:
-----------
branches/2.1.1/catalog/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-10 12:29:40
|
Revision: 4507
http://oscss.svn.sourceforge.net/oscss/?rev=4507&view=rev
Author: oscim
Date: 2012-07-10 12:29:29 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
Removed Paths:
-------------
branches/2.1.1/catalog/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-10 11:54:18
|
Revision: 4506
http://oscss.svn.sourceforge.net/oscss/?rev=4506&view=rev
Author: oscim
Date: 2012-07-10 11:54:07 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
correction
Modified Paths:
--------------
trunk/catalog/templates/defaut/includes/boxes/shopping_cart.php
Modified: trunk/catalog/templates/defaut/includes/boxes/shopping_cart.php
===================================================================
--- trunk/catalog/templates/defaut/includes/boxes/shopping_cart.php 2012-07-10 11:49:02 UTC (rev 4505)
+++ trunk/catalog/templates/defaut/includes/boxes/shopping_cart.php 2012-07-10 11:54:07 UTC (rev 4506)
@@ -9,7 +9,7 @@
*\author oscim <mail aur...@os...> <www http://www.oscim.fr>
*\encode UTF-8
*\group boxes
- *\file
+ *\file
*\dir includes/boxes/
*\brief cart custommers
*/
@@ -49,7 +49,7 @@
$detail_tot[]= sprintf('<span>%s </span> %s' ,$tot->text, $currencies->format($tot->value)) ;
}
- $detail_tot[]= '<li>'.__('box shopping cart weight').' '.$cart->show_weight().' '.UNIT_WEIGHT_NAME.'</a></li>'."\n";
+ $detail_tot[]= __('box shopping cart weight').' '.$cart->show_weight().' '.UNIT_WEIGHT_NAME.'</a>'."\n";
}
$info_box_contents .= '<p><a class="navBt" href="' . tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL') . '">' . __('box shopping cart button checkout') . '</a></p>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-10 11:49:11
|
Revision: 4505
http://oscss.svn.sourceforge.net/oscss/?rev=4505&view=rev
Author: oscim
Date: 2012-07-10 11:49:02 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
Added Paths:
-----------
branches/2.1.1/catalog/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-10 11:48:38
|
Revision: 4504
http://oscss.svn.sourceforge.net/oscss/?rev=4504&view=rev
Author: oscim
Date: 2012-07-10 11:48:29 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
create dir branche 2.1.1
Added Paths:
-----------
branches/2.1.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-08 20:31:47
|
Revision: 4503
http://oscss.svn.sourceforge.net/oscss/?rev=4503&view=rev
Author: oscim
Date: 2012-07-08 20:31:40 +0000 (Sun, 08 Jul 2012)
Log Message:
-----------
Correction du modele datatype du GenerCode
Correction de la class MLinkTo pour l'appel dynamique des classes
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/MLinkTo.php
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.edit.gab
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/pages/_DATATYPE_REPLACE_s.php
trunk/dev/GenerCode/datatype/Modele/install.xml
Modified: trunk/catalog/admin/includes/classes/MLinkTo.php
===================================================================
--- trunk/catalog/admin/includes/classes/MLinkTo.php 2012-07-06 12:05:11 UTC (rev 4502)
+++ trunk/catalog/admin/includes/classes/MLinkTo.php 2012-07-08 20:31:40 UTC (rev 4503)
@@ -117,11 +117,11 @@
case 'content': // retro compatible
return 'cms_'.$classname;
break;
- case 'product': // retro compatible
+// case 'product': // retro compatible
+// return $classname.'s';
+// break;
+ default:
return $classname.'s';
- break;
- default:
- return $classname;
}
}
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.edit.gab
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.edit.gab 2012-07-06 12:05:11 UTC (rev 4502)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.edit.gab 2012-07-08 20:31:40 UTC (rev 4503)
@@ -30,75 +30,67 @@
<div id="tabs-1" class="tabPage">
<div class="edit box_left w_70" >
- <div class="tabs_lang">
- <ul>
- <?php for ($i=0, $n=sizeof(_DATATYPE_REPLACE_s::$languages); $i<$n; $i++) { ?>
- <li><a href="#fieldset_<?php echo $i ?>"><?php echo tep_language_image(_DATATYPE_REPLACE_s::$languages[$i]['directory'] . '/images/' . _DATATYPE_REPLACE_s::$languages[$i]['image'], _DATATYPE_REPLACE_s::$languages[$i]['name']); ?></a></li>
+ <div class="tabs_lang">
+ <ul>
+ <?php for ($i=0, $n=sizeof(_DATATYPE_REPLACE_s::$languages); $i<$n; $i++) { ?>
+ <li><a href="#fieldset_<?php echo $i ?>"><?php echo tep_language_image(_DATATYPE_REPLACE_s::$languages[$i]['directory'] . '/images/' . _DATATYPE_REPLACE_s::$languages[$i]['image'], _DATATYPE_REPLACE_s::$languages[$i]['name']); ?></a></li>
- <?php } ?>
- </ul>
- <?php for ($i=0, $n=sizeof(_DATATYPE_REPLACE_s::$languages); $i<$n; $i++) { ?>
- <fieldset id="fieldset_<?php echo $i ?>" class="block_field">
- <p class="block_input">
- <label for="<?php echo '_DATATYPE_REPLACE__title' . _DATATYPE_REPLACE_s::$languages[$i]['id']; ?>"><?php echo __('entry title'); ?></label>
- <?php echo tep_draw_input_field('_DATATYPE_REPLACE__title[' . _DATATYPE_REPLACE_s::$languages[$i]['id'] . ']', '_DATATYPE_REPLACE__title' . $i, _DATATYPE_REPLACE_s::$Info->title[ _DATATYPE_REPLACE_s::$languages[$i]['id']], 'size="70"', true) ; ?>
- </p>
- <p class="block_input" >
- <?php echo __('txt info permalink').tep_catalog_href_link('_DATATYPE_REPLACE_.php','_DATATYPE_REPLACE_=' . _DATATYPE_REPLACE_s::$Info->_DATATYPE_REPLACE__id.'&language='._DATATYPE_REPLACE_s::$languages[$i]['code'] , 'NONSSL', false); ?>
- </p>
- <br style="clear:both" />
- <?php echo $oscss->_call(BO_WISIWYG_SELECTED,'_draw','_DATATYPE_REPLACE__description[' . _DATATYPE_REPLACE_s::$languages[$i]['id'] . ']','1000','800',_DATATYPE_REPLACE_s::$Info->description[_DATATYPE_REPLACE_s::$languages[$i]['id']]); ?>
- </fieldset>
- <?php } ?>
- </div>
+ <?php } ?>
+ </ul>
+ <?php for ($i=0, $n=sizeof(_DATATYPE_REPLACE_s::$languages); $i<$n; $i++) { ?>
+ <fieldset id="fieldset_<?php echo $i ?>" class="block_field">
+ <p class="block_input">
+ <label for="<?php echo '_DATATYPE_REPLACE__title' . _DATATYPE_REPLACE_s::$languages[$i]['id']; ?>"><?php echo __('entry title'); ?></label>
+ <?php echo tep_draw_input_field('_DATATYPE_REPLACE__title[' . _DATATYPE_REPLACE_s::$languages[$i]['id'] . ']', '_DATATYPE_REPLACE__title' . $i, _DATATYPE_REPLACE_s::$Info->title[ _DATATYPE_REPLACE_s::$languages[$i]['id']], 'size="70"', true) ; ?>
+ </p>
+ <p class="block_input" >
+ <?php echo __('txt info permalink').tep_catalog_href_link('_DATATYPE_REPLACE_.php','_DATATYPE_REPLACE_=' . _DATATYPE_REPLACE_s::$Info->_DATATYPE_REPLACE__id.'&language='._DATATYPE_REPLACE_s::$languages[$i]['code'] , 'NONSSL', false); ?>
+ </p>
+ <br style="clear:both" />
+ <?php echo $oscss->_call(BO_WISIWYG_SELECTED,'_draw','_DATATYPE_REPLACE__description[' . _DATATYPE_REPLACE_s::$languages[$i]['id'] . ']','1000','800',_DATATYPE_REPLACE_s::$Info->description[_DATATYPE_REPLACE_s::$languages[$i]['id']]); ?>
+ </fieldset>
+ <?php } ?>
+ </div>
</div>
- <div class="edit box_right w_30">
- <dl>
-
- <dt class="block_input w_90">
- <label><?php echo __('text _DATATYPE_REPLACE_ status'); ?></label>
- <?php echo tep_draw_radio_field('_DATATYPE_REPLACE__status', '_DATATYPE_REPLACE__status_1', '1', _DATATYPE_REPLACE_s::$enabled_status) . __('text _DATATYPE_REPLACE_ enabled') . tep_draw_radio_field('_DATATYPE_REPLACE__status', '_DATATYPE_REPLACE__status_0', '0', _DATATYPE_REPLACE_s::$disabled_status) . __('text _DATATYPE_REPLACE_ disabled'); ?>
- </dt>
- <dt class="block_input w_90 CategoryView">
- <label>
- <span class="text"><?php echo __('txt categories'); ?></span>
- <span class="button_nav"><?php echo '<a class="buttonimg fancy" href="' . tep_href_link(FILENAME_CATEGORIES, '&datatype=_DATATYPE_REPLACE_&action=new_light&origin='. urlencode(_DATATYPE_REPLACE_s::FILENAME.'?action=edit&cID='. (int)@_DATATYPE_REPLACE_s::$Id) ) . '" title="'. __('add category datatype _DATATYPE_REPLACE_').'">' .tep_image(DIR_WS_ICONS.'icon_add_new.png' ). '</a>'; ?> </span>
- </label>
- <ul id="cat_list_in_edit">
- <?php foreach(_DATATYPE_REPLACE_s::$Info->categories as $v){ $k=$v['categories_id'];
- echo '<li class="selected">'. tep_draw_checkbox_field('categories['.$k.']','cat_'.$k, tep_get_generated_category_path_ids($k), true ).' '.tep_get_category_name($k).'</li>';
- }
- foreach(categorieUtility::get_cat_list(array('root'=>0,'incre'=>false, 'datatype'=>'_DATATYPE_REPLACE_'))/*get_cat_list(0)*/ as $v)
- if(!isset(_DATATYPE_REPLACE_s::$Info->categories[$v['categories_id']])){
- echo '<li class="'.(isset(_DATATYPE_REPLACE_s::$Info->categories[$v['categories_id']])? 'selected' : 'noselected').'">'.tep_decal($v['niveau']).' '. tep_draw_checkbox_field('categories['.$v['categories_id'].']','cat_'.$v['categories_id'], tep_get_generated_category_path_ids($v['categories_id']), (isset(_DATATYPE_REPLACE_s::$Info->categories[$v['categories_id']])?true : false) ).' '.$v['categories_name'].'</li>';
- }
- else
- echo '<li class="'.(isset(_DATATYPE_REPLACE_s::$Info->categories[$v['categories_id']])? 'selected' : 'noselected').'">'.tep_decal($v['niveau']).' '. ' '.$v['categories_name'].'</li>';
- ?>
- </ul>
- </dt>
- <dt class="block_input button_nav w_90" >
- <?php echo tep_image_submit('', IMAGE_UPDATE) . tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' );?>
- <?php echo tep_js_back(tep_href_link(_DATATYPE_REPLACE_s::FILENAME, 'cID=' . _DATATYPE_REPLACE_s::$Info->_DATATYPE_REPLACE__id), IMAGE_CANCEL); ?>
- </dt>
- </dl>
- </div>
+ <?php
+ $g=6;
+ if(is_array($_DATATYPE_REPLACE_s)){
+ reset($_DATATYPE_REPLACE_s);
+ foreach ($_DATATYPE_REPLACE_s as $value) {
+ echo '<div id="tabs-'.$g.'" class="tabPage">'."\n";
+ if (!empty($value['text'])) echo $value['text']."\n";
+ else echo '<br />';
+ echo '<div class="separator"></div></div>'."\n";
+ $g++;
+ }
+ } ?>
</div>
- <?php
- $g=6;
- if(is_array($_DATATYPE_REPLACE_s)){
- reset($_DATATYPE_REPLACE_s);
- foreach ($_DATATYPE_REPLACE_s as $value) {
- echo '<div id="tabs-'.$g.'" class="tabPage">'."\n";
- if (!empty($value['text'])) echo $value['text']."\n";
- else echo '<br />';
- echo '<div class="separator"></div></div>'."\n";
- $g++;
- }
- } ?>
- <div class="separator"></div>
+ <div class="edit box_right w_30">
+ <fieldset class="block_field">
+ <dl>
+
+ <dt class="block_input w_90">
+ <label><?php echo __('text _DATATYPE_REPLACE_ status'); ?></label>
+ <?php echo tep_draw_radio_field('_DATATYPE_REPLACE__status', '_DATATYPE_REPLACE__status_1', '1', _DATATYPE_REPLACE_s::$enabled_status) . __('text _DATATYPE_REPLACE_ enabled') . tep_draw_radio_field('_DATATYPE_REPLACE__status', '_DATATYPE_REPLACE__status_0', '0', _DATATYPE_REPLACE_s::$disabled_status) . __('text _DATATYPE_REPLACE_ disabled'); ?>
+ </dt>
+
+ <!-- All LinkTo -->
+ <?php foreach(MLinkTo::LoadRightTo( '_DATATYPE_REPLACE_', 'edit' , 'action='._DATATYPE_REPLACE_s::$action.'&cID='._DATATYPE_REPLACE_s::$Id ) as $row): ?>
+ <dt class="block_input w_90">
+ <?php echo $row['text'] ;?>
+ </dt>
+ <?php endforeach;?>
+
+ <dt class="block_input button_nav w_90" >
+ <?php echo tep_image_submit('', IMAGE_UPDATE) . tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' );?>
+ <?php echo tep_js_back(tep_href_link(_DATATYPE_REPLACE_s::FILENAME, 'cID=' . _DATATYPE_REPLACE_s::$Info->_DATATYPE_REPLACE__id), IMAGE_CANCEL); ?>
+ </dt>
+ </dl>
+ </fieldset>
+ </div>
+
</div>
- </form>
- </div>
+ </form>
+</div>
\ No newline at end of file
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/pages/_DATATYPE_REPLACE_s.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/pages/_DATATYPE_REPLACE_s.php 2012-07-06 12:05:11 UTC (rev 4502)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/pages/_DATATYPE_REPLACE_s.php 2012-07-08 20:31:40 UTC (rev 4503)
@@ -33,32 +33,37 @@
public static $action;
public static $list=array();
+
/**
- @param object
+ @var int current id
*/
+ public static $Id;
+ /**
+ @var object
+ */
public static $modules;
/**
- @param object
+ @var object
*/
- public static $cInfo;
+ public static $Info;
/**
- @param array
+ @var array
*/
public static $languages;
/**
- @param bool
+ @var bool
*/
public static $enabled_status;
/**
- @param bool
+ @var bool
*/
public static $disabled_status;
/**
- @param string
+ @var string
*/
public static $view;
/**
- @param object
+ @var object
*/
public static $statusdet;
@@ -81,8 +86,8 @@
self::$action=(isset($_REQUEST['action'])? $_REQUEST['action'] : 'listing' );
self::$view=(isset($_REQUEST['view'])? $_REQUEST['view'] : '0' );
+ self::$Id=(isset($_REQUEST['cID'])? (int)$_REQUEST['cID'] : 0 );
-
/**
@remarks not load if not first init
*/
@@ -256,9 +261,9 @@
/**
@fn load_db_values($ID)
@brief this load db value function
- This method construct static var $cInfo
+ This method construct static var $Info
@param $ID integer id _DATATYPE_REPLACE_ | 0
- @return $cInfo
+ @return $Info
*/
public static function load_db_values($ID){
global $language_id;
@@ -267,9 +272,9 @@
$cID = tep_db_prepare_input((int)$ID);
// if(in_array(self::$action ,array('edit' ,'delete', 'detail') ) )
-// $cInfo_array=sql_DATATYPE_REPLACE_::fetch(array('id'=>$cID,'language_id'=>$language_id));
+// $Info_array=sql_DATATYPE_REPLACE_::fetch(array('id'=>$cID,'language_id'=>$language_id));
// elseif(self::$action == 'new')
-// $cInfo_array = sql_DATATYPE_REPLACE_::Specimen();
+// $Info_array = sql_DATATYPE_REPLACE_::Specimen();
//
@@ -294,26 +299,26 @@
case 'delete':
break;
case 'new':
- $cInfo_array = sql_DATATYPE_REPLACE_::Specimen();
+ $Info_array = sql_DATATYPE_REPLACE_::Specimen();
break;
case 'detail':
case 'edit':
- $cInfo_array=sql_DATATYPE_REPLACE_::fetch(array('id'=>$cID,'language_id'=>$language_id));
+ $Info_array=sql_DATATYPE_REPLACE_::fetch(array('id'=>$cID,'language_id'=>$language_id));
break;
default:
}
- self::$cInfo = new objectInfo($cInfo_array);
+ self::$Info = new objectInfo($Info_array);
- if (!isset(self::$cInfo->_DATATYPE_REPLACE__status)) self::$cInfo->_DATATYPE_REPLACE__status = '1';
- switch (self::$cInfo->_DATATYPE_REPLACE__status) {
+ if (!isset(self::$Info->_DATATYPE_REPLACE__status)) self::$Info->_DATATYPE_REPLACE__status = '1';
+ switch (self::$Info->_DATATYPE_REPLACE__status) {
case '0': self::$enabled_status = false; self::$disabled_status = true; break;
case '1':
default: self::$enabled_status = true; self::$disabled_status = false;
}
- return self::$cInfo;
+ return self::$Info;
}
/**
Modified: trunk/dev/GenerCode/datatype/Modele/install.xml
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/install.xml 2012-07-06 12:05:11 UTC (rev 4502)
+++ trunk/dev/GenerCode/datatype/Modele/install.xml 2012-07-08 20:31:40 UTC (rev 4503)
@@ -51,7 +51,7 @@
<!-- Module -->
<file name="includes/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.php" />
<file name="includes/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__criteres.php" />
- <file name="includes/modules/account/ac__DATATYPE_REPLACE_.php" />
+<!-- <file name="includes/modules/account/ac__DATATYPE_REPLACE_.php" /> -->
<!-- template -->
<file name="templates/defaut/includes/content/_DATATYPE_REPLACE_.php" />
@@ -73,7 +73,7 @@
<file name="admin/includes/languages/%LANGUAGE%/widget/_DATATYPE_REPLACE_Last.txt" lgref="fr_FR"/>
<file name="includes/languages/%LANGUAGE%/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.txt" lgref="fr_FR"/>
- <file name="includes/languages/%LANGUAGE%/modules/account/ac__DATATYPE_REPLACE_.txt" lgref="fr_FR"/>
+<!-- <file name="includes/languages/%LANGUAGE%/modules/account/ac__DATATYPE_REPLACE_.txt" lgref="fr_FR"/> -->
</addfilelg>
<add2endlg>
@@ -84,8 +84,8 @@
<add2endlg>
<file name="admin/includes/languages/%LANGUAGE%/boxes/01_configuration.php" />
<add type="php" lgref="fr_FR">
- <![CDATA[ define('BOX_HEADING_CONF_OPTION_ANNONCE', 'Option _DATATYPE_REPLACE_MAJ_');
- define('BOX_HEADING_CONF_EXTRA_ANNONCE', '_DATATYPE_REPLACE_MAJ_ EXTRA');]]>
+ <![CDATA[ define('BOX_HEADING_CONF_OPTION__DATATYPE_REPLACE_MAJ_', 'Option _DATATYPE_REPLACE_MAJ_');
+ define('BOX_HEADING_CONF_EXTRA__DATATYPE_REPLACE_MAJ_', '_DATATYPE_REPLACE_MAJ_ EXTRA');]]>
</add>
</add2endlg>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-06 12:05:17
|
Revision: 4502
http://oscss.svn.sourceforge.net/oscss/?rev=4502&view=rev
Author: oscim
Date: 2012-07-06 12:05:11 +0000 (Fri, 06 Jul 2012)
Log Message:
-----------
coquille tag d'install sur le chemin de controle de presence du fichier avant modif
Modified Paths:
--------------
trunk/catalog/admin/includes/exts/package/tags/add2endlg.php
Modified: trunk/catalog/admin/includes/exts/package/tags/add2endlg.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/tags/add2endlg.php 2012-07-06 11:45:28 UTC (rev 4501)
+++ trunk/catalog/admin/includes/exts/package/tags/add2endlg.php 2012-07-06 12:05:11 UTC (rev 4502)
@@ -124,7 +124,7 @@
*/
function do_install() {
for($i = 0; $i < count($this->data['filename']);$i++){
- if(file_exists($this->data['filename'][$i]))
+ if(file_exists(DIR_FS_DOCUMENT_ROOT.$this->data['filename'][$i]))
if(!$this->add_file_end($this->data['filename'][$i],$this->add_str($this->data['add'][$i])))
return false;
}
@@ -138,7 +138,7 @@
*/
function do_remove() {
for($i = 0; $i < count($this->data['filename']);$i++){
- if(file_exists($this->data['filename'][$i]))
+ if(file_exists(DIR_FS_DOCUMENT_ROOT.$this->data['filename'][$i]))
if(!$this->remove_file_part($this->data['filename'][$i],$this->add_str($this->data['add'][$i])))
return false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-06 11:45:35
|
Revision: 4501
http://oscss.svn.sourceforge.net/oscss/?rev=4501&view=rev
Author: oscim
Date: 2012-07-06 11:45:28 +0000 (Fri, 06 Jul 2012)
Log Message:
-----------
correction coquille
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/MLinkTo.php
trunk/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab
trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/classes/drivers/sqlmanufacturer.php
trunk/extensions/MANUFACTURERS_stable/install.xml
Modified: trunk/catalog/admin/includes/classes/MLinkTo.php
===================================================================
--- trunk/catalog/admin/includes/classes/MLinkTo.php 2012-07-05 15:43:42 UTC (rev 4500)
+++ trunk/catalog/admin/includes/classes/MLinkTo.php 2012-07-06 11:45:28 UTC (rev 4501)
@@ -42,23 +42,22 @@
protected function __construct($type){
global $oscss,$language;
-// var_dump('init');
self::$current = $type;
$res = sqlconfiguration::fetch(array('like_key'=>'DATATYPES_ROOTLISTING_%'), true );
-// var_dump($res);
+
if(is_array($res)){
foreach($res as $row){
- $key = strtolower(substr($row->key, strlen('DATATYPES_ROOTLISTING_') ) );
- if( DataTypes::is_active($key))
+ $key = strtolower(substr(self::RetroDatatype($row->key), strlen('DATATYPES_ROOTLISTING_') ) );
+
+ if( DataTypes::is_active($key) ){
// search current in type for rootlisting
- if(in_array(self::$current, explode(',',$row->value))) {
-
- //! @remarks Force load language centralised
-// $oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/pages/'.$key.'s.txt');
-// var_dump($key);
- self::$RL[$key] = $key;
+ if(in_array(self::$current, explode(',',$row->value))) {
+ //! @remarks Force load language centralised
+ // $oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/pages/'.$key.'s.txt');
+ self::$RL[$key] = $key;
+ }
}
}
}
@@ -83,16 +82,17 @@
*/
public static function LoadRightTo( $classname, $action, $origin){
- self::$currclass = $classname;
+ self::getInstance($classname);
+
+ self::$currclass = self::RetroClassName($classname);
+
self::$origin = $origin;
-// self::getInstance(self::$current);
-
$result = array();
foreach(self::$RL as $key=>$row){
$mkey = strtolower($key);
global $language,$lang;
-// var_dump(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'modules/pages/'.$mkey.'s.txt');
+
$oscss = oscss_cstr::getInstance();
//! @remarks Force load language centralised
$oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/modules/pages/'.$mkey.'s.txt');
@@ -106,5 +106,44 @@
return $result;
}
+
+ /**
+ @brief define current class name and adjust retor-compatibilite
+ @param $classname string name of current class
+ */
+ private static function RetroClassName($classname){
+
+ switch($classname){
+ case 'content': // retro compatible
+ return 'cms_'.$classname;
+ break;
+ case 'product': // retro compatible
+ return $classname.'s';
+ break;
+ default:
+ return $classname;
+ }
+
+ }
+
+ /**
+ @brief define current class name and adjust retor-compatibilite
+ @param $classname string name of current class
+ */
+ private static function RetroDatatype($classname){
+
+ switch($classname){
+ case 'cms_content': // retro compatible
+ return $classname;
+ break;
+ case 'products': // retro compatible
+ return $classname;
+ break;
+ default:
+ return $classname;
+ }
+
+ }
+
}
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab 2012-07-05 15:43:42 UTC (rev 4500)
+++ trunk/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab 2012-07-06 11:45:28 UTC (rev 4501)
@@ -89,7 +89,7 @@
<!-- All LinkTo -->
- <?php foreach(MLinkTo::LoadRightTo( 'cms_content', 'edit' , 'action='.cms_content::$action.'&cID='.@$_GET['cID'] ) as $row): ?>
+ <?php foreach(MLinkTo::LoadRightTo( 'content', 'edit' , 'action='.cms_content::$action.'&cID='.@$_GET['cID'] ) as $row): ?>
<dt class="block_input w_90">
<?php echo $row['text'] ;?>
</dt>
Modified: trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/classes/drivers/sqlmanufacturer.php
===================================================================
--- trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/classes/drivers/sqlmanufacturer.php 2012-07-05 15:43:42 UTC (rev 4500)
+++ trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/classes/drivers/sqlmanufacturer.php 2012-07-06 11:45:28 UTC (rev 4501)
@@ -132,14 +132,10 @@
if(isset($option['name'])) $sql .="AND manufacturers_name = '".(string)tep_db_input($option['name'])."' ";
// if(isset($option['visible'])) $sql .="AND manufacturersvisible = '".(int)$option['visible']."' ";
+ $sql="SELECT * FROM " . TABLE_MANUFACTURERS . " a ";
- if($sql=='')
- return false;
+ if($sql=='') $sql.=" WHERE ".substr($sql,3);
-
- $sql="SELECT * FROM " . TABLE_MANUFACTURERS . " a ".
- " WHERE ".substr($sql,3);
-
$res=$DB->query($sql);
$num = $res->__get('numRows');
Modified: trunk/extensions/MANUFACTURERS_stable/install.xml
===================================================================
--- trunk/extensions/MANUFACTURERS_stable/install.xml 2012-07-05 15:43:42 UTC (rev 4500)
+++ trunk/extensions/MANUFACTURERS_stable/install.xml 2012-07-06 11:45:28 UTC (rev 4501)
@@ -36,7 +36,7 @@
</addfilelg>
<add2endlg>
- <file name="admin/includes/languages/%LANGUAGE%/boxes/01_configuration.php" />
+ <file name="admin/includes/languages/%LANGUAGE%/boxes/07_catalog.php" />
<add type="php" lgref="fr_FR">
<![CDATA[ define('BOX_MANUFACTURERS', 'Fabricants'); ]]>
</add>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-05 15:43:51
|
Revision: 4500
http://oscss.svn.sourceforge.net/oscss/?rev=4500&view=rev
Author: oscim
Date: 2012-07-05 15:43:42 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
adjust
Modified Paths:
--------------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_history_info.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_history_info.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_history_info.php 2012-07-04 14:49:57 UTC (rev 4499)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_history_info.php 2012-07-05 15:43:42 UTC (rev 4500)
@@ -57,8 +57,8 @@
?> </td>
<td class="invoiceQty tcenter"><?php echo $prdct['qty'] ;?></td>
<td class="invoiceTaxes tcenter taxe"><?php echo tep_display_tax_value($prdct['tax']) . '%' ; ?></td>
- <td class="invoicePrice tright pu"><?php echo $currencies->format($prdct['final_price'] , true, $order->info['currency'], $order->info['currency_value']) ; ?></td>
- <td class="invoicePrice tright totht"><?php echo $currencies->format($prdct['final_price'] * $prdct['qty'], true, $order->info['currency'], $order->info['currency_value']) ; ?></td>
+<!-- <td class="invoicePrice tright pu"><?php echo $currencies->format($prdct['final_price'] , true, $order->info['currency'], $order->info['currency_value']) ; ?></td> -->
+<!-- <td class="invoicePrice tright totht"><?php echo $currencies->format($prdct['final_price'] * $prdct['qty'], true, $order->info['currency'], $order->info['currency_value']) ; ?></td> -->
<td class="invoicePrice tright totttc"><?php echo $currencies->format(tep_add_tax($prdct['final_price'], $prdct['tax'],true) * $prdct['qty'], true, $order->info['currency'], $order->info['currency_value']) ; ?></td>
</tr>
<?php } ?>
@@ -76,16 +76,16 @@
</tbody>
</table>
-
+<?php /*
<?php if (tep_not_null($order->info['shipping_method'])) { ?>
<p><?php echo HEADING_SHIPPING_METHOD . ':' . $order->info['shipping_method']; ?></p>
<?php } ?>
<p><?php echo HEADING_PAYMENT_METHOD . ':' . $order->info['payment_method']; ?></p>
+*/ ?>
- <h5><?php echo HEADING_ORDER_HISTORY; ?></h5>
-
- <table class="invoiceHistory" cellspacing="0" summary="<?php echo HEADING_ORDER_HISTORY; ?>">
+ <table class="invoice invoiceHistory" cellspacing="0" summary="<?php echo HEADING_ORDER_HISTORY; ?>">
+ <caption><?php echo HEADING_ORDER_HISTORY; ?></caption>
<thead>
<tr>
<th><?php echo HEADING_HISTORY_DATE; ?></th>
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2012-07-04 14:49:57 UTC (rev 4499)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2012-07-05 15:43:42 UTC (rev 4500)
@@ -401,4 +401,49 @@
#slider ul li.one.product section.outerblock {
height:inherit;
width:inherit;
-}
\ No newline at end of file
+}
+
+
+table.invoice{
+ clear:both;
+ background:none;
+ margin:10px 1%;
+ width: 98%;
+}
+table.invoice.invoiceDetails,
+table.invoice.invoiceTotal,
+table.invoice.invoiceHistory{
+ margin-top:0;
+ margin-bottom:0;
+ border-collapse:collapse;
+ border: 1px solid gray;
+}
+table.invoice.invoiceTotal {
+ border-top: none;
+ width:60%;
+ float:right;
+}
+table.invoice.invoiceHistory{
+ position:relative;
+ top:10px;
+}
+
+
+table.invoice.invoiceDetails thead th,
+table.invoice.invoiceTotal thead th,
+table.invoice.invoiceHistory thead th{
+ margin:10px 0;
+ background:gray;
+ border-left: 1px solid gray;
+}
+table.invoice.invoiceDetails tbody td,
+table.invoice.invoiceTotal tbody td,
+table.invoice.invoiceHistory tbody td{
+ border-left: 1px solid gray;
+}
+
+table.invoice thead th.totttc,
+table.invoice tbody td.totttc {
+ width:84px;
+ text-align:right;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-04 14:50:06
|
Revision: 4499
http://oscss.svn.sourceforge.net/oscss/?rev=4499&view=rev
Author: oscim
Date: 2012-07-04 14:49:57 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
coquille lors de la selection
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/featureds/rightto.edit.gab
Modified: trunk/catalog/admin/includes/gabarit/featureds/rightto.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/featureds/rightto.edit.gab 2012-07-04 13:50:30 UTC (rev 4498)
+++ trunk/catalog/admin/includes/gabarit/featureds/rightto.edit.gab 2012-07-04 14:49:57 UTC (rev 4499)
@@ -36,15 +36,9 @@
<ul class="LinkToView">
<?php foreach($list as $v): ?>
- <?php if(!isset($curr::$Info->id[$v->id])): ?>
<li class="<?php echo (isset($curr::$Info->categories[$v->id])? 'selected' : 'noselected') ?>">
<?php echo tep_draw_checkbox_field('linkto[featured]['.$v->id.']','linkto_featured_'.$v->id, $v->id, (isset($curr::$Info->featureds[$v->id])?true : false) ).' ['.status_name('featured', $v->type ,$languages_id).'] - '. $v->lg[$languages_id]->title ; ?>
</li>
- <?php else: ?>
- <li class="<?php echo (isset($curr::$Info->categories[$v->id])? 'selected' : 'noselected') ?>">
- <?php echo status_name('featured', $v->type ,$languages_id); ?>
- </li>
- <?php endif; ?>
<?php endforeach; ?>
</ul>
</div>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-04 13:50:36
|
Revision: 4498
http://oscss.svn.sourceforge.net/oscss/?rev=4498&view=rev
Author: oscim
Date: 2012-07-04 13:50:30 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
coquille sur le control des datatype actif
Modified Paths:
--------------
trunk/catalog/includes/modules/featured.php
Modified: trunk/catalog/includes/modules/featured.php
===================================================================
--- trunk/catalog/includes/modules/featured.php 2012-07-04 06:44:04 UTC (rev 4497)
+++ trunk/catalog/includes/modules/featured.php 2012-07-04 13:50:30 UTC (rev 4498)
@@ -83,10 +83,12 @@
$dt = $featured['datatype'];
- $pd = $dt::get_item($featured['id']);
-// $pd->aca=$aca_listing->return_db_min($featured['products_id']);
- $pd->type = $dt;
- $p[]=$pd;
+ if( DataTypes::is_active($dt)){
+ $pd = $dt::get_item($featured['id']);
+ // $pd->aca=$aca_listing->return_db_min($featured['products_id']);
+ $pd->type = $dt;
+ $p[]=$pd;
+ }
}
return new objectInfo(array('title'=>$title, 'content'=>$p , 'type'=>$dt ));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-04 06:44:10
|
Revision: 4497
http://oscss.svn.sourceforge.net/oscss/?rev=4497&view=rev
Author: oscim
Date: 2012-07-04 06:44:04 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
Ajout element necessaire en db pour pre configuration featured
activation dans l'install de featured
correction coquille extension
Modified Paths:
--------------
trunk/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/gabarit/products/UltimateImage/display_edit.listing.gab
Added Paths:
-----------
trunk/catalog/install/includes/sql/mysql/data/40_osc_featured.sql
trunk/catalog/install/includes/sql/mysql/data/40_osc_featured_description.sql
Modified: trunk/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql
===================================================================
--- trunk/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql 2012-07-03 07:04:08 UTC (rev 4496)
+++ trunk/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql 2012-07-04 06:44:04 UTC (rev 4497)
@@ -214,9 +214,11 @@
+INSERT IGNORE INTO osc_featured_data (row_id, featured_id, datatype, datatype_id, date_added, user_added, date_update, user_update, date_start, date_end) VALUES
+(2, 1, 'product', 11, '2012-07-04 08:37:58', 1, '0000-00-00 00:00:00', 0, '1000-01-01 00:00:00', '1000-01-01 00:00:00'),
+(3, 1, 'product', 12, '2012-07-04 08:38:07', 1, '0000-00-00 00:00:00', 0, '1000-01-01 00:00:00', '1000-01-01 00:00:00');
-
INSERT INTO osc_images ( pathkey, path, file, date_added, last_modified, width, height, ext) VALUES
( '692b75fc6312e428109e1f9312cfa007', 'images/sony.png', 'sony.png', '2011-12-26 23:40:29', '0000-00-00 00:00:00', 300, 191, 'png'),
( 'cba0825cec275d062a22572011c55c48', 'images/D40x.jpg', 'D40x.jpg', '2011-12-26 23:40:29', '0000-00-00 00:00:00', 841, 650, 'jpeg'),
Added: trunk/catalog/install/includes/sql/mysql/data/40_osc_featured.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/40_osc_featured.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/data/40_osc_featured.sql 2012-07-04 06:44:04 UTC (rev 4497)
@@ -0,0 +1,19 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2011 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+
+
+
+INSERT IGNORE INTO osc_featured (row_id, k_status_type, featured_uniqkey, featured_min, featured_max, featured_status, date_added, user_added, date_update, user_update) VALUES
+(1, 1, 'home_slideshow', 1, 10, 1, NOW(), 1, NOW(), 1);
+
Added: trunk/catalog/install/includes/sql/mysql/data/40_osc_featured_description.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/40_osc_featured_description.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/data/40_osc_featured_description.sql 2012-07-04 06:44:04 UTC (rev 4497)
@@ -0,0 +1,19 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2011 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+
+
+
+INSERT IGNORE INTO osc_featured_description (featured_id, languages_id, featured_title) VALUES
+(1, 1, 'Diaporama accueil');
+
Modified: trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql 2012-07-03 07:04:08 UTC (rev 4496)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql 2012-07-04 06:44:04 UTC (rev 4497)
@@ -342,7 +342,7 @@
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('NO_DISPLAY_SYMBOL_TAXE_S', 'NO_DISPLAY_SYMBOL_TAXE', 'GabaritTemplate', 'NO_DISPLAY_SYMBOL_TAXE_L', '128', '0', NOW(), NOW(),NULL, NULL, 2);
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function ,set_function,configuration_type) values ('DATATYPES_DEFAULT_NOSELECTED_S', 'DATATYPES_DEFAULT_NOSELECTED', 'product', 'DATATYPES_DEFAULT_NOSELECTED_L', '128', '0', NOW(), NOW(),NULL, NULL, 2);
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('PUBLIC_PAGE_TYPE_S', 'PUBLIC_PAGE_TYPE', 'listing,product,account,home,content', 'PUBLIC_PAGE_TYPE_L', '128', '0', NOW(), NOW(),NULL, NULL, 2);
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('DATATYPES_S', 'DATATYPES', 'error,product,content,diver,categorie,home,', 'DATATYPES_L', '128', '0', NOW(), NOW(),NULL, NULL, 2);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('DATATYPES_S', 'DATATYPES', 'error,product,content,diver,featured,categorie,home,', 'DATATYPES_L', '128', '0', NOW(), NOW(),NULL, NULL, 2);
insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('DATATYPES_ROOTLISTING_CATEGORIE_S', 'DATATYPES_ROOTLISTING_CATEGORIE', 'product,content,nested', 'DATATYPES_ROOTLISTING_CATEGORIE_L', '128', '0', NOW(), NOW(),NULL, NULL, 2);
insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('DATATYPES_ROOTLISTING_FEATURED_S', 'DATATYPES_ROOTLISTING_FEATURED', 'product', 'DATATYPES_ROOTLISTING_FEATURED_L', '128', '0', NOW(), NOW(),NULL, NULL, 2);
Modified: trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/gabarit/products/UltimateImage/display_edit.listing.gab
===================================================================
--- trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/gabarit/products/UltimateImage/display_edit.listing.gab 2012-07-03 07:04:08 UTC (rev 4496)
+++ trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/gabarit/products/UltimateImage/display_edit.listing.gab 2012-07-04 06:44:04 UTC (rev 4497)
@@ -35,13 +35,13 @@
<?php foreach(UltimateImage::$iList as $img): $cpt++; ?>
<tr id="ListImage_<?php echo $img->id ?>">
<td>
- <?php echo tep_info_image( $img->products_image_sm, products::$pInfo->products_name, UltimateImage::$THUMB, UltimateImage::$THUMB, 'align="left" hspace="0" vspace="5"') ?>
+ <?php echo tep_info_image( $img->products_image_sm,'' /*products::$pInfo->products_name*/, UltimateImage::$THUMB, UltimateImage::$THUMB, 'align="left" hspace="0" vspace="5"') ?>
<?php echo tep_draw_hidden_field('products_image_sm_', $img->products_image_sm) ?>
</td>
<td>
<?php echo tep_draw_hidden_field('products_image_xl', $img->products_image_xl) ?>
- <?php echo tep_info_image( $img->products_image_xl, products::$pInfo->products_name, UltimateImage::$THUMB, UltimateImage::$THUMB, 'align="left" hspace="0" vspace="5"') ?>
+ <?php echo tep_info_image( $img->products_image_xl, ''/*products::$pInfo->products_name*/, UltimateImage::$THUMB, UltimateImage::$THUMB, 'align="left" hspace="0" vspace="5"') ?>
</td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-03 07:04:15
|
Revision: 4496
http://oscss.svn.sourceforge.net/oscss/?rev=4496&view=rev
Author: oscim
Date: 2012-07-03 07:04:08 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
obsolete
Removed Paths:
-------------
trunk/catalog/templates/defaut/includes/gabarit/desc_base.display_view.gab
Deleted: trunk/catalog/templates/defaut/includes/gabarit/desc_base.display_view.gab
===================================================================
--- trunk/catalog/templates/defaut/includes/gabarit/desc_base.display_view.gab 2012-07-02 19:58:48 UTC (rev 4495)
+++ trunk/catalog/templates/defaut/includes/gabarit/desc_base.display_view.gab 2012-07-03 07:04:08 UTC (rev 4496)
@@ -1,17 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 22/06/10, 18:12
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<div id="productDescription">
- <div>
- <?php echo desc_base::$products_description ?>
- </div>
- <p><?php echo desc_base::$products_url ?></p>
-</div>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
