You can subscribe to this list here.
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(57) |
May
(31) |
Jun
(21) |
Jul
(11) |
Aug
(23) |
Sep
(22) |
Oct
(36) |
Nov
(62) |
Dec
(85) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(24) |
Feb
(24) |
Mar
(65) |
Apr
(232) |
May
(118) |
Jun
(22) |
Jul
(54) |
Aug
(57) |
Sep
(14) |
Oct
(27) |
Nov
(16) |
Dec
(19) |
| 2013 |
Jan
(16) |
Feb
(12) |
Mar
(3) |
Apr
(17) |
May
(2) |
Jun
(30) |
Jul
(33) |
Aug
(19) |
Sep
(35) |
Oct
(58) |
Nov
(27) |
Dec
(64) |
| 2014 |
Jan
(102) |
Feb
(80) |
Mar
(15) |
Apr
(4) |
May
(3) |
Jun
(3) |
Jul
(5) |
Aug
(11) |
Sep
(15) |
Oct
|
Nov
(3) |
Dec
(5) |
| 2015 |
Jan
(5) |
Feb
(4) |
Mar
(2) |
Apr
(11) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(9) |
Nov
(10) |
Dec
|
| 2016 |
Jan
(3) |
Feb
(2) |
Mar
(18) |
Apr
(13) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
|
Nov
|
Dec
|
|
From: <hom...@us...> - 2014-09-08 13:59:36
|
Revision: 5229
http://sourceforge.net/p/oscss/svn/5229
Author: homer8173
Date: 2014-09-08 13:59:28 +0000 (Mon, 08 Sep 2014)
Log Message:
-----------
New themplate :
quick search activate
product thumbnail OK
Login Ok
Create account OK
Modified Paths:
--------------
trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/header.php
trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/module.php
trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/ssheader.php
trunk/catalog/install/data/templates/Modern_RWD/cfg/init.php
trunk/catalog/install/data/templates/Modern_RWD/css/bootstrap.css
trunk/catalog/install/data/templates/Modern_RWD/less/_custom.less
trunk/catalog/install/includes/language/fr_FR/osc_content_description.txt
Modified: trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/header.php
===================================================================
--- trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/header.php 2014-09-08 11:15:53 UTC (rev 5228)
+++ trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/header.php 2014-09-08 13:59:28 UTC (rev 5229)
@@ -69,6 +69,7 @@
$this->draw_file_header(); ?>
<link href='http://fonts.googleapis.com/css?family=Raleway:300,400,600,700' rel='stylesheet' type='text/css' />
+ <link href='http://fonts.googleapis.com/css?family=Lobster&subset=latin,cyrillic,latin-ext' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Oswald:700,400' rel='stylesheet' type='text/css'>
<link href='<?php echo 'templates/'.$template.'/css/'; ?>bootstrap.css' rel='stylesheet' type='text/css' media="screen" />
<link rel="shortcut icon" type="images/x-icon" href="favicon.ico" />
@@ -86,6 +87,7 @@
$("#hover_zone").show();
}
}).mouseleave(function(){$("#hover_zone").hide();});
+
// fix height of tabs pane at init
function egalize_height(cibles){
$(cibles).height("auto");
@@ -96,10 +98,39 @@
$(cibles).height(maxHeight);
}
egalize_height(".tab-pane");
- //
+ // on windows resize , egalize too
$( window ).bind('resize',function() {
egalize_height(".tab-pane");
});
+
+ // sorting element by :
+ function addQSParm(myUrl,name, value) {
+ var re = new RegExp("([?&]" + name + "=)[^&]+", "");
+ function add(sep) {
+ myUrl += sep + name + "=" + encodeURIComponent(value);
+ }
+ function change() {
+ myUrl = myUrl.replace(re, "$1" + encodeURIComponent(value));
+ }
+ if (myUrl.indexOf("?") === -1) {
+ add("?");
+ } else {
+ if (re.test(myUrl)) { change(); }
+ else { add("&"); }
+ }
+ return myUrl;
+ }
+ $('#sort-order-elements').change(function() {
+ newUrl=addQSParm(location.href,'order',$(this).val());
+ document.location.href=newUrl;
+ });
+ //init
+ function getUrlVars() {
+ var vars = {};
+ var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m,key,value) { vars[key] = value; });
+ return vars;
+ }
+ $('#sort-order-elements option[value="'+getUrlVars()["order"]+'"]').attr("selected", "selected");
});
</script>
</head>
Modified: trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/module.php
===================================================================
--- trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/module.php 2014-09-08 11:15:53 UTC (rev 5228)
+++ trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/module.php 2014-09-08 13:59:28 UTC (rev 5229)
@@ -38,7 +38,7 @@
<div class="col-xs-3 form-group form-group-sm">
<div class="input-group">
<div class="input-group-addon">Trier par </div>
- <select class="form-control input-sm">
+ <select id="sort-order-elements" class="form-control input-sm">
<option value="best-seller">Meilleures ventes</option>
<option value="new">Nouveauté</option>
<option value="price-up">Prix croissant</option>
@@ -85,22 +85,13 @@
</a>
</p>
<div class="images-extra">
- <ul class="list-group">
+ <ul class="list-group"><?php foreach ($ele->images as $key => $value) { if(($key+1) < $page->_conf_value('MAX_DISPLAY_IMG_THUMBNAIL')) {?>
<li class="list-group-item">
<a class="text-center" href="<?= $ele->GetHref() ?>" title="$ele->GetTitle()">
- <?= tep_image(DIR_WS_IMAGES . $ele->GetImage(), $ele->GetTitle(), $page->_conf_value('SMALL_IMAGE_WIDTH'), $page->_conf_value('SMALL_IMAGE_HEIGHT'), ' class="miniature"') ?>
+ <?= tep_image(DIR_WS_IMAGES .$value, $ele->GetTitle(), $page->_conf_value('SMALL_IMAGE_WIDTH'), $page->_conf_value('SMALL_IMAGE_HEIGHT'), ' class="miniature"') ?>
</a>
</li>
- <li class="list-group-item">
- <a class="text-center" href="<?= $ele->GetHref() ?>" title="$ele->GetTitle()">
- <?= tep_image(DIR_WS_IMAGES . $ele->GetImage(), $ele->GetTitle(), $page->_conf_value('SMALL_IMAGE_WIDTH'), $page->_conf_value('SMALL_IMAGE_HEIGHT'), ' class="miniature"') ?>
- </a>
- </li>
- <li class="list-group-item">
- <a class="text-center" href="<?= $ele->GetHref() ?>" title="$ele->GetTitle()">
- <?= tep_image(DIR_WS_IMAGES . $ele->GetImage(), $ele->GetTitle(), $page->_conf_value('SMALL_IMAGE_WIDTH'), $page->_conf_value('SMALL_IMAGE_HEIGHT'), ' class="miniature"') ?>
- </a>
- </li>
+ <?php } } ?>
</ul>
</div>
<?php if ( $page->_draw_in_page('PRODUCT_LIST_BUY_NOW')) { ?>
@@ -149,7 +140,7 @@
<?php if ( isset($themodule->module_db->split) && ($themodule->module_db->split->number_of_rows > 0)&& (in_array(PREV_NEXT_BAR_LOCATION ,array('2','3') )) ) { ?>
<div class="panel-footer" role="toolbar">
<div class="row">
- <div class="col-sm-3"><?php echo $themodule->module_db->split->display_count(TEXT_DISPLAY_NUMBER_OF); ?></div>
+ <div class="col-sm-offset-3 col-sm-3"><?php echo $themodule->module_db->split->display_count(TEXT_DISPLAY_NUMBER_OF); ?></div>
<div class="col-sm-3" >
<?php echo /*TEXT_RESULT_PAGE . ' ' .*/ $themodule->module_db->split->display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info'))); ?>
</div>
Modified: trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/ssheader.php
===================================================================
--- trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/ssheader.php 2014-09-08 11:15:53 UTC (rev 5228)
+++ trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/ssheader.php 2014-09-08 13:59:28 UTC (rev 5229)
@@ -25,9 +25,9 @@
<div id="navbar-collapse1" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-left">
<li class="divider"></li>
- <li><a href="#" class="btn btn-warning">S'enregistrer</a></li>
+ <li><a href="<?= tep_href_link(FILENAME_LOGIN, '', 'SSL') ?>" class="btn btn-warning"><?= __('link text login') ?></a></li>
<li class="divider"></li>
- <li><a href="#" class="btn btn-warning">S'identifier</a></li>
+ <li><a href="<?= tep_href_link(FILENAME_CREATE_ACCOUNT, '', 'SSL') ?>" class="btn btn-warning"><?= __('link text create account') ?></a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Réglages de langue<span class="caret "></span></a>
@@ -101,8 +101,8 @@
<?php endif; ?>
<li><a href="#">Blog</a></li>
</ul>
- <form class="navbar-form navbar-right input-group">
- <input type="search" class="form-control" placeholder="Rechercher..." />
+ <?php echo tep_draw_form('advanced_search', tep_href_link(FILENAME_ADVANCED_SEARCH, '', 'NONSSL', false), 'get', 'class="navbar-form navbar-right input-group"') ;?>
+ <?php echo tep_draw_input_field('keywords','keywords','', 'class="form-control" placeholder="'.ENTRY_KEYWORDS.'"',false,"search"); ?>
<span class="input-group-btn">
<input type="submit" class="btn btn-default" value="Go" />
</span>
Modified: trunk/catalog/install/data/templates/Modern_RWD/cfg/init.php
===================================================================
--- trunk/catalog/install/data/templates/Modern_RWD/cfg/init.php 2014-09-08 11:15:53 UTC (rev 5228)
+++ trunk/catalog/install/data/templates/Modern_RWD/cfg/init.php 2014-09-08 13:59:28 UTC (rev 5229)
@@ -70,6 +70,7 @@
$this->add_var_page('MAX_DISPLAY_PRODUCTS_NEW','15');
$this->add_var_page('MAX_DISPLAY_NEW_PRODUCTS','15');
$this->add_var_page('MAX_DISPLAY_PRODUCTS_NEW','25');
+ $this->add_var_page('MAX_DISPLAY_IMG_THUMBNAIL','3');
/**
Display block
Modified: trunk/catalog/install/data/templates/Modern_RWD/css/bootstrap.css
===================================================================
--- trunk/catalog/install/data/templates/Modern_RWD/css/bootstrap.css 2014-09-08 11:15:53 UTC (rev 5228)
+++ trunk/catalog/install/data/templates/Modern_RWD/css/bootstrap.css 2014-09-08 13:59:28 UTC (rev 5229)
@@ -1 +1 @@
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2014-09-08 11:15:56
|
Revision: 5228
http://sourceforge.net/p/oscss/svn/5228
Author: homer8173
Date: 2014-09-08 11:15:53 +0000 (Mon, 08 Sep 2014)
Log Message:
-----------
New themplate : fix tab height
Modified Paths:
--------------
trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/header.php
Modified: trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/header.php
===================================================================
--- trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/header.php 2014-09-06 17:59:09 UTC (rev 5227)
+++ trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/header.php 2014-09-08 11:15:53 UTC (rev 5228)
@@ -86,6 +86,20 @@
$("#hover_zone").show();
}
}).mouseleave(function(){$("#hover_zone").hide();});
+ // fix height of tabs pane at init
+ function egalize_height(cibles){
+ $(cibles).height("auto");
+ var heights = $(cibles).map(function() {
+ return $(this).height();
+ }).get(),
+ maxHeight = Math.max.apply(null, heights);
+ $(cibles).height(maxHeight);
+ }
+ egalize_height(".tab-pane");
+ //
+ $( window ).bind('resize',function() {
+ egalize_height(".tab-pane");
+ });
});
</script>
</head>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2014-09-06 17:59:14
|
Revision: 5227
http://sourceforge.net/p/oscss/svn/5227
Author: homer8173
Date: 2014-09-06 17:59:09 +0000 (Sat, 06 Sep 2014)
Log Message:
-----------
New template Modern Responsive Web Design based on bootstrap
+
New logo and favicon
Modified Paths:
--------------
trunk/catalog/admin/includes/template/oscss/img/1/oscss.png
trunk/catalog/favicon.ico
Added Paths:
-----------
trunk/catalog/install/data/templates/Modern_RWD/
trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/
trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/boxe.php
trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/content.php
trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/footer.php
trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/header.php
trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/module.php
trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/module.slideshow.php
trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/sidebar.php
trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/ssheader.php
trunk/catalog/install/data/templates/Modern_RWD/cfg/
trunk/catalog/install/data/templates/Modern_RWD/cfg/configuration.php
trunk/catalog/install/data/templates/Modern_RWD/cfg/init.php
trunk/catalog/install/data/templates/Modern_RWD/css/
trunk/catalog/install/data/templates/Modern_RWD/css/bootstrap.css
trunk/catalog/install/data/templates/Modern_RWD/css/images/
trunk/catalog/install/data/templates/Modern_RWD/css/images/footer.jpg
trunk/catalog/install/data/templates/Modern_RWD/css/images/gradient-white.png
trunk/catalog/install/data/templates/Modern_RWD/css/images/logo.png
trunk/catalog/install/data/templates/Modern_RWD/css/images/slider.jpg
trunk/catalog/install/data/templates/Modern_RWD/css/images/sprites.png
trunk/catalog/install/data/templates/Modern_RWD/desc.xml
trunk/catalog/install/data/templates/Modern_RWD/favicon.png
trunk/catalog/install/data/templates/Modern_RWD/fonts/
trunk/catalog/install/data/templates/Modern_RWD/fonts/glyphicons-halflings-regular.eot
trunk/catalog/install/data/templates/Modern_RWD/fonts/glyphicons-halflings-regular.svg
trunk/catalog/install/data/templates/Modern_RWD/fonts/glyphicons-halflings-regular.ttf
trunk/catalog/install/data/templates/Modern_RWD/fonts/glyphicons-halflings-regular.woff
trunk/catalog/install/data/templates/Modern_RWD/fonts/glyphicons-halflings-regular_1.eot
trunk/catalog/install/data/templates/Modern_RWD/fonts/glyphicons-halflings-regular_1.svg
trunk/catalog/install/data/templates/Modern_RWD/fonts/glyphicons-halflings-regular_1.ttf
trunk/catalog/install/data/templates/Modern_RWD/fonts/glyphicons-halflings-regular_1.woff
trunk/catalog/install/data/templates/Modern_RWD/includes/
trunk/catalog/install/data/templates/Modern_RWD/includes/boxes/
trunk/catalog/install/data/templates/Modern_RWD/includes/boxes/view_min_cart.php
trunk/catalog/install/data/templates/Modern_RWD/includes/gabarit/
trunk/catalog/install/data/templates/Modern_RWD/includes/gabarit/box.categories.gab
trunk/catalog/install/data/templates/Modern_RWD/includes/gabarit/box.currencies.gab
trunk/catalog/install/data/templates/Modern_RWD/includes/gabarit/box.generic.gab
trunk/catalog/install/data/templates/Modern_RWD/includes/gabarit/box.languages.gab
trunk/catalog/install/data/templates/Modern_RWD/includes/gabarit/pages/
trunk/catalog/install/data/templates/Modern_RWD/includes/gabarit/pages/listing.gab
trunk/catalog/install/data/templates/Modern_RWD/includes/gabarit/product/
trunk/catalog/install/data/templates/Modern_RWD/includes/gabarit/product/view.gab
trunk/catalog/install/data/templates/Modern_RWD/includes/languages/
trunk/catalog/install/data/templates/Modern_RWD/includes/languages/fr_FR.txt
trunk/catalog/install/data/templates/Modern_RWD/js/
trunk/catalog/install/data/templates/Modern_RWD/js/bootstrap.min.js
trunk/catalog/install/data/templates/Modern_RWD/js/holder.js
trunk/catalog/install/data/templates/Modern_RWD/js/jquery.1.10.2.min.js
trunk/catalog/install/data/templates/Modern_RWD/js/jquery.validate.1.7.min.js
trunk/catalog/install/data/templates/Modern_RWD/js/less-1.7.3.min.js
trunk/catalog/install/data/templates/Modern_RWD/less/
trunk/catalog/install/data/templates/Modern_RWD/less/_custom.less
trunk/catalog/install/data/templates/Modern_RWD/less/_sprites.less
trunk/catalog/install/data/templates/Modern_RWD/less/alerts.less
trunk/catalog/install/data/templates/Modern_RWD/less/badges.less
trunk/catalog/install/data/templates/Modern_RWD/less/bootstrap.less
trunk/catalog/install/data/templates/Modern_RWD/less/breadcrumbs.less
trunk/catalog/install/data/templates/Modern_RWD/less/button-groups.less
trunk/catalog/install/data/templates/Modern_RWD/less/buttons.less
trunk/catalog/install/data/templates/Modern_RWD/less/carousel.less
trunk/catalog/install/data/templates/Modern_RWD/less/close.less
trunk/catalog/install/data/templates/Modern_RWD/less/code.less
trunk/catalog/install/data/templates/Modern_RWD/less/component-animations.less
trunk/catalog/install/data/templates/Modern_RWD/less/dropdowns.less
trunk/catalog/install/data/templates/Modern_RWD/less/forms.less
trunk/catalog/install/data/templates/Modern_RWD/less/glyphicons.less
trunk/catalog/install/data/templates/Modern_RWD/less/grid.less
trunk/catalog/install/data/templates/Modern_RWD/less/input-groups.less
trunk/catalog/install/data/templates/Modern_RWD/less/jumbotron.less
trunk/catalog/install/data/templates/Modern_RWD/less/labels.less
trunk/catalog/install/data/templates/Modern_RWD/less/list-group.less
trunk/catalog/install/data/templates/Modern_RWD/less/media.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/alerts.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/background-variant.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/border-radius.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/buttons.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/center-block.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/clearfix.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/forms.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/gradients.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/grid-framework.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/grid.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/hide-text.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/image.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/labels.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/list-group.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/nav-divider.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/nav-vertical-align.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/opacity.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/pagination.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/panels.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/progress-bar.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/reset-filter.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/resize.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/responsive-visibility.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/size.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/tab-focus.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/table-row.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/text-emphasis.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/text-overflow.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins/vendor-prefixes.less
trunk/catalog/install/data/templates/Modern_RWD/less/mixins.less
trunk/catalog/install/data/templates/Modern_RWD/less/modals.less
trunk/catalog/install/data/templates/Modern_RWD/less/navbar.less
trunk/catalog/install/data/templates/Modern_RWD/less/navs.less
trunk/catalog/install/data/templates/Modern_RWD/less/normalize.less
trunk/catalog/install/data/templates/Modern_RWD/less/pager.less
trunk/catalog/install/data/templates/Modern_RWD/less/pagination.less
trunk/catalog/install/data/templates/Modern_RWD/less/panels.less
trunk/catalog/install/data/templates/Modern_RWD/less/popovers.less
trunk/catalog/install/data/templates/Modern_RWD/less/print.less
trunk/catalog/install/data/templates/Modern_RWD/less/progress-bars.less
trunk/catalog/install/data/templates/Modern_RWD/less/responsive-embed.less
trunk/catalog/install/data/templates/Modern_RWD/less/responsive-utilities.less
trunk/catalog/install/data/templates/Modern_RWD/less/scaffolding.less
trunk/catalog/install/data/templates/Modern_RWD/less/tables.less
trunk/catalog/install/data/templates/Modern_RWD/less/theme.less
trunk/catalog/install/data/templates/Modern_RWD/less/thumbnails.less
trunk/catalog/install/data/templates/Modern_RWD/less/tooltip.less
trunk/catalog/install/data/templates/Modern_RWD/less/type.less
trunk/catalog/install/data/templates/Modern_RWD/less/utilities.less
trunk/catalog/install/data/templates/Modern_RWD/less/variables.less
trunk/catalog/install/data/templates/Modern_RWD/less/wells.less
trunk/catalog/install/data/templates/Modern_RWD/product.template.php
trunk/catalog/install/data/templates/Modern_RWD/sample.css
trunk/catalog/install/data/templates/Modern_RWD/template.php
trunk/catalog/install/data/templates/Modern_RWD/thumb.jpg
Modified: trunk/catalog/admin/includes/template/oscss/img/1/oscss.png
===================================================================
(Binary files differ)
Modified: trunk/catalog/favicon.ico
===================================================================
(Binary files differ)
Added: trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/boxe.php
===================================================================
--- trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/boxe.php (rev 0)
+++ trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/boxe.php 2014-09-06 17:59:09 UTC (rev 5227)
@@ -0,0 +1,16 @@
+<?php
+/**
+ @licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template Modern Responsive web design
+ @package osCSS-2 <www http://www.oscss.org>
+ @author NP <mail n....@op...> <www http://www.oscss.biz>
+ @encode UTF-8
+*/
+?>
+<section id="Box-<?php echo $boxe->name_clean; ?>" class="boxe">
+ <header>
+ <h3 class="boxe title"><?php echo unhtmlentities($boxe->title) ;?></h3>
+ </header>
+
+ <?php echo unhtmlentities($boxe->content) ?>
+</section>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/content.php
===================================================================
--- trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/content.php (rev 0)
+++ trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/content.php 2014-09-06 17:59:09 UTC (rev 5227)
@@ -0,0 +1,38 @@
+<?php
+/**
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @version 2.2.0
+ @encode UTF-8
+ @file content.php
+ @dir templates/defaut/Childs_tpl/
+*/
+global $page;
+
+require_once($page->oscss_content());
+
+if(!isset($SectionTplPC) || !is_object($SectionTplPC)){
+ $SectionTplPC = new SectionTpl(
+ tep_output_string_protected(tep_get_include_contents('pages/'.substr($page->oscss_body_id(),5 )),false,true) ,
+ __('heading title '.str_replace('_', ' ',substr($page->oscss_body_id(),5 ) ) )
+ );
+}
+
+?>
+
+
+<?php if( $SectionTplPC->GetContinue() ): ?>
+
+<header>
+ <h1 class="main-content title <?php echo $language ;?>"><?php echo unhtmlentities( $SectionTplPC->GetTitle() ); ?></h1>
+</header>
+
+
+<section id="Master<?php $page->the_type() ?>" class="<?php $page->the_type() ?>" >
+
+ <?php echo unhtmlentities( $SectionTplPC->GetContent() ) ?>
+
+</section>
+
+<?php endif; ?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/footer.php
===================================================================
--- trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/footer.php (rev 0)
+++ trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/footer.php 2014-09-06 17:59:09 UTC (rev 5227)
@@ -0,0 +1,124 @@
+<?php
+/**
+ @licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template Modern Responsive web design
+ @package osCSS-2 <www http://www.oscss.org>
+ @author NP <mail n....@op...> <www http://www.oscss.biz>
+ @encode UTF-8
+
+ @note La Licence OpenSource d'osCSS, vous impose de conserver le liens vers le site de la communauté. C'est la seul contrepartie imposé part l'utilisation de cette solution , qui est diffusé gratuitement, dans le cadre de ca licence.
+ Si vous supprimer la référence à osCSS, la commuanté se reserve le droit de faire valoir ces droits aupres des organisme dedié à la protection de cette licence.
+
+ CE template est livré gratuitement pour donner un aperçu des disponibilités du moteur de templates.
+ Veuillez respecter les termes et conditions générales d'utilisation.
+ Vous pouvez employer nos templates sous n'importe quel site Web publiquement accessible selon les termes et conditions générales du contrat Creative Commons
+*/
+global $template;
+?>
+</main>
+
+<div id="push"></div>
+<footer class="footer_white">
+ <div><i class="sprite-row"></i></div>
+ <div class="container haut">
+ <div class="row">
+ <div class="col-sm-3">
+ <h3><span class="sprite-negoce rotator"></span><?= __('negociant en prix footer') ?></h3>
+ <p class="text-muted justified"><?= __('negociant en prix details footer') ?></p>
+ </div>
+ <div class="col-sm-3">
+ <h3><span class="sprite-about rotator"></span><?= __('a propos footer') ?></h3>
+ <p class="text-muted justified"><?= __('a propos details footer') ?></p>
+
+ </div>
+ <div class="col-sm-3">
+ <h3><span class="sprite-contact rotator"></span><?= __('Nous contacter footer') ?></h3>
+ <address class="vcard">
+ <h4 class="name">Open Commerce</h4>
+ <div>
+ <i class="sprite-address"></i>
+ <a class="adr" target="_blank" href="https://www.google.fr/maps/place/34+avenue+de+l%27Europe,+38100+Grenoble">
+ <span class="street-address">34 avenue de l'europe</span>
+ <span class="postal-code">38100</span><br />
+ <span class="locality">Grenoble</span>,
+ <span class="country-name">France</span>
+ </a>
+ </div>
+ <div class="tel"><i class="sprite-tel"></i><a href="tel:+33633323234">+33 (0)6 33 32 32 34</a></div>
+ <div class="email"><i class="sprite-email"></i><a href="mailto:co...@op...">co...@op...</a></div>
+ </address>
+ </div>
+ <div class="col-sm-3">
+ <h3><span class="sprite-follow rotator"></span><?= __('Nous suivre footer') ?></h3>
+ <i class="sprite-facebook rotator"></i><a target="_blank" href="https://www.facebook.com/oscss.org">Facebook</a><br />
+ <i class="sprite-tweeter rotator"></i><a target="_blank" href="https://twitter.com/osCSS">Tweeter</a><br />
+ <i class="sprite-pinterest rotator"></i><a target="_blank" href="http://forums.oscss.org/forum.html"><?= __('Forum footer') ?></a><br />
+ <i class="sprite-googlep rotator"></i><a target="_blank" href="https://plus.google.com/107698144587463763937/posts">Google +</a><br />
+ </div>
+ </div>
+ </div>
+ </footer>
+ <footer class="footer_blue">
+ <div class="container milieu">
+ <div class="row">
+ <div class="col-sm-3">
+ <h3><span class="sprite-info rotator"></span>Informations</h3>
+ <div class="footer_box">
+ <p><a href="<?php echo tep_href_link(FILENAME_TEMPLATE) ?>"><?php echo __('about') ?></a></p>
+ <p><a href="/">Informations de livraison</a></p>
+ <p><a href="/">Vie privée</a></p>
+ <p><a href="/">Conditions générales</a></p>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <h3><span class="sprite-client rotator"></span>Service client</h3>
+ <div class="footer_box">
+ <p><a href="<?php echo tep_href_link(FILENAME_CONTACT_US) ?>"><?php echo __('contact us') ?></a></p>
+ <p><a href="/">Retours</a></p>
+ <p><a href="/">Livreurs</a></p>
+ <p><a href="<?php echo tep_href_link(FILENAME_SITEMAP) ?>"><?php echo __('sitemap') ?></a></p>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <h3><span class="sprite-extra rotator"></span>Bonus</h3>
+ <div class="footer_box">
+ <p><a href="/">Nos marques</a></p>
+ <p><a href="/">Bon cadeaux</a></p>
+ <p><a href="/">Offres du moment</a></p>
+ <p><a href="<?php echo tep_href_link('rss.php') ?>"><?php echo __('rss') ?></a></p>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <h3><span class="sprite-account rotator"></span>Mon compte</h3>
+ <div class="footer_box">
+ <p><a href="/">Espace utilisateur</a></p>
+ <p><a href="/">Historique des commandes</a></p>
+ <p><a href="/">Liste de voeux</a></p>
+ <p><a href="/">Newsletter</a></p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div><i class="sprite-row"></i></div>
+ <div class="container bas">
+ <p class="text-center"><i class="sprite-cb"></i></p>
+ <p class="text-muted text-center">~ Design <a target="_blank" href="http://www.oscss.biz"><b>OpenCommerce</b></a> - ©<?php echo date('Y') ?>
+ ~ Based on <a target="_blank" href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true"><b>@twbootstrap</b></a>
+ ~ Propulsé par <a target="_blank" href="http://www.oscss.org/" title=" osCSS "><b>osCSS-2</b></a> ~</p>
+ </div>
+ </footer>
+ <!-- Placed at the end of the document so the pages load faster -->
+ <script src="<?php echo 'templates/'.$template.'/js/'; ?>bootstrap.min.js"></script>
+
+ <script>
+ $('#nav').affix({ // used to make a magic menu
+ offset: {
+ top: $('header').height()-80
+ }
+ });
+
+ $(".alert").alert()
+ </script>
+
+ <div id="hover_zone"></div>
+ <?php /** Fichier appel bottom page */ $this->draw_file_footer(); ?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/header.php
===================================================================
--- trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/header.php (rev 0)
+++ trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/header.php 2014-09-06 17:59:09 UTC (rev 5227)
@@ -0,0 +1,93 @@
+<?php
+/**
+ @licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template Modern Responsive web design
+ @package osCSS-2 <www http://www.oscss.org>
+ @author NP <mail n....@op...> <www http://www.oscss.biz>
+ @encode UTF-8
+
+
+ Dans Ce fichier, les element du constructeur sont accessible directement, via la variable this.
+ Chaque sous object est nommé comme la variable habituelle
+ ex: $breadcrumb == $this->breadcrumb
+
+ Les variable local, de la page application top par exemple, eux ne le sont pas. Tout les appel ici, doit utiliser l'object constructeur
+
+ La configuration du theme: editer le fichier /cfg/init.php
+
+
+ @note
+ Ce fichier assure le chargement de l'entete de page, et des element qu'il doit contenir (css , javascript, meta, title) de maniere dynamqiue.
+ En générale, il n'est pas necessaire de modifié celui ci .
+
+ Les variable accessible au sein de ce fichier pour traité les parametre sont:
+ - $page : object contrusteur
+ - $load : configuration fournis en arguement de l'appel de ce fichier
+
+
+ C'est le fichier de template Master, qui est chargée de l'appel de ce fichier.
+ Pour intégrer celui ci dans u fichier master il est necessaire d'utiliser cette forme
+
+ echo $page->tep_get_header('file='.$page->the_var('PathChildGab').'header') ;
+
+ L'arguement est optionnel, il permet le cas echeants de transmettre un chemin autre que le chemin par default
+ Sans arguement la function cherche a charger un fichier header.php palcé à la racine du theme
+*/
+
+?>
+<!DOCTYPE html>
+<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
+<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
+<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
+<html>
+<head>
+ <meta charset="<?php echo CHARSET; ?>">
+ <title><?php echo $page->GetHtmlMeta(); ?></title>
+ <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 http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <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() ; ?>" />
+ <!--[if lte IE 8]>
+ <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
+
+ <script type="text/javascript" src="<?php echo 'templates/'.$template.'/js/'; ?>jquery.1.10.2.min.js"></script>
+ <script type="text/javascript" src="<?php echo 'templates/'.$template.'/js/'; ?>jquery.validate.1.7.min.js"></script>
+ <script type="text/javascript" src="<?php echo 'templates/'.$template.'/js/'; ?>less-1.7.3.min.js" ></script>
+ <script type="text/javascript" src="includes/general.js" ></script>
+ <?php /**
+ @remarks Cette fonction doit necessairement être chargée lors de l'appel du gabarit,
+ sans quoi l'initialisation du template n'et pas achevé
+ */
+ $this->draw_file_header(); ?>
+
+ <link href='http://fonts.googleapis.com/css?family=Raleway:300,400,600,700' rel='stylesheet' type='text/css' />
+ <link href='http://fonts.googleapis.com/css?family=Oswald:700,400' rel='stylesheet' type='text/css'>
+ <link href='<?php echo 'templates/'.$template.'/css/'; ?>bootstrap.css' rel='stylesheet' type='text/css' media="screen" />
+ <link rel="shortcut icon" type="images/x-icon" href="favicon.ico" />
+ <link rel="alternate" type="application/rss+xml" title="global" href="<?php echo tep_get_httpdir().'rss.php' ?>" />
+ <link rel="canonical" href="<?php echo $page->GetHtmlMeta('canonical'); ?>" />
+ <script>
+
+ $( document ).ready(function() {
+ // page home and others
+ $( ".miniature" ).mousemove(function( event ) {
+ source=$(this).attr("src");
+ if(source!=undefined){
+ $("#hover_zone").html("<img src='"+source+"' />");
+ $("#hover_zone").css({ left: (event.pageX+15)+"px",top: (event.pageY-20)+"px"});
+ $("#hover_zone").show();
+ }
+ }).mouseleave(function(){$("#hover_zone").hide();});
+ });
+ </script>
+</head>
+ <body id="<?php echo page::oscss_body_id() ; ?>" class="<?php echo 'Type_'.$page->the_type(); ?> <?php echo 'Class_'.$page->the_typeClass('class'); ?>">
+
Added: trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/module.php
===================================================================
--- trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/module.php (rev 0)
+++ trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/module.php 2014-09-06 17:59:09 UTC (rev 5227)
@@ -0,0 +1,161 @@
+<?php
+/**
+ @licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.2.0
+ @date 12/11/2011, 19:30
+ @author NP <mail n....@op...> <www http://www.oscss.biz>
+ @encode UTF-8
+*/
+global $load;
+
+?>
+
+<hr class="sprite-row">
+ <section class="module panel panel-default">
+ <?php if($load->module =='child' && tep_not_null($themodule->module_db->title) ) : ?>
+ <header>
+ <h4 class="main title"><?php echo unhtmlentities($themodule->module_db->title) ;?></h4>
+ </header>
+ <?php endif; ?>
+
+ <?php if(isset($themodule->module_db->text)): ?>
+ <p><?php echo unhtmlentities($themodule->module_db->text) ;?></p>
+ <?php endif; ?>
+
+
+ <?php if ( isset($themodule->module_db->split) && ($themodule->module_db->split->number_of_rows > 0) && (in_array(PREV_NEXT_BAR_LOCATION ,array('1','3') )) ) { ?>
+ <div class="panel-heading" role="toolbar">
+ <div class="row">
+ <div class="col-xs-3 vcenter"><?php echo TEXT_RESULT_PAGE ?></div>
+ <div class="col-xs-3 vcenter">
+ <?php echo $themodule->module_db->split->display_count(TEXT_DISPLAY_NUMBER_OF); ?>
+ </div>
+ <div class="col-xs-3 vcenter">
+ <?= $themodule->module_db->split->display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info'))); ?>
+ </div>
+ <div class="col-xs-3 form-group form-group-sm">
+ <div class="input-group">
+ <div class="input-group-addon">Trier par </div>
+ <select class="form-control input-sm">
+ <option value="best-seller">Meilleures ventes</option>
+ <option value="new">Nouveauté</option>
+ <option value="price-up">Prix croissant</option>
+ <option value="price-down">Prix décroissant</option>
+ <option value="alpha-up">Ordre alphabétique</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ <?php } ?>
+
+
+ <?php /**
+ * Loop Data
+ */
+ $i = 0; foreach($themodule->module_db->content as $ele): ?>
+
+ <?php if( $i%3 ==0 ) : ?>
+ <?php if( $i>0 ) : ?>
+ </div>
+ <?php endif; ?>
+ <div class="row">
+ <?php endif; ?>
+
+
+ <div class=" one <?php echo $ele->data ?>">
+
+
+
+ <?php if($ele->data =='product'): /** PRODUCTS */ ?>
+
+ <article class="produit col-sm-4">
+ <div class="innerblock">
+ <p>
+ <span class="information label label-danger">New</span>
+ <a class="text-center main-link" href="<?= $ele->GetHref() ?>" title="$ele->GetTitle()">
+ <?= tep_image(DIR_WS_IMAGES . $ele->GetImage(), $ele->GetTitle(), $page->_conf_value('SMALL_IMAGE_WIDTH'), $page->_conf_value('SMALL_IMAGE_HEIGHT')) ?>
+ <span class="center-block"><strong><?= $ele->GetName() ?></strong></span>
+ <?php if (tep_not_null( $ele->GetPrice() ) && $page->_draw_in_page('PRODUCT_LIST_PRICE')) { ?>
+ <span class="center-block"><?= print_products_price_rv($ele) ?></span>
+ <?php } ?>
+ <span class="follow-me"><strong><?= __('Voir ce produit') ?></strong></span>
+ </a>
+ </p>
+ <div class="images-extra">
+ <ul class="list-group">
+ <li class="list-group-item">
+ <a class="text-center" href="<?= $ele->GetHref() ?>" title="$ele->GetTitle()">
+ <?= tep_image(DIR_WS_IMAGES . $ele->GetImage(), $ele->GetTitle(), $page->_conf_value('SMALL_IMAGE_WIDTH'), $page->_conf_value('SMALL_IMAGE_HEIGHT'), ' class="miniature"') ?>
+ </a>
+ </li>
+ <li class="list-group-item">
+ <a class="text-center" href="<?= $ele->GetHref() ?>" title="$ele->GetTitle()">
+ <?= tep_image(DIR_WS_IMAGES . $ele->GetImage(), $ele->GetTitle(), $page->_conf_value('SMALL_IMAGE_WIDTH'), $page->_conf_value('SMALL_IMAGE_HEIGHT'), ' class="miniature"') ?>
+ </a>
+ </li>
+ <li class="list-group-item">
+ <a class="text-center" href="<?= $ele->GetHref() ?>" title="$ele->GetTitle()">
+ <?= tep_image(DIR_WS_IMAGES . $ele->GetImage(), $ele->GetTitle(), $page->_conf_value('SMALL_IMAGE_WIDTH'), $page->_conf_value('SMALL_IMAGE_HEIGHT'), ' class="miniature"') ?>
+ </a>
+ </li>
+ </ul>
+ </div>
+ <?php if ( $page->_draw_in_page('PRODUCT_LIST_BUY_NOW')) { ?>
+ <?php /** @remarks If buy possible and attribute , force choose attribute */ ?>
+ <?php if (_test_bool($ele->action['buy'] ) && count(product_attribut_info($ele->GetId())) != 0): ?>
+ <a class="btn btn-warning" href="<?php echo $ele->GetHref() ?>" ><?php echo __('add to cart') ?></a>
+ <?php /** @remarks If buy possible and attribute */ ?>
+ <?php elseif (_test_bool($ele->action['buy'] )) : ?>
+ <?php echo tep_draw_form($themodule->id.'cart_quantity'.$ele->GetId(), tep_href_link(FILENAME_DEFAULT, tep_get_all_get_params(array('action')) . 'action=add_product'), 'post', ' class="addcart"'); ?>
+ <?= tep_draw_hidden_field('products_id', $ele->GetId()) ?>
+
+ <div class="input-group">
+ <?= tep_draw_input_field('products_quantity', '1', '1', 'class="form-control" min="1"', false, 'number') ?>
+ <span class="input-group-btn"><input type="button" value="<?= __('add to cart') ?>" title="<?= __('add to cart') ?>" class="btn btn-warning" /></span>
+ </div>
+ </form>
+ <?php endif; ?>
+ <?php } ?>
+ </div>
+ </article>
+
+ <?php else : /** Other */ ?>
+ <section class="col-sm-3 col-xs-6 outerblock">
+ <div class="innerblock">
+ <p class="title <?php echo $ele->data ?>">
+ <a href="<?php echo $ele->GetHref() ; ?>" ><?php echo $ele->GetTitle() ?></a>
+ </p>
+ <p class="img-thumbnail <?php echo $ele->data ?>">
+ <?php echo '<a href="' . $ele->GetHref(). '">' . tep_image(DIR_WS_IMAGES . $ele->GetImage(), $ele->GetTitle(), $page->_conf_value('SIDEBAR_IMG_WIDTH'), $page->_conf_value('SIDEBAR_IMAGE_HEIGHT')) . '</a>' ;?>
+ </p>
+ <p class="preview <?php echo $ele->data ?>">
+ <?php echo truncate(strip_tags(unhtmlentities( $ele->GetText() )), 100) ?>
+ </p>
+ </div>
+ </section>
+ <?php endif; ?>
+ </div>
+
+
+ <?php $i++; endforeach; ?>
+
+ </div> <!--Last Div for loop and class row -->
+
+
+
+ <?php if ( isset($themodule->module_db->split) && ($themodule->module_db->split->number_of_rows > 0)&& (in_array(PREV_NEXT_BAR_LOCATION ,array('2','3') )) ) { ?>
+<div class="panel-footer" role="toolbar">
+ <div class="row">
+ <div class="col-sm-3"><?php echo $themodule->module_db->split->display_count(TEXT_DISPLAY_NUMBER_OF); ?></div>
+ <div class="col-sm-3" >
+ <?php echo /*TEXT_RESULT_PAGE . ' ' .*/ $themodule->module_db->split->display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info'))); ?>
+ </div>
+ </div>
+</div>
+ <?php } ?>
+
+ </section>
+<?php ?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/module.slideshow.php
===================================================================
--- trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/module.slideshow.php (rev 0)
+++ trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/module.slideshow.php 2014-09-06 17:59:09 UTC (rev 5227)
@@ -0,0 +1,61 @@
+<?php
+/**
+ @licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template Modern Responsive web design
+ @package osCSS-2 <www http://www.oscss.org>
+ @author NP <mail n....@op...> <www http://www.oscss.biz>
+ @encode UTF-8
+*/
+global $load, $themodule;
+?>
+
+
+<div id="slider" class="module">
+
+ <ul class="module carousel-inner">
+
+ <?php if(isset($themodule->module_db->content) )foreach($themodule->module_db->content as $ele): ?>
+
+ <?php if($ele->type =='product'): /** PRODUCTS */ ?>
+ <li class="item one product">
+ <section class="outerblock">
+ <div class="innerblock">
+ <?php if ($page->_draw_in_page('PRODUCT_LIST_NAME')) { ?>
+ <p class="carousel-caption product"><?php echo '<a href="' . $ele->GetHref() . '" title="header=['.$ele->GetName().'] body=[ ] fade=[on]">' . $ele->GetName() . '</a>' ;?></p>
+ <?php } ?>
+
+ <?php if ($page->_draw_in_page('PRODUCT_LIST_IMAGE')) { ?>
+ <p class="img product"><?php echo '<a href="' . $ele->href . '" title="header=['.$ele->GetName().'] body=[ ] fade=[on]" >' . tep_image(DIR_WS_IMAGES . @$ele->products_image, $ele->GetName(), $page->_conf_value('SMALL_IMAGE_WIDTH'), $page->_conf_value('SMALL_IMAGE_HEIGHT')) . '</a>' ; ?></p>
+ <?php } ?>
+
+ <?php if (tep_not_null($ele->GetPrice()) && $page->_draw_in_page('PRODUCT_LIST_PRICE')) { ?>
+ <p class="price prod">
+ <?php echo print_products_price_rv($ele->GetId()) ?>
+ </p>
+ <?php } ?>
+
+ <a class="btn btn-lg btn-primary" href="<?php echo $ele->GetHref() ?>" title="header=<?php echo __('view more') ?>" role="button"><?php echo __('more') ?></a>
+
+ </div>
+ </section>
+ </li>
+ <?php else : /** Other */ ?>
+ <li class="item one content">
+ <section class="outerblock">
+ <div class="innerblock">
+ <p class="carousel-caption content">
+ <a id="<?php echo $ele->GetId(); ?>" href="<?php echo $ele->GetHref() ; ?>" ><?php echo $ele->GetTitle() ?></a>
+ </p>
+ <div class="chapo content">
+ <?php echo $ele->GetText() ?>
+ </div>
+ </div>
+ </section>
+ </li>
+ <?php endif; ?>
+
+ <?php endforeach; ?>
+
+ </ul>
+
+</div>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/sidebar.php
===================================================================
--- trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/sidebar.php (rev 0)
+++ trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/sidebar.php 2014-09-06 17:59:09 UTC (rev 5227)
@@ -0,0 +1,26 @@
+<?php
+/**
+ @licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template Modern Responsive web design
+ @package osCSS-2 <www http://www.oscss.org>
+ @author NP <mail n....@op...> <www http://www.oscss.biz>
+ @encode UTF-8
+*/
+
+/** Page produits */ if(isset($_GET['products_id'])) $product_info=$page->the_var('product_info');
+?>
+
+ <?php while($boxe=templ_draw_list('type=boxes&pile='.$page->the_type().'')):
+ if (!$page->is_page_here($boxe->name_clean) ) : ?>
+<!-- <div id="<?php echo $boxe->name_clean; ?>Box" class="deroul l_158"> -->
+ <?php include('boxe.php'); ?>
+<!-- </div> -->
+ <?php endif; endwhile; ?>
+
+ <?php while($boxe=templ_draw_list('type=boxes&pile=sidebar')):
+ if (!$page->is_page_here($boxe->name_clean) ) : ?>
+<!-- <div id="<?php echo $boxe->name_clean; ?>Box" class="deroul l_158"> -->
+ <?php include('boxe.php'); ?>
+<!-- </div> -->
+ <?php endif; endwhile; ?>
+
Added: trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/ssheader.php
===================================================================
--- trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/ssheader.php (rev 0)
+++ trunk/catalog/install/data/templates/Modern_RWD/Childs_tpl/ssheader.php 2014-09-06 17:59:09 UTC (rev 5227)
@@ -0,0 +1,141 @@
+<?php
+/**
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author NP <mail n....@op...> <www http://www.oscss.biz>
+ @encode UTF-8
+*/
+global $customer_id;
+
+?>
+
+<header class="container">
+ <div class="navbar navbar-inverse navbar-fixed-top clear-menu" role="navigation">
+ <div class="container">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse1">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="<?php echo tep_href_link() ?>"><i class="sprite-home rotator"></i><?php echo STORE_NAME ?></a>
+ </div>
+ <div id="navbar-collapse1" class="navbar-collapse collapse">
+ <ul class="nav navbar-nav navbar-left">
+ <li class="divider"></li>
+ <li><a href="#" class="btn btn-warning">S'enregistrer</a></li>
+ <li class="divider"></li>
+ <li><a href="#" class="btn btn-warning">S'identifier</a></li>
+ </ul>
+ <ul class="nav navbar-nav navbar-right">
+ <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Réglages de langue<span class="caret "></span></a>
+ <ul class="dropdown-menu" role="menu">
+ <?php $boxe =$page->oscss_boxes->_return('currencies');
+ echo unhtmlentities($boxe->content) ?>
+ <li class="divider"></li>
+ <?php $boxe =$page->oscss_boxes->_return('languages');
+ echo unhtmlentities($boxe->content) ?>
+ </ul>
+ </li>
+ <li class="divider"></li>
+ <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="sprite-basket rotator"></i>100,00 € <span class="badge">2</span><span class="caret"></span></a>
+ <ul class="dropdown-menu" role="menu">
+ <?= $boxe =$page->oscss_boxes->_return('shopping_cart_short'); ?>
+ <li>
+ <table class="table table-condensed table-striped table-hover">
+ <thead>
+ <tr>
+ <th>Prod.</th>
+ <th>Qté.</th>
+ <th>Prix</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td class="dark">Disque</td>
+ <td>1</td>
+ <td>50.00€</td>
+ </tr>
+ <tr>
+ <td class="dark">Vaisselle</td>
+ <td>1</td>
+ <td>50.00€</td>
+ </tr>
+ </tbody>
+ <tfoot>
+ <tr class="active">
+ <td colspan="2">Total : </td>
+ <td class="dark">100.00€</td>
+ </tr>
+ </tfoot>
+ </table>
+ </li>
+ <li><a href="#">Voir mon panier</a></li>
+ </ul>
+
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ <div id="nav" class="navbar navbar-inverse navbar-fixed-top dark-menu" role="navigation">
+ <div class="container">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse2">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ </div>
+ <div id="navbar-collapse2" class="navbar-collapse collapse">
+ <ul class="nav navbar-nav navbar-left">
+ <li><a href="">Catégories</a><?php // echo in_menu_cat('ParentGroupString=ul&catID=0&max_level=3&datatype=product'); ?></li>
+ <li><a href="<?php echo tep_href_link(FILENAME_PRODUCTS_NEW) ?>" ><?php echo __('link product new') ?></a></li>
+ <li><a href="<?php echo tep_href_link(FILENAME_BEST_SELLERS) ?>" ><?php echo __('link best sellers') ?></a></li>
+ <li><a href="<?php echo tep_href_link(FILENAME_SMALL_PRICE) ?>" ><?php echo __('link small price') ?></a></li>
+ <?php if(tep_cst_define('MODULE_ACA_SPECIALS_SORT_ORDER') !='false') : ?>
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_SPECIALS) . '">' . __('link specials') . '</a>'; ?></li>
+ <?php endif; ?>
+ <li><a href="#">Blog</a></li>
+ </ul>
+ <form class="navbar-form navbar-right input-group">
+ <input type="search" class="form-control" placeholder="Rechercher..." />
+ <span class="input-group-btn">
+ <input type="submit" class="btn btn-default" value="Go" />
+ </span>
+ </form>
+
+ </div>
+ </div>
+ </div>
+</header>
+
+<div><hr class="sprite-row"></div>
+
+<main id="content" role="main">
+
+<?php if($load->mode =='home') : ?>
+
+ <section id="myCarousel" class="carousel slide margin_top" data-ride="carousel">
+<!-- <div class="intro content"> -->
+
+ <?php /**
+ @brief Call featured for slideshow
+ */
+ global $themodule;
+ $themodule=templ_draw_list('type=modules&pile=slideshow');
+ include('module.slideshow.php'); ?>
+<!-- </div> -->
+ </section>
+<?php endif; ?>
+
+<?php if($load->mode !='home') : ?>
+<section class="container margin_top">
+ <ol role="breadcrumbs" id="breadcrumbs" class="breadcrumb">
+ <?php echo $page->draw_breadcrumb(''); ?>
+ </ol>
+</section>
+<?php endif; ?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/Modern_RWD/cfg/configuration.php
===================================================================
--- trunk/catalog/install/data/templates/Modern_RWD/cfg/configuration.php (rev 0)
+++ trunk/catalog/install/data/templates/Modern_RWD/cfg/configuration.php 2014-09-06 17:59:09 UTC (rev 5227)
@@ -0,0 +1,66 @@
+<?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
+ @subpackage Template boostrap
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.2
+ @date 08/11/2013, 21:14
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+/* Config divers */
+UpConfigKey('SMALL_IMAGE_WIDTH','60');
+UpConfigKey('SMALL_IMAGE_HEIGHT','60');
+UpConfigKey('HEADING_IMAGE_WIDTH','160');
+UpConfigKey('HEADING_IMAGE_HEIGHT','250');
+UpConfigKey('SUBCATEGORY_IMAGE_WIDTH','120');
+UpConfigKey('SUBCATEGORY_IMAGE_HEIGHT','120');
+UpConfigKey('POPUP_IMAGE_WIDTH','600');
+UpConfigKey('POPUP_IMAGE_HEIGHT','600');
+UpConfigKey('STACK_IMAGE_WIDTH','50');
+UpConfigKey('STACK_IMAGE_HEIGHT','50');
+UpConfigKey('JPEG_QUALITY','95');
+
+UpConfigKey('PRODUCT_LIST_WEIGHT','false');
+UpConfigKey('PRODUCT_LIST_MODEL','false');
+UpConfigKey('PRODUCT_LIST_DESCRIPTION','false');
+UpConfigKey('PRODUCT_LIST_MANUFACTURER','false');
+UpConfigKey('PRODUCT_LIST_PRICE','false');
+UpConfigKey('PRODUCT_LIST_WEIGHT','false');
+UpConfigKey('PRODUCT_LIST_QUANTITY','false');
+
+/* Config des plugins */
+ResetConfigKey('PLUGIN_ACCOUNT_INSTALLED');
+ResetConfigKey('PLUGIN_GENERIC_INSTALLED');
+ResetConfigKey('PLUGIN_HOME_INSTALLED');
+ResetConfigKey('PLUGIN_LISTING_INSTALLED');
+ResetConfigKey('PLUGIN_PRODUCT_INSTALLED');
+
+
+/* Config des modules base */
+ResetConfigKey('MODULE_ACAPRO_INSTALLED');
+ResetConfigKey('MODULE_ACCOUNT_INSTALLED');
+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', 'desc_base.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');
+
+
+/* Purge du repertoire de miniature */
+$path = DIR_FS_ROOT_DOCS.DIR_WS_IMAGES.'imagecache/' ;
+$dir = @opendir($path);
+$templates = array();
+while ($file = @readdir($dir)) {
+ if($file != '..' && $file !='.' && $file !='') @unlink($path.$file);
+}
+@closedir($dir);
Added: trunk/catalog/install/data/templates/Modern_RWD/cfg/init.php
===================================================================
--- trunk/catalog/install/data/templates/Modern_RWD/cfg/init.php (rev 0)
+++ trunk/catalog/install/data/templates/Modern_RWD/cfg/init.php 2014-09-06 17:59:09 UTC (rev 5227)
@@ -0,0 +1,260 @@
+<?php
+/**
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template boostrap
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+
+
+
+ @note
+ Dans Ce fichier, les element du constructeur sont accessible directement, via la variable this.
+ Chaque sous object est nommé comme la variable habituelle
+ ex: $breadcrumb == $this->breadcrumb
+
+ Les variable locales, du application_top par exemple, ne le sont pas.
+ Tout les appels ici, doit utiliser l'object constructeur
+*/
+
+/*
+ * protected static $modele = array( 'price_model' => array( 'text'=>'%pprice', // Modèle Brut
+ 'html'=>'<span class="h2 diff-font normalprice">%pprice</span>', // Modèle HTML
+ 'rss'=>' <price>%pprice</price>' // Modèle rss
+ ),
+ 'special_model'=> array( 'text'=>'%sprice', // Modèle Brut
+ 'html'=>'<span class="h2 diff-font productSpecialPrice">%sprice<small><del>%pprice</del></small></span>',// Modèle HTML
+ 'rss'=>" <price>%pprice</price> \n <specialprice>%sprice</specialprice>" // Modèle rss
+ ),
+ );
+ */
+price::define_modele('<span class="h2 diff-font normalprice">%pprice</span>', 'price_model', 'html' );
+price::define_modele('<span class="h2 diff-font productSpecialPrice">%sprice<small><del>%pprice</del></small></span>', 'special_model', 'html');
+
+
+/*
+ Utilisation de l'objet local
+ $load
+
+ Cet object est specifique au templae, il est initialisé avant l'appel de fichier, est accesible depuis tous les elemnts inclus de ce theme
+ Il transmet ainsi tout calcul ou opertaion necessitant un transport d'informations
+*/
+
+$load = $page->GetThemeLoad();
+
+/**
+ @var PathChildGab Path
+ Childs html tpl files
+*/
+ $this->add_var_page('PathChildGab','Childs_tpl/');
+
+
+/**
+ image
+*/
+ $this->add_var_page('SIDEBAR_IMG_WIDTH','150');
+ $this->add_var_page('SIDEBAR_IMG_HEIGHT','150');
+ $this->add_var_page('HEADING_IMG_WIDTH','150');
+ $this->add_var_page('HEADING_IMG_HEIGHT','150');
+ $this->add_var_page('SMALL_IMAGE_WIDTH','235');
+ $this->add_var_page('SMALL_IMAGE_HEIGHT','200');
+
+/**
+ Listing
+*/
+ /**
+ Nbr maxi dans les listes (shearch, listing)
+ */
+ $this->add_var_page('MAX_DISPLAY_SEARCH_RESULTS','10');
+ $this->add_var_page('MAX_DISPLAY_PAGE_LINKS','15');
+ $this->add_var_page('MAX_DISPLAY_PRODUCTS_NEW','15');
+ $this->add_var_page('MAX_DISPLAY_NEW_PRODUCTS','15');
+ $this->add_var_page('MAX_DISPLAY_PRODUCTS_NEW','25');
+
+ /**
+ Display block
+ */
+ $this->add_var_page('PRODUCT_LIST_IMAGE','true');
+ $this->add_var_page('PRODUCT_LIST_BUY_NOW','true');
+ $this->add_var_page('PRODUCT_LIST_NAME','true');
+ $this->add_var_page('PRODUCT_LIST_PRICE','true');
+
+
+
+/**
+ Fix format and css class for display message
+*/
+ $Ms = $this->getMessageStack();
+ $Ms->setPrefix('alert');
+ $Ms->setRowsBlock('<div %s >%s</div>');
+ $Ms->setTypeArray(0, 'danger');
+
+
+
+
+/**
+ Configuration des boxes
+Les boxes sont appelé via les lg suivant.
+$this->oscss_boxes(Nom de la boxes, parent);
+@param string boxe: juste le nom, sans ext, et sans path
+@param string parent: le nom dans lesquel l'element sera stocké
+*/
+
+
+
+
+ $this->oscss_boxes->_add('myaccount', 'permanent' ,array('cache'=>false,'sort'=>30));
+
+
+ $this->oscss_boxes->_add('languages', 'headertop');
+/** Boite de recherche */
+ $this->oscss_boxes->_addWidget('Widget_search_suggest', 'headertop');
+
+ $this->oscss_boxes->_add('currencies', 'header');
+ /* panier court */
+ $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
+
+if(self::oscss_body_id() !='Page_shopping_cart')
+ $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
+
+
+ /**
+ @var mode used in template.php for adjust affichage
+ mixed type and other control for determine mode
+ */
+ $load->mode = $page->GetPageType();
+ /**
+ @var module default child, else master
+ master is mode full screen , and child is complete existant page
+ */
+ $load->module = 'child';
+
+/**
+ @brief Estimate environement, for choose block load
+*/
+
+switch($page->GetPageType()){
+
+
+ case 'home':
+
+ $this->add_var_page('MAX_DISPLAY_PRODUCTS_NEW','4');
+ $this->add_var_page('MAX_DISPLAY_NEW_PRODUCTS','4');
+// Added for basket summary
+ $this->oscss_boxes->_add('view_min_cart', 'header', array('cache'=>false));
+ $this->oscss_boxes->_add('whats_new', 'sidebar', array('cache'=>false));
+ $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+ $this->oscss_boxes->_add('best_sellers', 'sidebar', array('cache'=>false));
+ $this->oscss_boxes->_add('selections', 'sidebar', array('cache'=>false));
+
+ $this->oscss_boxes->_add('bann_type', 'sidebar', array('cache'=>false));
+
+ $load->mode = 'home';
+
+ // force put key for load specific featured
+ $this->add_var_page('featured_key','home_slideshow');
+ $this->oscss_modules->_add('featured.php','slideshow',array('sort'=>60));
+
+ $this->oscss_modules->_add(FILENAME_NEW_PRODUCTS,'center',array('sort'=>60));
+ break;
+
+ case 'checkout':
+ case 'cart':
+ $this->oscss_boxes->_add('checkout_progressbar', 'progressbar');
+ $this->oscss_boxes->_add('categories', 'sidebar');
+ $this->oscss_boxes->_add('whats_new', 'sidebar', array('cache'=>false));
+ $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+ break;
+
+
+ case 'account':
+ $this->oscss_boxes->_add('myaccount', 'sidebar' ,array('cache'=>false,'sort'=>30));
+ $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+ break;
+
+ case 'content':
+ $this->oscss_boxes->_add('categories', 'sidebar');
+ $this->oscss_boxes->_add('cms_last_post', 'sidebar', array('cache'=>false));
+ //
+ $this->oscss_boxes->_add('recently_viewed_content', 'sidebar', array('cache'=>false));
+ break;
+
+ case 'product':
+// $this->oscss_boxes->_add('categories', 'sidebar');
+//
+// //
+// $this->oscss_boxes->_add('recently_viewed', 'sidebar', array('cache'=>false));
+// // required manufacturer exts
+// $this->oscss_boxes->_add('manufacturer_info', 'sidebar');
+// // required specials exts
+// $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+
+
+
+ // load generic module in childs module in page
+ $this->oscss_modules->_add(FILENAME_ALSO_PURCHASED_PRODUCTS,'center',array('sort'=>60));
+ $this->oscss_modules->_add(FILENAME_UPCOMING_PRODUCTS,'center',array('sort'=>61));
+ break;
+
+ case 'listing': // obsolete
+ case 'categorie':
+ $this->oscss_boxes->_add('categories', 'sidebar');
+
+ //
+ $this->oscss_boxes->_add('recently_viewed', 'sidebar', array('cache'=>false));
+ // required specials exts
+ $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+ //
+ $this->oscss_boxes->_add('whats_new', 'sidebar', array('cache'=>false));
+
+
+ $this->oscss_boxes->_add('very_viewed', 'sidebar', array('cache'=>false));
+ $load->module = 'child';
+
+
+
+ break;
+
+
+ case 'diver':
+ case 'none':
+ default:
+
+ $this->oscss_boxes->_add('categories', 'sidebar');
+ //
+ $this->oscss_boxes->_add('recently_viewed', 'sidebar', array('cache'=>false));
+ $this->oscss_boxes->_add('whats_new', 'sidebar', array('cache'=>false));
+ // required specials exts
+ $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+
+
+ // precise si module utilisé comme pleine page
+ switch(self::oscss_body_id()){
+
+ case '404':
+ $this->oscss_modules->_add(FILENAME_NEW_PRODUCTS,'center',array('sort'=>60));
+ break;
+
+ case 'Page_shopping_cart':
+ $this->oscss_boxes->_add('checkout_progressbar', 'progressbar');
+ break;
+
+ case 'Page_listing_small_price':
+ case 'Page_listing_best_sellers':
+ case 'Page_listing_specials':
+ case 'Page_listing_products_new':
+ $load->module = 'master';
+ break;
+ case 'Page_sitemap':
+ $this->oscss_boxes->_add('selections', 'ponctual');
+ $this->oscss_boxes->_add('information', 'ponctual');
+ break;
+ default:
+ }
+
+}
+
+
+
+
+?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/Modern_RWD/css/bootstrap.css
===================================================================
--- trunk/catalog/install/data/templates/Modern_RWD/css/bootstrap.css (rev 0)
+++ trunk/catalog/install/data/templates/Modern_RWD/css/bootstrap.css 2014-09-06 17:59:09 UTC (rev 5227)
@@ -0,0 +1 @@
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2014-09-05 13:01:59
|
Revision: 5226
http://sourceforge.net/p/oscss/svn/5226
Author: homer8173
Date: 2014-09-05 13:01:51 +0000 (Fri, 05 Sep 2014)
Log Message:
-----------
FS#1130 - Erreur de DB sur les modules nouveaut?\195?\169s, etc
http://dev.oscss.org/task/1130?project=5
Fix sur des datatypes sp?\195?\169ciaux
Modified Paths:
--------------
trunk/catalog/common/classes/datatype_drivers/Data_diver.php
Modified: trunk/catalog/common/classes/datatype_drivers/Data_diver.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_diver.php 2014-09-02 16:12:58 UTC (rev 5225)
+++ trunk/catalog/common/classes/datatype_drivers/Data_diver.php 2014-09-05 13:01:51 UTC (rev 5226)
@@ -205,13 +205,13 @@
}
// Force put Content data for Key Page_xxx
- elseif(( ($objectContent=content::get_item($page->oscss_body_id()) ) !=false ) ){
-
- $page->SetVar('current_object', $objectContent);
- $page->SetVar('current_type',$this->DataType);
- $page->SetVar('current_id',(int)$objectContent->GetId());
- $page->SetVar('type_id',(int)$objectContent->GetType());
- }
+// elseif(( ($objectContent=content::get_item($page->oscss_body_id()) ) !=false ) ){
+//
+// $page->SetVar('current_object', $objectContent);
+// $page->SetVar('current_type',$this->DataType);
+// $page->SetVar('current_id',(int)$objectContent->GetId());
+// $page->SetVar('type_id',(int)$objectContent->GetType());
+// }
else
switch ($p){
// case 'form.php':
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2014-09-02 16:13:06
|
Revision: 5225
http://sourceforge.net/p/oscss/svn/5225
Author: homer8173
Date: 2014-09-02 16:12:58 +0000 (Tue, 02 Sep 2014)
Log Message:
-----------
Modification de la pagination pour utiliser la pr?\195?\169sentation bootstrap :
http://getbootstrap.com/components/#pagination
Modified Paths:
--------------
trunk/catalog/includes/classes/split_page_results.php
trunk/catalog/includes/languages/fr_FR/initial.php
Modified: trunk/catalog/includes/classes/split_page_results.php
===================================================================
--- trunk/catalog/includes/classes/split_page_results.php 2014-09-02 12:20:33 UTC (rev 5224)
+++ trunk/catalog/includes/classes/split_page_results.php 2014-09-02 16:12:58 UTC (rev 5225)
@@ -22,13 +22,20 @@
/**
@var string format link
*/
- public $format_link = '<a class="btn btn-default" href="%s" title=" %s ">%s</a>';
+ public $format_link = '<a href="%s" title=" %s ">%s</a>';
/**
@var string format link parent encapusation
*/
- public $format_link_p = '<div class="btn-group btn-group-xs">%s</div>';
+ public $format_link_p = '<li>%s</li>';
+ public $format_link_p_active = '<li class="active">%s</li>';
+ /**
+ * @var string format main container
+ */
+ // small version
+ // public $format_main_container = '<ul class="pagination pagination-sm">%s</ul>';
+ public $format_main_container = '<ul class="pagination">%s</ul>';
-/* class constructor */
+ /* class constructor */
function splitPageResults($query, $max_rows, $count_key = '*', $page_holder = 'page') {
global $_GET, $_POST;
@@ -101,6 +108,7 @@
$basename = basename($_SERVER['SCRIPT_FILENAME']);
$display_links_string = '';
$link = sprintf( $this->format_link_p, $this->format_link);
+ $link_active = sprintf( $this->format_link_p_active, $this->format_link);
if (tep_not_null($parameters) && (substr($parameters, -1) != '&')) $parameters .= '&';
@@ -130,11 +138,12 @@
// page nn button
for ($jump_to_page = 1 + (($cur_window_num - 1) * $max_page_links); ($jump_to_page <= ($cur_window_num * $max_page_links)) && ($jump_to_page <= $this->number_of_pages); $jump_to_page++) {
if ($jump_to_page == $this->current_page_number) {
- $display_links_string .= sprintf( $link,
+ // active link
+ $display_links_string .= sprintf( $link_active,
tep_href_link($basename, $parameters . 'page=' . $this->current_page_number , $request_type) ,
$jump_to_page ,
$jump_to_page
- );
+ );
}
else {
@@ -162,7 +171,7 @@
PREVNEXT_BUTTON_NEXT
);
- return $display_links_string;
+ return sprintf($this->format_main_container,$display_links_string);
}
// display number of total products found
Modified: trunk/catalog/includes/languages/fr_FR/initial.php
===================================================================
--- trunk/catalog/includes/languages/fr_FR/initial.php 2014-09-02 12:20:33 UTC (rev 5224)
+++ trunk/catalog/includes/languages/fr_FR/initial.php 2014-09-02 16:12:58 UTC (rev 5225)
@@ -140,10 +140,10 @@
define('PREVNEXT_TITLE_PAGE_NO',"Page %d" );
define('PREVNEXT_TITLE_PREV_SET_OF_NO_PAGE',"Ensemble précédent de %d pages" );
define('PREVNEXT_TITLE_NEXT_SET_OF_NO_PAGE',"Ensemble suivant de %d pages" );
-define('PREVNEXT_BUTTON_FIRST',"<<PREMIER" );
-define('PREVNEXT_BUTTON_PREV',"[<< Préc.]" );
-define('PREVNEXT_BUTTON_NEXT',"[Suiv. >>]" );
-define('PREVNEXT_BUTTON_LAST',"DERNIER>>" );
+define('PREVNEXT_BUTTON_FIRST',"«" );
+define('PREVNEXT_BUTTON_PREV',"‹" );
+define('PREVNEXT_BUTTON_NEXT',"›" );
+define('PREVNEXT_BUTTON_LAST',"»" );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2014-09-02 12:20:41
|
Revision: 5224
http://sourceforge.net/p/oscss/svn/5224
Author: homer8173
Date: 2014-09-02 12:20:33 +0000 (Tue, 02 Sep 2014)
Log Message:
-----------
target _blank remplac?\195?\169 dans l'installeur
Merci Ayatus ;)
Modified Paths:
--------------
trunk/catalog/install/includes/team_info/default.inc
trunk/catalog/install/templates/header.php
Modified: trunk/catalog/install/includes/team_info/default.inc
===================================================================
--- trunk/catalog/install/includes/team_info/default.inc 2014-08-26 16:17:46 UTC (rev 5223)
+++ trunk/catalog/install/includes/team_info/default.inc 2014-09-02 12:20:33 UTC (rev 5224)
@@ -1,21 +1,21 @@
-<h2>Support osCSS ! </h2>
-<p>
- We are interested in all review to improve performance, stability and consistency of the whole software. It costs only few minutes ...
-</p>
-<div class="divided50 separator">
- <h3>Help Promote and Join Us</h3>
- <ul>
- <li><a href="https://plus.google.com/107698144587463763937/posts" target="_blank">Google+</a></li>
- <li><a href="https://facebook.com/oscss.org" target="_blank">Facebook</a></li>
- <li><a href="https://twitter.com/osCSS" target="_blank">Tweeter</a></li>
- </ul>
-</div>
-<div class="divided50">
- <h3>Participate in Development</h3>
- <ul>
- <li><a href="http://sourceforge.net/projects/oscss/" target="_blank">SourceForge</a></li>
- <li><a href="http://dev.oscss.org/" target="_blank">Repport a Bug</a></li>
- <li><a href="http://forums.oscss.org/" target="_blank">Forums</a></li>
- </ul>
-</div>
+<h2>Support osCSS ! </h2>
+<p>
+ We are interested in all review to improve performance, stability and consistency of the whole software. It costs only few minutes ...
+</p>
+<div class="divided50 separator">
+ <h3>Help Promote and Join Us</h3>
+ <ul>
+ <li><a href="https://plus.google.com/107698144587463763937/posts" class="blank">Google+</a></li>
+ <li><a href="https://facebook.com/oscss.org" class="blank">Facebook</a></li>
+ <li><a href="https://twitter.com/osCSS" class="blank">Tweeter</a></li>
+ </ul>
+</div>
+<div class="divided50">
+ <h3>Participate in Development</h3>
+ <ul>
+ <li><a href="http://sourceforge.net/projects/oscss/" class="blank">SourceForge</a></li>
+ <li><a href="http://dev.oscss.org/" class="blank">Repport a Bug</a></li>
+ <li><a href="http://forums.oscss.org/" class="blank">Forums</a></li>
+ </ul>
+</div>
<br class="clear" />
\ No newline at end of file
Modified: trunk/catalog/install/templates/header.php
===================================================================
--- trunk/catalog/install/templates/header.php 2014-08-26 16:17:46 UTC (rev 5223)
+++ trunk/catalog/install/templates/header.php 2014-09-02 12:20:33 UTC (rev 5224)
@@ -22,6 +22,11 @@
<script type="text/javascript" src="../ext/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../ext/jquery/jquery.validate.min.js"></script>
<script type="text/javascript" src="templates/main_page/zoombox.js"></script>
+<script>
+ $( document ).ready(function() {
+ $(".blank").attr("target", "_blank");
+ });
+</script>
</head>
<body>
<div id="template">
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2014-08-26 16:17:50
|
Revision: 5223
http://sourceforge.net/p/oscss/svn/5223
Author: homer8173
Date: 2014-08-26 16:17:46 +0000 (Tue, 26 Aug 2014)
Log Message:
-----------
- nouveau logo mis en place
- R?\195?\169activation de la langue anglaise -> fichier de langue ?\195?\160 finaliser
- corrections d'orthographes
- nouveau look pour l'installeur
- les informations de la team sont fournies par le site web
- cr?\195?\169ation d'un type de message empilable de type warning
- nouveau jeu d'icones
Modified Paths:
--------------
trunk/catalog/install/data/templates/appareil_photo/booststrap/cfg/configuration.php
trunk/catalog/install/images/check.png
trunk/catalog/install/images/cross.png
trunk/catalog/install/images/favicon.ico
trunk/catalog/install/images/help_icon.png
trunk/catalog/install/images/oscss.jpg
trunk/catalog/install/images/oscss_logo.png
trunk/catalog/install/includes/application.php
trunk/catalog/install/includes/classes/core.php
trunk/catalog/install/includes/content/core.base.php
trunk/catalog/install/includes/content/core.configuration.php
trunk/catalog/install/includes/content/core.finition.php
trunk/catalog/install/includes/content/core.installdb.php
trunk/catalog/install/includes/content/core.modes.php
trunk/catalog/install/includes/content/core.template_sample.php
trunk/catalog/install/includes/language/en_EN/install.base.txt
trunk/catalog/install/includes/language/fr_FR/install.base.txt
trunk/catalog/install/includes/language/fr_FR/osc_categories_description.txt
trunk/catalog/install/includes/language/fr_FR/osc_content_description.txt
trunk/catalog/install/includes/modele/configure.txt
trunk/catalog/install/includes/team_info/base.inc
trunk/catalog/install/index.php
trunk/catalog/install/templates/footer.php
trunk/catalog/install/templates/header.php
trunk/catalog/install/templates/main_page/stylesheet.css
Added Paths:
-----------
trunk/catalog/install/images/warning.png
trunk/catalog/install/includes/team_info/default.inc
Modified: trunk/catalog/install/data/templates/appareil_photo/booststrap/cfg/configuration.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/booststrap/cfg/configuration.php 2014-08-23 14:14:14 UTC (rev 5222)
+++ trunk/catalog/install/data/templates/appareil_photo/booststrap/cfg/configuration.php 2014-08-26 16:17:46 UTC (rev 5223)
@@ -64,5 +64,3 @@
if($file != '..' && $file !='.' && $file !='') @unlink($path.$file);
}
@closedir($dir);
-?>
-<p><?php echo __('text option success') ?></p>
\ No newline at end of file
Modified: trunk/catalog/install/images/check.png
===================================================================
(Binary files differ)
Modified: trunk/catalog/install/images/cross.png
===================================================================
(Binary files differ)
Modified: trunk/catalog/install/images/favicon.ico
===================================================================
(Binary files differ)
Modified: trunk/catalog/install/images/help_icon.png
===================================================================
(Binary files differ)
Modified: trunk/catalog/install/images/oscss.jpg
===================================================================
(Binary files differ)
Modified: trunk/catalog/install/images/oscss_logo.png
===================================================================
(Binary files differ)
Added: trunk/catalog/install/images/warning.png
===================================================================
(Binary files differ)
Index: trunk/catalog/install/images/warning.png
===================================================================
--- trunk/catalog/install/images/warning.png 2014-08-23 14:14:14 UTC (rev 5222)
+++ trunk/catalog/install/images/warning.png 2014-08-26 16:17:46 UTC (rev 5223)
Property changes on: trunk/catalog/install/images/warning.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/catalog/install/includes/application.php
===================================================================
--- trunk/catalog/install/includes/application.php 2014-08-23 14:14:14 UTC (rev 5222)
+++ trunk/catalog/install/includes/application.php 2014-08-26 16:17:46 UTC (rev 5223)
@@ -17,6 +17,9 @@
define('DRIVER_SQL', 'mysql');
if(!defined('DIR_WS_COMMON_CLASSES')) define('DIR_WS_COMMON_CLASSES', 'classes/');
+ // where the team info are now
+ define("URL_INFORMATIONS", "http://oscss.biz/module-installer/");
+
require('includes/functions/general.php');
require('includes/functions/database.php');
require('includes/functions/html_output.php');
Modified: trunk/catalog/install/includes/classes/core.php
===================================================================
--- trunk/catalog/install/includes/classes/core.php 2014-08-23 14:14:14 UTC (rev 5222)
+++ trunk/catalog/install/includes/classes/core.php 2014-08-26 16:17:46 UTC (rev 5223)
@@ -38,8 +38,8 @@
Reperoire portant le nom de cla clef dans /includes/language/
*/
$this->available_languages = array(
- 'fr_FR' => 'Français [FR]',
-// 'en_EN' => 'English [EN]',
+ 'en_EN' => 'English [EN]',
+ 'fr_FR' => 'Français [FR]'
);
@@ -223,15 +223,13 @@
if($this->GetConfig('subpath') !='')
$this->ws_document_root=$this->cookie_path = $this->GetConfig('subpath');
- elseif(isset($_SERVER['SCRIPT_URL']) && !empty($_SERVER['SCRIPT_URL']) )
- $this->ws_document_root=$this->cookie_path = $_SERVER['SCRIPT_URL'];
elseif(isset($_SERVER['SCRIPT_FILENAME']) && !empty($_SERVER['SCRIPT_FILENAME']) )
$this->ws_document_root=$this->cookie_path = substr(dirname($_SERVER['SCRIPT_FILENAME']), 0, -strlen($path_install));
// // $this->fs_document_root=substr(dirname(__FILE__), 0, -strlen('includes/'.$path_install.basename(__FILE__)));
$this->cookie_domain =$_SERVER['HTTP_HOST'];
- $www_location = 'http://' . $_SERVER['HTTP_HOST']/* . $_SERVER['SCRIPT_FILENAME']*/;
- $this->www_location = $this->ws_document_root ; // /*substr(*/$www_location/*, 0, strpos($www_location, $path_install)*//*)*/;
+ $www_location = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_FILENAME'];
+ $this->www_location = substr($www_location, 0, strpos($www_location, $path_install));
$this->https_www_address = str_replace('http://', 'https://', $this->www_location);
$this->ws_admin_rand=(!isset($_POST['WS_STORE_ADMIN'])? 'admin'.rand(10,1000) :$_POST['WS_STORE_ADMIN']) ;
@@ -436,8 +434,15 @@
public static function team_pub(){
if(!file_exists('includes/team_info/'.self::$class.'.inc')) return;
- echo '<div id="team_info"><hr />'."\n";
- include('includes/team_info/'.self::$class.'.inc');
+ echo '<div id="team_info"><hr class="info"/>'."\n";
+ // try to retrieve info
+ $info_content = file_get_contents(URL_INFORMATIONS."?etape=".self::$class."&language=".DC_LOADER_LANG);
+ if ($info_content!== FALSE)
+ echo $info_content;
+ else {
+ // no connection, so default text
+ include('includes/team_info/default.inc');
+ }
echo '</div>'."\n";
}
Modified: trunk/catalog/install/includes/content/core.base.php
===================================================================
--- trunk/catalog/install/includes/content/core.base.php 2014-08-23 14:14:14 UTC (rev 5222)
+++ trunk/catalog/install/includes/content/core.base.php 2014-08-26 16:17:46 UTC (rev 5223)
@@ -70,7 +70,7 @@
// Show available languages
asort($this->available_languages);
echo
- '<form id="language_form" action="" method="get">'."\n".
+ '<form id="language_form" action="?language='.DC_LOADER_LANG.'" method="get">'."\n".
'<p class="language">'.core::l10n('Language')."\n".
'<select name="language" >'."\n";
foreach ($this->available_languages as $language_code => $language_name)
@@ -88,10 +88,10 @@
if(!$this->err) :
$this->PileMessage('succes',core::l10n("Tout est correct"));
$this->writeMessage();
- echo '<form id="install" action="?etape='.$this->get_current_etape(1).'" method="post">'."\n";
+ echo '<form id="install" action="?language='.DC_LOADER_LANG.'&etape='.$this->get_current_etape(1).'" method="post">'."\n";
- echo '<label>'.core::l10n('obtenir les dernieres correction durant le processus').'</label>'."\n"
+ echo '<p><label>'.core::l10n('obtenir les dernieres correction durant le processus').'</label>'."\n"
.osc_draw_checkbox_field('USE_SVN')."\n"
// .core::draw_help('patchsvn', core::l10n("Patcher votre shop avec les dernières modification du svn"))."\n"
.'</p>'."\n";
@@ -110,10 +110,11 @@
$path='../';
$this->err=false;
- if (version_compare(PHP_VERSION, '5.3.0', '<') )
- exit("Sorry, this version of osCSS will only run on PHP version 5.3 or greater!\n");
+ if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+ $this->PileMessage('alert',core::l10n("Sorry, this version of osCSS will only run on PHP version 5.3 or greater!\n"));
+ $this->err=true;
+ }
-
/** Contrôle écriture possible pour la suite */
while ($r=each($this->ctr)){
$type= (preg_match("#/$#i",$r['value'])) ?'rep' : 'file';
@@ -147,7 +148,11 @@
}
unset($type);
}
-
+ /** TODO : check functions for library* */
+ if (function_exists("gd_info")) {
+ $this->PileMessage('alert', core::l10n("La librairie PHP GD n'est pas installée"));
+ $this->err = true;
+ }
}
Modified: trunk/catalog/install/includes/content/core.configuration.php
===================================================================
--- trunk/catalog/install/includes/content/core.configuration.php 2014-08-23 14:14:14 UTC (rev 5222)
+++ trunk/catalog/install/includes/content/core.configuration.php 2014-08-26 16:17:46 UTC (rev 5223)
@@ -91,19 +91,20 @@
*/
private function AdjustConf(){
- $http_catalog = $_POST['HTTP_WWW_ADDRESS'];
- $http_server = 'http://' .$_POST['HTTP_COOKIE_DOMAIN'] ;
-
-// if (isset($http_url['port']) && !empty($http_url['port'])) $http_server .= ':' . $http_url['port'];
+ $http_url = parse_url($_POST['HTTP_WWW_ADDRESS']);
+ $http_server = $http_url['scheme'] . '://' . $http_url['host'];
+ $http_catalog = $http_url['path'];
+ if (isset($http_url['port']) && !empty($http_url['port'])) $http_server .= ':' . $http_url['port'];
if (substr($http_catalog, -1) != '/') $http_catalog .= '/';
$https_server = '';
$https_catalog = '';
if (isset($_POST['HTTPS_WWW_ADDRESS']) && !empty($_POST['HTTPS_WWW_ADDRESS'])) {
- $https_catalog = $_POST['HTTPS_WWW_ADDRESS'];
- $https_server = 'https://' . $_POST['HTTP_COOKIE_DOMAIN'];
+ $https_url = parse_url($_POST['HTTPS_WWW_ADDRESS']);
+ $https_server = $https_url['scheme'] . '://' . $https_url['host'];
+ $https_catalog = $https_url['path'];
-// if (isset($https_url['port']) && !empty($https_url['port'])) $https_server .= ':' . $https_url['port'];
+ if (isset($https_url['port']) && !empty($https_url['port'])) $https_server .= ':' . $https_url['port'];
if (substr($https_catalog, -1) != '/') $https_catalog .= '/';
}
@@ -147,7 +148,7 @@
$corresp['FS_DOCUMENT_ROOT'] = $this->fs_document_root;
$corresp['WS_DOCUMENT_ROOT'] = $this->ws_document_root;
$corresp['FS_ROOT_DOCS'] = $root_docs;
- $corresp['WS_ADMIN'] = $this->ws_document_root.$this->ws_admin_rand.'/';
+ $corresp['WS_ADMIN'] = $http_catalog .$this->ws_admin_rand.'/';
$corresp['FS_ADMIN'] = $this->fs_document_root.$this->ws_admin_rand.'/' ;
$corresp['HTTP_WORK_DIRECTORY'] = $http_work_directory;
$corresp['DB_SERVER'] = $this->db['DB_SERVER'];
@@ -217,9 +218,9 @@
$file_contents .=str_replace(self::$c_k, self::$c_v ,$res);
$file_contents .= "\n".'?>';
- $fp =@ fopen($this->fs_document_root . 'includes/configure.php', 'w');
- @fputs($fp, $file_contents);
- @fclose($fp);
+ $fp = fopen($this->fs_document_root . 'includes/configure.php', 'w');
+ fputs($fp, $file_contents);
+ fclose($fp);
$res=file_get_contents(self::$modele_path.'admin_configure.txt');
@@ -227,18 +228,18 @@
$file_contents .=str_replace(self::$c_k, self::$c_v ,$res);
$file_contents .= "\n".'?>';
- $fp = @fopen($this->fs_document_root .$this->ws_admin_rand.'/includes/configure.php', 'w');
- @fputs($fp, $file_contents);
- @fclose($fp);
+ $fp = fopen($this->fs_document_root .$this->ws_admin_rand.'/includes/configure.php', 'w');
+ fputs($fp, $file_contents);
+ fclose($fp);
$res=file_get_contents(self::$modele_path.'robot.txt');
$file_contents =str_replace(self::$c_k, self::$c_v ,$res);
- $fp = @fopen($this->fs_document_root . 'robots.txt', 'w');
- @fputs($fp, $file_contents);
- @fclose($fp);
+ $fp = fopen($this->fs_document_root . 'robots.txt', 'w');
+ fputs($fp, $file_contents);
+ fclose($fp);
}
@@ -257,18 +258,18 @@
$file_contents =str_replace(self::$c_k, self::$c_v ,$res);
- $fp = @fopen($this->fs_document_root .$this->ws_admin_rand.'/.htaccess', 'w');
- @fputs($fp, $file_contents);
- @fclose($fp);
+ $fp = fopen($this->fs_document_root .$this->ws_admin_rand.'/.htaccess', 'w');
+ fputs($fp, $file_contents);
+ fclose($fp);
$res=file_get_contents(self::$modele_path.'htaccess.txt');
$file_contents =str_replace(self::$c_k, self::$c_v ,$res);
- $fp = @fopen($this->fs_document_root . '.htaccess', 'w');
- @fputs($fp, $file_contents);
- @fclose($fp);
+ $fp = fopen($this->fs_document_root . '.htaccess', 'w');
+ fputs($fp, $file_contents);
+ fclose($fp);
}
else return false;
@@ -287,13 +288,13 @@
$file_contents .=str_replace(self::$c_k, self::$c_v ,$res);
$file_contents .= "\n".'?>';
- $fp = @fopen($this->fs_document_root .$this->ws_admin_rand.'/'.$file, 'w');
- @fputs($fp, $file_contents);
- @fclose($fp);
+ $fp = fopen($this->fs_document_root .$this->ws_admin_rand.'/'.$file, 'w');
+ fputs($fp, $file_contents);
+ fclose($fp);
- $fp = @fopen($this->fs_document_root .'/'.$file, 'w');
- @fputs($fp, $file_contents);
- @fclose($fp);
+ $fp = fopen($this->fs_document_root .'/'.$file, 'w');
+ fputs($fp, $file_contents);
+ fclose($fp);
}
/**
@@ -445,7 +446,7 @@
*/
function draw_form(){
$this->writeMessage();
- echo '<form id="install" action="?etape='.$this->get_current_etape(1).'" method="post">'."\n";
+ echo '<form id="install" action="?language='.DC_LOADER_LANG.'&etape='.$this->get_current_etape(1).'" method="post">'."\n";
$this->repet_post();
echo osc_draw_hidden_field('FS_ROOT_DOCS', '',$_POST['FS_ROOT_DOCS']);
Modified: trunk/catalog/install/includes/content/core.finition.php
===================================================================
--- trunk/catalog/install/includes/content/core.finition.php 2014-08-23 14:14:14 UTC (rev 5222)
+++ trunk/catalog/install/includes/content/core.finition.php 2014-08-26 16:17:46 UTC (rev 5223)
@@ -31,7 +31,7 @@
if(isset($_POST['EMAIL_ADMIN']))echo '<br /><p>'.sprintf(core::l10n("Rappel: pour vous connecter, utiliser votre email <strong>%s</strong> et le mot de passe <strong>%s</strong>"), $_POST['EMAIL_ADMIN'] ,'admin').'</p>'."\n";
echo '<p id="shop_link">'.'<a href="'.$this->www_location.'" >'.core::l10n("Boutique").'</a><a href="'.$this->www_location.$this->ws_admin_rand.'/" >'.core::l10n("Espace administratif privé" ).'</a>'.'</p>'."\n";
- echo '<form id="install" action="?etape='.$this->get_current_etape(1).'" method="post">'."\n";
+ echo '<form id="install" action="?language='.DC_LOADER_LANG.'&etape='.$this->get_current_etape(1).'" method="post">'."\n";
echo $this->draw_button(false, true);
echo '</form>'."\n";
}
Modified: trunk/catalog/install/includes/content/core.installdb.php
===================================================================
--- trunk/catalog/install/includes/content/core.installdb.php 2014-08-23 14:14:14 UTC (rev 5222)
+++ trunk/catalog/install/includes/content/core.installdb.php 2014-08-26 16:17:46 UTC (rev 5223)
@@ -183,7 +183,7 @@
while($file = readdir($fichier)){
if($file !='.' && $file !='..' && $file !='.svn' ) {
if(!isset($_POST['upgrade']) || ( $_POST['upgrade'] != $file && $_POST['upgrade']<$file)) {
- $s = '<form id="install" action="?etape='.$this->get_current_etape().'&upgrade=true" method="post">'."\n";
+ $s = '<form id="install" action="?language='.DC_LOADER_LANG.'&etape='.$this->get_current_etape().'&upgrade=true" method="post">'."\n";
$s .=$this->repet_post(true);
$s .="<p>" .core::l10n("Mettre a niveau la base de donnée, de la version" ).
' '. substr($file,0,strpos($file,'_')).
@@ -205,7 +205,7 @@
elseif(!isset($_POST['upgrade'])) {
echo '<hr />';
- echo '<form id="install" action="?etape='.$this->get_current_etape().'&upgrade=true" method="post">'."\n";
+ echo '<form id="install" action="?language='.DC_LOADER_LANG.'&etape='.$this->get_current_etape().'&upgrade=true" method="post">'."\n";
$this->repet_post();
echo "<p>" .core::l10n("Nouvelle installation. Supprime les données de la base si elles esistent " ).
' '.osc_draw_hidden_field('upgrade', '','install') .
@@ -215,7 +215,7 @@
echo '<hr />';
- echo '<form id="install" action="?etape='.$this->get_current_etape(1).'" method="post">'."\n";
+ echo '<form id="install" action="?language='.DC_LOADER_LANG.'&etape='.$this->get_current_etape(1).'" method="post">'."\n";
$this->repet_post();
if(isset($_POST['upgrade'])) {
echo osc_draw_hidden_field('up_upgrade['.$_POST['upgrade'].']', '', @$version['name']);
Modified: trunk/catalog/install/includes/content/core.modes.php
===================================================================
--- trunk/catalog/install/includes/content/core.modes.php 2014-08-23 14:14:14 UTC (rev 5222)
+++ trunk/catalog/install/includes/content/core.modes.php 2014-08-26 16:17:46 UTC (rev 5223)
@@ -46,7 +46,7 @@
if($this->err):
$this->writeMessage();
- echo '<form id="install" action="?etape='.$this->get_current_etape().'" method="post">'."\n";
+ echo '<form id="install" action="?language='.DC_LOADER_LANG.'&etape='.$this->get_current_etape().'" method="post">'."\n";
echo "<p>" . osc_draw_hidden_field('DB_TEST_CONNECTION', '', 'true') . "</p>\n";
$this->repet_post();
@@ -54,12 +54,12 @@
$this->PileMessage('succes',core::l10n("Test db correct"));
- if($this->db_exists) $this->PileMessage('succes',core::l10n("database existe, force mode upgrade"));
+ if($this->db_exists) $this->PileMessage('warning',core::l10n("database existe, force mode upgrade"));
$this->writeMessage();
- echo '<form id="install" action="?etape='.$this->get_current_etape(1).'" method="post">'."\n";
+ echo '<form id="install" action="?language='.DC_LOADER_LANG.'&etape='.$this->get_current_etape(1).'" method="post">'."\n";
$this->repet_post();
/** Test si db oscss deja existante, si c'est le cas, force mode upgrade db */
@@ -128,7 +128,7 @@
else:
- echo '<form id="install" action="?etape='.$this->get_current_etape().'" method="post">'."\n";
+ echo '<form id="install" action="?language='.DC_LOADER_LANG.'&etape='.$this->get_current_etape().'" method="post">'."\n";
$this->repet_post();
echo "<p>" . osc_draw_hidden_field('DB_TEST_CONNECTION', '', 'true') . "</p>\n";
@@ -207,7 +207,7 @@
echo '<p class="smallDesc">'."\n"
.'<label>'.core::l10n('Le port de la base de donnée').'</label>'."\n"
.osc_draw_input_field('DBMOTOR_PORT', '',( isset($_POST['DBMOTOR_PORT'])? $_POST['DBMOTOR_PORT'] : '3306'))."\n"
- .core::draw_help('httpSSL', core::l10n(' Post du serveur de base de donnée mysql(3306), ')/*, core::l10n('Activer les connections SSL:')*/)."\n"
+ .core::draw_help('httpSSL', core::l10n('Port du serveur de base de donnée mysql (3306)')/*, core::l10n('Activer les connections SSL:')*/)."\n"
.'</p>'."\n";
echo '<p class="smallDesc">'."\n"
@@ -220,7 +220,7 @@
.'</p>'."\n";
- echo '<h2>'.core::l10n("Serveur").'</h2>'."\n";
+ echo '<h2>'.core::l10n("Reglages serveur").'</h2>'."\n";
echo '<p class="smallDesc">'."\n"
.'<label>'.core::l10n('Activer les connections SSL:').'</label>'."\n"
.osc_draw_checkbox_field('ENABLE_SSL', '', ( (isset($_POST['ENABLE_SSL'])&& $_POST['ENABLE_SSL'] == 'true')? true : false) )."\n"
Modified: trunk/catalog/install/includes/content/core.template_sample.php
===================================================================
--- trunk/catalog/install/includes/content/core.template_sample.php 2014-08-23 14:14:14 UTC (rev 5222)
+++ trunk/catalog/install/includes/content/core.template_sample.php 2014-08-26 16:17:46 UTC (rev 5223)
@@ -129,7 +129,7 @@
*/
function draw_form(){
$this->writeMessage();
- echo '<form id="install" action="?etape='.$this->get_current_etape(1).'" method="post">'."\n";
+ echo '<form id="install" action="?language='.DC_LOADER_LANG.'&etape='.$this->get_current_etape(1).'" method="post">'."\n";
// report POST
$this->repet_post();
echo '<h2>'.core::l10n("Installer des exemples").'</h2>'."\n";
Modified: trunk/catalog/install/includes/language/en_EN/install.base.txt
===================================================================
--- trunk/catalog/install/includes/language/en_EN/install.base.txt 2014-08-23 14:14:14 UTC (rev 5222)
+++ trunk/catalog/install/includes/language/en_EN/install.base.txt 2014-08-26 16:17:46 UTC (rev 5223)
@@ -2,8 +2,8 @@
/**
@licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 16/03/11, 10:00
+ @version 2.1.1
+ @date 24/08/2014, 10:00
@author oscim <mail aur...@os...> <www http://www.oscim.fr> - Ayatus - Rwan
@encode UTF-8
*/
@@ -13,22 +13,23 @@
$lang['etape core.base']='Welcome';
$lang['etape core.modes']='Preparing';
$lang['etape core.update']='Update';
-$lang['etape core.installdb']='Data base';
-$lang['etape core.configuration']='Configuration';
-$lang['etape core.template_sample']='Templates and exemples';
-$lang['etape core.finition']='Finished';
+$lang['etape core.installdb']='Database';
+$lang['etape core.configuration']='Setup';
+$lang['etape core.template_sample']='Templates and Exemples';
+$lang['etape core.finition']='Success';
$lang['Précédent']='Previous';
$lang['Suivant']='Next';
$lang['Welcome to osCSS-2 install!']='osCSS-2 installer';
// core.base
$lang['Language']='Language';
-$lang['Valider']='Valider';
-$lang['Tout est correct']='All parameters correct';
+$lang['Valider']='Validate';
+$lang['Tout est correct']='All parameters are correct';
$lang["Corriger ces alertes pour continuer l'installation"]="Please, correct these alerts to continue...";
$lang["Le fichier n'est pas accessible en écriture : "]="No write permission on this file :";
$lang["Le répertoire n'est pas accessible en écriture : "]="No write permission on this directory :";
$lang["Le répertoire n'existe pas et ne peut être créé : "]="Directory not exist and can't be created :";
+$lang["obtenir les dernieres correction durant le processus"]="Obtain last updates during installation";
// core.modes
$lang["Test de connexion à la base de données échoué. Corriger cette alerte pour continuer l'installation"]="Le test de connexion à la base de données a échoué. Corriger cette alerte pour continuer l'installation";
Modified: trunk/catalog/install/includes/language/fr_FR/install.base.txt
===================================================================
--- trunk/catalog/install/includes/language/fr_FR/install.base.txt 2014-08-23 14:14:14 UTC (rev 5222)
+++ trunk/catalog/install/includes/language/fr_FR/install.base.txt 2014-08-26 16:17:46 UTC (rev 5223)
@@ -10,12 +10,12 @@
// core
-$lang['etape core.base']="Bienvenue" ;
+$lang['etape core.base']="Verification" ;
$lang['etape core.modes']="Préparation" ;
$lang['etape core.update']="Mise à jour" ;
$lang['etape core.installdb']="Base de données" ;
$lang['etape core.configuration']="Configuration" ;
-$lang['etape core.template_sample']="Templates et exemples" ;
+$lang['etape core.template_sample']="Thèmes et Exemples" ;
$lang['etape core.finition']="Finition" ;
$lang['Précédent']="Précédent" ;
$lang['Suivant']="Suivant" ;
@@ -30,11 +30,12 @@
$lang["Le répertoire n'est pas accessible en écriture : "]="Le répertoire n'est pas accessible en écriture : " ;
$lang["Le répertoire n'existe pas et ne peut être créé : "]="Le répertoire n'existe pas et ne peut être créé : " ;
$lang["Le répertoire existe mais les droits ne sont pas suffisants: "]="Le répertoire existe mais les droits ne sont pas suffisants : " ;
+$lang["obtenir les dernieres correction durant le processus"]="Obtenir les dernières corrections durant l'installation";
// core.modes
$lang["Test de connexion à la base de données échoué. Corriger cette alerte pour continuer l'installation"]="Le test de connexion à la base de données a échoué. Corriger cette alerte pour continuer l'installation" ;
-$lang["Test db correct"]="Test db correct" ;
-$lang["database existe, force mode upgrade"]="database existe, force mode upgrade" ;
+$lang["Test db correct"]="Connection au moteur de base de données correcte" ;
+$lang["database existe, force mode upgrade"]="La base de données existe déjà : mode 'Mise à jour' forcé" ;
$lang["Serveur"]="Serveur" ;
$lang["Important"]="Important" ;
$lang['Adresse WWW :']="Adresse WWW :" ;
@@ -61,9 +62,9 @@
$lang["Mode d'installation :"]="Mode d'installation :" ;
$lang["Install"]="Installation" ;
$lang["Update valable pour les version 2.xx uniquement"]="Mise à jour valable pour les versions 2.xx uniquement" ;
-$lang["Cette option vous permet de ré-écrire vos fichier de configuration (après déplacement), ou d'installer complètement votre boutique (effacement de la db)."]="Cette option vous permet de ré-écrire vos fichiers de configuration (après déplacement), ou d'installer complètement votre boutique (effacement de la db)." ;
+$lang["Cette option vous permet de ré-écrire vos fichier de configuration (après déplacement), ou d'installer complètement votre boutique (effacement de la db)."]="Cette option vous permet de réécrire vos fichiers de configuration (après déplacement), ou d'installer complètement votre boutique (effacement de la db)." ;
$lang['Rewriting :']="Ré-écriture d'url :" ;
-$lang["Cette option permet d'exploiter les rewriting , donc le SEO. Il est nécessaire que votre serveur le supporte."]="Cette option permet d'exploiter la ré-écriture d'url, donc le SEO. Il est nécessaire que votre serveur la supporte." ;
+$lang["Cette option permet d'exploiter les rewriting , donc le SEO. Il est nécessaire que votre serveur le supporte."]="Cette option permet d'exploiter la réécriture d'url, donc le SEO. Il est nécessaire que votre serveur la supporte." ;
$lang["Base de donnée"]="Base de données" ;
$lang['Serveur de Base de données :']="Serveur de base de données :" ;
$lang["Le serveur de base de données peut être sous forme de chemin, tel que db1.myserver.com, ou en tant qu'adresse IP comme 192.168.0.1"]="Le serveur de base de données peut être sous forme de chemin, tel que db1.myserver.com, ou en tant qu'adresse IP comme 127.0.0.1" ;
@@ -75,7 +76,16 @@
$lang['La base de données contient les données du catalogue. Un exemple de nom de base de données : oscss.']="La base de données contient les données de la boutique. Un exemple de nom de base de données : oscss." ;
$lang['Préfixe des tables :']="Préfixe des tables :" ;
$lang['Le prefix à utiliser pour les tables crées sur la base de données. Un exemple de préfixe de table : "osc_" ce qui créera une table nommée osc_products.']="Le préfixe à utiliser pour les tables créées sur la base de données. Un exemple de préfixe de table : 'osc_' ce qui créera une table nommée osc_products." ;
-$lang["Serveur"]="Serveur" ;
+$lang['Avance']="Avancé";
+$lang['Type de base de donnée']="Type de base de données";
+$lang['Le type de base de donnée']="Le type de base de données";
+$lang['Base de donnée encodage']="Base de données encodage";
+$lang['L\'encodage de la base de donnée']="L'encodage de la base de données";
+$lang['Le port de la base de donnée']="Le port de la base de données";
+$lang['Port du serveur de base de donnée mysql (3306)']="Port du serveur de base de donnée mysql (3306)";
+$lang['Type de moteur dans la base de donnée']="Type de moteur dans la base de données";
+$lang['Preferer le moteur innodb pour les base volumineuse, uniquement lors d\'une nouvelle installation. le moteur ne peut être converti apres installation']="Préférer le moteur innodb pour les base volumineuse, uniquement lors d'une nouvelle installation. le moteur ne peut être converti après installation";
+$lang["Reglages serveur"]="Réglages serveur" ;
$lang['Activer les connections SSL:']="Activer les connexions SSL:" ;
$lang['Activer les connections sécurisé SSL (HTTPS) (exige un certificat installé sur le serveur web).']="Activer les connexions sécurisées SSL (HTTPS) (exige un certificat installé sur le serveur web)." ;
$lang["Connexion sécurisée"]="Connexion sécurisée" ;
@@ -88,6 +98,14 @@
$lang['Chemin Cookie Sécurisé :']="Chemin sécurisé des cookies :" ;
$lang['Le chemin sécurisé pour stocker les cookies, par exemple <em>/my_name/catalog/</em>']="Le chemin sécurisé pour stocker les cookies, par exemple <em>/my_name/catalog/</em>" ;
$lang['Le chemin sécurisé pour stocker les cookies']="Le chemin sécurisé pour stocker les cookies" ;
+$lang['Arboresance']="Arborescence";
+$lang['Choix de l\'arboresance des dossiers et fichiers inscriptibles']="Choix de l'arborescence des dossiers et fichiers inscriptibles";
+$lang['Classique']="Standard";
+$lang['Un dossier contient l\'ensemble des données de l\'application']="Un dossier contient l'ensemble des données de l'application";
+$lang['Vhost']="Vhost";
+$lang['Le dossier des données et document est placé au dessus du dossier de l\'application. modification du vhost ou acces au dossier superieur']="Le dossier des données et documents est placé au dessus du dossier de l'application. Modification du vhost ou accès au dossier supérieur";
+$lang['Nom du répertoire des dossier inscriptibles:']="Nom du répertoire des dossier inscriptibles:";
+$lang['y seront placé tous les fichier est dossier necessaire au fonctionnement.']="Y seront placés tous les fichiers et dossiers nécessaires au fonctionnement.";
// core.update
$lang["Erreur récupération fichier"]="Erreur de récupération de fichier" ;
@@ -96,12 +114,12 @@
$lang["Le fichier à été enregistré"]="Le fichier à été enregistré" ;
$lang["Le fichier n'as pas été enregistré"]="Le fichier n'as pas été enregistré" ;
$lang["Version svn(développement) de osCSS-2 "]="Version svn(développement) de osCSS-2 " ;
-$lang["Les version svn contienent les dernières correction et mise à jour. Les revisions sont calculé sur votre version, et, en dehors des beta, vous devriez utiliser cette option. L'ecart entre les versions signifie qu'aucun paquet n'as été proposé depuis, et donc souligne qu'il s'agit de revision et correction mineure "]="Les versions svn contiennent les dernières corrections et mises à jour. Les révisions sont calculées sur votre version, et, en dehors des bêta, vous devriez utiliser cette option. L'écart entre les versions signifie qu'aucun paquet n'a été proposé depuis, et donc souligne qu'il s'agit de révision et correction mineure " ;
-$lang["Version svn actuelle: "]="Version svn actuelle : " ;
+$lang["Les version svn contienent les dernières corrections et mise à jour. Les revisions sont calculé sur votre version, et, en dehors des beta, vous devriez utiliser cette option. L'ecart entre les versions signifie qu'aucun paquet n'as été proposé depuis, et donc souligne qu'il s'agit de revision et correction mineure "]="Les versions svn contiennent les dernières corrections et mises à jour. Les révisions sont calculées sur votre version, et, en dehors des bêta, vous devriez utiliser cette option. L'écart entre les versions signifie qu'aucun paquet n'a été proposé depuis, et donc souligne qu'il s'agit de révision et correction mineure " ;
+$lang["Version svn actuelle: "]="Version SVN actuelle : " ;
$lang['Récupérer le patch de la version courante du dépôt subversion']="Récupérer le patch de la version courante du dépôt subversion" ;
-$lang["Patcher votre shop avec les dernières modification du svn"]="Patcher votre boutique avec les dernières modifications du svn" ;
-$lang['Revision N° precis :']="Revision N° precis :" ;
-$lang["Le numéro de révision svn (basé sur :https://oscss.svn.sourceforge.net/svnroot/oscss )pour patcher votre shop "]="Le numéro de révision svn (basé sur :https://oscss.svn.sourceforge.net/svnroot/oscss ) pour patcher votre boutique " ;
+$lang["Patcher votre shop avec les dernières modification du svn"]="Mettre à jour votre boutique avec les dernières modifications du svn" ;
+$lang['Revision N° precis :']="Revision N° précis :" ;
+$lang["Le numéro de révision svn (basé sur :https://oscss.svn.sourceforge.net/svnroot/oscss )pour patcher votre shop "]="Le numéro de révision svn (basé sur :https://oscss.svn.sourceforge.net/svnroot/oscss ) pour mettre à jour votre boutique " ;
// core.installdb
$lang["Un problème à eu lieu durant la phase d'installation de la base de données"]="Un problème a eu lieu durant la phase d'installation de la base de données" ;
@@ -111,7 +129,7 @@
$lang["a"]="à" ;
$lang["Mettre a jour"]="Mettre à jour" ;
$lang["Nouvelle installation. Supprime les données de la base si elles esistent "]="Nouvelle installation. Supprime les données de la base si elles existent " ;
-$lang["Installer"]="Installer" ;
+$lang["Installer"]="Installer la base de données" ;
// core.configuration
$lang["Votre nouvelle boutique osCSS est maintenant installé. "]="Votre nouvelle boutique osCSS est maintenant installée. " ;
@@ -148,13 +166,14 @@
$lang["L'installation et la configuration du template sont terminés"]="L'installation et la configuration du template sont terminés" ;
$lang["Installer des exemples"]="Installer des exemples" ;
$lang['Installer les exemples :']="Installer les exemples :" ;
-$lang["Si vous désactivez cette option, seul le template sera installé"]="Si vous désactivez cette option, seul le template sera installé" ;
+$lang["Si vous désactivez cette option, seul le template sera installé"]="Si vous désactivez cette option, seul le thème sera installé" ;
$lang['Sample appareil_photo']="Exemple avec des appareils photo" ;
-// $lang['Template ']='Template ';
+// $lang['Template ']='Thème ';
+$lang['Installer template et exemples']="Installer les thèmes et les exemples";
// core.finition
$lang["L'installation d'osCSS-2 est terminée avec succès "]="L'installation d'osCSS-2 est terminée avec succès " ;
-$lang["Votre boutique est maintenant prête à être exploitée. Elle est le fruit d'un travail communautaire et ne fournis aucune garantie. Reportez vous à la licence GNU. \n Vous pouvez bien sur contacter la communauté, à travers le forum ou l'un des administrateur dont vous trouverez les coordonnées sur cet espace. \n Enfin, pour assurer et pérenniser ce travail, n'hésitez pas à nous faire par de vos commentaires et toutes volontés quelconque à la promotion de cette solution."]="Votre boutique est maintenant prête à être exploitée. Elle est le fruit d'un travail communautaire et ne fournis aucune garantie. Reportez vous à la licence GNU. \n Vous pouvez bien sûr contacter la communauté, à travers le forum ou l'un des administrateur dont vous trouverez les coordonnées sur cet espace. \n Enfin, pour assurer et pérenniser ce travail, n'hésitez pas à nous faire par de vos commentaires et de toutes volontés quelconque à la promotion de cette solution." ;
+$lang["Votre boutique est maintenant prête à être exploitée. Elle est le fruit d'un travail communautaire et ne fournis aucune garantie. Reportez vous à la licence GNU. \n Vous pouvez bien sur contacter la communauté, à travers le forum ou l'un des administrateur dont vous trouverez les coordonnées sur cet espace. \n Enfin, pour assurer et pérenniser ce travail, n'hésitez pas à nous faire par de vos commentaires et toutes volontés quelconque à la promotion de cette solution."]="Votre boutique est maintenant prête à être exploitée. Elle est le fruit d'un travail communautaire et ne fournis aucune garantie. Reportez-vous à la licence GNU. \n Vous pouvez bien sûr contacter la communauté, à travers le forum ou l'un des administrateurs dont vous trouverez les coordonnées sur cet espace. \n Enfin, pour assurer et pérenniser ce travail, n'hésitez pas à nous faire part de vos commentaires et de toutes volontés quelconque à la promotion de cette solution." ;
$lang["Rappel: pour vous connecter, utiliser votre email <strong>%s</strong> et le mot de passe <strong>%s</strong>"]="Rappel: pour vous connecter, utilisez votre email <strong>%s</strong> et le mot de passe <strong>%s</strong>" ;
$lang["Boutique"]="Boutique" ;
$lang["Espace administratif privé"]="Espace administratif privé" ;
Modified: trunk/catalog/install/includes/language/fr_FR/osc_categories_description.txt
===================================================================
--- trunk/catalog/install/includes/language/fr_FR/osc_categories_description.txt 2014-08-23 14:14:14 UTC (rev 5222)
+++ trunk/catalog/install/includes/language/fr_FR/osc_categories_description.txt 2014-08-26 16:17:46 UTC (rev 5223)
@@ -12,6 +12,6 @@
/* osc_categories_description */
$lg['CAT1']="Non classé(s)" ;
$lg['CAT2']="Informations" ;
-$lg['CAT3']="Home" ;
+$lg['CAT3']="Accueil" ;
?>
\ No newline at end of file
Modified: trunk/catalog/install/includes/language/fr_FR/osc_content_description.txt
===================================================================
--- trunk/catalog/install/includes/language/fr_FR/osc_content_description.txt 2014-08-23 14:14:14 UTC (rev 5222)
+++ trunk/catalog/install/includes/language/fr_FR/osc_content_description.txt 2014-08-26 16:17:46 UTC (rev 5223)
@@ -1,8 +1,8 @@
<?php
/**
- @licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.2.0
+ @version 2.1.0
@date 18/12/10, 10:50
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@@ -19,6 +19,5 @@
$lg['OSC_CONTENT_DESCRIPTION_CONTACT_T']="Contact" ;
$lg['OSC_CONTENT_DESCRIPTION_CONTACT_D']="<p>Utiliser ce formulaire pour contacter notre service clientèle.</p>" ;
-$lg[' OSC_CONTENT_DESCRIPTION_HOME_T']="Bienvenue" ;
-$lg[' OSC_CONTENT_DESCRIPTION_HOME_T']="<p>Faites un tour sur notre shop ... , et n'hesitez pas à nous solliciter pour tous renseigement :)</p>" ;
+
?>
\ No newline at end of file
Modified: trunk/catalog/install/includes/modele/configure.txt
===================================================================
--- trunk/catalog/install/includes/modele/configure.txt 2014-08-23 14:14:14 UTC (rev 5222)
+++ trunk/catalog/install/includes/modele/configure.txt 2014-08-26 16:17:46 UTC (rev 5223)
@@ -29,8 +29,8 @@
define('HTTPS_COOKIE_DOMAIN', '%HTTPS_COOKIE_DOMAIN%');
define('HTTP_COOKIE_PATH', '%HTTP_COOKIE_PATH%');
define('HTTPS_COOKIE_PATH', '%HTTPS_COOKIE_PATH%');
- define('DIR_WS_HTTP_CATALOG', '%WS_DOCUMENT_ROOT%');
- define('DIR_WS_HTTPS_CATALOG', '%WS_DOCUMENT_ROOT%');
+ define('DIR_WS_HTTP_CATALOG', '%HTTP_CATALOG%');
+ define('DIR_WS_HTTPS_CATALOG', '%HTTP_CATALOG%');
define('DIR_CLASSES', 'classes/');
define('DIR_FUNCTIONS', 'functions/');
Modified: trunk/catalog/install/includes/team_info/base.inc
===================================================================
--- trunk/catalog/install/includes/team_info/base.inc 2014-08-23 14:14:14 UTC (rev 5222)
+++ trunk/catalog/install/includes/team_info/base.inc 2014-08-26 16:17:46 UTC (rev 5223)
@@ -1,13 +1,7 @@
-<h2><a href="http:://www.osCSS.org">osCSS</a> </h2>
+<h2>History</h2>
<p>
-<a href="http:://www.osCSS.org"><img src="../install/images/oscss_logo.png" width="210" height="103" alt="logo osCSS"/></a>
-<strong>osCSS, moteur de boutique en ligne</strong> est une solution 100% Open Source, dont le moteur (le core) appartient à la communauté qui en détient le choix d'orientation et d'évolution.
+ <a href="http://www.osCSS.biz" title="Visit Web site" target="_blank"><img src="../install/images/oscss_logo.png" width="210" height="" alt="logo osCSS"/></a>
+ <strong>osCSS, e-commerce engine</strong> is an Open Source community solution.
+ This version of the engine is far from the original osCommerce forked in 2005. The orientation is close to an "osCommmerce 3".
</p>
-<p>Il est ainsi possible, pour toute personne désirant s'investir dans le développement, d'orienter les choix et évolutions de cette solution.
-</p>
-<p>Cette version du moteur est fortement éloignée du moteur osCommerce d'origine et tend plus à l'évolution poussée du développement d'osCSS. De plus, au niveau de l'orientation du moteur on est plus proche d'un "osCommmerce 3" ou de toutes solutions rigides.
-</p>
-<p><strong>Soutenez nous ! </strong>Participez à la promotion, au développement, aux remontées de bug, afin d'améliorer les performances, la stabilité et la cohérence de l'ensemble. Toutes informations liées à votre utilisation nous intéressent. Quelques minutes pour nous faire connaître vos remarques sur cette solution seront les bienvenues.
-</p>
-<p>osCSS, 2005 - <?php echo date('Y') ?>. - Basé à l'origine sur osCommerce</p>
Added: trunk/catalog/install/includes/team_info/default.inc
===================================================================
--- trunk/catalog/install/includes/team_info/default.inc (rev 0)
+++ trunk/catalog/install/includes/team_info/default.inc 2014-08-26 16:17:46 UTC (rev 5223)
@@ -0,0 +1,21 @@
+<h2>Support osCSS ! </h2>
+<p>
+ We are interested in all review to improve performance, stability and consistency of the whole software. It costs only few minutes ...
+</p>
+<div class="divided50 separator">
+ <h3>Help Promote and Join Us</h3>
+ <ul>
+ <li><a href="https://plus.google.com/107698144587463763937/posts" target="_blank">Google+</a></li>
+ <li><a href="https://facebook.com/oscss.org" target="_blank">Facebook</a></li>
+ <li><a href="https://twitter.com/osCSS" target="_blank">Tweeter</a></li>
+ </ul>
+</div>
+<div class="divided50">
+ <h3>Participate in Development</h3>
+ <ul>
+ <li><a href="http://sourceforge.net/projects/oscss/" target="_blank">SourceForge</a></li>
+ <li><a href="http://dev.oscss.org/" target="_blank">Repport a Bug</a></li>
+ <li><a href="http://forums.oscss.org/" target="_blank">Forums</a></li>
+ </ul>
+</div>
+<br class="clear" />
\ No newline at end of file
Modified: trunk/catalog/install/index.php
===================================================================
--- trunk/catalog/install/index.php 2014-08-23 14:14:14 UTC (rev 5222)
+++ trunk/catalog/install/index.php 2014-08-26 16:17:46 UTC (rev 5223)
@@ -9,7 +9,7 @@
*/
require('includes/application.php');
-error_reporting(E_ALL);
+
$install=new core();
$install->draw_page();
Modified: trunk/catalog/install/templates/footer.php
===================================================================
--- trunk/catalog/install/templates/footer.php 2014-08-23 14:14:14 UTC (rev 5222)
+++ trunk/catalog/install/templates/footer.php 2014-08-26 16:17:46 UTC (rev 5223)
@@ -9,7 +9,7 @@
*/
?>
<div id="contentFooter">
-<p id="copyright">~ Design - Ayatus & j4k ~ Propulsé par <a href="http://www.oscss.org/" title=" osCSS-2 ">osCSS-2</a> ~ Valid <a href="http://validator.w3.org/check?uri=referer" title=" validate XHTML ">XHTML</a> - <a href="http://jigsaw.w3.org/css-validator/check/referer/?profile=css3" title=" validate CSS ">CSS</a> ~</p></div>
+<p id="copyright">~ Design - Ayatus & j4k ~ Propulsé par <a href="http://www.oscss.org/" title=" osCSS-2 ">osCSS-2</a> ~</p></div>
</div>
</body>
</html>
\ No newline at end of file
Modified: trunk/catalog/install/templates/header.php
===================================================================
--- trunk/catalog/install/templates/header.php 2014-08-23 14:14:14 UTC (rev 5222)
+++ trunk/catalog/install/templates/header.php 2014-08-26 16:17:46 UTC (rev 5223)
@@ -12,11 +12,13 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr" dir="ltr" >
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title>osCSS :// Web standard compliant Open Source E-Commerce Solutions</title>
+<title>Install osCSS | Web standard compliant Open Source E-Commerce Solutions</title>
<meta name="ROBOTS" content="NOFOLLOW" />
-<link rel="shortcut icon" type="images/x-icon" href="images/favicon.ico"/>
-<link rel="stylesheet" type="text/css" href="templates/main_page/stylesheet.css" media="screen"/>
-<link rel="stylesheet" type="text/css" href="templates/main_page/zoombox.css" media="screen"/>
+<link rel="icon" type="images/x-icon" href="images/favicon.ico" />
+<link href='http://fonts.googleapis.com/css?family=Raleway:400,600,800' rel='stylesheet' type='text/css' />
+<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css' />
+<link rel="stylesheet" type="text/css" href="templates/main_page/stylesheet.css" media="screen" />
+<link rel="stylesheet" type="text/css" href="templates/main_page/zoombox.css" media="screen" />
<script type="text/javascript" src="../ext/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../ext/jquery/jquery.validate.min.js"></script>
<script type="text/javascript" src="templates/main_page/zoombox.js"></script>
Modified: trunk/catalog/install/templates/main_page/stylesheet.css
===================================================================
--- trunk/catalog/install/templates/main_page/stylesheet.css 2014-08-23 14:14:14 UTC (rev 5222)
+++ trunk/catalog/install/templates/main_page/stylesheet.css 2014-08-26 16:17:46 UTC (rev 5223)
@@ -1,11 +1,12 @@
html {font-size:100%;}
-body {margin:0; padding:103px 0 0; font-family:Arial,Georgia,Tahoma,FreeSans,sans-serif; font-size:12px; color:white; background:#eee url(../../images/oscss_logo.png) center top no-repeat;}
+body {margin:0; padding:175px 0 50px; font-family: 'Raleway', sans-serif; font-weight:400; font-size:14px; color:#666; background:#eee url(../../images/oscss_logo.png) center 25px no-repeat;}
/* Titres */
-h1, h2, h3, h4, h5, h6 {margin:0; padding:0;}
-h1 {font-size:2em;}
-h2 {font-size:1.3em; padding-bottom:.7em;}
-h3 {font-size:1.1em; padding-bottom:.5em;}
+h1, h2, h3, h4, h5, h6 {margin:0; padding:0;color:#4f8ecb;font-family: 'Lobster', cursive;letter-spacing: 0.05em;}
+h1 {font-size:3em;}
+h2 {font-size:1.8em; padding-bottom:.7em;}
+h3 {font-size:1.3em; padding-bottom:.5em;}
+h4 {font-size:1.1em; padding-bottom:.5em;}
/* Listes */
ul, ol {margin:0; padding:0; list-style:none;}
@@ -15,41 +16,30 @@
address {margin:.75em 0; font-style:normal;}
/* Liens */
-a, a:link, a:visited {color:#303030; text-decoration:none;}
-a:hover {color:#82c46c; font-weight:bold;}
+a, a:link, a:visited {color:#4f8ecb; }
+a:hover {color:#ff9803; font-weight:bold;}
a:active {outline:none;}
a img {border:none;}
-/* Divers éléments de type en-ligne */
+/* Divers éléments de type en-ligne */
em {font-style:italic;}
strong {font-weight:bold;}
/* Formulaires */
form, fieldset {margin:0 0 1em; padding:0; border:none;}
+form p:hover{background-color: #eee;}
label {margin-right:1em;}
-input, button, select {font-size:12px;}
+input, button, select {font-size:16px;padding: 5px 7px;font-family: arial;font-weight: bold;border-radius: 5px; border:1px solid #999;color: #666;vertical-align: middle;}
+input:focus, button:focus, select:focus {border:1px solid #4f8ecb;color: #4f8ecb; box-shadow: 0 0 5px #ff9803;}
input[type=text], input[type=password] {width:45%;}
-input[type=radio] {margin: .3em 1em;}
+input[type=radio] {margin: .3em .3em .3em 1em;}
img {border:none;}
-#install label {display:inline-block; width:35%; }
+#install label {display:inline-block; width:40%; vertical-align: middle;}
/* ---Template--- */
-#template {
- background-color:white;
- color:#303030;
- margin:0 auto;
- padding:1em;
- width:910px;
- -moz-border-radius:1em;
- -webkit-border-radius:1em;
- -khtml-border-radius:1em;
- border-radius:1em;
- -moz-box-shadow: 0 0 1em #ccc;
- -webkit-box-shadow: 0 0 1em #ccc;
- box-shadow: 0px 0px 1em #ccc;
-}
+#template { background-color:white; color:#303030; margin:0 auto; padding:1em; width:960px; -moz-border-radius:1em; -webkit-border-radius:1em; -khtml-border-radius:1em; border-radius:1em; -moz-box-shadow: 0 0 1em #4f8ecb; -webkit-box-shadow: 0 0 1em #4f8ecb; box-shadow: 0px 0px 1em #4f8ecb;}
#title {text-align:center; margin-bottom:.5em;}
@@ -59,8 +49,9 @@
display:inline;
font-weight:bold;
margin-right:1px;
- padding: .2em .5em .1em;
+ padding: .3em .5em .2em;
border:1px solid #ccc;
+ border-bottom: none;
-moz-border-radius:0.5em 0.5em 0 0;
-webkit-border-radius:0.5em 0.5em 0 0;
-khtml-border-radius:0.5em 0.5em 0 0;
@@ -79,9 +70,19 @@
-khtml-border-radius:1em;
border-radius:1em;
}
-.smallDesc {padding:0 0 .5em .5em; line-height:2em;}
-#team_info p {padding:1em;}
+.smallDesc {padding:0 0 0 .5em; line-height:2em;margin: 0 0 .5em 0;}
+#team_info p {padding:1em;text-align: justify;}
#team_info img {margin:-2em 2em 0 0; float:right;}
+
+#team_info h2 {padding:1em 0 0 0;}
+#team_info h3 {padding:1em 0 0 0;}
+#team_info .divided50 { width: 47%;float: left;padding: 10px; text-align: center;}
+#team_info .divided50 h3 { padding: 0;}
+#team_info ul { margin-left: 20px;}
+#team_info ul li { padding: 3px;}
+hr.info { margin:40px 0 0 0; padding: 0; border: none; border-top: medium dotted #999; color: #999; text-align: center; }
+hr.info:after { content: "Informations"; display: inline-block; position: relative; top: -0.7em; font-size: 1.5em; padding: 0 0.5em; background: white; z-index:500;border-left: 2px solid #999;border-right: 2px solid #999;border-radius: 5px;}
+.separator { border-right: 2px solid #ccc;padding: -20px;}
.clear {clear:both;}
/* Aide contextuellle */
@@ -90,7 +91,7 @@
.help:hover .longDescription {
display:block;
position: absolute;
- background-color:#82c46c;
+ background-color:#666;
color:white;
padding:.2em .7em;
width:865px;
@@ -99,21 +100,29 @@
-khtml-border-radius:1em;
border-radius:1em;
}
-.help img {padding:0 .5em; display:inline; vertical-align:sub;}
+.help img {padding:0 .5em; display:inline; vertical-align:middle;}
/* Bouton formulaire */
#bt {text-align:center;}
+#bt:hover {background-color: transparent;}
.submitBt {
- background-color:#82c46c;
- color:white;
+ background-color:#ff9803;
+ color:#eeeeee;
font-weight:bold;
- padding: .2em .5em;
- border: none;
+ font-size: 1.4em;
+ padding: .2em .4em;
+ margin: 0 10px;
+ border: 1px solid #e88a03;
-moz-border-radius:0.5em;
-webkit-border-radius:0.5em;
-khtml-border-radius:0.5em;
border-radius:0.5em;
+ cursor:pointer;
}
+.submitBt:hover{
+ background-color:#ffae38; color:white;
+ box-shadow: 0 0 15px #999;
+}
/* Sample */
#ChooseSample li p {width:250px;}
ul.ChooseTemplate li {display:inline-block;width:180px; text-align:center; height:200px; vertical-align:top;}
@@ -123,23 +132,26 @@
#shop_link {text-align:center; margin:1em 0;}
#shop_link a {
background-color:#303030;
- color:#82c46c;
+ color:#ff9803;
font-weight:bold;
margin-right:1em;
padding: .5em 1em;
- border:1px solid #82c46c;
+ border:1px solid #ff9803;
-moz-border-radius:15px;
-webkit-border-radius:15px;
-khtml-border-radius:15px;
border-radius:15px;
}
-#shop_link a:hover {background-color:#82c46c; color:white;}
+#shop_link a:hover {background-color:#ff9803; color:white;}
/* Messages */
.msg {padding: 1em; font-size:1.1em;}
.msg span {display:block; padding-left:2em;}
-.succes {background:transparent url(../../images/check.png) no-repeat; color:green;}
-.alert {background:transparent url(../../images/cross.png) no-repeat; color:red;}
+.succes, .success {background:transparent url(../../images/check.png) no-repeat; color:green;font-weight: bold;}
+.warning {background:transparent url(../../images/warning.png) no-repeat; color:orange;font-weight: bold;}
+.alert {background:transparent url(../../images/cross.png) no-repeat; color:red;font-weight: bold;}
+input.error {background:url("../../images/cross.png") no-repeat scroll right center transparent; }
+label.error { color:red;}
/* -Footer- */
#copyright {padding:.5em 0 0; text-align:center;}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2014-08-23 14:14:18
|
Revision: 5222
http://sourceforge.net/p/oscss/svn/5222
Author: oscim
Date: 2014-08-23 14:14:14 +0000 (Sat, 23 Aug 2014)
Log Message:
-----------
Fix bug
Add correctly install
Modified Paths:
--------------
trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/attributeManager/attributeManager.php
trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/attributeManager/includes/attributeManagerGeneralFunctions.inc.php
trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/attributeManager/includes/attributeManagerHeader.inc.php
trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/attributeManager/includes/attributeManagerPlaceHolder.inc.php
trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/attributeManager/javascript/attributeManager.js
trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/includes/modules/products/attributeManager.php
trunk/extensions/ATTRIBUTEMANAGER_stable/install.xml
Modified: trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/attributeManager/attributeManager.php
===================================================================
--- trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/attributeManager/attributeManager.php 2014-08-23 14:11:01 UTC (rev 5221)
+++ trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/attributeManager/attributeManager.php 2014-08-23 14:14:14 UTC (rev 5222)
@@ -1,9 +1,9 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2014 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
+ @version 2.2.0
@date 31/10/10, 09:01
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
Modified: trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/attributeManager/includes/attributeManagerGeneralFunctions.inc.php
===================================================================
--- trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/attributeManager/includes/attributeManagerGeneralFunctions.inc.php 2014-08-23 14:11:01 UTC (rev 5221)
+++ trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/attributeManager/includes/attributeManagerGeneralFunctions.inc.php 2014-08-23 14:14:14 UTC (rev 5222)
@@ -28,20 +28,22 @@
function amGetAttributeManagerInstance($get) {
- if (!is_numeric($get['products_id']) || AM_ATOMIC_PRODUCT_UPDATES) {
+// if (!is_numeric($get['products_id']) || AM_ATOMIC_PRODUCT_UPDATES) {
+//
+// // first time visiting the page - delete the session var and start again
+// if('new_product' == $get[AM_PAGE_ACTION_NAME] && !tep_not_null($get[AM_ACTION_GET_VARIABLE]))
+// amSessionUnregister(AM_SESSION_VAR_NAME);
+//
+// amSessionRegister(AM_SESSION_VAR_NAME, array());
+//
+// $attributeManager = new attributeManagerAtomic(amGetSesssionVariable(AM_SESSION_VAR_NAME));
+// }
+// else {
- // first time visiting the page - delete the session var and start again
- if('new_product' == $get[AM_PAGE_ACTION_NAME] && !tep_not_null($get[AM_ACTION_GET_VARIABLE]))
- amSessionUnregister(AM_SESSION_VAR_NAME);
- amSessionRegister(AM_SESSION_VAR_NAME, array());
-
- $attributeManager = new attributeManagerAtomic(amGetSesssionVariable(AM_SESSION_VAR_NAME));
- }
- else {
$attributeManager = new attributeManagerInstant($_GET['products_id']);
- }
+// }
return $attributeManager;
}
Modified: trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/attributeManager/includes/attributeManagerHeader.inc.php
===================================================================
--- trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/attributeManager/includes/attributeManagerHeader.inc.php 2014-08-23 14:11:01 UTC (rev 5221)
+++ trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/attributeManager/includes/attributeManagerHeader.inc.php 2014-08-23 14:14:14 UTC (rev 5222)
@@ -7,12 +7,12 @@
Released under the GNU General Public License
- Copyright � 2006 Kangaroo Partners
+ Copyright 2006 Kangaroo Partners
http://kangaroopartners.com
os...@ka...
*/
-if('new_product' == $action || 'update_product' == $action) {
+// if('edit' == $action || 'new' == $action|| 'update' == $action) {
$amSessionVar = tep_session_name().'='.tep_session_id();
echo <<<HEADER
<script type="text/JavaScript">
@@ -22,19 +22,19 @@
var sessionId='{$amSessionVar}';
// -->
</script>
-<script type="text/JavaScript" src="attributeManager/javascript/requester.js"></script>
-<script type="text/JavaScript" src="attributeManager/javascript/alertBoxes.js"></script>
-<script type="text/JavaScript" src="attributeManager/javascript/attributeManager.js"></script>
+<script type="text/javascript" src="attributeManager/javascript/requester.js"></script>
+<script type="text/javascript" src="attributeManager/javascript/alertBoxes.js"></script>
+<script type="text/javascript" src="attributeManager/javascript/attributeManager.js"></script>
<link rel="stylesheet" type="text/css" href="attributeManager/css/attributeManager.css" />
HEADER;
-}
+// }
?>
<script type="text/javascript">
<!--
function goOnLoad() {
- <?php if('new_product' == $action || 'update_product' == $action) echo 'attributeManagerInit();'; ?>
+ <?php if('edit' == $action || 'new' == $action|| 'update' == $action) echo 'attributeManagerInit();'; ?>
SetFocus();
}
// -->
Modified: trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/attributeManager/includes/attributeManagerPlaceHolder.inc.php
===================================================================
--- trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/attributeManager/includes/attributeManagerPlaceHolder.inc.php 2014-08-23 14:11:01 UTC (rev 5221)
+++ trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/attributeManager/includes/attributeManagerPlaceHolder.inc.php 2014-08-23 14:14:14 UTC (rev 5222)
@@ -15,7 +15,7 @@
// chdir('../');
require_once('attributeManager/classes/attributeManagerConfig.class.php');
-if( isset($_GET['pID'])){
+if( isset($_GET['products_ID'])){
require_once('attributeManager/classes/stopDirectAccess.class.php');
stopDirectAccess::authorise($amSessionVar,AM_SESSION_VALID_INCLUDE);
Modified: trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/attributeManager/javascript/attributeManager.js
===================================================================
--- trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/attributeManager/javascript/attributeManager.js 2014-08-23 14:11:01 UTC (rev 5221)
+++ trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/attributeManager/javascript/attributeManager.js 2014-08-23 14:14:14 UTC (rev 5222)
@@ -1,6 +1,6 @@
var placeHolderDiv;
var url = 'attributeManager/attributeManager.php';
-var debug = true;
+var debug = false;
var amRequester = new Requester();
@@ -200,7 +200,7 @@
var sortOrder = -1;
- amSendRequest('amAction=addAttributeToProduct&option_id='+option+'&option_value_id='+optionValue+'&prefix='+pricePrefix+'&price='+price+'&sortOrder='+sortOrder);
+ amSendRequest('amAction=addAttributeToProduct&products_id='+productsId+'&option_id='+option+'&option_value_id='+optionValue+'&prefix='+pricePrefix+'&price='+price+'&sortOrder='+sortOrder);
return false;
}
Modified: trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/includes/modules/products/attributeManager.php
===================================================================
--- trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/includes/modules/products/attributeManager.php 2014-08-23 14:11:01 UTC (rev 5221)
+++ trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/includes/modules/products/attributeManager.php 2014-08-23 14:14:14 UTC (rev 5222)
@@ -60,30 +60,31 @@
@fn get_header_js ($action)
*/
function get_header_js ($action) {
- if ($action="new_product") {
+// if ('edit' == $action || 'new' == $action|| 'update' == $action) {
require_once(PATH_ATTRIBUT_MANAGER.'includes/attributeManagerHeader.inc.php' );
echo '<script type="text/javascript"><!--'."\n".
'function get_ajax_attM(id,pID,paction){'."\n".
- 'var ter = document.getElementById(id);'."\n".
- 'ter.innerHTML = "'.__('En cours').'";'."\n".
- '$.ajax({'."\n".
- 'type: "GET",'."\n".
- 'url: "'.PATH_ATTRIBUT_MANAGER.'/attributeManager.php",'."\n".
- 'data: "'.tep_session_name().'='.tep_session_id().'&products_id=" +pID+"&pageAction="+paction,'."\n".
- 'success: function(msg){'."\n".
- 'ter.innerHTML = msg;'."\n".
+ 'var ter = document.getElementById(id);'."\n".
+ 'ter.innerHTML = "'.__('En cours').'";'."\n".
+ '$.ajax({'."\n".
+ 'type: "GET",'."\n".
+ 'url: "'.PATH_ATTRIBUT_MANAGER.'attributeManager.php",'."\n".
+ 'data: "'.tep_session_name().'='.tep_session_id().'&products_id=" +pID+"&pageAction="+paction,'."\n".
+ 'success: function(msg){'."\n".
+ 'ter.innerHTML = msg;'."\n".
+ '}'."\n".
+ '});'."\n".
'}'."\n".
- '});'."\n".
- '}'."\n".
'var image_icon_minus = "'.DIR_WS_ADMIN .CsrtAction::getFullPathIcon('at_icon_minus').'";'."\n".
'var image_icon_plus = "'.DIR_WS_ADMIN .CsrtAction::getFullPathIcon('at_icon_plus').'";'."\n".
'var image_icon_up = "'.DIR_WS_ADMIN .CsrtAction::getFullPathIcon('at_icon_up').'";'."\n".
'var image_icon_down = "'.DIR_WS_ADMIN .CsrtAction::getFullPathIcon('at_icon_down').'";'."\n".
'var image_icon_add = "'.DIR_WS_ADMIN .CsrtAction::getFullPathIcon('at_icon_add').'";'."\n".
'var image_icon_disable = "'.DIR_WS_ADMIN .CsrtAction::getFullPathIcon('at_icon_disable').'";'."\n".
+ 'var productsId = '.$_GET['cID'].';'."\n".
'//--></script>'."\n".
'';
- }
+// }
}
/**
@@ -110,12 +111,13 @@
$m='<div class="attributeManager">'."\n";
- if (!isset($_GET['pID']))
+
+ if (!isset($_GET['cID']))
$m .= __('@attributemanager please save product after view this tabs');
else {
$m.='<div id="attributeManager"></div>'."\n".
'<script type="text/javascript"><!--'."\n".
- 'get_ajax_attM(\'attributeManager\','.$_GET['pID'].', \''.self::$action.'\');'."\n".
+ 'get_ajax_attM(\'attributeManager\','.$_GET['cID'].', \''.self::$action.'\');'."\n".
'// --></script>';
}
$m.='</div>'."\n";
Modified: trunk/extensions/ATTRIBUTEMANAGER_stable/install.xml
===================================================================
--- trunk/extensions/ATTRIBUTEMANAGER_stable/install.xml 2014-08-23 14:11:01 UTC (rev 5221)
+++ trunk/extensions/ATTRIBUTEMANAGER_stable/install.xml 2014-08-23 14:14:14 UTC (rev 5222)
@@ -8,19 +8,42 @@
<version>1.0.0</version>
</description>
- <extractzip>
- <zip name="attributeManager.zip" />
- <path name="admin/" />
- </extractzip>
<addfile>
<file name="admin/includes/modules/products/attributeManager.php" />
- <file name="includes/modules/products/attributeManager.php" />
+
+
+ <file name="admin/attributeManager/attributeManager.php" />
+ <file name="admin/attributeManager/index.html" />
+ <file name="admin/attributeManager/includes/attributeManagerPlaceHolder.inc.php" />
+ <file name="admin/attributeManager/includes/attributeManagerPrompts.inc.php" />
+ <file name="admin/attributeManager/includes/attributeManagerGeneralFunctions.inc.php" />
+ <file name="admin/attributeManager/includes/attributeManagerSessionFunctions.inc.php" />
+ <file name="admin/attributeManager/includes/attributeManagerHeader.inc.php" />
+ <file name="admin/attributeManager/includes/attributeManagerUpdateAtomic.inc.php" />
+ <file name="admin/attributeManager/javascript/alertBoxes.js" />
+ <file name="admin/attributeManager/javascript/attributeManager.js" />
+ <file name="admin/attributeManager/javascript/requester.js" />
+ <file name="admin/attributeManager/css/attributeManager.css" />
+ <file name="admin/attributeManager/classes/attributeManagerAtomic.class.php" />
+ <file name="admin/attributeManager/classes/attributeManager.class.php" />
+ <file name="admin/attributeManager/classes/stopDirectAccess.class.php" />
+ <file name="admin/attributeManager/classes/attributeManagerConfig.class.php" />
+ <file name="admin/attributeManager/classes/attributeManagerInstant.class.php" />
+ <file name="admin/attributeManager/classes/amDB.class.php" />
+
+
+
+
+ <file name="includes/modules/products/attributeManager.php" />
+
</addfile>
<addfilelg>
+ <file name="admin/attributeManager/languages/%LANGUAGE%/attributeManager.php" lgref="fr_FR" />
+
<file name="admin/includes/languages/%LANGUAGE%/modules/products/attributeManager.txt" lgref="fr_FR" />
<file name="includes/languages/%LANGUAGE%/modules/products/attributeManager.txt" lgref="fr_FR" />
</addfilelg>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2014-08-23 14:11:04
|
Revision: 5221
http://sourceforge.net/p/oscss/svn/5221
Author: oscim
Date: 2014-08-23 14:11:01 +0000 (Sat, 23 Aug 2014)
Log Message:
-----------
Adjust AM
Added Paths:
-----------
trunk/extensions/ATTRIBUTEMANAGER_stable/catalog/admin/attributeManager/
Removed Paths:
-------------
trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/
trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager.zip
Deleted: trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager.zip
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2014-08-22 12:52:54
|
Revision: 5220
http://sourceforge.net/p/oscss/svn/5220
Author: homer8173
Date: 2014-08-22 12:52:51 +0000 (Fri, 22 Aug 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/catalog/pub/index.html
Modified: trunk/catalog/pub/index.html
===================================================================
--- trunk/catalog/pub/index.html 2014-08-21 13:31:15 UTC (rev 5219)
+++ trunk/catalog/pub/index.html 2014-08-22 12:52:51 UTC (rev 5220)
@@ -5,4 +5,4 @@
<body>
.
</body>
-</html>
\ No newline at end of file
+</html>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2014-08-21 13:31:24
|
Revision: 5219
http://sourceforge.net/p/oscss/svn/5219
Author: oscim
Date: 2014-08-21 13:31:15 +0000 (Thu, 21 Aug 2014)
Log Message:
-----------
Fix bug link image
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/plugins/display_view.listing.gab
Modified: trunk/catalog/admin/includes/gabarit/plugins/display_view.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/plugins/display_view.listing.gab 2014-08-21 12:58:59 UTC (rev 5218)
+++ trunk/catalog/admin/includes/gabarit/plugins/display_view.listing.gab 2014-08-21 13:31:15 UTC (rev 5219)
@@ -1,9 +1,9 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2014 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.2
+ @version 2.2.0
@date 29/11/2013, 22:52
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2014-08-21 12:59:07
|
Revision: 5218
http://sourceforge.net/p/oscss/svn/5218
Author: oscim
Date: 2014-08-21 12:58:59 +0000 (Thu, 21 Aug 2014)
Log Message:
-----------
[BO] Fix bug in listing and view page tags for php page file
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/header_tags.form.gab
trunk/catalog/admin/includes/gabarit/header_tags.listing.gab
trunk/catalog/common/classes/AbstractHeader_tags.php
Modified: trunk/catalog/admin/includes/gabarit/header_tags.form.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/header_tags.form.gab 2014-08-21 12:51:29 UTC (rev 5217)
+++ trunk/catalog/admin/includes/gabarit/header_tags.form.gab 2014-08-21 12:58:59 UTC (rev 5218)
@@ -1,9 +1,9 @@
<?php
/**
- @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2014 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
+ @version 2.2.0
@date 09/01/12, 19:18
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
Modified: trunk/catalog/admin/includes/gabarit/header_tags.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/header_tags.listing.gab 2014-08-21 12:51:29 UTC (rev 5217)
+++ trunk/catalog/admin/includes/gabarit/header_tags.listing.gab 2014-08-21 12:58:59 UTC (rev 5218)
@@ -1,9 +1,9 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2014 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
+ @version 2.2.0
@date 20/10/11, 21:53
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@@ -34,8 +34,11 @@
<td><?php echo $ele['name']; ?></td>
<td class="row_action">
<span class="view fils">
+ <?php printf( CsrtAction::getLink('button_action' , IMAGE_ICON_INFO, 'edit'), '', tep_href_link(FILENAME_FULL_TAG, 'action=edit&name=' . $ele['key'], 'NONSSL'),'' ) ?>
+
<?php if (header_tags::$nameID == $ele['key']) { echo tep_image(DIR_WS_ICONS . 'icon_arrow_right.gif', ''); }
- else { echo '<a href="' . tep_href_link(FILENAME_FULL_TAG, tep_get_all_get_params(array('name','action')) . 'name=' . $ele['key']) . '&action=edit">' . tep_image(DIR_WS_ICONS . 'icon_info.gif', IMAGE_ICON_INFO) . '</a>'; } ?>
+ else { echo '<a href="' . tep_href_link(FILENAME_FULL_TAG, tep_get_all_get_params(array('name','action')) . 'name=' . $ele['key']) . '&action=edit">' .
+ tep_image(DIR_WS_ICONS . 'icon_info.gif', IMAGE_ICON_INFO) . '</a>'; } ?>
</span>
</td>
</tr>
Modified: trunk/catalog/common/classes/AbstractHeader_tags.php
===================================================================
--- trunk/catalog/common/classes/AbstractHeader_tags.php 2014-08-21 12:51:29 UTC (rev 5217)
+++ trunk/catalog/common/classes/AbstractHeader_tags.php 2014-08-21 12:58:59 UTC (rev 5218)
@@ -1,9 +1,9 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2014 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.2
+ @version 2.2.0
@date 30/09/2013, 14:33
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@@ -24,13 +24,14 @@
*/
-abstract class AbstractHeader_tags {
+class AbstractHeader_tags {
+
public static $test_cache = array();
/** Force Extending class to define this method */
- abstract protected function display_edit(&$contents, $id);
- abstract protected function after_update($id);
- abstract protected function after_update_lang($language_id,$id);
+ function display_edit(&$contents, $id){}
+ function after_update($id){}
+ function after_update_lang($language_id,$id){}
/**
constrcuteur
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2014-08-21 12:51:32
|
Revision: 5217
http://sourceforge.net/p/oscss/svn/5217
Author: oscim
Date: 2014-08-21 12:51:29 +0000 (Thu, 21 Aug 2014)
Log Message:
-----------
Fix call file lang in page's held order
Modified Paths:
--------------
trunk/catalog/admin/includes/modules/pages/held_orders.php
Modified: trunk/catalog/admin/includes/modules/pages/held_orders.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/held_orders.php 2014-08-21 12:43:53 UTC (rev 5216)
+++ trunk/catalog/admin/includes/modules/pages/held_orders.php 2014-08-21 12:51:29 UTC (rev 5217)
@@ -47,7 +47,7 @@
global $language;
$oscss=oscss_cstr::getInstance();
- $oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.'/'.$language.'/modules/pages/orders.txt');
+ $oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.'/'.$language.'/Order.txt');
self::GetConf();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2014-08-21 12:44:02
|
Revision: 5216
http://sourceforge.net/p/oscss/svn/5216
Author: oscim
Date: 2014-08-21 12:43:53 +0000 (Thu, 21 Aug 2014)
Log Message:
-----------
[BO] Fix error named of file of page's shipping
Modified Paths:
--------------
trunk/catalog/admin/includes/filenames.php
trunk/catalog/admin/includes/modules/pages/shippings.php
Modified: trunk/catalog/admin/includes/filenames.php
===================================================================
--- trunk/catalog/admin/includes/filenames.php 2014-08-21 12:30:37 UTC (rev 5215)
+++ trunk/catalog/admin/includes/filenames.php 2014-08-21 12:43:53 UTC (rev 5216)
@@ -64,7 +64,7 @@
define('FILENAME_STOCK', 'stock.php');
define('FILENAME_SERVICES', 'services.php');
-define('FILENAME_SHIPPING', 'shipping.php');
+define('FILENAME_SHIPPING', 'shippings.php');
define('FILENAME_TAX_CLASSES', 'tax_classes.php');
define('FILENAME_TEMPLATES', 'templates.php');
Modified: trunk/catalog/admin/includes/modules/pages/shippings.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/shippings.php 2014-08-21 12:30:37 UTC (rev 5215)
+++ trunk/catalog/admin/includes/modules/pages/shippings.php 2014-08-21 12:43:53 UTC (rev 5216)
@@ -47,7 +47,7 @@
/**
@var const
*/
- const FILENAME = "shippings.php";
+ const FILENAME = FILENAME_SHIPPING;
/**
@var object $order
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2014-08-21 12:30:46
|
Revision: 5215
http://sourceforge.net/p/oscss/svn/5215
Author: oscim
Date: 2014-08-21 12:30:37 +0000 (Thu, 21 Aug 2014)
Log Message:
-----------
[FO] Fix bug in propagation, customers_id in checkout_process
[BO] Fix bug filter in listing page
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/ModTreePage.php
trunk/catalog/admin/includes/modules/pages/orders.php
trunk/catalog/checkout.php
Modified: trunk/catalog/admin/includes/classes/ModTreePage.php
===================================================================
--- trunk/catalog/admin/includes/classes/ModTreePage.php 2014-08-21 08:03:56 UTC (rev 5214)
+++ trunk/catalog/admin/includes/classes/ModTreePage.php 2014-08-21 12:30:37 UTC (rev 5215)
@@ -529,7 +529,9 @@
*/
public static function actionFilter(){
+ $tmp = $_SESSION['filters'][self::$code];
$_SESSION['filters'] =array();
+ $_SESSION['filters'][self::$code] = $tmp;
foreach($_POST['filters']['listfield'] as $key=>$row){
if( $row =='on' )
Modified: trunk/catalog/admin/includes/modules/pages/orders.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/orders.php 2014-08-21 08:03:56 UTC (rev 5214)
+++ trunk/catalog/admin/includes/modules/pages/orders.php 2014-08-21 12:30:37 UTC (rev 5215)
@@ -23,15 +23,6 @@
class orders
extends ModTreePage /// new abstract class for nextgen module
implements
-// InterfaceModule
-// , ExtModConfig
-// , InterfacedTJsonS
-// , InterfacedInnerHtml
-//
-// // Events Interface for display and exec all notification
-// , EventMessInterface
-// , EventNotificationInterface
-
InterfaceModule
// base module config structure
@@ -315,32 +306,7 @@
$mutli=array();
$mutli[] = '<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>' ;
- /**
- @remarks Active forms filter
- @note
- array[
- // For normalised filter define on method ConvertInitVar
- generic =>
- array (
- 'string'
- // , ....
- );
- mod =>
- array(
- 'title'=>__('@products filter tab manufacturer'),
- 'content'=>tep_get_include_contents('manufacturers/filter.manufacturer'),
- )
- ]
- */
- $tab = array();
- $tab['mod'][]=array(
- 'title'=>__('orders filter tab clause'),
- 'content'=>tep_get_include_contents(__CLASS__.'/filter.clause'),
- );
- $tab['mod'][]=array(
- 'title'=>__('orders filter products tab clause'),
- 'content'=>tep_get_include_contents(__CLASS__.'/filter.products'),
- );
+
/**
@remarks this define menu master module in page
@note use $boutons[action][] = array(params)
@@ -355,15 +321,13 @@
*/
$boutons = array();
-
-
/**
@remarks filter based on status orders
*/
$allclosed = array(DEFAULT_ORDERS_STATUS_COMPLETED =>'on' , DEFAULT_ORDERS_STATUS_ANNULATE =>'on');
if(self::$view =='allclosed'){
- $_SESSION['filters'][__CLASS__]['viewstatus'] = $allclosed;
+ $_SESSION['filters'][self::$code]['viewstatus'] = $allclosed;
}
if(self::$view =='allnoclosed'){
$arr = array();
@@ -373,11 +337,11 @@
if( !in_array( $row['id'] , $rev ) )
$arr[$row['id']] = 'on' ;
- $_SESSION['filters'][__CLASS__]['viewstatus'] = $arr;
+ $_SESSION['filters'][self::$code]['viewstatus'] = $arr;
}
- if(isset($_SESSION['filters'][__CLASS__]['viewstatus']))
- $_SESSION['filters']['viewstatus'] = $_SESSION['filters'] [__CLASS__]['viewstatus'];
+ if(isset($_SESSION['filters'][self::$code]['viewstatus']))
+ $_SESSION['filters']['viewstatus'] = $_SESSION['filters'] [self::$code]['viewstatus'];
else
$_SESSION['filters']['viewstatus'] =array();
@@ -395,22 +359,24 @@
/**
@remarks filter based on date_purchased orders
*/
+
+
if(self::$view =='thisday'){
- $_SESSION['filters'][__CLASS__]['dates']['start'] = date('Y-m-d');
- $_SESSION['filters'][__CLASS__]['dates']['end'] = date('Y-m-d');
+ $_SESSION['filters'][self::$code]['dates']['start'] = date('Y-m-d');
+ $_SESSION['filters'][self::$code]['dates']['end'] = date('Y-m-d');
}
elseif(self::$view =='thisweek'){
- $_SESSION['filters'][__CLASS__]['dates']['start'] = date('Y-m-d', time() - (7 * 24 * 3600));
- $_SESSION['filters'][__CLASS__]['dates']['end'] = date('Y-m-d');
+ $_SESSION['filters'][self::$code]['dates']['start'] = date('Y-m-d', time() - (7 * 24 * 3600));
+ $_SESSION['filters'][self::$code]['dates']['end'] = date('Y-m-d');
}
else {
- if(isset($_SESSION['filters'][__CLASS__]['dates']['start']))
- $_SESSION['filters']['dates']['start'] = $_SESSION['filters'][__CLASS__]['dates']['start'].' 00:00:00';
+ if(isset($_SESSION['filters'][self::$code]['dates']['start']))
+ $_SESSION['filters']['dates']['start'] = $_SESSION['filters'][self::$code]['dates']['start'].' 00:00:00';
else
$_SESSION['filters']['dates']['start'] = date('Y-m-d', strtotime('-60 days') ) .' 00:00:00';
- if(isset($_SESSION['filters'][__CLASS__]['dates']['end']))
- $_SESSION['filters']['dates']['end'] = $_SESSION['filters'][__CLASS__]['dates']['end'].' 23:59:59';
+ if(isset($_SESSION['filters'][self::$code]['dates']['end']))
+ $_SESSION['filters']['dates']['end'] = $_SESSION['filters'][self::$code]['dates']['end'].' 23:59:59';
else
$_SESSION['filters']['dates']['end'] = date('Y-m-d').' 23:59:59';
}
@@ -426,11 +392,36 @@
- if(isset($_SESSION['filters'][__CLASS__]['products']))
- self::$InitInfo['adjust']['sWhere'] .=" AND op.products_id= '".tep_db_input($_SESSION['filters'][__CLASS__]['products'])."'";
+ if(isset($_SESSION['filters'][self::$code]['products']))
+ self::$InitInfo['adjust']['sWhere'] .=" AND op.products_id= '".tep_db_input($_SESSION['filters'][self::$code]['products'])."'";
+ /**
+ @remarks Active forms filter
+ @note
+ array[
+ // For normalised filter define on method ConvertInitVar
+ generic =>
+ array (
+ 'string'
+ // , ....
+ );
+ mod =>
+ array(
+ 'title'=>__('@products filter tab manufacturer'),
+ 'content'=>tep_get_include_contents('manufacturers/filter.manufacturer'),
+ )
+ ]
+ */
+ $tab = array();
+ $tab['mod'][]=array(
+ 'title'=>__('orders filter tab clause'),
+ 'content'=>tep_get_include_contents(__CLASS__.'/filter.clause'),
+ );
+ $tab['mod'][]=array(
+ 'title'=>__('orders filter products tab clause'),
+ 'content'=>tep_get_include_contents(__CLASS__.'/filter.products'),
+ );
-
/**
Call Base Init and construct $InitInfo for process Filter
$listfield string list row in db
@@ -476,27 +467,27 @@
case 'filters':
+
// status orders restric list
+ $_SESSION['filters'][self::$code]['viewstatus'] = array();
foreach($_POST['filters']['viewstatus'] as $key=>$row){
if( $row =='on' )
- $_SESSION['filters'][__CLASS__]['viewstatus'][$key] = 'on';
- else
- unset($_SESSION['filters'][__CLASS__]['viewstatus'][$key]);
+ $_SESSION['filters'][self::$code]['viewstatus'][$key] = 'on';
}
// date order
if(isset($_POST['filters']['dates']) ){
if( tep_not_null($_POST['filters']['dates']['start']))
- $_SESSION['filters'][__CLASS__]['dates']['start'] = tep_date_raw(tep_db_prepare_input($_POST['filters']['dates']['start']));
+ $_SESSION['filters'][self::$code]['dates']['start'] = tep_date_raw(tep_db_prepare_input($_POST['filters']['dates']['start']));
if(tep_not_null($_POST['filters']['dates']['end']))
- $_SESSION['filters'][__CLASS__]['dates']['end'] = tep_date_raw(tep_db_prepare_input($_POST['filters']['dates']['end']));
+ $_SESSION['filters'][self::$code]['dates']['end'] = tep_date_raw(tep_db_prepare_input($_POST['filters']['dates']['end']));
}
if(isset($_POST['filters']['products']) && $_POST['filters']['products'] > 0)
- $_SESSION['filters'][__CLASS__]['products'] = tep_db_prepare_input($_POST['filters']['products']);
+ $_SESSION['filters'][self::$code]['products'] = tep_db_prepare_input($_POST['filters']['products']);
else
- unset($_SESSION['filters'][__CLASS__]['products']);
+ unset($_SESSION['filters'][self::$code]['products']);
$actions = self::GenericAction();
Modified: trunk/catalog/checkout.php
===================================================================
--- trunk/catalog/checkout.php 2014-08-21 08:03:56 UTC (rev 5214)
+++ trunk/catalog/checkout.php 2014-08-21 12:30:37 UTC (rev 5215)
@@ -1,61 +1,110 @@
<?php
/**
- @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.1
- @date 20/11/11, 22:47
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ *\licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
+ *\portion code Copyright (c) 2002 osCommerce
+ *\package osCSS-2 <www http://www.oscss.org>
+ *\version 2.2.2
+ *\date 31/10/10, 22:59
+ *\author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ *\encode UTF-8
*\file
- *\brief page pre-process order
+ *\brief process checkout , no display ,
+ * this file have not file child i dir content
*/
- require('includes/application_top.php');
+ include('includes/application_top.php');
+ $page->init(basename(__FILE__),$language);
- //! chargement order
- $order = new order;
- $page->add_object('order',$order);
+ if(($path_lg=$page->fix_file(DIR_WS_INCLUDES .'languages/'. $language . '/product.txt',true)) !=false)
+ $page->pile_file_lang($path_lg);
+ if(($path_lg=$page->fix_file(DIR_WS_INCLUDES .'languages/'. $language . '/checkout.txt',true)) !=false)
+ $page->pile_file_lang($path_lg);
- $ACA =$page->new_class('checkout', @$_GET['step']);
+ $aca_modules = new checkout_process();
- $Etape=$ACA->GetCurrentEtape();
- $filepath = 'checkout_'.strtolower(substr($Etape, 2)).'.php';
+ //! ne prend les redirection liée au elements que si session not null ou post et get null block
+ if (count($_SESSION)==0 || ( count($_POST)==0 && count($_GET)==0 ) ){
+ $page->is_registered();
- $page->init($filepath,$language);
+ if (!tep_session_is_registered('sendto')) tep_redirect(tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
- if(($path_lg=$page->fix_file(DIR_WS_INCLUDES .'languages/'. $language . '/product.txt',true)) !=false)
- $page->pile_file_lang($path_lg);
- if(($path_lg=$page->fix_file(DIR_WS_INCLUDES .'languages/'. $language . '/checkout.txt',true)) !=false)
- $page->pile_file_lang($path_lg);
+ if (tep_not_null(MODULE_PAYMENT_INSTALLED) && (!tep_session_is_registered('payment')) ) tep_redirect(tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
+ }
- $page->force_content($filepath);
+ //! avoid hack attempts during the checkout procedure by checking the internal cartID
+ if (isset($cart->cartID) && tep_session_is_registered('cartID')) {
+ if ($cart->cartID != $cartID) {
+ tep_redirect(tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL'));
+ }
+ }
- $page->is_registered();
+// load selected payment module
+ $payment_modules = payment::getInstance($payment);
+
+ $order = new order;
+
+// load the selected shipping module
+ $shipping_modules = shipping::getInstance();
- if(isset($ACA->modules[$Etape])) {
- $BeforeProcess=$ACA->modules[$Etape]->BeforeProcess();
+ /**
+ Before process module ACA
+ */
+ $aca_modules->before_process();
+ /**
+ load the before_process function from the payment modules
+ Execution ligne suivante si before_process !=false
+ */
+ if ( ($pay_mod = $payment_modules->before_process()) == false ){
+
+ // Search or load order total modules
+ if( ($order_total_modules=$page->return_object('order_total')) ==false){
+ $order_total_modules = new order_total;
+ $page->add_object('order_total_modules',$order_total_modules);
+ }
+ /**
+ Si la methode contient une redirection, le reste de de process n'est pas executés
+ */
+ $order_totals = $order_total_modules->process( $order , $price);
+
+ $res=$aca_modules->preventDuplicate( array('order_totals'=>$order_totals,'order'=>$order,'customer_id'=>$customer_id) );
+
+ $insert_id=$res['the_order_id'];
}
+ else {
+ /**
+ Execution apres le before du module
+ et traitement des vars
+ */
+ if (isset($pay_mod) && is_array($pay_mod) ){
+ $insert_id = $pay_mod['insert_id'];
+ if(isset($pay_mod['order_totals'])) $order_totals= @$pay_mod['order_totals'];
+ }
+ }
-// $page->breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(constant('FILENAME_CHECKOUT_'.strtoupper(substr($Etape, 2))), '', 'SSL'));
- $page->post_init(false);
+// load the after_process function from the payment modules
+ $payment_modules->after_process();
+ /**
+ Before process module ACA
+ */
+ $aca_modules->after_process();
- $page->javascript->add_framework("ext/jquery/jquery.min.js");
- $page->javascript->add_script("ext/jquery/jquery.validate.min.js", array('sort'=>30));
+ $ACA =$page->new_class('checkout', '');
+ $ACA->after_process();
- include($page->path_gabarit());
+
+ $cart->reset(true);
+ tep_redirect(tep_href_link(FILENAME_CHECKOUT_SUCCESS, '', 'SSL'));
require(DIR_WS_INCLUDES . 'application_bottom.php');
-
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2014-08-21 08:03:58
|
Revision: 5214
http://sourceforge.net/p/oscss/svn/5214
Author: oscim
Date: 2014-08-21 08:03:56 +0000 (Thu, 21 Aug 2014)
Log Message:
-----------
Fix lang no present in install
Modified Paths:
--------------
trunk/catalog/install/includes/language/fr_FR/osc_content_description.txt
Modified: trunk/catalog/install/includes/language/fr_FR/osc_content_description.txt
===================================================================
--- trunk/catalog/install/includes/language/fr_FR/osc_content_description.txt 2014-08-20 08:44:04 UTC (rev 5213)
+++ trunk/catalog/install/includes/language/fr_FR/osc_content_description.txt 2014-08-21 08:03:56 UTC (rev 5214)
@@ -1,8 +1,8 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
+ @version 2.2.0
@date 18/12/10, 10:50
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@@ -19,5 +19,6 @@
$lg['OSC_CONTENT_DESCRIPTION_CONTACT_T']="Contact" ;
$lg['OSC_CONTENT_DESCRIPTION_CONTACT_D']="<p>Utiliser ce formulaire pour contacter notre service clientèle.</p>" ;
-
+$lg[' OSC_CONTENT_DESCRIPTION_HOME_T']="Bienvenue" ;
+$lg[' OSC_CONTENT_DESCRIPTION_HOME_T']="<p>Faites un tour sur notre shop ... , et n'hesitez pas à nous solliciter pour tous renseigement :)</p>" ;
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2014-08-20 08:44:14
|
Revision: 5213
http://sourceforge.net/p/oscss/svn/5213
Author: oscim
Date: 2014-08-20 08:44:04 +0000 (Wed, 20 Aug 2014)
Log Message:
-----------
Fix install in mode cli vs http
Modified Paths:
--------------
trunk/catalog/install/includes/classes/core.php
trunk/catalog/install/includes/content/core.configuration.php
trunk/catalog/install/includes/modele/configure.txt
Modified: trunk/catalog/install/includes/classes/core.php
===================================================================
--- trunk/catalog/install/includes/classes/core.php 2014-07-23 07:08:37 UTC (rev 5212)
+++ trunk/catalog/install/includes/classes/core.php 2014-08-20 08:44:04 UTC (rev 5213)
@@ -223,13 +223,15 @@
if($this->GetConfig('subpath') !='')
$this->ws_document_root=$this->cookie_path = $this->GetConfig('subpath');
+ elseif(isset($_SERVER['SCRIPT_URL']) && !empty($_SERVER['SCRIPT_URL']) )
+ $this->ws_document_root=$this->cookie_path = $_SERVER['SCRIPT_URL'];
elseif(isset($_SERVER['SCRIPT_FILENAME']) && !empty($_SERVER['SCRIPT_FILENAME']) )
$this->ws_document_root=$this->cookie_path = substr(dirname($_SERVER['SCRIPT_FILENAME']), 0, -strlen($path_install));
// // $this->fs_document_root=substr(dirname(__FILE__), 0, -strlen('includes/'.$path_install.basename(__FILE__)));
$this->cookie_domain =$_SERVER['HTTP_HOST'];
- $www_location = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_FILENAME'];
- $this->www_location = substr($www_location, 0, strpos($www_location, $path_install));
+ $www_location = 'http://' . $_SERVER['HTTP_HOST']/* . $_SERVER['SCRIPT_FILENAME']*/;
+ $this->www_location = $this->ws_document_root ; // /*substr(*/$www_location/*, 0, strpos($www_location, $path_install)*//*)*/;
$this->https_www_address = str_replace('http://', 'https://', $this->www_location);
$this->ws_admin_rand=(!isset($_POST['WS_STORE_ADMIN'])? 'admin'.rand(10,1000) :$_POST['WS_STORE_ADMIN']) ;
Modified: trunk/catalog/install/includes/content/core.configuration.php
===================================================================
--- trunk/catalog/install/includes/content/core.configuration.php 2014-07-23 07:08:37 UTC (rev 5212)
+++ trunk/catalog/install/includes/content/core.configuration.php 2014-08-20 08:44:04 UTC (rev 5213)
@@ -91,20 +91,19 @@
*/
private function AdjustConf(){
- $http_url = parse_url($_POST['HTTP_WWW_ADDRESS']);
- $http_server = $http_url['scheme'] . '://' . $http_url['host'];
- $http_catalog = $http_url['path'];
- if (isset($http_url['port']) && !empty($http_url['port'])) $http_server .= ':' . $http_url['port'];
+ $http_catalog = $_POST['HTTP_WWW_ADDRESS'];
+ $http_server = 'http://' .$_POST['HTTP_COOKIE_DOMAIN'] ;
+
+// if (isset($http_url['port']) && !empty($http_url['port'])) $http_server .= ':' . $http_url['port'];
if (substr($http_catalog, -1) != '/') $http_catalog .= '/';
$https_server = '';
$https_catalog = '';
if (isset($_POST['HTTPS_WWW_ADDRESS']) && !empty($_POST['HTTPS_WWW_ADDRESS'])) {
- $https_url = parse_url($_POST['HTTPS_WWW_ADDRESS']);
- $https_server = $https_url['scheme'] . '://' . $https_url['host'];
- $https_catalog = $https_url['path'];
+ $https_catalog = $_POST['HTTPS_WWW_ADDRESS'];
+ $https_server = 'https://' . $_POST['HTTP_COOKIE_DOMAIN'];
- if (isset($https_url['port']) && !empty($https_url['port'])) $https_server .= ':' . $https_url['port'];
+// if (isset($https_url['port']) && !empty($https_url['port'])) $https_server .= ':' . $https_url['port'];
if (substr($https_catalog, -1) != '/') $https_catalog .= '/';
}
@@ -148,7 +147,7 @@
$corresp['FS_DOCUMENT_ROOT'] = $this->fs_document_root;
$corresp['WS_DOCUMENT_ROOT'] = $this->ws_document_root;
$corresp['FS_ROOT_DOCS'] = $root_docs;
- $corresp['WS_ADMIN'] = $http_catalog .$this->ws_admin_rand.'/';
+ $corresp['WS_ADMIN'] = $this->ws_document_root.$this->ws_admin_rand.'/';
$corresp['FS_ADMIN'] = $this->fs_document_root.$this->ws_admin_rand.'/' ;
$corresp['HTTP_WORK_DIRECTORY'] = $http_work_directory;
$corresp['DB_SERVER'] = $this->db['DB_SERVER'];
@@ -218,9 +217,9 @@
$file_contents .=str_replace(self::$c_k, self::$c_v ,$res);
$file_contents .= "\n".'?>';
- $fp = fopen($this->fs_document_root . 'includes/configure.php', 'w');
- fputs($fp, $file_contents);
- fclose($fp);
+ $fp =@ fopen($this->fs_document_root . 'includes/configure.php', 'w');
+ @fputs($fp, $file_contents);
+ @fclose($fp);
$res=file_get_contents(self::$modele_path.'admin_configure.txt');
@@ -228,18 +227,18 @@
$file_contents .=str_replace(self::$c_k, self::$c_v ,$res);
$file_contents .= "\n".'?>';
- $fp = fopen($this->fs_document_root .$this->ws_admin_rand.'/includes/configure.php', 'w');
- fputs($fp, $file_contents);
- fclose($fp);
+ $fp = @fopen($this->fs_document_root .$this->ws_admin_rand.'/includes/configure.php', 'w');
+ @fputs($fp, $file_contents);
+ @fclose($fp);
$res=file_get_contents(self::$modele_path.'robot.txt');
$file_contents =str_replace(self::$c_k, self::$c_v ,$res);
- $fp = fopen($this->fs_document_root . 'robots.txt', 'w');
- fputs($fp, $file_contents);
- fclose($fp);
+ $fp = @fopen($this->fs_document_root . 'robots.txt', 'w');
+ @fputs($fp, $file_contents);
+ @fclose($fp);
}
@@ -258,18 +257,18 @@
$file_contents =str_replace(self::$c_k, self::$c_v ,$res);
- $fp = fopen($this->fs_document_root .$this->ws_admin_rand.'/.htaccess', 'w');
- fputs($fp, $file_contents);
- fclose($fp);
+ $fp = @fopen($this->fs_document_root .$this->ws_admin_rand.'/.htaccess', 'w');
+ @fputs($fp, $file_contents);
+ @fclose($fp);
$res=file_get_contents(self::$modele_path.'htaccess.txt');
$file_contents =str_replace(self::$c_k, self::$c_v ,$res);
- $fp = fopen($this->fs_document_root . '.htaccess', 'w');
- fputs($fp, $file_contents);
- fclose($fp);
+ $fp = @fopen($this->fs_document_root . '.htaccess', 'w');
+ @fputs($fp, $file_contents);
+ @fclose($fp);
}
else return false;
@@ -288,13 +287,13 @@
$file_contents .=str_replace(self::$c_k, self::$c_v ,$res);
$file_contents .= "\n".'?>';
- $fp = fopen($this->fs_document_root .$this->ws_admin_rand.'/'.$file, 'w');
- fputs($fp, $file_contents);
- fclose($fp);
+ $fp = @fopen($this->fs_document_root .$this->ws_admin_rand.'/'.$file, 'w');
+ @fputs($fp, $file_contents);
+ @fclose($fp);
- $fp = fopen($this->fs_document_root .'/'.$file, 'w');
- fputs($fp, $file_contents);
- fclose($fp);
+ $fp = @fopen($this->fs_document_root .'/'.$file, 'w');
+ @fputs($fp, $file_contents);
+ @fclose($fp);
}
/**
Modified: trunk/catalog/install/includes/modele/configure.txt
===================================================================
--- trunk/catalog/install/includes/modele/configure.txt 2014-07-23 07:08:37 UTC (rev 5212)
+++ trunk/catalog/install/includes/modele/configure.txt 2014-08-20 08:44:04 UTC (rev 5213)
@@ -29,8 +29,8 @@
define('HTTPS_COOKIE_DOMAIN', '%HTTPS_COOKIE_DOMAIN%');
define('HTTP_COOKIE_PATH', '%HTTP_COOKIE_PATH%');
define('HTTPS_COOKIE_PATH', '%HTTPS_COOKIE_PATH%');
- define('DIR_WS_HTTP_CATALOG', '%HTTP_CATALOG%');
- define('DIR_WS_HTTPS_CATALOG', '%HTTP_CATALOG%');
+ define('DIR_WS_HTTP_CATALOG', '%WS_DOCUMENT_ROOT%');
+ define('DIR_WS_HTTPS_CATALOG', '%WS_DOCUMENT_ROOT%');
define('DIR_CLASSES', 'classes/');
define('DIR_FUNCTIONS', 'functions/');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2014-07-23 07:08:45
|
Revision: 5212
http://sourceforge.net/p/oscss/svn/5212
Author: oscim
Date: 2014-07-23 07:08:37 +0000 (Wed, 23 Jul 2014)
Log Message:
-----------
Add file and rewrite for use RESTFUL API based on core
Modified Paths:
--------------
trunk/catalog/common/modules/core/seo_modrewrite/SeoR_byfolder.php
trunk/catalog/common/modules/core/seo_modrewrite/SeoR_classic.php
Added Paths:
-----------
trunk/catalog/restfulapi.php
Modified: trunk/catalog/common/modules/core/seo_modrewrite/SeoR_byfolder.php
===================================================================
--- trunk/catalog/common/modules/core/seo_modrewrite/SeoR_byfolder.php 2014-07-22 14:36:01 UTC (rev 5211)
+++ trunk/catalog/common/modules/core/seo_modrewrite/SeoR_byfolder.php 2014-07-23 07:08:37 UTC (rev 5212)
@@ -1,9 +1,9 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2014 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
+ @version 2.2.0
@date 16/03/2012, 16:16
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@@ -153,6 +153,7 @@
$t = 0;
if(isset($obj->anchor))
foreach($obj->anchor as $key=>$row){
+
$tmp[$i] = "\n\n## Datatype - ".$k."";
$i++;
$tmp[$i] = str_replace(
@@ -166,7 +167,16 @@
$replace,
'RewriteRule ^'. $row . $this->separator . '%CHECK_'.$t.'_%' . $this->separator . $reg_text . $reg_ext ."$ %PAGE_REPLACE_".$t."_%?" . $key . "=$1&%{QUERY_STRING} [L] "
);
+
$i++;
+
+ // add rewrite for activate RESTFUL API
+ $tmp[$i] = str_replace(
+ $base,
+ $replace,
+ 'RewriteRule ^'. preg_replace('#(_.*|s.*)#i','',$key) . $this->separator . '%CHECK_'.$t.'_%' ."$ restfulapi.php?" . $key . "=$1&%{QUERY_STRING} [L] "
+ );
+ $i++;
$t++;
}
}
Modified: trunk/catalog/common/modules/core/seo_modrewrite/SeoR_classic.php
===================================================================
--- trunk/catalog/common/modules/core/seo_modrewrite/SeoR_classic.php 2014-07-22 14:36:01 UTC (rev 5211)
+++ trunk/catalog/common/modules/core/seo_modrewrite/SeoR_classic.php 2014-07-23 07:08:37 UTC (rev 5212)
@@ -1,9 +1,9 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2014 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
+ @version 2.2.0
@date 16/03/2012, 16:16
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@@ -151,18 +151,32 @@
foreach($obj->anchor as $key=>$row){
$tmp[$i] = "\n\n## Datatype - ".$k."";
$i++;
+
$tmp[$i] = str_replace(
$base,
$replace,
'RewriteRule ^'. $reg_lg . $this->separator . $row . $this->separator . '%CHECK_'.$t.'_%' . $this->separator . $reg_text . $reg_ext ."$ %PAGE_REPLACE_".$t."_%?" . $key . "=$2&%{QUERY_STRING} [L] "
);
$i++;
+
+
$tmp[$i] = str_replace(
$base,
$replace,
'RewriteRule ^'. $row . $this->separator . '%CHECK_'.$t.'_%' . $this->separator . $reg_text . $reg_ext ."$ %PAGE_REPLACE_".$t."_%?" . $key . "=$1&%{QUERY_STRING} [L] "
);
+ $i++;
+
+
+ // add rewrite for activate RESTFUL API
+ $tmp[$i] = str_replace(
+ $base,
+ $replace,
+ 'RewriteRule ^'. preg_replace('#(_.*|s.*)#i','',$key) . $this->separator . '%CHECK_'.$t.'_%' ."$ restfulapi.php?" . $key . "=$1&%{QUERY_STRING} [L] "
+ );
$i++;
+
+
$t++;
}
}
Added: trunk/catalog/restfulapi.php
===================================================================
--- trunk/catalog/restfulapi.php (rev 0)
+++ trunk/catalog/restfulapi.php 2014-07-23 07:08:37 UTC (rev 5212)
@@ -0,0 +1,108 @@
+<?php
+/**
+ @licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.2.0
+ @date 11/05/2012 ,15:04:13
+ *\author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ *\encode UTF-8
+ *\file restfulapi.php
+ *\brief Page for RESTFUL API
+*/
+ require('includes/application_top.php');
+
+ $page->init(basename(__FILE__),$language);
+
+
+
+ //! Choix du mode affichage des listign et priorité
+ $page->add_var_page('category_depth','top');
+
+ /// call preload root listing for childs modules
+ DataTypes::Preload('preload_root');
+ $category_depth = $page->GetVar('category_depth');
+
+
+/**
+ @brief page unique sans heritages ou element externe (aca en pleine page)
+*/
+ if( ($dyntype = DataTypes::is_type('error')) && $dyntype != false )
+ $page_content = $dyntype->FO_load_page();
+
+ elseif ($category_depth == 'top') {
+
+ if( ($dyntype = DataTypes::is_type('unique')) && $dyntype != false && ($page_content = $dyntype->FO_load_page()) && $page_content !=false){
+ header('Content-Type: application/json');
+ $value=$page->GetVar('current_object');
+ }
+ else{
+ header("Status: 404 Not Found");
+ header("HTTP/1.0 301 Moved Permanently");
+ }
+
+ unset($category_cfils,$category_pfils,$category_parent);
+ }
+
+/**
+ @brief Modes Avec heritage des informations sur un parent (categorie, manufacturer, ...)
+*/
+ else{
+
+ if( ($dyntype = DataTypes::is_type('unique')) && $dyntype != false && ($page_content = $dyntype->FO_load_page()) && $page_content !=false ) {
+
+ header('Content-Type: application/json');
+ $value=$page->GetVar('current_object');
+ }
+ /**
+ @brief Unique Page 404 next check correct parent
+ use /content/404.php
+ */
+ elseif ( $page->GetVar('category_depth') == 'nofound') {
+ header("Status: 404 Not Found");
+ header("HTTP/1.0 301 Moved Permanently");
+ }
+ elseif ( $page->GetVar('category_depth') == 'empty') {
+ header("Status: 404 Not Found");
+ header("HTTP/1.0 301 Moved Permanently");
+ }
+ elseif ( $page->GetVar('category_depth') == 'error') {
+ header("Status: 500 technical error ");
+ header("HTTP/1.0 301 Moved Permanently");
+ }
+ /**
+ @brief Listing Page / Mutli prodycts / cms
+ use /content/index_listing.php
+ */
+ elseif ( ($dyntype = DataTypes::is_type('listing')) && $dyntype != false ){
+
+ $page->init(basename(__FILE__),$language);
+ $breadcrumb=$page->return_object('breadcrumb');
+
+ $listing=listing::getInstance();
+
+ // call master DataTypes listing and next childs modules
+ $page_content = DataTypes::transversal('transversal' /*, $listing*/ );
+
+ $listing_split = $listing->listing($dyntype);
+
+ $listing_query = $DB->query($listing_split->sql_query);
+
+ if(!empty($page_content))
+ $page->force_content($page_content);
+ else
+ $page_content = $page->force_content('index_listing.php');
+ }
+ else{
+ header("Status: 404 Not Found");
+ header("HTTP/1.0 301 Moved Permanently");
+ }
+ }
+
+
+ $page->post_init(false);
+
+
+ exit(json_encode($value));
+
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2014-07-22 14:36:10
|
Revision: 5211
http://sourceforge.net/p/oscss/svn/5211
Author: oscim
Date: 2014-07-22 14:36:01 +0000 (Tue, 22 Jul 2014)
Log Message:
-----------
Fix bur for required library
Modified Paths:
--------------
trunk/catalog/admin/includes/modules/pages/navigation_links.php
Modified: trunk/catalog/admin/includes/modules/pages/navigation_links.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/navigation_links.php 2014-07-10 06:17:26 UTC (rev 5210)
+++ trunk/catalog/admin/includes/modules/pages/navigation_links.php 2014-07-22 14:36:01 UTC (rev 5211)
@@ -12,6 +12,7 @@
require_once(DIR_FS_ADMIN . DIR_WS_CLASSES .'ModTreePage.php');
+require_once(DIR_FS_ADMIN . DIR_WS_CLASSES .'listeners/EventMessListener.php');
/**
@class navigation_links
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2014-07-10 06:17:34
|
Revision: 5210
http://sourceforge.net/p/oscss/svn/5210
Author: oscim
Date: 2014-07-10 06:17:26 +0000 (Thu, 10 Jul 2014)
Log Message:
-----------
Fix fr
Fix load box in sitemap
Modified Paths:
--------------
trunk/catalog/includes/languages/fr_FR/categorie.txt
trunk/catalog/includes/languages/fr_FR/product.txt
trunk/catalog/install/data/templates/appareil_photo/booststrap/cfg/init.php
Modified: trunk/catalog/includes/languages/fr_FR/categorie.txt
===================================================================
--- trunk/catalog/includes/languages/fr_FR/categorie.txt 2014-07-09 07:10:06 UTC (rev 5209)
+++ trunk/catalog/includes/languages/fr_FR/categorie.txt 2014-07-10 06:17:26 UTC (rev 5210)
@@ -23,8 +23,4 @@
/* Sitemap */
$lang['heading title categories'] = "Catégories";
-
-// $lang['entry password'] = "Mot de passe";
-
-
?>
Modified: trunk/catalog/includes/languages/fr_FR/product.txt
===================================================================
--- trunk/catalog/includes/languages/fr_FR/product.txt 2014-07-09 07:10:06 UTC (rev 5209)
+++ trunk/catalog/includes/languages/fr_FR/product.txt 2014-07-10 06:17:26 UTC (rev 5210)
@@ -1,8 +1,8 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.2
+ @version 2.2.0
@date 18/12/2013, 08:18
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@@ -21,13 +21,16 @@
$lang['image button in cart']="Ajouter au panier" ;
/* Boxes */
- $lang['categories menu']="Catégories" ;
+ $lang['categories menu']="Catalogue" ;
$lang['box heading viewed products']="Derniers produits vus" ;
$lang['box heading bestsellers']="Meilleures ventes" ;
$lang['box heading bestsellers in']="Meilleures ventes dans<br /> " ;
+/* sitemap */
+ $lang['heading title catalog'] = "Rubrique du catalogue";
+
/* Listing */
Modified: trunk/catalog/install/data/templates/appareil_photo/booststrap/cfg/init.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/booststrap/cfg/init.php 2014-07-09 07:10:06 UTC (rev 5209)
+++ trunk/catalog/install/data/templates/appareil_photo/booststrap/cfg/init.php 2014-07-10 06:17:26 UTC (rev 5210)
@@ -230,6 +230,7 @@
break;
case 'Page_sitemap':
$this->oscss_boxes->_add('selections', 'ponctual');
+ $this->oscss_boxes->_add('information', 'ponctual');
break;
default:
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2014-07-09 07:10:14
|
Revision: 5209
http://sourceforge.net/p/oscss/svn/5209
Author: oscim
Date: 2014-07-09 07:10:06 +0000 (Wed, 09 Jul 2014)
Log Message:
-----------
Fix link usage in .gab files
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/configuration/modlangue.listing.gab
trunk/catalog/admin/includes/gabarit/countries/edit.tab.state.gab
Modified: trunk/catalog/admin/includes/gabarit/configuration/modlangue.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modlangue.listing.gab 2014-07-09 06:30:38 UTC (rev 5208)
+++ trunk/catalog/admin/includes/gabarit/configuration/modlangue.listing.gab 2014-07-09 07:10:06 UTC (rev 5209)
@@ -1,9 +1,9 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2014 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
+ @version 2.2.0
@date 24/10/11, 17:00
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@@ -32,11 +32,8 @@
<th rowspan="2" class="tright"><?php echo __('table heading action') ?></th>
</tr>
<tr>
-<!-- <th><?php echo __('table heading language name') ?></th> -->
-<!-- <th class="tleft" style="width:40px"><?php echo __('table heading language code') ?></th> -->
<th class="tleft" style="width:40px"><?php echo __('table heading language folder public') ?></th>
<th class="tleft" style="width:40px"><?php echo __('table heading language folder admin') ?></th>
-<!-- <th class="tright"><?php echo __('table heading action') ?></th> -->
</tr>
</thead>
<tbody>
@@ -47,8 +44,10 @@
<td><?php echo (language::check_langue($lang->directory)? 'ok' : '--') ?></td>
<td><?php echo (language::check_langue($lang->directory, false)? 'ok' : '--') ?></td>
<td class="row_action">
- <a class="buttonimg" href="<?php echo tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','lID')). 'lID=' .$lang->languages_id. '&action=edit') ?>"><?php echo tep_image(DIR_WS_ICONS . 'icon_edit.png',IMAGE_EDIT )?></a>
- <a class="buttonimg" href="<?php echo tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','lID')). 'lID=' . $lang->languages_id . '&action=delete') ?>"><?php echo tep_image(DIR_WS_ICONS . 'icon_delete.png',IMAGE_DELETE) ?></a>
+ <?php printf(CsrtAction::getLink('row_action_right', IMAGE_EDIT, 'edit'), 'edit', tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','lID')). 'lID=' .$lang->languages_id. '&action=edit') ,'' ) ?>
+
+ <?php printf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'delete', tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','lID')). 'lID=' .$lang->languages_id. '&action=delete') ,'' ) ?>
+
<?php if (isset(modlangue::$lInfo) && is_object(modlangue::$lInfo) && ($lang->languages_id == modlangue::$lInfo->languages_id)) { echo tep_image(DIR_WS_ICONS . 'icon_arrow_right.gif', ''); }
else { echo '<a href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','oID')). 'lID=' . $lang->languages_id) . '">' . tep_image(DIR_WS_ICONS . 'icon_info.gif', IMAGE_ICON_INFO) . '</a>'; } ?>
Modified: trunk/catalog/admin/includes/gabarit/countries/edit.tab.state.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/countries/edit.tab.state.gab 2014-07-09 06:30:38 UTC (rev 5208)
+++ trunk/catalog/admin/includes/gabarit/countries/edit.tab.state.gab 2014-07-09 07:10:06 UTC (rev 5209)
@@ -31,11 +31,10 @@
<td><?php echo $zones->name; ?></td>
<td class="tcenter"><?php echo $zones->code; ?></td>
<td>
- <span class="view fils fright">
- <?php
-echo '<a class="buttonimg fancy" href="' . tep_href_link(countries::FILENAME, 'cID='.countries::$Id.'&id=' . $zones->id . '&action=edit_zone') . '">' . tep_image(DIR_WS_ICONS . 'icon_edit.png',IMAGE_EDIT ) . '</a> ';
-echo '<a class="buttonimg fancy" href="' . tep_href_link(countries::FILENAME, 'cID='.countries::$Id.'&id=' . $zones->id . '&action=delete_zone') . '">' . tep_image(DIR_WS_ICONS . 'icon_delete.png',IMAGE_DELETE ) . '</a>';
- ?>
+ <span class="view fils fleft">
+ <?php printf(CsrtAction::getLink('row_action_right', IMAGE_EDIT, 'edit'), 'edit', tep_href_link(countries::FILENAME, 'cID='.countries::$Id.'&id=' . $zones->id . '&action=edit_zone') ,'' ) ?>
+ <?php printf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'delete', tep_href_link(countries::FILENAME, 'cID='.countries::$Id.'&id=' . $zones->id . '&action=delete_zone') ,'' ) ?>
+
</span>
</td>
</tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2014-07-09 06:30:42
|
Revision: 5208
http://sourceforge.net/p/oscss/svn/5208
Author: oscim
Date: 2014-07-09 06:30:38 +0000 (Wed, 09 Jul 2014)
Log Message:
-----------
Fix lang
Modified Paths:
--------------
trunk/catalog/admin/includes/languages/fr_FR/Content.txt
trunk/catalog/admin/includes/languages/fr_FR/Product.txt
Modified: trunk/catalog/admin/includes/languages/fr_FR/Content.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/Content.txt 2014-06-17 07:22:28 UTC (rev 5207)
+++ trunk/catalog/admin/includes/languages/fr_FR/Content.txt 2014-07-09 06:30:38 UTC (rev 5208)
@@ -50,8 +50,8 @@
/* Form Add new */
/* */
- $lang['text new content']="Ajout d'un nouveau contenu" ;
- $lang['text content type']="Choix du type de contenu" ;
+ $lang['@cms_content heading title new']="Ajout d'un nouveau contenu" ;
+ $lang['cms_content table heading type id']="Choix du type de contenu" ;
$lang['text info intro choose content type']="Le type de contenu que vous créer impactera les options d'edition et d'affichage de votre texte. (depend de la prise en charge du theme public et de ces options)" ;
/* Edit */
Modified: trunk/catalog/admin/includes/languages/fr_FR/Product.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/Product.txt 2014-06-17 07:22:28 UTC (rev 5207)
+++ trunk/catalog/admin/includes/languages/fr_FR/Product.txt 2014-07-09 06:30:38 UTC (rev 5208)
@@ -251,8 +251,10 @@
$lang['@product create products in new link categorie for %s']="Copie réussie du produit" ;
$lang['@product error for create products in new link categorie for %s']="Erreur lors de la copie du produit" ;
+/* rightto */
+ $lang['@products txt link to'] = "Produtits" ;
+ $lang['@product link %s to %s'] = "Produit" ;
-
/* mutliple choose */
$lang['@products text info heading multi']="Action multiples sur les produits" ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2014-06-17 07:22:33
|
Revision: 5207
http://sourceforge.net/p/oscss/svn/5207
Author: oscim
Date: 2014-06-17 07:22:28 +0000 (Tue, 17 Jun 2014)
Log Message:
-----------
Fix
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/drivers/sqlcontent.php
trunk/catalog/admin/includes/modules/pages/cms_content.php
Modified: trunk/catalog/admin/includes/classes/drivers/sqlcontent.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcontent.php 2014-06-04 14:47:46 UTC (rev 5206)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcontent.php 2014-06-17 07:22:28 UTC (rev 5207)
@@ -383,6 +383,7 @@
$result = array(
'content_id' => 0,
+ 'content_type' => 1,
'content_name' => '',
'date_added' => '',
'last_modified' => '',
Modified: trunk/catalog/admin/includes/modules/pages/cms_content.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/cms_content.php 2014-06-04 14:47:46 UTC (rev 5206)
+++ trunk/catalog/admin/includes/modules/pages/cms_content.php 2014-06-17 07:22:28 UTC (rev 5207)
@@ -18,6 +18,7 @@
require_once(DIR_FS_ADMIN . DIR_WS_CLASSES .'listeners/EventTriggersCacheListener.php');
require_once(DIR_FS_ADMIN . DIR_WS_CLASSES .'listeners/EventTriggersSqlMaintenanceListener.php');
+
/**
@class cms_content
@brief multiple class for content
@@ -120,6 +121,26 @@
),
)
);
+
+ self::$allfields['c.content_type']= array(
+ 'sort'=>true,
+ 'search'=>true,
+ 'alias'=>'type',
+ 'text'=>__('cms_content table heading type id'),
+ 'width'=>'5%',
+ 'class'=>'tleft',
+ 'default'=>true,
+ 'edit'=>array(
+ 'input_name'=>'content_type',
+ 'input_type'=>'select',
+ 'class'=>'tleft',
+ 'input_size'=>'1',
+ 'required_status'=>true,
+ 'select_values'=>tep_get_status_array('content',0,'status_name'),
+ 'position_col'=>'right',
+ 'position_grp'=>5
+ ),
+ );
self::$allfields['cd.content_text'] = array(
'sort'=>true,
@@ -525,10 +546,6 @@
/**
@remarks Normal View Page
*/
- case 'new':
- $MG = false;
- self::$Info=self::GetDBValue();
- break;
default:
$action = parent::GenericDisplay($action);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2014-06-04 14:47:50
|
Revision: 5206
http://sourceforge.net/p/oscss/svn/5206
Author: oscim
Date: 2014-06-04 14:47:46 +0000 (Wed, 04 Jun 2014)
Log Message:
-----------
Fix
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/drivers/sqlorder.php
trunk/catalog/common/classes/InvoiceUtility.php
Modified: trunk/catalog/admin/includes/classes/drivers/sqlorder.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlorder.php 2014-06-03 12:48:29 UTC (rev 5205)
+++ trunk/catalog/admin/includes/classes/drivers/sqlorder.php 2014-06-04 14:47:46 UTC (rev 5206)
@@ -137,6 +137,10 @@
if( ($order = self::fetch(array('id'=>$option['id']))) && $order == false )
return false;
+ else {
+ $sql_data_array['facture_id'] = $order->info['facture_id'];
+ $sql_data_array['facture_ref'] = $order->info['facture_ref'];
+ }
if( isset($option['post']) )
$post = $option['post'];
@@ -309,27 +313,16 @@
}
-// if($new_st >= DEFAULT_ORDERS_STATUS_PAYED ){
-// if( !isset($sql_data_array['facture_id']) || empty($sql_data_array['facture_id']) )
-// $sql_data_array['facture_id'] = self::GetNumberInvoice();
-//
-// if( isset($sql_data_array['facture_ref']) && !empty($sql_data_array['facture_ref']) )
-// $sql_data_array['facture_ref'] = trim($sql_data_array['facture_ref']);
-// // New Ref
-// else {
-// $numref= new NumRef('bills');
-// $sql_data_array['facture_ref'] =$numref->GetNewNumRef() ;
-// }
-// self::$comment[] = __('orders update and factured');
-// }
+ if( ($_data_array = InvoiceUtility::CheckCreateInvoice($new_st, $sql_data_array)) && is_array( $_data_array ) ){
- if( $sql_data_array = InvoiceUtility::CheckCreateInvoice($new_st, $sql_data_array) )
- self::$comment[] = $sql_data_array['add_comment'];
+ if(isset($_data_array['add_comment'])){
+ self::$comment[] = $_data_array['add_comment'];
+ unset($_data_array['add_comment']);
+ }
- if($new_st >= DEFAULT_ORDERS_STATUS_COMPLETED ){
- //! cloture commande
- $sql_data_array['orders_date_finished']= 'NOW()';
+ $sql_data_array = array_merge($sql_data_array, $_data_array);
}
+
}
if(count($sql_data_array) > 0){
Modified: trunk/catalog/common/classes/InvoiceUtility.php
===================================================================
--- trunk/catalog/common/classes/InvoiceUtility.php 2014-06-03 12:48:29 UTC (rev 5205)
+++ trunk/catalog/common/classes/InvoiceUtility.php 2014-06-04 14:47:46 UTC (rev 5206)
@@ -11,7 +11,7 @@
*/
-require_once( DIR_FS_CATALOG . DIR_WS_COMMON_CLASSES . 'NumRef.php');
+// require_once( DIR_FS_CATALOG . DIR_WS_COMMON_CLASSES . 'NumRef.php');
/**
@@ -38,9 +38,12 @@
*/
public function CheckCreateInvoice($status = 0, $current = array() ){
if($status >= DEFAULT_ORDERS_STATUS_PAYED ){
- if( !isset($current['facture_id']) || empty($current['facture_id']) )
- $current['facture_id'] = self::GetNumberInvoice();
-
+
+ if( !isset($current['facture_id']) || empty($current['facture_id']) || $current['facture_id'] <=0 ){
+ $current['facture_id'] = self::GetNextNumberInvoice();
+ $current['add_comment'] = __('orders update and factured');
+ }
+
if( isset($current['facture_ref']) && !empty($current['facture_ref']) )
$current['facture_ref'] = trim($current['facture_ref']);
// New Ref
@@ -48,8 +51,7 @@
$numref= new NumRef('bills');
$current['facture_ref'] =$numref->GetNewNumRef() ;
}
- $current['add_comment'] = __('orders update and factured');
-
+
return $current;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2014-06-03 12:48:33
|
Revision: 5205
http://sourceforge.net/p/oscss/svn/5205
Author: oscim
Date: 2014-06-03 12:48:29 +0000 (Tue, 03 Jun 2014)
Log Message:
-----------
Fix
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/customerUtility.php
trunk/catalog/admin/includes/classes/drivers/sqlorder.php
trunk/catalog/checkout_payment_address.php
trunk/catalog/checkout_shipping_address.php
trunk/catalog/common/classes/addressUtility.php
trunk/catalog/includes/classes/checkout_process.php
trunk/catalog/includes/modules/account/address_book.php
trunk/catalog/templates/defaut/includes/gabarit/address_book_details.gab
trunk/catalog/templates/defaut/includes/gabarit/checkout/payment_address.gab
trunk/catalog/templates/defaut/includes/gabarit/checkout/shipping_address.gab
Added Paths:
-----------
trunk/catalog/common/classes/InvoiceUtility.php
Modified: trunk/catalog/admin/includes/classes/customerUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/customerUtility.php 2014-05-26 08:34:52 UTC (rev 5204)
+++ trunk/catalog/admin/includes/classes/customerUtility.php 2014-06-03 12:48:29 UTC (rev 5205)
@@ -1,9 +1,9 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2014 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.2
+ @version 2.2.0
@date 02/03/2012, 13:41
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
Modified: trunk/catalog/admin/includes/classes/drivers/sqlorder.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlorder.php 2014-05-26 08:34:52 UTC (rev 5204)
+++ trunk/catalog/admin/includes/classes/drivers/sqlorder.php 2014-06-03 12:48:29 UTC (rev 5205)
@@ -14,6 +14,10 @@
require_once( DIR_FS_ADMIN . DIR_WS_CLASSES . 'SqlFilesDataDriverClass.php');
+require_once( DIR_FS_ADMIN . DIR_WS_FUNCTIONS . 'lib.orders.php');
+
+require_once( DIR_FS_CATALOG . DIR_WS_COMMON_CLASSES . 'InvoiceUtility.php');
+
class sqlorder
extends SqlFilesDataDriverClass
implements ModSqlDataDriver{
@@ -138,13 +142,15 @@
$post = $option['post'];
+
+
if( isset($option['facture_ref']) ) {
$sql_data_array['facture_ref'] = trim($option['facture_ref']);
if( isset($option['facture_id']) && $option['facture_id'] > 0)
$sql_data_array['facture_id'] = $option['facture_id'];
else
- $sql_data_array['facture_id'] = self::GetNumberInvoice();
+ $sql_data_array['facture_id'] = InvoiceUtility::GetNextNumberInvoice();
}
if( isset($option['type']) ){
@@ -160,13 +166,14 @@
$sql_data_array['orders_ref'] = $ref;
}
}
+
// specific for soap event
$sql_data_array['synchro_event'] = ( isset($option['synchro_event'])? (int)$option['synchro_event'] : '0');
if(isset($option['comments']))
self::$comment[] = $option['comments'];
- $notif = (( isset($option['notify']) && $option['notify'] )? true : false );
+ $notify = (( isset($option['notify']) && $option['notify'] )? true : false );
/// update billing address
if(isset($option['billing'])) {
@@ -302,19 +309,23 @@
}
- if($new_st >= DEFAULT_ORDERS_STATUS_PAYED ){
- if( !isset($sql_data_array['facture_id']) || empty($sql_data_array['facture_id']) )
- $sql_data_array['facture_id'] = self::GetNumberInvoice();
-
- if( isset($sql_data_array['facture_ref']) && !empty($sql_data_array['facture_ref']) )
- $sql_data_array['facture_ref'] = trim($sql_data_array['facture_ref']);
- // New Ref
- else {
- $numref= new NumRef('bills');
- $sql_data_array['facture_ref'] =$numref->GetNewNumRef() ;
- }
- self::$comment[] = __('orders update and factured');
- }
+// if($new_st >= DEFAULT_ORDERS_STATUS_PAYED ){
+// if( !isset($sql_data_array['facture_id']) || empty($sql_data_array['facture_id']) )
+// $sql_data_array['facture_id'] = self::GetNumberInvoice();
+//
+// if( isset($sql_data_array['facture_ref']) && !empty($sql_data_array['facture_ref']) )
+// $sql_data_array['facture_ref'] = trim($sql_data_array['facture_ref']);
+// // New Ref
+// else {
+// $numref= new NumRef('bills');
+// $sql_data_array['facture_ref'] =$numref->GetNewNumRef() ;
+// }
+// self::$comment[] = __('orders update and factured');
+// }
+
+ if( $sql_data_array = InvoiceUtility::CheckCreateInvoice($new_st, $sql_data_array) )
+ self::$comment[] = $sql_data_array['add_comment'];
+
if($new_st >= DEFAULT_ORDERS_STATUS_COMPLETED ){
//! cloture commande
$sql_data_array['orders_date_finished']= 'NOW()';
@@ -340,9 +351,8 @@
self::AddOrderHistory($id, $status , $notif, implode("\n\r", self::$comment) );
-// if ($notify)
- require_once(DIR_WS_FUNCTIONS. 'lib.orders.php');
- OrdersNotify($id,$order->info, $order->customer, $status, implode("\n\r", self::$comment) );
+ if ($notify)
+ OrdersNotify($id,$order->info, $order->customer, $status, implode("\n\r", self::$comment) );
if($error !=false)
return false;
@@ -720,10 +730,7 @@
@return
*/
public static function GetNumberInvoice(){
- $_query = tep_db_query("select count(*) as _id from " . TABLE_ORDERS . " where facture_id IS NOT NULL ");
- $res_id=tep_db_fetch_array($_query);
-
- return ((int)$res_id['_id'] +1);
+ return InvoiceUtility::GetNextNumberInvoice();;
}
}
Modified: trunk/catalog/checkout_payment_address.php
===================================================================
--- trunk/catalog/checkout_payment_address.php 2014-05-26 08:34:52 UTC (rev 5204)
+++ trunk/catalog/checkout_payment_address.php 2014-06-03 12:48:29 UTC (rev 5205)
@@ -86,7 +86,15 @@
$addresses_count = tep_count_customer_address_book_entries();
$addresses_query = tep_db_query("select address_book_id, entry_firstname as firstname, entry_lastname as lastname, entry_company as company, entry_street_address as street_address, entry_suburb as suburb, entry_city as city, entry_postcode as postcode, entry_state as state, entry_zone_id as zone_id, entry_country_id as country_id from " . TABLE_ADDRESS_BOOK . " where customers_id = '" . (int)$customer_id . "'");
-// $addresses = tep_db_fetch_array($addresses_query);
+
+
+ while ($addresses = tep_db_fetch_array($addresses_query)){
+ // extract extra for this address
+ $EFU = new ExtraFieldsUse('addressbook', $languages_id );
+ $addresses['extra'] = ExtraFieldsUse::GetExtraFieldsForId($addresses['address_book_id']);
+
+ $addresseslist[]=$addresses;
+ }
/**
@brief use session stocked for pre-entry forms
*/
Modified: trunk/catalog/checkout_shipping_address.php
===================================================================
--- trunk/catalog/checkout_shipping_address.php 2014-05-26 08:34:52 UTC (rev 5204)
+++ trunk/catalog/checkout_shipping_address.php 2014-06-03 12:48:29 UTC (rev 5205)
@@ -124,6 +124,15 @@
$addresses_query = tep_db_query("select address_book_id, entry_firstname as firstname, entry_lastname as lastname, entry_company as company, entry_street_address as street_address, entry_suburb as suburb, entry_city as city, entry_postcode as postcode, entry_state as state, entry_zone_id as zone_id, entry_country_id as country_id from " . TABLE_ADDRESS_BOOK . " where customers_id = '" . (int)$customer_id . "'");
+
+ while ($addresses = tep_db_fetch_array($addresses_query)){
+ // extract extra for this address
+ $EFU = new ExtraFieldsUse('addressbook', $languages_id );
+ $addresses['extra'] = ExtraFieldsUse::GetExtraFieldsForId($addresses['address_book_id']);
+
+ $addresseslist[]=$addresses;
+ }
+
/**
@brief use session stocked for pre-entry forms
*/
Added: trunk/catalog/common/classes/InvoiceUtility.php
===================================================================
--- trunk/catalog/common/classes/InvoiceUtility.php (rev 0)
+++ trunk/catalog/common/classes/InvoiceUtility.php 2014-06-03 12:48:29 UTC (rev 5205)
@@ -0,0 +1,74 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.2.0
+ @date 03/06/2014, 09:08
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @file common/classes/InvoiceUtility.php
+*/
+
+
+require_once( DIR_FS_CATALOG . DIR_WS_COMMON_CLASSES . 'NumRef.php');
+
+
+/**
+ @class InvoiceUtility
+*/
+class InvoiceUtility {
+
+
+
+
+ /**
+ @brief Check If Order now create invoice
+ @note this orders of all status order is fixed;
+ DEFAULT_ORDERS_STATUS_PAYED > Pending or preparing Status
+ @param $status int new status for current order
+ @param $current array data of order
+ @return array OK , False Ko
+
+ array
+ $current ,
+ facture_id,
+ facture_ref,
+ add_comment
+ */
+ public function CheckCreateInvoice($status = 0, $current = array() ){
+ if($status >= DEFAULT_ORDERS_STATUS_PAYED ){
+ if( !isset($current['facture_id']) || empty($current['facture_id']) )
+ $current['facture_id'] = self::GetNumberInvoice();
+
+ if( isset($current['facture_ref']) && !empty($current['facture_ref']) )
+ $current['facture_ref'] = trim($current['facture_ref']);
+ // New Ref
+ else {
+ $numref= new NumRef('bills');
+ $current['facture_ref'] =$numref->GetNewNumRef() ;
+ }
+ $current['add_comment'] = __('orders update and factured');
+
+ return $current;
+ }
+
+ return false;
+ }
+
+
+ /**
+ @brief classed Invoice
+ @param $invoice_ref string default is null and ref generated by local generating
+ @return
+ */
+ public static function GetNextNumberInvoice(){
+ $_query = tep_db_query("select count(*) as _id from " . TABLE_ORDERS . " where facture_id IS NOT NULL ");
+ $res_id=tep_db_fetch_array($_query);
+
+ return ((int)$res_id['_id'] +1);
+ }
+
+
+}
+?>
Modified: trunk/catalog/common/classes/addressUtility.php
===================================================================
--- trunk/catalog/common/classes/addressUtility.php 2014-05-26 08:34:52 UTC (rev 5204)
+++ trunk/catalog/common/classes/addressUtility.php 2014-06-03 12:48:29 UTC (rev 5205)
@@ -11,6 +11,9 @@
*/
+/**
+ @class addressUtility
+*/
class addressUtility {
@@ -111,7 +114,7 @@
$HR = '----------------------------------------';
$hr = '----------------------------------------';
}
-
+// print_r($obj);
if ( _cst_bool('ACCOUNT_COMPANY')){
$company = tep_output_string_protected($obj->company);
if(isset($obj->extra ) ){
@@ -122,9 +125,13 @@
$company .=$cr;
}
- $personnal = ( (isset($obj->firstname) && tep_not_null($obj->firstname)) ? tep_output_string_protected($obj->firstname) : '' );
- $personnal .= ( (isset($obj->firstname) && tep_not_null($obj->firstname) && isset($obj->lastname) && tep_not_null($obj->lastname)) ? ' ' : '' );
- $personnal .= ( (isset($obj->lastname) && tep_not_null($obj->lastname)) ? tep_output_string_protected($obj->lastname) : '' );
+ if(isset($obj->name) && tep_not_null($obj->name) )
+ $personnal = tep_output_string_protected($obj->name) ;
+ else {
+ $personnal = ( (isset($obj->firstname) && tep_not_null($obj->firstname)) ? tep_output_string_protected($obj->firstname) : '' );
+ $personnal .= ( (isset($obj->firstname) && tep_not_null($obj->firstname) && isset($obj->lastname) && tep_not_null($obj->lastname)) ? ' ' : '' );
+ $personnal .= ( (isset($obj->lastname) && tep_not_null($obj->lastname)) ? tep_output_string_protected($obj->lastname) : '' );
+ }
if(isset($obj->extra ) ){
foreach($obj->extra as $row)
if($row->epf_class =='personnal')
@@ -158,11 +165,7 @@
$zip = $postcode;
-
-
-
-
$statecomma = '';
if ($state != '') $statecomma = $state . ', ';
Modified: trunk/catalog/includes/classes/checkout_process.php
===================================================================
--- trunk/catalog/includes/classes/checkout_process.php 2014-05-26 08:34:52 UTC (rev 5204)
+++ trunk/catalog/includes/classes/checkout_process.php 2014-06-03 12:48:29 UTC (rev 5205)
@@ -12,6 +12,7 @@
*/
include_once(DIR_FS_CATALOG . DIR_WS_COMMON_CLASSES .'NumRef.php');
+include_once(DIR_FS_CATALOG . DIR_WS_COMMON_CLASSES .'InvoiceUtility.php');
include_once(DIR_FS_CATALOG . DIR_WS_COMMON_CLASSES .'Template.php');
include_once(DIR_FS_CATALOG . DIR_WS_COMMON_CLASSES .'PHPMailer.php');
@@ -219,10 +220,10 @@
/**
@fn preventDuplicate($array)
- @brief
- Bacule pre commande vers commande
- Si a pre-commande existe (ds la session),elle est transformé en commande
- Si pas de pre-commande en session, creation de la commande
+ @brief Call mecanical prevent duplicate in db
+ Convert order temp in permanent order , change col order_type
+ IF not prev-order exist (in session), convert in order
+ If not prev-order create order
@param $array array
*/
public function preventDuplicate($array){
@@ -472,6 +473,43 @@
/**
+ @fn GetTblByOrderId($_id=0)
+ @brief Obtain content in order table
+ @param $_id int order id
+ @return false KO
+ Array data of row for OK
+ */
+ private static function GetTblByOrderId($_id=0){
+ if($_id<=0)
+ return false;
+
+ $DB=Database::getInstance();
+
+ /// table order
+ $order_query = $DB->query("select orders_prefix,orders_ref, orders_type, customers_id, customers_name, customers_company, customers_street_address, customers_suburb, customers_city, customers_postcode, customers_state, customers_country, customers_telephone, customers_email_address, customers_address_format_id, delivery_name, delivery_company, delivery_street_address, delivery_suburb, delivery_extra, delivery_city, delivery_postcode, delivery_state, delivery_country, delivery_address_format_id, billing_name, billing_company, billing_street_address, billing_suburb, billing_extra, billing_city, billing_postcode, billing_state, billing_country, billing_address_format_id, payment_method, cc_type, cc_owner, cc_number, cc_expires, currency, currency_value, date_purchased, orders_status, last_modified, ip_address, class_payment, class_shipping from " . TABLE_ORDERS . " where orders_id = '" . (int)$_id . "'");
+ $order = $order_query->fetchAssoc();
+
+ return $order;
+ }
+
+ /**
+
+ */
+ private static function GetRef($order=array()){
+
+ if(isset($order['order_ref']) && strlen($order['order_ref']) >= 3 ){
+ // New Ref
+ $numref= new NumRef('orders');
+ $ref = $numref->GetNewNumRef('', new objectInfo($order) );
+
+ return $ref;
+ }
+ else
+ return $order['order_ref'];
+ }
+
+
+ /**
@fn process_confirm($pre_order_id)
@brief Ordananceur process holding vs order
@param $pre_order_id int id pre commande
@@ -481,20 +519,16 @@
$DB=Database::getInstance();
- /// table order
- $order_query = $DB->query("select orders_prefix,orders_type, customers_id, customers_name, customers_company, customers_street_address, customers_suburb, customers_city, customers_postcode, customers_state, customers_country, customers_telephone, customers_email_address, customers_address_format_id, delivery_name, delivery_company, delivery_street_address, delivery_suburb, delivery_extra, delivery_city, delivery_postcode, delivery_state, delivery_country, delivery_address_format_id, billing_name, billing_company, billing_street_address, billing_suburb, billing_extra, billing_city, billing_postcode, billing_state, billing_country, billing_address_format_id, payment_method, cc_type, cc_owner, cc_number, cc_expires, currency, currency_value, date_purchased, orders_status, last_modified, ip_address, class_payment, class_shipping from " . TABLE_ORDERS . " where orders_id = '" . (int)$pre_order_id . "'");
- $order = $order_query->fetchAssoc();
- // New Ref
- $numref= new NumRef('orders');
- $ref = $numref->GetNewNumRef('', new objectInfo($order) );
-
+ $order = self::GetTblByOrderId($_id);
+ $ref = self::GetRef($order);
+
$this->the_order_formated=$_SESSION['the_order_formated']=$ref;
$sql_data_array = array(
'holding_origin_id'=>(int)$pre_order_id,
'orders_type' => 0,
- 'orders_ref' => tep_db_input($ref),
+ 'orders_ref' => tep_db_input( $ref ),
'orders_prefix' => tep_db_input($order['orders_prefix']), // obsolete
'currency' => tep_db_input($order['currency']),
'customers_id' => (int)$order['customers_id'],
@@ -523,7 +557,7 @@
'delivery_company' => tep_db_input($order['delivery_company']),
'delivery_street_address' => tep_db_input($order['delivery_street_address']),
'delivery_suburb' => tep_db_input($order['delivery_suburb']),
- 'delivery_extra' => tep_db_input($order['delivery_extra']),
+ 'delivery_extra' => unserialize($order['delivery_extra']),
'delivery_city' => tep_db_input($order['delivery_city']),
'delivery_postcode' => tep_db_input($order['delivery_postcode']),
'delivery_state' => tep_db_input($order['delivery_state']),
@@ -533,7 +567,7 @@
'billing_company' => tep_db_input($order['billing_company']),
'billing_street_address' => tep_db_input($order['billing_street_address']),
'billing_suburb' => tep_db_input($order['billing_suburb']),
- 'billing_extra' => tep_db_input($order['billing_extra']),
+ 'billing_extra' => unserialize($order['billing_extra']),
'billing_city' => tep_db_input($order['billing_city']),
'billing_postcode' => tep_db_input($order['billing_postcode']),
'billing_state' => tep_db_input($order['billing_state']),
@@ -711,9 +745,6 @@
*/
private function insert_order($customer_id, $order, $update=''){
-// print_r($order->customer);
-// exit;
-
$sql_data_array = array(
'customers_id' => $customer_id,
'orders_type' => ((!self::$mode)? '-1' : '0'),
@@ -733,7 +764,7 @@
'delivery_company' => $order->delivery['company'],
'delivery_street_address' => (string)$order->delivery['street_address'],
'delivery_suburb' => $order->delivery['suburb'],
- 'delivery_extra' => $order->delivery['delivery_extra'],
+ 'delivery_extra' => serialize($order->delivery['extra']),
'delivery_city' => (string)$order->delivery['city'],
'delivery_postcode' => $order->delivery['postcode'],
'delivery_state' => $order->delivery['state'],
@@ -743,7 +774,7 @@
'billing_company' => $order->billing['company'],
'billing_street_address' => (string)$order->billing['street_address'],
'billing_suburb' => $order->billing['suburb'],
- 'billing_extra' => $order->billing['billing_extra'],
+ 'billing_extra' => serialize($order->billing['extra']),
'billing_city' => (string)$order->billing['city'],
'billing_postcode' => $order->billing['postcode'],
'billing_state' => $order->billing['state'],
@@ -805,19 +836,32 @@
/**
@fn update_status_order($order_status_id)
- @brief Mise a jour du status
+ @brief Update status of order
+ Fix ref if not define
@param $order_status_id
@param $synchro_event 0 for internal , 1 For external
*/
public function update_status_order($order_status_id, $synchro_ext=0){
- $sql_data_array = array(
- 'last_modified' => 'now()',
- 'orders_status' => (int)$order_status_id,
- 'synchro_event' => (int)$synchro_ext,
- );
+
+ $order = self::GetTblByOrderId($this->the_order_id);
+ $ref = self::GetRef($order);
+
+
+
+ $sql_data_array = array(
+ 'order_ref' =>$ref,
+ 'last_modified' => 'now()',
+ 'orders_status' => (int)$order_status_id,
+ 'synchro_event' => (int)$synchro_ext,
+ );
+
+
+ if( $sql_array = InvoiceUtility::CheckCreateInvoice($order_status_id, array()) ){
+ $sql_data_array = array_merge($sql_data_array, $sql_array);
+ }
+
return tep_db_perform(self::$tables['ORDERS'], $sql_data_array, 'update', " orders_id = '" . (int)$this->the_order_id . "' ");
-// tep_db_query("update " . self::$tables['ORDERS'] . " set orders_status = '" . (int)$order_status_id . "', last_modified = now() where orders_id = '" . (int)$this->the_order_id . "'");
}
Modified: trunk/catalog/includes/modules/account/address_book.php
===================================================================
--- trunk/catalog/includes/modules/account/address_book.php 2014-05-26 08:34:52 UTC (rev 5204)
+++ trunk/catalog/includes/modules/account/address_book.php 2014-06-03 12:48:29 UTC (rev 5205)
@@ -286,6 +286,13 @@
$addresses_query = tep_db_query("select address_book_id, entry_firstname as firstname, entry_lastname as lastname, entry_company as company,entry_company_tax_id as company_tax_id, entry_street_address as street_address, entry_suburb as suburb, entry_city as city, entry_postcode as postcode, entry_state as state, entry_zone_id as zone_id, entry_country_id as country_id from " . TABLE_ADDRESS_BOOK . " where customers_id = '" . (int)$cID . "' order by firstname, lastname");
while ($addresses = tep_db_fetch_array($addresses_query)){
$addr[$addresses['address_book_id']]=$addresses;
+
+ $extra_fields_query = tep_db_query($s="select ce.fields_id, fields_key, fields_required_email from " . TABLE_EXTRA_FIELDS . " ce LEFT JOIN " . TABLE_EXTRA_FIELDS_TO . " cet ON(cet.fields_id = ce.fields_id AND data_id= '".$addresses['address_book_id']."' ) where ce.fields_type = 'addressbook' AND ce.fields_status=1 and fields_admin IN(0,3) AND fields_special_mod ='' ");
+
+ while($extra_fields = tep_db_fetch_array($extra_fields_query)) {
+ $addr[$addresses['address_book_id']]['extra'] = $extra_fields;
+ }
+
$cpt++;
}
Modified: trunk/catalog/templates/defaut/includes/gabarit/address_book_details.gab
===================================================================
--- trunk/catalog/templates/defaut/includes/gabarit/address_book_details.gab 2014-05-26 08:34:52 UTC (rev 5204)
+++ trunk/catalog/templates/defaut/includes/gabarit/address_book_details.gab 2014-06-03 12:48:29 UTC (rev 5205)
@@ -110,7 +110,7 @@
<?php if ($page->_draw_in_page('ACCOUNT_STATE')) { ?>
<div class="form-group">
- <label for="state" class="col-sm-2 control-label"><?php echo ENTRY_STATE; ?></label>
+ <label for="state" class="col-sm-2 control-label"><?php echo __('entry state'); ?></label>
<div class="col-sm-10">
<?php
if ($process == true) {
@@ -131,7 +131,6 @@
echo tep_draw_input_field('state','state', tep_get_zone_name($entry['country_id'], $entry['zone_id'], $entry['state']));
}
- if (tep_not_null(ENTRY_STATE_TEXT)) echo ' <span class="notice">' . ENTRY_STATE_TEXT . '</span>';
?>
</div>
</div>
@@ -143,7 +142,7 @@
<?php if (isset($_GET['id']) && ($customer_default_address_id != $_GET['id'])) { ?>
<div class="form-group">
- <label for="primary" class="col-sm-2 control-label"><?php echo SET_AS_PRIMARY; ?></label>
+ <label for="primary" class="col-sm-2 control-label"><?php echo __('entry set a primary'); ?></label>
<div class="col-sm-10">
<?php echo tep_draw_checkbox_field('primary','primary', 'on', false, 'id="primary"') ; ?>
</div>
Modified: trunk/catalog/templates/defaut/includes/gabarit/checkout/payment_address.gab
===================================================================
--- trunk/catalog/templates/defaut/includes/gabarit/checkout/payment_address.gab 2014-05-26 08:34:52 UTC (rev 5204)
+++ trunk/catalog/templates/defaut/includes/gabarit/checkout/payment_address.gab 2014-06-03 12:48:29 UTC (rev 5205)
@@ -9,7 +9,7 @@
@file payment_address.gab
@dir templstes/defaut/includes/gabarit/checkout/
*/
-global $page,$customer_id, $billto, $quotes, $currencies, $cart,$addresses_count,$addresses_query;
+global $page,$customer_id, $sendto, $quotes, $currencies, $cart,$addresses_count,$addresseslist;
?>
<div id="checkoutPaymentAddress" >
@@ -39,16 +39,16 @@
<h3><?php echo __('title please select') ;?></h3>
- <?php while ($addresses = tep_db_fetch_array($addresses_query)) :
+ <?php foreach($addresseslist as $addresses):
$format_id = tep_get_address_format_id($addresses['country_id']); ?>
<p>
<label><?php echo tep_output_string_protected($addresses['firstname'] . ' ' . $addresses['lastname']); ?></label>
<?php echo tep_draw_radio_field('address', 'address', $addresses['address_book_id'], ($addresses['address_book_id'] == $billto)); ?>
</p>
<p class="Adress"> <?php echo tep_address_format($format_id, $addresses, true, ' ', ', '); ?></p>
- <?php endwhile; ?>
+ <?php endforeach; ?>
</div>
- <?php endif; //if ($addresses_count > 1) ?>
+ <?php endif; ?>
</div>
Modified: trunk/catalog/templates/defaut/includes/gabarit/checkout/shipping_address.gab
===================================================================
--- trunk/catalog/templates/defaut/includes/gabarit/checkout/shipping_address.gab 2014-05-26 08:34:52 UTC (rev 5204)
+++ trunk/catalog/templates/defaut/includes/gabarit/checkout/shipping_address.gab 2014-06-03 12:48:29 UTC (rev 5205)
@@ -9,7 +9,7 @@
@file shipping_address.gab
@dir templstes/defaut/includes/gabarit/checkout/
*/
-global $page,$customer_id, $sendto, $quotes, $currencies, $cart,$addresses_count,$addresses_query;
+global $page,$customer_id, $sendto, $quotes, $currencies, $cart,$addresses_count,$addresseslist;
?>
@@ -41,14 +41,14 @@
<h3><?php echo __('title please select') ;?></h3>
- <?php while ($addresses = tep_db_fetch_array($addresses_query)) :
+ <?php foreach($addresseslist as $addresses):
$format_id = tep_get_address_format_id($addresses['country_id']); ?>
<p>
<label><?php echo tep_output_string_protected($addresses['firstname'] . ' ' . $addresses['lastname']); ?></label>
<?php echo tep_draw_radio_field('address', 'address', $addresses['address_book_id'], ($addresses['address_book_id'] == $billto)); ?>
</p>
<p class="Adress"> <?php echo tep_address_format($format_id, $addresses, true, ' ', ', '); ?></p>
- <?php endwhile; ?>
+ <?php endforeach; ?>
</div>
<?php endif; //if ($addresses_count > 1) ?>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|