Thread: [Oscss-commit] SF.net SVN: oscss:[3846] trunk/catalog (Page 2)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 3846
          http://oscss.svn.sourceforge.net/oscss/?rev=3846&view=rev
Author:   oscim
Date:     2011-10-25 09:04:08 +0000 (Tue, 25 Oct 2011)
Log Message:
-----------
Ajout element manquant des dashbords, ajout de widget de base a completer 
correction coquille notice class language

Modified Paths:
--------------
    trunk/catalog/admin/includes/data/dashboard.xml
    trunk/catalog/admin/includes/languages/fr_FR/modules/pages/index.txt
    trunk/catalog/common/classes/language.php
    trunk/catalog/common/oscss.version.xml
    trunk/catalog/install/includes/content/core.template_sample.php

Added Paths:
-----------
    trunk/catalog/admin/includes/languages/fr_FR/widget/HelpConfig.txt
    trunk/catalog/admin/includes/languages/fr_FR/widget/SsMenuConfig.txt
    trunk/catalog/admin/includes/widget/HelpConfig.php
    trunk/catalog/admin/includes/widget/SsMenuConfig.php

Modified: trunk/catalog/admin/includes/data/dashboard.xml
===================================================================

--- trunk/catalog/admin/includes/data/dashboard.xml	2011-10-24 21:23:43 UTC (rev 3845)
+++ trunk/catalog/admin/includes/data/dashboard.xml	2011-10-25 09:04:08 UTC (rev 3846)
@@ -85,4 +85,45 @@
       <widget>info_connexion</widget>
     </right>
   </configuration>
+
+  <config_100>
+    <left>
+	<widget>HelpConfig</widget>
+    </left>
+    <right>
+    	<widget>SsMenuConfig</widget>
+    </right>
+  </config_100>
+  <config_110>
+    <left>
+	<widget>HelpConfig</widget>
+    </left>
+    <right>
+    	<widget>SsMenuConfig</widget>
+    </right>
+  </config_110>
+  <config_120>
+    <left>
+	<widget>HelpConfig</widget>
+    </left>
+    <right>
+    	<widget>SsMenuConfig</widget>
+    </right>
+  </config_120>
+  <config_126>
+    <left>
+	<widget>HelpConfig</widget>
+    </left>
+    <right>
+    	<widget>SsMenuConfig</widget>
+    </right>
+  </config_126>
+    <config_127>
+    <left>
+	<widget>HelpConfig</widget>
+    </left>
+    <right>
+    	<widget>SsMenuConfig</widget>
+    </right>
+  </config_127>
 </root>
\ No newline at end of file

Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/index.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/index.txt	2011-10-24 21:23:43 UTC (rev 3845)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/index.txt	2011-10-25 09:04:08 UTC (rev 3846)
@@ -2,8 +2,8 @@
 /**
   @licence GPL 2005-2011  The osCSS developers - osCSS Open Source E-commerce
   @package osCSS-2 <www http://www.oscss.org>
-  @version 2.1.0
-  @date  23/03/11, 16:10
+  @version 2.1.1
+  @date  25/10/11, 11:00
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
 */
@@ -17,7 +17,13 @@
 $lang['heading title modules']="Aperçu" ;
 $lang['heading title configuration']="Aperçu de la configuration" ;
 
+$lang['heading title config_100']="Configuration de l'apparence" ;
+$lang['heading title config_110']="Configuration de base" ;
+$lang['heading title config_120']="Configuration avancée" ;
+$lang['heading title config_126']="Configuration de l'environement admin" ;
+$lang['heading title config_127']="Configuration commerciale de votre boutique" ;
 
+
 $lang['HEADING_STOCK']="Stock Alerte" ;
 $lang['TEXT_OSCSS_VERSION']="version d'osCSS" ;
 $lang['ERROR_FOPEN']="Ne peut pas vérifier la mise à jour si  'allow_url_fopen' est désactivé sur votre système.." ;

Added: trunk/catalog/admin/includes/languages/fr_FR/widget/HelpConfig.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/HelpConfig.txt	                        (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/HelpConfig.txt	2011-10-25 09:04:08 UTC (rev 3846)
@@ -0,0 +1,20 @@
+<?php
+/**
+  @licence GPL 2005-2011  The osCSS developers - osCSS Open Source E-commerce
+  @portion code Copyright (c) 2002 osCommerce
+  @package osCSS-2 <www http://www.oscss.org>
+  @version 2.1.1
+  @date  25/10/11, 11:00
+  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+  @encode UTF-8
+*/
+
+$lang['widget help config config_110']="Configuration de base" ;
+$lang['widget help config config_100']="Configuration de l'apparence" ;
+$lang['widget help config config_120']="Configuration avancée" ;
+$lang['widget help config config_126']="Configuration de l'environement admin" ;
+$lang['widget help config config_127']="Configuration commerciale de votre boutique" ;
+
+
+$lang['widget text help config_110']="Dans cette section de la configuration, vous pouvez regler les informations de base de la boutique. Cette Etape est un prerequis pour un le focntionnement normal de votre shop. Notez que ces information ne sont en generale reglé qu'une seule fois; " ;
+?>
\ No newline at end of file

Added: trunk/catalog/admin/includes/languages/fr_FR/widget/SsMenuConfig.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/SsMenuConfig.txt	                        (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/SsMenuConfig.txt	2011-10-25 09:04:08 UTC (rev 3846)
@@ -0,0 +1,16 @@
+<?php
+/**
+  @licence GPL 2005-2011  The osCSS developers - osCSS Open Source E-commerce
+  @portion code Copyright (c) 2002 osCommerce
+  @package osCSS-2 <www http://www.oscss.org>
+  @version 2.1.1
+  @date  25/10/11, 11:00
+  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+  @encode UTF-8
+*/
+$lang['widget ssmenuconfig config_110']="Menu" ;
+$lang['widget ssmenuconfig config_100']="Menu" ;
+$lang['widget ssmenuconfig config_120']="Menu" ;
+$lang['widget ssmenuconfig config_126']="Menu" ;
+$lang['widget ssmenuconfig config_127']="Menu" ;
+?>
\ No newline at end of file

Added: trunk/catalog/admin/includes/widget/HelpConfig.php
===================================================================
--- trunk/catalog/admin/includes/widget/HelpConfig.php	                        (rev 0)
+++ trunk/catalog/admin/includes/widget/HelpConfig.php	2011-10-25 09:04:08 UTC (rev 3846)
@@ -0,0 +1,28 @@
+<?php
+/**
+  @licence GPL 2005-2011  The osCSS developers - osCSS Open Source E-commerce
+  @portion code Copyright (c) 2002 osCommerce
+  @package osCSS-2 <www http://www.oscss.org>
+  @version 2.1.1
+  @date  25/10/11, 11:00
+  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+  @encode UTF-8
+*/
+?>
+
+<div id="HelpConfig" class="<?php echo $widg['class'] ?>" >
+  <h3><?php echo __('widget help config '.@$_GET['type']) ?></h3>
+
+
+  <?php
+    switch(@$_GET['type']){
+
+    case 'config_110':
+      echo __('widget text help config_110');
+    break;
+
+
+    }
+
+  ?>
+</div>
\ No newline at end of file

Added: trunk/catalog/admin/includes/widget/SsMenuConfig.php
===================================================================
--- trunk/catalog/admin/includes/widget/SsMenuConfig.php	                        (rev 0)
+++ trunk/catalog/admin/includes/widget/SsMenuConfig.php	2011-10-25 09:04:08 UTC (rev 3846)
@@ -0,0 +1,22 @@
+<?php
+/**
+  @licence GPL 2005-2011  The osCSS developers - osCSS Open Source E-commerce
+  @portion code Copyright (c) 2002 osCommerce
+  @package osCSS-2 <www http://www.oscss.org>
+  @version 2.1.1
+  @date  25/10/11, 11:00
+  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+  @encode UTF-8
+*/
+require_once(DIR_WS_FUNCTIONS.'lib.configuration.php');
+?>
+
+
+<div id="SsMenuConfig" class="<?php echo $widg['class'] ?>" >
+  <h3><?php echo __('widget ssmenuconfig '.@$_GET['type']) ?></h3>
+
+  <div id="ssmenu">
+    <?php echo tep_ssmenu_configuration((int)substr($_GET['type'],7)) ?>
+  </div>
+  <br />
+</div>
\ No newline at end of file

Modified: trunk/catalog/common/classes/language.php
===================================================================
--- trunk/catalog/common/classes/language.php	2011-10-24 21:23:43 UTC (rev 3845)
+++ trunk/catalog/common/classes/language.php	2011-10-25 09:04:08 UTC (rev 3846)
@@ -175,7 +175,7 @@
   private static function check_langue($directory,$public){
     $base=(!$public)? DIR_FS_ADMIN : DIR_FS_CATALOG ;
     if(is_dir($base.DIR_WS_LANGUAGES.$directory)) return true;
-    elseif(tep_cst_define('OSCSS_ALTERNATE') == true && is_dir(CORE_PATH.DIR_WS_LANGUAGES.$directory))  return true;
+//     elseif(tep_cst_define('OSCSS_ALTERNATE') == true && is_dir(CORE_PATH.DIR_WS_LANGUAGES.$directory))  return true;
     return false;
   }
 }

Modified: trunk/catalog/common/oscss.version.xml
===================================================================
--- trunk/catalog/common/oscss.version.xml	2011-10-24 21:23:43 UTC (rev 3845)
+++ trunk/catalog/common/oscss.version.xml	2011-10-25 09:04:08 UTC (rev 3846)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <core>
   <version>2.1.0 RC</version>
-  <svn>3786</svn>
+  <svn>3845</svn>
   <level>stable</level>
   <template_admin>oscss</template_admin>
 

Modified: trunk/catalog/install/includes/content/core.template_sample.php
===================================================================
--- trunk/catalog/install/includes/content/core.template_sample.php	2011-10-24 21:23:43 UTC (rev 3845)
+++ trunk/catalog/install/includes/content/core.template_sample.php	2011-10-25 09:04:08 UTC (rev 3846)
@@ -71,7 +71,7 @@
       Langue supplementaire
     */
 
-    include($this->fs_document_root.$this->ws_admin_rand.'/includes/modules/configuration/cfg_31.php');
+    include($this->fs_document_root.$this->ws_admin_rand.'/includes/modules/configuration/modlangue.php');
     if(isset($_POST['lang']) && is_array($_POST['lang']))
       foreach($_POST['lang'] as $key=>$cfg){
 	core::recurse_copy( $this->fs_document_root . 'install/'.I_WS_DATA.'language/'.$key.'/public/', $this->fs_document_root .'includes/languages/');
@@ -81,7 +81,7 @@
 	osc_db_query($sql="insert into ".$this->db['DB_TABLE_PREFIX']."languages (name,code,image,directory,sort_order) VALUES ('".core::l10n($key)."','".$key."','icon.gif','".$key."','2') " );
 	$insert_id=tep_db_insert_id();
 
-	cfg_31::repliqu_db_lang('1',$insert_id);
+	modlangue::repliqu_db_lang('1',$insert_id);
       }
 
 

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





Thread: [Oscss-commit] SF.net SVN: oscss:[3846] trunk/catalog (Page 2)

E-Commerce Shopping Cart

oscss-commit