Revision: 6494 http://care2002.svn.sourceforge.net/care2002/?rev=6494&view=rev Author: mizuko Date: 2010-06-30 12:35:43 +0000 (Wed, 30 Jun 2010)
Log Message: ----------- see #54 Modified Paths: -------------- care2x/branches/gettext/modules/supplier/supplier-orderlist-final.php care2x/branches/gettext/modules/supplier/supply-bestellkatalog.php care2x/branches/gettext/modules/supplier/supply-bestellkorb.php Added Paths: ----------- care2x/branches/gettext/modules/supplier/supplier-ordercatalog-popinfo.php Removed Paths: ------------- care2x/branches/gettext/modules/supplier/supplier-bestellkatalog-popinfo.php Deleted: care2x/branches/gettext/modules/supplier/supplier-bestellkatalog-popinfo.php =================================================================== --- care2x/branches/gettext/modules/supplier/supplier-bestellkatalog-popinfo.php 2010-06-30 12:32:20 UTC (rev 6493) +++ care2x/branches/gettext/modules/supplier/supplier-bestellkatalog-popinfo.php 2010-06-30 12:35:43 UTC (rev 6494) @@ -1,61 +0,0 @@ -<?php -error_reporting(E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR); -require('./roots.php'); -require($root_path.'include/helpers/inc_environment_global.php'); - -define('LANG_FILE','products.php'); -define("NO_2LEVEL_CHK","1"); -require_once($root_path.'include/helpers/inc_front_chain_lang.php'); - -# Set order catalog flag -$bcat=true; - -# Load search routine -require('includes/inc_products_search_mod.php'); - -# Start Smarty templating here - /** - * LOAD Smarty - */ - - # Note: it is advisable to load this after the inc_front_chain_lang.php so - # that the smarty script can use the user configured template theme - - require_once($root_path.'gui/smarty_template/smarty_care.class.php'); - $smarty = new smarty_care('common',TRUE,FALSE); - -# Title in the title bar - $smarty->assign('sToolbarTitle',$title_art); - - # hide back button - $smarty->assign('pbBack',FALSE); - - # href for the help button - $smarty->assign('pbHelp',"javascript:gethelp()"); - - # href for the close button - $smarty->assign('breakfile','javascript:window.close()'); - - # Window bar title - $smarty->assign('sWindowTitle',$title_art); - - # Assign Body Onload javascript code - $smarty->assign('sOnLoadJs','onLoad="if (window.focus) window.focus()"'); - - # Load the search result in form - require('includes/inc_products_search_result_mod.php'); - - if($goback) $sTemp= "javascript:window.history.back()"; - else $sTemp= "javascript:window.close()"; - - $smarty->assign('sBreakButton','<a href="'.$sTemp.'"><img '.createLDImgSrc($root_path,'close2.gif','0').'"></a>'); - - # Assign the form template to mainframe - - $smarty->assign('sMainBlockIncludeFile','products/form.tpl'); - - /** - * show Template - */ - $smarty->display('common/mainframe.tpl'); -?> Copied: care2x/branches/gettext/modules/supplier/supplier-ordercatalog-popinfo.php (from rev 6440, care2x/branches/gettext/modules/supplier/supplier-bestellkatalog-popinfo.php) =================================================================== --- care2x/branches/gettext/modules/supplier/supplier-ordercatalog-popinfo.php (rev 0) +++ care2x/branches/gettext/modules/supplier/supplier-ordercatalog-popinfo.php 2010-06-30 12:35:43 UTC (rev 6494) @@ -0,0 +1,61 @@ +<?php +error_reporting(E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR); +require('./roots.php'); +require($root_path.'include/helpers/inc_environment_global.php'); + +define('LANG_FILE','products.php'); +define("NO_2LEVEL_CHK","1"); +require_once($root_path.'include/helpers/inc_front_chain_lang.php'); + +# Set order catalog flag +$bcat=true; + +# Load search routine +require('includes/inc_products_search_mod.php'); + +# Start Smarty templating here + /** + * LOAD Smarty + */ + + # Note: it is advisable to load this after the inc_front_chain_lang.php so + # that the smarty script can use the user configured template theme + + require_once($root_path.'gui/smarty_template/smarty_care.class.php'); + $smarty = new smarty_care('common',TRUE,FALSE); + +# Title in the title bar + $smarty->assign('sToolbarTitle',$title_art); + + # hide back button + $smarty->assign('pbBack',FALSE); + + # href for the help button + $smarty->assign('pbHelp',"javascript:gethelp()"); + + # href for the close button + $smarty->assign('breakfile','javascript:window.close()'); + + # Window bar title + $smarty->assign('sWindowTitle',$title_art); + + # Assign Body Onload javascript code + $smarty->assign('sOnLoadJs','onLoad="if (window.focus) window.focus()"'); + + # Load the search result in form + require('includes/inc_products_search_result_mod.php'); + + if($goback) $sTemp= "javascript:window.history.back()"; + else $sTemp= "javascript:window.close()"; + + $smarty->assign('sBreakButton','<a href="'.$sTemp.'"><img '.createLDImgSrc($root_path,'close2.gif','0').'"></a>'); + + # Assign the form template to mainframe + + $smarty->assign('sMainBlockIncludeFile','products/form.tpl'); + + /** + * show Template + */ + $smarty->display('common/mainframe.tpl'); +?> Modified: care2x/branches/gettext/modules/supplier/supplier-orderlist-final.php =================================================================== --- care2x/branches/gettext/modules/supplier/supplier-orderlist-final.php 2010-06-30 12:32:20 UTC (rev 6493) +++ care2x/branches/gettext/modules/supplier/supplier-orderlist-final.php 2010-06-30 12:35:43 UTC (rev 6494) @@ -77,7 +77,7 @@ <script language=javascript> function popinfo(b) { - urlholder="supplier-bestellkatalog-popinfo.php<?php echo URL_APPEND; ?>&cat=<?php echo $cat; ?>&keyword="+b+"&mode=search"; + urlholder="supplier-ordercatalog-popinfo.php<?php echo URL_APPEND; ?>&cat=<?php echo $cat; ?>&keyword="+b+"&mode=search"; ordercatwin=window.open(urlholder,"ordercat","width=850,height=550,menubar=no,resizable=yes,scrollbars=yes"); } function checkform(d) { Modified: care2x/branches/gettext/modules/supplier/supply-bestellkatalog.php =================================================================== --- care2x/branches/gettext/modules/supplier/supply-bestellkatalog.php 2010-06-30 12:32:20 UTC (rev 6493) +++ care2x/branches/gettext/modules/supplier/supply-bestellkatalog.php 2010-06-30 12:35:43 UTC (rev 6494) @@ -47,7 +47,7 @@ <script language=javascript> function popinfo(b){ - urlholder="supplier-bestellkatalog-popinfo.php<?php echo URL_REDIRECT_APPEND; ?>&keyword="+b+"&mode=search&cat=<?php echo $cat; ?>"; + urlholder="supplier-ordercatalog-popinfo.php<?php echo URL_REDIRECT_APPEND; ?>&keyword="+b+"&mode=search&cat=<?php echo $cat; ?>"; ordercatwin=window.open(urlholder,"ordercat","width=850,height=550,menubar=no,resizable=yes,scrollbars=yes"); } Modified: care2x/branches/gettext/modules/supplier/supply-bestellkorb.php =================================================================== --- care2x/branches/gettext/modules/supplier/supply-bestellkorb.php 2010-06-30 12:32:20 UTC (rev 6493) +++ care2x/branches/gettext/modules/supplier/supply-bestellkorb.php 2010-06-30 12:35:43 UTC (rev 6494) @@ -199,7 +199,7 @@ <script language=javascript> function popinfo(b) { - urlholder="supplier-bestellkatalog-popinfo.php?sid=<?php echo "$sid&lang=$lang&userck=$userck"; ?>&keyword="+b+"&mode=search&cat=<?php echo $cat ?>"; + urlholder="supplier-ordercatalog-popinfo.php?sid=<?php echo "$sid&lang=$lang&userck=$userck"; ?>&keyword="+b+"&mode=search&cat=<?php echo $cat ?>"; ordercatwin=window.open(urlholder,"ordercat","width=850,height=550,menubar=no,resizable=yes,scrollbars=yes"); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first _______________________________________________ Care2002-developers mailing list Care2002-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/care2002-developers