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-02 19:58:54
|
Revision: 4495
http://oscss.svn.sourceforge.net/oscss/?rev=4495&view=rev
Author: oscim
Date: 2012-07-02 19:58:48 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
correction erreur notice
ajustement css BO
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/drivers/sqlcontent.php
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
Modified: trunk/catalog/admin/includes/classes/drivers/sqlcontent.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcontent.php 2012-07-02 18:58:15 UTC (rev 4494)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcontent.php 2012-07-02 19:58:48 UTC (rev 4495)
@@ -273,6 +273,7 @@
), true
);
+ if($res !=false)
foreach($res as $row2)
$row['featureds'][$row2->featured_id]=$row2;
}
Modified: trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2012-07-02 18:58:15 UTC (rev 4494)
+++ trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2012-07-02 19:58:48 UTC (rev 4495)
@@ -280,8 +280,8 @@
#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:28px;}
-#user ul#MenuExts li { background:transparent url(img/1/bg_header.jpg) repeat-x ;padding:0 8px;}
+#user { background:#303030 ;border-top: 1px solid #3F3F3F; padding-right:10px; height:27px;}
+#user ul#MenuExts li { background: none repeat-x scroll 0 0 #78222F; height: 25px; padding: 0 8px;}
#user ul#MenuExts li a {color:white;}
#user ul#MenuExts li a:hover{color:gray;}
#user li { position:relative; float:left;}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-02 18:58:21
|
Revision: 4494
http://oscss.svn.sourceforge.net/oscss/?rev=4494&view=rev
Author: oscim
Date: 2012-07-02 18:58:15 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
coquille calcul du nombre d'entree dans la liste des rapports
Modified Paths:
--------------
trunk/catalog/admin/includes/modules/pages/rapport.php
Modified: trunk/catalog/admin/includes/modules/pages/rapport.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/rapport.php 2012-07-02 17:39:58 UTC (rev 4493)
+++ trunk/catalog/admin/includes/modules/pages/rapport.php 2012-07-02 18:58:15 UTC (rev 4494)
@@ -264,7 +264,7 @@
$adjust=new objectInfo(self::$InitInfo['adjust']);
-
+ $query_numrows = 0;
/* Calcul des module de stats et rapport*/
foreach(scan(DIR_FS_ADMIN .DIR_WS_MODULES.'rapport/') as $file)
if (substr("$file", -4) == '.php'){
@@ -280,6 +280,7 @@
'rapport_description'=>$new->description,
);
$res[] = $tmp;
+ $query_numrows++;
}
$res=self::FormatDBValue($res);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-02 17:40:04
|
Revision: 4493
http://oscss.svn.sourceforge.net/oscss/?rev=4493&view=rev
Author: oscim
Date: 2012-07-02 17:39:58 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
coquille
Modified Paths:
--------------
trunk/catalog/Documents/admin/data/repository_sources.xml
trunk/catalog/admin/includes/classes/drivers/sqlcontent.php
trunk/catalog/admin/includes/classes/drivers/sqlproduct.php
trunk/catalog/admin/includes/gabarit/MGabCont/filter.subtype.gab
Modified: trunk/catalog/Documents/admin/data/repository_sources.xml
===================================================================
--- trunk/catalog/Documents/admin/data/repository_sources.xml 2012-07-01 19:51:27 UTC (rev 4492)
+++ trunk/catalog/Documents/admin/data/repository_sources.xml 2012-07-02 17:39:58 UTC (rev 4493)
@@ -1,14 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<root>
- <channel>
- <title>Local</title>
- <key>local</key>
- <description>local folder</description>
- <repository> </repository>
- <rep_listing> </rep_listing>
- <rep_detail> </rep_detail>
- </channel>
+
<channel>
<title>Official</title>
@@ -25,4 +18,16 @@
<download>download_package</download>
</service>
</channel>
+
+
+ <channel>
+ <title>Local</title>
+ <key>local</key>
+ <description>local folder</description>
+ <repository>
+ </repository>
+ <rep_listing>
+ </rep_listing>
+ <rep_detail> </rep_detail>
+ </channel>
</root>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/classes/drivers/sqlcontent.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcontent.php 2012-07-01 19:51:27 UTC (rev 4492)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcontent.php 2012-07-02 17:39:58 UTC (rev 4493)
@@ -229,6 +229,7 @@
$num = $res->__get('numRows');
+ $cInfo_array = array();
if($num == 1)
$cInfo_array[] = $res->fetchAssoc();
else
@@ -238,7 +239,6 @@
tep_db_free_result($res);
-
foreach($cInfo_array as $row) {
// call all langue for this post
Modified: trunk/catalog/admin/includes/classes/drivers/sqlproduct.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlproduct.php 2012-07-01 19:51:27 UTC (rev 4492)
+++ trunk/catalog/admin/includes/classes/drivers/sqlproduct.php 2012-07-02 17:39:58 UTC (rev 4493)
@@ -280,7 +280,7 @@
'id'=> $ID,
), true
);
-
+ if(count($res)>0)
foreach($res as $row)
$product['featureds'][$row->featured_id]=$row;
}
Modified: trunk/catalog/admin/includes/gabarit/MGabCont/filter.subtype.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/MGabCont/filter.subtype.gab 2012-07-01 19:51:27 UTC (rev 4492)
+++ trunk/catalog/admin/includes/gabarit/MGabCont/filter.subtype.gab 2012-07-02 17:39:58 UTC (rev 4493)
@@ -15,7 +15,7 @@
<ul class="inline">
<?php foreach(tep_get_status_array(MGabCont::CallSt('GetClassDatatype')) as $item): ?>
<li>
- <?php echo tep_draw_checkbox_field('filters[subtype]['.$item['id'] .']', 'filters[subtype]['.$item['id'].']', 'on', (bool)(count(@$_SESSION['filters']['subtype']) <=1 || (string)@$_SESSION['filters']['subtype'][$item['id']] == 'on')); ?>
+ <?php echo tep_draw_checkbox_field('filters[subtype]['.$item['id'] .']', 'filters[subtype]['.$item['id'].']', 'on', (bool)(count(@$_SESSION['filters']['subtype']) <1 || (string)@$_SESSION['filters']['subtype'][$item['id']] == 'on')); ?>
<?php echo $item['text'] ?>
</li>
<?php endforeach; ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-01 19:51:33
|
Revision: 4492
http://oscss.svn.sourceforge.net/oscss/?rev=4492&view=rev
Author: oscim
Date: 2012-07-01 19:51:27 +0000 (Sun, 01 Jul 2012)
Log Message:
-----------
correction mineurs
Modified Paths:
--------------
trunk/catalog/admin/includes/modules/pages/products.php
trunk/catalog/admin/includes/template/defaut/gabarit-1.php
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
Modified: trunk/catalog/admin/includes/modules/pages/products.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/products.php 2012-07-01 15:38:55 UTC (rev 4491)
+++ trunk/catalog/admin/includes/modules/pages/products.php 2012-07-01 19:51:27 UTC (rev 4492)
@@ -263,11 +263,11 @@
'text'=>__('products table heading price'),
);
- self::$allfields['p.products_price']= array(
- 'sort'=>false,
- 'alias'=>'price_ttx',
- 'text'=>__('products table heading price taxe'),
- );
+// self::$allfields['p.products_price']= array(
+// 'sort'=>false,
+// 'alias'=>'price_ttx',
+// 'text'=>__('products table heading price taxe'),
+// );
self::$allfields['p.products_tax_class_id']= array(
'sort'=>true,
Modified: trunk/catalog/admin/includes/template/defaut/gabarit-1.php
===================================================================
--- trunk/catalog/admin/includes/template/defaut/gabarit-1.php 2012-07-01 15:38:55 UTC (rev 4491)
+++ trunk/catalog/admin/includes/template/defaut/gabarit-1.php 2012-07-01 19:51:27 UTC (rev 4492)
@@ -44,7 +44,7 @@
$menu_link .= '</ul>'."\n";
echo $menu_link;?>
<ul class="fright">
- <li class="inline"><?php echo tep_draw_form('menubookmark', 'index.php', '', 'get') ?><p class="themeSwitcher">Bookmark: <?php echo tep_draw_pull_down_menu('page_admin',$Bookmark, '' , 'onchange="this.form.submit();"') ?></p></form></li>
+ <li class="inline"><?php echo tep_draw_form('menubookmark', 'index.php', '', 'get') ?><p class="themeSwitcher"><?php echo __('recently viewed') ?><?php echo tep_draw_pull_down_menu('page_admin',$Bookmark, '' , 'onchange="this.form.submit();"') ?></p></form></li>
<li class="account inline"><a class="buttonimg" href="<?php echo tep_href_link(FILENAME_LOGOFF, '', 'NONSSL') ?>"><?php echo tep_image(DIR_WS_ICONS. 'icon_logoff.png',HEADER_TITLE_LOGOFF) ?></a></li>
<li class="userName inline"><a class="buttonimg" href="<?php echo tep_href_link(FILENAME_ADMIN_ACCOUNT, '', 'NONSSL') ?>"><?php echo tep_image(DIR_WS_ICONS. 'users.png', HEADER_TITLE_ACCOUNT.' '.$login_firstname) ?></a></li>
</ul>
Modified: trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2012-07-01 15:38:55 UTC (rev 4491)
+++ trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2012-07-01 19:51:27 UTC (rev 4492)
@@ -287,7 +287,7 @@
#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 { float:right; margin:0; padding:2px 1em 0 0; text-align:right; width:250px; color:white;}
p.themeSwitcher select { vertical-align:middle; font-size:0.9em; width:100px; }
/* Bookmark */
#menubookmark p.themeSwitcher select option,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-01 15:39:02
|
Revision: 4491
http://oscss.svn.sourceforge.net/oscss/?rev=4491&view=rev
Author: oscim
Date: 2012-07-01 15:38:55 +0000 (Sun, 01 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php
Modified: trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php 2012-07-01 15:24:50 UTC (rev 4490)
+++ trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php 2012-07-01 15:38:55 UTC (rev 4491)
@@ -69,6 +69,7 @@
define('BOX_HEADING_CONF_BOX_CONFIGURATION_PRODUCTS_EXTRA_FIELDS',"Produits extra" );
define('BOX_HEADING_CONF_NEW_PRODUCTS',"Nouveaux produits" );
define('BOX_HEADING_CONF_OPTION_CUSTOMERS',"Option des utilisateurs" );
+ define('BOX_HEADING_CONF_CONFIG_CUSTOMERS',"Configuration des comptes clients" );
define('BOX_HEADING_CONF_BOX_CONFIGURATION_EXTRA_FIELDS',"Clients extra" );
define('BOX_HEADING_CONF_MEMBRES_DETAIL',"Membre détail" );
define('BOX_HEADING_CONF_OPTION_ORDERS',"Option des commandes" );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-01 15:24:58
|
Revision: 4490
http://oscss.svn.sourceforge.net/oscss/?rev=4490&view=rev
Author: oscim
Date: 2012-07-01 15:24:50 +0000 (Sun, 01 Jul 2012)
Log Message:
-----------
Correction diverse
deport de la configuration des souso module de chaque type dans les page de configuration de chaque datatype
Ajustement element manquant dans la config
Ajout d'une page de datyeaccount
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/modulesUtility.php
trunk/catalog/admin/includes/content/modules.top.inc
trunk/catalog/admin/includes/gabarit/configuration/datatypeproduct.listing.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeproduct.txt
trunk/catalog/admin/includes/modules/configuration/datatypeproduct.php
trunk/catalog/admin/includes/modules/pages/products.php
trunk/catalog/install/includes/sql/mysql/data/91_osc_admin_cip.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration_group.sql
Added Paths:
-----------
trunk/catalog/admin/includes/gabarit/configuration/datatypeaccount.listing.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeaccount.txt
trunk/catalog/admin/includes/modules/configuration/datatypeaccount.php
trunk/catalog/install/includes/sql/mysql/data/92_osc_admin_cip_modfiles.sql
Modified: trunk/catalog/admin/includes/classes/modulesUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/modulesUtility.php 2012-07-01 08:12:31 UTC (rev 4489)
+++ trunk/catalog/admin/includes/classes/modulesUtility.php 2012-07-01 15:24:50 UTC (rev 4490)
@@ -19,6 +19,10 @@
protected function __construct(){
self::$pathType['checkout_process']=array('key'=>'MODULE_CHECKOUT_PROCESS_INSTALLED', 'value'=>MODULE_CHECKOUT_PROCESS_INSTALLED, 'module_directory'=> 'process/');
+
+ // retor compatibilite
+ self::$pathType['products']=array('key'=>'MODULE_ACAPRO_INSTALLED', 'value'=>MODULE_ACAPRO_INSTALLED,'key_BO'=>'MODULE_ACAPRO_INSTALLED_BO', 'value_BO'=>MODULE_ACAPRO_INSTALLED_BO,'module_directory'=> 'products/','module_language'=>DIR_FS_ADMIN.DIR_WS_LANGUAGES, 'prefix'=>'' );
+ self::$pathType['product']=self::$pathType['products'];
}
protected static function getInstance() {
Modified: trunk/catalog/admin/includes/content/modules.top.inc
===================================================================
--- trunk/catalog/admin/includes/content/modules.top.inc 2012-07-01 08:12:31 UTC (rev 4489)
+++ trunk/catalog/admin/includes/content/modules.top.inc 2012-07-01 15:24:50 UTC (rev 4490)
@@ -38,10 +38,10 @@
case 'general':
default:
$code_inistalletd_array['generic']=array('key'=>'MODULE_GENERIC_INSTALLED', 'value'=>MODULE_GENERIC_INSTALLED, 'key_BO'=>'MODULE_GENERIC_INSTALLED_BO', 'value_BO'=>MODULE_GENERIC_INSTALLED_BO,'module_directory'=>'generic/','module_language'=>DIR_FS_ADMIN.'includes/languages/', 'prefix'=>'');
- $code_inistalletd_array['products']=array('key'=>'MODULE_ACAPRO_INSTALLED', 'value'=>MODULE_ACAPRO_INSTALLED,'key_BO'=>'MODULE_ACAPRO_INSTALLED_BO', 'value_BO'=>MODULE_ACAPRO_INSTALLED_BO,'module_directory'=> 'products/','module_language'=>DIR_FS_ADMIN.'includes/languages/', 'prefix'=>'' );
+// $code_inistalletd_array['products']=array('key'=>'MODULE_ACAPRO_INSTALLED', 'value'=>MODULE_ACAPRO_INSTALLED,'key_BO'=>'MODULE_ACAPRO_INSTALLED_BO', 'value_BO'=>MODULE_ACAPRO_INSTALLED_BO,'module_directory'=> 'products/','module_language'=>DIR_FS_ADMIN.'includes/languages/', 'prefix'=>'' );
$code_inistalletd_array['content']=array('key'=>'MODULE_CONTENT_INSTALLED', 'value'=>MODULE_CONTENT_INSTALLED, 'key_BO'=>'MODULE_CONTENT_INSTALLED_BO', 'value_BO'=>MODULE_CONTENT_INSTALLED_BO,'module_directory'=>'content/','module_language'=>DIR_FS_ADMIN.'includes/languages/', 'prefix'=>'');
$code_inistalletd_array['categories']=array('key'=>'MODULE_ACACAT_INSTALLED', 'value'=>MODULE_ACACAT_INSTALLED ,'key_BO'=>'MODULE_ACACAT_INSTALLED_BO', 'value_BO'=>MODULE_ACACAT_INSTALLED_BO,'module_directory'=> 'categories/','module_language'=>DIR_FS_ADMIN.DIR_WS_LANGUAGES , 'prefix'=>'');
- $code_inistalletd_array['account']=array('key'=>'MODULE_ACCOUNT_INSTALLED', 'value'=>MODULE_ACCOUNT_INSTALLED,'key_BO'=>'MODULE_ACCOUNT_INSTALLED_BO', 'value_BO'=>MODULE_ACCOUNT_INSTALLED_BO,'module_directory'=> 'account/','module_language'=>DIR_FS_ADMIN.DIR_WS_LANGUAGES , 'prefix'=>'');
+// $code_inistalletd_array['account']=array('key'=>'MODULE_ACCOUNT_INSTALLED', 'value'=>MODULE_ACCOUNT_INSTALLED,'key_BO'=>'MODULE_ACCOUNT_INSTALLED_BO', 'value_BO'=>MODULE_ACCOUNT_INSTALLED_BO,'module_directory'=> 'account/','module_language'=>DIR_FS_ADMIN.DIR_WS_LANGUAGES , 'prefix'=>'');
$code_inistalletd_array['listing']=array('key'=>'MODULE_LISTING_INSTALLED', 'value'=>MODULE_LISTING_INSTALLED,'key_BO'=>'MODULE_LISTING_INSTALLED_BO', 'value_BO'=>@MODULE_LISTING_INSTALLED_BO,'module_directory'=> 'listing/','module_language'=>DIR_FS_ADMIN.DIR_WS_LANGUAGES , 'prefix'=>'');
$code_inistalletd_array['home']=array('key'=>'MODULE_HOME_INSTALLED', 'value'=>MODULE_HOME_INSTALLED, 'key_BO'=>'MODULE_HOME_INSTALLED_BO', 'value_BO'=>MODULE_HOME_INSTALLED_BO ,'module_directory'=>'home/','module_language'=>DIR_FS_ADMIN.DIR_WS_LANGUAGES , 'prefix'=>'');
Added: trunk/catalog/admin/includes/gabarit/configuration/datatypeaccount.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/datatypeaccount.listing.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/datatypeaccount.listing.gab 2012-07-01 15:24:50 UTC (rev 4490)
@@ -0,0 +1,94 @@
+<?php
+/**
+ @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 22/09/11, 20:05
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief mise en forme de la gestion du stock
+*/
+?>
+
+<div id="ssmenu">
+ <?php echo tep_ssmenu_configuration($_GET['gparentID']) ?>
+</div>
+
+
+
+<h3 class="main-title"><?php echo __('heading datatypeaccount configuration') ?></h3>
+
+
+
+
+ <div id="tabs">
+ <ul>
+<!-- <li><a href="#tabs-1"><?php echo __('datatypeaccount tab configuration'); ?></a></li> -->
+ <li><a href="#tabs-2"><?php echo __('datatypeaccount tab module'); ?></a></li>
+ </ul>
+
+<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=save_mutli') ?>
+</form>
+
+ <div id="tabs-2" class="tabPage">
+
+ <div id="datatypeaccount-module" class="block_form">
+ <h4 class="main-title"><?php echo __('datatypeaccount heading modules'); ?></h4>
+
+
+ <table class="dataTable">
+ <thead>
+ <tr>
+ <th><?php echo __('table heading module code'); ?></th>
+ <th><?php echo __('table heading module title'); ?></th>
+ <th><?php echo __('table heading module desc'); ?></th>
+ <th><?php echo __('table heading module sort'); ?></th>
+ <th><?php echo __('table heading module status'); ?></th>
+ <th><?php echo __('table heading action'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach(datatypeaccount::$module as $row): /*print_r($row)*/ ?>
+ <tr>
+ <td><?php echo $row->content->code; ?></td>
+ <td><?php echo $row->content->title; ?></td>
+ <td><?php echo $row->content->description; ?></td>
+ <td class="tcenter"><?php echo $row->content->sort_order; ?></td>
+ <td class="tcenter">
+ <?php echo datatypeaccount::GetStatusMod($row); ?>
+ </td>
+ <td class="tright">
+ <?php echo datatypeaccount::get_item_action($row); ?>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+
+
+
+
+
+ <?php if(isset(datatypeaccount::$moduleEdit)): ?>
+
+ <?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, FILENAME_CFG_42.'gID=' . $_GET['gID'] . '&mod='.$_GET['mod'].'&action=modules-save') ?>
+ <fieldset class="block_field">
+ <legend><?php echo __('datatypeaccount heading Configuration du modules') ?></legend>
+ <?php echo datatypeaccount::$moduleEdit; ?>
+
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG_42.'gID=' . $_GET['gID'] )) ; ?>
+ </div>
+ </fieldset>
+ </form>
+
+ <?php endif; ?>
+
+
+ </div>
+
+ </div>
+ <div id="tabs-3" class="tabPage">
+ </div>
+ </div>
Modified: trunk/catalog/admin/includes/gabarit/configuration/datatypeproduct.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/datatypeproduct.listing.gab 2012-07-01 08:12:31 UTC (rev 4489)
+++ trunk/catalog/admin/includes/gabarit/configuration/datatypeproduct.listing.gab 2012-07-01 15:24:50 UTC (rev 4490)
@@ -19,82 +19,155 @@
<h3 class="main-title"><?php echo __('heading datatypeproduct configuration') ?></h3>
-<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=save_mutli') ?>
+
<!-- <div class="block_form"> -->
<div id="tabs">
<ul>
<li><a href="#tabs-1"><?php echo __('datatypeproduct tab configuration'); ?></a></li>
- <?php if(datatypeproduct::$list->activ_physique): ?>
- <li><a href="#tabs-2"><?php echo __('datatypeproduct tab physique'); ?></a></li>
- <?php endif; ?>
- <?php if(datatypeproduct::$list->activ_virtual): ?>
- <li><a href="#tabs-3"><?php echo __('datatypeproduct tab virtual'); ?></a></li>
- <?php endif; ?>
+ <li><a href="#tabs-2"><?php echo __('datatypeproduct tab module'); ?></a></li>
</ul>
<div id="tabs-1" class="tabPage">
- <h4 class="main-title"><?php echo __('heading datatypeproduct manage type products') ?></h4>
+ <div class="tabs">
+ <ul>
+ <li><a href="#subtabs-1"><?php echo __('datatypeproduct tab configuration'); ?></a></li>
+ <?php if(datatypeproduct::$list->activ_physique): ?>
+ <li><a href="#subtabs-2"><?php echo __('datatypeproduct tab physique'); ?></a></li>
+ <?php endif; ?>
+ <?php if(datatypeproduct::$list->activ_virtual): ?>
+ <li><a href="#subtabs-3"><?php echo __('datatypeproduct tab virtual'); ?></a></li>
+ <?php endif; ?>
+ </ul>
- <p class="main-intro"><?php echo __('datatypeproduct type txt intro') ?></p>
+ <div id="subtabs-1" class="tabPage">
+ <h4 class="main-title"><?php echo __('heading datatypeproduct manage type products') ?></h4>
+<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=save_mutli') ?>
+ <p class="main-intro"><?php echo __('datatypeproduct type txt intro') ?></p>
- <fieldset class="block_field">
- <legend><?php echo __('datatypeproduct legend manage type') ?></legend>
- <div class="block_input">
+ <fieldset class="block_field">
+ <legend><?php echo __('datatypeproduct legend manage type') ?></legend>
+ <div class="block_input">
- <table>
- <thead>
- <tr>
- <th><?php echo __('datatypeproduct tableheading id') ?></th>
- <th><?php echo __('datatypeproduct tableheading active') ?></th>
- <th><?php echo __('datatypeproduct tableheading name') ?></th>
- <th><?php echo __('datatypeproduct tableheading physical') ?></th>
- <th><?php echo __('datatypeproduct tableheading virtual') ?></th>
- </tr>
- </thead>
- <!-- <tfoot>
- <tr>
- <td> </td>
- <td class="tcenter"> </td>
- <td><?php echo tep_draw_input_field('name_0', 'name_0', ''); ?></td>
- <td class="tcenter"><?php echo tep_draw_radio_field('virtual_0', 'virtual_0' , 0, 1); ?></td>
- <td class="tcenter"><?php echo tep_draw_radio_field('virtual_0', 'virtual_0' , 1, 0); ?></td>
- </tr>
- </tfoot>-->
- <tbody>
- <?php foreach(datatypeproduct::$list->types as $row): ?>
+ <table>
+ <thead>
<tr>
- <td><?php echo $row->id; ?></td>
- <td class="tcenter"><?php echo tep_draw_checkbox_field('types[active]['.$row->id.']', 'active_'.$row->id , $row->status, (bool)$row->status); ?></td>
- <td><?php echo $row->name /*tep_draw_input_field('types[name]['.$row->id.']', 'name_'.$row->id, $row->name)*/; ?></td>
- <td class="tcenter"><?php echo tep_draw_radio_field('types[virtual]['.$row->id.']', 'virtual_'.$row->id , 1, (bool)!in_array($row->id, explode(',', TYPE_VIRTUAL_PRODUCTS) )); ?></td>
- <td class="tcenter"><?php echo tep_draw_radio_field('types[virtual]['.$row->id.']', 'virtual_'.$row->id , 2, (bool)in_array($row->id, explode(',', TYPE_VIRTUAL_PRODUCTS) )); ?></td>
+ <th><?php echo __('datatypeproduct tableheading id') ?></th>
+ <th><?php echo __('datatypeproduct tableheading active') ?></th>
+ <th><?php echo __('datatypeproduct tableheading name') ?></th>
+ <th><?php echo __('datatypeproduct tableheading physical') ?></th>
+ <th><?php echo __('datatypeproduct tableheading virtual') ?></th>
</tr>
- <?php endforeach; ?>
- </tbody>
- </table>
+ </thead>
+ <!-- <tfoot>
+ <tr>
+ <td> </td>
+ <td class="tcenter"> </td>
+ <td><?php echo tep_draw_input_field('name_0', 'name_0', ''); ?></td>
+ <td class="tcenter"><?php echo tep_draw_radio_field('virtual_0', 'virtual_0' , 0, 1); ?></td>
+ <td class="tcenter"><?php echo tep_draw_radio_field('virtual_0', 'virtual_0' , 1, 0); ?></td>
+ </tr>
+ </tfoot>-->
+ <tbody>
+ <?php foreach(datatypeproduct::$list->types as $row): ?>
+ <tr>
+ <td><?php echo $row->id; ?></td>
+ <td class="tcenter"><?php echo tep_draw_checkbox_field('types[active]['.$row->id.']', 'active_'.$row->id , $row->status, (bool)$row->status); ?></td>
+ <td><?php echo $row->name /*tep_draw_input_field('types[name]['.$row->id.']', 'name_'.$row->id, $row->name)*/; ?></td>
+ <td class="tcenter"><?php echo tep_draw_radio_field('types[virtual]['.$row->id.']', 'virtual_'.$row->id , 1, (bool)!in_array($row->id, explode(',', TYPE_VIRTUAL_PRODUCTS) )); ?></td>
+ <td class="tcenter"><?php echo tep_draw_radio_field('types[virtual]['.$row->id.']', 'virtual_'.$row->id , 2, (bool)in_array($row->id, explode(',', TYPE_VIRTUAL_PRODUCTS) )); ?></td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+ </div>
+ </fieldset>
+
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] )) ; ?>
</div>
- </fieldset>
-
- <div class="button_nav">
- <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] )) ; ?>
+</form>
</div>
- </div>
<?php if(datatypeproduct::$list->activ_physique): ?>
- <div id="tabs-2" class="tabPage">
+ <div id="subtabs-2" class="tabPage">
+ Not impemented in this version
</div>
<?php endif; ?>
<?php if(datatypeproduct::$list->activ_virtual): ?>
- <div id="tabs-3" class="tabPage">
+ <div id="subtabs-3" class="tabPage">
+ Not impemented in this version
</div>
<?php endif; ?>
+ </div>
</div>
-</form>
\ No newline at end of file
+
+
+ <div id="tabs-2" class="tabPage">
+
+ <div id="datatypeproduct-module" class="block_form">
+ <h4 class="main-title"><?php echo __('datatypeproduct heading modules'); ?></h4>
+
+
+ <table class="dataTable">
+ <thead>
+ <tr>
+ <th><?php echo __('table heading module code'); ?></th>
+ <th><?php echo __('table heading module title'); ?></th>
+ <th><?php echo __('table heading module desc'); ?></th>
+ <th><?php echo __('table heading module sort'); ?></th>
+ <th><?php echo __('table heading module status'); ?></th>
+ <th><?php echo __('table heading action'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach(datatypeproduct::$module as $row): /*print_r($row)*/ ?>
+ <tr>
+ <td><?php echo $row->content->code; ?></td>
+ <td><?php echo $row->content->title; ?></td>
+ <td><?php echo $row->content->description; ?></td>
+ <td class="tcenter"><?php echo $row->content->sort_order; ?></td>
+ <td class="tcenter">
+ <?php echo datatypeproduct::GetStatusMod($row); ?>
+ </td>
+ <td class="tright">
+ <?php echo datatypeproduct::get_item_action($row); ?>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+
+
+
+
+
+ <?php if(isset(datatypeproduct::$moduleEdit)): ?>
+
+ <?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, FILENAME_CFG_36.'gID=' . $_GET['gID'] . '&mod='.$_GET['mod'].'&action=modules-save') ?>
+ <fieldset class="block_field">
+ <legend><?php echo __('datatypeproduct heading Configuration du modules') ?></legend>
+ <?php echo datatypeproduct::$moduleEdit; ?>
+
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG_36.'gID=' . $_GET['gID'] )) ; ?>
+ </div>
+ </fieldset>
+ </form>
+
+ <?php endif; ?>
+
+
+ </div>
+
+ </div>
+ <div id="tabs-3" class="tabPage">
+ </div>
+ </div>
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeaccount.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeaccount.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeaccount.txt 2012-07-01 15:24:50 UTC (rev 4490)
@@ -0,0 +1,48 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 28/03/2012, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$lang['heading datatypeaccount configuration']="Configuration produits" ;
+
+
+ $lang['datatypeaccount tab configuration']="Configuration" ;
+ $lang['datatypeaccount tab module']="Modules" ;
+
+/* tab configuration */
+ $lang['heading datatypeaccount manage type accounts']="Gestion des types de produits" ;
+ $lang['datatypeaccount legend manage type']="Types de produits" ;
+ $lang['datatypeaccount type txt intro']="Les types de produits modifie le fonctionnement des produits, et permettent de construire des extensions ciblées avec des caractéristiques particulières. L'ensemble des ces modification peuvent impacter profondement le fonctionnement de vos produits. Ne manipuler ces options que si vous savez ce que vous faites !!!" ;
+
+ $lang['datatypeaccount tableheading id']="Id" ;
+ $lang['datatypeaccount tableheading active']="Actif" ;
+ $lang['datatypeaccount tableheading name']="Nom" ;
+ $lang['datatypeaccount tableheading physical']="physique" ;
+ $lang['datatypeaccount tableheading virtual']="Virtuel" ;
+
+ /* tab physqiue */
+ $lang['datatypeaccount tab physique']="Physique" ;
+
+ /* tab virtuel */
+ $lang['datatypeaccount tab virtual']="virtuel" ;
+
+/* tab modules */
+ $lang['datatypeaccount heading modules']="Activer / desactiver l'ensemble des modules specifique aux produits" ;
+
+ $lang['table heading module code']="Nom" ;
+ $lang['table heading module title']="Description" ;
+ $lang['table heading module desc']="crée/modifié" ;
+ $lang['table heading module sort']="Ordre" ;
+ $lang['table heading module status']="Etat" ;
+ $lang['table heading action']="Action" ;
+
+
+ /* Edit */
+ $lang['datatypeaccount heading Configuration du modules']="Options de ce module" ;
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeproduct.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeproduct.txt 2012-07-01 08:12:31 UTC (rev 4489)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeproduct.txt 2012-07-01 15:24:50 UTC (rev 4490)
@@ -9,24 +9,40 @@
@encode UTF-8
*/
-$lang['heading datatypeproduct configuration']="DataType produits" ;
+$lang['heading datatypeproduct configuration']="Configuration produits" ;
+
+ $lang['datatypeproduct tab configuration']="Configuration" ;
+ $lang['datatypeproduct tab module']="Modules" ;
+
/* tab configuration */
-$lang['datatypeproduct tab configuration']="configuration" ;
-$lang['heading datatypeproduct manage type products']="Gestion des types de produits" ;
-$lang['datatypeproduct legend manage type']="Types de produits" ;
-$lang['datatypeproduct type txt intro']="Les types de produits modifie le fonctionnement des produits, et permettent de construire des extensions ciblées avec des caractéristiques particulières. L'ensemble des ces modification peuvent impacter profondement le fonctionnement de vos produits. Ne manipuler ces options que si vous savez ce que vous faites !!!" ;
+ $lang['heading datatypeproduct manage type products']="Gestion des types de produits" ;
+ $lang['datatypeproduct legend manage type']="Types de produits" ;
+ $lang['datatypeproduct type txt intro']="Les types de produits modifie le fonctionnement des produits, et permettent de construire des extensions ciblées avec des caractéristiques particulières. L'ensemble des ces modification peuvent impacter profondement le fonctionnement de vos produits. Ne manipuler ces options que si vous savez ce que vous faites !!!" ;
-$lang['datatypeproduct tableheading id']="Id" ;
-$lang['datatypeproduct tableheading active']="Actif" ;
-$lang['datatypeproduct tableheading name']="Nom" ;
-$lang['datatypeproduct tableheading physical']="physique" ;
-$lang['datatypeproduct tableheading virtual']="Virtuel" ;
+ $lang['datatypeproduct tableheading id']="Id" ;
+ $lang['datatypeproduct tableheading active']="Actif" ;
+ $lang['datatypeproduct tableheading name']="Nom" ;
+ $lang['datatypeproduct tableheading physical']="physique" ;
+ $lang['datatypeproduct tableheading virtual']="Virtuel" ;
-/* tab physqiue */
-$lang['datatypeproduct tab physique']="Physique" ;
+ /* tab physqiue */
+ $lang['datatypeproduct tab physique']="Physique" ;
-/* tab virtuel */
-$lang['datatypeproduct tab virtual']="virtuel" ;
+ /* tab virtuel */
+ $lang['datatypeproduct tab virtual']="virtuel" ;
+/* tab modules */
+ $lang['datatypeproduct heading modules']="Activer / desactiver l'ensemble des modules specifique aux produits" ;
+
+ $lang['table heading module code']="Nom" ;
+ $lang['table heading module title']="Description" ;
+ $lang['table heading module desc']="crée/modifié" ;
+ $lang['table heading module sort']="Ordre" ;
+ $lang['table heading module status']="Etat" ;
+ $lang['table heading action']="Action" ;
+
+
+ /* Edit */
+ $lang['datatypeproduct heading Configuration du modules']="Options de ce module" ;
?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/modules/configuration/datatypeaccount.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/datatypeaccount.php (rev 0)
+++ trunk/catalog/admin/includes/modules/configuration/datatypeaccount.php 2012-07-01 15:24:50 UTC (rev 4490)
@@ -0,0 +1,351 @@
+<?php
+/**
+ @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 22/09/11, 19:49
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class datatypeaccount
+*/
+
+define('FILENAME_CFG_42',"gparentID=39&gID=42&");
+
+
+Class datatypeaccount
+ implements ext_configuration
+ {
+
+ /**
+ @var object all config
+ */
+ public static $list;
+ /**
+ @var int Current Get gID
+ */
+ public static $gID;
+ /**
+ @var
+ */
+ public static $cfg;
+ /**
+ @var
+ */
+ public static $module;
+
+ /**
+ @var
+ */
+ public static $moduleEdit;
+
+ /**
+ @fn __construct()
+ @brief constructor
+ */
+ function __construct(){
+ global $oscss;
+ $this->code=__CLASS__;
+ global $messageStack, $language,$lang;
+
+ $oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/modules/configuration/'.$this->code.'.txt');
+
+// self::$cfg =new sqlconfiguration();
+ self::$gID = (int)$_GET['gID'];
+ }
+
+
+ /**
+ @fn draw_action()
+ @brief Action Prise en charge par le modules
+ */
+ public function draw_action(){
+ global $action,$messageStack;
+
+ $DB=Database::getInstance();
+ $gparentID = tep_db_prepare_input($_GET['gparentID']);
+ $gID= tep_db_prepare_input($_GET['gID']);
+
+ switch($action){
+ /**
+ @brief save page groupe
+ */
+ case 'save_mutli':
+
+ /// option de configuration classique
+ if(tep_not_null($gID) ){
+
+ $list=sqlconfiguration::fetch(array('group_id'=> (int)$gID), true);
+
+ foreach($list as $row) {
+
+ if(isset($_POST['configuration'][$row->key])) {
+ $configuration_value = tep_db_prepare_input($_POST['configuration'][$row->key]);
+
+ if( ($res=sqlconfiguration::update(array('key'=>$row->key , 'value'=>tep_db_input($configuration_value) ))) == false)$erreur[]=false;
+ else $erreur[]=true;
+
+ }
+
+ }
+
+ if(!in_array(false,$erreur)) $messageStack->add_session(SAVE_CONFIG_OK, 'success');
+ else $messageStack->add_session(SAVE_CONFIG_NOT_OK, 'error');
+
+ }
+
+
+
+
+
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $_GET['gID'] . '&cID=' . $cID));
+ break;
+
+ /**
+ @brief Manage modules
+ */
+ case 'modules':
+
+
+ if(isset($_GET['flag'])){
+
+ $mod=tep_db_prepare_input($_GET['mod']);
+ $flag=(int)tep_db_prepare_input($_GET['flag']);
+
+ // call type module
+ $typeOri=modulesUtility::GetModttype('account');
+
+ // get current value
+ $current = sqlconfiguration::fetch(array('key'=>$typeOri->key), true);
+ $current_bo = sqlconfiguration::fetch(array('key'=>$typeOri->key_BO), true);
+
+
+ // call
+ $type=modulesUtility::LoadModule('account',$mod.'.php');
+ // force install
+ if( $flag ==1 && !$type->content->check()){
+ $type->content->remove();
+ $type->content->install();
+ }
+ // force remove
+ elseif( $flag == 0 && $type->content->check())
+ $type->content->remove();
+
+ // up module
+ $r=explode(';',$typeOri->value);
+ $result[]=( ($flag ==1 ) ? $mod.'.php;' : '' );
+
+ foreach($r as $v)
+ if(trim($v) !='')
+ if( (
+ $flag ==1
+ || ($flag == 0 && $v != trim($mod).'.php' )
+ )
+ && !in_array($v,$result)
+ ){
+ $result[]=$v;
+ }
+
+ sqlconfiguration::update(array('id'=>$current->id, 'value'=>implode(';',$result)) );
+
+ if($current_bo !=false)
+ sqlconfiguration::update(array('id'=>$current_bo->id, 'value'=>implode(';',$result)) );
+
+ if(!isset($_GET['forceajax']))
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $_GET['gID'] . '#modorder-module' ));
+ }
+
+ break;
+ case 'modules-edit':
+
+ $mod=tep_db_prepare_input($_GET['mod']);
+ // call
+ $Mod=modulesUtility::LoadModule('account',$mod.'.php');
+ $ModCurr = $Mod->content;
+ $i=0;
+ foreach($ModCurr->keys() as $value){
+ $i++;
+ $current = sqlconfiguration::fetch(array('key'=>$value));
+
+ $keys_extra[$value]['title'] = $current['configuration_title'];
+ $keys_extra[$value]['value'] = $current['configuration_value'];
+ $keys_extra[$value]['description'] = $current['configuration_description'];
+ $keys_extra[$value]['use_function'] = $current['use_function'];
+ $keys_extra[$value]['set_function'] = $current['set_function'];
+ }
+
+ self::$moduleEdit = configUtility::FormatEditAuto(array('array'=>$keys_extra));
+ break;
+ /**
+ @brief save Config base page
+ */
+ case 'modules-save':
+ foreach($_POST['configuration'] as $key=>$value) {
+
+ $configuration_value = tep_db_prepare_input($value);
+
+ if( ($res=sqlconfiguration::update(array('key'=>$key , 'value'=>tep_db_input($value) ))) == false)$erreur[]=false;
+ else $erreur[]=true;
+
+ }
+
+ if(!in_array(false,$erreur)) $messageStack->add_session(SAVE_CONFIG_OK, 'success');
+ else $messageStack->add_session(SAVE_CONFIG_NOT_OK, 'error');
+
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $_GET['gID'] . '&action=modules-edit&mod='. $_GET['mod'] ));
+ break;
+
+ }
+ }
+
+ /**
+ @fn load_db_values($Id)
+ @return object
+ */
+ public function load_db_values($Id){
+ global $languages_id;
+
+ $DB = Database::getInstance();
+ $list=new stdClass();
+ $list->activ_physique = false;
+ $list->activ_virtual = false;;
+// $gID = 1;
+
+ $li=sqlconfiguration::fetch(array('group_id'=> (int)self::$gID), true);
+
+ if(is_array($li))
+ foreach($li as $row) {
+
+ $cfgValue =configUtility::CallExecConfigLine($row->use, $row->key, $row->value);
+
+ if (!empty($row->set)){
+ if(strpos($row->set,'(') === false) $row->set.='(';
+ eval('$value_field = ' . $row->set . '"' . htmlspecialchars($row->value) . '","'.$row->key.'");');
+ }
+ else $value_field = tep_draw_input_field('configuration['.$row->key.']', '',$row->value);
+
+ $conf = $row;
+ $row->cfgValue=$cfgValue;
+ $row->value_field=$value_field;
+
+ $list->config[$row->key]=$conf;
+ }
+
+
+// $list->types = sqlstatus::fetch(array('type'=>'customers', 'language_id'=>$languages_id), true);
+//
+// foreach($list->types as $row){
+// if((bool)!in_array($row->id, explode(',', TYPE_VIRTUAL_PRODUCTS)) )
+// $list->activ_physique = true;
+// if((bool)in_array($row->id, explode(',', TYPE_VIRTUAL_PRODUCTS)) )
+// $list->activ_virtual = true;
+// }
+
+ return $list;
+ }
+
+ /**
+ @brief Appelé dans le header de page
+ */
+ public static function draw_header(){
+ ?>
+ <style type="text/css">
+ #central form label {
+ display: inline-block;
+ font-weight: normal;
+ margin: 5px 10px;
+ text-align: left;
+ white-space: pre-wrap;
+ width: 90%;
+ }
+ </style>
+ <?php
+ }
+
+ /**
+ @brief Contenu central
+ */
+ public function draw(){
+
+ global $action,$gparentID;
+
+
+
+ switch($action){
+ case 'modules';
+ return self::GetStatusMod( new objectInfo( array('status'=>(int)$_GET['flag'], 'content'=> new objectInfo(array('mod'=>(int)$_GET['mod'])) )) );
+ break;
+
+ default:
+ self::$list = $this->load_db_values('');
+ $dbl = array();
+
+ foreach(scan(DIR_FS_ADMIN. DIR_WS_MODULES.'account/') as $row){
+ if( substr($row,-3) =='php'){
+
+ $class = substr($row,0, -4);
+
+ $tmp = modulesUtility::LoadModule('account', $row);
+ $dbl[]=$tmp->classe;
+ self::$module[]= $tmp;
+
+ }
+ }
+
+ foreach(scan(DIR_FS_CATALOG_MODULES.'account/') as $row){
+ if( substr($row,-3) =='php'){
+
+ $class = substr($row,0, -4);
+
+ $tmp = modulesUtility::LoadModule('account', $row);
+ if( !in_array($tmp->classe, $dbl) )
+ self::$module[]= $tmp;
+ }
+ }
+
+ return tep_get_include_contents('configuration/'.__CLASS__.'.listing');
+ }
+
+ }
+
+
+
+ /**
+ @fn get_item_action($orders)
+ @brief fonction qui construit l'affichage de la colonne action
+ La mise en forme est contenu dans les ressource xml du template en cours
+ @param $orders array
+ @return string
+ */
+ public static function get_item_action($row){
+ global $SecuKey;
+ return sprintf(
+ CsrtAction::getFormat('row_action'),
+ '',
+ (($row->status)
+ ? sprintf(CsrtAction::getLink('row_action_right', __('image config'), 'config'), '', tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG_42.'action=modules-edit&mod='.$row->content->code ),'' )
+ : ''
+ )
+ );
+ }
+
+ /**
+ @brief return format html for row status
+ @param $account array restuts row
+ @return string html
+ */
+ public static function GetStatusMod($row){
+ $exclude=array('action','mod','forceajax','type','class','function','funct', 'mod');
+ $query_s=FILENAME_CFG_42.'action=modules&mod=' . $row->content->code.'&flag=';
+
+ return '<a class="ajaxinline" href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params($exclude).$query_s.(($row->status == '1')? '0' : '1') ) . '">'.
+ sprintf(
+ CsrtAction::getFormat('row_flag'),
+ (int)$row->status,
+ ( ($row->status == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
+ ).
+ '</a>';
+ }
+}
+
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/modules/configuration/datatypeproduct.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/datatypeproduct.php 2012-07-01 08:12:31 UTC (rev 4489)
+++ trunk/catalog/admin/includes/modules/configuration/datatypeproduct.php 2012-07-01 15:24:50 UTC (rev 4490)
@@ -10,7 +10,9 @@
@class datatypeproduct
*/
+define('FILENAME_CFG_36',"gparentID=35&gID=36&");
+
Class datatypeproduct
implements ext_configuration
{
@@ -23,7 +25,19 @@
@var int Current Get gID
*/
public static $gID;
+ /**
+ @var
+ */
+ public static $cfg;
+ /**
+ @var
+ */
+ public static $module;
+ /**
+ @var
+ */
+ public static $moduleEdit;
/**
@fn __construct()
@@ -33,7 +47,6 @@
global $oscss;
$this->code=__CLASS__;
global $messageStack, $language,$lang;
- if (!is_writeable(DIR_FS_TEMPLATES)) $messageStack->add(ERROR_DESTINATION_NOT_WRITEABLE. 'template/', 'error');
$oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/modules/configuration/'.$this->code.'.txt');
@@ -128,6 +141,101 @@
tep_redirect(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $_GET['gID'] . '&cID=' . $cID));
break;
+
+ /**
+ @brief Manage modules
+ */
+ case 'modules':
+
+
+ if(isset($_GET['flag'])){
+
+ $mod=tep_db_prepare_input($_GET['mod']);
+ $flag=(int)tep_db_prepare_input($_GET['flag']);
+
+ // call type module
+ $typeOri=modulesUtility::GetModttype('products');
+
+ // get current value
+ $current = sqlconfiguration::fetch(array('key'=>$typeOri->key), true);
+ $current_bo = sqlconfiguration::fetch(array('key'=>$typeOri->key_BO), true);
+
+
+ // call
+ $type=modulesUtility::LoadModule('products',$mod.'.php');
+ // force install
+ if( $flag ==1 && !$type->content->check()){
+ $type->content->remove();
+ $type->content->install();
+ }
+ // force remove
+ elseif( $flag == 0 && $type->content->check())
+ $type->content->remove();
+
+ // up module
+ $r=explode(';',$typeOri->value);
+ $result[]=( ($flag ==1 ) ? $mod.'.php;' : '' );
+
+ foreach($r as $v)
+ if(trim($v) !='')
+ if( (
+ $flag ==1
+ || ($flag == 0 && $v != trim($mod).'.php' )
+ )
+ && !in_array($v,$result)
+ ){
+ $result[]=$v;
+ }
+
+ sqlconfiguration::update(array('id'=>$current->id, 'value'=>implode(';',$result)) );
+
+ if($current_bo !=false)
+ sqlconfiguration::update(array('id'=>$current_bo->id, 'value'=>implode(';',$result)) );
+
+ if(!isset($_GET['forceajax']))
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $_GET['gID'] . '#modorder-module' ));
+ }
+
+ break;
+ case 'modules-edit':
+
+ $mod=tep_db_prepare_input($_GET['mod']);
+ // call
+ $Mod=modulesUtility::LoadModule('products',$mod.'.php');
+ $ModCurr = $Mod->content;
+ $i=0;
+ foreach($ModCurr->keys() as $value){
+ $i++;
+ $current = sqlconfiguration::fetch(array('key'=>$value));
+
+ $keys_extra[$value]['title'] = $current['configuration_title'];
+ $keys_extra[$value]['value'] = $current['configuration_value'];
+ $keys_extra[$value]['description'] = $current['configuration_description'];
+ $keys_extra[$value]['use_function'] = $current['use_function'];
+ $keys_extra[$value]['set_function'] = $current['set_function'];
+ }
+
+ self::$moduleEdit = configUtility::FormatEditAuto(array('array'=>$keys_extra));
+ break;
+ /**
+ @brief save Config base page
+ */
+ case 'modules-save':
+ foreach($_POST['configuration'] as $key=>$value) {
+
+ $configuration_value = tep_db_prepare_input($value);
+
+ if( ($res=sqlconfiguration::update(array('key'=>$key , 'value'=>tep_db_input($value) ))) == false)$erreur[]=false;
+ else $erreur[]=true;
+
+ }
+
+ if(!in_array(false,$erreur)) $messageStack->add_session(SAVE_CONFIG_OK, 'success');
+ else $messageStack->add_session(SAVE_CONFIG_NOT_OK, 'error');
+
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $_GET['gID'] . '&action=modules-edit&mod='. $_GET['mod'] ));
+ break;
+
}
}
@@ -201,11 +309,84 @@
public function draw(){
global $action,$gparentID;
-// if($action=='cfg') return;
- self::$list = $this->load_db_values('');
-// var_dump('configuration/'.__CLASS__.'.listing');
- return tep_get_include_contents('configuration/'.__CLASS__.'.listing');
+
+
+
+ switch($action){
+ case 'modules';
+ return self::GetStatusMod( new objectInfo( array('status'=>(int)$_GET['flag'], 'content'=> new objectInfo(array('mod'=>(int)$_GET['mod'])) )) );
+ break;
+
+ default:
+ self::$list = $this->load_db_values('');
+ $dbl = array();
+
+ foreach(scan(DIR_FS_ADMIN. DIR_WS_MODULES.'products/') as $row){
+ if( substr($row,-3) =='php'){
+
+ $class = substr($row,0, -4);
+
+ $tmp = modulesUtility::LoadModule('products', $row);
+ $dbl[]=$tmp->classe;
+ self::$module[]= $tmp;
+
+ }
+ }
+
+ foreach(scan(DIR_FS_CATALOG_MODULES.'products/') as $row){
+ if( substr($row,-3) =='php'){
+
+ $class = substr($row,0, -4);
+
+ $tmp = modulesUtility::LoadModule('products', $row);
+ if( !in_array($tmp->classe, $dbl) )
+ self::$module[]= $tmp;
+ }
+ }
+
+ return tep_get_include_contents('configuration/'.__CLASS__.'.listing');
+ }
+
}
+
+
+
+ /**
+ @fn get_item_action($orders)
+ @brief fonction qui construit l'affichage de la colonne action
+ La mise en forme est contenu dans les ressource xml du template en cours
+ @param $orders array
+ @return string
+ */
+ public static function get_item_action($row){
+ global $SecuKey;
+ return sprintf(
+ CsrtAction::getFormat('row_action'),
+ '',
+ (($row->status)
+ ? sprintf(CsrtAction::getLink('row_action_right', __('image config'), 'config'), '', tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG_36.'action=modules-edit&mod='.$row->content->code ),'' )
+ : ''
+ )
+ );
+ }
+
+ /**
+ @brief return format html for row status
+ @param $product array restuts row
+ @return string html
+ */
+ public static function GetStatusMod($row){
+ $exclude=array('action','mod','forceajax','type','class','function','funct', 'mod');
+ $query_s=FILENAME_CFG_36.'action=modules&mod=' . $row->content->code.'&flag=';
+
+ return '<a class="ajaxinline" href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params($exclude).$query_s.(($row->status == '1')? '0' : '1') ) . '">'.
+ sprintf(
+ CsrtAction::getFormat('row_flag'),
+ (int)$row->status,
+ ( ($row->status == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
+ ).
+ '</a>';
+ }
}
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/modules/pages/products.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/products.php 2012-07-01 08:12:31 UTC (rev 4489)
+++ trunk/catalog/admin/includes/modules/pages/products.php 2012-07-01 15:24:50 UTC (rev 4490)
@@ -262,12 +262,12 @@
'alias'=>'price',
'text'=>__('products table heading price'),
);
-/*
+
self::$allfields['p.products_price']= array(
'sort'=>false,
'alias'=>'price_ttx',
'text'=>__('products table heading price taxe'),
- ); */
+ );
self::$allfields['p.products_tax_class_id']= array(
'sort'=>true,
Modified: trunk/catalog/install/includes/sql/mysql/data/91_osc_admin_cip.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_admin_cip.sql 2012-07-01 08:12:31 UTC (rev 4489)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_admin_cip.sql 2012-07-01 15:24:50 UTC (rev 4490)
@@ -18,7 +18,7 @@
INSERT IGNORE INTO osc_admin_cip (cip_id, cip_checksum, cip_folder_name, cip_installed, cip_ident, cip_version, cip_level) VALUES (3, 'eec88916a23139e55400cf0dd834856f', 'DESC_BASE_stable', 1, 'DESC_BASE', '1.0', 'stable');
INSERT IGNORE INTO osc_admin_cip (cip_id, cip_checksum, cip_folder_name, cip_installed, cip_ident, cip_version, cip_level) VALUES (4, '451a84aa41e342884b84890af7cf69e7', 'HEADER_TAGS_stable', 1, 'HEADER_TAGS', '1.0', 'stable');
INSERT IGNORE INTO osc_admin_cip (cip_id, cip_checksum, cip_folder_name, cip_installed, cip_ident, cip_version, cip_level) VALUES (5, 'e62f47533278a4cacb1c9324a1aa7f27', 'ACCOUNT_EXTRA_stable', 1, 'ACCOUNT_EXTRA', '1.0', 'stable');
-INSERT IGNORE INTO osc_admin_cip (cip_id, cip_checksum, cip_folder_name, cip_installed, cip_ident, cip_version, cip_level) VALUES (6, 'a72e4a34f10af98a9814d865e717399f', 'SPECIAL_stable', 1, 'SPECIAL', '1.0', 'stable');
+-- INSERT IGNORE INTO osc_admin_cip (cip_id, cip_checksum, cip_folder_name, cip_installed, cip_ident, cip_version, cip_level) VALUES (6, 'a72e4a34f10af98a9814d865e717399f', 'SPECIALS_stable', 1, 'SPECIALS', '1.0', 'stable');
INSERT IGNORE INTO osc_admin_cip (cip_id, cip_checksum, cip_folder_name, cip_installed, cip_ident, cip_version, cip_level) VALUES (7, '1415dd6d4b211ace908a6ac84621f88a', 'SVNUPDATE_unstable', 1, 'SVNUPDATE', '1.0', 'unstable');
INSERT IGNORE INTO osc_admin_cip (cip_id, cip_checksum, cip_folder_name, cip_installed, cip_ident, cip_version, cip_level) VALUES (8, 'da8a0d4a6c802e4d0bb48065258582b1', 'SPU_stable', 1, 'SPU', '1.0', 'stable');
INSERT IGNORE INTO osc_admin_cip (cip_id, cip_checksum, cip_folder_name, cip_installed, cip_ident, cip_version, cip_level) VALUES (9, '2b911c015ed17a423c74ab9987330e60', 'ITEM_stable', 1, 'ITEM', '1.0', 'stable');
Modified: trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql 2012-07-01 08:12:31 UTC (rev 4489)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql 2012-07-01 15:24:50 UTC (rev 4490)
@@ -65,6 +65,7 @@
insert into osc_configuration_group values (25 , 'NEW_PRODUCTS', NULL, 0 , 1, 35, '0', 'CG_NEW_PRODUCTS');
insert into osc_configuration_group values (39 , 'OPTION_CUSTOMERS', NULL, 0 , 1, 127, '1', 'OPTION_CUSTOMERS');
+ insert into osc_configuration_group values (42 , 'CONFIG_CUSTOMERS', NULL, 0 , 1, 39, '0', 'DATATYPEACCOUNT');
insert into osc_configuration_group values (28 , 'MEMBRES_DETAIL', NULL, 0 , 1, 39, '0', 'MODMEMBRES');
insert into osc_configuration_group values (33 , 'BOX_CONFIGURATION_EXTRA_FIELDS', NULL, 0 , 1, 39, '0', 'MODCUSTEXTRA');
Added: trunk/catalog/install/includes/sql/mysql/data/92_osc_admin_cip_modfiles.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/92_osc_admin_cip_modfiles.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/data/92_osc_admin_cip_modfiles.sql 2012-07-01 15:24:50 UTC (rev 4490)
@@ -0,0 +1,33 @@
+--+######################################################################--+
+--| 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_admin_cip_modfiles ( k_cip_id, cip_filename, cip_folder, cip_type, cip_typetype, core, cip_install) VALUES( 2, 'address_book.php', 'modules/account', 'module', 'account', 0, 'i');
+INSERT IGNORE INTO osc_admin_cip_modfiles ( k_cip_id, cip_filename, cip_folder, cip_type, cip_typetype, core, cip_install) VALUES( 2, 'address_book.php', 'modules/account', 'module', 'account', 1, 'i');
+
+
+INSERT IGNORE INTO osc_admin_cip_modfiles ( k_cip_id, cip_filename, cip_folder, cip_type, cip_typetype, core, cip_install) VALUES( 3, 'desc_base.php', 'modules/products', 'module', 'products', 0, 'i');
+INSERT IGNORE INTO osc_admin_cip_modfiles ( k_cip_id, cip_filename, cip_folder, cip_type, cip_typetype, core, cip_install) VALUES( 3, 'desc_base.php', 'modules/products', 'module', 'products', 1, 'i');
+
+
+INSERT IGNORE INTO osc_admin_cip_modfiles ( k_cip_id, cip_filename, cip_folder, cip_type, cip_typetype, core, cip_install) VALUES( 4, 'header_tags.php', 'modules/products', 'module', 'products', 1, 'i');
+INSERT IGNORE INTO osc_admin_cip_modfiles ( k_cip_id, cip_filename, cip_folder, cip_type, cip_typetype, core, cip_install) VALUES( 4, 'header_tags.php', 'modules/content', 'module', 'content', 1, 'i');
+INSERT IGNORE INTO osc_admin_cip_modfiles ( k_cip_id, cip_filename, cip_folder, cip_type, cip_typetype, core, cip_install) VALUES( 4, 'header_tags.php', 'modules/categorie', 'module', 'categorie', 1, 'i');
+
+INSERT IGNORE INTO osc_admin_cip_modfiles ( k_cip_id, cip_filename, cip_folder, cip_type, cip_typetype, core, cip_install) VALUES( 5, 'account_extra.php', 'modules/account', 'module', 'account', 1, 'i');
+
+INSERT IGNORE INTO osc_admin_cip_modfiles ( k_cip_id, cip_filename, cip_folder, cip_type, cip_typetype, core, cip_install) VALUES( 7, 'SvnUpdate.php', 'modules/generic', 'module', 'generic', 1, 'i');
+
+INSERT IGNORE INTO osc_admin_cip_modfiles ( k_cip_id, cip_filename, cip_folder, cip_type, cip_typetype, core, cip_install) VALUES( 18, 'history.php', 'modules/account', 'module', 'account', 0, 'i');
+INSERT IGNORE INTO osc_admin_cip_modfiles ( k_cip_id, cip_filename, cip_folder, cip_type, cip_typetype, core, cip_install) VALUES( 18, 'history.php', 'modules/account', 'module', 'account', 1, 'i');
+
Modified: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration_group.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration_group.sql 2012-07-01 08:12:31 UTC (rev 4489)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration_group.sql 2012-07-01 15:24:50 UTC (rev 4490)
@@ -68,6 +68,7 @@
insert into osc_configuration_group values (39 , 'OPTION_CUSTOMERS', NULL, 0 , 1, 127, '1', 'OPTION_CUSTOMERS');
insert into osc_configuration_group values (28 , 'MEMBRES_DETAIL', NULL, 0 , 1, 39, '0', 'MODMEMBRES');
insert into osc_configuration_group values (33 , 'BOX_CONFIGURATION_EXTRA_FIELDS', NULL, 0 , 1, 39, '0', 'MODCUSTEXTRA');
+ insert into osc_configuration_group values (42 , 'CONFIG_CUSTOMERS', NULL, 0 , 1, 39, '0', 'DATATYPEACCOUNT');
insert into osc_configuration_group values (40 , 'OPTION_ORDERS', NULL, 0 , 1, 127, '1', 'OPTION_ORDERS');
insert into osc_configuration_group values (129,'CONFIGURATION_ORDERS', NULL, 0, 1, 40, '0', 'MODORDER');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-01 08:12:37
|
Revision: 4489
http://oscss.svn.sourceforge.net/oscss/?rev=4489&view=rev
Author: oscim
Date: 2012-07-01 08:12:31 +0000 (Sun, 01 Jul 2012)
Log Message:
-----------
correction css mineurs
Modified Paths:
--------------
trunk/catalog/admin/includes/template/defaut/login-panel.css
trunk/catalog/admin/includes/template/defaut/logoff.php
Modified: trunk/catalog/admin/includes/template/defaut/login-panel.css
===================================================================
--- trunk/catalog/admin/includes/template/defaut/login-panel.css 2012-06-30 21:19:12 UTC (rev 4488)
+++ trunk/catalog/admin/includes/template/defaut/login-panel.css 2012-07-01 08:12:31 UTC (rev 4489)
@@ -32,12 +32,7 @@
border-bottom-right-radius: 10px;
border-bottom-left-radius: 10px;}
-/*#password_perdu section#forms {-webkit-border-top-left-radius: 10px;
--webkit-border-top-right-radius: 10px;
--moz-border-radius-topleft: 10px;
--moz-border-radius-topright: 10px;
-border-top-left-radius: 10px;
-border-top-right-radius: 10px;}*/
+
section#forms section { background:transparent url(../../../images/oscss.jpg) 250px top no-repeat; }
.button{font-family:Arial; font-size:13px;white-space:nowrap;}
@@ -46,7 +41,7 @@
a.button{background:#e3e5f0; border:1px solid #003c74; padding:2px 5px; margin:1px 2px ;color:black;text-decoration:none;}
a.button:hover{background:#797979; border:1px solid #003c74; padding:2px 5px ; margin:1px 2px ; color:white;text-decoration:none;}
input{ background : #d4dce1; color : #000; font-family : Verdana,Arial,Helvetica,sans-serif; font-size : 1em; border-width : 1px; width:97%; }
-.alert{ position:fixed; color:red; background:white; border:1px solid red; padding:5px 20px; top:15%; width:300px; margin:0 auto 0 -90px }
+.alert{background: none repeat scroll 0 0 white; border: 1px solid red; color: red; left: 15%; margin: 0 auto; padding: 5px 20px; position: absolute; top: -15%; width: 300px; }
#loginc,
#openid {width:214px; float:left}
Modified: trunk/catalog/admin/includes/template/defaut/logoff.php
===================================================================
--- trunk/catalog/admin/includes/template/defaut/logoff.php 2012-06-30 21:19:12 UTC (rev 4488)
+++ trunk/catalog/admin/includes/template/defaut/logoff.php 2012-07-01 08:12:31 UTC (rev 4489)
@@ -20,10 +20,12 @@
<body>
<div id="page">
<h1>osCSS Admin</h1>
- <div id="content">
+ <div id="content">
+ <section id="forms">
<h3>osCSS Admin</h3>
<h2><?php echo LOGOFF_HEADING_TITLE; ?></h2>
<?php echo LOGOFF_TEXT_MAIN; ?><?php echo '<a class="button" href="' . tep_href_link(FILENAME_LOGIN, '', 'SSL') . '">' . IMAGE_BACK . '</a>'; ?>
+ </section>
</div>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-06-30 21:19:19
|
Revision: 4488
http://oscss.svn.sourceforge.net/oscss/?rev=4488&view=rev
Author: oscim
Date: 2012-06-30 21:19:12 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
ajustement
Modified Paths:
--------------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/template.php
trunk/catalog/templates/defaut/includes/plugins/generic/slider/inc/easySlider.css
Added Paths:
-----------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.slideshow.php
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.slideshow.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.slideshow.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.slideshow.php 2012-06-30 21:19:12 UTC (rev 4488)
@@ -0,0 +1,86 @@
+<?php
+/**
+ @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 12/11/11, 19:30
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $load, $themodule;
+?>
+
+<div id="slider" class="module">
+
+ <ul>
+
+ <?php foreach($themodule->module_db->content as $ele): ?>
+
+ <?php if($ele->type =='product'): /** PRODUCTS */ ?>
+ <li class="one product">
+ <section class="outerblock">
+ <div class="innerblock">
+ <?php if ($page->_draw_in_page('PRODUCT_LIST_NAME')) { ?>
+ <p class="title product"><?php echo '<a href="' . $ele->href . '" title="header=['.$ele->products_name.'] body=[ ] fade=[on]">' . $ele->products_name . '</a>' ;?></p>
+ <?php } ?>
+
+ <?php if ($page->_draw_in_page('PRODUCT_LIST_IMAGE')) { ?>
+ <p class="img product"><?php echo '<a href="' . $ele->href . '" title="header=['.$ele->products_name.'] body=[ ] fade=[on]" >' . tep_image(DIR_WS_IMAGES . @$ele->products_image, $ele->products_name, $page->_conf_value('SMALL_IMAGE_WIDTH'), $page->_conf_value('SMALL_IMAGE_HEIGHT')) . '</a>' ; ?></p>
+ <?php } ?>
+
+ <?php if (tep_not_null($ele->products_price) && $page->_draw_in_page('PRODUCT_LIST_PRICE')) { ?>
+ <p class="price prod">
+ <?php echo print_products_price_rv($ele) ?>
+ </p>
+ <?php } ?>
+
+ <a class="details prod" href="<?php echo $ele->href ?>" title="header=[<?php echo __('view more') ?>] body=[ ] fade=[on]"><?php echo __('more') ?></a>
+
+ </div>
+ </section>
+ </li>
+ <?php elseif($ele->type =='content') : /** POSTS */ ?>
+ <li class="one content">
+ <section class="outerblock">
+ <div class="innerblock">
+ <p class="title content">
+ <a id="<?php echo $ele->id; ?>" href="<?php echo $ele->href ; ?>" ><?php echo $ele->title ?></a>
+ </p>
+ <div class="chapo content">
+ <?php echo $ele->chapo ?>
+ </div>
+ </div>
+ </section>
+ </li>
+ <?php elseif($ele->type =='categorie'): /** CATEGORIES */ ?>
+ <li class="one categorie">
+ <section class="outerblock">
+ <div class="innerblock">
+ <p class="title categorie">
+ <a href="<?php echo $ele->href ?>"> <?php echo $ele->categories_name ;?></a>
+ </p>
+ <p class="img categorie">
+ <?php echo '<a href="' . $ele->href. '">' . tep_image(DIR_WS_IMAGES . $ele->categories_image, $ele->categories_name, $page->_conf_value('SUBCATEGORY_IMAGE_WIDTH'), $page->_conf_value('SUBCATEGORY_IMAGE_HEIGHT')) . '<br />' . $ele->categories_name . '</a>' ;?>
+ </p>
+ </div>
+ </section>
+ </li>
+
+ <?php else : /** Other */ ?>
+
+
+ <li class="one other">
+ <dl class="listing contents <?php echo $page->page_content_clean() ?>">
+ <dt class="listing_s">
+ <a id="<?php echo $ele->id; ?>" href="<?php echo $ele->href ; ?>" ><?php echo $ele->title ?></a>
+ </dt>
+ </dl>
+ </li>
+ <?php endif; ?>
+
+ <?php endforeach; ?>
+
+ </ul>
+
+</div>
\ No newline at end of file
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css 2012-06-26 12:45:27 UTC (rev 4487)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css 2012-06-30 21:19:12 UTC (rev 4488)
@@ -51,7 +51,7 @@
}
#intro .intro.content {padding: 0;color:#fff;-webkit-border-radius: 5px; -webkit-border-radius: 5px;height:220px;}
- #intro .intro.content div{padding: 12px;font-size: 0.9em; font-weight:bold; width:936px;}
+ #intro .intro.content div{font-size: 0.9em; font-weight:bold; width:936px;margin:0; padding:0;}
nl#breadcrumbs {
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2012-06-26 12:45:27 UTC (rev 4487)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2012-06-30 21:19:12 UTC (rev 4488)
@@ -389,3 +389,16 @@
li.currentCheckoutBar span{color:#b3e050;}
li.end.currentCheckoutBar {/*background:url("images/progress_end_full.gif") no-repeat scroll right 2px transparent;*/ width:139px;}
+
+
+/* Slider */
+#slider ul li {width:960px;
+ height:220px;
+ margin:0;
+ padding:0;
+}
+
+#slider ul li.one.product section.outerblock {
+ height:inherit;
+ width:inherit;
+}
\ 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 2012-06-26 12:45:27 UTC (rev 4487)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/template.php 2012-06-30 21:19:12 UTC (rev 4488)
@@ -1,8 +1,10 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @subpackage Template 2cShopHtml5Oscim
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 04/03/2012, 21:54
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
Modified: trunk/catalog/templates/defaut/includes/plugins/generic/slider/inc/easySlider.css
===================================================================
--- trunk/catalog/templates/defaut/includes/plugins/generic/slider/inc/easySlider.css 2012-06-26 12:45:27 UTC (rev 4487)
+++ trunk/catalog/templates/defaut/includes/plugins/generic/slider/inc/easySlider.css 2012-06-30 21:19:12 UTC (rev 4488)
@@ -55,13 +55,13 @@
/* numeric controls */
ol#controls{
- clear:both;
- margin:0 0 -10px 385px ;
- padding:0;
- height:28px;
-
- position:relative;
-top:-10px
+ float: right;
+ height: 28px;
+ padding: 0;
+ position: relative;
+ right: 0;
+ text-align: right;
+ top: -30px;
}
ol#controls li{
margin:0 10px 0 0;
@@ -81,11 +81,15 @@
padding:0 10px;
text-decoration:none;
}
-/* ol#controls li.current a{
- background:#b56aae;
+ ol#controls li.current a{
+ background:#0FA4C5;
color:#fff;
- }*/
- ol#controls li a:focus, #prevBtn a:focus, #nextBtn a:focus{outline:none;}
+ text-decoration:underline;
+ }
+ ol#controls li.current a:hover{
+ background:#11BCE1;
+ }
+ ol#controls li a:focus, #prevBtn a:focus, #nextBtn a:focus{text-decoration:underline;}
/* // Easy Slider */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-06-26 12:45:38
|
Revision: 4487
http://oscss.svn.sourceforge.net/oscss/?rev=4487&view=rev
Author: oscim
Date: 2012-06-26 12:45:27 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
coquille lors de la suppression d'un article
Modified Paths:
--------------
trunk/catalog/admin/includes/modules/pages/products.php
Modified: trunk/catalog/admin/includes/modules/pages/products.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/products.php 2012-06-25 21:52:57 UTC (rev 4486)
+++ trunk/catalog/admin/includes/modules/pages/products.php 2012-06-26 12:45:27 UTC (rev 4487)
@@ -229,7 +229,6 @@
'alias'=>'manuf_title',
'text'=>__('products table heading manufacturers'),
'width'=>'12%',
- 'default'=>true,
);
}
/* END Datatype RootListing manufacturer */
@@ -247,7 +246,6 @@
'alias'=>'featured',
'text'=>__('products table heading featured'),
'width'=>'12%',
- 'default'=>true,
);
}
/* END Datatype RootListing featured */
@@ -264,17 +262,13 @@
'alias'=>'price',
'text'=>__('products table heading price'),
);
+/*
+ self::$allfields['p.products_price']= array(
+ 'sort'=>false,
+ 'alias'=>'price_ttx',
+ 'text'=>__('products table heading price taxe'),
+ ); */
-/**
- TODO A revoir , appel des sub modules
-*/
- if(tep_cst_define('MODULE_ACAPRO_SPECIAL_SORT_ORDER'))
- self::$allfields['s.specials_new_products_price']= array(
- 'sort'=>false,
- 'alias'=>'sprice',
- 'text'=>__('@specials products table heading special price'),
- );
-
self::$allfields['p.products_tax_class_id']= array(
'sort'=>true,
'alias'=>'taxe_id',
@@ -478,7 +472,7 @@
foreach($_SESSION['filters']['subtype'] as $key=>$row)
$list_type .=$key.',';
else{
- $allcats = tep_get_status_array('product');
+ $allcats = categorieUtility::get_category_tree(array('datatype'=>MGabCont::CallSt('GetClassDatatype'),'language_id'=>$new_languages_id , 'exclude'=>array('0')));
foreach($allcats as $row)
$list_type .=$row['id'].',';
}
@@ -714,9 +708,10 @@
case 'delete_product_confirm':
- if (isset($_POST['products_id']) && isset($_POST['product_categories']) && is_array($_POST['product_categories'])) {
+
+ if (isset($_POST['products_id']) /*&& isset($_POST['product_categories']) && is_array($_POST['product_categories'])*/ ) {
$product_id = tep_db_prepare_input($_POST['products_id']);
- $product_categories = $_POST['product_categories'];
+ $product_categories = (array)@$_POST['product_categories'];
sqlproduct::delete(array('id'=>$product_id, 'catarray'=>$product_categories ) );
}
@@ -906,7 +901,7 @@
$action=self::$action;
-
+// var_dump($action);
switch ($action) {
case 'detail':
case 'new':
@@ -977,13 +972,6 @@
$query_raw .= " LEFT JOIN " . TABLE_FEATURED_DESCRIPTION . " fad ON( fad.featured_id=fada.featured_id AND fad.languages_id = '".(int)$adjust->languages_id."' ) ";
}
- /**
- TODO A revoir , appel des sub modules
- */
- if(tep_cst_define('MODULE_ACAPRO_SPECIAL_SORT_ORDER'))
- $query_raw .= " LEFT JOIN " . TABLE_SPECIALS . " s ON( s.products_id =p.products_id AND s.status > 0) ";
-
-
$query_raw .=((strlen($adjust->sWhere)>4) ? " WHERE ".substr($adjust->sWhere, 3) : '').
" GROUP BY p.products_id ".
" ORDER BY ".((!empty($adjust->sOrder)) ? $adjust->sOrder : ' p.products_date_added DESC ');
@@ -1018,6 +1006,7 @@
@remarks Normal View Page
*/
case 'delete':
+ self::GetDBValue();
case 'copy_to':
case 'new':
case 'edit':
@@ -1210,7 +1199,7 @@
while ($item = $_query->fetchAssoc()) {
$ord =array();
- if( DataTypes::is_active('categorie')) {
+ if( ! DataTypes::is_active('categorie')) {
/// complete cats list
$objres=$DB->query("SELECT categories_name FROM " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd , " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c WHERE c.categories_id=cd.categories_id AND cd.language_id = '" . (int)$languages_id . "' AND c.categories_id=p2c.categories_id and products_id='".$item['id']."' AND c.categories_id <> '".$item['categories_id']."' ");
$rescat=$objres->fetchAllAssoc();
@@ -1221,8 +1210,8 @@
if(strlen($item['cat_title'])>35)$item['cat_title']= substr($item['cat_title'],0 ,30).'...';
}
- if( DataTypes::is_active('featured')) {
- /// complete featured list
+ if( ! DataTypes::is_active('featured')) {
+ /// complete cats list
// $objres=$DB->query("SELECT categories_name FROM " . TABLE_FEATURED . " f, " . TABLE_CATEGORIES_DESCRIPTION . " cd , " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c WHERE c.categories_id=cd.categories_id AND cd.language_id = '" . (int)$languages_id . "' AND c.categories_id=p2c.categories_id and products_id='".$item['id']."' AND c.categories_id <> '".$item['categories_id']."' ");
// $rescat=$objres->fetchAllAssoc();
//
@@ -1238,7 +1227,7 @@
foreach(self::$InitInfo['modele']['listing'] as $k=>$row){
if($k == 'action') $ord[$k]=self::ButtonRowsActions($item);
- elseif($k == 'title') $ord[$k]= '<a rel="'.tep_href_link('document.php', 'mod=img&typ=product&w=200&h=200&id='.$item['id']) .'" class="screenshot" href="'.tep_href_link(self::FILENAME).'" title="">'.$item['title'].'</a>';
+ elseif($k == 'title') $ord[$k]= '<a rel="'.tep_href_link('document.php', 'mod=img&typ=product&w=200&h=200&id='.$item['id']) .'" class="screenshot" href="#" title="">'.$item['title'].'</a>';
elseif($k == 'status') $ord[$k]=self::RowStatus($item);
// elseif($k == 'hidden') $ord[$k]=self::RowHidden($item);
elseif(in_array($k , array('added', 'modified' ,'available')) ) $ord[$k]=tep_date_short($item[$k]);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-06-25 21:53:04
|
Revision: 4486
http://oscss.svn.sourceforge.net/oscss/?rev=4486&view=rev
Author: oscim
Date: 2012-06-25 21:52:57 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/ssheader.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
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 2012-06-25 18:17:36 UTC (rev 4485)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/ssheader.php 2012-06-25 21:52:57 UTC (rev 4486)
@@ -82,21 +82,13 @@
<?php if($load->mode =='home') : ?>
<section id="intro">
<div class="intro content">
- <?php
- /**
- @remarks Call generic moduel cat_home for slider
- */
- $ACA_generic=generic::getInstance();
- if(is_object($res=$ACA_generic->display_view($customer_id,'cat_home')) ) : ?>
- <?php echo unhtmlentities($res->content); ?>
-
- <a class="intro content more" href="details.html" >details</a>
- <?php /** FOR EXAMPLE */ else : ?>
- <h3>Tee Central - Home of the Cheap Cheap Tees</h3>
-
- <div>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut. Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi.</div>
- <?php endif; ?>
+ <?php /**
+ @brief Call featured for slideshow
+ */
+ global $themodule;
+ $themodule=templ_draw_list('type=modules&pile=slideshow');
+ include('module.slideshow.php'); ?>
</div>
</section>
<?php endif; ?>
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php 2012-06-25 18:17:36 UTC (rev 4485)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php 2012-06-25 21:52:57 UTC (rev 4486)
@@ -114,6 +114,10 @@
$load->mode = 'home';
+ // force put key for load specific featured
+ $this->add_var_page('featured_key','home_slideshow');
+ $this->oscss_modules->_add('featured.php','slideshow',array('sort'=>60));
+
$this->oscss_modules->_add(FILENAME_NEW_PRODUCTS,'center',array('sort'=>60));
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-06-25 18:17:43
|
Revision: 4485
http://oscss.svn.sourceforge.net/oscss/?rev=4485&view=rev
Author: oscim
Date: 2012-06-25 18:17:36 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
ajustement login panel
Modified Paths:
--------------
trunk/catalog/admin/includes/template/defaut/login-panel.css
trunk/catalog/admin/includes/template/defaut/password_forgotten.php
Modified: trunk/catalog/admin/includes/template/defaut/login-panel.css
===================================================================
--- trunk/catalog/admin/includes/template/defaut/login-panel.css 2012-06-25 17:37:06 UTC (rev 4484)
+++ trunk/catalog/admin/includes/template/defaut/login-panel.css 2012-06-25 18:17:36 UTC (rev 4485)
@@ -31,6 +31,13 @@
-moz-border-radius-bottomleft: 10px;
border-bottom-right-radius: 10px;
border-bottom-left-radius: 10px;}
+
+/*#password_perdu section#forms {-webkit-border-top-left-radius: 10px;
+-webkit-border-top-right-radius: 10px;
+-moz-border-radius-topleft: 10px;
+-moz-border-radius-topright: 10px;
+border-top-left-radius: 10px;
+border-top-right-radius: 10px;}*/
section#forms section { background:transparent url(../../../images/oscss.jpg) 250px top no-repeat; }
.button{font-family:Arial; font-size:13px;white-space:nowrap;}
Modified: trunk/catalog/admin/includes/template/defaut/password_forgotten.php
===================================================================
--- trunk/catalog/admin/includes/template/defaut/password_forgotten.php 2012-06-25 17:37:06 UTC (rev 4484)
+++ trunk/catalog/admin/includes/template/defaut/password_forgotten.php 2012-06-25 18:17:36 UTC (rev 4485)
@@ -19,9 +19,19 @@
<body>
<div id="page">
<h1>osCSS</h1>
-<div id="content">
+
+<div id="password_perdu">
+ <section id="choose">
+
+ <div id="passforgot" class="sub">
+ <a class="button" href="<?php echo tep_href_link(FILENAME_LOGIN, '' , 'SSL') ; ?>"><?php echo IMAGE_BACK; ?></a>
+ </div>
+
+ </section>
+
+ <section id="forms">
<?php echo tep_draw_form('login', FILENAME_PASSWORD_FORGOTTEN, 'action=process'); ?>
-<h2><?php echo HEADING_PASSWORD_FORGOTTEN; ?></h2>
+ <h2><?php echo HEADING_PASSWORD_FORGOTTEN; ?></h2>
@@ -66,10 +76,12 @@
<?php echo tep_draw_input_field('email_address'); ?>
</p>
- <div class="button_nav"><?php echo '<a class="button" href="' . tep_href_link(FILENAME_LOGIN, '' , 'SSL') . '">' . IMAGE_BACK . '</a> ' . tep_image_submit('button_confirm.gif', IMAGE_BUTTON_LOGIN); ?>
+ <div class="button_nav"><?php echo tep_image_submit('button_confirm.gif', IMAGE_BUTTON_LOGIN); ?>
</div>
<?php } ?>
</form>
+
+</section>
</div>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-06-25 17:37:12
|
Revision: 4484
http://oscss.svn.sourceforge.net/oscss/?rev=4484&view=rev
Author: oscim
Date: 2012-06-25 17:37:06 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
ajustement login panel
Modified Paths:
--------------
trunk/catalog/admin/includes/template/defaut/login-panel.css
trunk/catalog/admin/includes/template/defaut/login.php
Added Paths:
-----------
trunk/catalog/admin/includes/template/defaut/img/login_bg.png
Added: trunk/catalog/admin/includes/template/defaut/img/login_bg.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/admin/includes/template/defaut/img/login_bg.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/catalog/admin/includes/template/defaut/login-panel.css
===================================================================
--- trunk/catalog/admin/includes/template/defaut/login-panel.css 2012-06-25 16:32:16 UTC (rev 4483)
+++ trunk/catalog/admin/includes/template/defaut/login-panel.css 2012-06-25 17:37:06 UTC (rev 4484)
@@ -1,15 +1,40 @@
-body { width: 100%; margin: 0; padding: 0; text-align: center; font: 0.8em Georgia,Tahoma,sans-serif; color: #000; background: #fff url(../../../images/fond.jpg) repeat-y center; }
-h1 { width:210px; height:105px; background: transparent url(../../../images/oscss.jpg) no-repeat; text-indent:-9999px; }
+body { width: 100%; margin: 0; padding: 0; text-align: center; font: 0.8em Georgia,Tahoma,sans-serif; color: #61748A; background:transparent url(img/login_bg.png) repeat; }
+h1 { display:none; }
h2 { font-size: 1em }
h3 { font-size: 0.8em }
#page{position: relative; width : 500px; margin: 0 auto 0 auto; text-align: left;}
+
#content,
-#password_perdu { border:1px solid #000; padding:2em 0 2em 1em;}
+#password_perdu { margin-top:20%; border:1px solid #000; border-radius:10px;
+-moz-border-radius:10px;
+-webkit-border-radius:10px;}
+section { display:block;}
+section div.sub {width:48%; float:left;}
+section div.sub a.button {background:none; border:none;}
+section div.sub a.button:hover {color:black;text-decoration:underline;}
+section div#passforgot {padding:2em 0 0 0;}
+section div#chooselg {padding:1em 0 0.2em 1em;}
+section div#chooselg h3{margin:0;}
+
+section#choose {background:#C3C3C3; height:62px; border-bottom:1px solid black;-webkit-border-top-left-radius: 10px;
+-webkit-border-top-right-radius: 10px;
+-moz-border-radius-topleft: 10px;
+-moz-border-radius-topright: 10px;
+border-top-left-radius: 10px;
+border-top-right-radius: 10px;}
+section#forms {clear:both;background:white; padding:2em 0 2em 1em;-webkit-border-bottom-right-radius: 10px;
+-webkit-border-bottom-left-radius: 10px;
+-moz-border-radius-bottomright: 10px;
+-moz-border-radius-bottomleft: 10px;
+border-bottom-right-radius: 10px;
+border-bottom-left-radius: 10px;}
+section#forms section { background:transparent url(../../../images/oscss.jpg) 250px top no-repeat; }
+
.button{font-family:Arial; font-size:13px;white-space:nowrap;}
-input.button{background:#e3e5f0; border:1px solid #003c74; padding:1px 5px; margin:1px 2px;color:black;}
+input.button{background:#2D79CD; border:1px solid #003c74; padding:1px 5px; margin:1px 2px;color:white;font-weight:bold;}
input.button:hover{background:#797979; border:1px solid #003c74; padding:1px 5px; margin:1px 2px ; color:white;}
a.button{background:#e3e5f0; border:1px solid #003c74; padding:2px 5px; margin:1px 2px ;color:black;text-decoration:none;}
a.button:hover{background:#797979; border:1px solid #003c74; padding:2px 5px ; margin:1px 2px ; color:white;text-decoration:none;}
Modified: trunk/catalog/admin/includes/template/defaut/login.php
===================================================================
--- trunk/catalog/admin/includes/template/defaut/login.php 2012-06-25 16:32:16 UTC (rev 4483)
+++ trunk/catalog/admin/includes/template/defaut/login.php 2012-06-25 17:37:06 UTC (rev 4484)
@@ -22,9 +22,21 @@
<h1>osCSS Admin</h1>
<div id="content">
- <h3><?php echo HEADING_RETURNING_ADMIN_LG_CHOOSE; ?></h3>
- <?php echo tep_draw_form('languages', basename($PHP_SELF), '', 'get'); ?><?php echo tep_draw_pull_down_menu('language', $languages_array, $languages_selected, 'onchange="this.form.submit();"'); ?></form>
- </form>
+ <section id="choose">
+
+ <div id="chooselg" class="sub">
+ <h3><?php echo HEADING_RETURNING_ADMIN_LG_CHOOSE; ?></h3>
+ <?php echo tep_draw_form('languages', basename($PHP_SELF), '', 'get'); ?><?php echo tep_draw_pull_down_menu('language', $languages_array, $languages_selected, 'onchange="this.form.submit();"'); ?></form>
+ </form>
+ </div>
+
+ <div id="passforgot" class="sub">
+ <a class="button" href="<?php echo FILENAME_PASSWORD_FORGOTTEN ; ?>"><?php echo TEXT_PASSWORD_FORGOTTEN; ?></a>
+ </div>
+
+ </section>
+
+ <section id="forms">
<h2><?php echo HEADING_RETURNING_ADMIN; ?></h2>
<?php echo tep_draw_form('login',tep_href_link(FILENAME_LOGIN, 'action=process') ); ?>
@@ -39,14 +51,14 @@
<?php } ?>
- <?php echo login_ident::draw_form(); ?>
+ <?php echo login_ident::draw_form(); ?>
-
+ <section>
<div id="bouton">
<input type="submit" class="button" value="<?php echo IMAGE_BUTTON_LOGIN ; ?>" />
- <span style="float:right;position:relative;margin-top:15px;right:0"><a class="button" href="<?php echo FILENAME_PASSWORD_FORGOTTEN ; ?>"><?php echo TEXT_PASSWORD_FORGOTTEN; ?></a></span>
+
<br style="clear:both"/>
</div>
</form>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-06-25 16:32:26
|
Revision: 4483
http://oscss.svn.sourceforge.net/oscss/?rev=4483&view=rev
Author: oscim
Date: 2012-06-25 16:32:16 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
ajustement template public
Modified Paths:
--------------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/contact_us.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/index_listing.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/login.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/contact_us.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/contact_us.php 2012-06-24 21:07:27 UTC (rev 4482)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/contact_us.php 2012-06-25 16:32:16 UTC (rev 4483)
@@ -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
@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
+ @date 23/06/2012, 21:54
@encode UTF-8
*/
?>
@@ -17,14 +17,16 @@
<?php $page->messageStack->_draw('contact');?>
<?php if (isset($_GET['action']) && ($_GET['action'] == 'success')) : ?>
- <div class="infoText"> <?php tep_draw_txt_block('page_contact_us_success') ?></div>
+ <div class="text infoText"> <?php tep_draw_txt_block('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') ?>
+ <div class="text">
+ <?php tep_draw_txt_block('Page_contact_us') ?>
+ </div>
<?php echo tep_draw_form('contact_us', tep_href_link(FILENAME_CONTACT_US, 'action=send')); ?>
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/index_listing.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/index_listing.php 2012-06-24 21:07:27 UTC (rev 4482)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/index_listing.php 2012-06-25 16:32:16 UTC (rev 4483)
@@ -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
@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
+ @date 23/06/2012, 21:54
@encode UTF-8
@brief draw for all listing generated by Datatypes Rootlisting
*/
@@ -52,7 +52,7 @@
</div>
<?php endif; ?>
<?php /** Image cat */ if($RootListing->description !=false) : ?>
- <div id="headingCatTxt">
+ <div id="headingCatTxt" class="text">
<?php echo $RootListing->description; ?>
</div>
<?php endif; ?>
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 2012-06-24 21:07:27 UTC (rev 4482)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/login.php 2012-06-25 16:32:16 UTC (rev 4483)
@@ -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
@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
+ @date 23/06/2012, 21:54
@encode UTF-8
*\group content
*\file
@@ -59,14 +59,18 @@
<article>
-<header>
- <h1 class="content title <?php echo $language ;?>"><?php echo HEADING_NEW_CUSTOMER; ?></h1>
-</header>
+ <header>
+ <h1 class="content title <?php echo $language ;?>"><?php echo HEADING_NEW_CUSTOMER; ?></h1>
+ </header>
+
<div class="contentBox newCustomer">
<h4><?php echo TEXT_NEW_CUSTOMER ; ?></h4>
- <div class="infoText"><?php echo TEXT_NEW_CUSTOMER_INTRODUCTION; ?></div>
+ <div class="text infoText">
+ <?php echo TEXT_NEW_CUSTOMER_INTRODUCTION; ?>
+ </div>
+
<div class="navBt">
<?php echo '<a class="navBt" href="' . tep_href_link(FILENAME_CREATE_ACCOUNT, '', 'SSL') . '">' . IMAGE_BUTTON_CONTINUE . '</a>'; ?>
</div>
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2012-06-24 21:07:27 UTC (rev 4482)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2012-06-25 16:32:16 UTC (rev 4483)
@@ -89,6 +89,13 @@
img.alignright { margin: 5px 0 0 10px; }
.center { text-align: center; }
+.navBt,
+.text,
+h4,
+p {
+ padding:0 10px;
+}
+
/* Standard width*/
#main_container {width:960px;}
@@ -120,265 +127,265 @@
padding: 10px 0;
}
-p {
- 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;}
+form input[type=checkbox] ,
+form input[type=radio] ,
+form input[type=password] ,
+form input[type=text] {width:250px;}
- /* content and sidebar layout */
+/* content and sidebar layout */
- #main-tpl {clear:both;}
+#main-tpl {clear:both;}
- #content {
- float: right;
- width: 74%;
- margin:10px 0 10px 0;
- padding:5px 0 0 0;
- }
- .Type_checkout #content {width:100%; padding-right:0; padding-left:0;}
+#content {
+ float: right;
+ width: 74%;
+ margin:10px 0 10px 0;
+ padding:0 0 0 0;
+}
+.Type_checkout #content {width:100%; padding-right:0; padding-left:0;}
- aside {
- float: left;
- width: 26%;
- margin:0;
- padding:0;
- }
- .Type_checkout aside {width:0; display:none;}
+aside {
+ float: left;
+ width: 26%;
+ margin:0;
+ padding:0;
+}
+.Type_checkout aside {width:0; display:none;}
- /* article */
+/* article */
- article {
- clear:both;
- }
+article {
+ clear:both;
+}
- article p,
- .textMain p {padding:0.5em;font-size:0.9em;}
+article p,
+.textMain p {padding:0.5em;font-size:0.9em;}
- article h1,
- article h2 {
- padding-left: 10px;
- margin-top: 10px;
- }
+article h1,
+article h2 {
+ padding-left: 10px;
+ margin-top: 10px;
+}
- article h1/*,
- .product h1,
- .regular h2*/ {
- padding-left: 10px;
- margin-top: 12px;
- }
+article h1/*,
+.product h1,
+.regular h2*/ {
+ padding-left: 10px;
+ margin-top: 0;
+}
- /* sidebar */
- aside section {
- margin: 10px 12px 0 0;
- padding: 10px 15px 10px 0;
- }
+/* sidebar */
+aside section {
+ margin: 10px 12px 0 0;
+ padding: 0 0 10px 0;
+}
- aside section ul {
- margin-left: 12px;
- padding-left: 12px;
- }
+aside section ul {
+ margin-left: 12px;
+ padding-left: 12px;
+}
- aside section ul li {
- padding-top: 10px;
- padding-bottom: 22px;
- }
+aside section ul li {
+ padding-top: 10px;
+ padding-bottom: 22px;
+}
- aside section ul li a {
- display: block;
- }
+aside section ul li a {
+ display: block;
+}
- aside section header h3 {
- padding-left: 10px;
- margin: 10px 0px;
- }
+aside section header h3 {
+ padding-left: 10px;
+ margin: 10px 0px;
+}
- /* columns */
+/* columns */
- article div.module {
- clear:both;
- }
+article div.module {
+ clear:both;
+}
- .module ul {
- width: 110%;
- padding: 0;
- margin: 0;
- }
+.module ul {
+ width: 110%;
+ padding: 0;
+ margin: 0;
+}
- .module ul li {
- display: inline;
- float: left;
- margin: 0 17px 12px 0;
- padding: 0;
- width: 216px;
- }
+.module ul li {
+ display: inline;
+ float: left;
+ margin: 0 17px 12px 0;
+ padding: 0;
+ width: 216px;
+}
- .module .outerblock {
- height: 255px;
- padding: 12px;
- width: 90%;
- }
+.module .outerblock {
+ height: 255px;
+ padding: 12px;
+ width: 90%;
+}
- .module .innerblock {
- height: 220px;
- padding: 12px;
- }
+.module .innerblock {
+ height: 220px;
+ padding: 12px;
+}
- .module .innerblock p {
- padding-bottom:0.2em;
- }
+.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.title{
+ height:41px;
+}
+.module .innerblock p.title a{
+ text-decoration: none;
+ font-size: 1.3em;
+}
+.module .innerblock p.img{
+ height:100px;
+}
- .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 .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 .splitnav{clear:both;}
+.module .splitnav{clear:both;}
- /* end of column configuration */
+/* end of column configuration */
- article.product.single figure{
- display: block;
- float: left;
- width: 50%;
- }
- #productInfo {padding:2em;}
- .module {padding:1em 0.5em;}
+article.product.single figure{
+ display: block;
+ float: left;
+ width: 50%;
+}
+#productInfo {padding:2em;}
+.module {padding:1em 0.5em;}
- article.product.single figure ul{
- display:inline;
- }
- article.product.single figure ul li{
- float:left;
- margin:5px 5px;
- }
+article.product.single figure ul{
+ display:inline;
+}
+article.product.single figure ul li{
+ float:left;
+ margin:5px 5px;
+}
- #headingCatImg {height:220px;}
- .innerblock { height:220px;}
- #productImagelistMini{ height:70px;}
+#headingCatImg {height:220px;}
+.innerblock { height:220px;}
+#productImagelistMini{ height:70px;}
- .tax_symbol {font-size:0.4em;}
+.tax_symbol {font-size:0.4em;}
- #price_master {font-weight:bold;font-size:2em;}
- .price {font-size:1.4em;font-weight:bold;}
- form input[type=text]#products_quantity{ width:25px;}
+#price_master {font-weight:bold;font-size:2em;}
+.price {font-size:1.4em;font-weight:bold;}
+form input[type=text]#products_quantity{ width:25px;}
- #productDescription p { padding:2em;color: #555;font-size: 0.8em;}
- #productImage {height:200px;}
+#productDescription p { padding:2em;color: #555;font-size: 0.8em;}
+#productImage {height:200px;}
- article.product.single .prod_box_big {padding:2em; clear:both;}
- /* -- panier -- */
+article.product.single .prod_box_big {padding:2em; clear:both;}
+/* -- panier -- */
- .cart-header {padding:0.5em;}
- .cart-line {padding:0.5em;}
- .cart-line input{padding:0.5em;}
- #TotCart{float:right; padding:2em 0 ; height:50px;}
- #TotCart li span.value{display:inline-block;width:150px;}
- #TotCart li span.text{display:inline-block;width:100px;}
- .block {clear:both;margin-top:100px;}
- a.link {padding: 2em; }
- form input[type=text].CartQty{ width:25px;}
+.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; }
+form input[type=text].CartQty{ width:25px;}
- /* panier short */
- #shopping_cart_shortBox {position:absolute;height:100px;top:45px;width:400px;}
+/* panier short */
+#shopping_cart_shortBox {position:absolute;height:100px;top:45px;width:400px;}
- #Box-shopping_cart_short h3 {padding:0;margin-bottom:10px;}
- #Box-shopping_cart_short span {padding:0;margin-bottom:10px;padding:0 2em;}
- #Box-shopping_cart_short *,
- .cart_details * {float:left;padding-left:0.5em;}
- #Box-shopping_cart_short ul,
- #Box-shopping_cart_short ul li ul {float:none;list-style:none;}
- /* #Box-shopping_cart_short ul li ul,#Box-shopping_cart_short ul li,ul.cart{float:left;} */
+#Box-shopping_cart_short h3 {padding:0;margin-bottom:10px;}
+#Box-shopping_cart_short span {padding:0;margin-bottom:10px;padding:0 2em;}
+#Box-shopping_cart_short *,
+.cart_details * {float:left;padding-left:0.5em;}
+#Box-shopping_cart_short ul,
+#Box-shopping_cart_short ul li ul {float:none;list-style:none;}
+/* #Box-shopping_cart_short ul li ul,#Box-shopping_cart_short ul li,ul.cart{float:left;} */
- /*box header*/
+/*box header*/
- #Box-currencies {display:none;}
+#Box-currencies {display:none;}
- /*checkout */
- div.orderProcess p.checkoutComment {clear:both;}
- div.orderProcess fieldset {clear:both;}
+/*checkout */
+div.orderProcess p.checkoutComment {clear:both;}
+div.orderProcess fieldset {clear:both;}
- /* Account page */
- #account div.box{
- float:left;
- width:50%;
- }
- #account div.box h4{
- padding:5px;
- }
- #account div.box div.contentBox{
- padding:5px;
- }
+/* Account page */
+#account div.box{
+ float:left;
+ width:50%;
+}
+#account div.box h4{
+ padding:5px;
+}
+#account div.box div.contentBox{
+ padding:5px;
+}
- /* etapes de la commande - barre verte du haut --*/
- div#progress { margin: 0 auto; width:650px}
- ul.checkoutBar { margin:20px 0 0 0 ;padding:0;}
- ul.checkoutBar li{/*background:url("images/progress_empty.gif") no-repeat scroll right top transparent;*/ display:inline-block; height:50px; margin:0 0 0 -3px; padding:0; width:122px;}
- ul.checkoutBar li a,
- ul.checkoutBar li span{position:relative; display:inline-block; top:-20px; left:45px; width:150px; text-align:center; white-space:nowrap;}
- /* ul.checkoutBar li.barCheck{background:url("images/progress.gif") no-repeat scroll right 2px transparent; }*/
+/* etapes de la commande - barre verte du haut --*/
+div#progress { margin: 0 auto; width:650px}
+ul.checkoutBar { margin:20px 0 0 0 ;padding:0;}
+ul.checkoutBar li{/*background:url("images/progress_empty.gif") no-repeat scroll right top transparent;*/ display:inline-block; height:50px; margin:0 0 0 -3px; padding:0; width:122px;}
+ul.checkoutBar li a,
+ul.checkoutBar li span{position:relative; display:inline-block; top:-20px; left:45px; width:150px; text-align:center; white-space:nowrap;}
+/* ul.checkoutBar li.barCheck{background:url("images/progress.gif") no-repeat scroll right 2px transparent; }*/
- ul.checkoutBar li.start{/*background:url("images/progress_start.gif") no-repeat scroll right top transparent;*/ width:50px;}
- ul.checkoutBar li.start a,
- ul.checkoutBar li.start span{left:-30px; width:150px; }
- ul.checkoutBar li.end{/*background:url("images/progress_end.gif") no-repeat scroll right 2px transparent;*/ width:139px;}
- ul.checkoutBar li.end a,
- ul.checkoutBar li.end span{left:30px; width:150px; }
+ul.checkoutBar li.start{/*background:url("images/progress_start.gif") no-repeat scroll right top transparent;*/ width:50px;}
+ul.checkoutBar li.start a,
+ul.checkoutBar li.start span{left:-30px; width:150px; }
+ul.checkoutBar li.end{/*background:url("images/progress_end.gif") no-repeat scroll right 2px transparent;*/ width:139px;}
+ul.checkoutBar li.end a,
+ul.checkoutBar li.end span{left:30px; width:150px; }
- li.barCheck a,
- li.barCheck span {color:#847676; text-decoration:none}
+li.barCheck a,
+li.barCheck span {color:#847676; text-decoration:none}
- li.currentCheckoutBar a,
- li.currentCheckoutBar span{color:#b3e050;}
+li.currentCheckoutBar a,
+li.currentCheckoutBar span{color:#b3e050;}
- li.end.currentCheckoutBar {/*background:url("images/progress_end_full.gif") no-repeat scroll right 2px transparent;*/ width:139px;}
+li.end.currentCheckoutBar {/*background:url("images/progress_end_full.gif") no-repeat scroll right 2px transparent;*/ width:139px;}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-06-24 21:07:33
|
Revision: 4482
http://oscss.svn.sourceforge.net/oscss/?rev=4482&view=rev
Author: oscim
Date: 2012-06-24 21:07:27 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
Correction extension fabricant
Correction lib product erreur liee activation datatype
correction productAca syr le control de l'actiavtion du sous module
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/drivers/productsACA.php
trunk/catalog/admin/includes/functions/lib.products.php
trunk/catalog/admin/includes/modules/pages/products.php
trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/modules/products/manufacturers.php
trunk/extensions/MANUFACTURERS_stable/sql/mysql/install/data/osc_manufacturers.sql
trunk/extensions/MANUFACTURERS_stable/sql/mysql/install/data/osc_manufacturers_info.sql
Added Paths:
-----------
trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/languages/fr_FR/modules/products/manufacturers.txt
Modified: trunk/catalog/admin/includes/classes/drivers/productsACA.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/productsACA.php 2012-06-24 20:35:27 UTC (rev 4481)
+++ trunk/catalog/admin/includes/classes/drivers/productsACA.php 2012-06-24 21:07:27 UTC (rev 4482)
@@ -50,15 +50,16 @@
foreach(parent::initialise_type('MODULE_ACAPRO_INSTALLED_BO','products') as $class){
$cl[$class]=new $class ();
-
- if($this->products_id > 0){
- // test flag type module, si aucun, produist base
- if(!isset($cl[$class]->flag_type_virtual)) $cl[$class]->flag_type_virtual=0;
- // incremente tableau module unqiuement si flag ok
- if($this->control_type_mod($cl[$class]->flag_type_virtual)) $list_mod[$class] = $cl[$class]->sort_order;
+ if($cl[$class]->enabled) {
+ if($this->products_id > 0){
+ // test flag type module, si aucun, produist base
+ if(!isset($cl[$class]->flag_type_virtual)) $cl[$class]->flag_type_virtual=0;
+ // incremente tableau module unqiuement si flag ok
+ if($this->control_type_mod($cl[$class]->flag_type_virtual)) $list_mod[$class] = $cl[$class]->sort_order;
+ }
+ else
+ $list_mod[$class] = $cl[$class]->sort_order;
}
- else
- $list_mod[$class] = $cl[$class]->sort_order;
}
Modified: trunk/catalog/admin/includes/functions/lib.products.php
===================================================================
--- trunk/catalog/admin/includes/functions/lib.products.php 2012-06-24 20:35:27 UTC (rev 4481)
+++ trunk/catalog/admin/includes/functions/lib.products.php 2012-06-24 21:07:27 UTC (rev 4482)
@@ -117,8 +117,13 @@
@author oscim
@version 1.4
utilisé pour recharger ajax
+
+ TODO a deporter dans le mdoule corresspondant
*/
function in_manufacturers($selected='',$print=true) {
+ if( DataTypes::is_active('manufacturer'))
+ return array();
+
$manufacturers_array = $sortie='';
$manufacturers_query = tep_db_query("select manufacturers_id, manufacturers_name from " . TABLE_MANUFACTURERS . " order by manufacturers_name");
while ($manufacturers = tep_db_fetch_array($manufacturers_query)) {
Modified: trunk/catalog/admin/includes/modules/pages/products.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/products.php 2012-06-24 20:35:27 UTC (rev 4481)
+++ trunk/catalog/admin/includes/modules/pages/products.php 2012-06-24 21:07:27 UTC (rev 4482)
@@ -1222,7 +1222,7 @@
}
if( DataTypes::is_active('featured')) {
- /// complete cats list
+ /// complete featured list
// $objres=$DB->query("SELECT categories_name FROM " . TABLE_FEATURED . " f, " . TABLE_CATEGORIES_DESCRIPTION . " cd , " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c WHERE c.categories_id=cd.categories_id AND cd.language_id = '" . (int)$languages_id . "' AND c.categories_id=p2c.categories_id and products_id='".$item['id']."' AND c.categories_id <> '".$item['categories_id']."' ");
// $rescat=$objres->fetchAllAssoc();
//
Added: trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/languages/fr_FR/modules/products/manufacturers.txt
===================================================================
--- trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/languages/fr_FR/modules/products/manufacturers.txt (rev 0)
+++ trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/languages/fr_FR/modules/products/manufacturers.txt 2012-06-24 21:07:27 UTC (rev 4482)
@@ -0,0 +1,11 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/04/2012 ,22:50:08
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
\ No newline at end of file
Modified: trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/modules/products/manufacturers.php
===================================================================
--- trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/modules/products/manufacturers.php 2012-06-24 20:35:27 UTC (rev 4481)
+++ trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/modules/products/manufacturers.php 2012-06-24 21:07:27 UTC (rev 4482)
@@ -18,7 +18,7 @@
/**
*/
- public static $manufacturers_array;
+ public static $manufacturers_array = array();
public static $pInfo;
@@ -30,18 +30,18 @@
$this->title = __('module aca manufacturers text title');
$this->description = __('module aca manufacturers text description');
$this->sort_order = (defined('MODULE_ACA_MANUFACTURERS_SORT_ORDER')) ? MODULE_ACA_MANUFACTURERS_SORT_ORDER : '';
- $this->enabled = true;
+ $this->enabled = DataTypes::is_active('manufacturer');
// $this->general=true;
-
- global $language;
- $this->language = $language;
- self::$manufacturers_array = array();
- $manufacturers_query = tep_db_query("select manufacturers_id, manufacturers_name from " . TABLE_MANUFACTURERS . " order by manufacturers_name");
- while ($manufacturers = tep_db_fetch_array($manufacturers_query)) {
- self::$manufacturers_array[] = array('id' => $manufacturers['manufacturers_id'],'text' => $manufacturers['manufacturers_name']);
- }
-
+ if($this->enabled) {
+ global $language;
+ $this->language = $language;
+ self::$manufacturers_array = array();
+ $manufacturers_query = tep_db_query("select manufacturers_id, manufacturers_name from " . TABLE_MANUFACTURERS . " order by manufacturers_name");
+ while ($manufacturers = tep_db_fetch_array($manufacturers_query)) {
+ self::$manufacturers_array[] = array('id' => $manufacturers['manufacturers_id'],'text' => $manufacturers['manufacturers_name']);
+ }
+ }
}
/**
Modified: trunk/extensions/MANUFACTURERS_stable/sql/mysql/install/data/osc_manufacturers.sql
===================================================================
--- trunk/extensions/MANUFACTURERS_stable/sql/mysql/install/data/osc_manufacturers.sql 2012-06-24 20:35:27 UTC (rev 4481)
+++ trunk/extensions/MANUFACTURERS_stable/sql/mysql/install/data/osc_manufacturers.sql 2012-06-24 21:07:27 UTC (rev 4482)
@@ -11,8 +11,9 @@
--| http://www.oscss.org/ |
--+######################################################################--+
-INSERT INTO osc_manufacturers (manufacturers_id, manufacturers_name, manufacturers_image, date_added) VALUES
-(1, 'Sony', 'sony.png', NOW() ),
-(2, 'Panasonic', 'panasonic.png', NOW()),
-(3, 'Nikon', 'nikon.png', NOW()),
-(4, 'Sigma', 'sigma.png', NOW());
\ No newline at end of file
+TRUNCATE osc_manufacturers;
+
+INSERT INTO osc_manufacturers (manufacturers_id, manufacturers_name, manufacturers_image, date_added) VALUES (1, 'Sony', 'sony.png', NOW() );
+INSERT INTO osc_manufacturers (manufacturers_id, manufacturers_name, manufacturers_image, date_added) VALUES (2, 'Panasonic', 'panasonic.png', NOW());
+INSERT INTO osc_manufacturers (manufacturers_id, manufacturers_name, manufacturers_image, date_added) VALUES (3, 'Nikon', 'nikon.png', NOW());
+INSERT INTO osc_manufacturers (manufacturers_id, manufacturers_name, manufacturers_image, date_added) VALUES (4, 'Sigma', 'sigma.png', NOW());
\ No newline at end of file
Modified: trunk/extensions/MANUFACTURERS_stable/sql/mysql/install/data/osc_manufacturers_info.sql
===================================================================
--- trunk/extensions/MANUFACTURERS_stable/sql/mysql/install/data/osc_manufacturers_info.sql 2012-06-24 20:35:27 UTC (rev 4481)
+++ trunk/extensions/MANUFACTURERS_stable/sql/mysql/install/data/osc_manufacturers_info.sql 2012-06-24 21:07:27 UTC (rev 4482)
@@ -12,10 +12,9 @@
--+######################################################################--+
+TRUNCATE osc_manufacturers_info;
+INSERT INTO osc_manufacturers_info (manufacturers_id, languages_id, manufacturers_url, url_clicked, date_last_click) VALUES (1, 1, '', 0, NULL);
+INSERT INTO osc_manufacturers_info (manufacturers_id, languages_id, manufacturers_url, url_clicked, date_last_click) VALUES(2, 1, '', 0, NULL);
+INSERT INTO osc_manufacturers_info (manufacturers_id, languages_id, manufacturers_url, url_clicked, date_last_click) VALUES(3, 1, '', 0, NULL);
+INSERT INTO osc_manufacturers_info (manufacturers_id, languages_id, manufacturers_url, url_clicked, date_last_click) VALUES(4, 1, '', 0, NULL);
-INSERT INTO osc_manufacturers_info (manufacturers_id, languages_id, manufacturers_url, url_clicked, date_last_click) VALUES
-(1, 1, '', 0, NULL),
-(2, 1, '', 0, NULL),
-(3, 1, '', 0, NULL),
-(4, 1, '', 0, NULL);
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-06-24 20:35:33
|
Revision: 4481
http://oscss.svn.sourceforge.net/oscss/?rev=4481&view=rev
Author: oscim
Date: 2012-06-24 20:35:27 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
FS#1080
Modified Paths:
--------------
trunk/catalog/admin/includes/modules/pages/products.php
Modified: trunk/catalog/admin/includes/modules/pages/products.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/products.php 2012-06-24 20:29:41 UTC (rev 4480)
+++ trunk/catalog/admin/includes/modules/pages/products.php 2012-06-24 20:35:27 UTC (rev 4481)
@@ -1238,7 +1238,7 @@
foreach(self::$InitInfo['modele']['listing'] as $k=>$row){
if($k == 'action') $ord[$k]=self::ButtonRowsActions($item);
- elseif($k == 'title') $ord[$k]= '<a rel="'.tep_href_link('document.php', 'mod=img&typ=product&w=200&h=200&id='.$item['id']) .'" class="screenshot" href="#" title="">'.$item['title'].'</a>';
+ elseif($k == 'title') $ord[$k]= '<a rel="'.tep_href_link('document.php', 'mod=img&typ=product&w=200&h=200&id='.$item['id']) .'" class="screenshot" href="'.tep_href_link(self::FILENAME).'" title="">'.$item['title'].'</a>';
elseif($k == 'status') $ord[$k]=self::RowStatus($item);
// elseif($k == 'hidden') $ord[$k]=self::RowHidden($item);
elseif(in_array($k , array('added', 'modified' ,'available')) ) $ord[$k]=tep_date_short($item[$k]);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-06-24 20:29:47
|
Revision: 4480
http://oscss.svn.sourceforge.net/oscss/?rev=4480&view=rev
Author: oscim
Date: 2012-06-24 20:29:41 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
correction coquille
ajout colonne special dans les listing produit
Modified Paths:
--------------
trunk/catalog/admin/includes/modules/pages/products.php
trunk/extensions/SPECIALS_stable/catalog/admin/includes/languages/fr_FR/modules/products/specials.txt
Modified: trunk/catalog/admin/includes/modules/pages/products.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/products.php 2012-06-24 20:13:42 UTC (rev 4479)
+++ trunk/catalog/admin/includes/modules/pages/products.php 2012-06-24 20:29:41 UTC (rev 4480)
@@ -981,7 +981,7 @@
TODO A revoir , appel des sub modules
*/
if(tep_cst_define('MODULE_ACAPRO_SPECIAL_SORT_ORDER'))
- $query_raw .= " LEFT JOIN " . TABLE_SPECIALS . " s ON( s.specials_id =p.products_id ) ";
+ $query_raw .= " LEFT JOIN " . TABLE_SPECIALS . " s ON( s.products_id =p.products_id AND s.status > 0) ";
$query_raw .=((strlen($adjust->sWhere)>4) ? " WHERE ".substr($adjust->sWhere, 3) : '').
Modified: trunk/extensions/SPECIALS_stable/catalog/admin/includes/languages/fr_FR/modules/products/specials.txt
===================================================================
--- trunk/extensions/SPECIALS_stable/catalog/admin/includes/languages/fr_FR/modules/products/specials.txt 2012-06-24 20:13:42 UTC (rev 4479)
+++ trunk/extensions/SPECIALS_stable/catalog/admin/includes/languages/fr_FR/modules/products/specials.txt 2012-06-24 20:29:41 UTC (rev 4480)
@@ -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 04/06/10, 12:04
+ @version 2.1.1
+ @date 22/06/2012, 12:04
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -17,4 +17,6 @@
$lang['Date de début :<small>(jj/mm/aaaa)</small>']= 'Date de début :<small>(jj/mm/aaaa)</small>';
$lang["Laissez la date d'échéance vide pour aucune expiration"]= "Laissez la date d'échéance vide pour aucune expiration";
$lang["Date d'expiration :<small>(jj/mm/aaaa)</small>"]= "Date d'expiration :<small>(jj/mm/aaaa)</small>";
+
+$lang['@specials products table heading special price']= 'Promotions';
?>
\ 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-06-24 20:13:48
|
Revision: 4479
http://oscss.svn.sourceforge.net/oscss/?rev=4479&view=rev
Author: oscim
Date: 2012-06-24 20:13:42 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
correction mineur
correction coquille
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/drivers/sqlfeatured.php
trunk/catalog/admin/includes/gabarit/MGabCont/filter.featured.gab
trunk/catalog/admin/includes/gabarit/featureds/display_view.edit.gab
trunk/catalog/admin/includes/modules/pages/products.php
Modified: trunk/catalog/admin/includes/classes/drivers/sqlfeatured.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlfeatured.php 2012-06-24 09:50:24 UTC (rev 4478)
+++ trunk/catalog/admin/includes/classes/drivers/sqlfeatured.php 2012-06-24 20:13:42 UTC (rev 4479)
@@ -14,7 +14,6 @@
-
class sqlfeatured
implements ModSqlDataDriver{
@@ -116,7 +115,7 @@
$where_lg .= "AND languages_id = '".(int)$lg['id']."' ";
- if(isset($row['title'][$lg['id']] ) {
+ if(isset($row['title'][$lg['id']]) ) {
$sql_data_array_lg = array(
'featured_title'=> ((!empty($row['title'][$lg['id']])) ? tep_db_prepare_input($row['title'][$lg['id']]) : '' ),
);
Modified: trunk/catalog/admin/includes/gabarit/MGabCont/filter.featured.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/MGabCont/filter.featured.gab 2012-06-24 09:50:24 UTC (rev 4478)
+++ trunk/catalog/admin/includes/gabarit/MGabCont/filter.featured.gab 2012-06-24 20:13:42 UTC (rev 4479)
@@ -14,8 +14,10 @@
if(is_object($res))
$list =array($res);
-else
+elseif($res !=false)
$list = $res;
+else
+ $list = array();
?>
Modified: trunk/catalog/admin/includes/gabarit/featureds/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/featureds/display_view.edit.gab 2012-06-24 09:50:24 UTC (rev 4478)
+++ trunk/catalog/admin/includes/gabarit/featureds/display_view.edit.gab 2012-06-24 20:13:42 UTC (rev 4479)
@@ -36,7 +36,7 @@
<fieldset id="fieldset_<?php echo $lg['id'] ?>" class="block_field">
<p class="block_input">
<label for="<?php echo 'title' . $lg['id']; ?>"><?php echo __('@featureds entry title'); ?></label>
- <?php echo tep_draw_input_field('title[' . $lg['id'] . ']', 'title_' . $lg['id'], featureds::$Info->lg[ $lg['id']]->title, 'size="70"', true) ; ?>
+ <?php echo tep_draw_input_field('title[' . $lg['id'] . ']', 'title_' . $lg['id'], @featureds::$Info->lg[ $lg['id']]->title, 'size="70"', true) ; ?>
</p>
</fieldset>
<?php endforeach; ?>
@@ -45,7 +45,7 @@
<p class="block_input">
<Label><?php echo __('@featureds text info featureds keys') ?></label>
- <?php echo tep_draw_input_field('featureds_key', '', featureds::$Info->uniqkey) ?>
+ <?php echo tep_draw_input_field('featureds_key', '', @featureds::$Info->uniqkey) ?>
</p>
<p class="block_input">
Modified: trunk/catalog/admin/includes/modules/pages/products.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/products.php 2012-06-24 09:50:24 UTC (rev 4478)
+++ trunk/catalog/admin/includes/modules/pages/products.php 2012-06-24 20:13:42 UTC (rev 4479)
@@ -229,6 +229,7 @@
'alias'=>'manuf_title',
'text'=>__('products table heading manufacturers'),
'width'=>'12%',
+ 'default'=>true,
);
}
/* END Datatype RootListing manufacturer */
@@ -246,6 +247,7 @@
'alias'=>'featured',
'text'=>__('products table heading featured'),
'width'=>'12%',
+ 'default'=>true,
);
}
/* END Datatype RootListing featured */
@@ -262,13 +264,17 @@
'alias'=>'price',
'text'=>__('products table heading price'),
);
-/*
- self::$allfields['p.products_price']= array(
- 'sort'=>false,
- 'alias'=>'price_ttx',
- 'text'=>__('products table heading price taxe'),
- ); */
+/**
+ TODO A revoir , appel des sub modules
+*/
+ if(tep_cst_define('MODULE_ACAPRO_SPECIAL_SORT_ORDER'))
+ self::$allfields['s.specials_new_products_price']= array(
+ 'sort'=>false,
+ 'alias'=>'sprice',
+ 'text'=>__('@specials products table heading special price'),
+ );
+
self::$allfields['p.products_tax_class_id']= array(
'sort'=>true,
'alias'=>'taxe_id',
@@ -971,6 +977,13 @@
$query_raw .= " LEFT JOIN " . TABLE_FEATURED_DESCRIPTION . " fad ON( fad.featured_id=fada.featured_id AND fad.languages_id = '".(int)$adjust->languages_id."' ) ";
}
+ /**
+ TODO A revoir , appel des sub modules
+ */
+ if(tep_cst_define('MODULE_ACAPRO_SPECIAL_SORT_ORDER'))
+ $query_raw .= " LEFT JOIN " . TABLE_SPECIALS . " s ON( s.specials_id =p.products_id ) ";
+
+
$query_raw .=((strlen($adjust->sWhere)>4) ? " WHERE ".substr($adjust->sWhere, 3) : '').
" GROUP BY p.products_id ".
" ORDER BY ".((!empty($adjust->sOrder)) ? $adjust->sOrder : ' p.products_date_added DESC ');
@@ -1197,7 +1210,7 @@
while ($item = $_query->fetchAssoc()) {
$ord =array();
- if( ! DataTypes::is_active('categorie')) {
+ if( DataTypes::is_active('categorie')) {
/// complete cats list
$objres=$DB->query("SELECT categories_name FROM " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd , " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c WHERE c.categories_id=cd.categories_id AND cd.language_id = '" . (int)$languages_id . "' AND c.categories_id=p2c.categories_id and products_id='".$item['id']."' AND c.categories_id <> '".$item['categories_id']."' ");
$rescat=$objres->fetchAllAssoc();
@@ -1208,7 +1221,7 @@
if(strlen($item['cat_title'])>35)$item['cat_title']= substr($item['cat_title'],0 ,30).'...';
}
- if( ! DataTypes::is_active('featured')) {
+ if( DataTypes::is_active('featured')) {
/// complete cats list
// $objres=$DB->query("SELECT categories_name FROM " . TABLE_FEATURED . " f, " . TABLE_CATEGORIES_DESCRIPTION . " cd , " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c WHERE c.categories_id=cd.categories_id AND cd.language_id = '" . (int)$languages_id . "' AND c.categories_id=p2c.categories_id and products_id='".$item['id']."' AND c.categories_id <> '".$item['categories_id']."' ");
// $rescat=$objres->fetchAllAssoc();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-06-24 09:50:30
|
Revision: 4478
http://oscss.svn.sourceforge.net/oscss/?rev=4478&view=rev
Author: oscim
Date: 2012-06-24 09:50:24 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
report function
Modified Paths:
--------------
trunk/catalog/admin/includes/functions/general.php
Modified: trunk/catalog/admin/includes/functions/general.php
===================================================================
--- trunk/catalog/admin/includes/functions/general.php 2012-06-24 09:47:51 UTC (rev 4477)
+++ trunk/catalog/admin/includes/functions/general.php 2012-06-24 09:50:24 UTC (rev 4478)
@@ -747,12 +747,23 @@
return 'false';
}
+/**
+ @fn DataForceStatus($clause)
+ @brief this function force status on datatype Required for admin view off data
+ @note use in sql Requete, next clause where and prev other clause
+ @param $clause string clause normal control status ( c.status='1' AND )
+ @return normal clause status or empty string
+*/
+function DataForceStatus($clause){
+ global $SecuKey;
+ if ( ( !empty($SecuKey) && (strlen($SecuKey)==40) && isset($_GET['forceview']) && (string)$_GET['forceview'] ==md5($SecuKey)) )
+ return '';
+ else
+ return ' '.$clause.' ';
+}
-
/**
- @package oscss
- @author oscim - OscssTeam
- @version 1.0
+ @fn tep_cst_menu_conf($cst)
Control la présence d'une constante de langue en remplacement de l'intitulé des menu de l'admin. Si cette constante n'est pas défini, une alerte est produite
ne préciser que le contenu de la colonne key
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-06-24 09:47:57
|
Revision: 4477
http://oscss.svn.sourceforge.net/oscss/?rev=4477&view=rev
Author: oscim
Date: 2012-06-24 09:47:51 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
FS#1077 finition
Modified Paths:
--------------
trunk/catalog/admin/includes/boxes/04_tools.php
trunk/catalog/admin/includes/languages/fr_FR/boxes/04_tools.php
Modified: trunk/catalog/admin/includes/boxes/04_tools.php
===================================================================
--- trunk/catalog/admin/includes/boxes/04_tools.php 2012-06-24 09:45:13 UTC (rev 4476)
+++ trunk/catalog/admin/includes/boxes/04_tools.php 2012-06-24 09:47:51 UTC (rev 4477)
@@ -8,23 +8,20 @@
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
- $tabl_link[]= array(FILENAME_RAPPORT, 'BOX_TOOLS_RAPPORT', 'stats',@$img['stats']);
+ $tabl_link[]= array(FILENAME_RAPPORT, 'BOX_TOOLS_RAPPORT', 'stats',@$img['stats']);
- $tabl_link[]= array(FILENAME_GOOGLE_SITEMAP, 'BOX_TOOLS_GOOGLE_SITEMAP', 'ggmap',@$img['ggmap']);
- $tabl_link[]= array(FILENAME_FULL_TAG, 'BOX_TOOLS_HEADER_TAG', 'headertag',@$img['headertag']);
+ $tabl_link[]= array(FILENAME_GOOGLE_SITEMAP, 'BOX_TOOLS_GOOGLE_SITEMAP', 'ggmap',@$img['ggmap']);
+ $tabl_link[]= array(FILENAME_FULL_TAG, 'BOX_TOOLS_HEADER_TAG', 'headertag',@$img['headertag']);
- $tabl_link[]= array(FILENAME_NAVIGATION_LINKS, 'BOX_NAVIGATION_LINK', 'nav',@$img['navigation_link']);
+ $tabl_link[]= array(FILENAME_NAVIGATION_LINKS, 'BOX_NAVIGATION_LINK', 'nav',@$img['navigation_link']);
-// if(_cst_bool('USE_LOCAL_GENERAT_PDF'))
-// $tabl_link[]= array(FILENAME_BATCH_PRINT, 'BOX_TOOLS_BATCH_CENTER', 'batch_print',@$img['batch_print']);
+ $tabl_link[608]= array('ss_menu', 'BOX_TOOLS_SYSTEM', 'system',@$img['system']);
+ $tabl_link[608][4][]= array(FILENAME_BACKUP, 'BOX_TOOLS_BACKUP', 'database',@$img['database']);
+ $tabl_link[608][4][]= array(FILENAME_CONFIGURATION.'?gmod=modcorecache', 'BOX_TOOLS_CACHE', 'cache');
+ $tabl_link[608][4][]= array(FILENAME_CONFIGURATION.'?gmod=modsysinfo', 'BOX_TOOLS_SERVER_INFO', 'server_info');
+ $tabl_link[608][4][]= array(FILENAME_CURRENCIES, 'BOX_LOCALIZATION_CURRENCIES', 'currencies');
+ $tabl_link[608][4][]= array(FILENAME_CRONJOB, 'BOX_TOOLS_CRONJOB', 'database',@$img['database']);
- $tabl_link[608]= array('ss_menu', 'BOX_TOOLS_SYSTEM', 'system',@$img['system']);
- $tabl_link[608][4][]= array(FILENAME_BACKUP, 'BOX_TOOLS_BACKUP', 'database',@$img['database']);
- $tabl_link[608][4][]= array(FILENAME_CONFIGURATION.'?gmod=modcorecache', 'BOX_TOOLS_CACHE', 'cache');
- $tabl_link[608][4][]= array(FILENAME_CONFIGURATION.'?gmod=modsysinfo', 'BOX_TOOLS_SERVER_INFO', 'server_info');
- $tabl_link[608][4][]= array(FILENAME_CURRENCIES, 'BOX_LOCALIZATION_CURRENCIES', 'currencies');
- $tabl_link[608][4][]= array(FILENAME_CRONJOB, 'BOX_TOOLS_CRONJOB', 'database',@$img['database']);
-
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/boxes/04_tools.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/boxes/04_tools.php 2012-06-24 09:45:13 UTC (rev 4476)
+++ trunk/catalog/admin/includes/languages/fr_FR/boxes/04_tools.php 2012-06-24 09:47:51 UTC (rev 4477)
@@ -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.1.0
- @date 09/12/10, 17:23
+ @version 2.1.1
+ @date 22/06/2012, 17:23
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@brief file languages for boxes menu
@@ -13,8 +13,6 @@
define('BOX_TOOLS_RAPPORT',"Rapports" );
-// define('BOX_HEADING_CONF_STATS_PRODUCTS_VIEWED',"Produits vus" );
-define('BOX_HEADING_CONF_STATS_DISCOUNT_COUPONS',"Coupons de réductions" );
define('BOX_HEADING_CONF_STATS_PRODUCTS_PURCHASED',"Produits achetés" );
define('BOX_HEADING_CONF_STATS_CUSTOMERS',"Total de commande client" );
define('BOX_HEADING_CONF_STATS_NEWSLETTER',"Clients inscrits newsletter" );
@@ -27,7 +25,6 @@
define('BOX_NAVIGATION_LINK',"Gestion du Menu" );
define('BOX_TOOLS_GOOGLE_SITEMAP',"Sitmap google" );
define('BOX_TOOLS_HEADER_TAG',"Référencement" );
-define('BOX_TOOLS_BANNER_MANAGER',"Bannière" );
define('BOX_TOOLS_SYSTEM',"Système" );
define('BOX_CONFIGURATION_CACHE',"Cache" );
define('BOX_TOOLS_CACHE',"Contrôle du cache" );
@@ -35,6 +32,5 @@
define('BOX_TOOLS_SERVER_INFO',"Infos serveur" );
define('BOX_LOCALIZATION_CURRENCIES',"Devises" );
define('BOX_HEADING_CONF_BOX_REPORTS',"Statistiques" );
-define('BOX_HEADING_CONF_BOX_TOOLS_BATCH_CENTER',"Batch Print Center" );
define('BOX_TOOLS_CRONJOB',"Tache(s) programmée(s)" );
?>
\ 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-06-24 09:45:20
|
Revision: 4476
http://oscss.svn.sourceforge.net/oscss/?rev=4476&view=rev
Author: oscim
Date: 2012-06-24 09:45:13 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
suppression element obsolete
Removed Paths:
-------------
trunk/catalog/admin/includes/functions/lib.batch_print.php
trunk/catalog/admin/includes/gabarit/batch_print.form.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/batch_print.txt
trunk/catalog/admin/includes/modules/pages/batch_print.php
Deleted: trunk/catalog/admin/includes/functions/lib.batch_print.php
===================================================================
--- trunk/catalog/admin/includes/functions/lib.batch_print.php 2012-06-24 09:40:13 UTC (rev 4475)
+++ trunk/catalog/admin/includes/functions/lib.batch_print.php 2012-06-24 09:45:13 UTC (rev 4476)
@@ -1,62 +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.1.0
- @date 19/12/10, 19:49
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-/**
-* @package batch_print for oscomm
-* @author du module
-*/
-function change_color($color) {
- global $pdf;
- list($r,$g,$b) = explode(',', $color);
- $pdf->setColor($r,$g,$b);
-}
-
-
-
-/**
-* @package batch_print for oscomm
-* @author du module
-*/
-function print_address($x, $y, $nums){
- global $pdf, $num, $billing,$orders_query, $order,$orders,$languages_id;
- $pos = $y;
- if ($order){
- if ($billing == true)
- $addressparts = explode("\n", tep_address_format($order->billing['format_id'], $order->billing, 1, '', " \n"));
- else
- $addressparts = explode("\n", tep_address_format($order->delivery['format_id'], $order->delivery, 1, '', " \n"));
- foreach($addressparts as $addresspart){
- $fontsize = GENERAL_FONT_SIZE;
- while ($pdf->getTextWidth($fontsize, $addresspart) > LABEL_WIDTH){
- $fontsize--;
- }
- $pdf->addText($x,$pos -=GENERAL_LINE_SPACING,$fontsize,$addresspart);
- }
- $pdf->addText($x + LABEL_WIDTH - ORDERIDXOFFSET - 22,$y + ORDERIDYOFFSET,ORDERIDFONTSIZE,$orders['orders_id']);
- if(($nums % NUM_LABELS_PER_PAGE) == (NUM_LABELS_PER_PAGE-1)){
- $order = false;
- return false;
- }
- else {
- if($orders = tep_db_fetch_array($orders_query)){
- $order = new order($orders['orders_id']);
- return true;
- }
- else {
- $order = false;
- return false;
- }
- }
- } else {
- return false;
- }
-
-}
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/gabarit/batch_print.form.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/batch_print.form.gab 2012-06-24 09:40:13 UTC (rev 4475)
+++ trunk/catalog/admin/includes/gabarit/batch_print.form.gab 2012-06-24 09:45:13 UTC (rev 4476)
@@ -1,89 +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
-*/
-?>
-<h3><?php echo __('heading title') ?></h3>
-
- <div class="box_uniq block_form">
- <?php echo tep_draw_form('batch', batch_print::FILENAME, 'action=exe'); ?>
-
- <div class="box_left">
- <fieldset class="block_field">
- <p class="block_input">
- <label title="<?php echo __('text choose template help'); ?>"><?php echo __('text choose template').tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_pull_down_menu('file_type', batch_print::$file_type_array, 1); ?>
- </p>
- <p class="block_input">
- <label title="<?php echo __('text order numbers ranges help'); ?>"><?php echo __('text order numbers ranges').tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_input_field('invoicenumbers'); ?>
- </p>
- </fieldset>
-
- <fieldset class="block_field">
- <legend><?php echo __('text dates orders'); ?></legend>
- <p class="block_input" >
- <label title="<?php echo __('text dates orders extractred'); ?>"><?php echo __('text from').tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_input_field('startdate'). tep_draw_hidden_field('bt_startdate'); ?>
- </p>
- <p class="block_input">
- <label title="<?php echo __('text dates orders extractred'); ?>"><?php echo __('text to').tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_input_field('enddate'). tep_draw_hidden_field('bt_enddate'); ?>
- </p>
- </fieldset>
-
- <fieldset class="block_field">
- <legend><?php echo __('text printing etiquette'); ?></legend>
- <p class="block_input">
- <label title="<?php echo __('text printing labels billing delivery help'); ?>"><?php echo __('text printing labels billing delivery').tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo __('text delivery') . tep_draw_radio_field('address','address_d', 'delivery', true) . __('text billing') . tep_draw_radio_field('address','address_b','billing'); ?>
- </p>
- <p class="block_input">
- <label title="<?php echo __('text position start printing help'); ?>"><?php echo __('text position start printing').tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_input_field('startpos','', '0');?>
- </p>
- </fieldset>
- </div>
-
- <div class="box_right">
- <p class="block_input">
- <label title="<?php echo __('text include orders status help'); ?>"><?php echo __('text include orders status').tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_pull_down_menu('pull_status',batch_print::$orders_statuses, 0); ?>
- </p>
-
- <fieldset class="block_field">
- <legend><?php echo __('text option afficahge'); ?></legend>
- <p class="block_input">
- <label title="<?php echo __('text show order help'); ?>"><?php echo __('text show order').tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_checkbox_field('show_order_date','', true, true); ?>
- </p>
- <p class="block_input">
- <label title="<?php echo __('text show phone number help'); ?>"><?php echo __('text show phone number').tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_checkbox_field('show_phone','', true, true); ?>
- </p>
- <p class="block_input">
- <label title="<?php echo __('text show email customer help'); ?>"><?php echo __('text show email customer').tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_checkbox_field('show_email','', true, true); ?>
- </p>
- <p class="block_input">
- <label title="<?php echo __('text payment information help'); ?>"><?php echo __('text payment information').tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_checkbox_field('show_pay_method','', true, true); ?>
- </p>
- <p class="block_input">
- <label title="<?php echo __('text show oreders comments help'); ?>"><?php echo __('text show oreders comments').tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_checkbox_field('show_comments','', true, true); ?>
- </p>
- </fieldset>
- </div>
-
- <div class="button_nav">
- <?php echo tep_image_submit('button_send.gif', __('image genere pdf')); ?>
- </div>
- </form>
- </div>
Deleted: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/batch_print.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/batch_print.txt 2012-06-24 09:40:13 UTC (rev 4475)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/batch_print.txt 2012-06-24 09:45:13 UTC (rev 4476)
@@ -1,126 +0,0 @@
-<?php
-/**
- @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.0
- @date 23/03/11, 14:54
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-$lang['heading title']="Centre d'impression" ;
-$lang['table heading comments']="Commentaires" ;
-$lang['table heading products model']="Modèle" ;
-$lang['table heading products']="Produits" ;
-$lang['table heading tax']="Taxe en %" ;
-$lang['table heading total']="Total" ;
-$lang['table heading price excluding tax']="PU (HT)" ;
-$lang['table heading price including tax']="PU (TTC)" ;
-$lang['table heading total excluding tax']="Total (HT)" ;
-$lang['table heading total including tax']="Total (TTC)" ;
-$lang['entry sold to']="VENDU À :" ;
-$lang['entry ship to']="LIVRÉ À :" ;
-$lang['entry payment method']="Méthode de paiement :" ;
-$lang['entry payment type']="Carte de crédit :" ;
-$lang['payment type']="Carte de crédit" ;
-$lang['entry cc owner']="Détenteur de la carte :" ;
-$lang['entry cc number']="Numéro de carte de crédit :" ;
-$lang['entry cc exp']="Date d'expiration :" ;
-$lang['entry sub total']="Sous-Total :" ;
-$lang['entry phone']="Téléphone:" ;
-$lang['entry email']="Email:" ;
-$lang['entry tax']="Taxe :" ;
-$lang['entry shipping']="Expédition :" ;
-$lang['entry total']="Total:" ;
-$lang['text order number']="Numéro de Commande:" ;
-$lang['text order date']="Date de La commande:" ;
-$lang['text order format']="d/m/Y H:i:s" ;
-$lang['text choose template']="Modèle: " ;
-$lang['text choose template help']="Choisissez le calibre de fichier (template) avec lequel vous voulez imprimer" ;
-$lang['text order numbers ranges']="N° de commande(s)" ;
-$lang['text order numbers ranges help']="Entrez un numéro, une suite de numéros (separé par des virgule), ou une plage de numéros (300-500; plage et suite sont cumulable (par exemple : 2577,2580-2585,2588)" ;
-$lang['text dates orders extractred']="format: YYYY-MM-DD)" ;
-$lang['text from']="Du : " ;
-$lang['text to']="Au : " ;
-$lang['text printing labels billing delivery']="Adresse : " ;
-$lang['text printing labels billing delivery help']="En Imprimant l'étiquette :- employez l'adresse de facturation ou l'adresse de livraison ?" ;
-$lang['text delivery']="Livraison: " ;
-$lang['text billing']="Facturation: " ;
-$lang['text printing etiquette']="Étiquettes" ;
-$lang['text dates orders']="Dates" ;
-$lang['text orders status']="Status" ;
-$lang['text option afficahge']="Options d'affichage" ;
-$lang['text position start printing']="position pour commencer :" ;
-$lang['text position start printing help']="Commencer à imprimer de : (0 est la position de l'étiquette en haut à gauche, ils augmentent de gauche à droite et de haut en bas)" ;
-
-$lang['text include orders status']="Statut :" ;
-$lang['text include orders status help']="Choisissez le status des commandes , si NONE, toutes les commandes seront incluses)" ;
-$lang['text show order']="Voir la date :" ;
-$lang['text show order help']="la date de l'ordre (facture, bon de livrairson)" ;
-$lang['text show phone number']="Voir le téléphone :" ;
-$lang['text show phone number help']="Du client" ;
-$lang['text show email customer']="Voir l'Email :" ;
-$lang['text show email customer help']="Du client" ;
-$lang['text payment information']="Voir le paiement:" ;
-$lang['text payment information help']="Les informations du mode de paiement" ;
-$lang['text show credit card number']="Voir le numéro de CB :" ;
-$lang['text show credit card number help']="Pour la carte de crédit lors de la commande seulement)" ;
-$lang['text show oreders comments']="Ne pas voir les commentaires:" ;
-$lang['text show oreders comments help']="Ne montrera pas l'ordre avec des commentaires placés par le client à la période de l'ordre." ;
-$lang['text bank']="Banque: " ;
-$lang['text post']="Poste: " ;
-$lang['text sales']="Vente: " ;
-$lang['text packed by']="Emballé Par:______________________" ;
-$lang['text verified by']="Vérifié Par:______________________" ;
-$lang['text dear']="Cher " ;
-
-$lang['text returns label']="Etiquette de retours de commande: " ;
-$lang['text shipping label']="Etiquette d'expédition de commande: " ;
-$lang['ship from country']="" ;
-$lang['website']="www.your-site.com" ;
-$lang['text returns']="Nous espérons que vous n'en aurez pas besoin, mais nous vous avons fourni une étiquette de retours à tout hasard. Politique de retours sur www.your-site.com/shipping.php" ;
-$lang['image genere pdf']="Voir les pdf(s)" ;
-
-
-$lang['error invalid input']="Internal Error: Unrecognized or invalid script input." ;
-$lang['error bad date']="Invalid date, Please enter a valid date in Year-Month-Day (1000-01-01) format." ;
-$lang['error bad invoicenumbers']="Invalid Invoice numbers, Please enter a valid format. (eg. 2577,2580-2585,2588)" ;
-$lang['no orders']="There were no orders selected for export, try changing your order options." ;
-$lang['set permissions']="Can't write to directory! Please set the permissions of your temp pdf folder to CHMOD 0777" ;
-$lang['failed to open']="Impossible de creer le fichier, verifier les droits" ;
-$lang['precise date start']="Preciser une date de début" ;
-$lang['precise date end']="Preciser une date de Fin" ;
-
-
-/** UTILISE DANS LES SORTIE PDF NE PAS MODIFIER */
-define('PRINT_INVOICE_HEADING', 'Facture');
-define('PRINT_PROFORMAT_HEADING', 'Proformat');
-define('PRINT_INVOICE_TEXT', 'Merci de votre commande sur <a href="'.HTTP_SERVER.DIR_WS_CATALOG.'">'.STORE_NAME.'</a>');
-define('PRINT_INVOICE', 'Facture');
-define('PRINT_PROFORMAT_ORDERNR', 'Proformat n° : ');
-define('PRINT_INVOICE_ORDERNR', 'Facture n° : ');
-define('PRINT_PROFORMAT_DATE', 'Date de commande : ');
-define('PRINT_INVOICE_DATE', 'Date de facture : ');
-
-define('PRINT_PACKINGSLIP_HEADING', 'Bon de Commande');
-define('PRINT_PACKINGSLIP_TEXT', 'Merci de votre commande sur');
-define('PRINT_PACKINGSLIPE_TITLE', 'Commande n° : ');
-define('PRINT_PACKINGSLIP', 'Commande');
-define('ENTRY_SOLD_TO', 'VENDU À :');
-define('ENTRY_SHIP_TO', 'LIVRÉ À :');
-define('PRINT_PACKINGSLIP_ORDERNR', 'Bon de Commande n° : ');
-define('PRINT_PACKINGSLIP_DATE', 'Date de commande : ');
-define('TABLE_HEADING_COMMENTS', 'Commentaires');
-define('TABLE_HEADING_PRODUCTS_MODEL', 'Modèle');
-define('TABLE_HEADING_PRODUCTS', 'Produits');
-define('TABLE_HEADING_TAX', 'Taxe en %');
-define('TABLE_HEADING_TOTAL', 'Total');
-define('TABLE_HEADING_PRICE_EXCLUDING_TAX', 'PU (HT)');
-define('TABLE_HEADING_PRICE_INCLUDING_TAX', 'PU (TTC)');
-define('TABLE_HEADING_TOTAL_EXCLUDING_TAX', 'Total (HT)');
-define('TABLE_HEADING_TOTAL_INCLUDING_TAX', 'Total (TTC)');
-define('ENTRY_PAYMENT_METHOD', 'Méthode de paiement :');
-define('ENTRY_PHONE', 'Téléphone:');
-define('ENTRY_EMAIL', 'Email:');
-
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/modules/pages/batch_print.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/batch_print.php 2012-06-24 09:40:13 UTC (rev 4475)
+++ trunk/catalog/admin/includes/modules/pages/batch_print.php 2012-06-24 09:45:13 UTC (rev 4476)
@@ -1,212 +0,0 @@
-<?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 24/09/11, 21:53
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- @class batch_print
-*/
-
-class batch_print
- implements ExtModPage, InterfaceModule {
-
- const FILENAME = FILENAME_BATCH_PRINT;
- /**
- */
- public static $code;
-
- public static $action;
- /**
- @param array $list
- */
- public static $list=array();
- /**
- @param array $orders_statuses
- */
- public static $orders_statuses=array();
- /**
- @param array $file_type_array
- */
- public static $file_type_array=array();
-
- /**
- class constructor
- */
- public function __construct() {
- self::$code=__CLASS__;
-
- osCSS_pdf::getInstance();
-
- self::$orders_statuses = array_merge(tep_get_status_array('orders'),array(array('id'=>'','text'=>TEXT_NONE)));
- self::$file_type_array= osCSS_pdf::get_module();
- }
-
- public function check_action($actions){
- global $messageStack,$pdf,$currencies;
-
- $DB=Database::getInstance();
-
- self::$action=$actions;
-
- $pageloop = "0";
- if (isset($_GET['mkey'])) $action = 'erreur';
-
- switch (self::$action) {
- case 'exe':
- // check if invoice number is a empty field .. if its not empty do this ..
- // if it is empty skip down to the check date entered code.
- if (isset($_POST['invoicenumbers']) && tep_not_null($_POST['invoicenumbers']) || isset($_GET['oID']) && tep_not_null($_GET['oID'])) {
- $invoicenumbers =(!empty($_POST['invoicenumbers'])) ? $_POST['invoicenumbers'] : $_GET['oID'];
- $time0 = time();
- $invoicenumbers = tep_db_prepare_input($invoicenumbers);
- $arr_no = explode(',',$invoicenumbers);
- foreach ($arr_no as $key=>$value) {
- $arr_no[$key]=trim($value);
- if (substr_count($arr_no[$key],'-')>0) {
- $temp_range=explode('-',$arr_no[$key]);
- $arr_no[$key]=implode(',',range((int) $temp_range[0], (int) $temp_range[1]));
- }
- }
- $invoicenumbers=implode(',',$arr_no);
-
- $type=(isset($_GET['file_type'])) ? $_GET['file_type'] : $_POST['file_type'] ;
- } else {
-
- try{
- if (!isset($_POST['startdate'])) throw new Exception(__("precise date start"));
- $_POST['startdate']= tep_date_raw($_POST['startdate']);
- if ((strlen($_POST['startdate']) != 10) || self::verify_start_date($_POST['startdate']))throw new Exception(__("error bad date"));
-
- if (!isset($_POST['enddate'])) throw new Exception(__("precise date end"));
- $_POST['enddate']= tep_date_raw($_POST['enddate']);
- if ((strlen($_POST['enddate']) != 10) || self::verify_start_date($_POST['enddate']))throw new Exception(__("error bad date"));
-
- if (!is_writeable(BATCH_PDF_DIR)) throw new Exception(__("set permissions"));
- }catch(Exception $e){
- $messageStack->add_session($e->getMessage(), 'error');
- tep_redirect(tep_href_link(self::FILENAME));
- }
-
-
- $time0 = time();
- $startdate = tep_db_prepare_input($_POST['startdate']);
- $time0 = time();
- $enddate = tep_db_prepare_input($_POST['enddate']);
- $type=$_POST['file_type'];
- }
-
- $pdf=osCSS_pdf::OutputInit($type);
- $DF = new DatasFiles;
-
- $pageloop = "1";
-
- $get_customer_comments = (isset($_POST['show_comments']))? ' and h.orders_status_id = ' . DEFAULT_ORDERS_STATUS_ID : '' ;
- $pull_w_status =(isset($_POST['pull_status']) && tep_not_null($_POST['pull_status']))? " and o.orders_status = ". $_POST['pull_status']:'';
-
- // if there is a invoice number use first order query otherwise use second date style order query
- if ($invoicenumbers != '') $orders_query = tep_db_query("select o.orders_id,o.customers_id, o.orders_status,h.comments,MIN(h.date_added) from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_STATUS_HISTORY . " h where o.orders_id in (" . tep_db_input($invoicenumbers) . ") and h.orders_id = o.orders_id" . $pull_w_status . $get_customer_comments . ' group by o.orders_id');
- else $orders_query = tep_db_query("select o.orders_id,o.customers_id,o.orders_status,h.comments,MIN(h.date_added) from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_STATUS_HISTORY . " h where o.date_purchased between '" . tep_db_input($startdate) . "' and '" . tep_db_input($enddate) . " 23:59:59' and h.orders_id = o.orders_id" . $pull_w_status . $get_customer_comments . ' group by o.orders_id');
-
- if (!tep_db_num_rows($orders_query) > 0) message_handler('FAILED_TO_OPEN');
-
- while ($orders = tep_db_fetch_array($orders_query)) {
- $order = new order($orders['orders_id']);
-
- osCSS_pdf::OutputAddPage();
-
- include(osCSS_pdf::getPathModele());
-
- $time1 = time();
- if ($time1 >= $time0 + 30) {
- $time0 = $time1;
- header('X-bpPing: Pong');
- }
-
- $file=$DF->GetDoc(osCSS_pdf::GetPdfType(),$orders['orders_id']);
-
- if(file_exists($file))
- unlink($file);
-
- $pdf=osCSS_pdf::SaveEnd($file);
- }
-
- /// @remarks draw and exit;
- $pdf=osCSS_pdf::OutputEnd();
-//
-
- /* Succes */
-// $messageStack->add_session('A PDF of ' . $num . ' record(s) was successful! <a href="'.$fname.'" target="_blank"><b>Click here</b></a> to download the order file.', 'info');
- }
-
-
- return self::$action;
- }
-
- public function get_header(){
- ?>
- <script type="text/javascript"><!--
- var tax_rates = new Array();
- $(function() {
- $.datepicker.setDefaults($.extend({
- duration: '',
- changeMonth: true,
- changeYear: true,
- showOn: 'button',
- buttonImage: '<?php echo DIR_WS_ICONS . 'calendar.gif';?>',
- buttonImageOnly: true
- }
- <?php if (($lng=language::LangueSelected())&& $lng != 'en') echo ",\n"."$.datepicker.regional['".$lng."']"."\n"; ?>
- ));
- $('#bt_startdate').datepicker({altField: '#startdate'});
- $('#bt_enddate').datepicker({altField: '#enddate'});
- });
- // -->
- </script>
- <?php
- }
-
-
- public static function load_db_values($ID){
- }
-
- public function display_view(){
- return tep_get_include_contents(self::$code.'.form');
- }
-
-
-
-/** specifique private methode */
- private static function verify_start_date($startdate) {
- $error = 0;
- list($year,$month,$day) = explode('-', $startdate);
-
- if ((strlen($year) != 4) || !is_numeric($year)) $error++;
- if ((strlen($month) != 2) || !is_numeric($month)) $error++;
- if ((strlen($day) != 2) || !is_numeric($day)) $error++;
-
- return $error;
- }
-
- private static function verify_end_date($enddate) {
- $error = 0;
- list($year,$month,$day) = explode('-', $enddate);
-
- if ((strlen($year) != 4) || !is_numeric($year)) $error++;
- if ((strlen($month) != 2) || !is_numeric($month)) $error++;
- if ((strlen($day) != 2) || !is_numeric($day)) $error++;
-
- return $error;
- }
-
-/** Interface module */
-
- function check() { return false; }
- function install() { return false; }
- function remove() { return false; }
- function keys() { return false; }
-}
-
-?>
\ 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-06-24 09:40:19
|
Revision: 4475
http://oscss.svn.sourceforge.net/oscss/?rev=4475&view=rev
Author: oscim
Date: 2012-06-24 09:40:13 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
#FS1007
Modified Paths:
--------------
trunk/catalog/common/classes/datatype_drivers/Data_categorie.php
trunk/catalog/common/classes/datatype_drivers/Data_content.php
Modified: trunk/catalog/common/classes/datatype_drivers/Data_categorie.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_categorie.php 2012-06-24 09:31:40 UTC (rev 4474)
+++ trunk/catalog/common/classes/datatype_drivers/Data_categorie.php 2012-06-24 09:40:13 UTC (rev 4475)
@@ -85,7 +85,7 @@
" LEFT JOIN " . TABLE_CATEGORIES_DESCRIPTION . " ".$this->p."d ON( ".$this->p."d.categories_id = ".$this->p.".categories_id AND ".$this->p."d.language_id = '" . (int)$languages_id . "' ) ".
"";
// permanente contrainte
- $this->listing_sql['where'] = " WHERE ".$this->p.".categories_status = '1' ";
+ $this->listing_sql['where'] = " WHERE ".DataForceStatus(" ".$this->p.".categories_status='1' ")." ";
// sort in sitemap
$this->listing_sql['sort'] = " ".$this->p.".parent_id ";
// l id
@@ -282,7 +282,7 @@
$categories=categorie::get_item((int)$current_category_id);
//! List des categorie enfant
- $categories_query = $DB->query($sql="select c.categories_id from " . TABLE_CATEGORIES . " c where c.parent_id = '" . (int)$current_category_id . "' and c.categories_status='1' ");
+ $categories_query = $DB->query($sql="select c.categories_id from " . TABLE_CATEGORIES . " c where c.parent_id = '" . (int)$current_category_id . "' ".DataForceStatus(" AND c.categories_status='1' ")." ");
$lis="";
while ($cat= $categories_query->fetchAssoc() ){ $lis .="'".$cat['categories_id']."',"; }
$list = $lis . $current_category_id;
@@ -308,7 +308,7 @@
"SELECT DISTINCT ". $sql_tmp['col_count'] ." ".
$sql_tmp['tables'] .
" LEFT JOIN " . constant(strtoupper('TABLE_'.$type.'_TO_CATEGORIES')) . " ".$subtype->p."2c ON(".$subtype->p.".". $sql_tmp['base_key'] ." = ".$subtype->p."2c.". $sql_tmp['base_key'] ." ) ".
- " LEFT JOIN " . TABLE_CATEGORIES . " cat ON(cat.categories_id=".$subtype->p."2c.categories_id AND cat.categories_status='1') ".
+ " LEFT JOIN " . TABLE_CATEGORIES . " cat ON(cat.categories_id=".$subtype->p."2c.categories_id ".DataForceStatus(" AND cat.categories_status='1' ")." ) ".
$sql_tmp['where'] .
"";
$this->listing_sort = $sql_tmp['sort'] ;
@@ -358,7 +358,7 @@
}
//! List des categorie enfant
- $categories_query = $DB->query($sql="select c.categories_id from " . TABLE_CATEGORIES . " c where c.parent_id = '" . (int)$current_category_id . "' and c.categories_status='1' ");
+ $categories_query = $DB->query($sql="select c.categories_id from " . TABLE_CATEGORIES . " c where c.parent_id = '" . (int)$current_category_id . "' ".DataForceStatus(" AND c.categories_status='1' ")." ");
$lis="'" . (int)$current_category_id . "', ";
while ($cat= $categories_query->fetchAssoc() )
$lis .="'".$cat['categories_id']."',";
Modified: trunk/catalog/common/classes/datatype_drivers/Data_content.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_content.php 2012-06-24 09:31:40 UTC (rev 4474)
+++ trunk/catalog/common/classes/datatype_drivers/Data_content.php 2012-06-24 09:40:13 UTC (rev 4475)
@@ -76,7 +76,7 @@
" LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " ".$this->p."d ON( ".$this->p."d.content_id = ".$this->p.".content_id AND ".$this->p."d.language_id = '" . (int)$languages_id . "' ) ".
"";
- $this->listing_sql['where'] = " WHERE ".$this->p.".content_status = '1' ";
+ $this->listing_sql['where'] = " WHERE ".DataForceStatus(" ".$this->p.".content_status='1' ")." ";
$this->listing_sql['sort'] = " ".$this->p."d.content_title ";
$this->listing_sql['base_key'] = "content_id ";
$this->listing_sql['col_count'] = " ".$this->p.".content_id ";
@@ -157,7 +157,7 @@
$sql = "select ft.page_id as ID, head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='".$this->DataType."' and ftd.language_id = '" . (int)$language_id. "' Limit 1";
$rsql = $DB->query($sql);
if(!$rsql->__get('numRows')) {
- $sql = "select c.content_id as ID, content_title as tName from " . TABLE_CONTENT . " c LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " cd ON(c.content_id=cd.content_id) where c.content_status = '1' and c.content_id='".(int)$id."' and cd.language_id='".(int)$language_id."' Limit 1" ;
+ $sql = "select c.content_id as ID, content_title as tName from " . TABLE_CONTENT . " c LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " cd ON(c.content_id=cd.content_id) where ".DataForceStatus(" ".$this->p.".content_status='1' ")." and c.content_id='".(int)$id."' and cd.language_id='".(int)$language_id."' Limit 1" ;
$rsql = $DB->query($sql);
}
$result = $rsql->fetchAssoc();
@@ -225,7 +225,7 @@
$this->listing_sql['tables'] .= " LEFT JOIN " . TABLE_CATEGORIES . " cat ON( ".$this->p."2c.categories_id = cat.categories_id and cat.categories_status='1' ) ";
- $this->listing_sql['where'] = " WHERE ".$this->p.".content_status > 0 AND ".$this->p."d.language_id = '" . (int)$languages_id . "' ";
+ $this->listing_sql['where'] = " WHERE ".DataForceStatus(" ".$this->p.".content_status='1' ")." AND ".$this->p."d.language_id = '" . (int)$languages_id . "' ";
if (isset($_GET['categories_id']) && tep_not_null($_GET['categories_id'])) {
if (isset($_GET['inc_subcat']) && ($_GET['inc_subcat'] == '1')) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-06-24 09:31:47
|
Revision: 4474
http://oscss.svn.sourceforge.net/oscss/?rev=4474&view=rev
Author: oscim
Date: 2012-06-24 09:31:40 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
correction coquille extra fileds pour les produits et element de langue manquant
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/products/products_extra/display_edit.edit.gab
trunk/catalog/admin/includes/modules/products/products_extra.php
Added Paths:
-----------
trunk/catalog/admin/includes/languages/fr_FR/modules/products/products_extra.txt
Modified: trunk/catalog/admin/includes/gabarit/products/products_extra/display_edit.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/products/products_extra/display_edit.edit.gab 2012-06-22 14:50:42 UTC (rev 4473)
+++ trunk/catalog/admin/includes/gabarit/products/products_extra/display_edit.edit.gab 2012-06-24 09:31:40 UTC (rev 4474)
@@ -13,7 +13,7 @@
<div class="block_input">
<fieldset class="block_field">
- <legend><?php echo __('category extra fields') ?></legend>
+<!-- <legend><?php //echo __('@products_extra category extra fields') ?></legend> -->
<?php echo products_extra::get_extra_fields(products_extra::$pID,$languages_id) ?>
</fieldset>
</div>
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/products/products_extra.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/products/products_extra.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/products/products_extra.txt 2012-06-24 09:31:40 UTC (rev 4474)
@@ -0,0 +1,13 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 21/06/2012, 23:13
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @sub-package desc_base
+*/
+$lang['@products_extra edit tab']="Champs suppl" ;
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/modules/products/products_extra.php
===================================================================
--- trunk/catalog/admin/includes/modules/products/products_extra.php 2012-06-22 14:50:42 UTC (rev 4473)
+++ trunk/catalog/admin/includes/modules/products/products_extra.php 2012-06-24 09:31:40 UTC (rev 4474)
@@ -142,7 +142,7 @@
global $languages_id;
self::$pID =$product_id;
- $contents[]= array('title'=> __('extra fields'),
+ $contents[]= array('title'=> __('@products_extra edit tab'),
'text'=> tep_get_include_contents('products/'.__CLASS__.'/'.__FUNCTION__.'.edit') );
}
@@ -191,7 +191,8 @@
$value_info = $value_query->fetchAllAssoc();
foreach($value_info as $row) {
- if((int)$row['languages_id'] ==0) $value = $row['value'];
+ if((int)$row['languages_id'] ==0)
+ $value = $row['value'];
else
$value[$row['languages_id']] = $row['value'];
}
@@ -211,7 +212,7 @@
$robj->values_list = array();
$robj->select_values = array();
- $list_value = sqlproductsextrafieldsvalues::fetch(array('epf_id'=>$extra_fields['id'], 'languages_id'=>$languages_id ) );
+ $list_value = sqlproductsextrafieldsvalues::fetch(array('epf_id'=>$extra_fields['id'], 'languages_id'=> (((int) $extra_fields['active_value_language'] == 0)? 0 : $languages_id ) ) );
foreach($list_value as $item){
@@ -222,12 +223,12 @@
}
}
- if( (int) $extra_fields['active_value_language'] == 0) {
+ if( (int) $extra_fields['active_value_language'] == 0 || in_array( $extra_fields['type'], array(2, 3, 7, 4, 6 )) ) {
- $label = ExtraUtility::FormatLabels($robj, false);
- $input = ExtraUtility::FormatFields($robj, false);
+ $label = ExtraUtility::FormatLabels($robj, false);
+ $input = ExtraUtility::FormatFields($robj, false);
- $extra_fields_string .= str_replace( array('%label%', '%input%', '%unit%'), array($label, $input, '') , '<p class="block_input input-one">'.$extra_fields['format'].'</p>' ) ;
+ $extra_fields_string .= str_replace( array('%label%', '%input%', '%unit%'), array($label, $input, '') , '<p class="block_input input-one">'.$extra_fields['format'].'</p>' ) ;
}
else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-06-22 14:50:53
|
Revision: 4473
http://oscss.svn.sourceforge.net/oscss/?rev=4473&view=rev
Author: oscim
Date: 2012-06-22 14:50:42 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------
Correction coquille
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/drivers/sqlproductsextrafields.php
trunk/catalog/admin/includes/classes/oscss_DBIndex.php
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.listing.gab
trunk/catalog/admin/includes/modules/configuration/modprodextra.php
Modified: trunk/catalog/admin/includes/classes/drivers/sqlproductsextrafields.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlproductsextrafields.php 2012-06-18 14:19:22 UTC (rev 4472)
+++ trunk/catalog/admin/includes/classes/drivers/sqlproductsextrafields.php 2012-06-22 14:50:42 UTC (rev 4473)
@@ -283,7 +283,8 @@
if(!$res)
return $res;
else
- return $res->__get('insertId');
+ // no id in table
+ return true;
}
/**
Modified: trunk/catalog/admin/includes/classes/oscss_DBIndex.php
===================================================================
--- trunk/catalog/admin/includes/classes/oscss_DBIndex.php 2012-06-18 14:19:22 UTC (rev 4472)
+++ trunk/catalog/admin/includes/classes/oscss_DBIndex.php 2012-06-22 14:50:42 UTC (rev 4473)
@@ -97,7 +97,6 @@
if($key && !in_array($name, array(DB_TABLE_PREFIX.'customers'))) {
-// var_dump($name);
/*
Traitement des clef et recherche des liaision vers la table language
Si une liaison existe, celle ci considere la table associé comme une table de langue et celle ci sera duspliqué lors de l'ajout d'une nouvelle language
Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab 2012-06-18 14:19:22 UTC (rev 4472)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab 2012-06-22 14:50:42 UTC (rev 4473)
@@ -37,13 +37,13 @@
<li>
<p class="block_input">
<label for="<?php echo 'label_' . $lg['id'] ?>" title="<?php echo __('entry label help') ?>"><?php echo __('entry label') ; ?></label>
- <?php echo tep_draw_input_field('label_' . $lg['id'],'label_' . $lg['id'], modprodextra::$cInfo->lg[$lg['id']]->epf_label, "size=64 maxlength=64") ?>
+ <?php echo tep_draw_input_field('label_' . $lg['id'],'label_' . $lg['id'], @modprodextra::$cInfo->lg[$lg['id']]->epf_label, "size=64 maxlength=64") ?>
</p>
</li>
<li>
<p class="block_input">
<label for="<?php echo 'format_' . $lg['id'] ?>" title="<?php echo __('entry label help') ?>"><?php echo __('entry label format') ; ?></label>
- <?php echo tep_draw_input_field('format_' . $lg['id'],'format_' . $lg['id'], modprodextra::$cInfo->lg[$lg['id']]->epf_format, "size=64 maxlength=64") ?>
+ <?php echo tep_draw_input_field('format_' . $lg['id'],'format_' . $lg['id'], @modprodextra::$cInfo->lg[$lg['id']]->epf_format, "size=64 maxlength=64") ?>
</p>
</li>
</ul>
@@ -87,10 +87,10 @@
<label for="epf_special_mod" title="<?php echo __('ENTRY_SPECIFIQUE_MODULE_HELP') ?>"><?php echo __('ENTRY_SPECIFIQUE_MODULE'). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
<?php echo tep_draw_input_field('epf_special_mod','epf_special_mod', modprodextra::$cInfo->epf_special_mod); ?>
</p>
- <p class="block_input">
- <label><?php echo __('ENTRY_CHAIN') ?></label>
- <?php echo tep_draw_radio_field('chain','chain', '1', (((int)modprodextra::$cInfo->epf_show_parent_chain==1)? true : false) ) . ' ' .__('text yes'). ' ' . tep_draw_radio_field('chain','chain', '0', (((int)modprodextra::$cInfo->epf_show_parent_chain==0)? true : false)) . ' ' .__('text no'); ?>
- </p>
+<!-- <p class="block_input">
+ <label><?php //echo __('ENTRY_CHAIN') ?></label>
+ <?php //echo tep_draw_radio_field('chain','chain', '1', (((int)modprodextra::$cInfo->epf_show_parent_chain==1)? true : false) ) . ' ' .__('text yes'). ' ' . tep_draw_radio_field('chain','chain', '0', (((int)modprodextra::$cInfo->epf_show_parent_chain==0)? true : false)) . ' ' .__('text no'); ?>
+ </p>-->
</fieldset>
Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.listing.gab 2012-06-18 14:19:22 UTC (rev 4472)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.listing.gab 2012-06-22 14:50:42 UTC (rev 4473)
@@ -24,7 +24,7 @@
<div class="box_uniq">
- <?php echo tep_draw_form('filters', modprodextra::FILENAME, FILENAME_CFG_ac.'&action=filters', 'post') ?>
+ <?php echo tep_draw_form('filters', modprodextra::FILENAME, FILENAME_CFG_34.'&action=filters', 'post') ?>
<p class="Ctrtirroir"><?php echo __('@filters view filtres for listing'); ?></p>
<div id="filtre" class="tirroir tabs">
<ul>
@@ -51,7 +51,7 @@
</form>
- <?php echo tep_draw_form('multi',tep_href_link(modprodextra::FILENAME, FILENAME_CFG_ac), 'action=multi', 'post') ?>
+ <?php echo tep_draw_form('multi',tep_href_link(modprodextra::FILENAME, FILENAME_CFG_34), 'action=multi', 'post') ?>
<table class="dataTable">
<thead>
<tr>
Modified: trunk/catalog/admin/includes/modules/configuration/modprodextra.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/modprodextra.php 2012-06-18 14:19:22 UTC (rev 4472)
+++ trunk/catalog/admin/includes/modules/configuration/modprodextra.php 2012-06-22 14:50:42 UTC (rev 4473)
@@ -141,7 +141,7 @@
// if (!isset($_POST['epf_input_type']))
// throw new Exception(__('error entry required') . __('input type required'));
- $value_list =(int)$_POST['epf_input_type'];
+ $value_list =(int)$_POST['epf_input_type'];
$lactive = (!isset($_POST['epf_active_value_language']) || (int)$_POST['epf_active_value_language'] ==0) ? 0 : 1;
}
@@ -266,7 +266,7 @@
if( ! sqlproductsextrafieldslabels::create($label_array) )
$messageStack->add_session(
- __('error for create extra fileds label'),
+ sprintf(__('error for create extra fileds label %s'), (int)$lid ),
'error'
);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-06-18 14:19:33
|
Revision: 4472
http://oscss.svn.sourceforge.net/oscss/?rev=4472&view=rev
Author: oscim
Date: 2012-06-18 14:19:22 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
coquille
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/drivers/sqlfeatured.php
Modified: trunk/catalog/admin/includes/classes/drivers/sqlfeatured.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlfeatured.php 2012-06-18 09:03:10 UTC (rev 4471)
+++ trunk/catalog/admin/includes/classes/drivers/sqlfeatured.php 2012-06-18 14:19:22 UTC (rev 4472)
@@ -67,9 +67,9 @@
);
$res=tep_db_perform(TABLE_FEATURED_DESCRIPTION, $sql_data_array_lg);
}
-
+
if(!$res)
return $res;
else
@@ -116,11 +116,13 @@
$where_lg .= "AND languages_id = '".(int)$lg['id']."' ";
- $sql_data_array_lg = array(
- 'featured_title'=> ((isset($row['title'][$lg['id']])) ? tep_db_prepare_input($row['title'][$lg['id']]) : '' ),
- );
+ if(isset($row['title'][$lg['id']] ) {
+ $sql_data_array_lg = array(
+ 'featured_title'=> ((!empty($row['title'][$lg['id']])) ? tep_db_prepare_input($row['title'][$lg['id']]) : '' ),
+ );
- $res=tep_db_perform(TABLE_FEATURED_DESCRIPTION, $sql_data_array_lg, 'update' , substr($where_lg,3));
+ $res=tep_db_perform(TABLE_FEATURED_DESCRIPTION, $sql_data_array_lg, 'update' , substr($where_lg,3));
+ }
}
return $res;
@@ -178,7 +180,7 @@
$_query = $DB->query("select languages_id , fd.featured_title from " . TABLE_FEATURED_DESCRIPTION . " fd where fd.featured_id = '" . (int)$result['row_id'] . "' ");
- foreach($_query->fetchAllAssoc() as $row)
+ foreach($_query->fetchAllAssoc() as $row)
$result['lg'][$row['languages_id']] = ((!$shortkey)? $row : self::CleanKey($row));
@@ -197,7 +199,7 @@
$_query = $DB->query("select languages_id , fd.featured_title from " . TABLE_FEATURED_DESCRIPTION . " fd where fd.featured_id = '" . (int)$result['row_id'] . "' ");
- foreach($_query->fetchAllAssoc() as $row)
+ foreach($_query->fetchAllAssoc() as $row)
$result['lg'][$row['languages_id']] = ((!$shortkey)? $row : self::CleanKey($row));
@@ -227,8 +229,8 @@
$res = $DB->query("SELECT row_id as id FROM " . TABLE_FEATURED ." WHERE ". substr($where, 3 ).' LIMIT 1' );
$result = $res->fetchAssoc();
-
+
// childs tables
$DB->query("delete from " . TABLE_FEATURED_DATA . " where featured_id = '" . (int)$result['id'] . "'");
$DB->query("delete from " . TABLE_FEATURED_DESCRIPTION . " where featured_id = '" . (int)$result['id'] . "'");
@@ -286,7 +288,7 @@
}
/**
- @brief Function link to for contruct link featured vs datatype
+ @brief Function link to for contruct link featured vs datatype
@note normlised methode used in childs datatype
*/
public static function ListLinkTo($opt){
@@ -305,7 +307,7 @@
array(
'datatype'=> $datatype,
'datatype_id'=> $id,
- ),
+ ),
true
);
@@ -318,7 +320,7 @@
}
/**
- @brief Function link to for contruct link featued vs datatype
+ @brief Function link to for contruct link featued vs datatype
@note normlised methode used in childs datatype
*/
public static function AddLinkTo($opt){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-06-18 09:03:21
|
Revision: 4471
http://oscss.svn.sourceforge.net/oscss/?rev=4471&view=rev
Author: oscim
Date: 2012-06-18 09:03:10 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
coquille
Modified Paths:
--------------
trunk/catalog/admin/includes/modules/pages/products.php
Modified: trunk/catalog/admin/includes/modules/pages/products.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/products.php 2012-06-14 06:17:13 UTC (rev 4470)
+++ trunk/catalog/admin/includes/modules/pages/products.php 2012-06-18 09:03:10 UTC (rev 4471)
@@ -24,11 +24,11 @@
{
/**
- @def FILENAME current page
+ @def FILENAME current page
*/
const FILENAME = FILENAME_PRODUCTS;
/**
- @var int current id
+ @var int current id
*/
public static $Id;
@@ -173,45 +173,45 @@
Just for Edit listing
*/
self::$allfields = array(
- 'p.products_id' => array(
- 'sort'=>true,
- 'alias'=>'id',
+ 'p.products_id' => array(
+ 'sort'=>true,
+ 'alias'=>'id',
'text'=>__('products table heading id'),
- 'width'=>'2%',
+ 'width'=>'2%',
'class'=>'tcenter',
'default'=>true,
- ),
- 'p.products_image' => array(
- 'sort'=>true,
- 'alias'=>'image',
+ ),
+ 'p.products_image' => array(
+ 'sort'=>true,
+ 'alias'=>'image',
'text'=>__('products table heading image'),
- ),
- 'pd.products_name' => array(
- 'sort'=>true,
- 'alias'=>'title',
+ ),
+ 'pd.products_name' => array(
+ 'sort'=>true,
+ 'alias'=>'title',
'text'=>__('products table heading name'),
'default'=>true,
- 'width'=>'18%',
- ),
- 'p.products_model' => array(
- 'sort'=>true,
- 'alias'=>'model',
+ 'width'=>'18%',
+ ),
+ 'p.products_model' => array(
+ 'sort'=>true,
+ 'alias'=>'model',
'text'=>__('products table heading modele'),
- ),
+ ),
);
/* DEB Datatype RootListing categorie */
if( DataTypes::is_active('categorie')) {
- self::$allfields['cat.categories_id']= array(
- 'sort'=>true,
- 'alias'=>'categories_id',
+ self::$allfields['cat.categories_id']= array(
+ 'sort'=>true,
+ 'alias'=>'categories_id',
'text'=>__('products table heading categories id'),
- 'width'=>'6%',
+ 'width'=>'6%',
);
- self::$allfields['catd.categories_name']= array(
- 'sort'=>true,
- 'alias'=>'cat_title',
+ self::$allfields['catd.categories_name']= array(
+ 'sort'=>true,
+ 'alias'=>'cat_title',
'text'=>__('products table heading categories'),
- 'width'=>'12%',
+ 'width'=>'12%',
'default'=>true,
);
}
@@ -219,102 +219,102 @@
/* DEB Datatype RootListing manufacturer */
if( DataTypes::is_active('manufacturer')) {
- self::$allfields['p.manufacturers_id']= array(
- 'sort'=>true,
- 'alias'=>'manufacturers_id',
+ self::$allfields['p.manufacturers_id']= array(
+ 'sort'=>true,
+ 'alias'=>'manufacturers_id',
'text'=>__('products table heading manufacturers id'),
- );
- self::$allfields['m.manufacturers_name']= array(
- 'sort'=>true,
- 'alias'=>'manuf_title',
+ );
+ self::$allfields['m.manufacturers_name']= array(
+ 'sort'=>true,
+ 'alias'=>'manuf_title',
'text'=>__('products table heading manufacturers'),
- 'width'=>'12%',
- );
+ 'width'=>'12%',
+ );
}
/* END Datatype RootListing manufacturer */
/* DEB Datatype RootListing featured */
if( DataTypes::is_active('featured')) {
- self::$allfields['fada.featured_id']= array(
- 'sort'=>true,
- 'alias'=>'featured_id',
+ self::$allfields['fada.featured_id']= array(
+ 'sort'=>true,
+ 'alias'=>'featured_id',
'text'=>__('products table heading featured id'),
- );
- self::$allfields['fad.featured_title']= array(
- 'sort'=>true,
- 'alias'=>'featured',
+ );
+ self::$allfields['fad.featured_title']= array(
+ 'sort'=>true,
+ 'alias'=>'featured',
'text'=>__('products table heading featured'),
- 'width'=>'12%',
- );
+ 'width'=>'12%',
+ );
}
/* END Datatype RootListing featured */
- self::$allfields['p.products_weight']= array(
- 'sort'=>true,
- 'alias'=>'weight',
+ self::$allfields['p.products_weight']= array(
+ 'sort'=>true,
+ 'alias'=>'weight',
'text'=>__('products table heading weight'),
'default'=>true,
- );
+ );
- self::$allfields['p.products_price']= array(
- 'sort'=>true,
- 'alias'=>'price',
+ self::$allfields['p.products_price']= array(
+ 'sort'=>true,
+ 'alias'=>'price',
'text'=>__('products table heading price'),
- );
+ );
/*
- self::$allfields['p.products_price']= array(
- 'sort'=>false,
- 'alias'=>'price_ttx',
+ self::$allfields['p.products_price']= array(
+ 'sort'=>false,
+ 'alias'=>'price_ttx',
'text'=>__('products table heading price taxe'),
); */
- self::$allfields['p.products_tax_class_id']= array(
- 'sort'=>true,
- 'alias'=>'taxe_id',
+ self::$allfields['p.products_tax_class_id']= array(
+ 'sort'=>true,
+ 'alias'=>'taxe_id',
'text'=>__('products table heading taxe id'),
);
if(_cst_bool('STOCK_CHECK')) {
- self::$allfields['p.products_quantity']= array(
- 'sort'=>true,
- 'alias'=>'quantity',
+ self::$allfields['p.products_quantity']= array(
+ 'sort'=>true,
+ 'alias'=>'quantity',
'text'=>__('products table heading quantity'),
- );
- self::$allfields['p.track_stock']= array(
- 'sort'=>true,
- 'alias'=>'track_stock',
+ );
+ self::$allfields['p.track_stock']= array(
+ 'sort'=>true,
+ 'alias'=>'track_stock',
'text'=>__('products table heading track_stock'),
- );
+ );
}
- self::$allfields['p.products_date_added']= array(
- 'sort'=>true,
- 'alias'=>'added',
+ self::$allfields['p.products_date_added']= array(
+ 'sort'=>true,
+ 'alias'=>'added',
'text'=>__('products table heading date_added'),
- );
- self::$allfields['p.products_last_modified']= array(
- 'sort'=>true,
- 'alias'=>'modified',
+ );
+ self::$allfields['p.products_last_modified']= array(
+ 'sort'=>true,
+ 'alias'=>'modified',
'text'=>__('products table heading last modified'),
);
- self::$allfields['p.products_date_available']= array(
- 'sort'=>true,
- 'alias'=>'available',
+ self::$allfields['p.products_date_available']= array(
+ 'sort'=>true,
+ 'alias'=>'available',
'text'=>__('products table heading available'),
- );
- self::$allfields['p.products_status']= array(
- 'sort'=>true,
- 'alias'=>'status',
+ );
+ self::$allfields['p.products_status']= array(
+ 'sort'=>true,
+ 'alias'=>'status',
'text'=>__('products table heading status'),
- 'width'=>'5%',
+ 'width'=>'5%',
'default'=>true,
- );
-
+ );
+
/**
- @remarks Construct all list , fields , th/td
+ @remarks Construct all list , fields , th/td
*/
self::$InitInfo['theader']['listing']=array(
array('width'=>'2%', 'class'=>'tcenter', 'txt'=>' ' ),
@@ -330,7 +330,7 @@
// min fields and not view directly colonne fields
$listfield = ' cat.categories_id, ';
- // put in
+ // put in
if(isset($_SESSION['filters'][__CLASS__]['allfields']))
$_SESSION['filters']['allfields'] = $_SESSION['filters'] [__CLASS__]['allfields'];
else
@@ -384,7 +384,7 @@
self::$InitInfo['allfields']['listing'] = self::$allfields ;
/**
- @remarks filter based on language
+ @remarks filter based on language
*/
if(isset($_SESSION['filters'][__CLASS__]['language_id']))
$new_languages_id = $_SESSION['filters'] [__CLASS__]['language_id'];
@@ -393,7 +393,7 @@
/**
- @remarks filter based on categorie
+ @remarks filter based on categorie
*/
if( DataTypes::is_active('categorie')) {
if(isset($_SESSION['filters'][__CLASS__]['categorie']))
@@ -422,7 +422,7 @@
}
/**
- @remarks filter based on featured
+ @remarks filter based on featured
*/
if( DataTypes::is_active('featured')) {
if(isset($_SESSION['filters'][__CLASS__]['featured']))
@@ -441,7 +441,7 @@
/**
- @remarks filter based on featured
+ @remarks filter based on featured
*/
if( DataTypes::is_active('manufacturer')) {
if(isset($_SESSION['filters'][__CLASS__]['manufacturer']))
@@ -460,7 +460,7 @@
/**
- @remarks filter based on subtype products
+ @remarks filter based on subtype products
*/
if(isset($_SESSION['filters'][__CLASS__]['subtype']))
$_SESSION['filters']['subtype'] = $_SESSION['filters'] [__CLASS__]['subtype'];
@@ -472,7 +472,7 @@
foreach($_SESSION['filters']['subtype'] as $key=>$row)
$list_type .=$key.',';
else{
- $allcats = categorieUtility::get_category_tree(array('datatype'=>MGabCont::CallSt('GetClassDatatype'),'language_id'=>$new_languages_id , 'exclude'=>array('0')));
+ $allcats = tep_get_status_array('product');
foreach($allcats as $row)
$list_type .=$row['id'].',';
}
@@ -489,7 +489,7 @@
$array = array();
foreach($_SESSION['filters']['expected'] as $key=>$row)
- $array[] = $key;
+ $array[] = $key;
if((!in_array('publied', $array) && in_array('nopublied', $array) )|| isset($_GET['expected']) ){
$_SESSION['filters']['expected'] =array();
@@ -498,9 +498,9 @@
}
elseif(in_array('publied', $array) && !in_array('nopublied', $array) )
self::$InitInfo['adjust']['sWhere'] .=" AND products_date_available IS NULL ";
-
+
/**
@remarks filter based on status
*/
@@ -511,7 +511,7 @@
$array = array();
foreach($_SESSION['filters']['status'] as $key=>$row)
- $array[] = $key;
+ $array[] = $key;
if(in_array('publied', $array) && !in_array('nopublied', $array) )
self::$InitInfo['adjust']['sWhere'] .=" AND products_status >= 0";
@@ -520,7 +520,7 @@
/**
- @remarks Put detail for listing methode
+ @remarks Put detail for listing methode
*/
self::$InitInfo['adjust']['languages_id'] = $new_languages_id;
self::$InitInfo['adjust']['listfields'] = substr($listfield, 0,-1);
@@ -629,7 +629,7 @@
/**
- @remarks specific save in session value filters
+ @remarks specific save in session value filters
*/
case 'filters':
$_SESSION['filters'] =array();
@@ -685,7 +685,7 @@
/**
- @remarks specific Ajax call
+ @remarks specific Ajax call
*/
case 'setflag':
if ( ($_GET['flag'] == '0') || ($_GET['flag'] == '1') ) {
@@ -700,7 +700,7 @@
/**
- @remarks specific multi action
+ @remarks specific multi action
*/
case 'multi':
tep_redirect(tep_href_link(self::FILENAME) );
@@ -789,7 +789,7 @@
$products_id = tep_db_prepare_input($_POST['products_id']);
$categories_id = tep_db_prepare_input($_POST['categories_id']);
- $type = 'duplicate';
+ $type = 'duplicate';
if( ($pid = sqlproduct::copyto(array('id'=>$products_id ,'catid'=>$categories_id ,'type'=>$type))) && $pid > 0 ){
$products_id = $pid;
@@ -811,7 +811,7 @@
$res = tep_get_status_array('product',0,'status_name');
- // if one type, create auto and redirect
+ // if one type, create auto and redirect
if(count($res)==1)
tep_redirect(tep_href_link(self::FILENAME, 'action=insert&pID='));
break;
@@ -913,7 +913,7 @@
else
$res=sqlproduct::Specimen();
- self::$Info= new objectInfo($res);
+ self::$Info= new objectInfo($res);
//! descative gestion de stock, si stock composé avec attributes
$attributes_stock_query = $DB->query("SELECT products_stock_quantity FROM " . TABLE_PRODUCTS_STOCK . " WHERE products_id = '" . (int)self::$Id . "'");
@@ -953,7 +953,7 @@
}
- $query_raw = "select ".$adjust->listfields.", p.products_id as id FROM " . TABLE_PRODUCTS . " p ".
+ $query_raw = "select ".$adjust->listfields.", p.products_id as id FROM " . TABLE_PRODUCTS . " p ".
" LEFT JOIN " . TABLE_PRODUCTS_DESCRIPTION . " pd ON(p.products_id = pd.products_id and pd.language_id = '" . (int)$adjust->languages_id . "') ";
if( DataTypes::is_active('categorie')){
@@ -962,7 +962,7 @@
" LEFT JOIN " . TABLE_CATEGORIES_DESCRIPTION . " catd ON( catd.categories_id =p2p.categories_id AND catd.language_id='".(int)$adjust->languages_id."' ) ";
}
- if( DataTypes::is_active('manufacturer'))
+ if( DataTypes::is_active('manufacturer'))
$query_raw .= " LEFT JOIN " . TABLE_MANUFACTURERS . " m ON( m.manufacturers_id=p.manufacturers_id ) ";
@@ -1198,7 +1198,7 @@
$ord =array();
if( ! DataTypes::is_active('categorie')) {
- /// complete cats list
+ /// complete cats list
$objres=$DB->query("SELECT categories_name FROM " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd , " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c WHERE c.categories_id=cd.categories_id AND cd.language_id = '" . (int)$languages_id . "' AND c.categories_id=p2c.categories_id and products_id='".$item['id']."' AND c.categories_id <> '".$item['categories_id']."' ");
$rescat=$objres->fetchAllAssoc();
@@ -1209,13 +1209,13 @@
}
if( ! DataTypes::is_active('featured')) {
- /// complete cats list
+ /// complete cats list
// $objres=$DB->query("SELECT categories_name FROM " . TABLE_FEATURED . " f, " . TABLE_CATEGORIES_DESCRIPTION . " cd , " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c WHERE c.categories_id=cd.categories_id AND cd.language_id = '" . (int)$languages_id . "' AND c.categories_id=p2c.categories_id and products_id='".$item['id']."' AND c.categories_id <> '".$item['categories_id']."' ");
// $rescat=$objres->fetchAllAssoc();
-//
+//
// foreach($rescat as $cat)
// $item['cat_title'] .=','.$cat['categories_name'];
-//
+//
// if(strlen($item['cat_title'])>25)$item['cat_title']= substr($item['cat_title'],0 ,20).'...';
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
