oscss-commit — SVN Commit Notifications

[Oscss-commit] SF.net SVN: oscss:[4679] branches/2.1.1/catalog/admin/includes/exts/package /packageRepository.php

[<os...@us...>]

Revision: 4679
          http://oscss.svn.sourceforge.net/oscss/?rev=4679&view=rev
Author:   oscim
Date:     2012-12-30 15:47:14 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
FS#1096

Modified Paths:
--------------
    branches/2.1.1/catalog/admin/includes/exts/package/packageRepository.php

Modified: branches/2.1.1/catalog/admin/includes/exts/package/packageRepository.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/exts/package/packageRepository.php	2012-12-29 16:32:58 UTC (rev 4678)
+++ branches/2.1.1/catalog/admin/includes/exts/package/packageRepository.php	2012-12-30 15:47:14 UTC (rev 4679)
@@ -464,10 +464,10 @@
 		}
 
 		/// put local environement
-// 		$src .='&language='.$_SESSION['language_iso'];
-			/// put version
-			preg_match('#([0-9\.]*)#i', get_info_core( DIR_FS_ROOT_DOCS.'oscss.version.xml','version'), $match );
-			$src .='&core='.$match[1] ;
+		$src .='&language='.$_SESSION['language_iso'];
+		/// put version
+		preg_match('#([0-9\.]*)#i', get_info_core( DIR_FS_ROOT_DOCS.'oscss.version.xml','version'), $match );
+		$src .='&core='.$match[1] ;
 
 		return $src;
   }

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

[Oscss-commit] SF.net SVN: oscss:[4678] branches/2.1.1/catalog/admin/includes

[<os...@us...>]

Revision: 4678
          http://oscss.svn.sourceforge.net/oscss/?rev=4678&view=rev
Author:   oscim
Date:     2012-12-29 16:32:58 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
deport ds son sous dossier des gabarit de ggsitmap, ajustement du code 
correction coquille lors generation sitemap featured
correction erreur de traduction
ajout d'un nl2br sur la sortie de __() pour imposer la prise en charge des saut de ligne
correction sur appel function tep_action_check()
ajustement html et detail mise en forme dans la configration des commandes

Modified Paths:
--------------
    branches/2.1.1/catalog/admin/includes/functions/general.php
    branches/2.1.1/catalog/admin/includes/gabarit/adminGroup/display_view.listing.gab
    branches/2.1.1/catalog/admin/includes/gabarit/configuration/modorder.listing.gab
    branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeproduct.txt
    branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/modorder.txt
    branches/2.1.1/catalog/admin/includes/modules/pages/ggsitemap.php

Added Paths:
-----------
    branches/2.1.1/catalog/admin/includes/gabarit/ggsitemap/display_view.construct.gab
    branches/2.1.1/catalog/admin/includes/gabarit/ggsitemap/display_view.page.gab

Modified: branches/2.1.1/catalog/admin/includes/functions/general.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/functions/general.php	2012-12-29 16:26:38 UTC (rev 4677)
+++ branches/2.1.1/catalog/admin/includes/functions/general.php	2012-12-29 16:32:58 UTC (rev 4678)
@@ -202,7 +202,7 @@
   global $lang;
   if(!empty($ext)) $lang[$ext][$str]=$str;
   if($mode)print_r($lang);
-  return isset($lang[$str]) ? $lang[$str] : $str;
+  return nl2br(isset($lang[$str]) ? $lang[$str] : $str);
 }
 
 /**

Modified: branches/2.1.1/catalog/admin/includes/gabarit/adminGroup/display_view.listing.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/adminGroup/display_view.listing.gab	2012-12-29 16:26:38 UTC (rev 4677)
+++ branches/2.1.1/catalog/admin/includes/gabarit/adminGroup/display_view.listing.gab	2012-12-29 16:32:58 UTC (rev 4678)
@@ -14,7 +14,7 @@
 
 
 <div class="button_nav">
-  <?php if(tep_action_check('new')) echo ' <a class="button" href="' . tep_href_link(adminGroup::FILENAME, 'action=new') . '">' .tep_image(DIR_WS_ICONS . 'icon_add_new.png',IMAGE_NEW_GROUP).  IMAGE_NEW_GROUP . '</a>'; ?>
+  <?php if(tep_action_check('new' , adminGroup::FILENAME)) echo ' <a class="button" href="' . tep_href_link(adminGroup::FILENAME, 'action=new') . '">' .tep_image(DIR_WS_ICONS . 'icon_add_new.png',IMAGE_NEW_GROUP).  IMAGE_NEW_GROUP . '</a>'; ?>
 </div>
 
 <div class="box_uniq">

Modified: branches/2.1.1/catalog/admin/includes/gabarit/configuration/modorder.listing.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/configuration/modorder.listing.gab	2012-12-29 16:26:38 UTC (rev 4677)
+++ branches/2.1.1/catalog/admin/includes/gabarit/configuration/modorder.listing.gab	2012-12-29 16:32:58 UTC (rev 4678)
@@ -29,16 +29,16 @@
 <!--         <li><a href="#tabs-3"><?php //echo __('modorder tab orders'); ?></a></li> -->
       </ul>
 
-    <div id="tabs-1" class="tabPage">
+    <div id="tabs-1" class=" tabPage">
 
 <?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, FILENAME_CFG_129.'gID=' . $_GET['gID'] . '&amp;action=save_mutli') ?>
-
+		<div class="block_form">
 			<fieldset class="block_field">
 
 				<legend><?php echo __('modorder legend status orders'). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></legend>
 
 				<?php /** */  $row = modorder::$list['DEFAULT_ORDERS_STATUS_ID'];  ?>
-					<h4 title="<?php echo '('.$row->key.' -  ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h4>
+<!-- 					<h4 title="<?php echo '('.$row->key.' -  ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h4> -->
 					<div class="block_input">
 			<label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
 			<p>
@@ -47,7 +47,7 @@
 					</div>
 
 				<?php /** */  $row = modorder::$list['DEFAULT_ORDERS_STATUS_PAYED'];  ?>
-					<h4 title="<?php echo '('.$row->key.' -  ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h4>
+<!-- 					<h4 title="<?php echo '('.$row->key.' -  ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h4> -->
 					<div class="block_input">
 			<label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
 			<p>
@@ -57,7 +57,7 @@
 
 
 				<?php /** */  $row = modorder::$list['DEFAULT_ORDERS_STATUS_COMPLETED'];  ?>
-					<h4 title="<?php echo '('.$row->key.' -  ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h4>
+<!-- 					<h4 title="<?php echo '('.$row->key.' -  ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h4> -->
 					<div class="block_input">
 			<label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
 			<p>
@@ -66,13 +66,32 @@
 					</div>
 
 				<?php /** */  $row = modorder::$list['DEFAULT_ORDERS_STATUS_ANNULATE'];  ?>
-					<h4 title="<?php echo '('.$row->key.' -  ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h4>
+<!-- 					<h4 title="<?php echo '('.$row->key.' -  ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h4> -->
 					<div class="block_input">
-			<label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
-			<p>
-				<?php echo $row->value_field ; ?>
-			</p>
+						<label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
+						<p>
+							<?php echo $row->value_field ; ?>
+						</p>
 					</div>
+
+				<?php /** */  $row = modorder::$list['DEFAULT_ORDERS_STATUS_SHIPPING'];  ?>
+<!-- 					<h4 title="<?php echo '('.$row->key.' -  ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h4> -->
+					<div class="block_input">
+						<label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
+						<p>
+							<?php echo $row->value_field ; ?>
+						</p>
+					</div>
+
+				<?php /** */  $row = modorder::$list['DEFAULT_ORDERS_STATUS_DELIVERY'];  ?>
+<!-- 					<h4 title="<?php echo '('.$row->key.' -  ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h4> -->
+					<div class="block_input">
+						<label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
+						<p>
+							<?php echo $row->value_field ; ?>
+						</p>
+					</div>
+
 				</fieldset>
 
 
@@ -82,10 +101,10 @@
 				<legend title="<?php echo '('.$row->key.' -  ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></legend>
 
 					<div class="block_input">
-			<label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
-			<p>
-				<?php echo $row->value_field ; ?>
-			</p>
+						<label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
+						<p>
+							<?php echo $row->value_field ; ?>
+						</p>
 					</div>
 				</p>
 
@@ -108,7 +127,7 @@
 
 					<ul class="block_input">
 			<?php foreach(modorder::$list as $row)
-						if(!in_array($row->key,array('DEFAULT_ORDERS_STATUS_PAYED','DEFAULT_ORDERS_STATUS_ID', 'DEFAULT_ORDERS_STATUS_ANNULATE', 'DEFAULT_ORDERS_STATUS_COMPLETED', 'ORDERS_NUMBER_PREFIX', 'USE_LOCAL_GENERAT_ORDER_REF')) ) { ?>
+						if(!in_array($row->key,array('DEFAULT_ORDERS_STATUS_PAYED','DEFAULT_ORDERS_STATUS_ID', 'DEFAULT_ORDERS_STATUS_ANNULATE', 'DEFAULT_ORDERS_STATUS_COMPLETED', 'ORDERS_NUMBER_PREFIX', 'USE_LOCAL_GENERAT_ORDER_REF','DEFAULT_ORDERS_STATUS_DELIVERY', 'DEFAULT_ORDERS_STATUS_SHIPPING')) ) { ?>
 				<li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' -  ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
 
 					<div class="block_input tirroir">
@@ -124,8 +143,9 @@
 				<fieldset class="block_field button_nav">
           <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG_129.'gID=' . $_GET['gID'] )) ; ?>
 				</fieldset>
-</form>
 			</div>
+			</form>
+			</div>
 
 			<div id="tabs-2" class="tabPage">
 
@@ -187,7 +207,7 @@
 			</div>
 <!--			<div id="tabs-3" class="tabPage">
 			</div>-->
-<br class="clear" />
+	<br class="clear" />
 
 	</div>
 

Copied: branches/2.1.1/catalog/admin/includes/gabarit/ggsitemap/display_view.construct.gab (from rev 4670, branches/2.1.1/catalog/admin/includes/gabarit/ggsitemap.construct.gab)
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/ggsitemap/display_view.construct.gab	                        (rev 0)
+++ branches/2.1.1/catalog/admin/includes/gabarit/ggsitemap/display_view.construct.gab	2012-12-29 16:32:58 UTC (rev 4678)
@@ -0,0 +1,17 @@
+<?php
+/**
+  @licence GPL 2005-2010  The osCSS developers - osCSS Open Source E-commerce
+  @package osCSS-2 <www http://www.oscss.org>
+  @version 2.0.9
+  @date  22/06/10, 18:12
+  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+  @encode UTF-8
+*/
+?>
+<h3><?php echo __('heading title'); ?></h3>
+
+<div class="box_left">
+  <?php foreach(ggsitemap::$list as $item): ?>
+    <p><?php echo $item ?></p>
+  <?php endforeach; ?>
+</div>
\ No newline at end of file

Copied: branches/2.1.1/catalog/admin/includes/gabarit/ggsitemap/display_view.page.gab (from rev 4670, branches/2.1.1/catalog/admin/includes/gabarit/ggsitemap.page.gab)
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/ggsitemap/display_view.page.gab	                        (rev 0)
+++ branches/2.1.1/catalog/admin/includes/gabarit/ggsitemap/display_view.page.gab	2012-12-29 16:32:58 UTC (rev 4678)
@@ -0,0 +1,41 @@
+<?php
+/**
+  @licence GPL 2005-2010  The osCSS developers - osCSS Open Source E-commerce
+  @package osCSS-2 <www http://www.oscss.org>
+  @version 2.1.0
+  @date  14/11/10, 14:19
+  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+  @encode UTF-8
+*/
+?>
+<h3><?php echo __('heading title'); ?></h3>
+
+<div class="box_left">
+  <p><strong><?php echo __('overview title google sitemaps'); ?></strong></p>
+
+  <p><?php echo __('overview google sitemaps'); ?></p>
+
+  <p><strong><?php echo __('instructions title google sitemaps'); ?></strong></p>
+
+  <p>
+    <span style="color:#FF0000"><?php echo __('instructions step1 google sitemaps'); ?></span>
+    <?php echo __('instructions click google sitemaps'); ?>
+  </p>
+  <a class="button fright splitPageLink fancytext iframe" href="<?php echo tep_href_link(ggsitemap::FILENAME, 'action=construct&amp;forceview','NONSSL');?>"><strong><?php echo __('exec google sitemaps'); ?></strong></a>
+  <br /><br /><br /><br /><br />
+
+  <p><?php echo __('instructions note google sitemaps'); ?></p>
+  <br />
+  <p>
+    <span style="color:#FF0000"><?php echo __('instructions step2 google sitemaps'); ?></span>
+    <?php echo __('instructions end2 google sitemaps'); ?>
+  </p>
+
+  <a class="button fright splitPageLink" href="javascript:(void 0)"  onclick="window.open('<?php echo ggsitemap::GenerateSubmitURL();?>','google','resizable=1,statusbar=5,width=400,height=200,top=0,left=50,scrollbars=yes')"><strong><?php echo __('exec google sitemaps2'); ?></strong></a>
+</div>
+
+<div class="box_right">
+    <h4><?php echo __('whatis title google sitemaps'); ?></h4>
+    <p><?php echo __('whatis text google sitemaps'); ?></p>
+    <p><?php echo __('whatis register google sitemaps'); ?><strong><a href="https://www.google.com/accounts/ServiceLogin" class="splitPageLink"><?php echo __('exec google sitemaps'); ?></a></strong>.</p>
+</div>
\ No newline at end of file

Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeproduct.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeproduct.txt	2012-12-29 16:26:38 UTC (rev 4677)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeproduct.txt	2012-12-29 16:32:58 UTC (rev 4678)
@@ -18,14 +18,14 @@
 /* tab 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['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 modifications peuvent impacter profondement le fonctionnement de vos page produit. \n Ne manipuler ces options que si vous savez ce que vous faites !!! \n\n Liste des options disponibles:\n CLASS_MODELE,\n CLASS_SORTORDER,\n CLASS_PRICE,\n CLASS_STOCK,\n CLASS_WEIGHT,\n CLASS_IMAGE,\n CLASS_DATE_AVAIBLE\n \n Pour manipuler les types de produits disponible, utiliser la section 'Gestion status' " ;
 
 	$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 section edit active']="Section active" ;
+	$lang['datatypeproduct tableheading section edit active']="Section inactive" ;
 
 	/* tab physqiue */
 	$lang['datatypeproduct tab physique']="Physique" ;

Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/modorder.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/modorder.txt	2012-12-29 16:26:38 UTC (rev 4677)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/modorder.txt	2012-12-29 16:32:58 UTC (rev 4678)
@@ -45,18 +45,18 @@
 $lang['DEFAULT_ORDERS_STATUS_ID_S']="Commande Payée" ;
 $lang['DEFAULT_ORDERS_STATUS_ID_L']="definir le statut d'une commande payés." ;
 $lang['DEFAULT_ORDERS_STATUS_ID_S']="État par défaut pour une nouvelle commande" ;
-$lang['DEFAULT_ORDERS_STATUS_ID_L']="Quand une nouvelle commande est créée, ce statut de commande lui sera assigné." ;
+$lang['DEFAULT_ORDERS_STATUS_ID_L']="Quand une nouvelle commande est creée, ce statut de commande lui sera assignée." ;
 $lang['DEFAULT_ORDERS_STATUS_COMPLETED_S']="Commande Cloturé" ;
-$lang['DEFAULT_ORDERS_STATUS_COMPLETED_L']="definir le statut final d'une commande livre" ;
+$lang['DEFAULT_ORDERS_STATUS_COMPLETED_L']="definir le statut final d'une commande Cloturé - le processus de commande/livraison et terminé - aucune modification ne sera plus possible" ;
 $lang['DEFAULT_ORDERS_STATUS_PAYED_S']="Commande payés" ;
-$lang['DEFAULT_ORDERS_STATUS_PAYED_L']="definir le statut final d'une commande payés. Lors d'une mise à jour dans un status payés, construit la numerotation de facture est effecctué, et celle ci est creer" ;
+$lang['DEFAULT_ORDERS_STATUS_PAYED_L']="definir le statut final d'une commande payés. Lors d'une mise à jour dans un status payés, cette action construit la numérotation de facture (autonome de la numérotation des commandes) est effectué." ;
 $lang['DEFAULT_ORDERS_STATUS_ID_S']="Commande annulée" ;
-$lang['DEFAULT_ORDERS_STATUS_ID_L']="definir le statut d'une commande annule." ;
+$lang['DEFAULT_ORDERS_STATUS_ID_L']="definir le statut d'une commande annulé." ;
 
 $lang['DEFAULT_ORDERS_STATUS_SHIPPING_S']="Commande Expedié" ;
-$lang['DEFAULT_ORDERS_STATUS_SHIPPING_L']="definir le statut d'une commande Expedié." ;
+$lang['DEFAULT_ORDERS_STATUS_SHIPPING_L']="(uniquement les commandes contenant des produits 'physique') definir le statut d'une commande Expedié." ;
 $lang['DEFAULT_ORDERS_STATUS_DELIVERY_S']="Commande Livré" ;
-$lang['DEFAULT_ORDERS_STATUS_DELIVERY_L']="definir le statut d'une commande Livré." ;
+$lang['DEFAULT_ORDERS_STATUS_DELIVERY_L']="(uniquement les commandes contenant des produits 'physique') definir le statut d'une commande Livré." ;
 
 $lang['ORDERS_NUMBER_PREFIX_S']="Préfixe numéro commande" ;
 $lang['ORDERS_NUMBER_PREFIX_L']="Indiquer le préfixe des numéros de commande le chiffre precise le nombre de chiffre du numéro; ex: 'ym-5'(1005-00001); Laissez vide si vous ne voulez pas de préfixe." ;

Modified: branches/2.1.1/catalog/admin/includes/modules/pages/ggsitemap.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/ggsitemap.php	2012-12-29 16:26:38 UTC (rev 4677)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/ggsitemap.php	2012-12-29 16:32:58 UTC (rev 4678)
@@ -1,10 +1,10 @@
 <?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
 /**
-  @licence GPL 2005-2010  The osCSS developers - osCSS Open Source E-commerce
+  @licence GPL 2005-2013  The osCSS developers - osCSS Open Source E-commerce
   @portion code Copyright (c) 2002 osCommerce
   @package osCSS-2 <www http://www.oscss.org>
-  @version 2.1.0
-  @date  02/10/10, 10:32
+  @version 2.1.1
+  @date  29/12/2012, 10:32
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
   @class ggsitemap
@@ -45,9 +45,10 @@
   public function display_view(){
     if(self::$action=='construct'){
       self::cstr_sitemap();
-      return tep_get_include_contents(self::$code.'.construct');
+      return tep_get_include_contents(self::$code.'/'.__FUNCTION__.'.construct');
     }
-    else return tep_get_include_contents(self::$code.'.page');
+    else 
+			return tep_get_include_contents(self::$code.'/'.__FUNCTION__.'.page');
   }
 
 
@@ -82,7 +83,7 @@
 				}
 				else {
 					$submit = false;
-					self::$list[]= __('google sitemaps '.$type.' error');
+					self::$list[]= '<span class="error">'.__('google sitemaps '.$type.' error').'</span>';
 				}
 			}
 		}
@@ -227,31 +228,31 @@
     if ($type == 'index') $compress = 'false';
     switch($compress){
       case 'true':
-	$filename .= '.xml.gz';
-	if ($gz = gzopen($filename,'wb9')){
-	  gzwrite($gz, $data);
-	  gzclose($gz);
-	  $this->debug['SAVE_FILE_COMPRESS'][] = array('file' => $filename, 'status' => 'success', 'file_exists' => 'true');
-	  return true;
-	} else {
-	  $file_check = file_exists($filename) ? 'true' : 'false';
-	  $this->debug['SAVE_FILE_COMPRESS'][] = array('file' => $filename, 'status' => 'failure', 'file_exists' => $file_check);
-	  return false;
-	}
-	break;
+				$filename .= '.xml.gz';
+				if ($gz = gzopen($filename,'wb9')){
+					gzwrite($gz, $data);
+					gzclose($gz);
+					$this->debug['SAVE_FILE_COMPRESS'][] = array('file' => $filename, 'status' => 'success', 'file_exists' => 'true');
+					return true;
+				} else {
+					$file_check = file_exists($filename) ? 'true' : 'false';
+					$this->debug['SAVE_FILE_COMPRESS'][] = array('file' => $filename, 'status' => 'failure', 'file_exists' => $file_check);
+					return false;
+				}
+			break;
       default:
-	$filename .= '.xml';
-	if ($fp = fopen($filename, 'w+')){
-	  fwrite($fp, $data);
-	  fclose($fp);
-	  $this->debug['SAVE_FILE_XML'][] = array('file' => $filename, 'status' => 'success', 'file_exists' => 'true');
-	  return true;
-	} else {
-	  $file_check = file_exists($filename) ? 'true' : 'false';
-	  $this->debug['SAVE_FILE_XML'][] = array('file' => $filename, 'status' => 'failure', 'file_exists' => $file_check);
-	  return false;
-	}
-	break;
+				$filename .= '.xml';
+				if ($fp = fopen($filename, 'w+')){
+					fwrite($fp, $data);
+					fclose($fp);
+					$this->debug['SAVE_FILE_XML'][] = array('file' => $filename, 'status' => 'success', 'file_exists' => 'true');
+					return true;
+				} else {
+					$file_check = file_exists($filename) ? 'true' : 'false';
+					$this->debug['SAVE_FILE_XML'][] = array('file' => $filename, 'status' => 'failure', 'file_exists' => $file_check);
+					return false;
+				}
+			break;
     } # end switch
   }
 
@@ -398,7 +399,7 @@
       } # end while
 
       $products_query->__destruct();
-      if ( sizeof($container) > 1 ) {
+      if ( sizeof($container) >= 0 ) {
 				$type2 = $number == 0 ? $type : $type . $number;
 				return $this->GenerateSitemap($container, $type2);
       } # end if

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

[Oscss-commit] SF.net SVN: oscss:[4677] branches/2.1.1/catalog/admin/includes/gabarit/ ggsitemap/

[<os...@us...>]

Revision: 4677
          http://oscss.svn.sourceforge.net/oscss/?rev=4677&view=rev
Author:   oscim
Date:     2012-12-29 16:26:38 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------


Added Paths:
-----------
    branches/2.1.1/catalog/admin/includes/gabarit/ggsitemap/

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

[Oscss-commit] SF.net SVN: oscss:[4676] branches/2.1.1/catalog/install/data/templates/ appareil_photo/2cShopHtml5Oscim

[<os...@us...>]

Revision: 4676
          http://oscss.svn.sourceforge.net/oscss/?rev=4676&view=rev
Author:   oscim
Date:     2012-12-29 15:32:55 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
correction diverse

Modified Paths:
--------------
    branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php
    branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/configuration.php
    branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
    branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_shipping.php
    branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php
    branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php

Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php	2012-12-29 15:16:09 UTC (rev 4675)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php	2012-12-29 15:32:55 UTC (rev 4676)
@@ -43,21 +43,25 @@
   <meta name="description" content="<?php echo $page->GetHtmlMeta('description'); ?>" />
   <meta name="keywords" content="<?php echo $page->GetHtmlMeta('keywords'); ?>" />
   <meta http-equiv="content-type" content="text/html; charset=<?php echo CHARSET; ?>" />
+	<meta name="viewport" content="width=device-width, height=device-height" />
   <meta name="author" content="oscim"/>
   <meta name="reply-to" content="<?php echo HEAD_REPLY_TAG_ALL ?>" />
   <meta name="robots" content="all" />
   <meta name="generator" content="osCSS-2" />
   <base href="<?php echo  tep_get_httpdir() ; ?>" />
-  <link rel="stylesheet" type="text/css" href="<?php echo 'templates/'.$template.'/'; ?>sample.css" media="all"/>
+
+  <link rel="stylesheet" type="text/css" href="<?php echo 'templates/'.$template.'/'; ?>sample.css" media="screen"/>
   <!--[if IE ]>
-  <link rel="stylesheet" type="text/css" href="<?php echo 'templates/'.$template.'/'; ?>iecss.css" />
+  <link rel="stylesheet" type="text/css" href="<?php echo 'templates/'.$template.'/'; ?>iecss.css" media="screen"/>
   <![endif]-->
 
-<!--[if lte IE 8]>
+	<!--[if lte IE 8]>
+		<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+	<![endif]--> 
 
-  <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 
-<![endif]--> 
+  <link rel="stylesheet" type="text/css" href="<?php echo 'templates/'.$template.'/'; ?>screen_480.css" media="screen and (max-width: 480px)"/>
+  <link rel="stylesheet" type="text/css" href="<?php echo 'templates/'.$template.'/'; ?>screen_640.css" media="screen and (max-width: 640px)"/>
 
   <script type="text/javascript" src="<?php echo 'templates/'.$template.'/'; ?>js/boxOver.js"></script>
 

Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/configuration.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/configuration.php	2012-12-29 15:16:09 UTC (rev 4675)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/configuration.php	2012-12-29 15:32:55 UTC (rev 4676)
@@ -46,16 +46,24 @@
 
 /* Config des modules base */
 ResetConfigKey('MODULE_ACAPRO_INSTALLED');
-ResetConfigKey('MODULE_ACAPRO_INSTALLED_BO');
 ResetConfigKey('MODULE_ACCOUNT_INSTALLED');
-ResetConfigKey('MODULE_ACCOUNT_INSTALLED_BO');
 ResetConfigKey('MODULE_GENERIC_INSTALLED');
 
+ResetConfigKey('MODULE_ACAPRO_INSTALLED_BO');
+ResetConfigKey('MODULE_ACCOUNT_INSTALLED_BO');
+ResetConfigKey('MODULE_ACACAT_INSTALLED_BO');
+ResetConfigKey('MODULE_CONTENT_INSTALLED_BO');
+
+
 addConfigModule('MODULE_ACAPRO_INSTALLED', 'attributeManager.php');
 addConfigModule('MODULE_ACAPRO_INSTALLED', 'desc_base.php');
 addConfigModule('MODULE_ACAPRO_INSTALLED_BO', 'attributeManager.php');
 addConfigModule('MODULE_ACAPRO_INSTALLED_BO', 'desc_base.php');
+
 addConfigModule('MODULE_ACAPRO_INSTALLED_BO', 'header_tags.php');
+addConfigModule('MODULE_ACACAT_INSTALLED_BO', 'header_tags.php');
+addConfigModule('MODULE_CONTENT_INSTALLED_BO', 'header_tags.php');
+
 addConfigModule('MODULE_ACCOUNT_INSTALLED', 'address_book.php');
 addConfigModule('MODULE_ACCOUNT_INSTALLED', 'account_extra.php');
 addConfigModule('MODULE_ACCOUNT_INSTALLED', 'history.php');

Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php	2012-12-29 15:16:09 UTC (rev 4675)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php	2012-12-29 15:32:55 UTC (rev 4676)
@@ -84,6 +84,7 @@
 
   $this->oscss_boxes->_add('currencies', 'header');
 
+if(self::oscss_body_id() !='Page_shopping_cart')
   $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
 
 

Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_shipping.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_shipping.php	2012-12-29 15:16:09 UTC (rev 4675)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_shipping.php	2012-12-29 15:32:55 UTC (rev 4676)
@@ -54,27 +54,35 @@
 	    </label>
 
 	      <?php if (isset($quotes[$i]['error'])): ?>
-		<span><?php echo $quotes[$i]['error']; ?></span>
+					<span><?php echo $quotes[$i]['error']; ?></span>
 
 	      <?php else: ?>
-		<ul class="shippingSelect listMethod ">
-		  <?php for ($j=0, $n2=sizeof($quotes[$i]['methods']); $j<$n2; $j++) {// set the radio button to be checked if it is the method chosen
-			  $checked = (($quotes[$i]['id'] . '_' . $quotes[$i]['methods'][$j]['id'] == $shipping['id']) ? true : false); ?>
-		      <li class="nameMethod">
-			<span class="methodTitle"><?php echo $quotes[$i]['methods'][$j]['title']; ?></span>
-			<?php if(isset($quotes[$i]['methods'][$j]['detail'])): ?>
-			  <span class="methodDetail"><?php echo $quotes[$i]['methods'][$j]['detail']; ?></span>
-			<?php endif; ?>
-			<?php if ( ($n >= 1) || ($n2 >= 1) ): ?>
-			    <span class="methodPrice"><?php echo $currencies->format($quotes[$i]['methods'][$j]['cost']); ?></span>
-			  <?php echo tep_draw_radio_field('shipping','shipping'.$i, $quotes[$i]['id'] . '_' . $quotes[$i]['methods'][$j]['id'], $checked); ?>
-			<?php else: ?>
-			    <?php echo $currencies->format($quotes[$i]['methods'][$j]['cost']) . tep_draw_hidden_field('shipping', $quotes[$i]['id'] . '_' . $quotes[$i]['methods'][$j]['id']); ?>
-			<?php endif; // if ( ($n >= 1) || ($n2 >= 1) ) ?>
-		      </li>
-		  <?php $radio_buttons++;
-		      } ?>
-		</ul>
+					<ul class="shippingSelect listMethod ">
+						<?php for ($j=0, $n2=sizeof($quotes[$i]['methods']); $j<$n2; $j++) {// set the radio button to be checked if it is the method chosen
+							$checked = (($quotes[$i]['id'] . '_' . $quotes[$i]['methods'][$j]['id'] == $shipping['id']) ? true : false); ?>
+								<li class="nameMethod">
+						<span class="methodTitle"><?php echo $quotes[$i]['methods'][$j]['title']; ?></span>
+						<?php if(isset($quotes[$i]['methods'][$j]['detail'])): ?>
+							<span class="methodDetail"><?php echo $quotes[$i]['methods'][$j]['detail']; ?></span>
+						<?php endif; ?>
+
+
+						<?php if(isset($quotes[$i]['methods'][$j]['date_delivery'])): ?>
+							<span class="methodDateDelivery"><?php echo  sprintf(TEXT_ESTIMATE_DELIVERY, $quotes[$i]['methods'][$j]['date_delivery'] ); ?></span>
+						<?php endif; ?>
+
+						<?php if ( ($n >= 1) || ($n2 >= 1) ): ?>
+								<span class="methodPrice"><?php echo $currencies->format($quotes[$i]['methods'][$j]['cost']); ?></span>
+							<?php echo tep_draw_radio_field('shipping','shipping'.$i, $quotes[$i]['id'] . '_' . $quotes[$i]['methods'][$j]['id'], $checked); ?>
+						<?php else: ?>
+								<?php echo $currencies->format($quotes[$i]['methods'][$j]['cost']) . tep_draw_hidden_field('shipping', $quotes[$i]['id'] . '_' . $quotes[$i]['methods'][$j]['id']); ?>
+						<?php endif; // if ( ($n >= 1) || ($n2 >= 1) ) ?>
+
+
+								</li>
+						<?php $radio_buttons++;
+								} ?>
+					</ul>
 	      <?php endif; // if (isset($quotes[$i]['error']))  ?>
 	  </li>
 	<?php endfor; // for ($i=0, $n=sizeof($quotes); $i<$n; $i++) ?>

Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php	2012-12-29 15:16:09 UTC (rev 4675)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php	2012-12-29 15:32:55 UTC (rev 4676)
@@ -78,35 +78,52 @@
 		</ul>
 	</div>
 
+		<div id="productInfoSpec">
+			<p class="productModel"><?php echo $product_info['products_model']; ?></p>
+			<p id="price_master" class="productPrice"><?php echo print_products_price_rv($product_info); ?></p>
+		</div>
 
-  <div id="productInfoSpec">
-    <p class="productModel"><?php echo $product_info['products_model']; ?></p>
-    <p id="price_master" class="productPrice"><?php echo print_products_price_rv($product_info); ?></p>
-  </div>
 
   <?php if (_test_bool($product_info['action']['buy'])): ?>
+		<!-- 	this product is avaible for add cart -->	
+
     <?php echo tep_draw_form('cart_quantity', tep_href_link(FILENAME_PRODUCT_INFO, tep_get_all_get_params(array('action')) . 'action=add_product')); ?>
 
+      <?php /** Aca Attribute Products */ if(isset($module['attributeManager'])) echo $module['attributeManager']->display_view_master($product_info['products_id']);?>
+
       <?php /** Aca Attribute Products */ if(isset($module['Abonnement'])) echo $module['Abonnement']->display_view_master($product_info['products_id']);?>
 
       <p class="formQt"><?php echo TEXT_PREFIX_QTY.tep_draw_input_field('products_quantity', 'products_quantity', '1', 'size="2"'); ?></p>
       <p class="formBt">
-	<input class="submitBt" type="submit" value="<?php echo IMAGE_BUTTON_IN_CART; ?>"  />
+				<input class="submitBt" type="submit" value="<?php echo IMAGE_BUTTON_IN_CART; ?>"  />
       </p>
       <p><?php echo tep_draw_hidden_field('products_id', $product_info['products_id']); ?></p>
     </form>
+
+  <?php else: ?>
+
+		<?php if ($product_info['track_stock'] == 3 && $product_info['quantity'] <= 0): ?>
+			<!-- 	this product is definitive enought stock  -->
+			<p>
+				<?php echo __('@template products info stock finish in limited') ?>
+			</p>
+		<?php endif;?>
+
   <?php endif ; ?>
 
   <?php  if (tep_not_null($product_info['products_url'])) { ?>
     <p id="productUrl"><?php echo sprintf(TEXT_MORE_INFORMATION, tep_href_link(FILENAME_REDIRECT, 'action=url&amp;goto=' . urlencode($product_info['products_url']), 'NONSSL', true, false)); ?></p>
   <?php } ?>
 
-  <?php if ($product_info['products_date_available'] > date('Y-m-d H:i:s')) { ?>
+
+  <?php if ($product_info['products_date_available'] > date('Y-m-d H:i:s')): ?>
     <p id="productDateAvalaible" class="date"><?php echo sprintf(TEXT_DATE_AVAILABLE, tep_date_long($product_info['products_date_available'])); ?></p>
-  <?php } else { ?>
+  <?php endif;?>
+
+
     <p id="productDateAdded" class="date"><?php echo sprintf(TEXT_DATE_ADDED, tep_date_long($product_info['products_date_added'])); ?></p>
-  <?php } ?>
 
+
   <div id="productInfoBack" class="navBt">
       <?php echo '<a class="navBt" href="javascript: history.go(-1)">' . IMAGE_BUTTON_BACK . '</a>'; ?>
   </div>

Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php	2012-12-29 15:16:09 UTC (rev 4675)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php	2012-12-29 15:32:55 UTC (rev 4676)
@@ -95,23 +95,32 @@
     </div>
 
 
+      <?php if (Stock::DisplayMessage() > 0): ?>
+				<!-- display Stock alerts carts  -->
+				<?php if (Stock::DisplayMessage() !=3 && $DCart->any_out_of_stock > 0): ?>
 
-      <?php if ($DCart->any_out_of_stock == 1): ?>
-	<?php if (_cst_bool('STOCK_ALLOW_CHECKOUT')) { ?>
-          <div class="warning"><?php printf(OUT_OF_STOCK_CAN_CHECKOUT, STOCK_MARK_PRODUCT_OUT_OF_STOCK); ?></div>
-	<?php } else { ?>
-	  <div class="warning"><?php printf(OUT_OF_STOCK_CANT_CHECKOUT,STOCK_MARK_PRODUCT_OUT_OF_STOCK ); ?></div>
-	<?php } ?>
-      <?php endif ?>
+					<?php if (_cst_bool('STOCK_ALLOW_CHECKOUT')): ?>
+						<div class="warning"><?php printf(OUT_OF_STOCK_CAN_CHECKOUT, STOCK_MARK_PRODUCT_OUT_OF_STOCK); ?></div>
+					<?php  else: ?>
+						<div class="warning"><?php printf(OUT_OF_STOCK_CANT_CHECKOUT,STOCK_MARK_PRODUCT_OUT_OF_STOCK ); ?></div>
+					<?php endif; ?>
 
+				<?php endif ?>
+			<?php endif ?>
 
+
+
+
       <div class="Bt navBt block">
 
-	<?php echo '<a class="Bt navBt link" href="' . tep_href_link(FILENAME_SHOPPING_CART, 'action=resetCart') . '">' . IMAGE_BUTTON_RESET_CART . '</a>'; ?>
-	<input class="Bt navBt submit" type="submit" value="<?php echo IMAGE_BUTTON_UPDATE_CART; ?>"  />
+				<?php echo '<a class="Bt navBt link" href="' . tep_href_link(FILENAME_SHOPPING_CART, 'action=resetCart') . '">' . IMAGE_BUTTON_RESET_CART . '</a>'; ?>
+				<input class="Bt navBt submit" type="submit" value="<?php echo IMAGE_BUTTON_UPDATE_CART; ?>"  />
 
-	<?php echo '<a class="Bt navBt link" href="' . $navigation->GetBack() . '">' . IMAGE_BUTTON_CONTINUE_SHOPPING . '</a>'; ?>
-	<?php echo '<a class="Bt navBt link" href="' . tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL') . '">' . IMAGE_BUTTON_CHECKOUT . '</a>'; ?>
+				<?php echo '<a class="Bt navBt link" href="' . $navigation->GetBack() . '">' . IMAGE_BUTTON_CONTINUE_SHOPPING . '</a>'; ?>
+
+				<?php if ($cart->ContinueButton()): ?>
+					<?php echo '<a class="Bt navBt link" href="' . tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL') . '">' . IMAGE_BUTTON_CHECKOUT . '</a>'; ?>
+				<?php endif ?>
       </div>
 
 

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

[Oscss-commit] SF.net SVN: oscss:[4675] branches/2.1.1/catalog/includes/functions/general. php

[<os...@us...>]

Revision: 4675
          http://oscss.svn.sourceforge.net/oscss/?rev=4675&view=rev
Author:   oscim
Date:     2012-12-29 15:16:09 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
#FS1100

Modified Paths:
--------------
    branches/2.1.1/catalog/includes/functions/general.php

Modified: branches/2.1.1/catalog/includes/functions/general.php
===================================================================
--- branches/2.1.1/catalog/includes/functions/general.php	2012-12-29 15:11:28 UTC (rev 4674)
+++ branches/2.1.1/catalog/includes/functions/general.php	2012-12-29 15:16:09 UTC (rev 4675)
@@ -384,10 +384,12 @@
 		$list .=  " , countries_iso_code_2, countries_iso_code_3 ";
 
   if (tep_not_null($countries_id) && (int)$countries_id > 0) 
-		$where = " AND countries_id = '" . (int)$countries_id . "' ";
+		$where = " countries_id = '" . (int)$countries_id . "' ";
+	else
+		$where = " country_visible = '1' ";
   
 
-	$countries = $DB->query("SELECT countries_id ".$list." FROM " . TABLE_COUNTRIES . " WHERE country_visible = '1' ".$where." ORDER BY countries_name");
+	$countries = $DB->query("SELECT countries_id ".$list." FROM " . TABLE_COUNTRIES . " WHERE  ".$where." ORDER BY countries_name");
 
 	if($countries->__get('numRows'))
 		foreach($countries->fetchAllAssoc() as $row)

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

[Oscss-commit] SF.net SVN: oscss:[4674] branches/2.1.1/catalog/admin/editeur/tiny_mce/ plugins/tinybrowser/fns_tinybrowser.php

[<os...@us...>]

Revision: 4674
          http://oscss.svn.sourceforge.net/oscss/?rev=4674&view=rev
Author:   oscim
Date:     2012-12-29 15:11:28 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
FS#1088

Modified Paths:
--------------
    branches/2.1.1/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/fns_tinybrowser.php

Modified: branches/2.1.1/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/fns_tinybrowser.php
===================================================================
--- branches/2.1.1/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/fns_tinybrowser.php	2012-12-28 20:48:16 UTC (rev 4673)
+++ branches/2.1.1/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/fns_tinybrowser.php	2012-12-29 15:11:28 UTC (rev 4674)
@@ -1,8 +1,5 @@
 <?php
-error_reporting(E_ALL);
 
-
-
 Class TinyBrowser{
 
 
@@ -342,8 +339,10 @@
 function clean_filename($filename){
     $filename = preg_replace('/^\W+|\W+$/', '', $filename); // remove all non-alphanumeric chars at begin & end of string
     $filename = preg_replace('/\s+/', '_', $filename); // compress internal whitespace and replace with _
-    return strtolower(preg_replace('/\W-/', '', $filename)); // remove all non-alphanumeric chars except _ and -
-
+    $n = strtolower(preg_replace('/\W-/', '', $filename)); // remove all non-alphanumeric chars except _ and -
+		$n = strtr($n, '()ÀÁÂÃÄÅàáâãäåÒÓÔÕÖØòóôõöøÈÉÊËèéêëÇçÌÍÎÏìíîïÙÚÛÜùúûüÿÑñ',
+   '__aaaaaaaaaaaaooooooooooooeeeeeeeecciiiiiiiiuuuuuuuuynn');
+		return $n;
 }
 
 //********************************Return File MIME Type***************************

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

[Oscss-commit] SF.net SVN: oscss:[4673] branches/2.1.1/catalog/admin/includes

[<os...@us...>]

Revision: 4673
          http://oscss.svn.sourceforge.net/oscss/?rev=4673&view=rev
Author:   oscim
Date:     2012-12-28 20:48:16 +0000 (Fri, 28 Dec 2012)
Log Message:
-----------
correction coquille 
FS#1015

Modified Paths:
--------------
    branches/2.1.1/catalog/admin/includes/gabarit/configuration/modseourl.listing.gab
    branches/2.1.1/catalog/admin/includes/modules/configuration/modseourl.php
    branches/2.1.1/catalog/admin/includes/modules/pages/adminUsers.php

Modified: branches/2.1.1/catalog/admin/includes/gabarit/configuration/modseourl.listing.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/configuration/modseourl.listing.gab	2012-12-27 20:01:34 UTC (rev 4672)
+++ branches/2.1.1/catalog/admin/includes/gabarit/configuration/modseourl.listing.gab	2012-12-28 20:48:16 UTC (rev 4673)
@@ -53,7 +53,7 @@
 		<!--   <fieldset class="block_field"> -->
 				<div class="block_input">
 					<label class="block_field-title" title=""><?php echo __('modseourl legend seo mode choose') ?></label>
-					<table class="dataTable">
+					<table class="dataTableBase">
 						<?php foreach(modseourl::$list_childs_mod as $row): $value = ((SEO_REWRITE_TYPE == $row->code)? 'true': 'false' ); ?>
 							<tr>
 								<td><?php echo $row->code ?></td>
@@ -62,7 +62,7 @@
 								<td><?php echo $row->sample ?></td>
 								<td class="row_action">
 									<span class="edit-input">  
-										<?php echo tep_draw_radio_field('configuration[SEO_REWRITE_TYPE]','', $row->code, (SEO_REWRITE_TYPE == $row->code) ); ?>
+										<?php echo tep_draw_radio_field('configuration[SEO_REWRITE_TYPE]','', $row->code, (SEO_REWRITE_TYPE == $row->code) ,'', ' class="modseoselect" ' ); ?>
 										<span class="edit-input-value Val-<?php echo $value; ?> "> <?php echo $value; ?> </span> 
 										<span class="edit-input-value-alternate Val-<?php echo $value; ?>"></span> 
 									</span>
@@ -76,7 +76,7 @@
 
 			<div class="block_input">
 				<h4 class="block_field-title"><?php echo __('modseourl legend seo htaccess reg') ?></h4>
-				<textarea style="width:100%; height:300px;">
+				<textarea id="htaccess_view" style="width:100%; height:300px;">
 					<?php echo modseourl::$view_htaccess ?>
 				</textarea>
 			</div>
@@ -119,6 +119,11 @@
 					<legend class="block_field-title"><?php echo __('modseourl legend other') ?></legend>
 
 					<ul class="block_input">
+								<div class="block_input">
+									<label><?php  ?></label>
+									<p>
+							<?php  ?>
+									</p>
 						<?php foreach(modseourl::$list as $row)
 									if(!in_array($row->key,array('SEO_ENABLED', 'SEO_REWRITE_TYPE')) && ( substr($row->key,0,4) !='SEO_' && substr($row->key,0,7) !='USE_SEO' ) ) { ?>
 							<li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' -  ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>

Modified: branches/2.1.1/catalog/admin/includes/modules/configuration/modseourl.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/configuration/modseourl.php	2012-12-27 20:01:34 UTC (rev 4672)
+++ branches/2.1.1/catalog/admin/includes/modules/configuration/modseourl.php	2012-12-28 20:48:16 UTC (rev 4673)
@@ -66,6 +66,18 @@
 
     switch($action){
       /**
+				@brief Ajax adjust content htaccess view 
+      */
+			case 'htaccess_view':
+				$moderewrite = tep_db_prepare_input($_GET['SEO_REWRITE_TYPE']);
+				$this->load_db_values($moderewrite);
+
+				echo self::$view_htaccess;
+
+				exit;
+			break;
+
+      /**
 				@brief save page groupe
       */
       case 'save_mutli':
@@ -115,13 +127,12 @@
 		@brief
     @return array
   */
-  public function load_db_values($Id){
+  public function load_db_values($moderewrite){
 
 
 		$list_edit=array();
     $gparentID = tep_db_prepare_input($_GET['gparentID']);
     $gID= tep_db_prepare_input($_GET['gID']);
-// 		$gID = 16;
 
 		$list=sqlconfiguration::fetch(array('group_id'=> (int)$gID), true);
 
@@ -153,7 +164,7 @@
 				$obj = new $class();
 
 				$row = $obj->GetDescription();
-				if((SEO_REWRITE_TYPE == $row->code)) 
+				if($moderewrite == $row->code) 
 					$current = $obj;
 				self::$list_childs_mod[] = $row;
 			}
@@ -180,16 +191,18 @@
   */
   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>
+		<script type="text/javascript">
+		$(function() {
+			// Section for reload content htaccess in textarea 
+			$('.modseoselect').change( function (i) {
+						$.get("<?php echo tep_get_http().DIR_WS_ADMIN. FILENAME_CONFIGURATION ?>",
+							{ 'gparentID': "<?php echo $_GET['gparentID'] ?>",'gID': "<?php echo  $_GET['gID']  ?>",'action': "htaccess_view", 'SEO_REWRITE_TYPE': $(this).val() },
+							function(data){
+								$('#htaccess_view').html(data);
+						});
+			});
+		});
+		</script>
     <?php
   }
 
@@ -199,7 +212,7 @@
   public function draw(){
     global $action,$gparentID;
 
-    self::$list = $this->load_db_values('');
+    self::$list = $this->load_db_values(SEO_REWRITE_TYPE);
     return tep_get_include_contents('configuration/'.__CLASS__.'.listing');
   }
 }

Modified: branches/2.1.1/catalog/admin/includes/modules/pages/adminUsers.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/adminUsers.php	2012-12-27 20:01:34 UTC (rev 4672)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/adminUsers.php	2012-12-28 20:48:16 UTC (rev 4673)
@@ -541,7 +541,7 @@
   public  static function ButtonRowsActions($item){
 		$left = '';
 		if(tep_action_check('new', self::FILENAME) || $_SESSION['login_id'] == $item['admin_id'])
-			$left .=sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'edit'), '',  tep_href_link(self::FILENAME,  'cID=' . $item['admin_id'] . '&amp;action=edit') ,'' );
+			$left .=sprintf(CsrtAction::getLink('row_action_right', IMAGE_EDIT, 'edit'), '',  tep_href_link(self::FILENAME,  'cID=' . $item['admin_id'] . '&amp;action=edit') ,'' );
 		if(tep_action_check('delete',self::FILENAME))
 			$left .=sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'fancy',  tep_href_link(self::FILENAME,  'cID=' . $item['admin_id'] . '&amp;action=delete') ,'' );
 

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

[Oscss-commit] SF.net SVN: oscss:[4672] branches/2.1.1/catalog/admin/includes/modules/ pages/adminUsers.php

[<os...@us...>]

Revision: 4672
          http://oscss.svn.sourceforge.net/oscss/?rev=4672&view=rev
Author:   oscim
Date:     2012-12-27 20:01:34 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
erreur dans utilisation de tep_admin_check

Modified Paths:
--------------
    branches/2.1.1/catalog/admin/includes/modules/pages/adminUsers.php

Modified: branches/2.1.1/catalog/admin/includes/modules/pages/adminUsers.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/adminUsers.php	2012-12-27 20:00:04 UTC (rev 4671)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/adminUsers.php	2012-12-27 20:01:34 UTC (rev 4672)
@@ -130,7 +130,7 @@
     */
     if(self::$action =='' || self::$action =='listing'){
 
-			if(tep_action_check('new'))
+			if(tep_action_check('new', self::FILENAME))
       self::$InitInfo['MenuModule'][]=array(
 					  'type'=>'getLink',
 					  'format'=>'button_nav',
@@ -540,9 +540,9 @@
   */
   public  static function ButtonRowsActions($item){
 		$left = '';
-		if(tep_action_check('new') || $_SESSION['login_id'] == $item['admin_id'])
+		if(tep_action_check('new', self::FILENAME) || $_SESSION['login_id'] == $item['admin_id'])
 			$left .=sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'edit'), '',  tep_href_link(self::FILENAME,  'cID=' . $item['admin_id'] . '&action=edit') ,'' );
-		if(tep_action_check('delete'))
+		if(tep_action_check('delete',self::FILENAME))
 			$left .=sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'fancy',  tep_href_link(self::FILENAME,  'cID=' . $item['admin_id'] . '&action=delete') ,'' );
 
     return  sprintf(
@@ -563,7 +563,7 @@
     $query_s='action=setflag&cID=' . $item['admin_id'].'&flag=';
 
 		// force admin not desactive
-		if($item['admin_id'] ==1 || !tep_action_check('edit'))
+		if($item['admin_id'] ==1 || !tep_action_check('edit', self::FILENAME))
 			return sprintf(
 					CsrtAction::getFormat('row_flag'),
 					(int)1,

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

[Oscss-commit] SF.net SVN: oscss:[4671] branches/2.1.1/catalog/admin/includes/ application_bottom.php

[<os...@us...>]

Revision: 4671
          http://oscss.svn.sourceforge.net/oscss/?rev=4671&view=rev
Author:   oscim
Date:     2012-12-27 20:00:04 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
correction erreur dans la numerotation des id css des message d'alerte

Modified Paths:
--------------
    branches/2.1.1/catalog/admin/includes/application_bottom.php

Modified: branches/2.1.1/catalog/admin/includes/application_bottom.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/application_bottom.php	2012-12-27 09:11:54 UTC (rev 4670)
+++ branches/2.1.1/catalog/admin/includes/application_bottom.php	2012-12-27 20:00:04 UTC (rev 4671)
@@ -13,6 +13,8 @@
 
 
   $navigation->add_current_page();
+
+
 ?>
 
 
@@ -27,12 +29,12 @@
 
 		// Get errors
 		$arr = $messageStack->get_errors() ;
-
+		$i = 0;
 		foreach($arr as $k=>$row): ?>
 
 				// Add message line 
 				OSCSS_JSCORE.utils.notif.AddNotif({
-						indice:"<?php echo time() ?>",
+						indice:"<?php echo $i++ ?>",
 						style:"<?php echo $row['class'] ?>",
 						message:"<?php echo addslashes($row['text']) ?>", 
 					});

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

[Oscss-commit] SF.net SVN: oscss:[4670] branches/2.1.1/catalog

[<os...@us...>]

Revision: 4670
          http://oscss.svn.sourceforge.net/oscss/?rev=4670&view=rev
Author:   oscim
Date:     2012-12-27 09:11:54 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
correction coquille construction des listings  et selecteur de sous type
correction de la recherche dans le browser d'image et fichier 
correction coquille dans la function de mise a jour de commande et le retour de mails associ?\195?\169 contenant le nom du status de commande en cours
coquille sur le order by de la requetes des nouveau produits en pleine page

Modified Paths:
--------------
    branches/2.1.1/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/edit.php
    branches/2.1.1/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/tinybrowser.php
    branches/2.1.1/catalog/admin/includes/functions/lib.orders.php
    branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php
    branches/2.1.1/catalog/admin/includes/modules/pages/products.php
    branches/2.1.1/catalog/templates/defaut/includes/content/listing_products_new.php

Modified: branches/2.1.1/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/edit.php
===================================================================
--- branches/2.1.1/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/edit.php	2012-12-23 17:43:30 UTC (rev 4669)
+++ branches/2.1.1/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/edit.php	2012-12-27 09:11:54 UTC (rev 4670)
@@ -191,7 +191,7 @@
 
 // Read directory contents and populate $file array
 
-	$file = TinyBrowser::BrowseFiles($editpath);
+	$file = TinyBrowser::BrowseFiles($editpath,$findnow);
 
 // Assign directory structure to array
 $editdirs=array();

Modified: branches/2.1.1/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/tinybrowser.php
===================================================================
--- branches/2.1.1/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/tinybrowser.php	2012-12-23 17:43:30 UTC (rev 4669)
+++ branches/2.1.1/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/tinybrowser.php	2012-12-27 09:11:54 UTC (rev 4670)
@@ -85,7 +85,7 @@
 // read folder contents if folder exists
 if(file_exists($tinybrowser['docroot'].$browsepath)){
 
-		$file = TinyBrowser::BrowseFiles($browsepath);
+		$file = TinyBrowser::BrowseFiles($browsepath, $findnow);
 
 	}
 // create file upload folder

Modified: branches/2.1.1/catalog/admin/includes/functions/lib.orders.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/functions/lib.orders.php	2012-12-23 17:43:30 UTC (rev 4669)
+++ branches/2.1.1/catalog/admin/includes/functions/lib.orders.php	2012-12-27 09:11:54 UTC (rev 4670)
@@ -28,17 +28,25 @@
 
 /**
   @brief Gestion des evolution du status d'une commandes
-  @param $oID int 
+  @param $oID int
   @param $status int
   @param array post array(status,comments, notify,  comments )
 */
 function up_status_order($oID,$status, $post){
-  global $language, $orders_status_array, $messageStack;
+  global $language, $languages_id, $messageStack;
   $_oID = tep_db_prepare_input($oID);
   $status = tep_db_prepare_input($post['status']);
   $comments = tep_db_prepare_input($post['comments']);
 	$notify = (isset($_POST['notify']) && ($post['notify'] == 'on')) ? true : false ;
 
+		$DB=Database::getInstance();
+		$orders_statuses=array();
+		$orders_status_query = $DB->query("select status_id, status_name from " . TABLE_STATUS . " where status_type='orders' and language_id = '" . (int)$languages_id . "'");
+		while ($orders_status = $orders_status_query->fetchAssoc()) {
+				$orders_statuses[] = array('id' => $orders_status['status_id'], 'text' => $orders_status['status_name']);
+				$orders_status_array[$orders_status['status_id']] = $orders_status['status_name'];
+		}
+
   $check_status_query = tep_db_query("select customers_id, customers_name, customers_email_address, orders_status, date_purchased, ip_address from " . TABLE_ORDERS . " where orders_id = '" . (int)$_oID . "'");
   $check_status = tep_db_fetch_array($check_status_query);
 
@@ -78,7 +86,7 @@
 
     return true;
   }
-  else  
+  else
 		return false;
 }
 

Modified: branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php	2012-12-23 17:43:30 UTC (rev 4669)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php	2012-12-27 09:11:54 UTC (rev 4670)
@@ -363,7 +363,8 @@
 			foreach($allcats as $row)
 				$list_type .=$row['id'].',';
 		}
-		self::$InitInfo['adjust']['sWhere'] .=" AND content_type IN (".substr($list_type, 0,-1).") ";
+		if(strlen($list_type)>2)
+				self::$InitInfo['adjust']['sWhere'] .=" AND content_type IN (".substr($list_type, 0,-1).") ";
 
 
 
@@ -515,7 +516,7 @@
 
 
 			/**
-				@remarks Test key , by ajax 
+				@remarks Test key , by ajax
 			*/
       case 'isValidKey':
 
@@ -799,7 +800,7 @@
       case 'isValidKey':
 				 $stringkey = tep_db_prepare_input($_REQUEST['stringkey']) ;
 
-				if( ! (bool)self::$list['isValidKey']) 
+				if( ! (bool)self::$list['isValidKey'])
 					$print = tep_draw_input_field('content_name', '', (string)$stringkey , ' class="inline error" ');
 				else
 					$print = $stringkey. tep_draw_hidden_field('content_name', '', (string)$stringkey, ' ');

Modified: branches/2.1.1/catalog/admin/includes/modules/pages/products.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/products.php	2012-12-23 17:43:30 UTC (rev 4669)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/products.php	2012-12-27 09:11:54 UTC (rev 4670)
@@ -255,7 +255,7 @@
 // 																'sort'=>false,
 // 																'alias'=>'price_ttx',
 // 																'text'=>__('products table heading price taxe'),
-// 													); 
+// 													);
 
 			self::$allfields['p.products_tax_class_id']= array(
 																'sort'=>true,
@@ -456,7 +456,7 @@
 
 
 		/**
-			@remarks  filter based on featured
+			@remarks  filter based on manufacturers
 		*/
 		if( DataTypes::is_active('manufacturer')) {
 			if(isset($_SESSION['filters'][__CLASS__]['manufacturer']))
@@ -491,7 +491,8 @@
 			foreach($allcats as $row)
 				$list_type .=$row['id'].',';
 		}
-		self::$InitInfo['adjust']['sWhere'] .=" AND products_type IN (".substr($list_type, 0,-1).") ";
+		if(strlen($list_type)>2)
+				self::$InitInfo['adjust']['sWhere'] .=" AND products_type IN (".substr($list_type, 0,-1).") ";
 
 
 		/**
@@ -817,7 +818,7 @@
 					$messageStack->add(__('@product success in update process'), 'success');
 
 /**
-	TODO a voir 
+	TODO a voir
 */
 				osCSS_Cache::clear('also_purchased');
 				osCSS_Cache::clear('product');
@@ -825,7 +826,7 @@
 
 				if(isset($_POST['up_and_close']) )
 					tep_redirect(tep_href_link(self::FILENAME, 'pID=' . $products_id));
-				else 
+				else
 					tep_redirect(tep_href_link(self::FILENAME, 'pID=' . $products_id.'&action=edit' ));
 
 			break;
@@ -904,7 +905,7 @@
 			}
 
 
-    } 
+    }
 		else {
       /**
 				@remarks A module has asked to privately take care of this action, check if class and method exist and run it.
@@ -1014,7 +1015,7 @@
 
 // 				if( DataTypes::is_active('manufacturer'))
 // 					$query_raw .=	" LEFT JOIN " . TABLE_MANUFACTURERS . " m ON( m.manufacturers_id=p.manufacturers_id ) ";
-// 
+//
 
 				if( DataTypes::is_active('featured')) {
 					$query_raw .=	" LEFT JOIN " . TABLE_FEATURED_DATA . " fada ON( fada.datatype_id=p.products_id AND datatype = 'product' ) ";
@@ -1284,7 +1285,7 @@
 				/* DEB  Sub module add col */
 				$external = array();
 				foreach(self::$allfieldsexternal as $key => $value ){
-					$clean = substr($key, (strpos($key, '.')+1)); 
+					$clean = substr($key, (strpos($key, '.')+1));
 					$alias = (isset($value['alias'])? $value['alias'] : $clean);
 					$external[] = $alias;
 					$process[$alias] = $value['module'];

Modified: branches/2.1.1/catalog/templates/defaut/includes/content/listing_products_new.php
===================================================================
--- branches/2.1.1/catalog/templates/defaut/includes/content/listing_products_new.php	2012-12-23 17:43:30 UTC (rev 4669)
+++ branches/2.1.1/catalog/templates/defaut/includes/content/listing_products_new.php	2012-12-27 09:11:54 UTC (rev 4670)
@@ -20,7 +20,7 @@
 	" LEFT JOIN " . TABLE_CATEGORIES . " c ON(c.categories_id=p2c.categories_id)  ".
 	" WHERE p.products_status = '1'   AND   categories_status = '1' AND p.products_date_added > SUBDATE(now(), INTERVAL  ".(int)MAX_DATEADDED_FOR_NEWX_PRODUCT." MONTH)  ".
 	" GROUP BY p.products_id   ".
-	" ORDER BY p.products_date_added ASC ";
+	" ORDER BY p.products_date_added DESC ";
 
 $listing_split = new splitPageResults($_query_raw, $page->_conf_value('MAX_DISPLAY_PRODUCTS_NEW'),  'p.products_id');
 

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

[Oscss-commit] SF.net SVN: oscss:[4668] branches/2.1.1/catalog/admin/includes/javascript

[<os...@us...>]

Revision: 4668
          http://oscss.svn.sourceforge.net/oscss/?rev=4668&view=rev
Author:   oscim
Date:     2012-12-23 17:40:20 +0000 (Sun, 23 Dec 2012)
Log Message:
-----------
mise a niveau de tabletool
mise a niveau et remont?\195?\169 fichier manquant

Added Paths:
-----------
    branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/css/
    branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/css/TableTools.css
    branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/css/TableTools_JUI.css
    branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/
    branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/background.png
    branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/collection.png
    branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/collection_hover.png
    branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/copy.png
    branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/copy_hover.png
    branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/csv.png
    branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/csv_hover.png
    branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/pdf.png
    branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/pdf_hover.png
    branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/print.png
    branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/print_hover.png
    branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/
    branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/collection.psd
    branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/copy document.psd
    branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/file_types.psd
    branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/printer.psd
    branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/xls.png
    branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/xls_hover.png
    branches/2.1.1/catalog/admin/includes/javascript/modules/products/

Added: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/css/TableTools.css
===================================================================
--- branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/css/TableTools.css	                        (rev 0)
+++ branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/css/TableTools.css	2012-12-23 17:40:20 UTC (rev 4668)
@@ -0,0 +1,321 @@
+/*
+ * File:        TableTools.css
+ * Description: Styles for TableTools 2
+ * Author:      Allan Jardine (www.sprymedia.co.uk)
+ * Language:    Javascript
+ * License:     GPL v2 / 3 point BSD
+ * Project:     DataTables
+ * 
+ * Copyright 2009-2012 Allan Jardine, all rights reserved.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * CSS name space:
+ *   DTTT                  DataTables TableTools
+ *
+ * Style sheet provides:
+ *   CONTAINER             TableTools container element and styles applying to all components
+ *   BUTTON_STYLES         Action specific button styles
+ *   SELECTING             Row selection styles
+ *   COLLECTIONS           Drop down list (collection) styles
+ *   PRINTING              Print display styles
+ */
+
+
+/*
+ * CONTAINER
+ * TableTools container element and styles applying to all components
+ */
+div.DTTT_container {
+	position: relative;
+	float: right;
+	margin-bottom: 1em;
+}
+
+button.DTTT_button,
+div.DTTT_button,
+a.DTTT_button {
+	position: relative;
+	float: left;
+	margin-right: 3px;
+	padding: 5px 8px;
+	border: 1px solid #999;
+	cursor: pointer;
+	*cursor: hand;
+	font-size: 0.88em;
+	color: black !important;
+
+	-webkit-border-radius: 2px;
+	   -moz-border-radius: 2px;
+	    -ms-border-radius: 2px;
+	     -o-border-radius: 2px;
+	        border-radius: 2px;
+
+	-webkit-box-shadow: 1px 1px 3px #ccc;
+	   -moz-box-shadow: 1px 1px 3px #ccc;
+	    -ms-box-shadow: 1px 1px 3px #ccc;
+	     -o-box-shadow: 1px 1px 3px #ccc;
+	        box-shadow: 1px 1px 3px #ccc;
+
+	/* Generated by http://www.colorzilla.com/gradient-editor/ */
+	background: #ffffff; /* Old browsers */
+	background: -webkit-linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* Chrome10+,Safari5.1+ */
+	background:    -moz-linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* FF3.6+ */
+	background:     -ms-linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* IE10+ */
+	background:      -o-linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* Opera 11.10+ */
+	background:         linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* W3C */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f9f9f9',GradientType=0 ); /* IE6-9 */
+}
+
+
+/* Buttons are cunning border-box sizing - we can't just use that for A and DIV due to IE6/7 */
+button.DTTT_button {
+	height: 30px;
+	padding: 3px 8px;
+}
+
+.DTTT_button embed { 
+	outline: none;
+}
+
+button.DTTT_button:hover,
+div.DTTT_button:hover,
+a.DTTT_button:hover {
+	border: 1px solid #666;
+	text-decoration: none !important;
+
+	-webkit-box-shadow: 1px 1px 3px #999;
+	   -moz-box-shadow: 1px 1px 3px #999;
+	    -ms-box-shadow: 1px 1px 3px #999;
+	     -o-box-shadow: 1px 1px 3px #999;
+	        box-shadow: 1px 1px 3px #999;
+
+	background: #f3f3f3; /* Old browsers */
+	background: -webkit-linear-gradient(top, #f3f3f3 0%,#e2e2e2 89%,#f4f4f4 100%); /* Chrome10+,Safari5.1+ */
+	background:    -moz-linear-gradient(top, #f3f3f3 0%,#e2e2e2 89%,#f4f4f4 100%); /* FF3.6+ */
+	background:     -ms-linear-gradient(top, #f3f3f3 0%,#e2e2e2 89%,#f4f4f4 100%); /* IE10+ */
+	background:      -o-linear-gradient(top, #f3f3f3 0%,#e2e2e2 89%,#f4f4f4 100%); /* Opera 11.10+ */
+	background:         linear-gradient(top, #f3f3f3 0%,#e2e2e2 89%,#f4f4f4 100%); /* W3C */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f3f3f3', endColorstr='#f4f4f4',GradientType=0 ); /* IE6-9 */
+}
+
+button.DTTT_disabled,
+div.DTTT_disabled,
+a.DTTT_disabled {
+	color: #999;
+	border: 1px solid #d0d0d0;
+	
+	background: #ffffff; /* Old browsers */
+	background: -webkit-linear-gradient(top, #ffffff 0%,#f9f9f9 89%,#fafafa 100%); /* Chrome10+,Safari5.1+ */
+	background:    -moz-linear-gradient(top, #ffffff 0%,#f9f9f9 89%,#fafafa 100%); /* FF3.6+ */
+	background:     -ms-linear-gradient(top, #ffffff 0%,#f9f9f9 89%,#fafafa 100%); /* IE10+ */
+	background:      -o-linear-gradient(top, #ffffff 0%,#f9f9f9 89%,#fafafa 100%); /* Opera 11.10+ */
+	background:         linear-gradient(top, #ffffff 0%,#f9f9f9 89%,#fafafa 100%); /* W3C */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#fafafa',GradientType=0 ); /* IE6-9 */
+}
+
+
+
+/*
+ * BUTTON_STYLES
+ * Action specific button styles
+ * If you want images - comment this back in
+
+button.DTTT_button_csv,
+button.DTTT_button_xls,
+button.DTTT_button_copy,
+button.DTTT_button_pdf,
+button.DTTT_button_print {
+	padding-right: 0px;
+}
+
+button.DTTT_button_csv span,
+button.DTTT_button_xls span,
+button.DTTT_button_copy span,
+button.DTTT_button_pdf span,
+button.DTTT_button_print span {
+	display: inline-block;
+	height: 24px;
+	line-height: 24px;
+	padding-right: 30px;
+}
+
+
+button.DTTT_button_csv span { background: url(../images/csv.png) no-repeat bottom right; }
+button.DTTT_button_csv:hover span { background: url(../images/csv_hover.png) no-repeat center right; }
+
+button.DTTT_button_xls span { background: url(../images/xls.png) no-repeat center right; }
+button.DTTT_button_xls:hover span { background: #f0f0f0 url(../images/xls_hover.png) no-repeat center right; }
+
+button.DTTT_button_copy span { background: url(../images/copy.png) no-repeat center right; }
+button.DTTT_button_copy:hover span { background: #f0f0f0 url(../images/copy_hover.png) no-repeat center right; }
+
+button.DTTT_button_pdf span { background: url(../images/pdf.png) no-repeat center right; }
+button.DTTT_button_pdf:hover span { background: #f0f0f0 url(../images/pdf_hover.png) no-repeat center right; }
+
+button.DTTT_button_print span { background: url(../images/print.png) no-repeat center right; }
+button.DTTT_button_print:hover span { background: #f0f0f0 url(../images/print_hover.png) no-repeat center right; }
+
+ */
+
+button.DTTT_button_collection span {
+	padding-right: 17px;
+	background: url(../images/collection.png) no-repeat center right;
+}
+
+button.DTTT_button_collection:hover span {
+	padding-right: 17px;
+	background: #f0f0f0 url(../images/collection_hover.png) no-repeat center right;
+}
+
+
+/*
+ * SELECTING
+ * Row selection styles
+ */
+table.DTTT_selectable tbody tr {
+	cursor: pointer;
+	*cursor: hand;
+}
+
+table.dataTable tr.DTTT_selected.odd {
+	background-color: #9FAFD1;
+}
+
+table.dataTable tr.DTTT_selected.odd td.sorting_1 {
+	background-color: #9FAFD1;
+}
+
+table.dataTable tr.DTTT_selected.odd td.sorting_2 {
+	background-color: #9FAFD1;
+}
+
+table.dataTable tr.DTTT_selected.odd td.sorting_3 {
+	background-color: #9FAFD1;
+}
+
+
+table.dataTable tr.DTTT_selected.even {
+	background-color: #B0BED9;
+}
+
+table.dataTable tr.DTTT_selected.even td.sorting_1 {
+	background-color: #B0BED9;
+}
+
+table.dataTable tr.DTTT_selected.even td.sorting_2 {
+	background-color: #B0BED9;
+}
+
+table.dataTable tr.DTTT_selected.even td.sorting_3 {
+	background-color: #B0BED9;
+}
+
+
+/*
+ * COLLECTIONS
+ * Drop down list (collection) styles
+ */
+
+div.DTTT_collection {
+	width: 150px;
+	padding: 8px 8px 4px 8px;
+	border: 1px solid #ccc;
+	border: 1px solid rgba( 0, 0, 0, 0.4 );
+	background-color: #f3f3f3;
+	background-color: rgba( 255, 255, 255, 0.3 );
+	overflow: hidden;
+	z-index: 2002;
+
+	-webkit-border-radius: 5px;
+	   -moz-border-radius: 5px;
+	    -ms-border-radius: 5px;
+	     -o-border-radius: 5px;
+	        border-radius: 5px;
+	
+	-webkit-box-shadow: 3px 3px 5px rgba(0, 0, 0, 0.3);
+	   -moz-box-shadow: 3px 3px 5px rgba(0, 0, 0, 0.3);
+	    -ms-box-shadow: 3px 3px 5px rgba(0, 0, 0, 0.3);
+	     -o-box-shadow: 3px 3px 5px rgba(0, 0, 0, 0.3);
+	        box-shadow: 3px 3px 5px rgba(0, 0, 0, 0.3);
+}
+
+div.DTTT_collection_background {
+	background: transparent url(../images/background.png) repeat top left;
+	z-index: 2001;
+}
+
+div.DTTT_collection button.DTTT_button,
+div.DTTT_collection div.DTTT_button,
+div.DTTT_collection a.DTTT_button {
+	position: relative;
+	left: 0;
+	right: 0;
+
+	display: block;
+	float: none;
+	margin-bottom: 4px;
+	
+	-webkit-box-shadow: 1px 1px 3px #999;
+	   -moz-box-shadow: 1px 1px 3px #999;
+	    -ms-box-shadow: 1px 1px 3px #999;
+	     -o-box-shadow: 1px 1px 3px #999;
+	        box-shadow: 1px 1px 3px #999;
+}
+
+
+/*
+ * PRINTING
+ * Print display styles
+ */
+
+.DTTT_print_info {
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	width: 400px;
+	height: 150px;
+	margin-left: -200px;
+	margin-top: -75px;
+	text-align: center;
+	color: #333;
+	padding: 10px 30px;
+
+	background: #ffffff; /* Old browsers */
+	background: -webkit-linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* Chrome10+,Safari5.1+ */
+	background:    -moz-linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* FF3.6+ */
+	background:     -ms-linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* IE10+ */
+	background:      -o-linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* Opera 11.10+ */
+	background:         linear-gradient(top, #ffffff 0%,#f3f3f3 89%,#f9f9f9 100%); /* W3C */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f9f9f9',GradientType=0 ); /* IE6-9 */
+	
+	opacity: 0.95;
+
+	border: 1px solid black;
+	border: 1px solid rgba(0, 0, 0, 0.5);
+	
+	-webkit-border-radius: 6px;
+	   -moz-border-radius: 6px;
+	    -ms-border-radius: 6px;
+	     -o-border-radius: 6px;
+	        border-radius: 6px;
+	
+	-webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.5);
+	   -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.5);
+	    -ms-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.5);
+	     -o-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.5);
+	        box-shadow: 0 3px 7px rgba(0, 0, 0, 0.5);
+}
+
+.DTTT_print_info h6 {
+	font-weight: normal;
+	font-size: 28px;
+	line-height: 28px;
+	margin: 1em;
+}
+
+.DTTT_print_info p {
+	font-size: 14px;
+	line-height: 20px;
+}
+


Property changes on: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/css/TableTools.css
___________________________________________________________________
Added: svn:executable
   + *

Added: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/css/TableTools_JUI.css
===================================================================
--- branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/css/TableTools_JUI.css	                        (rev 0)
+++ branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/css/TableTools_JUI.css	2012-12-23 17:40:20 UTC (rev 4668)
@@ -0,0 +1,185 @@
+/*
+ * File:        TableTools.css
+ * Description: Styles for TableTools 2 with JUI theming
+ * Author:      Allan Jardine (www.sprymedia.co.uk)
+ * Language:    Javascript
+ * License:     LGPL / 3 point BSD
+ * Project:     DataTables
+ * 
+ * Copyright 2010 Allan Jardine, all rights reserved.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Notes:
+ *   Generally speaking, please refer to the TableTools.css file - this file contains basic
+ *   modifications to that 'master' stylesheet for ThemeRoller.
+ *
+ * CSS name space:
+ *   DTTT                  DataTables TableTools
+ *
+ * Colour dictionary:
+ *   Button border         #d0d0d0
+ *   Button border hover   #999999
+ *   Hover background      #f0f0f0
+ *   Action blue           #4b66d9
+ *
+ * Style sheet provides:
+ *   CONTAINER             TableTools container element and styles applying to all components
+ *   SELECTING             Row selection styles
+ *   COLLECTIONS           Drop down list (collection) styles
+ *   PRINTING              Print display styles
+ *   MISC                  Minor misc styles
+ */
+
+
+/*
+ * CONTAINER
+ * TableTools container element and styles applying to all components
+ */
+div.DTTT_container {
+	position: relative;
+	float: left;
+}
+
+.DTTT_button {
+	position: relative;
+	float: left;
+	margin-right: 3px;
+	padding: 3px 10px;
+	border: 1px solid #d0d0d0;
+	background-color: #fff;
+	color: #333 !important;
+	cursor: pointer;
+	*cursor: hand;
+}
+
+.DTTT_button::-moz-focus-inner { 
+	border: none !important;
+	padding: 0;
+}
+
+
+
+/*
+ * SELECTING
+ * Row selection styles
+ */
+table.DTTT_selectable tbody tr {
+	cursor: pointer;
+	*cursor: hand;
+}
+
+table.dataTable tr.DTTT_selected.odd {
+	background-color: #9FAFD1;
+}
+
+table.dataTable tr.DTTT_selected.odd td.sorting_1 {
+	background-color: #9FAFD1;
+}
+
+table.dataTable tr.DTTT_selected.odd td.sorting_2 {
+	background-color: #9FAFD1;
+}
+
+table.dataTable tr.DTTT_selected.odd td.sorting_3 {
+	background-color: #9FAFD1;
+}
+
+
+table.dataTable tr.DTTT_selected.even {
+	background-color: #B0BED9;
+}
+
+table.dataTable tr.DTTT_selected.even td.sorting_1 {
+	background-color: #B0BED9;
+}
+
+table.dataTable tr.DTTT_selected.even td.sorting_2 {
+	background-color: #B0BED9;
+}
+
+table.dataTable tr.DTTT_selected.even td.sorting_3 {
+	background-color: #B0BED9;
+}
+
+
+/*
+ * COLLECTIONS
+ * Drop down list (collection) styles
+ */
+
+div.DTTT_collection {
+	width: 150px;
+	background-color: #f3f3f3;
+	overflow: hidden;
+	z-index: 2002;
+	
+	box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+	-moz-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+	-webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+}
+
+div.DTTT_collection_background {
+	background: url(../images/background.png) repeat top left;
+	z-index: 2001;
+}
+
+div.DTTT_collection button.DTTT_button,
+div.DTTT_collection div.DTTT_button,
+div.DTTT_collection a.DTTT_button {
+	float: none;
+	width: 100%;
+	margin-bottom: -0.1em;
+}
+
+
+/*
+ * PRINTING
+ * Print display styles
+ */
+
+.DTTT_print_info {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	width: 400px;
+	height: 150px;
+	margin-left: -200px;
+	margin-top: -75px;
+	text-align: center;
+	background-color: #3f3f3f;
+	color: white;
+	padding: 10px 30px;
+	
+	opacity: 0.9;
+	
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	
+	box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+	-moz-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+	-webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+}
+
+.DTTT_print_info h6 {
+	font-weight: normal;
+	font-size: 28px;
+	line-height: 28px;
+	margin: 1em;
+}
+
+.DTTT_print_info p {
+	font-size: 14px;
+	line-height: 20px;
+}
+
+
+/*
+ * MISC
+ * Minor misc styles
+ */
+
+.DTTT_disabled {
+	color: #999;
+}


Property changes on: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/css/TableTools_JUI.css
___________________________________________________________________
Added: svn:executable
   + *

Added: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/background.png
===================================================================
(Binary files differ)


Property changes on: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/background.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/collection.png
===================================================================
(Binary files differ)


Property changes on: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/collection.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/collection_hover.png
===================================================================
(Binary files differ)


Property changes on: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/collection_hover.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/copy.png
===================================================================
(Binary files differ)


Property changes on: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/copy.png
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/copy_hover.png
===================================================================
(Binary files differ)


Property changes on: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/copy_hover.png
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/csv.png
===================================================================
(Binary files differ)


Property changes on: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/csv.png
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/csv_hover.png
===================================================================
(Binary files differ)


Property changes on: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/csv_hover.png
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/pdf.png
===================================================================
(Binary files differ)


Property changes on: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/pdf.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/pdf_hover.png
===================================================================
(Binary files differ)


Property changes on: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/pdf_hover.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/print.png
===================================================================
(Binary files differ)


Property changes on: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/print.png
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/print_hover.png
===================================================================
(Binary files differ)


Property changes on: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/print_hover.png
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/collection.psd
===================================================================
(Binary files differ)


Property changes on: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/collection.psd
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/copy document.psd
===================================================================
(Binary files differ)


Property changes on: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/copy document.psd
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/file_types.psd
===================================================================
(Binary files differ)


Property changes on: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/file_types.psd
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/printer.psd
===================================================================
(Binary files differ)


Property changes on: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/psd/printer.psd
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/xls.png
===================================================================
(Binary files differ)


Property changes on: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/xls.png
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/xls_hover.png
===================================================================
(Binary files differ)


Property changes on: branches/2.1.1/catalog/admin/includes/javascript/dataTables.TableTools/images/xls_hover.png
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

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

[Oscss-commit] SF.net SVN: oscss:[4667] trunk/catalog/admin/includes/modules/pages/ geo_zones.php

[<os...@us...>]

Revision: 4667
          http://oscss.svn.sourceforge.net/oscss/?rev=4667&view=rev
Author:   oscim
Date:     2012-12-21 08:32:37 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
coquille lors creation zone inverse

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

Modified: trunk/catalog/admin/includes/modules/pages/geo_zones.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/geo_zones.php	2012-12-21 08:03:55 UTC (rev 4666)
+++ trunk/catalog/admin/includes/modules/pages/geo_zones.php	2012-12-21 08:32:37 UTC (rev 4667)
@@ -11,9 +11,9 @@
 */
 
 class geo_zones
-  implements 
-		ExtModPage, 
-		InterfacedTJsonS, 
+  implements
+		ExtModPage,
+		InterfacedTJsonS,
 		InterfaceModule {
 
   const FILENAME = FILENAME_GEO_ZONES;
@@ -251,6 +251,7 @@
 						/// create zone
 						$myarray=array(
 								'name' => 'reverse zone',
+								'description' => 'reverse zone',
 								'grp'=>tep_db_prepare_input($_POST['current_grp']),
 								'type'=>tep_db_prepare_input($_POST['current_type']),
 								);

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

[Oscss-commit] SF.net SVN: oscss:[4666] trunk/catalog/admin/includes/gabarit/geo_zones/ display_view.new.gab

[<os...@us...>]

Revision: 4666
          http://oscss.svn.sourceforge.net/oscss/?rev=4666&view=rev
Author:   oscim
Date:     2012-12-21 08:03:55 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
fichier ecras?\195?\169 sur commit 4018

Modified Paths:
--------------
    trunk/catalog/admin/includes/gabarit/geo_zones/display_view.new.gab

Modified: trunk/catalog/admin/includes/gabarit/geo_zones/display_view.new.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/geo_zones/display_view.new.gab	2012-12-11 10:39:43 UTC (rev 4665)
+++ trunk/catalog/admin/includes/gabarit/geo_zones/display_view.new.gab	2012-12-21 08:03:55 UTC (rev 4666)
@@ -8,28 +8,63 @@
   @encode UTF-8
 */
 ?>
-<h3><?php echo __('heading title'); ?></h3>
+<h3><?php echo __('text info heading edit zone'); ?></h3>
 
 
-  <div class="button_nav">
-    <?php if (!geo_zones::$action) echo '<a class="button" href="' . tep_href_link(FILENAME_GEO_ZONES,  tep_get_all_get_params(array('action','sID')). '&amp;action=new_zone') . '">' .tep_image(DIR_WS_ICONS . 'icon_add_new.png', IMAGE_ICON_INFO).' '. __('image insert new zone') . '</a>'; ?>
-  </div>
 
-  <div class="box_uniq">
-<!--     <div class="box_left"> -->
-      <table class="dataTable">
-        <thead>
-	  <tr>
-	    <th style="width:20px;"><?php echo __('table heading tax zones type'); ?></th>
-			<th style="width:20px;"><?php echo __('table heading tax zones grp'); ?></th>
-	    <th><?php echo __('table heading tax zones'); ?></th>
-	    <th><?php echo __('table heading tax zones desc'); ?></th>
-	    <th><?php echo __('table heading nbr sub'); ?></th>
-	    <th class="tright"><?php echo __('table heading action'); ?></th>
-	  </tr>
-	</thead>
-	<tbody>
-	<!--   AJAX BLOCK -->
-      </tbody>
-    </table>
-</div>
\ No newline at end of file
+				<p><?php echo __('text info edit zone intro'); ?></p>
+
+
+				<?php echo tep_draw_form('zones', geo_zones::FILENAME, 'zID=' . geo_zones::$zInfo->geo_zone_id . '&amp;action=insert_zone') ?>
+				<div class="box_form">
+				<!--
+				<div class="button_nav">
+				<?php //if (!geo_zones::$action) echo '<a class="button" href="' . tep_href_link(FILENAME_GEO_ZONES,  tep_get_all_get_params(array('action','sID')). '&amp;action=new_zone') . '">' .tep_image(DIR_WS_ICONS . 'icon_add_new.png', IMAGE_ICON_INFO).' '. __('image insert new zone') . '</a>'; ?>
+				</div>-->
+
+    <fieldset class="block_input">
+
+					<!--     <div class="box_left"> -->
+
+					<p class="block_input">
+						<label for="geo_zone_name" ><?php echo __('text info zone name'); ?></label>
+						<?php echo tep_draw_input_field('geo_zone_name','','') ?>
+					</p>
+
+					<p class="block_input">
+						<label for="geo_zone_description" ><?php echo __('text info zone description') ; ?></label>
+						<?php echo tep_draw_input_field('geo_zone_description','', '') ?>
+					</p>
+
+					<p class="block_input">
+						<label for="geo_zone_name" ><?php echo __('text info zone name'); ?></label>
+						<?php echo tep_draw_pull_down_menu('geo_zone_type',geo_zones::$geoTypes,'') ?>
+					</p>
+
+					<p class="block_input">
+						<label for="geo_zone_name" ><?php echo __('text info zone grp'); ?></label>
+						<span class="nobr">
+							<?php echo tep_draw_pull_down_menu('geo_zone_grp',geo_zones::$geoGrpDispo,'') ?>
+							<?php echo tep_draw_input_field('geo_zone_grp_add','','') ?>
+						</span>
+					</p>
+    </fieldset>
+
+    <fieldset class="block_input">
+			<h4><?php echo __('geo_zone text info zone pre-programmed'); ?></h4>
+
+			<p class="block_input">
+				<label for="geo_zone_name" ><?php echo __('text info zone name'); ?></label>
+				<?php echo tep_draw_pull_down_menu('geo_zone_model',geo_zones::$zInfo->modeleszones,'') ?>
+			</p>
+    </fieldset>
+
+    <fieldset class="block_input">
+			<div class="block_input button_nav" style="width:95%;">
+				<?php
+				echo tep_image_submit('', IMAGE_INSERT);
+				echo tep_js_back(tep_href_link(geo_zones::FILENAME, '&amp;zID=' . geo_zones::$zInfo->geo_zone_id ), IMAGE_CANCEL) ;
+				?>
+			</div>
+    </fieldset>
+		</div>
\ No newline at end of file

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

[Oscss-commit] SF.net SVN: oscss:[4665] trunk/catalog/includes/functions/validations.php

[<os...@us...>]

Revision: 4665
          http://oscss.svn.sourceforge.net/oscss/?rev=4665&view=rev
Author:   oscim
Date:     2012-12-11 10:39:43 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
correction erreur dans la detection des email invalide , les accent pouvais ?\195?\170tre utilis?\195?\169

Modified Paths:
--------------
    trunk/catalog/includes/functions/validations.php

Modified: trunk/catalog/includes/functions/validations.php
===================================================================
--- trunk/catalog/includes/functions/validations.php	2012-11-22 17:59:54 UTC (rev 4664)
+++ trunk/catalog/includes/functions/validations.php	2012-12-11 10:39:43 UTC (rev 4665)
@@ -42,7 +42,7 @@
 function tep_validate_email_inclus($email) {
   $valid_address = true;
 
-  $mail_pat = '^(.+)@(.+)$';
+  $mail_pat = '^([a-z0-9_.-]+)@([a-z0-9_.-]+)$';
   $valid_chars = "[^] \(\)<>@,;:\.\\\"\[]";
   $atom = "$valid_chars+";
   $quoted_user='(\"[^\"]*\")';

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

[Oscss-commit] SF.net SVN: oscss:[4664] branches/2.1.1/catalog/admin/includes/modules/ configuration/modstatus.php

[<os...@us...>]

Revision: 4664
          http://oscss.svn.sourceforge.net/oscss/?rev=4664&view=rev
Author:   oscim
Date:     2012-11-22 17:59:54 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
correction coquille

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

Modified: branches/2.1.1/catalog/admin/includes/modules/configuration/modstatus.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/configuration/modstatus.php	2012-11-07 15:53:14 UTC (rev 4663)
+++ branches/2.1.1/catalog/admin/includes/modules/configuration/modstatus.php	2012-11-22 17:59:54 UTC (rev 4664)
@@ -9,7 +9,7 @@
   @encode UTF-8
   @class modstatus
   @brief Manage All status in table status, for all status type
-		La modification des status 
+		La modification des status
 */
 
 
@@ -217,7 +217,7 @@
 					$sql_data['name'] = tep_db_prepare_input($list_status_name_array[$language_id]) ;
 
 
-					if ($action == 'insert') 
+					if ($action == 'insert')
 						sqlstatus::create($sql_data);
 					else
 						sqlstatus::update($sql_data);
@@ -230,7 +230,6 @@
 
 				tep_redirect(tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','sID'),false).  '&sID=' . $list_status_id));
 			break;
-
 			case 'deleteconfirm':
 				$sID = tep_db_prepare_input($_GET['sID']);
 
@@ -241,7 +240,7 @@
 					tep_db_query("update " . TABLE_CONFIGURATION . " set configuration_value = '' where configuration_key = 'DEFAULT_ORDERS_STATUS_ID'");
 				}
 
-				tep_db_query("delete from " . TABLE_STATUS . " where orders_status_id = '" . tep_db_input($sID) . "'");
+				tep_db_query("delete from " . TABLE_STATUS . " where status_id = '" . tep_db_input($sID) . "'");
 
 				tep_redirect(tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','sID'),false)));
       break;
@@ -249,9 +248,9 @@
       case 'delete':
 				$sID = tep_db_prepare_input($_GET['sID']);
 /**
-	TODO Utilisation sqlxxx + dependance shipping/service/produits/... !!! 
-		@date 26/03/2012 A revoir , prendre en charge le type de status , et le control sur les table qui en depende . 
-		@date 26/03/2012 A revoir , prendre en charge le type de status , et le control sur les table qui en depende . 
+	TODO Utilisation sqlxxx + dependance shipping/service/produits/... !!!
+		@date 26/03/2012 A revoir , prendre en charge le type de status , et le control sur les table qui en depende .
+		@date 26/03/2012 A revoir , prendre en charge le type de status , et le control sur les table qui en depende .
 */
 				$status_query = tep_db_query("select count(*) as count from " . TABLE_ORDERS . " where orders_status = '" . (int)$sID . "'");
 				$status = tep_db_fetch_array($status_query);

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

[Oscss-commit] SF.net SVN: oscss:[4663] branches/2.1.1/catalog/admin/includes/modules/ configuration/modstatus.php

[<os...@us...>]

Revision: 4663
          http://oscss.svn.sourceforge.net/oscss/?rev=4663&view=rev
Author:   oscim
Date:     2012-11-07 15:53:14 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
coquille lors modification status negatif 

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

Modified: branches/2.1.1/catalog/admin/includes/modules/configuration/modstatus.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/configuration/modstatus.php	2012-11-06 20:01:52 UTC (rev 4662)
+++ branches/2.1.1/catalog/admin/includes/modules/configuration/modstatus.php	2012-11-07 15:53:14 UTC (rev 4663)
@@ -203,7 +203,7 @@
 									'color' => $list_status_hexacolor
 									);
 
-				if($list_status_id > 0)
+				if(!empty($list_status_id) )
 					$sql_data['id'] = $list_status_id ;
 
 

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

[Oscss-commit] SF.net SVN: oscss:[4662] branches/2.1.1/catalog/admin/includes/modules/ pages/products.php

[<os...@us...>]

Revision: 4662
          http://oscss.svn.sourceforge.net/oscss/?rev=4662&view=rev
Author:   oscim
Date:     2012-11-06 20:01:52 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
coquille

Modified Paths:
--------------
    branches/2.1.1/catalog/admin/includes/modules/pages/products.php

Modified: branches/2.1.1/catalog/admin/includes/modules/pages/products.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/products.php	2012-11-06 19:59:26 UTC (rev 4661)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/products.php	2012-11-06 20:01:52 UTC (rev 4662)
@@ -1018,7 +1018,7 @@
 
 				if( DataTypes::is_active('featured')) {
 					$query_raw .=	" LEFT JOIN " . TABLE_FEATURED_DATA . " fada ON( fada.datatype_id=p.products_id AND datatype = 'product' ) ";
-					$query_raw .=	" JOIN " . TABLE_FEATURED_DESCRIPTION . " fad ON( fad.featured_id=fada.featured_id AND fad.languages_id = '".(int)$adjust->languages_id."' ) ";
+					$query_raw .=	" LEFT JOIN " . TABLE_FEATURED_DESCRIPTION . " fad ON( fad.featured_id=fada.featured_id AND fad.languages_id = '".(int)$adjust->languages_id."' ) ";
 				}
 
 				/* DEB  Sub module add table  */

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

[Oscss-commit] SF.net SVN: oscss:[4661] branches/2.1.1/catalog/admin/includes/modules

[<os...@us...>]

Revision: 4661
          http://oscss.svn.sourceforge.net/oscss/?rev=4661&view=rev
Author:   oscim
Date:     2012-11-06 19:59:26 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
Optimisation des requetes sql 

Modified Paths:
--------------
    branches/2.1.1/catalog/admin/includes/modules/pages/products.php
    branches/2.1.1/catalog/admin/includes/modules/products/header_tags.php

Modified: branches/2.1.1/catalog/admin/includes/modules/pages/products.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/products.php	2012-11-06 08:38:12 UTC (rev 4660)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/products.php	2012-11-06 19:59:26 UTC (rev 4661)
@@ -1004,12 +1004,12 @@
 				$query_raw = "select ".$adjust->listfields;
 
 				$query_raw .=",  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 . "') ";
+											" 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')){
 					$query_raw .=" LEFT JOIN " . TABLE_PRODUCTS_TO_CATEGORIES . " p2p  ON(p.products_id = p2p.products_id  ) ".
-											" LEFT JOIN " . TABLE_CATEGORIES . " cat ON( cat.categories_id =p2p.categories_id ) ".
-											" LEFT JOIN " . TABLE_CATEGORIES_DESCRIPTION . " catd ON( catd.categories_id =p2p.categories_id AND catd.language_id='".(int)$adjust->languages_id."' ) ";
+											" JOIN " . TABLE_CATEGORIES . " cat ON( cat.categories_id =p2p.categories_id ) ".
+											" 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'))
@@ -1018,7 +1018,7 @@
 
 				if( DataTypes::is_active('featured')) {
 					$query_raw .=	" LEFT JOIN " . TABLE_FEATURED_DATA . " fada ON( fada.datatype_id=p.products_id AND datatype = 'product' ) ";
-					$query_raw .=	" LEFT JOIN " . TABLE_FEATURED_DESCRIPTION . " fad ON( fad.featured_id=fada.featured_id AND fad.languages_id = '".(int)$adjust->languages_id."' ) ";
+					$query_raw .=	" JOIN " . TABLE_FEATURED_DESCRIPTION . " fad ON( fad.featured_id=fada.featured_id AND fad.languages_id = '".(int)$adjust->languages_id."' ) ";
 				}
 
 				/* DEB  Sub module add table  */

Modified: branches/2.1.1/catalog/admin/includes/modules/products/header_tags.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/products/header_tags.php	2012-11-06 08:38:12 UTC (rev 4660)
+++ branches/2.1.1/catalog/admin/includes/modules/products/header_tags.php	2012-11-06 19:59:26 UTC (rev 4661)
@@ -98,7 +98,7 @@
 			case 'tables':
 
 				$array['fht'] =	" LEFT JOIN " . TABLE_FULL_TAG . " fht ON( fht.page_id=p.products_id AND fht.page_type='product' ) ";
-				$array['fhtd'] =	" LEFT JOIN " . TABLE_FULL_TAG_DESCRIPTION . " fhtd ON( fht.tag_id=fhtd.tag_id AND fhtd.language_id = '".(int)$opt['languages_id']."' ) ";
+				$array['fhtd'] =	" JOIN " . TABLE_FULL_TAG_DESCRIPTION . " fhtd ON( fht.tag_id=fhtd.tag_id AND fhtd.language_id = '".(int)$opt['languages_id']."' ) ";
 
 			break;
 		}

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

[Oscss-commit] SF.net SVN: oscss:[4660] branches/2.1.1/catalog/install/includes/sql/mysql/ upgrade/2.1.0_2.1.1/tables

[<os...@us...>]

Revision: 4660
          http://oscss.svn.sourceforge.net/oscss/?rev=4660&view=rev
Author:   oscim
Date:     2012-11-06 08:38:12 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
coquille dans les sql d'upgrade

Modified Paths:
--------------
    branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_m_files_to_right.sql
    branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_categories.sql

Modified: branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_m_files_to_right.sql
===================================================================
--- branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_m_files_to_right.sql	2012-11-05 21:47:54 UTC (rev 4659)
+++ branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_m_files_to_right.sql	2012-11-06 08:38:12 UTC (rev 4660)
@@ -16,7 +16,7 @@
 
 CREATE TABLE  osc_admin_m_files_to_right (
   files_id int(11) DEFAULT NULL,
-  type_id int(1) DEFAULT '0',
+  type int(1) DEFAULT '0',
   ref_id int(11) NOT NULL,
   action varchar(64) DEFAULT NULL,
   UNIQUE KEY filesgroup (files_id,type_id,action)

Modified: branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_categories.sql
===================================================================
--- branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_categories.sql	2012-11-05 21:47:54 UTC (rev 4659)
+++ branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_categories.sql	2012-11-06 08:38:12 UTC (rev 4660)
@@ -15,6 +15,6 @@
 ALTER TABLE osc_categories ADD categories_datatype varchar(64) NOT NULL DEFAULT 'product,' COMMENT 'list type separated by ,' AFTER categories_id;
 ALTER TABLE osc_categories ADD categories_cpath varchar(64) NOT NULL AFTER parent_id;
 
+ALTER TABLE osc_categories ADD sortchids VARCHAR( 150 );
+ALTER TABLE osc_categories ADD sortchids_datatype VARCHAR( 150 );
 
-ALTER TABLE osc_categories CHANGE sortchids_products sortchids VARCHAR( 150 ) ,
-CHANGE sortchids_content sortchids_datatype VARCHAR( 150 ) ;

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

[Oscss-commit] SF.net SVN: oscss:[4659] branches/2.1.1/catalog

[<os...@us...>]

Revision: 4659
          http://oscss.svn.sourceforge.net/oscss/?rev=4659&view=rev
Author:   oscim
Date:     2012-11-05 21:47:54 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
correction coquille , add boutton select all 

Modified Paths:
--------------
    branches/2.1.1/catalog/admin/includes/header.php
    branches/2.1.1/catalog/admin/includes/modules/pages/orders.php
    branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_holding_orders_products.sql
    branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_orders_products.sql
    branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_orders_products.sql

Modified: branches/2.1.1/catalog/admin/includes/header.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/header.php	2012-11-05 15:24:36 UTC (rev 4658)
+++ branches/2.1.1/catalog/admin/includes/header.php	2012-11-05 21:47:54 UTC (rev 4659)
@@ -117,19 +117,20 @@
       "bProcessing": true,
       "bServerSide": true,
       "oSearch": { "sSearch": "", "bEscapeRegex": true },
+			"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
       "oLanguage": {
-      "sLengthMenu": "<?php echo sprintf(TEXT_MAXI_ROW_BY_PAGE,"_MENU_")?>",
-      "sZeroRecords": "Nothing found - sorry",
-      "sInfo": "<?php echo sprintf(TEXT_DISPLAY_NUMBER_OF,"_START_","_END_","_TOTAL_")?>",
-      "sInfoEmtpy": "Showing 0 to 0 of 0 records",
-      "sInfoFiltered": "<?php echo sprintf(TEXT_FILTRED_ON,"_MAX_")?> ",
-      "sSearch": "<?php echo IMAGE_SEARCH ?>",
-      "oPaginate": {
-	      "sFirst":    "<?php echo FIRST ?>",
-	      "sPrevious": "<?php echo PREV  ?>",
-	      "sNext":     "<?php echo NEXT ?>",
-	      "sLast":     "<?php echo PREVIOUS ?>"
-      }
+				"sLengthMenu": "<?php echo sprintf(TEXT_MAXI_ROW_BY_PAGE,"_MENU_")?>",
+				"sZeroRecords": "Nothing found - sorry",
+				"sInfo": "<?php echo sprintf(TEXT_DISPLAY_NUMBER_OF,"_START_","_END_","_TOTAL_")?>",
+				"sInfoEmtpy": "Showing 0 to 0 of 0 records",
+				"sInfoFiltered": "<?php echo sprintf(TEXT_FILTRED_ON,"_MAX_")?> ",
+				"sSearch": "<?php echo IMAGE_SEARCH ?>",
+				"oPaginate": {
+					"sFirst":    "<?php echo FIRST ?>",
+					"sPrevious": "<?php echo PREV  ?>",
+					"sNext":     "<?php echo NEXT ?>",
+					"sLast":     "<?php echo PREVIOUS ?>"
+				}
       },
       <?php if( ($col=call_user_func(array(tep_extrac_querystring(JSONSTATMENT,'type'), 'tep_get_modele'))) && is_array($col)): ?>
       "aoColumns": [

Modified: branches/2.1.1/catalog/admin/includes/modules/pages/orders.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/orders.php	2012-11-05 15:24:36 UTC (rev 4658)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/orders.php	2012-11-05 21:47:54 UTC (rev 4659)
@@ -255,8 +255,13 @@
 						0 =>array('width'=>'2%', 'class'=>'tcenter', 'txt'=>'&nbsp;' ),
 						1 =>array('width'=>'2%', 'class'=>'tcenter', 'txt'=>'&nbsp;' ),
 						);
-				self::$InitInfo['tfooter']['listing']=self::$InitInfo['theader']['listing'];
+				self::$InitInfo['tfooter']['listing']=array(
+						0 =>array('width'=>'2%', 'class'=>'tcenter', 'txt'=>'&nbsp;' ),
+						1 =>array('width'=>'2%', 'class'=>'tcenter', 'txt'=>'<input type="checkbox" id="select_all" name="select_all">' ),
+						);
 
+
+
 				self::$InitInfo['modele']['listing']=array(
 								0 =>false,
 								1 =>false,
@@ -1059,6 +1064,7 @@
 				$query_raw = "SELECT DISTINCT ".$adjust->listfields.
 											" FROM " . TABLE_ORDERS . " o ".
 											" LEFT JOIN " . TABLE_ORDERS_TOTAL . " ot on (o.orders_id = ot.orders_id) ".
+											" LEFT JOIN " . TABLE_ORDERS_PRODUCTS . " op on (op.orders_id = o.orders_id) ".
 											" LEFT JOIN " . TABLE_STATUS . " s ON(o.orders_status = s.status_id  and s.status_type='orders' and s.language_id = '" . (int)$adjust->languages_id . "')  ".
 											" WHERE  ot.class = 'ot_total' ".$adjust->sWhere.
 											" ORDER BY  ".((!empty($adjust->sOrder)) ? $adjust->sOrder : 'o.orders_id DESC');
@@ -1305,7 +1311,11 @@
       $col=count(self::DTheaderTable());
       return array(
 		  0 => self::$InitInfo['tfooter']['listing'] ,
-		  1 =>array( array('colspan'=>$col, 'class'=>'tleft', 'txt'=>'<span class="fleft">'.__('action multiple') . ' ' . tep_draw_pull_down_menu('status_multi', array_merge(array(array('id' => '', 'text' => __('text action multiple orders'))), orders::$orders_statuses) ) . __('export: ') . tep_draw_pull_down_menu('modeexport', orders::$export->mode ).'</span> <span class="fleft" style="margin-left:50px;"> '. tep_image_submit('button_confirm.gif', IMAGE_CONFIRM, '' ).'</span>' ) )
+		  1 =>array( 
+						array(
+						'colspan'=>$col, 
+						'class'=>'tleft', 
+						'txt'=>'<span class="fleft">'.__('action multiple') . ' ' . tep_draw_pull_down_menu('status_multi', array_merge(array(array('id' => '', 'text' => __('text action multiple orders'))), orders::$orders_statuses) ) . __('export: ') . tep_draw_pull_down_menu('modeexport', orders::$export->mode ).'</span> <span class="fleft" style="margin-left:50px;"> '. tep_image_submit('button_confirm.gif', IMAGE_CONFIRM, '' ).'</span>' ) )
 	      ) ;
     }
     else
@@ -1339,7 +1349,7 @@
 					if(isset($orders['orders_status_name'])) $ord['orders_status_name']=sprintf( CsrtAction::getFormat('type_color'), $orders['orders_status_color'], $orders['orders_status_name'] );
 
 					$ord[0]=$orders['orders_id'];
-					$ord[1]=tep_draw_checkbox_field('action_multi['.$orders['orders_id'].']','action_mutli_'.$orders['orders_id'],$orders['orders_id']);
+					$ord[1]=tep_draw_checkbox_field('action_multi['.$orders['orders_id'].']','action_mutli_'.$orders['orders_id'],$orders['orders_id'], '','',' class="multi" ');
 					$ord['action']=self::get_item_action($ord);
 					$res[]=$ord;
 				}

Modified: branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_holding_orders_products.sql
===================================================================
--- branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_holding_orders_products.sql	2012-11-05 15:24:36 UTC (rev 4658)
+++ branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_holding_orders_products.sql	2012-11-05 21:47:54 UTC (rev 4659)
@@ -25,6 +25,7 @@
   products_tax decimal(7,4) default '0.0000' not null ,
   products_quantity int(2) default '0' not null ,
   products_stock_attributes varchar(255) default NULL,
+  products_stock_extra varchar(255) default NULL,
   products_returned tinyint(2) unsigned default '0' ,
   products_exchanged tinyint(2) default '0' not null ,
   products_exchanged_id int(11) default '0' not null ,

Modified: branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_orders_products.sql
===================================================================
--- branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_orders_products.sql	2012-11-05 15:24:36 UTC (rev 4658)
+++ branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_orders_products.sql	2012-11-05 21:47:54 UTC (rev 4659)
@@ -23,8 +23,9 @@
   products_price decimal(15,4) default '0.0000' not null ,
   final_price decimal(15,4) default '0.0000' not null ,
   products_tax decimal(7,4) default '0.0000' not null ,
-  products_quantity int(2) default '0' not null ,
+  products_quantity int(3) default '0' not null ,
   products_stock_attributes varchar(255) default NULL,
+  products_stock_extra varchar(255) default NULL,
   products_returned tinyint(2) default '0' null ,
   products_exchanged tinyint(2) default '0' not null ,
   products_exchanged_id int(11) default '0' not null ,

Modified: branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_orders_products.sql
===================================================================
--- branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_orders_products.sql	2012-11-05 15:24:36 UTC (rev 4658)
+++ branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_orders_products.sql	2012-11-05 21:47:54 UTC (rev 4659)
@@ -14,3 +14,6 @@
 
 
 ALTER TABLE osc_orders_products ADD products_type int(1) NOT NULL DEFAULT '1' AFTER products_id;
+ALTER TABLE osc_orders_products ADD products_stock_extra varchar(255) default NULL AFTER products_stock_attributes;
+
+  ,

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

[Oscss-commit] SF.net SVN: oscss:[4658] branches/2.1.1/catalog/includes/functions/general. php

[<os...@us...>]

Revision: 4658
          http://oscss.svn.sourceforge.net/oscss/?rev=4658&view=rev
Author:   oscim
Date:     2012-11-05 15:24:36 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
coquille

Modified Paths:
--------------
    branches/2.1.1/catalog/includes/functions/general.php

Modified: branches/2.1.1/catalog/includes/functions/general.php
===================================================================
--- branches/2.1.1/catalog/includes/functions/general.php	2012-11-05 10:18:57 UTC (rev 4657)
+++ branches/2.1.1/catalog/includes/functions/general.php	2012-11-05 15:24:36 UTC (rev 4658)
@@ -933,7 +933,7 @@
   @param boolean return / print
 */
 function tep_post_prepare_email($gabarit_template,$language,$myarray,$print=false){
-  global $title_email,$messageStack,$page;
+  global $title_email,$messageStack,$page, $language;
 
   $gabarit_template=(tep_not_null($gabarit_template))? $gabarit_template : 'defaut.tpl' ;
 

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

[Oscss-commit] SF.net SVN: oscss:[4657] branches/2.1.1/catalog/common/classes/ExtraUtility .php

[<os...@us...>]

Revision: 4657
          http://oscss.svn.sourceforge.net/oscss/?rev=4657&view=rev
Author:   oscim
Date:     2012-11-05 10:18:57 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
correction bug affichage valeur de selection dans les extra en fonction du type 

Modified Paths:
--------------
    branches/2.1.1/catalog/common/classes/ExtraUtility.php

Modified: branches/2.1.1/catalog/common/classes/ExtraUtility.php
===================================================================
--- branches/2.1.1/catalog/common/classes/ExtraUtility.php	2012-11-05 10:02:47 UTC (rev 4656)
+++ branches/2.1.1/catalog/common/classes/ExtraUtility.php	2012-11-05 10:18:57 UTC (rev 4657)
@@ -130,7 +130,29 @@
 
 		$flag_r = (($rows->required_status==1) ? self::$required: '');
 
-		if($active) $input .= $rows->input_value;
+		if($active){
+			switch((int)$rows->input_type) {
+				case 2:
+				case 3:
+				case 4:
+					foreach($rows->select_values as $k=>$item)
+						if($rows->input_value == $k) $input .= $item['text'];
+				break;
+				case 6:
+				case 7:
+					foreach($rows->select_values as $k=>$item)
+						$input .= $item['text'];
+				break;
+				/**
+					@remarks textarea input
+					@note support multi - language stock value
+				*/
+				case  5: // classic
+				case  0: // classic
+				default:
+					$input .= $rows->input_value;
+			}
+		}
 		else
 			switch((int)$rows->input_type) {
 

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

[Oscss-commit] SF.net SVN: oscss:[4656] branches/2.1.1/catalog/common/classes/price.php

[<os...@us...>]

Revision: 4656
          http://oscss.svn.sourceforge.net/oscss/?rev=4656&view=rev
Author:   oscim
Date:     2012-11-05 10:02:47 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
coquille calcul price in specific currency

Modified Paths:
--------------
    branches/2.1.1/catalog/common/classes/price.php

Modified: branches/2.1.1/catalog/common/classes/price.php
===================================================================
--- branches/2.1.1/catalog/common/classes/price.php	2012-11-05 08:51:59 UTC (rev 4655)
+++ branches/2.1.1/catalog/common/classes/price.php	2012-11-05 10:02:47 UTC (rev 4656)
@@ -240,7 +240,7 @@
        $currency_type = (!empty($currency) ? $currency : (_cst_bool('USE_DEFAULT_LANGUAGE_CURRENCY') ? LANGUAGE_CURRENCY : DEFAULT_CURRENCY) ) ;
 
     if ($calculate_currency_value == true) {
-      $number *= tep_not_null($currency_value) ? $currency_value : $this->get_currency_value($currency_type);
+      $number *= tep_not_null($currency_value) ? $currency_value : $this->get_currency_value( (!empty($currency_type)? $currency_type : $currency ));
       // if the selected currency is in the european euro-conversion and the default currency is euro, the currency will displayed in the national currency and euro currency
       if ( (DEFAULT_CURRENCY == 'EUR') && in_array($currency_type, array('DEM','BEF','LUF','ESP','FRF','IEP','ITL','NLG','ATS','PTE','FIM','GRD')) )
         $euro_string = ' <small>[' . $this->currency_format($number, true, 'EUR') . ']</small>';

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

[Oscss-commit] SF.net SVN: oscss:[4655] branches/2.1.1/catalog/admin/includes

[<os...@us...>]

Revision: 4655
          http://oscss.svn.sourceforge.net/oscss/?rev=4655&view=rev
Author:   oscim
Date:     2012-11-05 08:51:59 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
suite coquille

Modified Paths:
--------------
    branches/2.1.1/catalog/admin/includes/gabarit/orders/filter.products.gab
    branches/2.1.1/catalog/admin/includes/modules/pages/orders.php

Modified: branches/2.1.1/catalog/admin/includes/gabarit/orders/filter.products.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/orders/filter.products.gab	2012-11-05 07:53:50 UTC (rev 4654)
+++ branches/2.1.1/catalog/admin/includes/gabarit/orders/filter.products.gab	2012-11-05 08:51:59 UTC (rev 4655)
@@ -16,7 +16,7 @@
 <fieldset>
 			<p >
 				<label  for="filters[products]"><?php echo __('@orders text restrict products'); ?></label>
-				<?php echo tep_draw_pull_down_menu('filters[products]', array_merge( array(array('id'=>'', 'text'=>'--')),$r->fetchAllAssoc() ), $_SESSION['filters']['orders']['products'] ) ; ?>
+				<?php echo tep_draw_pull_down_menu('filters[products]', array_merge( array(array('id'=>'', 'text'=>'--')),$r->fetchAllAssoc() ), @$_SESSION['filters']['orders']['products'] ) ; ?>
 		</p>
 </fieldset>
 

Modified: branches/2.1.1/catalog/admin/includes/modules/pages/orders.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/orders.php	2012-11-05 07:53:50 UTC (rev 4654)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/orders.php	2012-11-05 08:51:59 UTC (rev 4655)
@@ -469,7 +469,7 @@
 				}
 
 
-				if(isset($_POST['filters']['products']) )
+				if(isset($_POST['filters']['products']) && $_POST['filters']['products'] > 0)
 						$_SESSION['filters'][__CLASS__]['products'] = tep_db_prepare_input($_POST['filters']['products']);
 				else
 						unset($_SESSION['filters'][__CLASS__]['products']);

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

[Oscss-commit] SF.net SVN: oscss:[4654] branches/2.1.1/catalog/admin/includes

[<os...@us...>]

Revision: 4654
          http://oscss.svn.sourceforge.net/oscss/?rev=4654&view=rev
Author:   oscim
Date:     2012-11-05 07:53:50 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
ajout d'un filtre sur les produit dans les listing des commandes

Modified Paths:
--------------
    branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt
    branches/2.1.1/catalog/admin/includes/modules/pages/orders.php

Added Paths:
-----------
    branches/2.1.1/catalog/admin/includes/gabarit/orders/filter.products.gab

Added: branches/2.1.1/catalog/admin/includes/gabarit/orders/filter.products.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/orders/filter.products.gab	                        (rev 0)
+++ branches/2.1.1/catalog/admin/includes/gabarit/orders/filter.products.gab	2012-11-05 07:53:50 UTC (rev 4654)
@@ -0,0 +1,23 @@
+<?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
+*/
+global $languages_id;
+
+$DB = Database::getInstance();
+$r = $DB->query($sql= "SELECT DISTINCT p.products_id as id, pd.products_name as text FROM ".TABLE_ORDERS_PRODUCTS." p LEFT JOIN ".TABLE_PRODUCTS_DESCRIPTION." pd ON(p.products_id = pd.products_id AND pd.language_id = '".$languages_id."') WHERE pd.products_name IS NOT NULL ");
+?>
+<fieldset>
+			<p >
+				<label  for="filters[products]"><?php echo __('@orders text restrict products'); ?></label>
+				<?php echo tep_draw_pull_down_menu('filters[products]', array_merge( array(array('id'=>'', 'text'=>'--')),$r->fetchAllAssoc() ), $_SESSION['filters']['orders']['products'] ) ; ?>
+		</p>
+</fieldset>
+
+

Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt	2012-11-03 10:14:58 UTC (rev 4653)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt	2012-11-05 07:53:50 UTC (rev 4654)
@@ -19,6 +19,7 @@
 	/* Filter */
 		$lang['view filtres for listing']="Options des filtres" ;
 		$lang['orders filter tab clause']="Filtre" ;
+		$lang['orders filter products tab clause']="Filtre produit" ;
 
 		$lang['@orders filter legend choose status']="Statut visible" ;
 		$lang['@orders filter legend choose dates']="Periode" ;
@@ -27,6 +28,8 @@
 		$lang['@orders text date end']="Fin" ;
 		$lang['@orders text date format']="Format (jj/mm/aaaa)" ;
 
+		$lang['@orders text restrict products']="Choisir un produit particulier" ;
+
 	/* Fields */
 		$lang['orders table heading order id']="n°" ;
 		$lang['orders table heading customers']="Clients" ;

Modified: branches/2.1.1/catalog/admin/includes/modules/pages/orders.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/orders.php	2012-11-03 10:14:58 UTC (rev 4653)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/orders.php	2012-11-05 07:53:50 UTC (rev 4654)
@@ -380,6 +380,12 @@
 				if(tep_not_null($_SESSION['filters']['dates']['end']))
 					self::$InitInfo['adjust']['sWhere'] .=" AND date_purchased <= '".tep_db_input($_SESSION['filters']['dates']['end'])."'";
 
+
+
+				if(isset($_SESSION['filters'][__CLASS__]['products']))
+					self::$InitInfo['adjust']['sWhere'] .=" AND op.products_id= '".tep_db_input($_SESSION['filters'][__CLASS__]['products'])."'";
+
+
 				/**
 					@remarks Active forms filter
 				*/
@@ -388,7 +394,12 @@
 									'title'=>__('orders filter tab clause'),
 									'content'=>tep_get_include_contents(__CLASS__.'/filter.clause'),
 								),
+								/// lnk to products
 								array(
+									'title'=>__('orders filter products tab clause'),
+									'content'=>tep_get_include_contents(__CLASS__.'/filter.products'),
+								),
+								array(
 									'title'=>__('orders filter tab fields'),
 									'type'=>'listfield'
 								),
@@ -457,6 +468,12 @@
 						$_SESSION['filters'][__CLASS__]['dates']['end'] = tep_date_raw(tep_db_prepare_input($_POST['filters']['dates']['end']));
 				}
 
+
+				if(isset($_POST['filters']['products']) )
+						$_SESSION['filters'][__CLASS__]['products'] = tep_db_prepare_input($_POST['filters']['products']);
+				else
+						unset($_SESSION['filters'][__CLASS__]['products']);
+
 				tep_redirect(tep_href_link(self::FILENAME));
 			break;
 

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