Menu
▾
▴
oscss-commit — SVN Commit Notifications
You can subscribe to this list here.
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(57) |
May
(31) |
Jun
(21) |
Jul
(11) |
Aug
(23) |
Sep
(22) |
Oct
(36) |
Nov
(62) |
Dec
(85) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(24) |
Feb
(24) |
Mar
(65) |
Apr
(232) |
May
(118) |
Jun
(22) |
Jul
(54) |
Aug
(57) |
Sep
(14) |
Oct
(27) |
Nov
(16) |
Dec
(19) |
| 2013 |
Jan
(16) |
Feb
(12) |
Mar
(3) |
Apr
(17) |
May
(2) |
Jun
(30) |
Jul
(33) |
Aug
(19) |
Sep
(35) |
Oct
(58) |
Nov
(27) |
Dec
(64) |
| 2014 |
Jan
(102) |
Feb
(80) |
Mar
(15) |
Apr
(4) |
May
(3) |
Jun
(3) |
Jul
(5) |
Aug
(11) |
Sep
(15) |
Oct
|
Nov
(3) |
Dec
(5) |
| 2015 |
Jan
(5) |
Feb
(4) |
Mar
(2) |
Apr
(11) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(9) |
Nov
(10) |
Dec
|
| 2016 |
Jan
(3) |
Feb
(2) |
Mar
(18) |
Apr
(13) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
|
Nov
|
Dec
|
|
From: <os...@us...> - 2013-04-28 19:48:11
|
Revision: 4729
http://sourceforge.net/p/oscss/svn/4729
Author: oscim
Date: 2013-04-28 19:48:08 +0000 (Sun, 28 Apr 2013)
Log Message:
-----------
Added Paths:
-----------
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/font/
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/font/SourceSansPro-It.otf
Added: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/font/SourceSansPro-It.otf
===================================================================
(Binary files differ)
Index: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/font/SourceSansPro-It.otf
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/font/SourceSansPro-It.otf 2013-04-28 19:47:52 UTC (rev 4728)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/font/SourceSansPro-It.otf 2013-04-28 19:48:08 UTC (rev 4729)
Property changes on: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/font/SourceSansPro-It.otf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-04-28 19:47:56
|
Revision: 4728
http://sourceforge.net/p/oscss/svn/4728
Author: oscim
Date: 2013-04-28 19:47:52 +0000 (Sun, 28 Apr 2013)
Log Message:
-----------
Convert css in less exts
Added Paths:
-----------
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/element.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/forms.less
Added: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/element.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/element.less (rev 0)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/element.less 2013-04-28 19:47:52 UTC (rev 4728)
@@ -0,0 +1,155 @@
+/*---------------------------------------------------
+ * LESS Elements 0.6
+ * ---------------------------------------------------
+ * A set of useful LESS mixins by Dmitry Fadeyev
+ * Special thanks for mixin suggestions to:
+ * Kris Van Herzeele,
+ * Benoit Adam,
+ * Portenart Emile-Victor,
+ * Ryan Faerman
+ *
+ * More info at: http://lesselements.com
+ * -----------------------------------------------------*/
+
+.font-face(@name : '', @path : ''){
+ @ext:@path+".ttf";
+ @font-face {
+ font-family: @name;
+
+ src: url("@{path}.eot");
+ src: local('x'),
+ url("@{path}.woff") format('woff'),
+ url("@{path}.otf") format('opentype'),
+ url("@{path}.svg#grablau") format('svg');
+// url("@{path}.ttf") format('TrueType');
+ }
+}
+.gradient(@color: #F5F5F5, @start: #EEE, @stop: #FFF) {
+ background: @color;
+ background: -webkit-gradient(linear,
+ left bottom,
+ left top,
+ color-stop(0, @start),
+ color-stop(1, @stop));
+ background: -ms-linear-gradient(bottom,
+ @start,
+ @stop);
+ background: -moz-linear-gradient(center bottom,
+ @start 0%,
+ @stop 100%);
+}
+.bw-gradient(@color: #F5F5F5, @start: 0, @stop: 255) {
+ background: @color;
+ background: -webkit-gradient(linear,
+ left bottom,
+ left top,
+ color-stop(0, rgb(@start,@start,@start)),
+ color-stop(1, rgb(@stop,@stop,@stop)));
+ background: -ms-linear-gradient(bottom,
+ rgb(@start,@start,@start) 0%,
+ rgb(@start,@start,@start) 100%);
+ background: -moz-linear-gradient(center bottom,
+ rgb(@start,@start,@start) 0%,
+ rgb(@stop,@stop,@stop) 100%);
+}
+.bordered(@top-color: #EEE, @right-color: #EEE, @bottom-color: #EEE, @left-color: #EEE) {
+ border-top: solid 1px @top-color;
+ border-left: solid 1px @left-color;
+ border-right: solid 1px @right-color;
+ border-bottom: solid 1px @bottom-color;
+}
+.drop-shadow(@x-axis: 0, @y-axis: 1px, @blur: 2px, @alpha: 0.1) {
+ -webkit-box-shadow: @x-axis @y-axis @blur rgba(0, 0, 0, @alpha);
+ -moz-box-shadow: @x-axis @y-axis @blur rgba(0, 0, 0, @alpha);
+ box-shadow: @x-axis @y-axis @blur rgba(0, 0, 0, @alpha);
+}
+.rounded(@radius: 2px) {
+ -webkit-border-radius: @radius;
+ -moz-border-radius: @radius;
+ border-radius: @radius;
+ -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;
+}
+.border-radius(@topright: 0, @bottomright: 0, @bottomleft: 0, @topleft: 0) {
+ -webkit-border-top-right-radius: @topright;
+ -webkit-border-bottom-right-radius: @bottomright;
+ -webkit-border-bottom-left-radius: @bottomleft;
+ -webkit-border-top-left-radius: @topleft;
+ -moz-border-radius-topright: @topright;
+ -moz-border-radius-bottomright: @bottomright;
+ -moz-border-radius-bottomleft: @bottomleft;
+ -moz-border-radius-topleft: @topleft;
+ border-top-right-radius: @topright;
+ border-bottom-right-radius: @bottomright;
+ border-bottom-left-radius: @bottomleft;
+ border-top-left-radius: @topleft;
+ -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;
+}
+.opacity(@opacity: 0.5) {
+ -moz-opacity: @opacity;
+ -khtml-opacity: @opacity;
+ -webkit-opacity: @opacity;
+ opacity: @opacity;
+}
+.transition-duration(@duration: 0.2s) {
+ -moz-transition-duration: @duration;
+ -webkit-transition-duration: @duration;
+ transition-duration: @duration;
+}
+.rotation(@deg:5deg){
+ -webkit-transform: rotate(@deg);
+ -moz-transform: rotate(@deg);
+ transform: rotate(@deg);
+}
+.scale(@ratio:1.5){
+ -webkit-transform:scale(@ratio);
+ -moz-transform:scale(@ratio);
+ transform:scale(@ratio);
+}
+.transition(@duration:0.2s, @ease:ease-out) {
+ -webkit-transition: all @duration @ease;
+ -moz-transition: all @duration @ease;
+ transition: all @duration @ease;
+}
+.inner-shadow(@horizontal:0, @vertical:1px, @blur:2px, @alpha: 0.4) {
+ -webkit-box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha);
+ -moz-box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha);
+ box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha);
+}
+.box-shadow(@arguments) {
+ -webkit-box-shadow: @arguments;
+ -moz-box-shadow: @arguments;
+ box-shadow: @arguments;
+}
+.columns(@colwidth: 250px, @colcount: 0, @colgap: 50px, @columnRuleColor: #EEE, @columnRuleStyle: solid, @columnRuleWidth: 1px) {
+ -moz-column-width: @colwidth;
+ -moz-column-count: @colcount;
+ -moz-column-gap: @colgap;
+ -moz-column-rule-color: @columnRuleColor;
+ -moz-column-rule-style: @columnRuleStyle;
+ -moz-column-rule-width: @columnRuleWidth;
+ -webkit-column-width: @colwidth;
+ -webkit-column-count: @colcount;
+ -webkit-column-gap: @colgap;
+ -webkit-column-rule-color: @columnRuleColor;
+ -webkit-column-rule-style: @columnRuleStyle;
+ -webkit-column-rule-width: @columnRuleWidth;
+ column-width: @colwidth;
+ column-count: @colcount;
+ column-gap: @colgap;
+ column-rule-color: @columnRuleColor;
+ column-rule-style: @columnRuleStyle;
+ column-rule-width: @columnRuleWidth;
+}
+.translate(@x:0, @y:0) {
+ -moz-transform: translate(@x, @y);
+ -webkit-transform: translate(@x, @y);
+ -o-transform: translate(@x, @y);
+ -ms-transform: translate(@x, @y);
+ transform: translate(@x, @y);
+}
+.background-size(@size:100%){
+ /* background size */
+ -webkit-background-size: @size;
+ -o-background-size: @size;
+ -khtml-background-size: @size;
+}
\ No newline at end of file
Added: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/forms.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/forms.less (rev 0)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/forms.less 2013-04-28 19:47:52 UTC (rev 4728)
@@ -0,0 +1,221 @@
+/**
+ */
+
+
+
+input,
+select,
+textarea,
+button {
+ display:inline-block;
+ padding:(@padding_base * 0.3) ;
+ font-family: Verdana,Arial,sans-serif;
+ font-size: (@font_size*1.3);
+ border:1px solid @bg_input_border;
+ background: @bg_input ;
+ .border-radius(5px);
+ .rounded(5px);
+
+ &:hover{
+ border:1px solid @bg_input_border_hover;
+ background: @bg_input_hover ;
+ }
+
+ &[type=submit]{
+ padding:(@padding_base * 0.3) (@padding_base * 5) ;
+ }
+}
+
+
+
+// master central display
+form{
+ padding:0;
+
+ label { display: inline-block; font-weight: bold; line-height: 18px; margin: 5px 5px 5px 0; padding: 0 0 2px; text-align: left; min-width: 20%;}
+
+ fieldset legend { color:#666666; font-size:(@font_size*1.2); font-style:italic; font-weight:bold; padding:0 5px 0 20px;}
+
+ textarea{ vertical-align:baseline;}
+
+ p{
+
+ input[type="checkbox"] { float:right; }
+
+ select,
+ input[type="text"] {
+ margin:5px 15px;
+ }
+ select{
+ padding:1px 0 0 0;
+ height:(@lineheight * 1.3);
+ line-height:(@lineheight * 1.3);
+ }
+ }
+ p.new_product_img {
+ float:left;
+ padding:5px;
+ margin : 0 auto;
+ text-align:center;
+ width:98%;
+ border:1px solid @color_012;
+ .border-radius(5px,5px,5px,5px);
+
+ img{
+ margin:auto;
+ max-width: 300px;
+ }
+ }
+
+
+ ul.ui-tabs-nav {display: inline-block; margin: 0 ; padding: 1px; width: 99%;}
+
+ .block_form {
+ .block_input{
+ text-shadow:0 1px 0 #fff;
+ width:94.9%;
+ margin:0 1px;
+ display:inline-block;
+ text-align: left;
+ background:#C9C9C9;
+ float:left;
+ line-height:18px;
+ padding:1px 5px 1px 5px;
+ border:1px solid @color_014;
+ .border-radius(5px);
+ .rounded(5px);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
+
+
+ span.value_edit {clear:both;display:inline-block; width:100%;}
+
+ br,
+ span.value_edit br{display:none;}
+
+ label br {display:inline-block;}
+
+ span.edit-input,
+ span.value_edit span.edit-input{float:left; display:inline-block; padding:0 12px;}
+
+ span.edit-input{
+ white-space:nowrap;
+
+ input{float: left;}
+
+ .edit-input-value-alternate {display:inline-block;width:20px; height: 20px;margin: 0 12px;}
+ .edit-input-value {padding-left:12px;}
+ /* remplacement true /false par icone */
+ .edit-input-value.Val-true ,
+ .edit-input-value.Val-false {font-size:0;}
+ .edit-input-value-alternate.Val-true {background:transparent url("../../img/1/check.png") left top no-repeat; }
+ .edit-input-value-alternate.Val-false {background:transparent url("../../img/1/busy.png") left top no-repeat;}
+ }
+ }
+
+ .block_input.tirroir {float:none;}
+
+ .tabs_lang{ float:left;}
+ }
+
+
+
+
+
+ fieldset {
+ margin: 0.1em ;
+ padding:0.1em;
+ border:none;
+
+ p {
+ margin: 0.1em;
+ padding:0.1em;
+ }
+
+ select,
+ input[type="text"] {
+ min-width:62%;
+ display:inline-block;
+
+ &.w_5 {
+ min-width:5%;
+ width:5%;
+ }
+ &.w_10 {
+ min-width:10%;
+ width:10%;
+ }
+ &.w_20 {
+ min-width:20%;
+ width:20%;
+ }
+ &.w_30 {
+ min-width:30%;
+ width:30%;
+ }
+ }
+
+ input.price,
+ input[type=text].price,
+ input[type=hidden].price{
+ width :120px;
+ min-width :120px;
+ text-align : right;
+ }
+
+
+ select option {display:block; float:none;clear:both;width:100%}
+
+ label { line-height: 18px; margin-right: 10px; display:inline-block; padding: 0 0 2px 0;}
+
+ ul{
+ list-style:none;
+ .rounded(5px);
+ }
+ // Cat list lors edition article ou cms
+ ul.LinkToView{
+ overflow: auto;
+ max-height: 160px;
+ background-color: #fff;
+ padding: 5px;
+ line-height: 15px;
+ border: 1px solid #666;
+ }
+ }
+
+ .block_field {
+ text-shadow:0 1px 0 #fff;
+ width:98.9%; margin:2px ;
+ display:inline-block;
+ text-align: left;
+ padding: 5px 3px;
+ float:left;
+
+ .tabs,
+ .tabs_lang{
+ margin:0 2px ;
+ display:inline-block;
+ text-align: left;
+ padding:0 5px;
+ float:left;
+ }
+
+ &.tabs_lang ul,
+ .tabs_lang ul.ui-tabs-nav,
+ .tabs_lang ul.ui-tabs-panel{display: inline-block; padding: 1px; width: 100%;}
+ }
+
+ .block_input label.inline { white-space:nowrap; width: 20%;}
+
+ .edit.col_right .block_input{
+ width:95%;
+
+ label{width:20%;text-align:left;font-weight:bold}
+ }
+
+ .block_input .hasDatepicker{ margin:0; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;line-height:30px; min-width:0;}
+
+ .input-multi input[type="checkbox"],
+ .input-multi input[type="radio"]{float:none;}
+
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-04-28 19:46:00
|
Revision: 4727
http://sourceforge.net/p/oscss/svn/4727
Author: oscim
Date: 2013-04-28 19:45:56 +0000 (Sun, 28 Apr 2013)
Log Message:
-----------
Convert css in less exts
Modified Paths:
--------------
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_payment.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/index_listing.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/template.php
Added Paths:
-----------
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-account.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-categorie.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-product.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/datatype-generic.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/generic.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/master.less
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/js/less-1.3.0.min.js
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php 2013-04-28 19:37:10 UTC (rev 4726)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php 2013-04-28 19:45:56 UTC (rev 4727)
@@ -35,21 +35,31 @@
*/
?>
-<!-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -->
<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" <?php echo HTML_PARAMS; ?> >
-<head>
+<!--[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]-->
+<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
+ <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 name="viewport" content="width=device-width, height=device-height" />
+
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width">
+
<meta name="author" content="oscim"/>
<meta name="reply-to" content="<?php echo HEAD_REPLY_TAG_ALL ?>" />
<meta name="robots" content="all" />
<meta name="generator" content="osCSS-2" />
<base href="<?php echo tep_get_httpdir() ; ?>" />
+
+ <link rel="stylesheet/less" href="<?php echo 'templates/'.$template.'/Css/'; ?>master.less" type="text/css" />
+ <script type="text/javascript" src="<?php echo 'templates/'.$template.'/js/'; ?>less-1.3.0.min.js" ></script>
<link rel="stylesheet" type="text/css" href="<?php echo 'templates/'.$template.'/'; ?>sample.css" media="screen"/>
<!--[if IE ]>
<link rel="stylesheet" type="text/css" href="<?php echo 'templates/'.$template.'/'; ?>iecss.css" media="screen"/>
@@ -60,11 +70,6 @@
<![endif]-->
- <link rel="stylesheet" type="text/css" href="<?php echo 'templates/'.$template.'/'; ?>screen_480.css" media="screen and (max-width: 480px)"/>
- <link rel="stylesheet" type="text/css" href="<?php echo 'templates/'.$template.'/'; ?>screen_640.css" media="screen and (max-width: 640px)"/>
-
- <script type="text/javascript" src="<?php echo 'templates/'.$template.'/'; ?>js/boxOver.js"></script>
-
<script type="text/javascript" src="includes/general.js" ></script>
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.php 2013-04-28 19:37:10 UTC (rev 4726)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.php 2013-04-28 19:45:56 UTC (rev 4727)
@@ -18,10 +18,11 @@
<?php endif; ?>
<div class="module">
+
<section class="module">
- <?php if($load->module =='child') : ?>
+ <?php if($load->module =='child' && tep_not_null($themodule->module_db->title) ) : ?>
<header>
- <h4 class="module title"><?php echo unhtmlentities($themodule->module_db->title) ;?></h4>
+ <h4 class="module title"><?php echo unhtmlentities($themodule->module_db->title) ;?></h4>
</header>
<?php endif; ?>
@@ -30,18 +31,21 @@
<?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') )) ) { ?>
+ <?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 id="splitPageTop" class="splitnav">
- <p class="sP1"><?php echo $themodule->module_db->split->display_count(TEXT_DISPLAY_NUMBER_OF); ?></p>
- <p class="sP2"><?php echo TEXT_RESULT_PAGE . ' ' . $themodule->module_db->split->display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info'))); ?></p>
+ <p class="sP1"><?php echo $themodule->module_db->split->display_count(TEXT_DISPLAY_NUMBER_OF); ?></p>
+ <p class="sP2"><?php echo TEXT_RESULT_PAGE . ' ' . $themodule->module_db->split->display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info'))); ?></p>
</div>
- <?php }*/ ?>
+ <?php } ?>
<ul>
- <?php foreach($themodule->module_db->content as $ele): ?>
+ <?php /**
+ * Loop Data
+ */
+ foreach($themodule->module_db->content as $ele): ?>
<?php if($ele->type =='product'): /** PRODUCTS */ ?>
<li class="one product">
@@ -102,7 +106,7 @@
<a href="<?php echo $ele->href ?>"> <?php echo $ele->categories_name ;?></a>
</p>
<p class="img categorie">
- <?php echo '<a href="' . $ele->href. '">' . tep_image(DIR_WS_IMAGES . $ele->categories_image, $ele->categories_name, $page->_conf_value('SUBCATEGORY_IMAGE_WIDTH'), $page->_conf_value('SUBCATEGORY_IMAGE_HEIGHT')) . '<br />' . $ele->categories_name . '</a>' ;?>
+ <?php echo '<a href="' . $ele->href. '">' . tep_image(DIR_WS_IMAGES . $ele->categories_image, $ele->categories_name, $page->_conf_value('SUBCATEGORY_IMAGE_WIDTH'), $page->_conf_value('SUBCATEGORY_IMAGE_HEIGHT')) . '</a>' ;?>
</p>
</div>
</section>
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css 2013-04-28 19:37:10 UTC (rev 4726)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css 2013-04-28 19:45:56 UTC (rev 4727)
@@ -12,148 +12,33 @@
/* ------------ Structure ------------ */
- header#top {
- height:130px;
- }
- #logo {
- width:250px;
- float:left;
- }
- #logo p,
- #logo h1 {
- padding: 20px 0;
- }
- #top_bar {
- float:left;
- position:relative;
- left:260px
- }
+
- nav {
- position: absolute;
- width: inherit;
- }
- section#intro {
- margin-top: 57px;
- width: inherit;
- }
- #intro .intro.content {padding: 0;color:#fff;-webkit-border-radius: 5px; -webkit-border-radius: 5px;height:220px;}
- #intro .intro.content div{font-size: 0.9em; font-weight:bold; width:936px;margin:0; padding:0;}
+
- nl#breadcrumbs {
- margin-top: 12px;
- margin-bottom: 12px;
- clear: both;
- float: left;
- height: 25px;
- padding: 1.5em;
- position: relative;
- top: 22px;
- width: inherit;
-}
- nl#breadcrumbs a { text-decoration:none; padding:1em;font-size:1.5em;font-weight: bold;color: #777; }
-/* ------------ Habillage ------------ */
-/* voir fichier Habillage.css */
- /*header {
- }*/
- #logo p,
- #logo h1 {
- padding: 20px 0;
- }
- /* #top_bar {
- }*/
-
-
- nav ul {
- margin: 0 auto;
- width: inherit;
- }
-
- nav ul li {
- float: left;
- }
-
- nav ul li a {
- display: inline-block;
- margin-right: 20px;
- padding: 0 10px;
- line-height: 44px;
- }
-
-
-
- div#top_bar {
- width: 450px;
- padding:0;
- height:45px;
- }
- div#top_bar div{float:left;}
-
-
-
-
- #intro h1,
- #intro h2,
- #intro p {
- position: relative;
- z-index: 9999;
- width: 800px;
- }
-
- #intro h1,
- #intro h2 {
- padding: 0 0 20px 0;
- }
-
-
-
-
-
-
-
/* Bottom */
/* footer */
- footer {
- clear: both;
- height:60px;
- margin-bottom: 10px;
- padding:1.5em;
- position: relative;
- top: 12px;
- }
- footer p {
- padding: 2em;
- }
- footer div.left_footer {margin:0; padding:0; width:0; float:left; display:block; height:100%; }
- footer div.center_footer {margin:0; padding:0; width:33%%; float:left; display:block; height:100%; }
- footer div.right_footer a{font-size: 1.2em; color:#fff; padding:1.2em; }
- footer div.right_footer a:hover{font-size: 1.2em; color:#B4E3EC; padding:1.2em; }
-
-
-
-
-
Added: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.less (rev 0)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.less 2013-04-28 19:45:56 UTC (rev 4727)
@@ -0,0 +1,240 @@
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+
+
+
+nav{
+ position: absolute;
+ width: inherit;
+
+ background: #000;
+ .border-radius(5px,5px,5px,5px);
+
+ ul {
+ margin: 0 auto;
+ width: inherit;
+
+ list-style: none;
+
+
+ li {
+ float: left;
+
+ a {
+ font:20px "SourceSansPro",Arial;
+ display: inline-block;
+ margin-right: 20px;
+ padding: 0 10px;
+ line-height: 44px;
+
+// font-size: 16px;
+ font-weight: normal;
+ line-height: 44px;
+ text-align: center;
+ text-decoration: none;
+ color: #b4e3ec;
+
+ &:hover{
+ color: #fff;
+ }
+ }
+
+ &.selected a{
+ color: #fff;
+ }
+ }
+ }
+}
+
+
+
+
+
+header#top{
+ height:130px;
+
+
+
+ div#logo {
+ width:250px;
+ float:left;
+
+ p,
+ h1 {
+ padding: 20px 0;
+ color: #FFF;
+ font-size: 28px;
+ }
+ }
+
+ div #top_bar {
+ float:left;
+ position:relative;
+ left:260px;
+ width: 450px;
+ padding:0;
+ height:45px;
+
+ background: black;
+ .border-radius(0,5px,5px,0);
+
+ div{
+ float:left;
+
+ }
+ }
+}
+
+
+
+
+
+
+
+
+section#intro {
+ margin-top: 57px;
+ width: inherit;
+ background: #778899 url("../images/introbkg.png") repeat-x;
+ .background-size(100%);
+ .border-radius(5px,5px,5px,5px);
+
+
+ h1,
+ h2,
+ p {
+ position: relative;
+ z-index: 9999;
+ width: 800px;
+ padding: 0 0 20px 0;
+ }
+
+ h1,
+ h2 {
+ font-weight: normal;
+ color: #333;
+ }
+
+ p {
+ color: #5D4A3D;
+ }
+
+ .intro.content{
+ padding: 0;
+ height:220px;
+ .border-radius(5px,5px,5px,5px);
+
+ div{
+ font-size: 0.9em;
+ font-weight:bold;
+ width:936px;
+ margin:0;
+ padding:0;
+
+ }
+ }
+}
+
+
+nl#breadcrumbs {
+ margin-top: 12px;
+ margin-bottom: 2px;
+ clear: both;
+ float: left;
+ height: 25px;
+ padding: 1.1em 0;
+ position: relative;
+ top: 22px;
+ width: inherit;
+
+ a {
+ text-decoration:none;
+ padding:1em 0.3em;
+ font-size:1em;
+ font-weight:
+ bold;color: #777;
+
+ }
+}
+
+
+
+
+
+
+
+footer {
+ clear: both;
+ height:60px;
+ margin-bottom: 10px;
+ padding:1.5em;
+ position: relative;
+ top: 12px;
+
+ background: #778899 url("../images/footer.png") repeat-x;
+ color: #fff;
+ .border-radius(5px,5px,5px,5px);
+
+ p {
+ padding: 2em;
+ text-align: right;
+ font-size: 11px;
+
+ a {
+ color: #999;
+ text-decoration: none;
+
+ &:hover {
+ color: #FFF;
+ text-decoration: none;
+ }
+ }
+ }
+
+ div{
+ margin:0;
+ padding:0;
+
+
+ &.left_footer {
+ width:0;
+ float:left;
+ display:block;
+ height:100%;
+ }
+
+ &.center_footer {
+ width:33%%;
+ float:left;
+ display:block;
+ height:100%;
+
+ text-align:left;
+ font-size:0.8em;
+ }
+
+ &.right_footer a{
+ font-size: 1.2em;
+ color:#fff;
+ padding:1.2em;
+ text-align:right;
+
+ &:hover{
+ font-size: 1.2em;
+ color:#B4E3EC;
+ padding:1.2em;
+
+ }
+ }
+
+ }
+}
+
+
+
Added: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-account.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-account.less (rev 0)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-account.less 2013-04-28 19:45:56 UTC (rev 4727)
@@ -0,0 +1,64 @@
+/**
+ * @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ * @subpackage Template 2cShopHtml5Oscim
+ * @package osCSS-2 <www http://www.oscss.org>
+ * @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ * @encode UTF-8
+ */
+
+
+
+
+/*
+ * Adjust block article specific data product
+ */
+article.account{
+
+ div#account{
+ div.box{
+ float:left;
+ margin:0.3% 0.7%;
+ width:48% ;
+ border:1px solid #009FC2;
+ .border-radius(5px, 5px, 5px, 5px);
+
+ h4{
+ padding:5px;
+ background:#009FC2;
+ color:white;
+ font-weight:normal;
+ font-size:1em;
+
+ a{
+ color:white;
+ font-weight:normal;
+ font-size:inherit;
+ }
+ }
+
+ div.contentBox{
+ padding:5px;
+ }
+ }
+ }
+
+
+ /*
+ * History orders
+ */
+ .main-history{
+
+ table{
+ width:100%;
+ border-collapse:collapse;
+ border: 1px solid gray;
+
+ th{
+ margin:10px 0;
+ background:gray;
+ border-left: 1px solid gray;
+ }
+ }
+ }
+
+}
\ No newline at end of file
Added: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-categorie.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-categorie.less (rev 0)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-categorie.less 2013-04-28 19:45:56 UTC (rev 4727)
@@ -0,0 +1,31 @@
+/**
+ * @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ * @subpackage Template 2cShopHtml5Oscim
+ * @package osCSS-2 <www http://www.oscss.org>
+ * @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ * @encode UTF-8
+ */
+
+
+
+
+
+/*
+ * Adjust block article specific data product
+ */
+article.categorie{
+
+ figure{
+ display: block;
+ float: right;
+ width: 49%;
+ padding-top:0.9em;
+ text-align:center;
+ background: url("../images/bg_product.png") 0px 0px no-repeat;
+ }
+
+ div#headingCatTxt{
+ float: left;
+ width: 48%;
+ }
+}
\ No newline at end of file
Added: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-product.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-product.less (rev 0)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/article-product.less 2013-04-28 19:45:56 UTC (rev 4727)
@@ -0,0 +1,91 @@
+/**
+ * @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ * @subpackage Template 2cShopHtml5Oscim
+ * @package osCSS-2 <www http://www.oscss.org>
+ * @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ * @encode UTF-8
+ */
+
+
+
+
+form input[type=text]#products_quantity,
+form input[type=text].CartQty{
+ width:25px;
+
+}
+
+
+
+/*
+ * Adjust block article specific data product
+ */
+article.product{
+
+ header{
+
+ a {
+ font-size: 14px;
+ font-style: italic;
+ color: #777;
+
+ &:hover {
+ text-decoration: none;
+ color: #000;
+ }
+ }
+ }
+
+ figure{
+ display: block;
+ float: left;
+ width: 50%;
+
+ p{
+ text-align:center;
+
+ a {
+ color: #0e9fc0;
+
+ &:hover {
+ color: #000;
+ }
+ }
+ }
+
+ ul{
+ list-style:none;
+
+ li{
+ float:left;
+ }
+ }
+
+ div#productImagelistMini{
+ height:70px;
+ }
+
+ div#productImage {
+ height:200px;
+
+ }
+ }
+
+
+ .productPrice {
+ font-weight:bold;
+ font-size:2em;
+
+ }
+
+ div.in_tabs{
+ clear:both;
+
+ p {
+ padding:2em;
+ color: #555;
+ font-size: 0.8em;
+ }
+ }
+}
+
Added: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/datatype-generic.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/datatype-generic.less (rev 0)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/datatype-generic.less 2013-04-28 19:45:56 UTC (rev 4727)
@@ -0,0 +1,189 @@
+/**
+ * @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ * @subpackage Template 2cShopHtml5Oscim
+ * @package osCSS-2 <www http://www.oscss.org>
+ * @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ * @encode UTF-8
+ */
+
+article h1/*,
+.product h2,
+.product h1*/ {
+
+ }
+/* article */
+
+article {
+ clear:both;
+
+ h1 {
+ padding-left: 10px;
+ margin-top: 0;
+ background:transparent url("../images/bg_header.jpg") no-repeat top left;
+ .border-radius(5px,5px,5px,5px);
+
+ }
+
+ h2 {
+ padding-left: 10px;
+ margin-top: 10px;
+ }
+
+
+ p,
+ .textMain p {
+ padding:0.5em;
+ font-size:0.9em;
+
+ }
+
+
+ div.module {
+ clear:both;
+
+ /*
+ * View --Row module--
+ */
+ }
+
+ section{
+ clear:both;
+ float:none;
+
+ &.listing_cat{
+ .module {
+ .outerblock {
+ height: 158px;
+ }
+
+ .innerblock {
+ height: 135px;
+
+ p {
+ padding-bottom:0;
+
+ &.title{
+ height:21px;
+ }
+ }
+ }
+ }
+ }
+ }
+}
+
+
+
+
+
+
+
+
+
+/*
+ * Detail --Row module--
+ */
+.module{
+ padding:1em 0.5em;
+
+
+ h4.title {
+ font-size: 1.5em;
+ font-weight:bold;
+ margin:1.2em;
+ color:#0E9FC0;
+
+ }
+
+ ul {
+ width: 110%;
+ padding: 0;
+ margin: 0;
+ list-style: none;
+
+ li {
+ display: inline;
+ float: left;
+ margin: 0 17px 12px 0;
+ padding: 0;
+ width: 216px;
+ }
+ }
+
+ .outerblock {
+ height: 245px;
+ padding: 12px;
+ width: 90%;
+ font-size: 1em;
+ background: #dee;
+ .border-radius(5px,5px,5px,5px);
+ }
+
+ .innerblock {
+ height: 220px;
+ padding: 12px;
+ font-size: 1em;
+ text-align:center;
+ background: url("../images/bg_product_list.png") 0px 0px no-repeat;
+ .border-radius(5px,5px,5px,5px);
+
+ a {
+ color: #0e9fc0;
+ }
+
+ h2 {
+ font-size: 16px;
+ }
+
+ p {
+ padding-bottom:0.2em;
+
+ &.title{
+ height:41px;
+
+ a{
+ text-decoration: none;
+ font-size: 1.3em;
+ }
+ }
+
+ &.img{
+ height:100px;
+ }
+ }
+
+ .innerblock-more{
+ height:35px;
+ text-align:left;
+
+ *{
+ float:left;
+ margin:0;
+ padding:0;
+ }
+
+
+ img,
+ input[type=image]{
+ padding:5px ;
+ }
+
+ a.details{
+ display:inline-block;
+ padding: 6px 12px;
+ float:right;
+ color:#fff;
+ background:#0E9FC0;
+ .border-radius(5px,5px,5px,5px);
+
+ &:hover{
+ color:#0E9FC0;
+ background:#fff;
+ }
+ }
+ }
+
+ }
+
+
+}
\ No newline at end of file
Added: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/generic.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/generic.less (rev 0)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/generic.less 2013-04-28 19:45:56 UTC (rev 4727)
@@ -0,0 +1,354 @@
+/**
+ * @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ * @subpackage Template 2cShopHtml5Oscim
+ * @package osCSS-2 <www http://www.oscss.org>
+ * @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ * @encode UTF-8
+ */
+
+
+
+/* standard body */
+body {
+ margin: 0 auto;
+ width: 960px;
+ font: 14px/20px "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
+ background: #eee;
+}
+
+
+/*
+ * Normal html balise
+ */
+
+h1 {
+ padding: 20px 0;
+ color: #FFF;
+ font-size: 28px;
+}
+
+h2 {
+ padding: 20px 0;
+ font-size: 24px;
+}
+
+h3 {
+ padding: 10px 0;
+ font-size: 18px;
+}
+
+ul,ol {
+ list-style:none;
+ padding-left:20px;
+}
+
+a {
+ text-decoration:none;
+ color:#0E9FC0;
+ font-weight:normal;
+ font-size:1.2em;
+
+ &:hover{
+ text-decoration:underline;
+ }
+}
+
+img{
+ border: none;
+
+ &.alignleft {
+ margin: 5px 10px 0 0;
+ }
+
+ &.alignright {
+ margin: 5px 0 0 10px;
+ }
+}
+
+/*
+ * Class color / align
+ */
+.center { text-align: center; }
+
+.notice,
+.required{color:red}
+
+.alignleft { float: left; }
+
+.alignright { float: right; }
+
+.text,
+h4,
+p {
+ padding:0 10px;
+}
+
+
+
+
+
+
+
+
+
+
+
+/*
+ * sidebar --aside--
+ */
+aside{
+ float: left;
+ width: 26%;
+ margin:0;
+ padding:0;
+
+ section {
+ margin: 10px 12px 0 0;
+ padding: 0 0 10px 0;
+ background-color: #fff;
+ .border-radius(5px,5px,5px,5px);
+
+ header h3 {
+ padding-left: 10px;
+ margin: 10px 0px;
+ background: url("../images/introbkg.png") repeat-x scroll bottom right #778899;
+ color:#fff;
+
+ .border-radius(5px,5px,5px,5px);
+ }
+
+// h3 {
+// padding-left: 10px;
+// margin: 2px 0px;
+// text-align:center;
+// // background: url("../images/introbkg.png") repeat-x scroll bottom right #778899;
+// // color:#fff;
+//
+// .border-radius(5px,5px,5px,5px);
+// }
+
+ ul {
+ margin-left: 12px;
+ padding-left: 12px;
+ list-style: square;
+ color: #0e9fc0;
+
+ li {
+ padding-top: 0;
+ padding-bottom: 14px;
+ border-bottom: 1px #0e9fc0 dotted;
+
+ a {
+ display: block;
+ text-decoration: none;
+ color: #000;
+ font-size: 16px;
+ font-variant: small-caps;
+
+ &:hover {
+ text-decoration: underline;
+ }
+ }
+
+ ul li{
+ border-bottom: none;
+ padding: 5px;
+ }
+ }
+ }
+
+ div.inner-boxe{
+ text-align:center;
+ }
+ }
+}
+
+
+/*
+ * Specific dispay CGU/CGV
+ */
+
+div.CguView {
+ width:100%;
+ overflow:auto;
+ height:150px;
+ text-align: justify;
+ border:1px solid black;
+ background:white;
+}
+
+/*
+ * Specific block price
+ */
+
+.price{
+ font-size:1.2em;
+ font-weight:bold;
+
+ .tax_symbol {
+ font-size:0.4em;
+ }
+}
+
+
+/*
+ * Paginate
+ */
+.splitnav,
+.split{
+ clear: both;
+ display: inline-block;
+ float: none;
+ height: 30px;
+ width: 100%;
+
+ p.sP1{
+ float:left;
+ width:38%;
+ }
+
+ p.sP2{
+ float:right;
+ // width:58%;
+
+ a{
+ margin:0 0.1em;
+ padding: 0.12em 0.3em;
+
+ background: none repeat scroll 0 0 padding-box #FFFFFF;
+ border: 1px solid #ACAAAC;
+ .border-radius(5px,5px,5px,5px);
+ font-family: Verdana,Arial,sans-serif;
+ font-size: 14.3px;
+ font-weight:normal;
+ color:black;
+
+ &:hover{
+ text-decoration:none;
+ border:1px solid @bg_input_border_hover;
+ background: @bg_input_hover ;
+ }
+ }
+
+ .jump{
+ display:inline-block;
+ padding: 0.02em 0.3em;
+
+ background: #A0A0A0;
+ border: 1px solid #A0A0A0;
+ .border-radius(5px,5px,5px,5px);
+ font-size: 14.3px;
+ font-weight:normal;
+ color:black;
+ }
+ }
+}
+
+
+
+
+
+/*
+ * Bouton basé sur des liens
+ */
+a{
+ &.submitBt,
+ &.navBtMini,
+ &.navBt{
+ margin: 0.3em;
+ padding: 0.12em 0.3em;
+
+ background: none repeat scroll 0 0 padding-box #FFFFFF;
+ border: 1px solid #ACAAAC;
+ .border-radius(5px,5px,5px,5px);
+ font-family: Verdana,Arial,sans-serif;
+ font-size: 14.3px;
+ font-weight:normal;
+ color:black;
+
+
+ &:hover{
+ text-decoration:none;
+ border:1px solid @bg_input_border_hover;
+ background: @bg_input_hover ;
+ }
+ }
+}
+
+
+
+/*
+ *
+ */
+.messageStack{
+ margin:5px 0;
+ padding:0;
+ color: #FFF;
+ background-color: #f18f7e;
+ .border-radius(5px,5px,5px,5px);
+ *{
+ list-style:none;
+ margin:0;
+ padding:0;
+ }
+
+ li{
+ padding:5px 12px;
+ }
+}
+
+
+
+
+/*
+ *
+ */
+table{
+ width:100%;
+
+ &.invoice{
+ clear:both;
+ background:none;
+ margin:10px 1%;
+ width: 98%;
+
+ &.invoiceDetails,
+ &.invoiceTotal,
+ &.invoiceHistory{
+ margin-top:0;
+ margin-bottom:0;
+ border-collapse:collapse;
+ border: 1px solid gray;
+ }
+
+ &.invoiceTotal {
+ border-top: none;
+ width:60%;
+ float:right;
+ }
+
+ &.invoiceHistory{
+ position:relative;
+ top:10px;
+ }
+
+
+ thead th{
+ margin:10px 0;
+ background:gray;
+ border-left: 1px solid gray;
+ }
+
+ tbody td{
+ border-left: 1px solid gray;
+
+ &.totttc {
+ width:84px;
+ text-align:right;
+ }
+ }
+ }
+
+}
+
+
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2013-04-28 19:37:10 UTC (rev 4726)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2013-04-28 19:45:56 UTC (rev 4727)
@@ -7,226 +7,28 @@
*/
-/* standard body */
-body {
- font: 14px/20px "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
- background: #eee;
-}
-/* standard alignments */
-img { border: none; }
-.center { text-align: center; }
-.notice,
-.required{color:red}
-
/* Hx tags */
-h1 {
- color: #FFF;
- font-size: 28px;
-}
-h2 {
- font-size: 24px;
-}
-
-h3 {
- font-size: 18px;
-}
-ul {list-style:none;}
fieldest,
-form,
- fieldset.ListFilterType,
- fieldset.manufacturerFilter {border:0;font-size:0.9em;padding:0.5em}
- del {font-size:0.6em;}
+fieldset.ListFilterType,
+fieldset.manufacturerFilter {border:0;font-size:0.9em;padding:0.5em}
- .messageStack {
- color: #FFF;
- background-color: #f18f7e;
- /* curved border radius */
- -webkit-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
- div.CguView {
- text-align: justify;
- border:1px solid black;
- background:white;
- }
- a {text-decoration:none; color:#0E9FC0; font-weight:bold;font-size:1.2em;}
- /* content and sidebar layout */
- #content {
- background:#fff url("../images/bg_content.jpg") no-repeat top right;
- /* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
- /* article */
-
- .product header p, .blogPost header p a {
- font-size: 14px;
- font-style: italic;
- color: #777;
- }
-
- .product p a {
- color: #0e9fc0;
- }
-
- .product p a:hover {
- color: #000;
- }
-
- .product header p a:hover {
- text-decoration: none;
- color: #000;
- }
-
- article h1/*,
- .product h2,
- .product h1*/ {
- background:transparent url("../images/bg_header.jpg") no-repeat top left;
- /* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
-
- /* sidebar */
- aside section {
- background-color: #fff;
-
- /* curved border radius */
- -webkit-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
-
- aside section ul {
- list-style: square;
- color: #0e9fc0;
- }
-
- aside section ul li {
- border-bottom: 1px #0e9fc0 dotted;
- }
-
- aside section ul li a {
- text-decoration: none;
- color: #000;
- font-size: 16px;
- font-variant: small-caps;
- }
-
- aside section ul li a:hover {
- text-decoration: underline;
- }
-
- aside section header h3 {
- background: url("../images/introbkg.png") repeat-x scroll bottom right #778899;
- color:#fff;
- /* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
-
-
- aside section div.inner-boxe{
- text-align:center;
- }
-
-
- /* columns */
-
- .module h4.title {font-size: 1.5em;font-weight:bold;margin:1.2em;color:#0E9FC0;}
-
-
- .module ul {
- list-style: none;
- }
-
-
- .module .outerblock {
- font-size: 1em;
- background: #dee;
- /* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
-
- .module .innerblock {
- font-size: 1em;
-
- text-align:center;
- /* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
-
- .module .innerblock img {
- border: none;
- }
-
- .module .innerblock a {
- color: #0e9fc0;
- }
-
- .module .innerblock h2 {
- font-size: 16px;
- }
-
-
-
-
- .module .innerblock .innerblock-more{
- text-align:left;
- }
-
-
- .module .innerblock .innerblock-more a.details{
- color:#fff;
- background:#0E9FC0;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
-
- .module .innerblock .innerblock-more a.details:hover{
- color:#0E9FC0;
- background:#fff;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
-
-
-
-
- .boxe { -moz-border-radius: 5px;-webkit-border-radius: 5px}
-
/* end of column configuration */
- article.product.single figure p{
- text-align:center;
- }
- article.product.single figure ul{
- list-style:none;
- }
-
- #headingCatImg { background: url("../images/bg_product.png") 0px 0px no-repeat;}
- .innerblock { background: url("../images/bg_product_list.png") 0px 0px no-repeat;}
-
-
-
-
-
/* -- panier -- */
.invoice {background: url("../images/bg_product.png") 0px 0px no-repeat;}
@@ -255,117 +57,3 @@
.cart_details a {color:#000;font-size:10px;}
- /* Section habillage Top.css */
-
-
- /*header {
- } */ *
-
- #logo p,
- #logo h1 {
- color: #FFF;
- font-size: 28px;
- }
-
-
- /* #top_bar {
- } */ *
-
-
- nav {
- background: url("../images/navbg.png") no-repeat top right #000;
- /* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
-
- nav ul {
- list-style: none;
- }
-
-
- nav ul li a {
- font-size: 16px;
- font-weight: bold;
- line-height: 44px;
- text-align: center;
- text-decoration: none;
- color: #b4e3ec;
- }
-
- nav ul li a:hover {
- color: #fff;
- }
-
- nav ul li.selected a {
- color: #fff;
- }
-
-
- div#top_bar {
- -moz-border-radius: 0px 0px 10px 10px;
- background: url("../images/navbg.png") repeat scroll 0 0 transparent;
- }
-
-
- section#intro {
- background: #778899 url("../images/introbkg.png") repeat-x;
-
- /* background size */
- -webkit-background-size: 100%;
- -o-background-size: 100%;
- -khtml-background-size: 100%;
-
-
- /* curved border radius */
- -webkit-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
-
-
-
- #intro h1,
- #intro h2 {
- font-weight: normal;
- color: #333;
- }
-
- #intro p {
- color: #5D4A3D;
- }
-
-
-
-
-
- /* Footer habillage section*/
- /* footer */
- footer {
- background: #778899 url("../images/footer.png") repeat-x;
- color: #fff;
-
- /* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
-
- footer p {
- text-align: right;
- font-size: 11px;
- }
-
- footer a {
- color: #999;
- }
-
- footer a:hover {
- color: #FFF;
- text-decoration: none;
- }
-
- footer div.right_footer { text-align:right;}
-
- footer div.center_footer{
- text-align:left;font-size:0.8em;
- }
- footer a {text-decoration: none;}
\ No newline at end of file
Added: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/master.less
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/master.less (rev 0)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/master.less 2013-04-28 19:45:56 UTC (rev 4727)
@@ -0,0 +1,133 @@
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+@color_010 : #78222F;
+@color_011 : #FFFFFF;
+@color_012 : #ACAAAC;
+@color_013 : #303030;
+@color_014 : #D7D7D7;
+@color_015 : #000000;
+@color_016 : #3F3F3F;
+
+// gardient red
+@color_020 : #AE0405 ;
+@color_021 : #AE0405 ;
+@color_022 : #FD3841 ;
+
+
+
+// FORM
+@bg_input : @color_011;
+@bg_input_border : @color_012;
+@bg_input_hover : #F0F0F0;
+@bg_input_border_hover : @color_010;
+
+
+// block div edit / input gradient background
+@color_bg_gradient_base : #E4E4E4; // base color
+@color_bg_gradient_eob : 200; // deb gradient
+@color_bg_gradient_eon : 255; // end gradient
+
+
+/* Normal Definition */
+@margin: 0.2em;
+@padding_base : 0.1em;
+@lineheight: 16px;
+@font_size : 11px;
+
+
+@import "element.less";
+@import "forms.less";
+
+@import "generic.less";
+@import "BottomTop.less";
+
+
+@import "datatype-generic.less";
+@import "article-product.less";
+@import "article-categorie.less";
+@import "article-account.less";
+
+
+
+
+.font-face("SourceSansPro", "../font/SourceSansPro-It");
+
+/* reset */
+* { margin: 0; padding: 0; }
+br.clear {height:0; width:0;}
+/* render html5 elements as block */
+header,
+footer,
+section,
+aside,
+nav,
+article,
+nl{ display: block; }
+del {font-size:0.6em;}
+
+
+html:lang(fr-ca) { quotes: '« ' ' »' }
+html:lang(de) { quotes: '»' '«' '\2039' '\203A' }
+:lang(fr) > Q { quotes: '« ' ' »' }
+:lang(de) > Q { quotes: '»' '«' '\2039' '\203A' }
+
+
+
+
+
+
+
+
+
+
+/*
+ * Structure generic
+ */
+
+div#main-tpl {
+ clear:both;
+
+ div#content {
+ float: right;
+ width: 74%;
+ margin:10px 0 10px 0;
+ padding:0 0 0 0;
+ background:#fff url("../images/bg_content.jpg") no-repeat top right;
+ .border-radius(5px,5px,5px,5px);
+
+ /*
+ * SubSection is in dadatype-xxx.less
+ */
+ }
+
+ /*
+ * SubSection is --aside-- (generic.less)
+ */
+}
+
+
+
+
+
+/*
+ * Specific In section checkout and cart
+ */
+body#Page_shopping_cart div#main-tpl,
+.Type_checkout div#main-tpl {
+ aside {
+ width:0;
+ display:none;
+ }
+
+ div#content {
+ width:100%;
+ padding-right:0;
+ padding-left:0;
+ }
+}
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php 2013-04-28 19:37:10 UTC (rev 4726)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php 2013-04-28 19:45:56 UTC (rev 4727)
@@ -46,8 +46,8 @@
*/
$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');
/**
Configuration des boxes
Les boxes sont appelé via les lg suivant.
@@ -107,6 +107,10 @@
case 'home':
+
+ $this->add_var_page('MAX_DISPLAY_PRODUCTS_NEW','3');
+ $this->add_var_page('MAX_DISPLAY_NEW_PRODUCTS','3');
+
// $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
$this->oscss_boxes->_add('whats_new', 'sidebar', array('cache'=>false));
$this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
@@ -152,24 +156,16 @@
$this->oscss_modules->_add(FILENAME_UPCOMING_PRODUCTS,'center',array('sort'=>61));
break;
- case 'listing':
+ case 'listing': // obsolete
+ case 'categorie':
// $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
$this->oscss_boxes->_add('categories', 'sidebar');
$this->oscss_boxes->_add('manufacturers', 'sidebar');
- // precise si module utilisé comme pleine page
- switch(self::oscss_body_id()){
- case 'Page_listing_small_price':
- case 'Page_listing_best_sellers':
- case 'Page_listing_specials':
- case 'Page_listing_products_new':
- $load->module = 'master';
- break;
- default:
$load->module = 'child';
- }
+
break;
@@ -186,6 +182,12 @@
case '404':
$this->oscss_modules->_add(FILENAME_NEW_PRODUCTS,'center',array('sort'=>60));
break;
+ case 'Page_listing_small_price':
+ case 'Page_listing_best_sellers':
+ case 'Page_listing_specials':
+ case 'Page_listing_products_new':
+ $load->module = 'master';
+ break;
default:
}
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_payment.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_payment.php 2013-04-28 19:37:10 UTC (rev 4726)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_payment.php 2013-04-28 19:45:56 UTC (rev 4727)
@@ -17,7 +17,7 @@
<h2 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE; ?></h2>
- <?php echo tep_draw_form('checkout_payment', tep_href_link(FILENAME_CHECKOUT_CONFIRMATION, '', 'SSL'), 'post', 'onsubmit="return check_form();"'); ?>
+ <?php echo tep_draw_form('checkout_payment', tep_href_link(FILENAME_CHECKOUT, 'step=confirmation', 'SSL'), 'post', 'onsubmit="return check_form();"'); ?>
<?php /** Retour des erreurs */
if (isset($_GET['payment_error']) && is_object(${$_GET['payment_error']}) && ($error = ${$_GET['payment_error']}->get_error())) { ?>
@@ -107,12 +107,12 @@
<p id="checkoutcouponerror" class="warning"><?php if(isset($_GET['error_message'])) echo $_GET['error_message'] ?></p>
<?php } ?>
- <fieldset>
+ <!-- <fieldset>
<legend><?php echo CHECKOUT_CGV ;?></legend>
<label for="conditions"><?php printf(TEXT_CONDITIONS , tep_href_link(FILENAME_CONDITIONS, 'origin=checkout_payment') );?></label>
<input name="conditions" id="conditions" type="checkbox" <?php echo isset($_GET['consult_conditions']) ? 'checked="checked"' : '' ;?> />
- </fieldset>
+ </fieldset>-->
<p class="formBt ieExtractFieldset">
<?php echo TITLE_CONTINUE_CHECKOUT_PROCEDURE ;?>
Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/index_listing.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/index_listing.php 2013-04-28 19:37:10 UTC (rev 4726)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/index_listing.php 2013-04-28 19:45:56 UTC (rev 4727)
@@ -47,9 +47,9 @@
<div id="index">
<?php /** Image cat or manufacturer */ if (!empty($RootListing->image)) : ?>
- <div id="headingCatImg">
+ <figure id="headingCatImg">
<?php echo tep_image(DIR_WS_IMAGES . $RootListing->image, $RootListing->name , $page->_conf_value('HEADING_IMAGE_WIDTH'), $page->_conf_value('HEADING_IMAGE_HEIGHT')); ?>
- </div>
+ </figure>
<?php endif; ?>
<?php /** Image cat */ if($RootListing->description !=false) : ?>
<div id="headingCatTxt" class="text">
Added: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/js/less-1.3.0.min.js
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/js/less-1.3.0.min.js (rev 0)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/js/less-1.3.0.min.js 2013-04-28 19:45:56 UTC (rev 4727)
@@ -0,0 +1,9 @@
+//
+// LESS - Leaner CSS v1.3.0
+// http://lesscss.org
+//
+// Copyright (c) 2009-2011, Alexis Sellier
+// Licensed under the Apache 2.0 License.
+//
+(function(a,b){function c(b){return a.less[b.split("/")[1]]}function l(){var a=document.getElementsByTagName("style");for(var b=0;b<a.length;b++)a[b].type.match(j)&&(new d.Parser).parse(a[b].innerHTML||"",function(c,d){var e=d.toCSS(),f=a[b];f.type="text/css",f.styleSheet?f.styleSheet.cssText=e:f.innerHTML=e})}function m(a,b){for(var c=0;c<d.sheets.length;c++)n(d.sheets[c],a,b,d.sheets.length-(c+1))}function n(b,c,e,f){var h=a.location.href.replace(/[#?].*$/,""),i=b.href.replace(/\?.*$/,""),j=g&&g.getItem(i),k=g&&g.getItem(i+":timestamp"),l={css:j,timestamp:k};/^(https?|file):/.test(i)||(i.charAt(0)=="/"?i=a.location.protocol+"//"+a.location.host+i:i=h.slice(0,h.lastIndexOf("/")+1)+i);var m=i.match(/([^\/]+)$/)[1];q(b.href,b.type,function(a,g){if(!e&&l&&g&&(new Date(g)).valueOf()===(new Date(l.timestamp)).valueOf())p(l.css,b),c(null,null,a,b,{local:!0,remaining:f});else try{(new d.Parser({optimization:d.optimization,paths:[i.replace(/[\w\.-]+$/,"")],mime:b.type,filename:m})).parse(a,function(d,e){if(d)return u(d,i);try{c(d,e,a,b,{local:!1,lastModified:g,remaining:f}),s(document.getElementById("less-error-message:"+o(i)))}catch(d){u(d,i)}})}catch(h){u(h,i)}},function(a,b){throw new Error("Couldn't load "+b+" ("+a+")")})}function o(a){return a.replace(/^[a-z]+:\/\/?[^\/]+/,"").replace(/^\//,"").replace(/\?.*$/,"").replace(/\.[^\.\/]+$/,"").replace(/[^\.\w-]+/g,"-").replace(/\./g,":")}function p(a,b,c){var d,e=b.href?b.href.replace(/\?.*$/,""):"",f="less:"+(b.title||o(e));(d=document.getElementById(f))===null&&(d=document.createElement("style"),d.type="text/css",d.media=b.media||"screen",d.id=f,document.getElementsByTagName("head")[0].appendChild(d));if(d.styleSheet)try{d.styleSheet.cssText=a}catch(h){throw new Error("Couldn't reassign styleSheet.cssText.")}else(function(a){d.childNodes.length>0?d.firstChild.nodeValue!==a.nodeValue&&d.replaceChild(a,d.firstChild):d.appendChild(a)})(document.createTextNode(a));c&&g&&(t("saving "+e+" to cache."),g.setItem(e,a),g.setItem(e+":timestamp",c))}function q(a,b,c,e){function i(b,c,d){b.status>=200&&b.status<300?c(b.responseText,b.getResponseHeader("Last-Modified")):typeof d=="function"&&d(b.status,a)}var g=r(),h=f?!1:d.async;typeof g.overrideMimeType=="function"&&g.overrideMimeType("text/css"),g.open("GET",a,h),g.setRequestHeader("Accept",b||"text/x-less, text/css; q=0.9, */*; q=0.5"),g.send(null),f?g.status===0||g.status>=200&&g.status<300?c(g.responseText):e(g.status,a):h?g.onreadystatechange=function(){g.readyState==4&&i(g,c,e)}:i(g,c,e)}function r(){if(a.XMLHttpRequest)return new XMLHttpRequest;try{return new ActiveXObject("MSXML2.XMLHTTP.3.0")}catch(b){return t("browser doesn't support AJAX."),null}}function s(a){return a&&a.parentNode.removeChild(a)}function t(a){d.env=="development"&&typeof console!="undefined"&&console.log("less: "+a)}function u(a,b){var c="less-error-message:"+o(b),e='<li><label>{line}</label><pre class="{class}">{content}</pre></li>',f=document.createElement("div"),g,h,i=[],j=a.filename||b;f.id=c,f.className="less-error-message",h="<h3>"+(a.message||"There is an error in your .less file")+"</h3>"+'<p>in <a href="'+j+'">'+j+"</a> ";var k=function(a,b,c){a.extract[b]&&i.push(e.replace(/\{line\}/,parseInt(a.line)+(b-1)).replace(/\{class\}/,c).replace(/\{content\}/,a.extract[b]))};a.stack?h+="<br/>"+a.stack.split("\n").slice(1).join("<br/>"):a.extract&&(k(a,0,""),k(a,1,"line"),k(a,2,""),h+="on line "+a.line+", column "+(a.column+1)+":</p>"+"<ul>"+i.join("")+"</ul>"),f.innerHTML=h,p([".less-error-message ul, .less-error-message li {","list-style-type: none;","margin-right: 15px;","padding: 4px 0;","margin: 0;","}",".less-error-message label {","font-size: 12px;","margin-right: 15px;","padding: 4px 0;","color: #cc7777;","}",".less-error-message pre {","color: #dd6666;","padding: 4px 0;","margin: 0;","display: inline-block;","}",".less-error-message pre.line {","color: #ff0000;","}",".less-error-message h3 {","font-size: 20px;","font-weight: bold;","padding: 15px 0 5px 0;","margin: 0;","}",".less-error-message a {","color: #10a","}",".less-error-message .error {","color: red;","font-weight: bold;","padding-bottom: 2px;","border-bottom: 1px dashed red;","}"].join("\n"),{title:"error-message"}),f.style.cssText=["font-family: Arial, sans-serif","border: 1px solid #e00","background-color: #eee","border-radius: 5px","-webkit-border-radius: 5px","-moz-border-radius: 5px","color: #e00","padding: 15px","margin-bottom: 15px"].join(";"),d.env=="development"&&(g=setInterval(function(){document.body&&(document.getElementById(c)?document.body.replaceChild(f,document.getElementById(c)):document.body.insertBefore(f,document.body.firstChild),clearInterval(g))},10))}typeof define=="function"&&define.amd&&define("less",[],function(){return d}),Array.isArray||(Array.isArray=function(a){return Object.prototype.toString.call(a)==="[object Array]"||a instanceof Array}),Array.prototype.forEach||(Array.prototype.forEach=function(a,b){var c=this.length>>>0;for(var d=0;d<c;d++)d in this&&a.call(b,this[d],d,this)}),Array.prototype.map||(Array.prototype.map=function(a){var b=this.length>>>0,c=new Array(b),d=arguments[1];for(var e=0;e<b;e++)e in this&&(c[e]=a.call(d,this[e],e,this));return c}),Array.prototype.filter||(Array.prototype.filter=function(a){var b=[],c=arguments[1];for(var d=0;d<this.length;d++)a.call(c,this[d])&&b.push(this[d]);return b}),Array.prototype.reduce||(Array.prototype.reduce=function(a){var b=this.length>>>0,c=0;if(b===0&&arguments.length===1)throw new TypeError;if(arguments.length>=2)var d=arguments[1];else do{if(c in this){d=this[c++];break}if(++c>=b)throw new TypeError}while(!0);for(;c<b;c++)c in this&&(d=a.call(null,d,this[c],c,this));return d}),Array.prototype.indexOf||(Array.prototype.indexOf=function(a){var b=this.length,c=arguments[1]||0;if(!b)return-1;if(c>=b)return-1;c<0&&(c+=b);for(;c<b;c++){if(!Object.prototype.hasOwnProperty.call(this,c))continue;if(a===this[c])return c}return-1}),Object.keys||(Object.keys=function(a){var b=[];for(var c in a)Object.prototype.hasOwnProperty.call(a,c)&&b.push(c);return b}),String.prototype.trim||(String.prototype.trim=function(){return String(this).replace(/^\s\s*/,"").replace(/\s\s*$/,"")});var d,e;typeof environment=="object"&&{}.toString.call(environment)==="[object Environment]"?(typeof a=="undefined"?d={}:d=a.less={},e=d.tree={},d.mode="rhino"):typeof a=="undefined"?(d=exports,e=c("./tree"),d.mode="node"):(typeof a.less=="undefined"&&(a.less={}),d=a.less,e=a.less.tree={},d.mode="browser"),d.Parser=function v(a){function q(){h=k[g],i=f,l=f}function r(){k[g]=h,f=i,l=f}function s(){f>l&&(k[g]=k[g].slice(f-l),l=f)}function t(a){var c,d,e,h,i,j,n,o;if(a instanceof Function)return a.call(m.parsers);if(typeof a=="string")c=b.charAt(f)===a?a:null,e=1,s();else{s();if(c=a.exec(k[g]))e=c[0].length;else return null}if(c){o=f+=e,j=f+k[g].length-e;while(f<j){h=b.charCodeAt(f);if(h!==32&&h!==10&&h!==9)break;f++}return k[g]=k[g].slice(e+(f-o)),l=f,k[g].length===0&&g<k.length-1&&g++,typeof c=="string"?c:c.length===1?c[0]:c}}function u(a,c){var d=t(a);if(!d)v(c||(typeof a=="string"?"expected '"+a+"' got '"+b.charAt(f)+"'":"unexpected token"));else return d}function v(a,b){throw{index:f,type:b||"Syntax",message:a}}function w(a){return typeof a=="string"?b.charAt(f)===a:a.test(k[g])?!0:!1}function x(a){return d.mode==="node"?c("path").basename(a):a.match(/[^\/]+$/)[0]}function y(a,c){return a.filename&&c.filename&&a.filename!==c.filename?m.imports.contents[x(a.filename)]:b}function z(a,b){for(var c=a,d=-1;c>=0&&b.charAt(c)!=="\n";c--)d++;return{line:typeof a=="number"?(b.slice(0,a).match(/\n/g)||"").length:null,column:d}}function A(a,b){var c=y(a,b),d=z(a.index,c),e=d.line,f=d.column,g=c.split("\n");this.type=a.type||"Syntax",this.message=a.message,this.filename=a.filename||b.filename,this.index=a.index,this.line=typeof e=="number"?e+1:null,this.callLine=a.call&&z(a.call,c).line+1,this.callExtract=g[z(a.call,c).line],this.stack=a.stack,this.column=f,this.extract=[g[e-1],g[e],g[e+1]]}var b,f,g,h,i,j,k,l,m,n=this,o=function(){},p=this.imports={paths:a&&a.paths||[],queue:[],files:{},contents:{},mime:a&&a.mime,error:null,push:function(b,c){var e=this;this.queue.push(b),d.Parser.importer(b,this.paths,function(a,d,f){e.queue.splice(e.queue.indexOf(b),1),e.files[b]=d,e.contents[b]=f,a&&!e.error&&(e.error=a),c(a,d),e.queue.length===0&&o()},a)}};return this.env=a=a||{},this.optimization="optimization"in this.env?this.env.optimization:1,this.env.filename=this.env.filename||null,m={imports:p,parse:function(h,i){var n,p,q,r,s,u,v=[],w,x=null;f=g=l=j=0,b=h.replace(/\r\n/g,"\n"),k=function(c){var d=0,e=/[^"'`\{\}\/\(\)\\]+/g,f=/\/\*(?:[^*]|\*+[^\/*])*\*+\/|\/\/.*/g,g=/"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'|`((?:[^`\\\r\n]|\\.)*)`/g,h=0,i,j=c[0],k;for(var l=0,m,n;l<b.length;l++){e.lastIndex=l,(i=e.exec(b))&&i.index===l&&(l+=i[0].length,j.push(i[0])),m=b.charAt(l),f.lastIndex=g.lastIndex=l,(i=g.exec(b))&&i.index===l&&(l+=i[0].length,j.push(i[0]),m=b.charAt(l)),!k&&m==="/"&&(n=b.charAt(l+1),(n==="/"||n==="*")&&(i=f.exec(b))&&i.index===l&&(l+=i[0].length,j.push(i[0]),m=b.charAt(l)));switch(m){case"{":if(!k){h++,j.push(m);break};case"}":if(!k){h--,j.push(m),c[++d]=j=[];break};case"(":if(!k){k=!0,j.push(m);break};case")":if(k){k=!1,j.push(m);break};default:j.push(m)}}return h>0&&(x=new A({index:l,type:"Parse",message:"missing closing `}`",filename:a.filename},a)),c.map(function(a){return a.join("")})}([[]]);if(x)return i(x);try{n=new e.Ruleset([],t(this.parsers.primary)),n.root=!0}catch(y){return i(new A(y,a))}n.toCSS=function(b){var f,g,h;return function(f,g){var h=[],i;f=f||{},typeof g=="object"&&!Array.isArray(g)&&(g=Object.keys(g).map(function(a){var b=g[a];return b instanceof e.Value||(b instanceof e.Expression||(b=new e.Expression([b])),b=new e.Value([b])),new e.Rule("@"+a,b,!1,0)}),h=[new e.Ruleset(null,g)]);try{var j=b.call(this,{frames:h}).toCSS([],{compress:f.compress||!1})}catch(k){throw new A(k,a)}if(i=m.imports.error)throw i instanceof A?i:new A(i,a);return f.yuicompress&&d.mode==="node"?c("./cssmin").compressor.cssmin(j):f.compress?j.replace(/(\s)+/g,"$1"):j}}(n.eval);if(f<b.length-1){f=j,u=b.split("\n"),s=(b.slice(0,f).match(/\n/g)||"").length+1;for(var z=f,B=-1;z>=0&&b.charAt(z)!=="\n";z--)B++;x={type:"Parse",message:"Syntax Error on line "+s,index:f,filename:a.filename,line:s,column:B,extract:[u[s-2],u[s-1],u[s]]}}this.imports.queue.length>0?o=function(){i(x,n)}:i(x,n)},parsers:{primary:function(){var a,b=[];while((a=t(this.mixin.definition)||t(this.rule)||t(this.ruleset)||t(this.mixin.call)||t(this.comment)||t(this.directive))||t(/^[\s\n]+/))a&&b.push(a);return b},comment:function(){var a;if(b.charAt(f)!=="/")return;if(b.charAt(f+1)==="/")return new e.Comment(t(/^\/\/.*/),!0);if(a=t(/^\/\*(?:[^*]|\*+[^\/*])*\*+\/\n?/))return new e.Comment(a)},entities:{quoted:function(){var a,c=f,d;b.charAt(c)==="~"&&(c++,d=!0);if(b.charAt(c)!=='"'&&b.charAt(c)!=="'")return;d&&t("~");if(a=t(/^"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'/))return new e.Quoted(a[0],a[1]||a[2],d)},keyword:function(){var a;if(a=t(/^[_A-Za-z-][_A-Za-z0-9-]*/))return e.colors.hasOwnProperty(a)?new e.Color(e.colors[a].slice(1)):new e.Keyword(a)},call:function(){var b,c,d=f;if(!(b=/^([\w-]+|%|progid:[\w\.]+)\(/.exec(k[g])))return;b=b[1].toLowerCase();if(b==="url")return null;f+=b.length;if(b==="alpha")return t(this.alpha);t("("),c=t(this.entities.arguments);if(!t(")"))return;if(b)return new e.Call(b,c,d,a.filename)},arguments:function(){var a=[],b;while(b=t(this.entities.assignment)||t(this.expression)){a.push(b);if(!t(","))break}return a},literal:function(){return t(this.entities.dimension)||t(this.entities.color)||t(this.entities.quoted)},assignment:function(){var a,b;if((a=t(/^\w+(?=\s?=)/i))&&t("=")&&(b=t(this.entity)))return new e.Assignment(a,b)},url:function(){var a;if(b.charAt(f)!=="u"||!t(/^url\(/))return;return a=t(this.entities.quoted)||t(this.entities.variable)||t(this.entities.dataURI)||t(/^[-\w%@$\/.&=:;#+?~]+/)||"",u(")"),new e.URL(a.value||a.data||a instanceof e.Variable?a:new e.Anonymous(a),p.paths)},dataURI:function(){var a;if(t(/^data:/)){a={},a.mime=t(/^[^\/]+\/[^,;)]+/)||"",a.charset=t(/^;\s*charset=[^,;)]+/)||"",a.base64=t(/^;\s*base64/)||"",a.data=t(/^,\s*[^)]+/);if(a.data)return a}},variable:function(){var c,d=f;if(b.charAt(f)==="@"&&(c=t(/^@@?[\w-]+/)))return new e.Variable(c,d,a.filename)},color:function(){var a;if(b.charAt(f)==="#"&&(a=t(/^#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})/)))return new e.Color(a[1])},dimension:function(){var a,c=b.charCodeAt(f);if(c>57||c<45||c===47)return;if(a=t(/^(-?\d*\.?\d+)(px|%|em|rem|pc|ex|in|deg|s|ms|pt|cm|mm|rad|grad|turn)?/))return new e.Dimension(a[1],a[2])},javascript:function(){var a,c=f,d;b.charAt(c)==="~"&&(c++,d=!0);if(b.charAt(c)!=="`")return;d&&t("~");if(a=t(/^`([^`]*)`/))return new e.JavaScript(a[1],f,d)}},variable:function(){var a;if(b.charAt(f)==="@"&&(a=t(/^(@[\w-]+)\s*:/)))return a[1]},shorthand:function(){var a,b;if(!w(/^[@\w.%-]+\/[@\w.-]+/))return;if((a=t(this.entity))&&t("/")&&(b=t(this.entity)))return new e.Shorthand(a,b)},mixin:{call:function(){var c=[],d,g,h,i=f,j=b.charAt(f),k=!1;if(j!=="."&&j!=="#")return;while(d=t(/^[#.](?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+/))c.push(new e.Element(g,d,f)),g=t(">");t("(")&&(h=t(this.entities.arguments))&&t(")"),t(this.important)&&(k=!0);if(c.length>0&&(t(";")||w("}")))return new e.mixin.Call(c,h||[],i,a.filename,k)},definition:function(){var a,c=[],d,g,h,i,j,k=!1;if(b.charAt(f)!=="."&&b.charAt(f)!=="#"||w(/^[^{]*(;|})/))return;q();if(d=t(/^([#.](?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+)\s*\(/)){a=d[1];do{if(b.charAt(f)==="."&&t(/^\.{3}/)){k=!0;break}if(!(h=t(this.entities.variable)||t(this.entities.literal)||t(this.entities.keyword)))break;if(h instanceof e.Variable)if(t(":"))i=u(this.expression,"expected expression"),c.push({name:h.name,value:i});else{if(t(/^\.{3}/)){c.push({name:h.name,variadic:!0}),k=!0;break}c.push({name:h.name})}else c.push({value:h})}while(t(","));u(")"),t(/^when/)&&(j=u(this.conditions,"expected condition")),g=t(this.block);if(g)return new e.mixin.Definition(a,c,g,j,k);r()}}},entity:function(){return t(this.entities.literal)||t(this.entities.variable)||t(this.entities.url)||t(this.entities.call)||t(this.entities.keyword)||t(this.entities.javascript)||t(this.comment)},end:function(){return t(";")||w("}")},alpha:function(){var a;if(!t(/^\(opacity=/i))return;if(a=t(/^\d+/)||t(this.entities.variable))return u(")"),new e.Alpha(a)},element:function(){var a,b,c,d;c=t(this.combinator),a=t(/^(?:\d+\.\d+|\d+)%/)||t(/^(?:[.#]?|:*)(?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+/)||t("*")||t(this.attribute)||t(/^\([^)@]+\)/),a||t("(")&&(d=t(this.entities.variable))&&t(")")&&(a=new e.Paren(d));if(a)return new e.Element(c,a,f);if(c.value&&c.value.charAt(0)==="&")return new e.Element(c,null,f)},combinator:function(){var a,c=b.charAt(f);if(c===">"||c==="+"||c==="~"){f++;while(b.charAt(f)===" ")f++;return new e.Combinator(c)}if(c==="&"){a="&",f++,b.charAt(f)===" "&&(a="& ");while(b.charAt(f)===" ")f++;return new e.Combinator(a)}return b.charAt(f-1)===" "?new e.Combinator(" "):new e.Combinator(null)},selector:function(){var a,c,d=[],g,h;if(t("("))return a=t(this.entity),u(")"),new e.Selector([new e.Element("",a,f)]);while(c=t(this.element)){g=b.charAt(f),d.push(c);if(g==="{"||g==="}"||g===";"||g===",")break}if(d.length>0)return new e.Selector(d)},tag:function(){return t(/^[a-zA-Z][a-zA-Z-]*[0-9]?/)||t("*")},attribute:function(){var a="",b,c,d;if(!t("["))return;if(b=t(/^[a-zA-Z-]+/)||t(this.entities.quoted))(d=t(/^[|~*$^]?=/))&&(c=t(this.entities.quoted)||t(/^[\w-]+/))?a=[b,d,c.toCSS?c.toCSS():c].join(""):a=b;if(!t("]"))return;if(a)return"["+a+"]"},block:function(){var a;if(t("{")&&(a=t(this.primary))&&t("}"))return a},ruleset:function(){var b=[],c,d,g;q();while(c=t(this.selector)){b.push(c),t(this.comment);if(!t(","))break;t(this.comment)}if(b.length>0&&(d=t(this.block)))return new e.Ruleset(b,d,a.strictImports);j=f,r()},rule:function(){var a,c,d=b.charAt(f),h,l;q();if(d==="."||d==="#"||d==="&")return;if(a=t(this.variable)||t(this.property)){a.charAt(0)!="@"&&(l=/^([^@+\/'"*`(;{}-]*);/.exec(k[g]))?(f+=l[0].length-1,c=new e.Anonymous(l[1])):a==="font"?c=t(this.font):c=t(this.value),h=t(this.important);if(c&&t(this.end))return new e.Rule(a,c,h,i);j=f,r()}},"import":function(){var a,b,c=f;if(t(/^@import\s+/)&&(a=t(this.entities.quoted)||t(this.entities.url))){b=t(this.mediaFeatures);if(t(";"))return new e.Import(a,p,b,c)}},mediaFeature:function(){var a,b,c=[];do if(a=t(this.entities.keyword))c.push(a);else if(t("(")){b=t(this.property),a=t(this.entity);if(!t(")"))return null;if(b&&a)c.push(new e.Paren(new e.Rule(b,a,null,f,!0)));else if(a)c.push(new e.Paren(a));else return null}while(a);if(c.length>0)return new e.Expression(c)},mediaFeatures:function(){var a,b=[];do if(a=t(this.mediaFeature)){b.push(a);if(!t(","))break}else if(a=t(this.entities.variable)){b.push(a);if(!t(","))break}while(a);return b.length>0?b:null},media:function(){var a,b;if(t(/^@media/)){a=t(this.mediaFeatures);if(b=t(this.block))return new e.Media(b,a)}},directive:function(){var a,c,d,g,h,i;if(b.charAt(f)!=="@")return;if(c=t(this["import"])||t(this.media))return c;if(a=t(/^@page|@keyframes/)||t(/^@(?:-webkit-|-moz-|-o-|-ms-)[a-z0-9-]+/)){g=(t(/^[^{]+/)||"").trim();if(d=t(this.block))return new e.Directive(a+" "+g,d)}else if(a=t(/^@[-a-z]+/))if(a==="@font-face"){if(d=t(this.block))return new e.Directive(a,d)}else if((c=t(this.entity))&&t(";"))return new e.Directive(a,c)},font:function(){var a=[],b=[],c,d,f,g;while(g=t(this.shorthand)||t(this.entity))b.push(g);a.push(new e.Expression(b));if(t(","))while(g=t(this.expression)){a.push(g);if(!t(","))break}return new e.Value(a)},value:function(){var a,b=[],c;while(a=t(this.expression)){b.push(a);if(!t(","))break}if(b.length>0)return new e.Value(b)},important:function(){if(b.charAt(f)==="!")return t(/^! *important/)},sub:function(){var a;if(t("(")&&(a=t(this.expression))&&t(")"))return a},multiplication:function(){var a,b,c,d;if(a=t(this.operand)){while(!w(/^\/\*/)&&(c=t("/")||t("*"))&&(b=t(this.operand)))d=new e.Operation(c,[d||a,b]);return d||a}},addition:function(){var a,c,d,g;if(a=t(this.multiplication)){while((d=t(/^[-+]\s+/)||b.charAt(f-1)!=" "&&(t("+")||t("-")))&&(c=t(this.multiplication)))g=new e.Operation(d,[g||a,c]);return g||a}},conditions:function(){var a,b,c=f,d;if(a=t(this.condition)){while(t(",")&&(b=t(this.condition)))d=new e.Condition("or",d||a,b,c);return d||a}},condition:function(){var a,b,c,d,g=f,...
[truncated message content] |
|
From: <os...@us...> - 2013-04-28 19:37:14
|
Revision: 4726
http://sourceforge.net/p/oscss/svn/4726
Author: oscim
Date: 2013-04-28 19:37:10 +0000 (Sun, 28 Apr 2013)
Log Message:
-----------
Fix html myaccount menu
Fix coquille
Modified Paths:
--------------
branches/2.1.1/catalog/checkout.php
branches/2.1.1/catalog/common/classes/order.php
branches/2.1.1/catalog/includes/classes/core_page/checkout.php
branches/2.1.1/catalog/includes/classes/drivers/page/GabaritTemplate.php
branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.myaccount.gab
Modified: branches/2.1.1/catalog/checkout.php
===================================================================
--- branches/2.1.1/catalog/checkout.php 2013-04-27 20:02:29 UTC (rev 4725)
+++ branches/2.1.1/catalog/checkout.php 2013-04-28 19:37:10 UTC (rev 4726)
@@ -34,8 +34,6 @@
$page->is_registered();
-// var_dump($Etape);
-
if(isset($ACA->modules[$Etape])) {
$BeforeProcess=$ACA->modules[$Etape]->BeforeProcess();
@@ -50,7 +48,6 @@
$page->javascript->add_framework("ext/jquery/jquery.min.js");
$page->javascript->add_script("ext/jquery/jquery.validate.min.js", array('sort'=>30));
-// var_dump($page->path_gabarit());
include($page->path_gabarit());
Modified: branches/2.1.1/catalog/common/classes/order.php
===================================================================
--- branches/2.1.1/catalog/common/classes/order.php 2013-04-27 20:02:29 UTC (rev 4725)
+++ branches/2.1.1/catalog/common/classes/order.php 2013-04-28 19:37:10 UTC (rev 4726)
@@ -117,7 +117,7 @@
*/
function query($order_id) {
global $languages_id,$currencies;
-var_dump(__function__);
+
$order_id = tep_db_prepare_input($order_id);
$sql="select orders_id,orders_prefix,customers_id,customers_name, customers_company, customers_street_address, customers_suburb, customers_city, customers_postcode, customers_state, customers_country, o.customers_telephone, o.customers_email_address, customers_address_format_id, customers_group_name, delivery_name, delivery_company, delivery_street_address, delivery_suburb, delivery_city, delivery_postcode, delivery_state, delivery_country, delivery_address_format_id, billing_name, billing_company, billing_street_address, billing_suburb, 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, total_weight,orders_date_finished, class_payment, class_shipping ".((self::$mode)?" ,facture_id ,holding_origin_id ":'')." from " . self::$tables['ORDERS'] . " o left join " . TABLE_CUSTOMERS . " using(customers_id) left join " . TABLE_CUSTOMERS_GROUPS . " using(customers_group_id) where orders_id = '" . (int)$order_id . "'";
@@ -267,7 +267,6 @@
*/
public function cart() {
-var_dump(__function__);
global $customer_id, $sendto, $billto, $cart, $languages_id, $currency, $currencies, $shipping, $payment,$tax_address,$coupon_sav, $shipping_mod, $shipping_modules;
$this->content_type = $cart->get_content_type();
Modified: branches/2.1.1/catalog/includes/classes/core_page/checkout.php
===================================================================
--- branches/2.1.1/catalog/includes/classes/core_page/checkout.php 2013-04-27 20:02:29 UTC (rev 4725)
+++ branches/2.1.1/catalog/includes/classes/core_page/checkout.php 2013-04-28 19:37:10 UTC (rev 4726)
@@ -51,27 +51,21 @@
if($step !=false) {
if($step == 'init'){
-// var_dump($step);
+
$this->ResetProcess();
}
elseif(isset($this->modules['Pr'.$step])){
- // var_dump('Pr'.$step);
$this->modules['Pr'.$step]->ResetProcess();
- // exit;
}
}
-// var_dump( $this->etape);
-// var_dump( $this->process);
$etape = $this->ChkBeforeProcess();
/// force add etape confirmation and success
// $etape['PrConfirmation'] = true ;
// $etape['PrSuccess'] = true ;
-// var_dump($etape);
-
$i = 0;
foreach($etape as $key=>$row)
$this->etape[$i++] = $key;
@@ -102,13 +96,11 @@
@param $key string name etape current
*/
public function GetCurrentEtape($key=''){
-// var_dump($this->process);
+
foreach($this->process as $k=>$row)
if($row)
return $this->etape[$k];
-// var_dump( $this->etape);
-// var_dump( $this->process);
// if not found force reload step 0
// return $this->etape[0];
// tep_redirect(tep_href_link('checkout.php'/*FILENAME_CHECKOUT_PAYMENT*/, 'step=init', 'SSL'));
Modified: branches/2.1.1/catalog/includes/classes/drivers/page/GabaritTemplate.php
===================================================================
--- branches/2.1.1/catalog/includes/classes/drivers/page/GabaritTemplate.php 2013-04-27 20:02:29 UTC (rev 4725)
+++ branches/2.1.1/catalog/includes/classes/drivers/page/GabaritTemplate.php 2013-04-28 19:37:10 UTC (rev 4726)
@@ -75,6 +75,7 @@
}
elseif(isset($_GET['cPath'])){
$cPath =$_GET['cPath'];
+
$prev = array();
if(strpos($cPath,'_')>0){
// $suffixe[]='c_'.substr($cPath, 0, strpos($cPath,'_')).'.childs';
@@ -92,7 +93,7 @@
}
-
+
// reel normal page
$reel = substr($page->page['content'],0,-4);
$basename = array(
@@ -132,45 +133,7 @@
// return ;/**/
-return ;
-// if (isset($_GET['popup']) && parent::TestFile($path.'popup.php') )
-// $page->page['gabarit']='popup.php';
-// // type products
-// elseif($page->page['type']=='product' && parent::TestFile($path.sprintf($format_file,$p_red,'type_'.$page->page['var']['product_info']['type'])) )
-// $page->page['gabarit']=sprintf($format_file,$p_red,'type_'.$page->page['var']['product_info']['type']);
-// elseif($page->page['type']=='product' && parent::TestFile($path.sprintf($format_file,'template','type_'.$page->page['var']['product_info']['type'])) )
-// $page->page['gabarit']=sprintf($format_file,'template','type_'.$page->page['var']['product_info']['type']);
-// //page
-// elseif(isset($suffixe) && parent::TestFile($path.sprintf($format_file,$p_red,$suffixe)) )
-// $page->page['gabarit']=sprintf($format_file,$p_red,$suffixe);
-// elseif(isset($suffixe) && parent::TestFile($path.sprintf($format_file,'template',$suffixe)) )
-// $page->page['gabarit']=sprintf($format_file,'template',$suffixe) ;
-// elseif(parent::TestFile($path.$page->page['content']))
-// $page->page['gabarit']=$page->page['content'] ;
-// // class
-// elseif(isset($suffixe) && parent::TestFile($path.$page->page['class'].'.'.sprintf($format_file,$p_red,$suffixe) ))
-// $page->page['gabarit']=$page->page['class'].'.'.sprintf($format_file,$p_red,$suffixe) ;
-// elseif(parent::TestFile($path.$page->page['class'].'.'.$page->page['content'] ))
-// $page->page['gabarit']=$page->page['class'].'.'.$page->page['content'] ;
-// elseif(isset($suffixe) && parent::TestFile($path.$page->page['class'].'.'.sprintf($format_file,'template',$suffixe) ))
-// $page->page['gabarit']=$page->page['class'].'.'.sprintf($format_file,'template',$suffixe) ;
-// elseif(parent::TestFile($path.$page->page['class'].'.'.'template.php' ))
-// $page->page['gabarit']=$page->page['class'].'.'.'template.php' ;
-// // type
-// elseif(isset($suffixe) && parent::TestFile($path.$page->page['type'].'.'.sprintf($format_file,$p_red,$suffixe) ))
-// $page->page['gabarit']=$page->page['type'].'.'.sprintf($format_file,$p_red,$suffixe) ;
-// elseif(parent::TestFile($path.$page->page['type'].'.'.$page->page['content'] ))
-// $page->page['gabarit']=$page->page['type'].'.'.$page->page['content'] ;
-// elseif(isset($suffixe) && parent::TestFile($path.$page->page['type'].'.'.sprintf($format_file,'template',$suffixe) ))
-// $page->page['gabarit']=$page->page['type'].'.'.sprintf($format_file,'template',$suffixe) ;
-// elseif(parent::TestFile($path.$page->page['type'].'.'.'template.php' ))
-// $page->page['gabarit']=$page->page['type'].'.'.'template.php' ;
-// // base
-// elseif(parent::TestFile($path .'template.php'))
-// $page->page['gabarit']='template.php';
-// else die(__('object page (lg '.__LINE__.') FATAL ERROR: the gabarit template not found!'));
-//
-// parent::$GlobalCache['gabarit']=$page->page['gabarit'];
+ return ;
}
@@ -202,10 +165,10 @@
$page->page['type']='popup';
}elseif (in_array(substr($page->page['content'],0,7), array('account','address')) || in_array(substr(basename($_SERVER['SCRIPT_NAME']),0,-4), array('account','address')) ) {
$page->page['type']='account';
- }elseif (substr($page->page['content'],0,8) =='checkout') {
+ }elseif (substr($page->page['content'],0,8) =='checkout' || in_array(substr($page->page['content'],0,6) , array('shoppi')) ) {
$page->page['type']='checkout';
- }elseif (in_array(substr($page->page['content'],0,6) , array('shoppi'))) {
- $page->page['type']='cart';
+// }elseif (in_array(substr($page->page['content'],0,6) , array('shoppi'))) {
+// $page->page['type']='cart';
}elseif (substr($page->page['content'],0,9) =='index_cat') {
$page->page['type']='listing_cat';
}
Modified: branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.myaccount.gab
===================================================================
--- branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.myaccount.gab 2013-04-27 20:02:29 UTC (rev 4725)
+++ branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.myaccount.gab 2013-04-28 19:37:10 UTC (rev 4726)
@@ -14,31 +14,34 @@
$ModuleAccount = account::getInstance();
$module=$page->_call('account','ret_modules');
-// var_dump($account);
+
?>
- <h3><?php echo __('my account title'); ?></h3>
- <ul>
- <li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, 'action=edit', 'SSL') . '">' . __('my account information') . '</a>'; ?></li>
- <li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, 'action=password', 'SSL') . '">' . __('my account password') . '</a>'; ?></li>
- <li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, 'action=newsletters', 'SSL') . '">' . __('email notifications newsletters') . '</a>'; ?></li>
- <?php foreach($ModuleAccount->CstrMenu() as $k=>$aca_mod) : ?>
- <!-- dynamic myaccount menu -->
- <?php if($aca_mod->pile =='myaccount') : ?>
- <?php foreach($aca_mod->conteneur as $row) : /*print_r($row); */ ?>
- <li>
- <a href="<?php echo $row->href; ?>"><?php echo unhtmlentities($row->title); ?></a>
- </li>
- <?php endforeach; ?>
- <?php endif; ?>
- <?php endforeach; ?>
- <li><?php echo '<a href="' . tep_href_link(FILENAME_LOGOFF, '', 'NONSSL') . '">' .__('text logoff') . '</a>'; ?></li>
- </ul>
+<ul>
+ <li>
+ <h3><?php echo __('my account title'); ?></h3>
+ <ul>
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, 'action=edit', 'SSL') . '">' . __('my account information') . '</a>'; ?></li>
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, 'action=password', 'SSL') . '">' . __('my account password') . '</a>'; ?></li>
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, 'action=newsletters', 'SSL') . '">' . __('email notifications newsletters') . '</a>'; ?></li>
+ <?php foreach($ModuleAccount->CstrMenu() as $k=>$aca_mod) : ?>
+ <!-- dynamic myaccount menu -->
+ <?php if($aca_mod->pile =='myaccount') : ?>
+ <?php foreach($aca_mod->conteneur as $row) : /*print_r($row); */ ?>
+ <li>
+ <a href="<?php echo $row->href; ?>"><?php echo unhtmlentities($row->title); ?></a>
+ </li>
+ <?php endforeach; ?>
+ <?php endif; ?>
+ <?php endforeach; ?>
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_LOGOFF, '', 'NONSSL') . '">' .__('text logoff') . '</a>'; ?></li>
+ </ul>
+ </li>
<?php //if($account['customers_newsletter'] > 0 || @$account['global_product_notifications'] > 0 ) : ?>
- <?php if($account->customers_newsletter > 0 || $account->global_product_notifications > 0 ) : ?>
+ <?php if((int)$account['customers_newsletter'] > 0 || (int)$account['global_product_notifications'] > 0 ) : ?>
<!-- dynamic notification menu -->
- <div class="contentBox myEmail">
+ <li class="contentBox myEmail">
<h3><?php echo __('email notifications title'); ?></h3>
<ul>
<?php foreach($ModuleAccount->CstrMenu() as $k=>$aca_mod) : ?>
@@ -51,5 +54,6 @@
<?php endif; ?>
<?php endforeach; ?>
</ul>
- </div>
- <?php endif; ?>
\ No newline at end of file
+ </li>
+ <?php endif; ?>
+</ul>
\ 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...> - 2013-04-27 20:02:33
|
Revision: 4725
http://sourceforge.net/p/oscss/svn/4725
Author: oscim
Date: 2013-04-27 20:02:29 +0000 (Sat, 27 Apr 2013)
Log Message:
-----------
Add colum for report option_value_id and option_id
Added Paths:
-----------
branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_holding_orders_products_attributes.sql
branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_orders_products_attributes.sql
Added: branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_holding_orders_products_attributes.sql
===================================================================
--- branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_holding_orders_products_attributes.sql (rev 0)
+++ branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_holding_orders_products_attributes.sql 2013-04-27 20:02:29 UTC (rev 4725)
@@ -0,0 +1,20 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+
+
+
+ALTER TABLE osc_holding_orders_products_attributes ADD products_options_id INT( 11 ) NOT NULL AFTER orders_products_id ,
+ADD products_options_values_id INT( 11 ) NOT NULL AFTER products_options_id
+
+
Added: branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_orders_products_attributes.sql
===================================================================
--- branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_orders_products_attributes.sql (rev 0)
+++ branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_orders_products_attributes.sql 2013-04-27 20:02:29 UTC (rev 4725)
@@ -0,0 +1,20 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+
+
+
+ALTER TABLE osc_orders_products_attributes ADD products_options_id INT( 11 ) NOT NULL AFTER orders_products_id ,
+ADD products_options_values_id INT( 11 ) NOT NULL AFTER products_options_id
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-04-27 20:01:05
|
Revision: 4724
http://sourceforge.net/p/oscss/svn/4724
Author: oscim
Date: 2013-04-27 20:01:02 +0000 (Sat, 27 Apr 2013)
Log Message:
-----------
Fix service save in process
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/modules/pages/orders.php
branches/2.1.1/catalog/common/classes/order.php
branches/2.1.1/catalog/includes/classes/checkout_process.php
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/orders.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/orders.php 2013-04-27 15:10:11 UTC (rev 4723)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/orders.php 2013-04-27 20:01:02 UTC (rev 4724)
@@ -841,13 +841,13 @@
'status'=>(int)$_GET['flag'] ,
);
- if( ($_GET['flag'] == '1') && ) {
- $myarray['date_start']=date('Y-m-d H:i:s');;
- $myarray['date_end']=date('Y-m-d', strtotime('+'.(int)$optionContract['povc_duration'].' '.(string)$optionContract['povc_unit']));
- $myarray['date_revival']=date('Y-m-d', strtotime('+'.(int)($optionContract['povc_duration']*0.2).' '.(string)$optionContract['povc_unit']));
+// if( ($_GET['flag'] == '1') && ) {
+// $myarray['date_start']=date('Y-m-d H:i:s');;
+// $myarray['date_end']=date('Y-m-d', strtotime('+'.(int)$optionContract['povc_duration'].' '.(string)$optionContract['povc_unit']));
+// $myarray['date_revival']=date('Y-m-d', strtotime('+'.(int)($optionContract['povc_duration']*0.2).' '.(string)$optionContract['povc_unit']));
+//
+// }
- }
-
if(substr($res->date_start,0,4) <'2000')
$myarray['date_start']=date('Y-m-d H:i:s') ;
Modified: branches/2.1.1/catalog/common/classes/order.php
===================================================================
--- branches/2.1.1/catalog/common/classes/order.php 2013-04-27 15:10:11 UTC (rev 4723)
+++ branches/2.1.1/catalog/common/classes/order.php 2013-04-27 20:01:02 UTC (rev 4724)
@@ -117,7 +117,7 @@
*/
function query($order_id) {
global $languages_id,$currencies;
-
+var_dump(__function__);
$order_id = tep_db_prepare_input($order_id);
$sql="select orders_id,orders_prefix,customers_id,customers_name, customers_company, customers_street_address, customers_suburb, customers_city, customers_postcode, customers_state, customers_country, o.customers_telephone, o.customers_email_address, customers_address_format_id, customers_group_name, delivery_name, delivery_company, delivery_street_address, delivery_suburb, delivery_city, delivery_postcode, delivery_state, delivery_country, delivery_address_format_id, billing_name, billing_company, billing_street_address, billing_suburb, 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, total_weight,orders_date_finished, class_payment, class_shipping ".((self::$mode)?" ,facture_id ,holding_origin_id ":'')." from " . self::$tables['ORDERS'] . " o left join " . TABLE_CUSTOMERS . " using(customers_id) left join " . TABLE_CUSTOMERS_GROUPS . " using(customers_group_id) where orders_id = '" . (int)$order_id . "'";
@@ -228,14 +228,15 @@
'exchange_id' => $orders_products['products_exchanged_id'] );
$subindex = 0;
-// $attributes_query = tep_db_query("select products_options_id, products_options_values_id, products_options, products_options_values, options_values_price, price_prefix from " .self::$tables['ATTRIBUTES'] . " where orders_id = '" . (int)$order_id . "' and orders_products_id = '" . (int)$orders_products['orders_products_id'] . "'");
- $attributes_query = tep_db_query("select products_options, products_options_values, options_values_price, price_prefix from " .self::$tables['ATTRIBUTES'] . " where orders_id = '" . (int)$order_id . "' and orders_products_id = '" . (int)$orders_products['orders_products_id'] . "'");
+ $attributes_query = tep_db_query("select pa.products_options_id, pa.products_options_values_id, pa.products_options, pa.products_options_values, pa.options_values_price, pa.price_prefix, po.products_options_type as type from " .self::$tables['ATTRIBUTES'] . " pa LEFT JOIN ".TABLE_PRODUCTS_OPTIONS." po ON(pa.products_options_id = po.products_options_id) where orders_id = '" . (int)$order_id . "' and orders_products_id = '" . (int)$orders_products['orders_products_id'] . "'");
+// $attributes_query = tep_db_query("select products_options, products_options_values, options_values_price, price_prefix from " .self::$tables['ATTRIBUTES'] . " where orders_id = '" . (int)$order_id . "' and orders_products_id = '" . (int)$orders_products['orders_products_id'] . "'");
if (tep_db_num_rows($attributes_query)) {
while ($attributes = tep_db_fetch_array($attributes_query)) {
$this->products[$index]['attributes'][$subindex] = array(
-// 'option_id' => $attributes['products_options_id'],
-// 'value_id' => $attributes['products_options_values_id'],
+ 'option_id' => $attributes['products_options_id'],
+ 'value_id' => $attributes['products_options_values_id'],
+ 'type' => $attributes['type'],
'option' => $attributes['products_options'],
'value' => $attributes['products_options_values'],
@@ -265,6 +266,8 @@
@brief Call Public specific Environement for Generate checkout page
*/
public function cart() {
+
+var_dump(__function__);
global $customer_id, $sendto, $billto, $cart, $languages_id, $currency, $currencies, $shipping, $payment,$tax_address,$coupon_sav, $shipping_mod, $shipping_modules;
$this->content_type = $cart->get_content_type();
@@ -394,7 +397,7 @@
$subindex = 0;
reset($prdct['attributes']);
while (list($option, $value) = each($prdct['attributes'])) {
- $attributes_query = tep_db_query("select popt.products_options_name, popt.products_options_track_stock, poval.products_options_values_name, pa.options_values_price, pa.price_prefix,pa.options_values_weight from " . TABLE_PRODUCTS_OPTIONS . " popt, " . TABLE_PRODUCTS_OPTIONS_VALUES . " poval, " . TABLE_PRODUCTS_ATTRIBUTES . " pa where pa.products_id = '" . (int)$prdct['id'] . "' and pa.options_id = '" . (int)$option . "' and pa.options_id = popt.products_options_id and pa.options_values_id = '" . (int)$value . "' and pa.options_values_id = poval.products_options_values_id and popt.language_id = '" . (int)$languages_id . "' and poval.language_id = '" . (int)$languages_id . "'");
+ $attributes_query = tep_db_query("select popt.products_options_name, popt.products_options_track_stock, poval.products_options_values_name, pa.options_values_price, pa.price_prefix,pa.options_values_weight, popt.products_options_type as type from " . TABLE_PRODUCTS_OPTIONS . " popt, " . TABLE_PRODUCTS_OPTIONS_VALUES . " poval, " . TABLE_PRODUCTS_ATTRIBUTES . " pa where pa.products_id = '" . (int)$prdct['id'] . "' and pa.options_id = '" . (int)$option . "' and pa.options_id = popt.products_options_id and pa.options_values_id = '" . (int)$value . "' and pa.options_values_id = poval.products_options_values_id and popt.language_id = '" . (int)$languages_id . "' and poval.language_id = '" . (int)$languages_id . "'");
$attributes = tep_db_fetch_array($attributes_query);
if(isset($prdct['attributes_values'][$option]) ) {
@@ -403,6 +406,7 @@
}
$this->products[$index]['attributes'][$subindex] = array('option' => $attributes['products_options_name'],
'value' => $attributes['products_options_values_name'],
+ 'type' => $attributes['type'],
'option_id' => $option,
'value_id' => $value,
'prefix' => $attributes['price_prefix'],
Modified: branches/2.1.1/catalog/includes/classes/checkout_process.php
===================================================================
--- branches/2.1.1/catalog/includes/classes/checkout_process.php 2013-04-27 15:10:11 UTC (rev 4723)
+++ branches/2.1.1/catalog/includes/classes/checkout_process.php 2013-04-27 20:01:02 UTC (rev 4724)
@@ -62,7 +62,7 @@
/*
Selection Holding /orders
*/
- self::$mode=(tep_not_null($table)?false:true);
+ self::$mode=((strlen($table)>0)?false:true);
$table=((!self::$mode)? '_'.strtoupper($table) : '');
@@ -163,8 +163,8 @@
@brief Chargement dans le fin du process
This function call in pre-process and process
*/
- public function in_process_finish(){
- global $page, $checkout_process,$mode;
+ public function in_process_finish($order){
+ global $order, $page, $checkout_process,$mode;
// transport var for childs loop modules
$checkout_process = $this;
$mode=self::$mode;
@@ -174,7 +174,7 @@
foreach ($this->modules as $key=>$module) {
if (($module->enabled) and (method_exists($key, 'in_process_finish'))) {
$funct='in_process_finish';
- $result[$key]=$this->modules[$key]->$funct();
+ $result[$key]=$this->modules[$key]->$funct($order);
}
}
@@ -315,7 +315,7 @@
* @param $order object orders|null
*/
public function process_exe($order_totals,$order=''){
- global $customer_id, $currencies;
+ global $customer_id, $currencies,$order;
$ip = tep_get_ip_address();
$total_weight='';
@@ -421,18 +421,18 @@
// $products_ordered .= $order->products[$i]['qty'] . ' x ' . $order->products[$i]['name'] . ' (' . $order->products[$i]['model'] . ') = ' . $currencies->display_price($order->products[$i]['final_price'], $order->products[$i]['tax'], $order->products[$i]['qty']) . $products_ordered_attributes . "\n";
}
-// exit;
+
/*
Force reload order for obtain rowid line
*/
- $page = Page::getInstance();
- $order = new order((int)self::$Id);
- $page->add_object('order',$order);
+// $page = Page::getInstance();
+// $order = new order((int)self::$Id);
+
/**
Before process module ACA
*/
- $this->in_process_finish();
+ $this->in_process_finish(self::$Id);
/**
Fin pre commande
@@ -539,11 +539,13 @@
$order_products_id = $res2->__get('insertId');
- $attributes_query = tep_db_query("select products_options, products_options_values, options_values_price, price_prefix from " . TABLE_HOLDING_ORDERS_PRODUCTS_ATTRIBUTES . " where orders_id = '" . (int)$pre_order_id . "' and orders_products_id = '" . (int)$orders_products['orders_products_id'] . "'");
+ $attributes_query = tep_db_query("select products_options_id, products_options_values_id, products_options, products_options_values, options_values_price, price_prefix from " . TABLE_HOLDING_ORDERS_PRODUCTS_ATTRIBUTES . " where orders_id = '" . (int)$pre_order_id . "' and orders_products_id = '" . (int)$orders_products['orders_products_id'] . "'");
if (tep_db_num_rows($attributes_query)) {
while ($attributes = tep_db_fetch_array($attributes_query)) {
$sql_data_array1 = array('orders_id' => (int)$order_id,
'orders_products_id' => (int)$order_products_id,
+ 'products_options_id' => tep_db_input($attributes['products_options_id']),
+ 'products_options_values_id' => tep_db_input($attributes['products_options_values_id']),
'products_options' => tep_db_input($attributes['products_options']),
'products_options_values' => tep_db_input($attributes['products_options_values']),
'price_prefix' => tep_db_input($attributes['price_prefix']),
@@ -573,20 +575,15 @@
tep_db_query("delete from " . TABLE_CUSTOMERS_BASKET . " where customers_id = '" . (int)$order['customers_id'] . "'");
tep_db_query("delete from " . TABLE_CUSTOMERS_BASKET_ATTRIBUTES . " where customers_id = '" . (int)$order['customers_id'] . "'");
- /*
- Force reload order for obtain rowid line
- */
- $page = Page::getInstance();
- $order = new order((int)$order_id);
- $page->add_object('order',$order);
+
+
}
- /**
+ /**
Before process module ACA
- */
- $r = $this->in_process_finish();
-
+ */
+ $r = $this->in_process_finish();
$this->email_confirm_order($order_id);
@@ -815,6 +812,8 @@
private function insert_order_product_attribut($order_products_id,$attributes_values){
$sql_data_array = array('orders_id' => (int)$this->the_order_id,
'orders_products_id' => (int)$order_products_id,
+ 'products_options_id' => tep_db_input($attributes_values['products_options_id']),
+ 'products_options_values_id' => tep_db_input($attributes_values['products_options_values_id']),
'products_options' => tep_db_input($attributes_values['products_options_name']),
'products_options_values' => tep_db_input($attributes_values['products_options_values_name']),
'options_values_price' => tep_db_input($attributes_values['options_values_price']),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-04-27 15:10:15
|
Revision: 4723
http://sourceforge.net/p/oscss/svn/4723
Author: oscim
Date: 2013-04-27 15:10:11 +0000 (Sat, 27 Apr 2013)
Log Message:
-----------
adjust table service for unique key
Modified Paths:
--------------
branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_services.sql
Added Paths:
-----------
branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_services.key.sql
branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_services.sql
Modified: branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_services.sql
===================================================================
--- branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_services.sql 2013-04-27 14:58:15 UTC (rev 4722)
+++ branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_services.sql 2013-04-27 15:10:11 UTC (rev 4723)
@@ -16,18 +16,21 @@
-- Structure de la table osc_services
--
+
CREATE TABLE IF NOT EXISTS osc_services (
row_id int(11) NOT NULL AUTO_INCREMENT,
customers_id int(11) NOT NULL,
orders_id int(11) NOT NULL,
orders_products_id int(11) NOT NULL,
+ ref varchar(64) NOT NULL,
status int(1) NOT NULL,
date_added datetime NOT NULL,
- date_start datetime NULL,
- date_end datetime NULL,
+ date_start datetime DEFAULT NULL,
+ date_end datetime DEFAULT NULL,
duration int(10) NOT NULL,
duration_unit varchar(10) NOT NULL,
date_revival datetime NOT NULL,
auto_retry int(1) NOT NULL,
- PRIMARY KEY (row_id)
-) DEFAULT CHARSET=utf8;
+ PRIMARY KEY (row_id),
+ UNIQUE KEY orders_products_id (orders_products_id,ref)
+) CHARSET=utf8 ;
\ No newline at end of file
Added: branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_services.key.sql
===================================================================
--- branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_services.key.sql (rev 0)
+++ branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_services.key.sql 2013-04-27 15:10:11 UTC (rev 4723)
@@ -0,0 +1,22 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+
+
+
+ALTER TABLE osc_services ADD UNIQUE (
+orders_products_id ,
+ref
+);
+
+
Added: branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_services.sql
===================================================================
--- branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_services.sql (rev 0)
+++ branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_services.sql 2013-04-27 15:10:11 UTC (rev 4723)
@@ -0,0 +1,19 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+
+
+
+ALTER TABLE osc_services ADD ref varchar(64) NOT NULL NULL AFTER orders_products_id;
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-04-27 14:58:19
|
Revision: 4722
http://sourceforge.net/p/oscss/svn/4722
Author: oscim
Date: 2013-04-27 14:58:15 +0000 (Sat, 27 Apr 2013)
Log Message:
-----------
Fix restore cart but item is customers text
Modified Paths:
--------------
branches/2.1.1/catalog/common/classes/shoppingCart.php
Modified: branches/2.1.1/catalog/common/classes/shoppingCart.php
===================================================================
--- branches/2.1.1/catalog/common/classes/shoppingCart.php 2013-04-27 13:36:42 UTC (rev 4721)
+++ branches/2.1.1/catalog/common/classes/shoppingCart.php 2013-04-27 14:58:15 UTC (rev 4722)
@@ -37,6 +37,8 @@
function __construct() {
$this->reset();
+
+
}
/**
@@ -117,18 +119,24 @@
if (!tep_session_is_registered('customer_id')) return false;
$DB=Database::getInstance();
+ if (is_array($this->contents))
+ $content = $this->contents;
+
+ // reset per-session cart contents, but not the database contents
+ $this->reset(false);
+
// insert current cart contents in database
- if (is_array($this->contents)) {
- reset($this->contents);
- while (list($products_id, ) = each($this->contents)) {
+ if (is_array($content)) {
+ reset($content);
+ while (list($products_id, ) = each($content)) {
$qty = $this->contents[$products_id]['qty'];
$product_query = $DB->query($sql="select products_id from " . TABLE_CUSTOMERS_BASKET . " where customers_id = '" . (int)$customer_id . "' and products_id = '" . tep_db_input($products_id) . "'");
if (!$product_query->__get('numRows')) {
$DB->query("insert into " . TABLE_CUSTOMERS_BASKET . " (customers_id, products_id, customers_basket_quantity, customers_basket_date_added) values ('" . (int)$customer_id . "', '" . tep_db_input($products_id) . "', '" . $qty . "', '" . date('Ymd') . "')");
- if (isset($this->contents[$products_id]['attributes'])) {
- reset($this->contents[$products_id]['attributes']);
- while (list($option, $value) = each($this->contents[$products_id]['attributes'])) {
+ if (isset($content[$products_id]['attributes'])) {
+ reset($content[$products_id]['attributes']);
+ while (list($option, $value) = each($content[$products_id]['attributes'])) {
$DB->query("insert into " . TABLE_CUSTOMERS_BASKET_ATTRIBUTES . " (customers_id, products_id, products_options_id, products_options_value_id) values ('" . (int)$customer_id . "', '" . tep_db_input($products_id) . "', '" . (int)$option . "', '" . (int)$value . "')");
}
}
@@ -138,21 +146,23 @@
}
}
- // reset per-session cart contents, but not the database contents
- $this->reset(false);
+
$products_query = $DB->query("select products_id, customers_basket_quantity from " . TABLE_CUSTOMERS_BASKET . " where customers_id = '" . (int)$customer_id . "'");
while ($products = $products_query->fetchAssoc()) {
$this->contents[$products['products_id']] = array('qty' => $products['customers_basket_quantity']);
// attributes
- $attributes_query = $DB->query("select products_options_id, products_options_value_id, products_options_value_text from " . TABLE_CUSTOMERS_BASKET_ATTRIBUTES . " where customers_id = '" . (int)$customer_id . "' and products_id = '" . tep_db_input($products['products_id']) . "'");
+ $sql="select cba.products_options_id, cba.products_options_value_id, cba.products_options_value_text, po.products_options_type as type from " . TABLE_CUSTOMERS_BASKET_ATTRIBUTES . " cba LEFT JOIN ".TABLE_PRODUCTS_OPTIONS." po ON(cba.products_options_id = po.products_options_id ) where cba.customers_id = '" . (int)$customer_id . "' and cba.products_id = '" . tep_db_input($products['products_id']) . "' ";
+ $attributes_query = $DB->query($sql);
while ($attributes = $attributes_query->fetchAssoc()) {
- // specific mode txt add by customer in product attributes
- if ($attributes['products_options_value_id'] == PRODUCTS_OPTIONS_VALUE_TEXT_ID)
- $this->contents[$products['products_id']]['attributes'][$attributes['products_options_id']] = $attributes['products_options_value_text'];
+
+ // specific mode txt type option product
+ if ($attributes['type'] == 2){
+ $this->contents[$products['products_id']]['attributes'][$attributes['products_options_id']] = $attributes['products_options_value_id'];
+ $this->contents[$products['products_id']]['attributes_values'][$attributes['products_options_id']] = $attributes['products_options_value_text'];
// specific mode multi value for one option
- elseif( $attributes['products_options_value_id'] === 0)
+ }elseif( $attributes['products_options_value_id'] === 0)
$this->contents[$products['products_id']]['attributes'][$attributes['products_options_id']] = explode(',',$attributes['products_options_value_text']);
// normal
else
@@ -379,6 +389,8 @@
Utilisé dans tous les recap panier/order/checkcout
*/
function get_products() {
+// print_r($this->contents);
+// exit;
global $languages_id,$price;
if (!is_array($this->contents)) return false;
$products_array = array();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-04-27 13:36:49
|
Revision: 4721
http://sourceforge.net/p/oscss/svn/4721
Author: oscim
Date: 2013-04-27 13:36:42 +0000 (Sat, 27 Apr 2013)
Log Message:
-----------
Fix bug order and dervied services
Fix css datatable border split
Fix copy to in action products
Fix new checkout page and submodule for step process
Modified Paths:
--------------
branches/2.1.1/catalog/Documents/oscss.version.xml
branches/2.1.1/catalog/admin/includes/classes/MLinkTo.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlproduct.php
branches/2.1.1/catalog/admin/includes/gabarit/products/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/featureds.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt
branches/2.1.1/catalog/admin/includes/modules/pages/orders.php
branches/2.1.1/catalog/admin/includes/modules/pages/products.php
branches/2.1.1/catalog/admin/includes/modules/pages/services.php
branches/2.1.1/catalog/admin/includes/template/defaut/definition.less
branches/2.1.1/catalog/admin/includes/template/oscss/definition.less
branches/2.1.1/catalog/checkout.php
branches/2.1.1/catalog/includes/classes/checkout_process.php
branches/2.1.1/catalog/includes/classes/core_page/checkout.php
branches/2.1.1/catalog/includes/modules/checkout/PrCgu.php
branches/2.1.1/catalog/includes/modules/checkout/PrPayment.php
branches/2.1.1/catalog/templates/defaut/includes/content/checkout_cgu.php
Modified: branches/2.1.1/catalog/Documents/oscss.version.xml
===================================================================
--- branches/2.1.1/catalog/Documents/oscss.version.xml 2013-04-23 18:25:12 UTC (rev 4720)
+++ branches/2.1.1/catalog/Documents/oscss.version.xml 2013-04-27 13:36:42 UTC (rev 4721)
@@ -2,7 +2,7 @@
<core>
<version>2.1.1 (beta)</version>
<svn>4707</svn>
- <level>unstable</level>
+ <level>stable</level>
<template_admin>oscss</template_admin>
<urloscssorgtrac>http://sourceforge.net/apps/trac/oscss/changeset/?format=zip&new=SVN_REV_MAX&old=SVN_REV&new_path=trunk%2Fcatalog&old_path=trunk%2Fcatalog</urloscssorgtrac>
Modified: branches/2.1.1/catalog/admin/includes/classes/MLinkTo.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/MLinkTo.php 2013-04-23 18:25:12 UTC (rev 4720)
+++ branches/2.1.1/catalog/admin/includes/classes/MLinkTo.php 2013-04-27 13:36:42 UTC (rev 4721)
@@ -55,7 +55,7 @@
// search current in type for rootlisting
if(in_array(self::$current, explode(',',$row->value))) {
//! @remarks Force load language centralised
- // $oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/pages/'.$key.'s.txt');
+ $oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/pages/'.$key.'s.txt');
self::$RL[$key] = $key;
}
}
@@ -75,7 +75,7 @@
/**
@brief load in html gabarit for construct link to Datatype rootListing
-
+ les elements de langue sont recherché dans les fichier des classes maitres
@param $classname string name support class
@param $action string current action
@param string section param get for redirect after action
@@ -98,7 +98,7 @@
$oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/modules/pages/'.$mkey.'s.txt');
$result[] = array(
- 'title'=> sprintf(__('link %s to %s') , self::$current , $mkey ),
+ 'title'=> sprintf(__('@'.$mkey.' link %s to %s') , self::$current , $mkey ),
'text'=> tep_get_include_contents($mkey.'s/rightto.'.$action),
);
}
Modified: branches/2.1.1/catalog/admin/includes/classes/drivers/sqlproduct.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/drivers/sqlproduct.php 2013-04-23 18:25:12 UTC (rev 4720)
+++ branches/2.1.1/catalog/admin/includes/classes/drivers/sqlproduct.php 2013-04-27 13:36:42 UTC (rev 4721)
@@ -108,6 +108,9 @@
/// Call ACA module put post var
self::$modules->load_post_values($post);
+/**
+ TODO Check des clef des array pour verifier que celle ci existe dans specimen
+*/
if ($action == 'insert_product') {
$sql_data_array = array_merge($sql_data_array, self::$modules->get_insert_table_products());
@@ -258,7 +261,7 @@
// $DB=Database::getInstance();
- $product_query = $DB->query("select pd.products_name, pd.products_description, pd.products_url, p.products_id, p.products_quantity,p.products_type as products_virtual_typeID, p.products_model, p.products_image, p.products_price, p.products_weight, p.track_stock, p.products_date_added, p.products_last_modified, products_date_available, p.products_status, p.products_tax_class_id, p.manufacturers_id,p.products_ordered from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd where p.products_id = pd.products_id ". $sql );
+ $product_query = $DB->query("select pd.products_name, pd.products_description, pd.products_url, p.products_id, p.products_quantity,p.products_quantity_alert,p.products_type as products_virtual_typeID, p.products_model, p.products_image, p.products_price, p.products_weight,p.products_weight_brut, p.track_stock, p.products_date_added, p.products_last_modified, products_date_available, p.products_status, p.products_tax_class_id, p.manufacturers_id,p.products_ordered from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd where p.products_id = pd.products_id ". $sql );
$product = tep_db_fetch_array($product_query);
tep_db_free_result($product_query);
@@ -369,22 +372,33 @@
@return array product empty
*/
public static function Specimen(){
- $par = array('products_name' => '',
- 'products_description' => '',
+ $par = array(
+ 'products_id' => '', // auto incremente
+ 'products_type' => '', // int (0 : default)
+
+ 'products_name' => '', // depend language table
+ 'products_description' => '', // depend language table
'products_url' => '',
- 'products_id' => '',
+
'products_quantity' => '',
+ 'products_quantity_alert' => '',
+
'products_model' => '',
'products_image' => '',
+
'products_price' => '',
+ 'products_tax_class_id' => '',
+
'products_weight' => '',
+ 'products_weight_brut' => '',
+
'products_date_added' => '',
'products_last_modified' => '',
'products_date_available' => '',
- 'products_status' => '',
- 'products_tax_class_id' => '',
+ 'products_status' => 0,
+
'manufacturers_id' => '',
- 'products_ordered' => ''
+ 'products_ordered' => 0
);
return self::CleanKey($par);
@@ -416,11 +430,36 @@
- $product_query = $DB->query("select products_type, products_quantity, products_model, products_image, products_price, products_date_available, products_weight, products_tax_class_id, manufacturers_id from " . TABLE_PRODUCTS . " where products_id = '" . $pid . "'");
+ $product_query = $DB->query($sql = "select products_type, products_quantity, products_model, products_image, products_price, products_date_available, products_weight, products_tax_class_id, manufacturers_id from " . TABLE_PRODUCTS . " where products_id = '" . $pid . "'");
$product = $product_query->fetchAssoc();
- $resobj=$DB->query("insert into " . TABLE_PRODUCTS . " (products_type, products_quantity, products_model,products_image, products_price, products_date_added, products_date_available, products_weight, products_status, products_tax_class_id, manufacturers_id) values ('" . tep_db_input($product['products_type']) . "','" . tep_db_input($product['products_quantity']) . "', '" . tep_db_input($product['products_model']) . "', '" . tep_db_input($product['products_image']) . "', '" . tep_db_input($product['products_price']) . "', now(), " . (empty($product['products_date_available']) ? "null" : "'" . tep_db_input($product['products_date_available']) . "'") . ", '" . tep_db_input($product['products_weight']) . "', '0', '" . (int)$product['products_tax_class_id'] . "', '" . (int)$product['manufacturers_id'] . "')");
+ $sql = "INSERT INTO " . TABLE_PRODUCTS . " (
+ products_type,
+ products_quantity,
+ products_model,
+ products_image,
+ products_price,
+ products_date_added,
+ products_date_available,
+ products_weight,
+ products_status,
+ products_tax_class_id,
+ manufacturers_id
+ ) VALUES (
+ '" . tep_db_input($product['products_type']) . "',
+ '" . tep_db_input($product['products_quantity']) . "',
+ '" . tep_db_input($product['products_model']) . "',
+ '" . tep_db_input($product['products_image']) . "',
+ '" . tep_db_input($product['products_price']) . "',
+ now(),
+ " . (empty($product['products_date_available']) ? "null" : "'" . tep_db_input($product['products_date_available']) . "'") . ",
+ '" . tep_db_input($product['products_weight']) . "', '0',
+ '" . (int)$product['products_tax_class_id'] . "',
+ '" . (int)$product['manufacturers_id'] . "')";
+
+ $resobj=$DB->query( $sql );
+
$dup_products_id = $resobj->__get('insertId');
$description_query = $DB->query("select language_id, products_name, products_description, products_url from " . TABLE_PRODUCTS_DESCRIPTION . " where products_id = '" . $pid . "'");
Modified: branches/2.1.1/catalog/admin/includes/gabarit/products/display_view.edit.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/products/display_view.edit.gab 2013-04-23 18:25:12 UTC (rev 4720)
+++ branches/2.1.1/catalog/admin/includes/gabarit/products/display_view.edit.gab 2013-04-27 13:36:42 UTC (rev 4721)
@@ -172,47 +172,56 @@
<?php endif; ?>
+ <?php if( ! in_array(products::$Info->products_type , explode(',',TYPE_VIRTUAL_PRODUCTS)) ) : // physical product ?>
-
- <?php if( _cst_bool('STOCK_CHECK') && products::CheckClassProduct('CLASS_STOCK')): /** Si Class de stock defini, les prix sont pris en charge par un onglet */ ?>
-
- <fieldset class="block_field">
- <legend><?php echo __('@products text legend stock'); ?></legend>
- <div class="block_input">
- <p>
- <label class="inline"><?php echo __('@products text label stock'); ?></label>
- <?php echo tep_draw_pull_down_menu('track_stock', products::$track_stock , products::$Info->track_stock); ?>
- </p>
- <div id="products_quantity_block">
- <?php if(products::$product_investigation['has_tracked_options'] or products::$product_investigation['stock_entries_count'] > 0) :?>
- <a class="button fancyView iframe" href="<?php echo tep_href_link(FILENAME_STOCK, 'product_id=' . products::$Info->products_id.'&origin='.tep_href_link(products::FILENAME))?>"><?php echo __('txt stock') ?></a>
- <?php else: ?>
- <p>
- <label class="inline" for="products_quantity"><?php echo __('text products quantity'); ?></label>
- <?php echo tep_draw_input_field('products_quantity','', products::$Info->products_quantity, ((products::$Info->track_stock==0)? 'disabled="disabled"' :'') ) ; ?>
- </p>
- <?php endif; ?>
+ <?php if( _cst_bool('STOCK_CHECK') && products::CheckClassProduct('CLASS_STOCK')): /** Si Class de stock defini, les prix sont pris en charge par un onglet */ ?>
+ <fieldset class="block_field">
+ <legend><?php echo __('@products text legend stock'); ?></legend>
+ <div class="block_input">
+ <p>
+ <label class="inline"><?php echo __('@products text label stock'); ?></label>
+ <?php echo tep_draw_pull_down_menu('track_stock', products::$track_stock , products::$Info->track_stock); ?>
+ </p>
+ <div id="products_quantity_block">
+ <?php if(products::$product_investigation['has_tracked_options'] or products::$product_investigation['stock_entries_count'] > 0) :?>
+ <a class="button fancyView iframe" href="<?php echo tep_href_link(FILENAME_STOCK, 'product_id=' . products::$Info->products_id.'&origin='.tep_href_link(products::FILENAME))?>"><?php echo __('txt stock') ?></a>
+ <?php else: ?>
+ <p>
+ <label class="inline" for="products_quantity"><?php echo __('text products quantity'); ?></label>
+ <?php echo tep_draw_input_field('products_quantity','', products::$Info->products_quantity, ((products::$Info->track_stock==0)? 'disabled="disabled"' :'') ) ; ?>
+ </p>
+ <?php endif; ?>
+ </div>
</div>
- </div>
- <p class='textInfo'>
- </p>
- </fieldset>
+ <p class='textInfo'>
+ </p>
+ </fieldset>
+ <?php endif; ?>
- <?php endif; ?>
-
- <fieldset class="block_field">
<?php if(products::CheckClassProduct('CLASS_WEIGHT')): ?>
- <legend><?php echo __('@products text legend shipping'); ?></legend>
- <ul>
- <li class="block_input">
- <label class="inline" for="products_weight" title="<?php echo __('@products text weight help'); ?><"><?php echo __('@products text weight'); ?></label>
- <?php echo tep_draw_input_field('products_weight','', products::$Info->products_weight).' '.UNIT_WEIGHT_NAME; ?>
- </li>
- </ul>
+ <fieldset class="block_field">
+ <legend><?php echo __('@products text legend shipping'); ?></legend>
+ <ul>
+ <li class="block_input">
+ <label class="inline" for="products_weight" title="<?php echo __('@products text weight help'); ?><"><?php echo __('@products text weight'); ?></label>
+ <?php echo tep_draw_input_field('products_weight','', products::$Info->products_weight).' '.UNIT_WEIGHT_NAME; ?>
+ </li>
+ </ul>
+ </fieldset>
<?php endif; ?>
- </fieldset>
+ <?php else: // virtual product ?>
+ <fieldset class="block_field">
+ <legend><?php echo __('@products text legend shipping'); ?></legend>
+ <ul>
+ <li class="block_input">
+ <label class="inline" for="products_weight" title="<?php echo __('@products text weight help'); ?><"><?php echo __('@products text weight'); ?></label>
+ <?php echo tep_draw_input_field('products_weight','', products::$Info->products_weight).' '.UNIT_WEIGHT_NAME; ?>
+ </li>
+ </ul>
+ </fieldset>
+ <?php endif; ?>
</div>
@@ -266,13 +275,22 @@
<?php endif; ?>
</dd>
+ <div id="tabs">
<!-- All LinkTo -->
- <?php foreach(MLinkTo::LoadRightTo(products::$datatype, 'edit' , 'action='.products::$action.'&pID='.@$_GET['pID'] ) as $row): ?>
- <dt class="block_input w_90">
+ <dt class="tabs block_input w_90">
+ <?php $linkto =MLinkTo::LoadRightTo(products::$datatype, 'edit' , 'action='.products::$action.'&pID='.@$_GET['pID'] ); ?>
+ <ul>
+ <?php $j=0;foreach($linkto as $row): $j++; ?>
+ <li><a href="#tabslinkto-<?php echo $j ?>"><?php echo $row['title'] ;?></a></li>
+ <?php endforeach;?>
+ </ul>
+ <?php $j=0;foreach($linkto as $row): $j++; ?>
+ <div id="tabslinkto-<?php echo $j ?>">
<?php echo $row['text'] ;?>
- </dt>
+ </div>
<?php endforeach;?>
+ </dt>
<dd class="block_input button_nav" style="width:95%;">
<?php
Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt 2013-04-23 18:25:12 UTC (rev 4720)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt 2013-04-27 13:36:42 UTC (rev 4721)
@@ -49,9 +49,9 @@
/* rightto */
$lang['@categories txt link to'] = "Catégories" ;
+ $lang['@categorie link %s to %s'] = "Catégories" ;
-
/* other */
$lang['text categories']="Catégories :" ;
$lang['text subcategories']="Sous-catégories :" ;
Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/featureds.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/featureds.txt 2013-04-23 18:25:12 UTC (rev 4720)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/featureds.txt 2013-04-27 13:36:42 UTC (rev 4721)
@@ -54,4 +54,5 @@
/* rightto */
$lang['@featureds txt link to'] = "Mise en avant" ;
+ $lang['@featured link %s to %s'] = "Mise en avant" ;
?>
Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt 2013-04-23 18:25:12 UTC (rev 4720)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt 2013-04-27 13:36:42 UTC (rev 4721)
@@ -214,6 +214,8 @@
/* duplicate products */
$lang['text info copy to intro']="Veuillez choisir une nouvelle catégorie dans laquelle vous souhaitez copier ce produit" ;
$lang['text info heading copy to']="Copier vers" ;
+ $lang['text info current categories']="le produit d'origine appartient à cette catégorie :" ;
+ $lang['text categories']="Copier dans cette catégorie" ;
/* MessageStack */
$lang['@product create products in new link categorie for %s']="Copie réussie du produit" ;
@@ -224,10 +226,12 @@
/* mutliple choose */
+/* Linkto */
+ $lang['link products to featured'] = "Mise en avant" ;
+ $lang['link products to categorie'] = "Catégorie" ;
-
/* general error */
$lang['error catalog image directory not writeable %s']="Erreur : Impossible d'écrire dans le répertoire d'images : %s " ;
$lang['error catalog image directory does not exist %s']="Erreur : Le répertoire d'images n'existe pas : %s " ;
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/orders.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/orders.php 2013-04-23 18:25:12 UTC (rev 4720)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/orders.php 2013-04-27 13:36:42 UTC (rev 4721)
@@ -161,6 +161,7 @@
'text'=>__('orders table heading order id'),
'width'=>'2%',
'class'=>'tcenter',
+ 'default'=>true,
),
// 'CONCAT(o.orders_prefix, o.orders_id) ' => array(
// 'sort'=>true,
@@ -840,6 +841,13 @@
'status'=>(int)$_GET['flag'] ,
);
+ if( ($_GET['flag'] == '1') && ) {
+ $myarray['date_start']=date('Y-m-d H:i:s');;
+ $myarray['date_end']=date('Y-m-d', strtotime('+'.(int)$optionContract['povc_duration'].' '.(string)$optionContract['povc_unit']));
+ $myarray['date_revival']=date('Y-m-d', strtotime('+'.(int)($optionContract['povc_duration']*0.2).' '.(string)$optionContract['povc_unit']));
+
+ }
+
if(substr($res->date_start,0,4) <'2000')
$myarray['date_start']=date('Y-m-d H:i:s') ;
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/products.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/products.php 2013-04-23 18:25:12 UTC (rev 4720)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/products.php 2013-04-27 13:36:42 UTC (rev 4721)
@@ -878,6 +878,7 @@
case 'noedit':
case 'edit':
+ case 'copy':
if(!tep_action_check('edit', self::FILENAME))
tep_redirect(tep_href_link(self::FILENAME));
@@ -951,6 +952,7 @@
@return
*/
public static function GetDBValue(){
+
$DB=Database::getInstance();
@@ -962,6 +964,7 @@
case 'delete':
case 'noedit':
case 'edit':
+ case 'copy_to':
global $languages_id;
if(self::$Id > 0)
@@ -1051,7 +1054,7 @@
/* END Sub module add col */
$query_raw .=" ORDER BY ".((!empty($adjust->sOrder)) ? $adjust->sOrder : ' p.products_date_added DESC ');
-// echo $query_raw;
+
$_split = new splitPageResults($adjust->page, $adjust->rowbyp, $query_raw, $query_numrows);
$_query = $DB->query($query_raw);
@@ -1084,9 +1087,9 @@
*/
case 'noedit':
$action = 'edit';
+ case 'copy_to':
case 'delete':
self::GetDBValue();
- case 'copy_to':
case 'new':
case 'edit':
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/services.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/services.php 2013-04-23 18:25:12 UTC (rev 4720)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/services.php 2013-04-27 13:36:42 UTC (rev 4721)
@@ -707,7 +707,7 @@
$ord['services_id']=$services['row_id'];
$ord['orders_id']=$services['orders_id'];
$ord['customers_id']=tep_customers_row_action($services['customers_id'], array('origin'=>self::FILENAME));
- $ord['date_start']=tep_datetime_short($services['date_start']);
+ $ord['date_start']=( (tep_not_null($services['date_start']) && !in_array($services['date_start'], array('0000-00-00 00:00:00')) ) ? tep_datetime_short($services['date_start']) : '');
$ord['auto_retry']=self::GetServiceAutoRetry($services, false);
$ord['status']=self::GetServiceStatus($services, false);
$ord[0]=$services['row_id'];
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/definition.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/definition.less 2013-04-23 18:25:12 UTC (rev 4720)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/definition.less 2013-04-27 13:36:42 UTC (rev 4721)
@@ -31,6 +31,7 @@
@display_width : 98% ;
+
/* Normal Definition */
@margin: 0.2em;
@padding_base : 0.1em;
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/definition.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/definition.less 2013-04-23 18:25:12 UTC (rev 4720)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/definition.less 2013-04-27 13:36:42 UTC (rev 4721)
@@ -27,7 +27,6 @@
-
/* base dimension */
@display_max_width : 900px;
@display_width : 90% ;
Modified: branches/2.1.1/catalog/checkout.php
===================================================================
--- branches/2.1.1/catalog/checkout.php 2013-04-23 18:25:12 UTC (rev 4720)
+++ branches/2.1.1/catalog/checkout.php 2013-04-27 13:36:42 UTC (rev 4721)
@@ -14,7 +14,7 @@
require('includes/application_top.php');
-// error_reporting(E_ALL);
+error_reporting(E_ALL);
//! chargement order
@@ -34,10 +34,10 @@
$page->is_registered();
+// var_dump($Etape);
+ if(isset($ACA->modules[$Etape])) {
- if(isset($ACA->modules[$Etape])) {
-// var_dump($Etape);
$BeforeProcess=$ACA->modules[$Etape]->BeforeProcess();
}
@@ -50,8 +50,8 @@
$page->javascript->add_framework("ext/jquery/jquery.min.js");
$page->javascript->add_script("ext/jquery/jquery.validate.min.js", array('sort'=>30));
+// var_dump($page->path_gabarit());
-
include($page->path_gabarit());
Modified: branches/2.1.1/catalog/includes/classes/checkout_process.php
===================================================================
--- branches/2.1.1/catalog/includes/classes/checkout_process.php 2013-04-23 18:25:12 UTC (rev 4720)
+++ branches/2.1.1/catalog/includes/classes/checkout_process.php 2013-04-27 13:36:42 UTC (rev 4721)
@@ -79,14 +79,16 @@
*/
foreach(parent::initialise_type('MODULE_CHECKOUT_PROCESS_INSTALLED','checkout') as $class){
$classe = $class;
- $cl[$class]= new $classe();
- $list_mod[$class] = $cl[$class]->sort_order;
- asort($list_mod);
+ if(substr($classe, 0,3) == 'chk'){
+ $cl[$class]= new $classe();
+ $list_mod[$class] = $cl[$class]->sort_order;
+ asort($list_mod);
- foreach($list_mod as $class=>$s){
- $GLOBALS[$class] =$this->modules[$class] =$cl[$class];
- }
- unset($cl);unset($list_mod);
+ foreach($list_mod as $class=>$s){
+ $GLOBALS[$class] =$this->modules[$class] =$cl[$class];
+ }
+ unset($cl);unset($list_mod);
+ }
}
/*if(tep_not_null($order_id))*/ self::$Id=$this->the_order_id=(int)$order_id;
@@ -167,13 +169,16 @@
$checkout_process = $this;
$mode=self::$mode;
+ $result = array();
// loop childs
foreach ($this->modules as $key=>$module) {
if (($module->enabled) and (method_exists($key, 'in_process_finish'))) {
$funct='in_process_finish';
- return $this->modules[$key]->$funct();
+ $result[$key]=$this->modules[$key]->$funct();
}
}
+
+ return $result;
}
@@ -375,7 +380,7 @@
Process class
Enregsitrement des produits
*/
- $order_products_id =$this->insert_order_product($i,$products_stock_attributes,$order);
+ $order->products[$i]['rowid'] = $order_products_id =$this->insert_order_product($i,$products_stock_attributes,$order);
//------insert customer choosen option to order--------
@@ -416,6 +421,13 @@
// $products_ordered .= $order->products[$i]['qty'] . ' x ' . $order->products[$i]['name'] . ' (' . $order->products[$i]['model'] . ') = ' . $currencies->display_price($order->products[$i]['final_price'], $order->products[$i]['tax'], $order->products[$i]['qty']) . $products_ordered_attributes . "\n";
}
+// exit;
+ /*
+ Force reload order for obtain rowid line
+ */
+ $page = Page::getInstance();
+ $order = new order((int)self::$Id);
+ $page->add_object('order',$order);
/**
Before process module ACA
@@ -560,6 +572,13 @@
if(self::$mode){
tep_db_query("delete from " . TABLE_CUSTOMERS_BASKET . " where customers_id = '" . (int)$order['customers_id'] . "'");
tep_db_query("delete from " . TABLE_CUSTOMERS_BASKET_ATTRIBUTES . " where customers_id = '" . (int)$order['customers_id'] . "'");
+
+ /*
+ Force reload order for obtain rowid line
+ */
+ $page = Page::getInstance();
+ $order = new order((int)$order_id);
+ $page->add_object('order',$order);
}
@@ -567,10 +586,8 @@
Before process module ACA
*/
$r = $this->in_process_finish();
+
-
-
-
$this->email_confirm_order($order_id);
//! RETURN
Modified: branches/2.1.1/catalog/includes/classes/core_page/checkout.php
===================================================================
--- branches/2.1.1/catalog/includes/classes/core_page/checkout.php 2013-04-23 18:25:12 UTC (rev 4720)
+++ branches/2.1.1/catalog/includes/classes/core_page/checkout.php 2013-04-27 13:36:42 UTC (rev 4721)
@@ -29,7 +29,7 @@
/**
NOT USED , In DEV
*/
- return ;
+// return ;
global $language, $page;
$this->name='checkout';
@@ -40,8 +40,6 @@
foreach(parent::initialise_type('MODULE_CHECKOUT_PROCESS_INSTALLED','checkout') as $class){
$cl[$class]=new $class ();
$list_mod[$class] = $cl[$class]->sort_order;
-
-
}
asort($list_mod);
@@ -104,6 +102,7 @@
@param $key string name etape current
*/
public function GetCurrentEtape($key=''){
+// var_dump($this->process);
foreach($this->process as $k=>$row)
if($row)
return $this->etape[$k];
@@ -112,7 +111,7 @@
// var_dump( $this->process);
// if not found force reload step 0
// return $this->etape[0];
- tep_redirect(tep_href_link('checkout.php'/*FILENAME_CHECKOUT_PAYMENT*/, 'step=init', 'SSL'));
+// tep_redirect(tep_href_link('checkout.php'/*FILENAME_CHECKOUT_PAYMENT*/, 'step=init', 'SSL'));
}
Modified: branches/2.1.1/catalog/includes/modules/checkout/PrCgu.php
===================================================================
--- branches/2.1.1/catalog/includes/modules/checkout/PrCgu.php 2013-04-23 18:25:12 UTC (rev 4720)
+++ branches/2.1.1/catalog/includes/modules/checkout/PrCgu.php 2013-04-27 13:36:42 UTC (rev 4721)
@@ -83,6 +83,7 @@
*/
public function BeforeProcess($array=array()){
global $page;
+
if(isset($_POST['conditions'])){
// tep_session_register('conditions');
// $conditions = 'true';
@@ -110,12 +111,19 @@
global $cart;
$return = array();
+ /*
+ Call base CGU Generic
+ */
$v['title']=__("PrCgu tab");
$v['content']=tep_output_string_protected(tep_get_cms_content('informationBox_conditions',true, '<article><h5 class="CguView">%s</h5><div class="CguView">%s</textarea></article>' ));
$return[] = new objectInfo($v);
+
+ /*
+ Call CGU/CGV Specific for product
+ */
foreach($cart->get_products() as $row){
$pid = tep_get_prid($row['id']);
$arr = tep_get_prid_array($row['id']);
@@ -133,7 +141,6 @@
}
-
return $return;
}
Modified: branches/2.1.1/catalog/includes/modules/checkout/PrPayment.php
===================================================================
--- branches/2.1.1/catalog/includes/modules/checkout/PrPayment.php 2013-04-23 18:25:12 UTC (rev 4720)
+++ branches/2.1.1/catalog/includes/modules/checkout/PrPayment.php 2013-04-27 13:36:42 UTC (rev 4721)
@@ -140,12 +140,13 @@
$error = true;
$total_weight = $cart->show_weight();
$total_count = $cart->count_contents();
-
+
// load all enabled payment modules
$payment_modules = payment::getInstance();
+ $selection = $payment_modules->selection();
- if (isset($_POST['payment'])){
+ if ( sizeof($selection) > 1 && isset($_POST['payment'])){
$payment = (string)$_POST['payment'];
// force reload payment for selected modules
@@ -154,6 +155,15 @@
tep_session_register('payment');
}
+ elseif ( sizeof($selection) == 1 ){
+
+ $payment = (string)$selection[0]['id'];
+ // force reload payment for selected modules
+ $payment_modules = payment::getInstance($payment);
+
+ tep_session_register('payment');
+
+ }
else{
$error=false;
}
@@ -187,7 +197,7 @@
$page->javascript->add_framework("ext/jquery/jquery.min.js");
$page->javascript->add_script("ext/jquery/jquery.validate.min.js", array('sort'=>30));
- $selection = $payment_modules->selection();
+
$radio_buttons = 0;
}
Modified: branches/2.1.1/catalog/templates/defaut/includes/content/checkout_cgu.php
===================================================================
--- branches/2.1.1/catalog/templates/defaut/includes/content/checkout_cgu.php 2013-04-23 18:25:12 UTC (rev 4720)
+++ branches/2.1.1/catalog/templates/defaut/includes/content/checkout_cgu.php 2013-04-27 13:36:42 UTC (rev 4721)
@@ -8,6 +8,7 @@
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
+$display_view = $ACA->display_view();
?>
<div id="checkout">
@@ -17,21 +18,21 @@
<?php echo tep_draw_form('checkout_before', tep_href_link('checkout.php' /*FILENAME_CHECKOUT*/, '', 'SSL'), 'post', 'onsubmit="return check_form();"'); ?>
- <?php foreach($display_view as $row): ?>
+ <?php foreach($display_view['PrCgu'] as $row): ?>
- <h3><?php echo unhtmlentities($row->title) ?></h3>
+ <h3><?php echo unhtmlentities($row->title) ?></h3>
- <div>
- <?php echo unhtmlentities($row->content) ?>
- </div>
+ <div>
+ <?php echo unhtmlentities($row->content) ?>
+ </div>
<?php endforeach; ?>
<fieldset>
<legend><?php echo CHECKOUT_CGV ;?></legend>
- <label for="conditions"><?php printf(TEXT_CONDITIONS , tep_href_link(FILENAME_CONDITIONS, 'origin=checkout_payment') );?></label>
+ <label for="conditions"><?php echo __('checkout cgu text conditions'); //printf(TEXT_CONDITIONS , tep_href_link(FILENAME_CONDITIONS, 'origin=checkout_payment') );?></label>
<input name="conditions" id="conditions" type="checkbox" <?php echo isset($_GET['consult_conditions']) ? 'checked="checked"' : '' ;?> />
</fieldset>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-04-23 18:25:17
|
Revision: 4720
http://sourceforge.net/p/oscss/svn/4720
Author: oscim
Date: 2013-04-23 18:25:12 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
Fix display title block in "CLASS_WEIGHT" flag
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/gabarit/products/display_view.edit.gab
Modified: branches/2.1.1/catalog/admin/includes/gabarit/products/display_view.edit.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/products/display_view.edit.gab 2013-04-23 18:23:08 UTC (rev 4719)
+++ branches/2.1.1/catalog/admin/includes/gabarit/products/display_view.edit.gab 2013-04-23 18:25:12 UTC (rev 4720)
@@ -202,15 +202,15 @@
<?php endif; ?>
<fieldset class="block_field">
+ <?php if(products::CheckClassProduct('CLASS_WEIGHT')): ?>
<legend><?php echo __('@products text legend shipping'); ?></legend>
<ul>
- <?php if(products::CheckClassProduct('CLASS_WEIGHT')): ?>
<li class="block_input">
<label class="inline" for="products_weight" title="<?php echo __('@products text weight help'); ?><"><?php echo __('@products text weight'); ?></label>
<?php echo tep_draw_input_field('products_weight','', products::$Info->products_weight).' '.UNIT_WEIGHT_NAME; ?>
</li>
- <?php endif; ?>
</ul>
+ <?php endif; ?>
</fieldset>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-04-23 18:23:11
|
Revision: 4719
http://sourceforge.net/p/oscss/svn/4719
Author: oscim
Date: 2013-04-23 18:23:08 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
adjust install
Added Paths:
-----------
branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_products.sql
Added: branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_products.sql
===================================================================
--- branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_products.sql (rev 0)
+++ branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/osc_products.sql 2013-04-23 18:23:08 UTC (rev 4719)
@@ -0,0 +1,20 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+
+
+
+ALTER TABLE osc_products ADD products_quantity_alert INT( 3 ) NULL AFTER products_quantity
+
+ALTER TABLE osc_products ADD products_weight_brut FLOAT( 10, 3 ) NULL AFTER products_weight;
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-04-23 18:22:27
|
Revision: 4718
http://sourceforge.net/p/oscss/svn/4718
Author: oscim
Date: 2013-04-23 18:22:23 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
Add colums in product table and adjust install
Modified Paths:
--------------
branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_products.sql
Added Paths:
-----------
branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/
branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.1_2.1.1rc/tables/
Modified: branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_products.sql
===================================================================
--- branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_products.sql 2013-04-23 18:21:08 UTC (rev 4717)
+++ branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_products.sql 2013-04-23 18:22:23 UTC (rev 4718)
@@ -14,22 +14,25 @@
drop table if exists osc_products;
create table osc_products (
- products_id int(11) not null auto_increment,
- products_type int(2) not null default '1',
- products_quantity int(4) default '0' not null ,
- products_model varchar(12) null,
- products_image varchar(128) null,
- products_price decimal(15,6) default '0.000000' not null ,
- products_date_added datetime default '1000-01-01 00:00:00' not null ,
- products_last_modified datetime default '1000-01-01 00:00:00' null ,
- products_date_available datetime default '1000-01-01 00:00:00' null ,
- products_weight decimal(5,2) default '0.00' not null ,
- products_status tinyint(1) default '0' not null ,
- products_tax_class_id int(11) default '0' not null ,
- manufacturers_id int(11) null,
- track_stock int(1) default '1' null,
- products_ordered int(11) default '0' not null ,
+ products_id int(11) NOT NULL AUTO_INCREMENT,
+ products_type int(2) NOT NULL DEFAULT '1',
+ products_quantity int(4) NOT NULL DEFAULT '0',
+ products_quantity_alert int(3) DEFAULT NULL,
+ products_model varchar(12) DEFAULT NULL,
+ products_image varchar(128) DEFAULT NULL,
+ products_price decimal(15,6) NOT NULL DEFAULT '0.000000',
+ products_date_added datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
+ products_last_modified datetime DEFAULT '1000-01-01 00:00:00',
+ products_date_available datetime DEFAULT '1000-01-01 00:00:00',
+ products_weight decimal(5,2) NOT NULL DEFAULT '0.00',
+ products_weight_brut float(10,3) DEFAULT NULL,
+ products_status tinyint(1) NOT NULL DEFAULT '0',
+ products_tax_class_id int(11) NOT NULL DEFAULT '0',
+ manufacturers_id int(11) DEFAULT NULL,
+ track_stock int(1) DEFAULT '1',
+ products_ordered int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (products_id),
KEY idx_products_date_added (products_date_added)
+
) DEFAULT CHARSET=utf8;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-04-23 18:21:12
|
Revision: 4717
http://sourceforge.net/p/oscss/svn/4717
Author: oscim
Date: 2013-04-23 18:21:08 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
Fix css
Fix french
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt
branches/2.1.1/catalog/admin/includes/template/defaut/css/less/forms.less
branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less
Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt 2013-04-23 16:46:49 UTC (rev 4716)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt 2013-04-23 18:21:08 UTC (rev 4717)
@@ -119,7 +119,7 @@
// $lang['text categories']="Catégories :" ;
$lang['text products']="Produits :" ;
$lang['text products price info']="Prix :" ;
- $lang['text products tax class']="Classe fiscale :" ;
+ $lang['text products tax class']="Taxes :" ;
$lang['text products price net']=" HT :" ;
$lang['text products price gross']=" TTC :" ;
$lang['text products final price']="Prix final : " ;
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/css/less/forms.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/css/less/forms.less 2013-04-23 16:46:49 UTC (rev 4716)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/css/less/forms.less 2013-04-23 18:21:08 UTC (rev 4717)
@@ -69,13 +69,13 @@
.block_input{
text-shadow:0 1px 0 #fff;
width:94.9%;
- margin:2px 1px;
+ margin:0 1px;
display:inline-block;
text-align: left;
background:#C9C9C9;
float:left;
line-height:18px;
- padding:5px 5px 10px 5px;
+ padding:1px 5px 1px 5px;
border:1px solid @color_014;
.border-radius(5px);
.rounded(5px);
@@ -109,7 +109,7 @@
.block_input.tirroir {float:none;}
- .tabs_lang{width:98.5%; float:left;}
+ .tabs_lang{ float:left;}
}
@@ -117,13 +117,13 @@
fieldset {
- margin: 0.3em ;
- padding:0.3em;
+ margin: 0.1em ;
+ padding:0.1em;
border:none;
p {
- margin: 0.3em;
- padding:0.3em;
+ margin: 0.1em;
+ padding:0.1em;
}
select,
@@ -182,12 +182,11 @@
width:98.9%; margin:2px ;
display:inline-block;
text-align: left;
- padding: 5px;
+ padding: 5px 3px;
float:left;
.tabs,
.tabs_lang{
- width:96.5%;
margin:0 2px ;
display:inline-block;
text-align: left;
@@ -195,8 +194,9 @@
float:left;
}
+ &.tabs_lang ul,
.tabs_lang ul.ui-tabs-nav,
- .tabs_lang ul.ui-tabs-panel{display: inline-block; margin: 0 -5px; padding: 1px; width: 100%;}
+ .tabs_lang ul.ui-tabs-panel{display: inline-block; padding: 1px; width: 100%;}
}
.block_input label.inline { white-space:nowrap; width: 20%;}
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less 2013-04-23 16:46:49 UTC (rev 4716)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less 2013-04-23 18:21:08 UTC (rev 4717)
@@ -136,7 +136,13 @@
/* toogle item complet js action */
h4.Ctrtirroir,
-h5.Ctrtirroir{ margin: 10px 0; padding: 0 0 0 20px; font-size: (@font_size * 1.1); }
+h5.Ctrtirroir{ margin: 10px 0; padding: 0 0 0 20px; font-size: (@font_size * 1.1);
+ &:hover{
+ color:#A0A0A0;
+ opacity : 0.6;
+ background-color: @bg_hover;
+ }
+}
.Ctrtirroir {
background:transparent url("../../../../../images/icons/icon_down.gif") left top no-repeat;
padding-left:20px;
@@ -147,6 +153,7 @@
&:hover{
color:#A0A0A0;
opacity : 0.6;
+ background-color: @bg_hover;
}
}
.Ctrtirroir.closed {background:transparent url("../../../../../images/icons/icon_arrow_right.gif") left top no-repeat; }
@@ -568,7 +575,6 @@
p.Ctrtirroir {
padding: 2px 10px 2px 20px;
font-size:(@font_size*1.2);
- width:95.2%;
color: #000000;
font-weight: bold;
@@ -868,7 +874,7 @@
.ui-helper-hidden { display: none; }
.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
- .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: (@lineheight * 0.9); text-decoration: none; font-size: @font_size; list-style: none; }
+ .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: (@lineheight * 0.7); text-decoration: none; font-size: @font_size; list-style: none; }
.ui-helper-clearfix {
zoom: 1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-04-23 16:46:53
|
Revision: 4716
http://sourceforge.net/p/oscss/svn/4716
Author: oscim
Date: 2013-04-23 16:46:49 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
Fix css paginate border
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/template/defaut/css/less/datatable.less
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/css/less/datatable.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/css/less/datatable.less 2013-03-16 20:05:37 UTC (rev 4715)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/css/less/datatable.less 2013-04-23 16:46:49 UTC (rev 4716)
@@ -209,6 +209,7 @@
margin:0 1px;
min-width:10px;
text-align:center;
+ border:1px solid gray;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-03-16 20:05:59
|
Revision: 4715
http://oscss.svn.sourceforge.net/oscss/?rev=4715&view=rev
Author: oscim
Date: 2013-03-16 20:05:37 +0000 (Sat, 16 Mar 2013)
Log Message:
-----------
correction coquille
Fix pbs beadcrumb public
Ajust header all files
Modified Paths:
--------------
branches/2.1.1/catalog/Documents/modeles/pdf/harry/harry.php
branches/2.1.1/catalog/Documents/modeles/pdf/harry/publicCustomers/delivery.php
branches/2.1.1/catalog/Documents/modeles/pdf/harry/publicCustomers/packingslip.php
branches/2.1.1/catalog/account.php
branches/2.1.1/catalog/admin/includes/appli_top_Test.php
branches/2.1.1/catalog/admin/includes/application_bottom.php
branches/2.1.1/catalog/admin/includes/application_top.php
branches/2.1.1/catalog/admin/includes/boxes/002_admin.php
branches/2.1.1/catalog/admin/includes/boxes/00_hidden.php
branches/2.1.1/catalog/admin/includes/boxes/01_configuration.php
branches/2.1.1/catalog/admin/includes/boxes/04_tools.php
branches/2.1.1/catalog/admin/includes/boxes/05_customers.php
branches/2.1.1/catalog/admin/includes/boxes/07_catalog.php
branches/2.1.1/catalog/admin/includes/boxes/08_cms.php
branches/2.1.1/catalog/admin/includes/boxes/09_commercial.php
branches/2.1.1/catalog/admin/includes/boxes/10_orders.php
branches/2.1.1/catalog/admin/includes/class.interfaces.php
branches/2.1.1/catalog/admin/includes/classes/DataFileSql.php
branches/2.1.1/catalog/admin/includes/classes/GraphLoader.php
branches/2.1.1/catalog/admin/includes/classes/GraphUtility.php
branches/2.1.1/catalog/admin/includes/classes/MGabCont.php
branches/2.1.1/catalog/admin/includes/classes/MLinkTo.php
branches/2.1.1/catalog/admin/includes/classes/aca.php
branches/2.1.1/catalog/admin/includes/classes/categorieUtility.php
branches/2.1.1/catalog/admin/includes/classes/configUtility.php
branches/2.1.1/catalog/admin/includes/classes/customerUtility.php
branches/2.1.1/catalog/admin/includes/classes/dataTableInnerHTML.php
branches/2.1.1/catalog/admin/includes/classes/dataTableJsonStatment.php
branches/2.1.1/catalog/admin/includes/classes/drivers/productsACA.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqladminextra.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqladmingroups.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqladminmenu.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqladminuser.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlamattribute2template.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlamtemplate.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcategorie.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcategoriesextra.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcip.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcip_modfiles.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlconfiguration.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcountries.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcustomer.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcustomersextrafileds.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlfeatured.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlgeozone.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlimage.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlnavigation_links.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlorder.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlproduct.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlproductattribute.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlproductoption.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlproductoptionvalue.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlproductoptionvalue2option.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlservices.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlshipping.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlstatus.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlzones.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlzonetogeozone.php
branches/2.1.1/catalog/admin/includes/classes/emailUtility.php
branches/2.1.1/catalog/admin/includes/classes/fileUtility.php
branches/2.1.1/catalog/admin/includes/classes/imageUtility.php
branches/2.1.1/catalog/admin/includes/classes/localizationUtility.php
branches/2.1.1/catalog/admin/includes/classes/menu.php
branches/2.1.1/catalog/admin/includes/classes/modulesUtility.php
branches/2.1.1/catalog/admin/includes/classes/navigationHistory.php
branches/2.1.1/catalog/admin/includes/classes/osCSS_BackupProcess.php
branches/2.1.1/catalog/admin/includes/classes/osCSS_export.php
branches/2.1.1/catalog/admin/includes/classes/osCSS_messageStack.php
branches/2.1.1/catalog/admin/includes/classes/oscss_DBIndex.php
branches/2.1.1/catalog/admin/includes/classes/oscss_acl.php
branches/2.1.1/catalog/admin/includes/classes/oscss_cstr.php
branches/2.1.1/catalog/admin/includes/classes/productUtility.php
branches/2.1.1/catalog/admin/includes/classes/tracked_stock.php
branches/2.1.1/catalog/admin/includes/classes/worldUtility.php
branches/2.1.1/catalog/admin/includes/content/aca.central.inc
branches/2.1.1/catalog/admin/includes/content/aca.top.inc
branches/2.1.1/catalog/admin/includes/content/configuration.central.inc
branches/2.1.1/catalog/admin/includes/content/configuration.top.inc
branches/2.1.1/catalog/admin/includes/content/modules.top.inc
branches/2.1.1/catalog/admin/includes/content/page.top.inc
branches/2.1.1/catalog/admin/includes/database_tables.php
branches/2.1.1/catalog/admin/includes/exts/PHPlot/drivers.php
branches/2.1.1/catalog/admin/includes/exts/login/oscss.php
branches/2.1.1/catalog/admin/includes/exts/package/CIP.php
branches/2.1.1/catalog/admin/includes/exts/package/CipUtility.php
branches/2.1.1/catalog/admin/includes/exts/package/ci_tag.class.php
branches/2.1.1/catalog/admin/includes/exts/package/cip_modfiles.php
branches/2.1.1/catalog/admin/includes/exts/package/packageInstaller.php
branches/2.1.1/catalog/admin/includes/exts/package/packageRepository.php
branches/2.1.1/catalog/admin/includes/exts/package/packageUtility.php
branches/2.1.1/catalog/admin/includes/exts/package/tags/add2end.php
branches/2.1.1/catalog/admin/includes/exts/package/tags/add2endlg.php
branches/2.1.1/catalog/admin/includes/exts/package/tags/addfile.php
branches/2.1.1/catalog/admin/includes/exts/package/tags/addfilelg.php
branches/2.1.1/catalog/admin/includes/exts/package/tags/addfilename.php
branches/2.1.1/catalog/admin/includes/exts/package/tags/addlangdef.php
branches/2.1.1/catalog/admin/includes/exts/package/tags/config.php
branches/2.1.1/catalog/admin/includes/exts/package/tags/depend.php
branches/2.1.1/catalog/admin/includes/exts/package/tags/description.php
branches/2.1.1/catalog/admin/includes/exts/package/tags/extractzip.php
branches/2.1.1/catalog/admin/includes/exts/package/tags/filesql.php
branches/2.1.1/catalog/admin/includes/exts/package/tags/modifytable.class.php
branches/2.1.1/catalog/admin/includes/exts/package/tags/requirements.php
branches/2.1.1/catalog/admin/includes/exts/package/tags/sql.php
branches/2.1.1/catalog/admin/includes/filenames.php
branches/2.1.1/catalog/admin/includes/footer.php
branches/2.1.1/catalog/admin/includes/functions/general.php
branches/2.1.1/catalog/admin/includes/functions/html_output.php
branches/2.1.1/catalog/admin/includes/functions/lib.configuration.php
branches/2.1.1/catalog/admin/includes/functions/lib.orders.php
branches/2.1.1/catalog/admin/includes/gabarit/CheckCore/display_view.view.gab
branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/display_view.delete.gab
branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/display_view.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.categorie.gab
branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.dates.gab
branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.featured.gab
branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.language.gab
branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.listfield.gab
branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.subtype.gab
branches/2.1.1/catalog/admin/includes/gabarit/adminAccount/display_view.page.gab
branches/2.1.1/catalog/admin/includes/gabarit/adminGroup/display_view.define_group.gab
branches/2.1.1/catalog/admin/includes/gabarit/adminGroup/display_view.delete.gab
branches/2.1.1/catalog/admin/includes/gabarit/adminGroup/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/adminNotif/display_view.config.gab
branches/2.1.1/catalog/admin/includes/gabarit/adminUsers/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/adminUsers/display_view.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/attributes/display_view.options.delete.gab
branches/2.1.1/catalog/admin/includes/gabarit/attributes/display_view.options.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/attributes/display_view.values.delete.gab
branches/2.1.1/catalog/admin/includes/gabarit/attributes/display_view.values.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/backup/display_view.backup.gab
branches/2.1.1/catalog/admin/includes/gabarit/backup/display_view.restore.gab
branches/2.1.1/catalog/admin/includes/gabarit/backup/display_view.restorelocal.gab
branches/2.1.1/catalog/admin/includes/gabarit/backup/display_view.viewalldb.gab
branches/2.1.1/catalog/admin/includes/gabarit/categories/display_view.delete.gab
branches/2.1.1/catalog/admin/includes/gabarit/categories/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/categories/display_view.inline.gab
branches/2.1.1/catalog/admin/includes/gabarit/categories/display_view.new_light.gab
branches/2.1.1/catalog/admin/includes/gabarit/categories/rightto.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/cms_content/display_view.delete.gab
branches/2.1.1/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/cms_content/display_view.inline.gab
branches/2.1.1/catalog/admin/includes/gabarit/cms_content/display_view.new.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/datatypeaccount.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/datatypeproduct.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modadminconfig.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modcorecache.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modcustextra/draw.delete.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modcustextra/draw.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modcustextra/draw.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/moddownloads.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modexpedition.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modimages.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modmail.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modmembres.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modorder.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modpayment.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modprodextra/draw.delete.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.delete.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.new.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modseourl.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modstatus.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modstock.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modtemplate.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/my_boutique.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/countries/display_view.delete.gab
branches/2.1.1/catalog/admin/includes/gabarit/countries/display_view.delete_zone.gab
branches/2.1.1/catalog/admin/includes/gabarit/countries/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/countries/display_view.edit_zone.gab
branches/2.1.1/catalog/admin/includes/gabarit/cronjob/display_view.delete.gab
branches/2.1.1/catalog/admin/includes/gabarit/cronjob/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/cronjob/display_view.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/customers/address_book/display_view.tabs.gab
branches/2.1.1/catalog/admin/includes/gabarit/customers/address_book/inline.delete.gab
branches/2.1.1/catalog/admin/includes/gabarit/customers/address_book/inline.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/customers/display_view.delete.gab
branches/2.1.1/catalog/admin/includes/gabarit/customers/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/customers/display_view.inline.gab
branches/2.1.1/catalog/admin/includes/gabarit/customers/history/display_edit.noedit.gab
branches/2.1.1/catalog/admin/includes/gabarit/featureds/display_view.delete.gab
branches/2.1.1/catalog/admin/includes/gabarit/featureds/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/featureds/rightto.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/geo_zones/display_view.delete.gab
branches/2.1.1/catalog/admin/includes/gabarit/geo_zones/display_view.deletesub.gab
branches/2.1.1/catalog/admin/includes/gabarit/geo_zones/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/geo_zones/display_view.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/geo_zones/display_view.new.gab
branches/2.1.1/catalog/admin/includes/gabarit/graphs_stats.page.gab
branches/2.1.1/catalog/admin/includes/gabarit/header_tags.form.gab
branches/2.1.1/catalog/admin/includes/gabarit/held_orders/display_view.recup_order.gab
branches/2.1.1/catalog/admin/includes/gabarit/mail/display_view.create.gab
branches/2.1.1/catalog/admin/includes/gabarit/mail/display_view.list.gab
branches/2.1.1/catalog/admin/includes/gabarit/mail.page.gab
branches/2.1.1/catalog/admin/includes/gabarit/navigation_links/display_view.delete.gab
branches/2.1.1/catalog/admin/includes/gabarit/navigation_links/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/newsletters/display_view.confirm_send.gab
branches/2.1.1/catalog/admin/includes/gabarit/newsletters/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/newsletters/display_view.inline.gab
branches/2.1.1/catalog/admin/includes/gabarit/newsletters/display_view.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/newsletters/display_view.preview.gab
branches/2.1.1/catalog/admin/includes/gabarit/newsletters/display_view.send.gab
branches/2.1.1/catalog/admin/includes/gabarit/newsletters/display_view.sendtest.gab
branches/2.1.1/catalog/admin/includes/gabarit/newslettersModeles/display_view.delete.gab
branches/2.1.1/catalog/admin/includes/gabarit/newslettersModeles/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/newslettersModeles/display_view.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/newslettersModeles/display_view.preview.gab
branches/2.1.1/catalog/admin/includes/gabarit/orders/display_view.delete.gab
branches/2.1.1/catalog/admin/includes/gabarit/orders/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/orders/display_view.inline.gab
branches/2.1.1/catalog/admin/includes/gabarit/orders/display_view.multi.gab
branches/2.1.1/catalog/admin/includes/gabarit/orders/filter.clause.gab
branches/2.1.1/catalog/admin/includes/gabarit/orders/filter.products.gab
branches/2.1.1/catalog/admin/includes/gabarit/orders/payment/cod.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/orders/payment/cod.view.gab
branches/2.1.1/catalog/admin/includes/gabarit/orders/payment/moneyorder.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/orders/payment/moneyorder.view.gab
branches/2.1.1/catalog/admin/includes/gabarit/orders/shipping/flat.view.gab
branches/2.1.1/catalog/admin/includes/gabarit/orders/shipping/item.view.gab
branches/2.1.1/catalog/admin/includes/gabarit/package/display_view.package.config.gab
branches/2.1.1/catalog/admin/includes/gabarit/package/display_view.package.configedit.gab
branches/2.1.1/catalog/admin/includes/gabarit/package/display_view.package.detail.gab
branches/2.1.1/catalog/admin/includes/gabarit/package/display_view.package.install.gab
branches/2.1.1/catalog/admin/includes/gabarit/package/display_view.package.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/package/display_view.package.remove.gab
branches/2.1.1/catalog/admin/includes/gabarit/package/display_view.package.upload.gab
branches/2.1.1/catalog/admin/includes/gabarit/package/display_view.source.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/package/display_view.source.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/products/desc_base/display_edit.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/products/display_view.copy_to.gab
branches/2.1.1/catalog/admin/includes/gabarit/products/display_view.delete.gab
branches/2.1.1/catalog/admin/includes/gabarit/products/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/products/display_view.new.gab
branches/2.1.1/catalog/admin/includes/gabarit/products/filter.clause.gab
branches/2.1.1/catalog/admin/includes/gabarit/products/products_extra/display_edit.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/products/stock.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/recover_cart_sales/display_view.processconfirm.gab
branches/2.1.1/catalog/admin/includes/gabarit/services/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/shipping/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/shipping/display_view.multi-action.gab
branches/2.1.1/catalog/admin/includes/gabarit/shipping/display_view.multi.gab
branches/2.1.1/catalog/admin/includes/gabarit/usersNotif/display_view.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/usersNotif/display_view.view.gab
branches/2.1.1/catalog/admin/includes/header.php
branches/2.1.1/catalog/admin/includes/javascript/modules/pages/adminGroup.js.php
branches/2.1.1/catalog/admin/includes/javascript/modules/pages/adminUsers.js.php
branches/2.1.1/catalog/admin/includes/javascript/modules/pages/cms_content.js.php
branches/2.1.1/catalog/admin/includes/javascript/modules/pages/customers.js.php
branches/2.1.1/catalog/admin/includes/javascript/modules/pages/orders.js.php
branches/2.1.1/catalog/admin/includes/javascript/modules/pages/package.js.php
branches/2.1.1/catalog/admin/includes/javascript/modules/pages/products.js.php
branches/2.1.1/catalog/admin/includes/javascript/modules/pages/shipping.js.php
branches/2.1.1/catalog/admin/includes/languages/fr_FR/boxes/002_admin.php
branches/2.1.1/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php
branches/2.1.1/catalog/admin/includes/languages/fr_FR/boxes/04_tools.php
branches/2.1.1/catalog/admin/includes/languages/fr_FR/boxes/05_customers.php
branches/2.1.1/catalog/admin/includes/languages/fr_FR/boxes/07_catalog.php
branches/2.1.1/catalog/admin/includes/languages/fr_FR/boxes/08_cms.php
branches/2.1.1/catalog/admin/includes/languages/fr_FR/boxes/09_commercial.php
branches/2.1.1/catalog/admin/includes/languages/fr_FR/boxes/10_orders.php
branches/2.1.1/catalog/admin/includes/languages/fr_FR/configuration.php
branches/2.1.1/catalog/admin/includes/languages/fr_FR/fr_FR.php
branches/2.1.1/catalog/admin/includes/languages/fr_FR/login.php
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modeles/email/mouton/add_customer.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modeles/email/mouton/admin_account.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modeles/email/mouton/admin_members.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modeles/email/mouton/admin_members_new.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modeles/pdf/harry/harry.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/aca_header_tags.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/account/account_extra.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_0.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_10.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_11.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_128.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_14.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_15.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_2.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_20.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_21.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_22.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_24.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_25.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_27.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_8.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeaccount.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeproduct.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/modadminconfig.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/modcustextra.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/moddownloads.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/modexpedition.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/modimages.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/modlangue.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/modmail.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/modmembres.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/modorder.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/modpayment.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/modprodextra.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/modseourl.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/modstatus.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/modstock.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/modtemplate.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/my_boutique.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/cronjob/customers_birthday.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/cronjob/relance_order.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/filters.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/generic/CheckCore.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/graph_stats/NewCustomers.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/graph_stats/Sales.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/newsletters/new_products.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/newsletters/newsletter.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/adminAccount.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/adminGroup.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/adminNotif.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/adminUsers.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/attributes.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/backup.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/countries.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/cronjob.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/currencies.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/featureds.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/geo_zones.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/graphs_stats.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/held_orders.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/index.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/mail.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/navigation_links.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/newsletters.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/newslettersModeles.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/package.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/rapport.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/recover_cart_sales.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/services.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/shipping.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/stock.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/usersNotif.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/payment/cod.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/payment/moneyorder.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/products/desc_base.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/products/products_extra.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/rapport/customers_2product.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/rapport/customers_purchase.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/rapport/newsletters.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/rapport/products_purchased.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/rapport/products_viewed.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/rapport/whos_online.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/shipping/flat.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/shipping/item.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/shipping/spu.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/AdminGroupsNew.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/AdminUsersLast.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/CategorieLast.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/ContentLast.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/CrondJoblast.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/CustomerLast.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/HelpConfig.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/ImagesLast.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/NewCustomersStats.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/NewslettersLastModified.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/NewslettersLastNew.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/NewslettersModelesLastModified.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/NewslettersModelesLastNew.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/NewslettersWizzard.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/Notification.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/ProductsLast.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/SsMenuConfig.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/brief_config.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/currencies_update_server.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/homeStats.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/homeStock.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/orderLast.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/orderLastinvoice.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/orderLastservice.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/widget/orderLastshipp.txt
branches/2.1.1/catalog/admin/includes/modules/account/account_extra.php
branches/2.1.1/catalog/admin/includes/modules/account/address_book.php
branches/2.1.1/catalog/admin/includes/modules/account/history.php
branches/2.1.1/catalog/admin/includes/modules/configuration/datatypeaccount.php
branches/2.1.1/catalog/admin/includes/modules/configuration/datatypeproduct.php
branches/2.1.1/catalog/admin/includes/modules/configuration/modadminconfig.php
branches/2.1.1/catalog/admin/includes/modules/configuration/modcorecache.php
branches/2.1.1/catalog/admin/includes/modules/configuration/modcustextra.php
branches/2.1.1/catalog/admin/includes/modules/configuration/moddownloads.php
branches/2.1.1/catalog/admin/includes/modules/configuration/modexpedition.php
branches/2.1.1/catalog/admin/includes/modules/configuration/modimages.php
branches/2.1.1/catalog/admin/includes/modules/configuration/modlangue.php
branches/2.1.1/catalog/admin/includes/modules/configuration/modmail.php
branches/2.1.1/catalog/admin/includes/modules/configuration/modmembres.php
branches/2.1.1/catalog/admin/includes/modules/configuration/modorder.php
branches/2.1.1/catalog/admin/includes/modules/configuration/modpayment.php
branches/2.1.1/catalog/admin/includes/modules/configuration/modseourl.php
branches/2.1.1/catalog/admin/includes/modules/configuration/modstatus.php
branches/2.1.1/catalog/admin/includes/modules/configuration/modstock.php
branches/2.1.1/catalog/admin/includes/modules/configuration/modsysinfo.php
branches/2.1.1/catalog/admin/includes/modules/configuration/modtemplate.php
branches/2.1.1/catalog/admin/includes/modules/configuration/my_boutique.php
branches/2.1.1/catalog/admin/includes/modules/cronjob/clean_cache_dir.php
branches/2.1.1/catalog/admin/includes/modules/cronjob/customers_birthday.php
branches/2.1.1/catalog/admin/includes/modules/cronjob/ggsitemap_refresh.php
branches/2.1.1/catalog/admin/includes/modules/cronjob/relance_order.php
branches/2.1.1/catalog/admin/includes/modules/generic/CheckCore.php
branches/2.1.1/catalog/admin/includes/modules/generic/SvnUpdate.php
branches/2.1.1/catalog/admin/includes/modules/graph_stats/NewCustomers.php
branches/2.1.1/catalog/admin/includes/modules/graph_stats/Sales.php
branches/2.1.1/catalog/admin/includes/modules/newsletters/new_products.php
branches/2.1.1/catalog/admin/includes/modules/newsletters/newsletter.php
branches/2.1.1/catalog/admin/includes/modules/pages/adminAccount.php
branches/2.1.1/catalog/admin/includes/modules/pages/adminNotif.php
branches/2.1.1/catalog/admin/includes/modules/pages/adminUsers.php
branches/2.1.1/catalog/admin/includes/modules/pages/attributes.php
branches/2.1.1/catalog/admin/includes/modules/pages/backup.php
branches/2.1.1/catalog/admin/includes/modules/pages/browser.php
branches/2.1.1/catalog/admin/includes/modules/pages/categories.php
branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php
branches/2.1.1/catalog/admin/includes/modules/pages/countries.php
branches/2.1.1/catalog/admin/includes/modules/pages/cronjob.php
branches/2.1.1/catalog/admin/includes/modules/pages/currencies.php
branches/2.1.1/catalog/admin/includes/modules/pages/customers.php
branches/2.1.1/catalog/admin/includes/modules/pages/featureds.php
branches/2.1.1/catalog/admin/includes/modules/pages/geo_zones.php
branches/2.1.1/catalog/admin/includes/modules/pages/graphs_stats.php
branches/2.1.1/catalog/admin/includes/modules/pages/header_tags.php
branches/2.1.1/catalog/admin/includes/modules/pages/held_orders.php
branches/2.1.1/catalog/admin/includes/modules/pages/index.php
branches/2.1.1/catalog/admin/includes/modules/pages/navigation_links.php
branches/2.1.1/catalog/admin/includes/modules/pages/newsletters.php
branches/2.1.1/catalog/admin/includes/modules/pages/newslettersModeles.php
branches/2.1.1/catalog/admin/includes/modules/pages/orders.php
branches/2.1.1/catalog/admin/includes/modules/pages/package.php
branches/2.1.1/catalog/admin/includes/modules/pages/plugins.php
branches/2.1.1/catalog/admin/includes/modules/pages/products.php
branches/2.1.1/catalog/admin/includes/modules/pages/rapport.php
branches/2.1.1/catalog/admin/includes/modules/pages/recover_cart_sales.php
branches/2.1.1/catalog/admin/includes/modules/pages/services.php
branches/2.1.1/catalog/admin/includes/modules/pages/shipping.php
branches/2.1.1/catalog/admin/includes/modules/pages/stock.php
branches/2.1.1/catalog/admin/includes/modules/pages/usersNotif.php
branches/2.1.1/catalog/admin/includes/modules/payment/cod.php
branches/2.1.1/catalog/admin/includes/modules/payment/moneyorder.php
branches/2.1.1/catalog/admin/includes/modules/products/desc_base.php
branches/2.1.1/catalog/admin/includes/modules/products/products_extra.php
branches/2.1.1/catalog/admin/includes/modules/rapport/customers_purchase.php
branches/2.1.1/catalog/admin/includes/modules/rapport/newsletters.php
branches/2.1.1/catalog/admin/includes/modules/rapport/products_purchased.php
branches/2.1.1/catalog/admin/includes/modules/rapport/products_viewed.php
branches/2.1.1/catalog/admin/includes/modules/rapport/whos_online.php
branches/2.1.1/catalog/admin/includes/modules/shipping/flat.php
branches/2.1.1/catalog/admin/includes/modules/shipping/item.php
branches/2.1.1/catalog/admin/includes/modules/shipping/spu.php
branches/2.1.1/catalog/admin/includes/modules/template_export/expeditor.php
branches/2.1.1/catalog/admin/includes/modules/template_pdf/entete_shop.php
branches/2.1.1/catalog/admin/includes/modules/template_pdf/invoice.php
branches/2.1.1/catalog/admin/includes/modules/template_pdf/labels.php
branches/2.1.1/catalog/admin/includes/modules/template_pdf/packingslip.php
branches/2.1.1/catalog/admin/includes/modules/template_pdf/packingslip_and_invoice.php
branches/2.1.1/catalog/admin/includes/template/defaut/gabarit-1.php
branches/2.1.1/catalog/admin/includes/template/defaut/header-1.php
branches/2.1.1/catalog/admin/includes/template/defaut/inc/init_theme-1.php
branches/2.1.1/catalog/admin/includes/template/defaut/inc/init_theme-2.php
branches/2.1.1/catalog/admin/includes/template/defaut/password_forgotten.php
branches/2.1.1/catalog/admin/includes/template/oscss/gabarit-1.php
branches/2.1.1/catalog/admin/includes/template/oscss/header-1.php
branches/2.1.1/catalog/admin/includes/template/oscss/inc/init_theme-1.php
branches/2.1.1/catalog/admin/includes/template/oscss/inc/lib_general-1.js
branches/2.1.1/catalog/admin/includes/widget/AdminGroupsNew.php
branches/2.1.1/catalog/admin/includes/widget/AdminUsersLast.php
branches/2.1.1/catalog/admin/includes/widget/CategorieLast.php
branches/2.1.1/catalog/admin/includes/widget/ContentLast.php
branches/2.1.1/catalog/admin/includes/widget/CrondJoblast.php
branches/2.1.1/catalog/admin/includes/widget/CustomerLast.php
branches/2.1.1/catalog/admin/includes/widget/HelpConfig.php
branches/2.1.1/catalog/admin/includes/widget/ImagesLast.php
branches/2.1.1/catalog/admin/includes/widget/NewslettersLastModified.php
branches/2.1.1/catalog/admin/includes/widget/NewslettersLastNew.php
branches/2.1.1/catalog/admin/includes/widget/NewslettersModelesLastModified.php
branches/2.1.1/catalog/admin/includes/widget/NewslettersModelesLastNew.php
branches/2.1.1/catalog/admin/includes/widget/NewslettersWizzard.php
branches/2.1.1/catalog/admin/includes/widget/Notification.php
branches/2.1.1/catalog/admin/includes/widget/ProductsLast.php
branches/2.1.1/catalog/admin/includes/widget/SsMenuConfig.php
branches/2.1.1/catalog/admin/includes/widget/brief_config.php
branches/2.1.1/catalog/admin/includes/widget/currencies_update_server.php
branches/2.1.1/catalog/admin/includes/widget/homeNews.php
branches/2.1.1/catalog/admin/includes/widget/homeStats.php
branches/2.1.1/catalog/admin/includes/widget/homeStock.php
branches/2.1.1/catalog/admin/includes/widget/orderLast.php
branches/2.1.1/catalog/admin/includes/widget/orderLastinvoice.php
branches/2.1.1/catalog/admin/includes/widget/orderLastservice.php
branches/2.1.1/catalog/admin/includes/widget/orderLastshipp.php
branches/2.1.1/catalog/admin/includes/widget/salesStats.php
branches/2.1.1/catalog/admin/index.php
branches/2.1.1/catalog/admin/password_forgotten.php
branches/2.1.1/catalog/advanced_search.php
branches/2.1.1/catalog/checkout.php
branches/2.1.1/catalog/checkout_payment_address.php
branches/2.1.1/catalog/checkout_shipping.php
branches/2.1.1/catalog/checkout_shipping_address.php
branches/2.1.1/catalog/common/class.interfaces.php
branches/2.1.1/catalog/common/classes/DataTypes.php
branches/2.1.1/catalog/common/classes/DatasFiles.php
branches/2.1.1/catalog/common/classes/ExtraUtility.php
branches/2.1.1/catalog/common/classes/NewslettersUtility.php
branches/2.1.1/catalog/common/classes/PasswordUtility.php
branches/2.1.1/catalog/common/classes/datatype_drivers/Data_categorie.php
branches/2.1.1/catalog/common/classes/datatype_drivers/Data_content.php
branches/2.1.1/catalog/common/classes/datatype_drivers/Data_customer.php
branches/2.1.1/catalog/common/classes/datatype_drivers/Data_diver.php
branches/2.1.1/catalog/common/classes/datatype_drivers/Data_error.php
branches/2.1.1/catalog/common/classes/datatype_drivers/Data_featured.php
branches/2.1.1/catalog/common/classes/datatype_drivers/Data_home.php
branches/2.1.1/catalog/common/classes/datatype_drivers/Data_product.php
branches/2.1.1/catalog/common/classes/datetimeUtility.php
branches/2.1.1/catalog/common/classes/formUtility.php
branches/2.1.1/catalog/common/classes/fpdf.php
branches/2.1.1/catalog/common/classes/image_ratio.php
branches/2.1.1/catalog/common/classes/imgratio_drivers/Carre.php
branches/2.1.1/catalog/common/classes/language.php
branches/2.1.1/catalog/common/classes/order.php
branches/2.1.1/catalog/common/classes/osCSS_Cache.php
branches/2.1.1/catalog/common/classes/osCSS_CacheLib.php
branches/2.1.1/catalog/common/classes/osCSS_pdf.php
branches/2.1.1/catalog/common/classes/price.php
branches/2.1.1/catalog/common/classes/shippingUtility.php
branches/2.1.1/catalog/common/classes/shoppingCart.php
branches/2.1.1/catalog/common/classes/sql_drivers/DB_Mysql.php
branches/2.1.1/catalog/common/classes/sql_drivers/DB_Mysqli.php
branches/2.1.1/catalog/common/functions/pdf_output.php
branches/2.1.1/catalog/common/modules/core/password/Pass_Classic.php
branches/2.1.1/catalog/common/modules/core/password/Pass_Md5.php
branches/2.1.1/catalog/common/modules/core/password/Pass_Sha1.php
branches/2.1.1/catalog/common/modules/core/seo_modrewrite/SeoR_byfolder.php
branches/2.1.1/catalog/common/modules/core/seo_modrewrite/SeoR_classic.php
branches/2.1.1/catalog/common/modules/core/seo_modrewrite/SeoR_no.php
branches/2.1.1/catalog/create_account.php
branches/2.1.1/catalog/download.php
branches/2.1.1/catalog/iframe.php
branches/2.1.1/catalog/includes/appli_top_Test.php
branches/2.1.1/catalog/includes/application_bottom.php
branches/2.1.1/catalog/includes/application_top.php
branches/2.1.1/catalog/includes/classes/AbstractAcaModule.php
branches/2.1.1/catalog/includes/classes/Stock.php
branches/2.1.1/catalog/includes/classes/breadcrumb.php
branches/2.1.1/catalog/includes/classes/category_tree.php
branches/2.1.1/catalog/includes/classes/checkout_process.php
branches/2.1.1/catalog/includes/classes/core_page/account.php
branches/2.1.1/catalog/includes/classes/core_page/checkout.php
branches/2.1.1/catalog/includes/classes/core_page/contact.php
branches/2.1.1/catalog/includes/classes/core_page/customer.php
branches/2.1.1/catalog/includes/classes/core_page/develop.php
branches/2.1.1/catalog/includes/classes/core_page/generic.php
branches/2.1.1/catalog/includes/classes/core_page/javascript.php
branches/2.1.1/catalog/includes/classes/core_page/listing.php
branches/2.1.1/catalog/includes/classes/core_page/overlay/oscss_boxes.php
branches/2.1.1/catalog/includes/classes/core_page/overlay/oscss_modules.php
branches/2.1.1/catalog/includes/classes/core_page/overlay/oscss_plugins.php
branches/2.1.1/catalog/includes/classes/drivers/data/categorie.php
branches/2.1.1/catalog/includes/classes/drivers/data/content.php
branches/2.1.1/catalog/includes/classes/drivers/data/product.php
branches/2.1.1/catalog/includes/classes/drivers/page/GabaritTemplate.php
branches/2.1.1/catalog/includes/classes/navigation_history.php
branches/2.1.1/catalog/includes/classes/pad_base.php
branches/2.1.1/catalog/includes/classes/pad_base_multi.php
branches/2.1.1/catalog/includes/classes/page.php
branches/2.1.1/catalog/includes/classes/payment.php
branches/2.1.1/catalog/includes/classes/shopping_cart_action.php
branches/2.1.1/catalog/includes/classes/split_page_results.php
branches/2.1.1/catalog/includes/database_tables.php
branches/2.1.1/catalog/includes/filenames.php
branches/2.1.1/catalog/includes/functions/general.php
branches/2.1.1/catalog/includes/functions/html_output.php
branches/2.1.1/catalog/includes/functions/initialize.php
branches/2.1.1/catalog/includes/functions/template.php
branches/2.1.1/catalog/includes/inc_base_conf.php
branches/2.1.1/catalog/includes/inc_base_lib.php
branches/2.1.1/catalog/includes/inc_base_lib_min.php
branches/2.1.1/catalog/includes/js/address_book.js.php
branches/2.1.1/catalog/includes/js/checkout_address.js.php
branches/2.1.1/catalog/includes/js/shopping_cart.js.php
branches/2.1.1/catalog/includes/languages/fr_FR/account.php
branches/2.1.1/catalog/includes/languages/fr_FR/advanced_search.php
branches/2.1.1/catalog/includes/languages/fr_FR/boxes/categories.txt
branches/2.1.1/catalog/includes/languages/fr_FR/boxes/myaccount.txt
branches/2.1.1/catalog/includes/languages/fr_FR/boxes/tags.txt
branches/2.1.1/catalog/includes/languages/fr_FR/checkout_payment.php
branches/2.1.1/catalog/includes/languages/fr_FR/checkout_success.php
branches/2.1.1/catalog/includes/languages/fr_FR/contact_us.php
branches/2.1.1/catalog/includes/languages/fr_FR/create_account.php
branches/2.1.1/catalog/includes/languages/fr_FR/create_account_success.php
branches/2.1.1/catalog/includes/languages/fr_FR/home.php
branches/2.1.1/catalog/includes/languages/fr_FR/login.php
branches/2.1.1/catalog/includes/languages/fr_FR/modeles/email/mouton/add_customer.txt
branches/2.1.1/catalog/includes/languages/fr_FR/modeles/email/mouton/create_account.txt
branches/2.1.1/catalog/includes/languages/fr_FR/modeles/email/mouton/create_account_confirm.txt
branches/2.1.1/catalog/includes/languages/fr_FR/modeles/email/mouton/password_forgotten.txt
branches/2.1.1/catalog/includes/languages/fr_FR/modules/account/address_book.txt
branches/2.1.1/catalog/includes/languages/fr_FR/modules/account/history.txt
branches/2.1.1/catalog/includes/languages/fr_FR/modules/order_total/ot_shipping.txt
branches/2.1.1/catalog/includes/languages/fr_FR/modules/payment/cod.txt
branches/2.1.1/catalog/includes/languages/fr_FR/modules/payment/moneyorder.txt
branches/2.1.1/catalog/includes/languages/fr_FR/modules/products/desc_base.txt
branches/2.1.1/catalog/includes/languages/fr_FR/modules/products/products_extra.txt
branches/2.1.1/catalog/includes/languages/fr_FR/modules/shipping/flat.txt
branches/2.1.1/catalog/includes/languages/fr_FR/modules/shipping/item.txt
branches/2.1.1/catalog/includes/languages/fr_FR/modules/shipping/spu.txt
branches/2.1.1/catalog/includes/languages/fr_FR/new_sent_email_confirm.php
branches/2.1.1/catalog/includes/languages/fr_FR/password_forgotten.php
branches/2.1.1/catalog/includes/languages/fr_FR/triggers/cart_totaux.txt
branches/2.1.1/catalog/includes/modules/account/address_book.php
branches/2.1.1/catalog/includes/modules/account/history.php
branches/2.1.1/catalog/includes/modules/also_purchased_products.php
branches/2.1.1/catalog/includes/modules/checkout/PrCgu.php
branches/2.1.1/catalog/includes/modules/checkout/PrConfirmation.php
branches/2.1.1/catalog/includes/modules/checkout/PrPayment.php
branches/2.1.1/catalog/includes/modules/checkout/PrShipping.php
branches/2.1.1/catalog/includes/modules/downloads.php
branches/2.1.1/catalog/includes/modules/featured.php
branches/2.1.1/catalog/includes/modules/listing.php
branches/2.1.1/catalog/includes/modules/listing_cat.php
branches/2.1.1/catalog/includes/modules/listing_featured.php
branches/2.1.1/catalog/includes/modules/listing_manufacturer_products.php
branches/2.1.1/catalog/includes/modules/listing_pages.php
branches/2.1.1/catalog/includes/modules/new_products.php
branches/2.1.1/catalog/includes/modules/order_total/ot_shipping.php
branches/2.1.1/catalog/includes/modules/payment/cod.php
branches/2.1.1/catalog/includes/modules/payment/moneyorder.php
branches/2.1.1/catalog/includes/modules/product_listing.php
branches/2.1.1/catalog/includes/modules/products/desc_base.php
branches/2.1.1/catalog/includes/modules/shipping/flat.php
branches/2.1.1/catalog/includes/modules/shipping/item.php
branches/2.1.1/catalog/includes/modules/shipping/spu.php
branches/2.1.1/catalog/includes/modules/upcoming_products.php
branches/2.1.1/catalog/includes/triggers/cart_line.inc
branches/2.1.1/catalog/includes/triggers/cart_line_delete.inc
branches/2.1.1/catalog/includes/triggers/cart_totaux.inc
branches/2.1.1/catalog/includes/triggers/create_account.inc
branches/2.1.1/catalog/includes/triggers/discount_coupon.inc
branches/2.1.1/catalog/includes/triggers/search_suggest.inc
branches/2.1.1/catalog/index.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/boxe.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/footer.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.slideshow.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/sidebar.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/ssheader.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/boxes/categories.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/404.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_edit.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_history_info.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_newsletters.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_password.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/advanced_search.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_before_process.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_payment.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_payment_address.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_shipping.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_shipping_address.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_success.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/contact_us.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/content.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/create_account.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/create_account_success.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/home.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/index_listing.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/info_shopping_cart.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/login.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/new_sent_email_confirm.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/page.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/sitemap.php
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/address_book.display_view.gab
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/address_book.form_delete.gab
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/address_book.form_edit.gab
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/address_book_details.gab
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.categories.gab
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.recently_viewed.gab
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.specials.gab
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.tags.gab
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.whats_new.gab
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/triggers/cart_totaux.inc
branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/template.php
branches/2.1.1/catalog/install/includes/application.php
branches/2.1.1/catalog/install/includes/classes/core.php
branches/2.1.1/catalog/install/includes/content/core.base.php
branches/2.1.1/catalog/install/includes/content/core.configuration.php
branches/2.1.1/catalog/install/includes/content/core.installdb.php
branches/2.1.1/catalog/install/includes/content/core.modes.php
branches/2.1.1/catalog/install/includes/content/core.template_sample.php
branches/2.1.1/catalog/install/includes/functions/database.php
branches/2.1.1/catalog/install/includes/functions/html_output.php
branches/2.1.1/catalog/install/includes/language/en_EN/install.base.txt
branches/2.1.1/catalog/install/includes/language/en_EN/osc_status.txt
branches/2.1.1/catalog/install/includes/language/fr_FR/install.base.txt
branches/2.1.1/catalog/install/includes/language/fr_FR/osc_status.txt
branches/2.1.1/catalog/login.php
branches/2.1.1/catalog/logoff.php
branches/2.1.1/catalog/password_forgotten.php
branches/2.1.1/catalog/popup_image.php
branches/2.1.1/catalog/redirect.php
branches/2.1.1/catalog/templates/defaut/Childs_tpl/boxe.php
branches/2.1.1/catalog/templates/defaut/Childs_tpl/footer.php
branches/2.1.1/catalog/templates/defaut/Childs_tpl/header.php
branches/2.1.1/catalog/templates/defaut/Childs_tpl/module.php
branches/2.1.1/catalog/templates/defaut/Childs_tpl/module.slideshow.php
branches/2.1.1/catalog/templates/defaut/Childs_tpl/sidebar.php
branches/2.1.1/catalog/templates/defaut/Childs_tpl/ssheader.php
branches/2.1.1/catalog/templates/defaut/cfg/init.php
branches/2.1.1/catalog/templates/defaut/includes/boxes/categories.php
branches/2.1.1/catalog/templates/defaut/includes/boxes/categories_dropdown.php
branches/2.1.1/catalog/templates/defaut/includes/boxes/categories_tab_menu.php
branches/2.1.1/catalog/templates/defaut/includes/boxes/cms_last_post.php
branches/2.1.1/catalog/templates/defaut/includes/boxes/information.php
branches/2.1.1/catalog/templates/defaut/includes/boxes/myaccount.php
branches/2.1.1/catalog/templates/defaut/includes/boxes/recently_viewed.php
branches/2.1.1/catalog/templates/defaut/includes/boxes/search_suggest.php
branches/2.1.1/catalog/templates/defaut/includes/boxes/selections.php
branches/2.1.1/catalog/templates/defaut/includes/boxes/specials.php
branches/2.1.1/catalog/templates/defaut/includes/boxes/tags.php
branches/2.1.1/catalog/templates/defaut/includes/boxes/very_viewed.php
branches/2.1.1/catalog/templates/defaut/includes/boxes/whats_new.php
branches/2.1.1/catalog/templates/defaut/includes/content/account.php
branches/2.1.1/catalog/templates/defaut/includes/content/account_history_info.php
branches/2.1.1/catalog/templates/defaut/includes/content/advanced_search.php
branches/2.1.1/catalog/templates/defaut/includes/content/checkout_cgu.php
branches/2.1.1/catalog/templates/defaut/includes/content/checkout_confirmation.php
branches/2.1.1/catalog/templates/defaut/includes/content/checkout_payment.php
branches/2.1.1/catalog/templates/defaut/includes/content/checkout_payment_address.php
branches/2.1.1/catalog/templates/defaut/includes/content/checkout_shipping.php
branches/2.1.1/catalog/templates/defaut/includes/content/checkout_shipping_address.php
branches/2.1.1/catalog/templates/defaut/includes/content/checkout_success.php
branches/2.1.1/catalog/templates/defaut/includes/content/contact_us.php
branches/2.1.1/catalog/templates/defaut/includes/content/content.php
branches/2.1.1/catalog/templates/defaut/includes/content/create_account_success.php
branches/2.1.1/catalog/templates/defaut/includes/content/home.php
branches/2.1.1/catalog/templates/defaut/includes/content/index_listing.php
branches/2.1.1/catalog/templates/defaut/includes/content/listing_best_sellers.php
branches/2.1.1/catalog/templates/defaut/includes/content/listing_products_new.php
branches/2.1.1/catalog/templates/defaut/includes/content/listing_small_price.php
branches/2.1.1/catalog/templates/defaut/includes/content/listing_specials.php
branches/2.1.1/catalog/templates/defaut/includes/content/new_sent_email_confirm.php
branches/2.1.1/catalog/templates/defaut/includes/content/page.php
branches/2.1.1/catalog/templates/defaut/includes/content/product_info.php
branches/2.1.1/catalog/templates/defaut/includes/content/shopping_cart.php
branches/2.1.1/catalog/templates/defaut/includes/content/sitemap.php
branches/2.1.1/catalog/templates/defaut/includes/gabarit/address_book/display_view.delete.gab
branches/2.1.1/catalog/templates/defaut/includes/gabarit/address_book/display_view.edit.gab
branches/2.1.1/catalog/templates/defaut/includes/gabarit/address_book/display_view.page.gab
branches/2.1.1/catalog/templates/defaut/includes/gabarit/address_book_details.gab
branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.myaccount.gab
branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.recently_viewed.gab
branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.specials.gab
branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.tags.gab
branches/2.1.1/catalog/templates/defaut/includes/gabarit/box.whats_new.gab
branches/2.1.1/catalog/templates/defaut/includes/gabarit/history/account.display_view.page.gab
branches/2.1.1/catalog/templates/defaut/includes/gabarit/history/box_view.gab
branches/2.1.1/catalog/temp...
[truncated message content] |
|
From: <os...@us...> - 2013-03-13 15:09:30
|
Revision: 4714
http://oscss.svn.sourceforge.net/oscss/?rev=4714&view=rev
Author: oscim
Date: 2013-03-13 15:09:16 +0000 (Wed, 13 Mar 2013)
Log Message:
-----------
fix bug seo vs datatype content
fix data content in FO and BO
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt
branches/2.1.1/catalog/admin/includes/modules/content/header_tags.php
branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php
branches/2.1.1/catalog/common/classes/datatype_drivers/Data_content.php
branches/2.1.1/catalog/includes/classes/drivers/data/content.php
Modified: branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php 2013-03-12 13:07:08 UTC (rev 4713)
+++ branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php 2013-03-13 15:09:16 UTC (rev 4714)
@@ -246,21 +246,30 @@
foreach($cInfo_array as $row) {
- // call all langue for this post
- for ($i=0, $n=sizeof($list_languages); $i<$n; $i++) {
- $language_id = $list_languages[$i]['id'];
- $content_query = $DB->query("select cd.content_text, cd.content_title from " . TABLE_CONTENT_DESCRIPTION . " cd where cd.content_id = '" . (int)$row['content_id'] . "' AND language_id='" . $language_id . "'");
- $content = tep_db_fetch_array($content_query);
+ if(!isset($option['language_id'])){
+ // call all langue for this post
+ for ($i=0, $n=sizeof($list_languages); $i<$n; $i++) {
+ $language_id = $list_languages[$i]['id'];
+ $content_query = $DB->query("select cd.content_text, cd.content_title from " . TABLE_CONTENT_DESCRIPTION . " cd where cd.content_id = '" . (int)$row['content_id'] . "' AND language_id='" . $language_id . "'");
+ $content = tep_db_fetch_array($content_query);
- $row['text'][$language_id] = $content['content_text'];
- $row['title'][$language_id] = $content['content_title'];
+ $row['text'][$language_id] = $content['content_text'];
+ $row['title'][$language_id] = $content['content_title'];
- tep_db_free_result($content_query);
- }
+ tep_db_free_result($content_query);
+ }
+ }
+ else{
+ $language_id = (int)$option['language_id'];
+ $content_query = $DB->query("select cd.content_text, cd.content_title from " . TABLE_CONTENT_DESCRIPTION . " cd where cd.content_id = '" . (int)$row['content_id'] . "' AND language_id='" . $language_id . "'");
+ $content = $content_query->fetchAssoc();
+ $row['text'][$language_id] = $content['content_text'];
+ $row['title'][$language_id] = $content['content_title'];
+ tep_db_free_result($content_query);
+ }
-
/**
TODO Couplage avec MLinkto + datatype actif
*/
Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt 2013-03-12 13:07:08 UTC (rev 4713)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt 2013-03-13 15:09:16 UTC (rev 4714)
@@ -43,6 +43,12 @@
$lang['image create new content']="Créer une page" ;
+/* Form Add new */
+ /* */
+ $lang['text new content']="Ajout d'un nouveau contenu" ;
+ $lang['text content type']="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 */
/* */
$lang['heading title edit']="Édition d'une page" ;
Modified: branches/2.1.1/catalog/admin/includes/modules/content/header_tags.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/content/header_tags.php 2013-03-12 13:07:08 UTC (rev 4713)
+++ branches/2.1.1/catalog/admin/includes/modules/content/header_tags.php 2013-03-13 15:09:16 UTC (rev 4714)
@@ -152,6 +152,7 @@
*/
public static function load_db_values ($content_id) {
$arr ['content_id'] = $content_id;
+
$arr=array_merge(array('content_id'=>$content_id) ,parent::load_db_values ($content_id, 'content') );
self::$pInfo->objectInfo($arr);
}
@@ -161,6 +162,7 @@
Draw
*/
public function display_edit(&$contents) {
+ $this->load_db_values (cms_content::$Id);
$contents []=array('title'=> __('tab meta'),'text'=>tep_get_include_contents(__CLASS__.'.form'));
}
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php 2013-03-12 13:07:08 UTC (rev 4713)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php 2013-03-13 15:09:16 UTC (rev 4714)
@@ -434,14 +434,14 @@
self::$modules-> set_image_handler();
self::$languages = tep_get_languages();
- $actions['action'] = self::$action;
- $actions['display_file']='';
- $actions['action_class']=(isset($_GET['action_class']))? $_GET['action_class'] : '';
- $actions['action_method']=(isset($_GET['action_method']))? $_GET['action_method'] : '';
+// $actions['action'] = self::$action;
+// $actions['display_file']='';
+// $actions['action_class']=(isset($_GET['action_class']))? $_GET['action_class'] : '';
+// $actions['action_method']=(isset($_GET['action_method']))? $_GET['action_method'] : '';
// Ask categories modules if want to change the action
- $actions = self::$modules->check_action($actions);
- $action = $actions['action'];
+ /*$action =*/ self::$modules->check_action(self::$action);
+// $action = $actions['action'];
switch (self::$action) {
Modified: branches/2.1.1/catalog/common/classes/datatype_drivers/Data_content.php
===================================================================
--- branches/2.1.1/catalog/common/classes/datatype_drivers/Data_content.php 2013-03-12 13:07:08 UTC (rev 4713)
+++ branches/2.1.1/catalog/common/classes/datatype_drivers/Data_content.php 2013-03-13 15:09:16 UTC (rev 4714)
@@ -106,8 +106,9 @@
/**
+ @fn is_type($mode='unique')
@brief test si la page est du type produits
- @param $mode le type de control (page/cpath/seo)
+ @param $mode string le type de control (page/cpath/seo)
*/
function is_type($mode='unique'){
switch(strtolower($mode)){
@@ -129,6 +130,7 @@
/**
+ @fn GetcPath()
@brief calcul du cpath specifique a ce tyep de donnée
*/
function GetcPath(){
@@ -136,6 +138,7 @@
}
/**
+ @fn SeoGetQuery($mode, $subtype, $id, $language_id)
@brief Prepare an retrun result Seo request
@param $mode string anchor key used
@param $subtype Not used
@@ -154,12 +157,9 @@
switch($mode){
case 't':
default:
- $sql = "select ft.page_id as ID, head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='".$this->DataType."' and ftd.language_id = '" . (int)$language_id. "' Limit 1";
- $rsql = $DB->query($sql);
- if(!$rsql->__get('numRows')) {
- $sql = "select c.content_id as ID, content_title as tName from " . TABLE_CONTENT . " c LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " cd ON(c.content_id=cd.content_id) where ".DataForceStatus(" ".$this->p.".content_status='1' ")." and c.content_id='".(int)$id."' and cd.language_id='".(int)$language_id."' Limit 1" ;
+ $sql = "select c.content_id as ID, content_title as tName from " . TABLE_CONTENT . " c LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " cd ON(c.content_id=cd.content_id) where ".DataForceStatus(" ".$this->p.".content_status='1' ")." and c.content_id='".(int)$id."' and cd.language_id='".(int)$language_id."' Limit 1" ;
$rsql = $DB->query($sql);
- }
+
$result = $rsql->fetchAssoc();
$result['head_desc_tag']=(isset($result['head_desc_tag'])?$result['head_desc_tag']:'');
$result['head_keywords_tag']=(isset($result['head_keywords_tag'])?$result['head_keywords_tag']:'');
@@ -170,6 +170,7 @@
return $result;
}
+
/**
@brief Prepare an dgenere all cache for divers
*/
@@ -177,7 +178,6 @@
global $languages_id;
$DB=Database::getInstance();
$return_array = array();
-
if( _test_bool('SEO_ADD_CAT_PARENT') )
$res=$DB->query( "select ft.page_id as ID, head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='content' and ftd.language_id = '" . (int)$languages_id. "'" );
else
@@ -198,7 +198,6 @@
$return_array[] = array ($result['ID'], $result, 'CONTENT') ;
}
-
return $return_array;
}
@@ -208,7 +207,7 @@
@brief calcul du cpath specifique a ce tyep de donnée
*/
function FO_load_page(){
- global $aca_product,$product_info, $page_content, $language, $cPath, $languages_id;
+ global $aca_content,$product_info, $page_content, $language, $cPath, $languages_id;
$page = page::getInstance();
$DB=Database::getInstance();
@@ -280,6 +279,8 @@
return $this;
break;
+
+
case 'unique':
$page->init('content.php',$language);
$breadcrumb=$page->return_object('breadcrumb');
@@ -287,6 +288,17 @@
// call transversal load in other modules
DataTypes::transversal('transversal');
+ /** init aca module */
+ $aca_content=$page->new_class('content',true);
+
+ if (isset($_GET['action'])) {
+ $action=(string)tep_db_prepare_input($_GET['action']);
+ if ($aca_content->check_action('',$action) ) {
+ $aca_content->after_check_action('',$action);
+ tep_redirect(tep_href_link('content.php', tep_get_all_get_params(array('action'))));
+ }
+ }
+
$content = content::get_item((int)$_GET['content']);
$page->title=$content->title;
Modified: branches/2.1.1/catalog/includes/classes/drivers/data/content.php
===================================================================
--- branches/2.1.1/catalog/includes/classes/drivers/data/content.php 2013-03-12 13:07:08 UTC (rev 4713)
+++ branches/2.1.1/catalog/includes/classes/drivers/data/content.php 2013-03-13 15:09:16 UTC (rev 4714)
@@ -15,7 +15,9 @@
@class content
Control init et gestion des data product
*/
-class content {
+class content
+ Extends DataTypeFactory
+ {
//! @p object
protected static $_instance;
@@ -23,8 +25,21 @@
public static $modules;
+ /**
+ */
+ protected function __construct($full) {
+ global $languages_id;
+// productData::start();
+ if($full) self::start_module();
+ }
+
+ protected static function Getmodule(){
+ $pdm=contentModule::getInstance();
+ return $pdm;
+ }
+
protected function start_module(){
- $pdm=contentModule::getInstance();
+ $pdm=self::Getmodule();
self::$modules=$pdm->ret_modules();
return $pdm;
}
@@ -40,8 +55,6 @@
}
-
-
/**
Data function
*/
@@ -147,7 +160,7 @@
Requeteur
*/
protected static function cstr_query($orderby='', $limit='', $option=''){
- $query="SELECT content_title AS title, c.content_id AS id, c.content_name AS name, content_text AS text, c.date_added as date_added, ctc.categories_id
+ $query="SELECT content_title AS title, c.content_id AS id, c.content_type AS type, c.content_name AS name, content_text AS text, c.date_added as date_added, ctc.categories_id
FROM " . TABLE_CONTENT_DESCRIPTION . " cd, " . TABLE_CONTENT . " c, " . TABLE_CONTENT_TO_CATEGORIES . " ctc, " . TABLE_CATEGORIES . " cat
WHERE cat.categories_id=ctc.categories_id " . DataForceStatus(" AND cat.categories_status='1' ") . " " . DataForceStatus(" AND c.content_status = '1' ") . " AND c.content_id = ctc.content_id AND cd.content_id = ctc.content_id AND cd.language_id = '" . self::$lg_id . "' " ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-03-12 13:07:19
|
Revision: 4713
http://oscss.svn.sourceforge.net/oscss/?rev=4713&view=rev
Author: oscim
Date: 2013-03-12 13:07:08 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
correction, lang fr et en
Modified Paths:
--------------
branches/2.1.1/catalog/includes/languages/fr_FR/fr_FR.php
trunk/language/en_EN/includes/languages/en_EN/boxes/checkout_progressbar.txt
trunk/language/en_EN/includes/languages/en_EN/modules/order_total/ot_subtotal.txt
trunk/language/en_EN/includes/languages/en_EN/modules/order_total/ot_total.txt
trunk/language/en_EN/includes/languages/en_EN/shopping_cart.php
Added Paths:
-----------
trunk/language/en_EN/includes/languages/en_EN/modeles/
trunk/language/en_EN/includes/languages/en_EN/modules/account/history.txt
Modified: branches/2.1.1/catalog/includes/languages/fr_FR/fr_FR.php
===================================================================
--- branches/2.1.1/catalog/includes/languages/fr_FR/fr_FR.php 2013-02-23 21:58:50 UTC (rev 4712)
+++ branches/2.1.1/catalog/includes/languages/fr_FR/fr_FR.php 2013-03-12 13:07:08 UTC (rev 4713)
@@ -21,7 +21,7 @@
define('DATE_FORMAT', 'd/m/Y'); // this is used for date()
define('DATE_TIME_FORMAT',"".DATE_FORMAT_SHORT . " %H:%M:%S" );
-// all date (dd/mm) public holiday in country
+// all date (dd/mm) public holiday in country
define('CALENDAR_PUBLIC_HOLIDAY',"01/01;01/05;08/05;14/07;15/08;01/11;11/11;25/12");
@@ -282,7 +282,7 @@
define('IMAGE_BUTTON_ADDRESS_BOOK',"Carnet d'adresses" );
define('IMAGE_BUTTON_BACK',"Retour" );
define('IMAGE_BUTTON_BUY_NOW',"Acheter maintenant" );
-define('IMAGE_BUTTON_CHANGE_ADDRESS',"Changez l'adresse" );
+define('IMAGE_BUTTON_CHANGE_ADDRESS',"Changer l'adresse" );
define('IMAGE_BUTTON_CHECKOUT',"Commander" );
define('IMAGE_BUTTON_CONFIRM_ORDER',"Confirmer la commande" );
define('IMAGE_BUTTON_CONTINUE',"Continuer" );
Modified: trunk/language/en_EN/includes/languages/en_EN/boxes/checkout_progressbar.txt
===================================================================
--- trunk/language/en_EN/includes/languages/en_EN/boxes/checkout_progressbar.txt 2013-02-23 21:58:50 UTC (rev 4712)
+++ trunk/language/en_EN/includes/languages/en_EN/boxes/checkout_progressbar.txt 2013-03-12 13:07:08 UTC (rev 4713)
@@ -1,15 +1,16 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 18/11/10, 17:52
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ @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 10/03/2013, 22:44
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
*/
-$lang['box progressbar init']= 'Abstract';
-$lang['box progressbar shipping']= 'shipping';
-$lang['box progressbar payement']= 'payement';
-$lang['box progressbar confirm']= 'confirm';
+$lang['box progressbar init']= 'Summary';
+$lang['box progressbar shipping']= 'Shipping';
+$lang['box progressbar payement']= 'Payement';
+$lang['box progressbar confirm']= 'Confirm';
$lang['box progressbar finish']= 'Success';
?>
\ No newline at end of file
Added: trunk/language/en_EN/includes/languages/en_EN/modules/account/history.txt
===================================================================
--- trunk/language/en_EN/includes/languages/en_EN/modules/account/history.txt (rev 0)
+++ trunk/language/en_EN/includes/languages/en_EN/modules/account/history.txt 2013-03-12 13:07:08 UTC (rev 4713)
@@ -0,0 +1,35 @@
+<?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 10/03/2013, 22:44
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+ /* Bouton/liens */
+ $lang['history small image button view']="Afficher" ;
+ $lang['history pdf link']="Pdf" ;
+
+ /* Widget */
+ $lang['history widget view']="My all ordres" ;
+
+ /* Pleine page */
+ $lang['history heading listing']="Orders History" ;
+
+ $lang['history table heading order number']="Num" ;
+ $lang['history table heading order status']="Status" ;
+ $lang['history table heading order date']="Date" ;
+ $lang['history table heading order products']="Product(s)" ;
+ $lang['history table heading order cost']="Price" ;
+ $lang['history table heading order action']="" ;
+
+ $lang['history text display number of orders %s']="Affichage de la page %s" ;
+ $lang['history text result page']="Nombre de pages " ;
+
+ $lang['history no resultat orders']="No orders " ;
+
+
+?>
\ No newline at end of file
Modified: trunk/language/en_EN/includes/languages/en_EN/modules/order_total/ot_subtotal.txt
===================================================================
--- trunk/language/en_EN/includes/languages/en_EN/modules/order_total/ot_subtotal.txt 2013-02-23 21:58:50 UTC (rev 4712)
+++ trunk/language/en_EN/includes/languages/en_EN/modules/order_total/ot_subtotal.txt 2013-03-12 13:07:08 UTC (rev 4713)
@@ -1,12 +1,12 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 15/07/10, 20:00
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ @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 10/03/2013, 22:44
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
*/
$lang['module order total subtotal title']='Sub-Total';
$lang['module order total subtotal description']='Order Sub-Total';
Modified: trunk/language/en_EN/includes/languages/en_EN/modules/order_total/ot_total.txt
===================================================================
--- trunk/language/en_EN/includes/languages/en_EN/modules/order_total/ot_total.txt 2013-02-23 21:58:50 UTC (rev 4712)
+++ trunk/language/en_EN/includes/languages/en_EN/modules/order_total/ot_total.txt 2013-03-12 13:07:08 UTC (rev 4713)
@@ -1,13 +1,13 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 15/07/10, 20:00
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ @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 10/03/2013, 22:44
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
*/
$lang['module order total total title']='Total';
-$lang['module order total total description']='Total Commande';
+$lang['module order total total description']='Order Total';
?>
\ No newline at end of file
Modified: trunk/language/en_EN/includes/languages/en_EN/shopping_cart.php
===================================================================
--- trunk/language/en_EN/includes/languages/en_EN/shopping_cart.php 2013-02-23 21:58:50 UTC (rev 4712)
+++ trunk/language/en_EN/includes/languages/en_EN/shopping_cart.php 2013-03-12 13:07:08 UTC (rev 4713)
@@ -1,9 +1,9 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @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 12/12/10, 14:47
+ @version 2.1.1
+ @date 0703/2013, 16:45
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -12,13 +12,20 @@
define('TABLE_HEADING_REMOVE', 'Remove');
define('TABLE_HEADING_PRODUCTS', 'Product(s)');
define('TABLE_HEADING_TOTAL', 'Total');
-define('TEXT_CART_EMPTY', 'Your Shopping Cart is empty!');
-define('SUB_TITLE_SUB_TOTAL', 'Sub-Total:');
-define('SUB_TITLE_WEIGHT_TOTAL', 'Weight:');
+define('HEADING_PRODUCTS_TAXE',"Tax" );
+define('HEADING_PRODUCTS_TOT_TAXE',"Total Taxe" );
+define('HEADING_PRODUCTS_TOT_TTC',"Total" );
+define('HEADING_PRODUCTS_PRICE_U',"Price" );
+define('HEADING_PRODUCTS_QTY',"Qty" );
+
+define('SUB_TITLE_SUB_TOTAL',"Sub-Total : " );
+define('SUB_TITLE_WEIGHT_TOTAL',"Weight : " );
define('SUB_TITLE_TOTAL', 'Total:');
-define('OUT_OF_STOCK_CANT_CHECKOUT', 'Products marked with ' . STOCK_MARK_PRODUCT_OUT_OF_STOCK . ' don\'t exist in desired quantity in our stock.<br />Please alter the quantity of products marked with (' . STOCK_MARK_PRODUCT_OUT_OF_STOCK . '), Thank you');
-define('OUT_OF_STOCK_CAN_CHECKOUT', 'Products marked with ' . STOCK_MARK_PRODUCT_OUT_OF_STOCK . ' don\'t exist in desired quantity in our stock.<br />You can buy them anyway and check the quantity we have in stock for immediate deliver in the checkout process.');
+
+define('OUT_OF_STOCK_CANT_CHECKOUT', 'Products marked with %s dont exist in desired quantity in our stock.<br />Please alter the quantity of products marked with (%s), Thank you');
+define('OUT_OF_STOCK_CAN_CHECKOUT', 'Products marked with %s dont exist in desired quantity in our stock.<br />You can buy them anyway and check the quantity we have in stock for immediate deliver in the checkout process.');
define('TEXT_CART_DEL_CONFIRM', 'Would you like to delete this product?');
+
define('MY_CART_LEGEND', 'My Cart');
define('MY_CART_QTY', 'Qty');
define('SHOPPING_CART_TOTAL', 'Total:');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-02-23 21:59:02
|
Revision: 4712
http://oscss.svn.sourceforge.net/oscss/?rev=4712&view=rev
Author: oscim
Date: 2013-02-23 21:58:50 +0000 (Sat, 23 Feb 2013)
Log Message:
-----------
ajout d'une classe manquante
Added Paths:
-----------
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontentextra.php
Added: branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontentextra.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontentextra.php (rev 0)
+++ branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontentextra.php 2013-02-23 21:58:50 UTC (rev 4712)
@@ -0,0 +1,174 @@
+<?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
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 12/02/2013, 20:11
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+
+*/
+
+
+
+
+class sqlcontentextra
+ implements ModSqlDataDriver{
+
+
+ /**
+ @brief create new ligne in table configuration
+ */
+ public static function create($option){
+
+// if(!isset($option['key'])) return 'key';
+
+ if(isset($option['id'])) $sql_data_array['content_id'] = $option['id'];
+ if(isset($option['key'])) $sql_data_array['cat_key'] = strtoupper($option['key']);
+ if(isset($option['value'])) $sql_data_array['cat_value '] = $option['value'];
+
+
+ $res=tep_db_perform(TABLE_CONTENT_EXTRA, $sql_data_array);
+
+ if(!$res)
+ return $res;
+ else
+ return $res->__get('insertId');
+ }
+
+
+
+ /**
+ @brief update ligne in table configuration
+ */
+ public static function update($option){
+
+// if(!isset($option['id'])) return ' id';
+
+ $where ='';
+ if(isset($option['id'])) $where .="AND content_id = '".(int)$option['id']."' ";
+ if(isset($option['key'])) $where .="AND cat_key = '".(string)strtoupper(tep_db_input($option['key']))."' ";
+
+ if(isset($option['id'])) $sql_data_array['content_id'] = $option['id'];
+ if(isset($option['key'])) $sql_data_array['cat_key'] = $option['key'];
+ if(isset($option['value'])) $sql_data_array['cat_value '] = $option['value'];
+
+
+
+
+ $res=tep_db_perform(TABLE_CONTENT_EXTRA, $sql_data_array, 'update' , substr($where,3) );
+
+ return $res;
+ }
+
+ /**
+ @brief load ligne in table configuration
+ @param option array
+ id => row id int (configuration_id)
+ key => string key (configuration_key)
+ group_id => group_id int (configuration_group_id)
+
+ @return
+
+ object(stdClass)[13]
+ public 'id' => string '1' (length=1)
+
+ OR
+ array(
+ object(stdClass)[13]
+ ...
+ object(stdClass)[13]
+ ..
+ )
+
+ */
+ public static function fetch($option,$shortkey=false){
+ $DB=Database::getInstance();
+
+ $sql ="";
+ if(isset($option['id'])) $sql .="AND content_id = '".(int)$option['id']."' ";
+ if(isset($option['key'])) $sql .="AND cat_key = '".(string)strtoupper(tep_db_input($option['key']))."' ";
+
+ if($sql =='')
+ return false;
+
+ $sql ="SELECT * FROM ".TABLE_CONTENT_EXTRA." WHERE ".substr($sql,3);
+
+ $res=$DB->query($sql);
+
+ $num = $res->__get('numRows');
+
+ if($num == 1){
+ $result=$res->fetchAssoc();
+ return ((!$shortkey)? $result : self::CleanKey($result));
+ }
+ elseif($num > 1){
+ $array=array();
+
+ foreach($res->fetchAllAssoc() as $result)
+ $array[]= ((!$shortkey)? $result : self::CleanKey($result));
+
+ return $array;
+ }
+
+ return false;
+ }
+
+ /**
+ @brief delete row
+ */
+ public static function delete($option){
+ $DB=Database::getInstance();
+
+ $sql ="";
+ if(isset($option['id'])) $sql .="AND content_id = '".(int)$option['id']."' ";
+ if(isset($option['key'])) $sql .="AND cat_key = '".(string)tep_db_input($option['key'])."' ";
+
+ if(strlen($sql)==0)
+ return false;
+
+ $sql ="DELETE FROM ".TABLE_CONTENT_EXTRA." WHERE ".substr($sql,3);
+
+ $res=$DB->query($sql);
+
+ return $res;
+ }
+
+ /**
+ @fn CleanKey()
+ @brief Clean string name key
+ */
+ private static function CleanKey($array){
+
+ $object= new stdclass();
+
+ foreach($array as $key=>$value){
+
+ $object->$key = $value;
+ }
+
+ return $object;
+ }
+
+ /**
+ @brief
+ @return array empty
+ */
+ public static function Specimen($shortkey=false){
+
+ $par = array(
+ 'content_id' =>-1,
+ 'cat_key' =>'',
+ 'cat_value' =>'',
+
+ );
+
+ return ((!$shortkey)? $par : self::CleanKey($par));
+ }
+
+}
+
+
+
+?>
\ 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...> - 2013-02-23 21:19:47
|
Revision: 4711
http://oscss.svn.sourceforge.net/oscss/?rev=4711&view=rev
Author: oscim
Date: 2013-02-23 21:19:35 +0000 (Sat, 23 Feb 2013)
Log Message:
-----------
ajout d'une classe manquante
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php
Modified: branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php 2013-02-12 19:05:43 UTC (rev 4710)
+++ branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php 2013-02-23 21:19:35 UTC (rev 4711)
@@ -1,16 +1,15 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 02/02/2012, 20:11
+ @date 12/02/2013, 20:11
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
- @class sqlcontent
+
*/
-
class sqlcontent
implements ModSqlDataDriver{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-02-12 19:05:52
|
Revision: 4710
http://oscss.svn.sourceforge.net/oscss/?rev=4710&view=rev
Author: oscim
Date: 2013-02-12 19:05:43 +0000 (Tue, 12 Feb 2013)
Log Message:
-----------
correction appel cronfile en cli
Modified Paths:
--------------
branches/2.1.1/catalog/admin/cronfile.php
branches/2.1.1/catalog/admin/includes/appli_top_Test.php
branches/2.1.1/catalog/admin/includes/application_bottom.php
Modified: branches/2.1.1/catalog/admin/cronfile.php
===================================================================
--- branches/2.1.1/catalog/admin/cronfile.php 2013-02-12 17:43:48 UTC (rev 4709)
+++ branches/2.1.1/catalog/admin/cronfile.php 2013-02-12 19:05:43 UTC (rev 4710)
@@ -1,9 +1,9 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @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 05/01/11, 22:01
+ @version 2.1.1
+ @date 12/02/2013, 22:01
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@brief file for call cron job in oscss core
@@ -15,13 +15,19 @@
$_REQUEST=array();
$_GET['page_admin']=substr(basename(__FILE__),0,-4);
-if (file_exists('includes/local/application_top.php')) include('includes/local/application_top.php');
-else require('includes/application_top.php');
+if(php_sapi_name() == "cli") {
+ //In cli-mode
+ require('includes/appli_top_Test.php');
+} else {
+ //Not in cli-mode
+ if (file_exists('includes/local/application_top.php')) include('includes/local/application_top.php');
+ else require('includes/application_top.php');
+}
require(DIR_WS_MODULES.'pages/cronjob.php');
cronjob::ExeCron();
require(DIR_WS_INCLUDES . 'application_bottom.php');
+echo 'finish'."\n";
?>
-finish
\ No newline at end of file
Modified: branches/2.1.1/catalog/admin/includes/appli_top_Test.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/appli_top_Test.php 2013-02-12 17:43:48 UTC (rev 4709)
+++ branches/2.1.1/catalog/admin/includes/appli_top_Test.php 2013-02-12 19:05:43 UTC (rev 4710)
@@ -15,6 +15,8 @@
*/
+ //! Active mode CLI
+ define('OSCSS_MODE_CLI', true );
//! Start the clock for the page parse time log
define('PAGE_PARSE_START_TIME', microtime());
Modified: branches/2.1.1/catalog/admin/includes/application_bottom.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/application_bottom.php 2013-02-12 17:43:48 UTC (rev 4709)
+++ branches/2.1.1/catalog/admin/includes/application_bottom.php 2013-02-12 19:05:43 UTC (rev 4710)
@@ -10,14 +10,13 @@
\brief is close core pages
*/
+/// force exit if cli mode
+if(defined('OSCSS_MODE_CLI'))
+ return ;
+$navigation->add_current_page();
- $navigation->add_current_page();
-
-
?>
-
-
<?php
/**
Replace messageStack display generated php by javascript notification
@@ -47,7 +46,7 @@
<?php
- if(!isset($_GET['forceajax']) )
+ if(!isset($_GET['forceajax']) && is_object($messageStack))
$messageStack->reset() ;
//! close session (store variables)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-02-12 17:43:55
|
Revision: 4709
http://oscss.svn.sourceforge.net/oscss/?rev=4709&view=rev
Author: oscim
Date: 2013-02-12 17:43:48 +0000 (Tue, 12 Feb 2013)
Log Message:
-----------
suppression element devenu obsolete
Removed Paths:
-------------
branches/2.1.1/catalog/admin/includes/gabarit/adminNotif/display_view.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/adminNotif/display_view.view.gab
Deleted: branches/2.1.1/catalog/admin/includes/gabarit/adminNotif/display_view.listing.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/adminNotif/display_view.listing.gab 2013-02-12 17:42:29 UTC (rev 4708)
+++ branches/2.1.1/catalog/admin/includes/gabarit/adminNotif/display_view.listing.gab 2013-02-12 17:43:48 UTC (rev 4709)
@@ -1,65 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 09/12/2012, 10:34
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<h3><?php echo __('heading title'); ?></h3>
-
- <div class="button_nav">
- <?php printf(CsrtAction::getLink('button_nav', __('image notification config list') ), '', tep_href_link(adminNotif::FILENAME, 'action=config') ,'' ); ?>
- </div>
-
-<div class="box_uniq">
- <?php echo tep_draw_form('multi', adminNotif::FILENAME, 'action=multi', 'post') ?>
- <table class="dataTable">
- <thead>
- <tr>
- <th colspan="2"><?php echo __('table heading notif id'); ?></th>
- <th><?php echo __('table heading type'); ?></th>
- <th class="tcenter"><?php echo __('table heading keys'); ?></th>
- <th class="tcenter"><?php echo __('table heading date'); ?></th>
- <th class="row_action"><?php echo __('table heading action'); ?></th>
- </tr>
- </thead>
- <tfoot>
- <tr>
- <td colspan="2"><?php echo tep_draw_checkbox_field('select_all', 'select_all' ); ?></td>
- <td colspan="4"><?php printf(CsrtAction::getButton('button_action', IMAGE_DELETE, 'delete'), '', ' name="delete" ' ); ?></td>
- </tr>
- </tfoot>
- <tbody>
- <?php foreach(adminNotif::$list as $notif): ?>
- <tr class="view parent dataTableRow <?php if ((!isset($_GET['mID'])) || ($_GET['mID'] == $notif['admin_id']) ) echo "Selected"; ?>" >
- <td><?php echo tep_draw_checkbox_field('multi['.$notif['notif_id'].']', 'multi_'.$notif['notif_id'] ,'','','','class="multi"' ); ?></td>
- <td><?php echo $notif['notif_id']; ?></td>
- <td><?php echo ($notif['notif_type']==0)? __('type user') : __('type group') ; ?></td>
- <td class="tcenter"><?php echo $notif['notif_key']; ?></td>
- <td class="tcenter"><?php echo tep_datetime_short($notif['notif_date']); ?></td>
- <td class="w_20">
- <?php
- printf(
- CsrtAction::getFormat('row_action'),
- ((isset($notif['customers_id']) && !empty($notif['customers_id']) )
- ?tep_customers_row_action($notif['customers_id'], array('origin'=>adminNotif::FILENAME))
- : (!empty($notif['user_email'])? ' <a href="mailto:'.$notif['user_email'].'" >'.$notif['user'].'</a>' : '')
- ),
-
-// sprintf(CsrtAction::getLink('row_action_right', __('@adminNotif image reload mail'), 'reload'), '', tep_href_link(FILENAME_MAIL, 'customer='..'action=usemod&mod=adminNotif&id=' . $notif['notif_id'] . '') ,'' ).
- sprintf(CsrtAction::getLink('row_action_right', IMAGE_VIEW, 'view'), 'fancyView', tep_href_link(adminNotif::FILENAME, 'nID=' . $notif['notif_id'] . '&action=view') ,'' ).
- sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), '', tep_href_link(adminNotif::FILENAME, 'nID=' . $notif['notif_id'] . '&action=delete') ,'' )
-
- );
- ?>
- </td>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
- </form>
-</div>
\ No newline at end of file
Deleted: branches/2.1.1/catalog/admin/includes/gabarit/adminNotif/display_view.view.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/adminNotif/display_view.view.gab 2013-02-12 17:42:29 UTC (rev 4708)
+++ branches/2.1.1/catalog/admin/includes/gabarit/adminNotif/display_view.view.gab 2013-02-12 17:43:48 UTC (rev 4709)
@@ -1,15 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 11/02/11, 09:43
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
-?>
-<div class="box_uniq">
- <?php echo adminNotif::get_right_bar(); ?>
-</div>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-02-12 17:42:40
|
Revision: 4708
http://oscss.svn.sourceforge.net/oscss/?rev=4708&view=rev
Author: oscim
Date: 2013-02-12 17:42:29 +0000 (Tue, 12 Feb 2013)
Log Message:
-----------
modification des notification et creation d'une page specifique a leur visualisation/gestion
separation de la configuration des notification
ajout element gabarit et fr , ajout lien dans section hidden
mise a niveau filename
mise a niveau des appel en dur dans les template du BO
correction cms_content sur format de requets sql
ajout commentaire dans la section des notifications
Modified Paths:
--------------
branches/2.1.1/catalog/Documents/oscss.version.xml
branches/2.1.1/catalog/admin/includes/boxes/00_hidden.php
branches/2.1.1/catalog/admin/includes/classes/ModTwo.php
branches/2.1.1/catalog/admin/includes/filenames.php
branches/2.1.1/catalog/admin/includes/gabarit/adminNotif/display_view.config.gab
branches/2.1.1/catalog/admin/includes/modules/pages/adminNotif.php
branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php
branches/2.1.1/catalog/admin/includes/template/defaut/header-1.php
branches/2.1.1/catalog/admin/includes/template/oscss/header-1.php
branches/2.1.1/catalog/common/classes/notification.php
Added Paths:
-----------
branches/2.1.1/catalog/admin/includes/gabarit/usersNotif/
branches/2.1.1/catalog/admin/includes/gabarit/usersNotif/display_view.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/usersNotif/display_view.view.gab
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/usersNotif.txt
branches/2.1.1/catalog/admin/includes/modules/pages/usersNotif.php
Modified: branches/2.1.1/catalog/Documents/oscss.version.xml
===================================================================
--- branches/2.1.1/catalog/Documents/oscss.version.xml 2013-02-12 16:26:25 UTC (rev 4707)
+++ branches/2.1.1/catalog/Documents/oscss.version.xml 2013-02-12 17:42:29 UTC (rev 4708)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<core>
<version>2.1.1 (beta)</version>
- <svn>4405</svn>
+ <svn>4707</svn>
<level>unstable</level>
<template_admin>oscss</template_admin>
Modified: branches/2.1.1/catalog/admin/includes/boxes/00_hidden.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/boxes/00_hidden.php 2013-02-12 16:26:25 UTC (rev 4707)
+++ branches/2.1.1/catalog/admin/includes/boxes/00_hidden.php 2013-02-12 17:42:29 UTC (rev 4708)
@@ -19,6 +19,8 @@
$tabl_link[]= array(FILENAME_PACKAGE, '', '');
$tabl_link[]= array(FILENAME_ADMIN_MEMBERS, '', '');
$tabl_link[]= array('document.php', '', '');
+// element user
+ $tabl_link[]= array(FILENAME_USERSNOTIF, '', '');
/* tinybroswer */
$tabl_link[]= array('editeur/tiny_mce/plugins/tinybrowser/tinybrowser.php', '', '');
Modified: branches/2.1.1/catalog/admin/includes/classes/ModTwo.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/ModTwo.php 2013-02-12 16:26:25 UTC (rev 4707)
+++ branches/2.1.1/catalog/admin/includes/classes/ModTwo.php 2013-02-12 17:42:29 UTC (rev 4708)
@@ -1,9 +1,9 @@
<?php
/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 30/04/2012, 09:17
+ @date 12/02/2013, 09:17
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
Modified: branches/2.1.1/catalog/admin/includes/filenames.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/filenames.php 2013-02-12 16:26:25 UTC (rev 4707)
+++ branches/2.1.1/catalog/admin/includes/filenames.php 2013-02-12 17:42:29 UTC (rev 4708)
@@ -68,6 +68,9 @@
define('FILENAME_TAX_CLASSES', 'tax_classes.php');
define('FILENAME_TEMPLATES', 'templates.php');
+
+define('FILENAME_USERSNOTIF', 'usersNotif.php');
+
/* Public */
define('FILENAME_CATALOG_PRODUCT_INFO', 'product_info.php');
define('FILENAME_CATALOG_ACCOUNT_HISTORY_INFO', 'account_history_info.php');
Modified: branches/2.1.1/catalog/admin/includes/gabarit/adminNotif/display_view.config.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/adminNotif/display_view.config.gab 2013-02-12 16:26:25 UTC (rev 4707)
+++ branches/2.1.1/catalog/admin/includes/gabarit/adminNotif/display_view.config.gab 2013-02-12 17:42:29 UTC (rev 4708)
@@ -17,7 +17,7 @@
<div class="button_nav">
<?php printf(CsrtAction::getLink('button_nav', __('image new notification') ), '', tep_href_link(adminNotif::FILENAME, 'action=confignew') ,'' );
- printf(CsrtAction::getLink('button_nav', __('image notification list') ), '', tep_href_link(adminNotif::FILENAME ) ,'' ); ?>
+ printf(CsrtAction::getLink('button_nav', __('image notification list') ), '', tep_href_link(FILENAME_USERSNOTIF ) ,'' ); ?>
</div>
<div class="box_uniq">
Added: branches/2.1.1/catalog/admin/includes/gabarit/usersNotif/display_view.listing.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/usersNotif/display_view.listing.gab (rev 0)
+++ branches/2.1.1/catalog/admin/includes/gabarit/usersNotif/display_view.listing.gab 2013-02-12 17:42:29 UTC (rev 4708)
@@ -0,0 +1,65 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 09/12/2012, 10:34
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('heading title'); ?></h3>
+
+ <div class="button_nav">
+ <?php printf(CsrtAction::getLink('button_nav', __('image notification config list') ), '', tep_href_link(usersNotif::FILENAME, 'action=config') ,'' ); ?>
+ </div>
+
+<div class="box_uniq">
+ <?php echo tep_draw_form('multi', usersNotif::FILENAME, 'action=multi', 'post') ?>
+ <table class="dataTable">
+ <thead>
+ <tr>
+ <th colspan="2"><?php echo __('table heading notif id'); ?></th>
+ <th><?php echo __('table heading type'); ?></th>
+ <th class="tcenter"><?php echo __('table heading keys'); ?></th>
+ <th class="tcenter"><?php echo __('table heading date'); ?></th>
+ <th class="row_action"><?php echo __('table heading action'); ?></th>
+ </tr>
+ </thead>
+ <tfoot>
+ <tr>
+ <td colspan="2"><?php echo tep_draw_checkbox_field('select_all', 'select_all' ); ?></td>
+ <td colspan="4"><?php printf(CsrtAction::getButton('button_action', IMAGE_DELETE, 'delete'), '', ' name="delete" ' ); ?></td>
+ </tr>
+ </tfoot>
+ <tbody>
+ <?php foreach(usersNotif::$list as $notif): ?>
+ <tr class="view parent dataTableRow <?php if ((!isset($_GET['mID'])) || ($_GET['mID'] == $notif['admin_id']) ) echo "Selected"; ?>" >
+ <td><?php echo tep_draw_checkbox_field('multi['.$notif['notif_id'].']', 'multi_'.$notif['notif_id'] ,'','','','class="multi"' ); ?></td>
+ <td><?php echo $notif['notif_id']; ?></td>
+ <td><?php echo ($notif['notif_type']==0)? __('type user') : __('type group') ; ?></td>
+ <td class="tcenter"><?php echo $notif['notif_key']; ?></td>
+ <td class="tcenter"><?php echo tep_datetime_short($notif['notif_date']); ?></td>
+ <td class="w_20">
+ <?php
+ printf(
+ CsrtAction::getFormat('row_action'),
+ ((isset($notif['customers_id']) && !empty($notif['customers_id']) )
+ ?tep_customers_row_action($notif['customers_id'], array('origin'=>usersNotif::FILENAME))
+ : (!empty($notif['user_email'])? ' <a href="mailto:'.$notif['user_email'].'" >'.$notif['user'].'</a>' : '')
+ ),
+
+// sprintf(CsrtAction::getLink('row_action_right', __('@usersNotif image reload mail'), 'reload'), '', tep_href_link(FILENAME_MAIL, 'customer='..'action=usemod&mod=usersNotif&id=' . $notif['notif_id'] . '') ,'' ).
+ sprintf(CsrtAction::getLink('row_action_right', IMAGE_VIEW, 'view'), 'fancyView', tep_href_link(usersNotif::FILENAME, 'nID=' . $notif['notif_id'] . '&action=view') ,'' ).
+ sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), '', tep_href_link(usersNotif::FILENAME, 'nID=' . $notif['notif_id'] . '&action=delete') ,'' )
+
+ );
+ ?>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+ </form>
+</div>
\ No newline at end of file
Added: branches/2.1.1/catalog/admin/includes/gabarit/usersNotif/display_view.view.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/usersNotif/display_view.view.gab (rev 0)
+++ branches/2.1.1/catalog/admin/includes/gabarit/usersNotif/display_view.view.gab 2013-02-12 17:42:29 UTC (rev 4708)
@@ -0,0 +1,15 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 11/02/11, 09:43
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+?>
+<div class="box_uniq">
+ <?php echo usersNotif::get_right_bar(); ?>
+</div>
\ No newline at end of file
Added: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/usersNotif.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/usersNotif.txt (rev 0)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/usersNotif.txt 2013-02-12 17:42:29 UTC (rev 4708)
@@ -0,0 +1,54 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 07/05/2012, 14:46
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['heading title usersNotif']="Notifications métiers" ;
+
+/* User Config */
+ $lang['heading title configuration']="Régler vos préférences de notifications" ;
+ $lang['intro text configuration']="Utiliser le bouton 'Nouvelle notification' pour obtenir des alertes sur les événement de la boutique \n la méthode vous permet de regler le mode de fonctionnement (sql , visible sur la panel d'administration; email pour recevoir un mail) vous pouvez regler un même événement pour plusieurs méthodes\n" ;
+
+ $lang['@usersNotif table heading notif id']="Id" ;
+ $lang['@usersNotif table heading type']="type" ;
+ $lang['@usersNotif table heading keys']="key" ;
+ $lang['@usersNotif table heading name']="link" ;
+ $lang['@usersNotif table heading date']="date" ;
+ $lang['@usersNotif table heading action']="Action" ;
+ $lang['@usersNotif table heading chknotif id']="Id" ;
+ $lang['@usersNotif table heading type']="type" ;
+// $lang['@usersNotif table heading chknotif_key']="Évènement" ;
+// $lang['@usersNotif table heading chknotif_method']="Méthode" ;
+// $lang['@usersNotif table heading chknotif_status']="Status" ;
+
+ $lang['image new notification']="Nouvelle notification" ;
+ $lang['image notification config list']="Configuration" ;
+ $lang['image notification list']="Évènements" ;
+
+/* New Notif User Config */
+
+$lang['heading notification view']="Détail notification" ;
+$lang['heading config edit']="Édition d'une configuration " ;
+$lang['text info key notif']="Action sur : " ;
+$lang['text info key method']="Méthode : " ;
+$lang['text info date notif']="Date : " ;
+$lang['text info content notif']="Contenu : " ;
+
+
+
+
+$lang['@adminNotif image reload mail']="Relancer" ;
+
+$lang['error in update notification']="Erreur lors de la mise à jour de la notification" ;
+$lang['success notification update']="Notification de mise à jour" ;
+$lang['error in insert notification']="Erreur lors de l'ajout de la notification" ;
+$lang['success notification insert']="Notification ajoutée" ;
+$lang['success notification delete']="Notification supprimée" ;
+
+$lang['success notif detail delete']="Notification supprimée" ;
+?>
\ No newline at end of file
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/adminNotif.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/adminNotif.php 2013-02-12 16:26:25 UTC (rev 4707)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/adminNotif.php 2013-02-12 17:42:29 UTC (rev 4708)
@@ -51,60 +51,40 @@
$DB=Database::getInstance();
switch (self::$action) {
- case 'multi':
- if(isset($_POST['multi']) && is_array($_POST['multi']) )
- foreach($_POST['multi'] as $k=>$v) {
- $nID=tep_db_prepare_input($k);
-
- $DB->query($sql="DELETE FROM ".TABLE_ADMIN_NOTIFICATION." WHERE notif_id='".(int)$nID."' AND ( ( notif_type='0' and user_id='".$_SESSION['login_id']."') OR (notif_type='1' and user_id='".$_SESSION['login_groups_id']."') ) LIMIT 1");
-
- }
-
- tep_redirect(tep_href_link(self::FILENAME));
- break;
case 'config':
break;
case 'configadd':
- $chknotif_key=tep_db_prepare_input($_POST['chknotif_key']);
- $chknotif_method=tep_db_prepare_input($_POST['chknotif_method']);
+ $chknotif_key=tep_db_prepare_input($_POST['chknotif_key']);
+ $chknotif_method=tep_db_prepare_input($_POST['chknotif_method']);
- if(!$DB->query($sql="INSERT INTO ".TABLE_NOTIFICATION." (chknotif_id , chknotif_key , chknotif_uniq , chknotif_user, chknotif_status, chknotif_method ) VALUE ( '', '".$chknotif_key."', 0, '".$_SESSION['login_id']."', 1, '".$chknotif_method."') "))
- $messageStack->add_session(__('error in insert notification'), 'error');
- else
- $messageStack->add_session(__('success notification insert'), 'success');
+ if(!$DB->query($sql="INSERT INTO ".TABLE_NOTIFICATION." (chknotif_id , chknotif_key , chknotif_uniq , chknotif_user, chknotif_status, chknotif_method ) VALUE ( '', '".$chknotif_key."', 0, '".$_SESSION['login_id']."', 1, '".$chknotif_method."') "))
+ $messageStack->add_session(__('error in insert notification'), 'error');
+ else
+ $messageStack->add_session(__('success notification insert'), 'success');
- tep_redirect(tep_href_link(self::FILENAME, 'action=config'));
+ tep_redirect(tep_href_link(self::FILENAME, 'action=config'));
break;
case 'configupdate':
- $cID=tep_db_prepare_input($_GET['cID']);
- $chknotif_method=tep_db_prepare_input($_POST['chknotif_method']);
+ $cID=tep_db_prepare_input($_GET['cID']);
+ $chknotif_method=tep_db_prepare_input($_POST['chknotif_method']);
- if( !$DB->query($sql="UPDATE ".TABLE_NOTIFICATION." SET chknotif_method ='".$chknotif_method."' WHERE chknotif_id='".$cID."' ") )
- $messageStack->add_session(__('error in update notification'), 'error');
- else
- $messageStack->add_session(__('success notification update'), 'success');
+ if( !$DB->query($sql="UPDATE ".TABLE_NOTIFICATION." SET chknotif_method ='".$chknotif_method."' WHERE chknotif_id='".$cID."' ") )
+ $messageStack->add_session(__('error in update notification'), 'error');
+ else
+ $messageStack->add_session(__('success notification update'), 'success');
- tep_redirect(tep_href_link(self::FILENAME, 'action=config'));
+ tep_redirect(tep_href_link(self::FILENAME, 'action=config'));
break;
case 'configdelete':
- $cID=tep_db_prepare_input($_GET['cID']);
- $DB->query($sql="DELETE FROM ".TABLE_NOTIFICATION." WHERE chknotif_id='".(int)$cID."' AND ( ( chknotif_uniq='0' and chknotif_user='".$_SESSION['login_id']."') OR (chknotif_uniq='1' and chknotif_user='".$_SESSION['login_groups_id']."') ) ");
+ $cID=tep_db_prepare_input($_GET['cID']);
+ $DB->query($sql="DELETE FROM ".TABLE_NOTIFICATION." WHERE chknotif_id='".(int)$cID."' AND ( ( chknotif_uniq='0' and chknotif_user='".$_SESSION['login_id']."') OR (chknotif_uniq='1' and chknotif_user='".$_SESSION['login_groups_id']."') ) ");
- $messageStack->add_session(__('success notification delete'), 'success');
+ $messageStack->add_session(__('success notification delete'), 'success');
- tep_redirect(tep_href_link(self::FILENAME, 'action=config'));
+ tep_redirect(tep_href_link(self::FILENAME, 'action=config'));
break;
- case 'delete':
- $nID=tep_db_prepare_input($_GET['nID']);
-
- $DB->query($sql="DELETE FROM ".TABLE_ADMIN_NOTIFICATION." WHERE notif_id='".(int)$nID."' AND ( ( notif_type='0' and user_id='".$_SESSION['login_id']."') OR (notif_type='1' and user_id='".$_SESSION['login_groups_id']."') ) LIMIT 1");
-
- $messageStack->add_session(__('success notif detail delete'), 'success');
-
- tep_redirect(tep_href_link(self::FILENAME));
- break;
default:
}
@@ -134,16 +114,17 @@
case 'configedit':
case 'configdelete':
case 'config':
+ default:
self::loadConfigUser();
return tep_get_include_contents(self::$code.'/display_view.config');
break;
-
+/*
case 'view':
return tep_get_include_contents(self::$code.'/display_view.view');
break;
default:
self::loadNotifUser();
- return tep_get_include_contents(self::$code.'/display_view.listing');
+ return tep_get_include_contents(self::$code.'/display_view.listing');*/
}
}
@@ -177,21 +158,7 @@
tep_js_back(tep_href_link(self::FILENAME, 'action=config&nID=' . self::$nInfo->chknotif_id ), IMAGE_BACK)
);
break;
- case 'view':
- self::load_db_values((int)$_GET['nID']);
- $heading[] = array('text' => __('heading notification view') );
- $contents[] = array('text' => '<label>' . __('text info key notif') . '</label>' . self::$nInfo->notif_key);
- $contents[] = array('text' => '<label>' . __('text info date notif') . '</label>' . tep_datetime_short(self::$nInfo->notif_date) );
- $contents=array_merge($contents, self::detailSupll(self::$nInfo->notif_data));
- $contents[] = array('text' => '<label>' . __('text info content notif') . '</label>' . self::$nInfo->notif_text);
-
- $contents[] = array('class'=>'button_nav','text' =>
- sprintf(CsrtAction::getLink('button_nav', IMAGE_DELETE), 'ActionYes', tep_href_link(adminNotif::FILENAME, 'nID=' . self::$nInfo->notif_id . '&action=delete') ,'' ).
- tep_js_back(tep_href_link(self::FILENAME, 'nID=' . self::$nInfo->notif_id ), IMAGE_BACK)
- );
- break;
- default:
}
if ( (tep_not_null($heading)) && (tep_not_null($contents)) ) {
@@ -305,14 +272,6 @@
return $array;
}
- /**
- @fn CountNotif()
- @brief call count notification for current user
- */
- public static function CountNotif(){
- self::loadNotifUser();
- return count(self::$list);
- }
/** Interface module */
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php 2013-02-12 16:26:25 UTC (rev 4707)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php 2013-02-12 17:42:29 UTC (rev 4708)
@@ -730,7 +730,7 @@
$adjust->sWhere = preg_replace($k,$v, $adjust->sWhere);
}
- $query_raw = "select ".$adjust->listfields.", c.content_id as id from " . TABLE_CONTENT . " c ".
+ $query_raw = "SELECT ".$adjust->listfields.", c.content_id as id FROM " . TABLE_CONTENT . " c ".
" LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " cd ON(c.content_id =cd.content_id AND cd.language_id='".(int)$adjust->languages_id."') ";
if( DataTypes::is_active('categorie')){
Added: branches/2.1.1/catalog/admin/includes/modules/pages/usersNotif.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/usersNotif.php (rev 0)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/usersNotif.php 2013-02-12 17:42:29 UTC (rev 4708)
@@ -0,0 +1,728 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 09/12/2012, 10:34
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class usersNotif
+*/
+error_reporting(E_ALL);
+class usersNotif
+ extends ModTwo /// new abstract class for nextgen module
+ implements
+ InterfaceModule,
+ ExtModConfig,
+ InterfacedTJsonS,
+ InterfacedInnerHtml{
+ /**
+ @def FILENAME
+ */
+ const FILENAME =FILENAME_USERSNOTIF;
+
+// public static $code;
+
+// public static $action;
+ /**
+ @var int current id
+ */
+ public static $Id;
+ /**
+ @var $listConfig array list for config current user
+ */
+ public static $listConfig=array();
+ /**
+ @var $list array list for alert and notification for current user
+ */
+ public static $list=array();
+ /**
+ @var $Info object detail one notification
+ */
+ public static $Info;
+ /**
+ @var $XmlBase object xml simple parser result
+ */
+ protected static $XmlBase;
+ /**
+ @var array info all tabs for filter listings
+ */
+ public static $allfields = array();
+ /**
+ class constructor
+ */
+ public function __construct() {
+ self::GetConf();
+// self::loadXml();
+ }
+
+
+ /**
+ @brief Load , adjust and define var environement exe for module
+ Is use in module and class abstract for init value config this module
+ */
+ public static function GetConf(){
+ global $languages_id;
+
+ self::$code=__CLASS__;
+
+ self::$action=(isset($_REQUEST['action'])? (string)$_REQUEST['action'] : 'listing' );
+ self::$Id=(isset($_REQUEST['cID'])? (int)$_REQUEST['cID'] : 0 );
+
+ /**
+ @remarks define var execution sql in GetDBValue()
+ */
+ self::$InitInfo['adjust']=array(
+ 'languages_id'=>$languages_id,
+ 'page'=>1,
+ 'rowbyp'=>10,
+ 'sOrder'=>'',
+ 'sWhere'=>'',
+ );
+
+
+ if((self::$action =='' || self::$action =='listing') && !defined('JSONSTATMENT') )
+ //! active datatable in ajax, precise les GET necessaire
+ define('JSONSTATMENT', 'ModTwo=true&mod=page&type='.self::$code.
+ (isset(parent::$action)?'&action='.parent::$action : '' ).
+ (isset(self::$Id)?'&file='.self::$Id : '' )
+ );
+
+
+ /**
+ @remarks this define col theader title, and ajust html code
+ Just for Edit listing
+ */
+// self::$allfields = array();
+ self::$allfields['notif_id']=array(
+ 'sort'=>true,
+ 'alias'=>'notif_id',
+ 'text'=>__('@usersNotif table heading notif id'),
+ 'width'=>'2%',
+ 'class'=>'tcenter',
+ 'default'=>true,
+ );
+ self::$allfields['notif_type']= array(
+ 'sort'=>true,
+ 'alias'=>'type',
+ 'text'=>__('@usersNotif table heading type'),
+ );
+ self::$allfields['notif_key']= array(
+ 'sort'=>true,
+ 'alias'=>'nkeys',
+ 'text'=>__('@usersNotif table heading keys'),
+ 'default'=>true,
+ 'width'=>'18%',
+ );
+// self::$allfields['notif_text']= array(
+// 'sort'=>true,
+// 'alias'=>'text',
+// 'text'=>__('@usersNotif table heading text'),
+// 'default'=>true,
+// // 'width'=>'18%',
+// );
+ self::$allfields['notif_date']= array(
+ 'sort'=>true,
+ 'alias'=>'date',
+ 'text'=>__('@usersNotif table heading date'),
+ 'default'=>true,
+ 'width'=>'8%',
+ );
+
+
+
+
+ /**
+ @remarks Construct all list , fields , th/td
+ */
+ self::$InitInfo['theader']['listing']=array(
+ array('width'=>'2%', 'class'=>'tcenter', 'txt'=>' ' ),
+ array('width'=>'2%', 'class'=>'tcenter', 'txt'=>' ' ),
+ );
+ self::$InitInfo['tfooter']['listing']=self::$InitInfo['theader']['listing'];
+
+ self::$InitInfo['modele']['listing']=array(
+ 0=>false,
+ 1=>false,
+ );
+
+
+ // min fields and not view directly colonne fields
+ $listfield = ' notif_id as id, ';
+
+ // put in
+ if(isset($_SESSION['filters'][__CLASS__]['allfields']))
+ $_SESSION['filters']['allfields'] = $_SESSION['filters'] [__CLASS__]['allfields'];
+ else
+ $_SESSION['filters']['allfields'] = array();
+
+ $in_session = $_SESSION['filters']['allfields'];
+
+ $i = 0;
+ // check and appli
+ foreach(self::$allfields as $key=>$row){
+ $clean = substr($key, (strpos($key, '.')+1));
+
+ if(is_array($row)){
+ $txt = $row['text'];
+ $alias = (isset($row['alias'])? $row['alias'] : $clean);
+ $css = (isset($row['class'])? $row['class'] : 'tcenter');
+ $width = (isset($row['width'])? $row['width'] : '5%');
+ }
+ else{
+ $txt = $row;
+ $alias = $clean;
+ $css = 'tcenter';
+ $width = '5%';
+ }
+
+ if(
+ ( isset($in_session[$alias]) && (string)$in_session[$alias] == 'on' )
+ || ( count($in_session) <=1 && ( is_array($row) && isset($row['default']) && $row['default'] == true) )
+ ) {
+ $_SESSION['filters']['allfields'][$alias] = 'on';
+ /**
+ @remarks this define col theader title, and ajust html code
+ */
+ self::$InitInfo['theader']['listing'][]= array( 'width'=>$width, 'class'=>$css, 'txt'=>$txt);
+ self::$InitInfo['tfooter']['listing'][]= array( 'width'=>$width, 'class'=>$css, 'txt'=>$txt );
+ /**
+ @remarks this define col in table, and if is possible sort
+ */
+ self::$InitInfo['modele']['listing'][$alias]=((isset($row['sort']) && $row['sort'] == true) ? true : false );
+
+ if($clean !=$alias)
+ $listfield .=$key.' as '.$alias.',';
+ else
+ $listfield .=$key.',';
+ $i++;
+ }
+ }
+
+
+ self::$InitInfo['modele']['listing']['action']=false;
+ self::$InitInfo['theader']['listing']['action']= array( 'class'=>'row_action', 'txt'=>__('@usersNotif table heading action') );
+ self::$InitInfo['tfooter']['listing']['action']= array( 'class'=>'row_action', 'txt'=>__('@usersNotif table heading action') );
+
+ // add subligne in tfooter for multi action
+ if(!isset(self::$InitInfo['tfooter']['listing_multi'])) {
+ self::$InitInfo['tfooter']['listing_multi'] = array();
+ self::$InitInfo['tfooter']['listing_multi'][] = array( 'colspan' => 2, 'class'=>'row_action', 'txt'=>tep_draw_checkbox_field('select_all', 'select_all' ) );
+ self::$InitInfo['tfooter']['listing_multi'][] = array( 'colspan' => ($i+1), 'class'=>'row_action', 'txt'=>sprintf(CsrtAction::getButton('button_action', IMAGE_DELETE, 'delete'), '', ' name="multi_action" ' ) );
+ }
+
+ self::$InitInfo['allfields']['listing'] = self::$allfields ;
+
+
+
+
+
+ /**
+ @remarks Put detail for listing methode
+ */
+ self::$InitInfo['adjust']['listfields'] = substr($listfield, 0,-1);
+
+ /**
+ @remarks Active forms filter
+ */
+ self::$InitInfo['tfilter']['listing'] = array();
+ self::$InitInfo['tfilter']['listing'][]=array( 'type'=>'listfield' );
+
+
+ return true;
+ }
+
+
+ public function check_action($actions){
+ global $messageStack, $oscss;
+
+ self::$action=$actions;
+ $DB=Database::getInstance();
+
+ switch (self::$action) {
+
+ /**
+ @remarks specific save in session value filters
+ */
+ case 'filters':
+ $_SESSION['filters'] =array();
+
+
+ foreach($_POST['filters']['listfield'] as $key=>$row){
+ if( $row =='on' )
+ $_SESSION['filters'][__CLASS__]['allfields'][$key] = 'on';
+ else
+ unset($_SESSION['filters'][__CLASS__]['allfields'][$key]);
+ }
+
+
+ tep_redirect(tep_href_link(self::FILENAME));
+ break;
+
+
+
+
+ /**
+ @remarks action multi
+ */
+ case 'multi':
+
+ if(isset($_POST['action_multi']) && is_array($_POST['action_multi']) )
+
+ foreach($_POST['action_multi'] as $k=>$v) {
+
+ echo $nID=tep_db_prepare_input($k);
+
+ $r=$DB->query($sql="DELETE FROM ".TABLE_ADMIN_NOTIFICATION." WHERE notif_id='".(int)$nID."' AND ( ( notif_type='0' and user_id='".$_SESSION['login_id']."') OR (notif_type='1' and user_id='".$_SESSION['login_groups_id']."') ) LIMIT 1");
+
+ }
+
+ tep_redirect(tep_href_link(self::FILENAME));
+ break;
+
+
+ case 'delete':
+ $nID=tep_db_prepare_input($_GET['cID']);
+
+ if( $DB->query($sql="DELETE FROM ".TABLE_ADMIN_NOTIFICATION." WHERE notif_id='".(int)$nID."' AND ( ( notif_type='0' and user_id='".$_SESSION['login_id']."') OR (notif_type='1' and user_id='".$_SESSION['login_groups_id']."') ) LIMIT 1") )
+ $messageStack->add_session(__('success notif detail delete'), 'success');
+
+ tep_redirect(tep_href_link(self::FILENAME));
+ break;
+ default:
+
+ }
+
+ return self::$action;
+ }
+
+ public function get_header(){ return false;}
+
+
+
+ /**
+ @fn featured::GetDBValue();
+ @brief return DB value adapted for current action
+ Use self::action for determine switch
+ @return
+ */
+ public static function GetDBValue(){
+
+ $DB=Database::getInstance();
+
+
+ $action=self::$action;
+
+ switch ($action) {
+
+ /**
+ @remarks Ajax View result
+ */
+ case 'setflag':
+ break;
+ case 'viewflag':
+ break;
+
+
+ /**
+ @remarks Normal View Page
+ */
+ case 'view':
+// global $language_id;
+//
+// if( (int)self::$Id > 0) {
+// self::$Info = sqlcontent::fetch(array('id'=>self::$Id,'language_id'=>$language_id), true);
+// }
+// else{
+// self::$Info = sqlcontent::Specimen(true);
+// }
+//
+// if (!isset(self::$Info->status)) self::$Info->status = '1';
+// switch (self::$Info->status) {
+// case '0': self::$enabled_status = false; self::$disabled_status = true; break;
+// case '1':
+// default: self::$enabled_status = true; self::$disabled_status = false;
+// }
+ $DB=Database::getInstance();
+ $res=$DB->query($sql="SELECT notif_id,notif_type,user_id,notif_key,notif_data,notif_text, notif_date FROM ".TABLE_ADMIN_NOTIFICATION." WHERE notif_id='".(int)self::$Id ."' AND ( ( notif_type='0' and user_id='".$_SESSION['login_id']."') OR (notif_type='1' and user_id='".$_SESSION['login_groups_id']."') )");
+ self::$Info=new objectInfo($res->fetchAssoc());
+
+ break;
+
+ default:
+
+
+ /**
+ @remarks retrun object load one inventaire
+ */
+ global $query_numrows, $languages_id;
+ $adjust=new objectInfo(self::$InitInfo['adjust']);
+
+
+ /**
+ @remarks replace id by name col
+ */
+ if(!empty($adjust->sWhere)) {
+
+ foreach(self::$allfields as $key=>$row){
+ if(is_array($row) && isset($row['alias']) ){
+ $k[] = '#[(]'.$row['alias'].'[)]#i';
+ $k[] = '# '.$row['alias'].' #i';
+ $k[] = '# \.'.$row['alias'].'#i';
+
+ $v[] = '('.$key.')';
+ $v[] = ' '.$key.' ';
+ $v[] = '.'.$key.' ';
+ }
+ }
+
+ if(isset($k))
+ $adjust->sWhere = preg_replace($k,$v, $adjust->sWhere);
+ }
+
+
+ $query_raw = "SELECT ".$adjust->listfields.", notif_data FROM " . TABLE_ADMIN_NOTIFICATION . " " ;
+
+ $query_raw .="WHERE ( notif_type='0' and user_id='".$_SESSION['login_id']."') OR (notif_type='1' and user_id='".$_SESSION['login_groups_id']."') ";
+ $query_raw .=((strlen($adjust->sWhere)>4) ? " ".substr($adjust->sWhere, 3) : '');
+
+
+ $query_raw .=" ORDER BY ".((!empty($adjust->sOrder)) ? $adjust->sOrder : ' notif_date DESC ');
+
+ $_split = new splitPageResults($adjust->page, $adjust->rowbyp, $query_raw, $query_numrows);
+ $_query = $DB->query($query_raw);
+
+ $res=self::FormatDBValue($_query);
+
+ return $res;
+
+ }
+ }
+
+
+
+ public static function load_db_config($ID){
+ $DB=Database::getInstance();
+ $res=$DB->query($sql="SELECT * FROM ".TABLE_NOTIFICATION." WHERE chknotif_id='".(int)$ID."' AND ( ( chknotif_uniq='0' and chknotif_user='".$_SESSION['login_id']."') OR (chknotif_uniq='1' and chknotif_user='".$_SESSION['login_groups_id']."') )");
+ self::$Info=new objectInfo($res->fetchAssoc());
+ }
+
+
+
+ /**
+ @fn display_view()
+ @brief this methode is switch for call gabarit action
+ */
+ public function display_view(){
+ $action=self::$action;
+
+ switch ($action) {
+
+ /**
+ @remarks Ajax View result
+ */
+// case 'setflag':
+// return self::RowStatus(array('status'=>(int)$_GET['flag'], 'id'=>(int)self::$Id));
+// break;
+// case 'viewflag':
+// return self::RowHidden(array('hidden'=>(int)$_GET['flag'], 'id'=>(int)self::$Id));
+// break;
+
+
+ /**
+ @remarks Normal View Page
+ */
+
+// case 'delete':
+// self::GetDBValue(self::$Id);
+// return MGabCont::CallGab(self::$action,__FUNCTION__,__CLASS__);
+// break;
+ case 'view':
+ self::GetDBValue(self::$Id);
+ return tep_get_include_contents(self::$code.'/display_view.view');
+ break;
+ default:
+ self::$list=self::tep_get_list();
+ /// use master gabarit
+ MGabCont::SetCurrentName(__CLASS__);
+ return MGabCont::CallGab('listing',__FUNCTION__,self::MASTER);
+ }
+
+ }
+
+
+
+
+ /** public static InterfacedTJsonS */
+
+
+
+
+ /**
+ @fn tep_get_list($page=1,$rowbyp=10,$sOrder='',$sWhere='',$options='')
+ @brief Constructeur listing element cms content
+ @param $page integer default(1) split page
+ @param $rowbyp integer default(10) nbr line in page
+ @param $sOrder string | null
+ @param $sWhere string | null
+ @param $options array
+ @return Array
+ */
+ public static function tep_get_list($page=1,$rowbyp=10,$sOrder='',$sWhere='',$options=''){
+
+ global $query_numrows;
+
+ /// @remarks force load conf
+ self::GetConf();
+
+ $res=array();
+
+ /**
+ @remarks adjust param for sql requete
+ */
+ self::$InitInfo['adjust']['page']=$page;
+ self::$InitInfo['adjust']['rowbyp']=$rowbyp;
+ self::$InitInfo['adjust']['sOrder'].=$sOrder;
+ self::$InitInfo['adjust']['sWhere'].=$sWhere;
+ self::$InitInfo['adjust']['options']=$options;
+
+ $res = self::GetDBValue();
+
+ self::$list= $query_numrows ; //= count($res);
+
+ return $res;
+ }
+
+
+
+ /** static InterfacedInnerHtml */
+
+ /**
+ @fn detail_row_page($id)
+ @brief call Ajax , detail of line in listing
+ @param $id int content_id
+ */
+ public static function detail_row_page($id){
+ self::$action ='detail';
+
+ self::GetConf();
+
+ self::$Id= (int)$id;
+
+ self::GetDBValue();
+
+ return MGabCont::CallGab('inline','display_view',__CLASS__);
+
+ }
+
+ /**
+ @fn get_item_action($content)
+ @brief private model for row action
+ @param $content array
+ */
+ public static function ButtonRowsActions($content){
+ return sprintf(
+ CsrtAction::getFormat('row_action'),
+ '' ,
+ sprintf(CsrtAction::getLink('row_action_right', IMAGE_VIEW, 'view'), 'fancy', tep_href_link(self::FILENAME, 'cID=' . $content['id'] . '&action=view') ,'' ).
+ sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), '', tep_href_link(self::FILENAME, 'cID=' . $content['id'] . '&action=delete') ,'' )
+ );
+ }
+
+
+ /**
+ @brief return Filename
+ */
+ public static function GetFILENAME(){
+ return self::FILENAME;
+ }
+
+
+ /**
+ @brief redefine model
+ */
+ public static function tep_get_modele(){
+ self::GetConf();
+ return self::$InitInfo['modele']['listing'];
+ }
+
+
+ /**
+ @brief format db value for display page
+ @param $_query ressource db sql
+ @return array
+ */
+ private static function FormatDBValue($_query){
+ $DB=Database::getInstance();
+ $res=array();
+
+ switch (self::$action) {
+ case 'edit';
+ global $query_numrows,$languages_id;
+
+ break;
+ case 'listing':
+ global $query_numrows,$languages_id;
+
+ while ($item = $_query->fetchAssoc()) {
+ $ord = array();
+ $item[1]=tep_draw_checkbox_field('action_multi['.$item['id'].']','action_mutli_'.$item['id'],$item['id'],'','','class="multi"');
+
+ foreach(self::$InitInfo['modele']['listing'] as $k=>$row){
+ if($k == 'action') $ord[$k]=self::ButtonRowsActions($item);
+ elseif(in_array($k,array('date') ) )$ord[$k]=((isset($item[$k]) && $item[$k] !='1000-01-01 00:00:00' )? tep_date_short($item[$k]) : '' );
+ else $ord[$k]=$item[$k];
+ }
+
+ $ord[0]=$item['id'];
+
+
+ $res[]=$ord;
+ }
+ break;
+ }
+
+ return $res;
+ }
+
+
+ public static function get_right_bar(){
+ $heading=$contents=array();
+
+ switch(self::$action){
+
+ case 'view':
+// self::load_db_values((int)$_GET['nID']);
+
+ $heading[] = array('text' => __('heading notification view') );
+ $contents[] = array('text' => '<label>' . __('text info key notif') . '</label>' . self::$Info->notif_key);
+ $contents[] = array('text' => '<label>' . __('text info date notif') . '</label>' . tep_datetime_short(self::$Info->notif_date) );
+ $contents=array_merge($contents, self::detailSupll(self::$Info->notif_data));
+ $contents[] = array('text' => '<label>' . __('text info content notif') . '</label>' . self::$Info->notif_text);
+
+ $contents[] = array('class'=>'button_nav','text' =>
+ sprintf(CsrtAction::getLink('button_nav', IMAGE_DELETE), 'ActionYes', tep_href_link(usersNotif::FILENAME, 'nID=' . self::$Info->notif_id . '&action=delete') ,'' ).
+ tep_js_back(tep_href_link(self::FILENAME, 'nID=' . self::$Info->notif_id ), IMAGE_BACK)
+ );
+ break;
+ default:
+ }
+
+ if ( (tep_not_null($heading)) && (tep_not_null($contents)) ) {
+ $box = new box;
+ return $box->infoBox($heading, $contents);
+ }
+ }
+
+
+/** Specific module */
+
+ /**
+ @fn detailSupll($data)
+ @brief display content supp in data
+ @param $data string GET
+ @return array $contents
+ */
+ private static function detailSupll($data){
+ if(empty($data)) return array();
+ $array=tep_extrac_querystring($data);
+ $contents=array();
+
+ foreach($array as $k=>$item)
+ if(tep_not_null($item)) {
+ switch($k) {
+ case 'customers_id';
+ $contents[] = array('text' => tep_customers_row_action($item) );
+ break;
+ default:
+ $contents[] = array('text' => '<label>' . $k . ' : </label>' . $item );
+ }
+ }
+
+ return $contents;
+ }
+
+ /**
+ @fn loadNotifUser()
+ @brief call user notification current user
+ */
+ private static function loadNotifUser(){
+ if(is_array(self::$list) && count(self::$list)>0 ) return self::$list;
+ $DB=Database::getInstance();
+ $res=$DB->query($sql="SELECT notif_id,notif_type,user_id,notif_key,notif_data,notif_text,notif_date FROM ".TABLE_ADMIN_NOTIFICATION." WHERE ( notif_type='0' and user_id='".$_SESSION['login_id']."') OR (notif_type='1' and user_id='".$_SESSION['login_groups_id']."') ORDER BY notif_date ASC");
+
+ $list=$res->fetchAllAssoc();
+
+ foreach($list as $notif){
+ if(isset($notif['notif_data'])) self::$list[]=array_merge((array)$notif, (array)tep_extrac_querystring($notif['notif_data']));
+ else self::$list[]=$notif;
+ }
+ return self::$list;
+ }
+
+
+
+ /**
+ @fn loadXml()
+ @brief load xml base method and action defaut
+ */
+// private static function loadXml(){
+// global $messageStack;
+//
+// $FeedUrl = DIR_FS_ROOT_DOCS.'admin/data/notification_src.xml';
+//
+// if(!$SimpleParser = @simplexml_load_file($FeedUrl))
+// $messageStack->add_session( __('Flux introuvable'), 'error');
+//
+// self::$XmlBase = $SimpleParser;
+// }
+
+ /**
+ @fn XmlMethod()
+ @brief call method possible for alert
+ @return array for tep_pulldown
+ */
+// private static function XmlMethod(){
+// if(!is_object(self::$XmlBase)) return array();
+// $array=array();
+//
+// foreach(self::$XmlBase->method->mode as $item)
+// $array[]=array('id'=>(string)$item,'text'=>(string)$item);
+//
+// return $array;
+// }
+
+ /**
+ @fn XmlAction()
+ @brief call action possible for alert
+ @return array for tep_pulldown
+ */
+// private static function XmlAction(){
+// if(!is_object(self::$XmlBase)) return array();
+// $array=array();
+//
+// foreach(self::$XmlBase->metier->action as $item)
+// $array[]=array('id'=>(string)$item,'text'=>(string)$item);
+//
+// return $array;
+// }
+
+ /**
+ @fn CountNotif()
+ @brief call count notification for current user
+ */
+ public static function CountNotif(){
+ self::loadNotifUser();
+ return count(self::$list);
+ }
+
+/** Interface module */
+
+ function check() { return false; }
+ function install() { return false; }
+ function remove() { return false; }
+ function keys() { return false; }
+}
+
+?>
\ No newline at end of file
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/header-1.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/header-1.php 2013-02-12 16:26:25 UTC (rev 4707)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/header-1.php 2013-02-12 17:42:29 UTC (rev 4708)
@@ -10,14 +10,14 @@
*/
$class_widget="adminBlock";
/// force call class notification
-require_once(DIR_WS_MODULES.'pages/adminNotif.php');
+require_once(DIR_WS_MODULES.'pages/usersNotif.php');
?>
<div id="headInfos">
<h1><?php echo tep_image(DIR_WS_TEMPLATE . 'img/1/oscss.png', 'osCSS'); ?></h1>
<h2><?php echo PROJECT_VERSION ;?></h2>
<a href="<?php echo tep_catalog_href_link() ?>"><?php echo HEADER_TITLE_ONLINE_CATALOG ;?></a><span> | </span>
- <a href="<?php echo tep_href_link(FILENAME_ADMINNOTIF, '', 'NONSSL') ?>" class="messages"><?php echo __('notifications') ?> (<?php echo adminNotif::CountNotif() ?>)</a><span> | </span>
+ <a href="<?php echo tep_href_link(FILENAME_ADMINNOTIF, '', 'NONSSL') ?>" class="messages"><?php echo __('notifications') ?> (<?php echo usersNotif::CountNotif() ?>)</a><span> | </span>
<?php if($sess !=0) : ?>
<a href="<?php echo tep_href_link('', 'mode_menu=0', 'NONSSL') ?>" class="messages"><?php echo __('Admin menu') ?></a><span> | </span>
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/header-1.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/header-1.php 2013-02-12 16:26:25 UTC (rev 4707)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/header-1.php 2013-02-12 17:42:29 UTC (rev 4708)
@@ -10,14 +10,15 @@
*/
$class_widget="adminBlock";
/// force call class notification
-require_once(DIR_WS_MODULES.'pages/adminNotif.php');
+/// TODO a deporter en module
+require_once(DIR_WS_MODULES.'pages/usersNotif.php');
?>
<div id="headInfos">
<h1><?php echo tep_image(DIR_WS_TEMPLATE . 'img/1/oscss.png', 'osCSS'); ?></h1>
<h2><?php echo PROJECT_VERSION ;?></h2>
<a href="<?php echo tep_catalog_href_link() ?>"><?php echo HEADER_TITLE_ONLINE_CATALOG ;?></a><span> | </span>
- <a href="<?php echo tep_href_link(FILENAME_ADMINNOTIF, '', 'NONSSL') ?>" class="messages"><?php echo __('notifications') ?> (<?php echo adminNotif::CountNotif() ?>)</a><span> | </span>
+ <a href="<?php echo tep_href_link(FILENAME_USERSNOTIF, '', 'NONSSL') ?>" class="messages"><?php echo __('notifications') ?> (<?php echo usersNotif::CountNotif() ?>)</a><span> | </span>
<?php if($sess !=0) : ?>
<a href="<?php echo tep_href_link('', 'mode_menu=0', 'NONSSL') ?>" class="messages"><?php echo __('Admin menu') ?></a><span> | </span>
Modified: branches/2.1.1/catalog/common/classes/notification.php
===================================================================
--- branches/2.1.1/catalog/common/classes/notification.php 2013-02-12 16:26:25 UTC (rev 4707)
+++ branches/2.1.1/catalog/common/classes/notification.php 2013-02-12 17:42:29 UTC (rev 4708)
@@ -9,7 +9,7 @@
@encode UTF-8
@class notification
@brief cette class est a cheval entre front et backoffice.
- UTilise les class des admins
+ utilise les class des admins
*/
@@ -43,8 +43,8 @@
*/
self::$conf[] = array(
'chknotif_method' => 'sql',
- 'chknotif_user'=> 1,
- 'chknotif_uniq'=> 1,
+ 'chknotif_user'=> 1, // force notif pour l'admin 1
+ 'chknotif_uniq'=> 0, // force notif uniquement pour user
);
}
else
@@ -75,7 +75,7 @@
$DB->query($sql="INSERT INTO ".self::ADMIN_TABLE_NOTIF." (notif_id,notif_type,user_id,notif_key,notif_data,notif_text, notif_date) VALUES ('',0,'".(int)$item['chknotif_user']."', '".self::$key."','".tep_db_input($data)."','".tep_db_input($message_final['html'])."' ,now() ) " );
if((int)$item['chknotif_uniq'] == 1){
- $r = $DB->query("SELECT admin_id as id FROM ".TABLE_ADMIN." where admin_status > 0 AND admin_groups_id='".(int)$item['chknotif_user']."' " );
+ $r = $DB->query("SELECT admin_id as id FROM ".TABLE_ADMIN_USERS." where admin_status > 0 AND admin_groups_id='".(int)$item['chknotif_user']."' " );
foreach($r->fetchAllAssoc() as $admin)
if((int)$item['chknotif_user'] !=(int)$admin['id'])
@@ -87,9 +87,9 @@
case 'email':
default:
if((int)$item['chknotif_uniq'] == 0)
- $r=$DB->query($sql="select admin_firstname as firstname, admin_lastname as lastname, admin_email_address as email from ".TABLE_ADMIN." where admin_status > 0 AND admin_id='".(int)$item['chknotif_user']."' " );
+ $r=$DB->query($sql="select admin_firstname as firstname, admin_lastname as lastname, admin_email_address as email from ".TABLE_ADMIN_USERS." where admin_status > 0 AND admin_id='".(int)$item['chknotif_user']."' " );
elseif((int)$item['chknotif_uniq'] == 1)
- $r=$DB->query($sql="select admin_firstname as firstname, admin_lastname as lastname, admin_email_address as email from ".TABLE_ADMIN." where admin_status > 0 AND admin_groups_id='".(int)$item['chknotif_user']."' " );
+ $r=$DB->query($sql="select admin_firstname as firstname, admin_lastname as lastname, admin_email_address as email from ".TABLE_ADMIN_USERS." where admin_status > 0 AND admin_groups_id='".(int)$item['chknotif_user']."' " );
foreach($r->fetchAllAssoc() as $admin)
if((int)$item['chknotif_user'] !=(int)$admin['id'])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-02-12 16:26:33
|
Revision: 4707
http://oscss.svn.sourceforge.net/oscss/?rev=4707&view=rev
Author: oscim
Date: 2013-02-12 16:26:25 +0000 (Tue, 12 Feb 2013)
Log Message:
-----------
Ajout prise en charge ligne des actions multi dans la definitions des tfooter et prise en charge independante des tfooter vis a vis des thead
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/classes/ModTwo.php
Modified: branches/2.1.1/catalog/admin/includes/classes/ModTwo.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/ModTwo.php 2013-02-12 10:38:04 UTC (rev 4706)
+++ branches/2.1.1/catalog/admin/includes/classes/ModTwo.php 2013-02-12 16:26:25 UTC (rev 4707)
@@ -152,10 +152,23 @@
width => value width th balise
*/
public static function DTFootTable($mutli=false){
+
+ $action=(empty(self::$action)? 'listing' :self::$action);
+
+
+ if(!isset(self::$InitInfo['tfooter'][$action]))
/**
@remarks No tfoot specific,use equal theader
*/
return array( 1 => self::DTheaderTable());
+
+ else{
+ $arr = array( 1 => self::$InitInfo['tfooter'][$action] );
+ if($mutli && isset(self::$InitInfo['tfooter'][$action.'_multi'] ))
+ $arr[2] = self::$InitInfo['tfooter'][$action.'_multi'] ;
+
+ return $arr;
+ }
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-02-12 10:38:11
|
Revision: 4706
http://oscss.svn.sourceforge.net/oscss/?rev=4706&view=rev
Author: oscim
Date: 2013-02-12 10:38:04 +0000 (Tue, 12 Feb 2013)
Log Message:
-----------
suppression retour d'erreur et blockage email
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/classes/emailUtility.php
Modified: branches/2.1.1/catalog/admin/includes/classes/emailUtility.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/emailUtility.php 2013-02-08 16:21:41 UTC (rev 4705)
+++ branches/2.1.1/catalog/admin/includes/classes/emailUtility.php 2013-02-12 10:38:04 UTC (rev 4706)
@@ -179,10 +179,10 @@
include($lg);
$tpl = &Template::singleton();
- if (!empty($tpl->error)) {
- $messageStack->add_session($tpl->error, 'error');
- return false;
- }
+// if (!empty($tpl->error)) {
+// $messageStack->add_session($tpl->error, 'error');
+// return false;
+// }
$tpl->template_dir = $dir;
$tpl->assign("STORE_LOGO_PRINT",STORE_LOGO_PRINT);
$tpl->assign("DIR_WS_CATALOG", DIR_WS_CATALOG);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2013-02-08 16:21:49
|
Revision: 4705
http://oscss.svn.sourceforge.net/oscss/?rev=4705&view=rev
Author: oscim
Date: 2013-02-08 16:21:41 +0000 (Fri, 08 Feb 2013)
Log Message:
-----------
correction coquille
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/gabarit/adminGroup/display_view.listing.gab
branches/2.1.1/catalog/admin/includes/modules/pages/adminGroup.php
branches/2.1.1/catalog/admin/includes/modules/pages/rapport.php
branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/data/91_osc_configuration.sql
Modified: branches/2.1.1/catalog/admin/includes/gabarit/adminGroup/display_view.listing.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/adminGroup/display_view.listing.gab 2013-02-07 14:17:34 UTC (rev 4704)
+++ branches/2.1.1/catalog/admin/includes/gabarit/adminGroup/display_view.listing.gab 2013-02-08 16:21:41 UTC (rev 4705)
@@ -1,10 +1,10 @@
<?php
/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 03/04/2012, 09:32
+ @date 08/02/2013, 09:32
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -14,7 +14,7 @@
<div class="button_nav">
- <?php if(tep_action_check('new' , adminGroup::FILENAME)) echo ' <a class="button" href="' . tep_href_link(adminGroup::FILENAME, 'action=new') . '">' .tep_image(DIR_WS_ICONS . 'icon_add_new.png',IMAGE_NEW_GROUP). IMAGE_NEW_GROUP . '</a>'; ?>
+ <?php if(tep_action_check('new' , adminGroup::FILENAME)) echo ' <a class="button" href="' . tep_href_link(adminGroup::FILENAME, 'action=new') . '">' . IMAGE_NEW_GROUP . '</a>'; ?>
</div>
<div class="box_uniq">
@@ -45,8 +45,7 @@
'locked.gif',__('image define groups') ). '</a> ';
echo ' <a class="buttonimg" href="' . tep_href_link(FILENAME_ADMINUSERS, 'group_id=' . $groups['admin_groups_id'] . '&action=new') . '">' . tep_image(DIR_WS_ICONS .
- 'icon_add_new.png', __('image
- add user in this group') ). '</a> ';
+ 'icon_add_new.png', __('image add user in this group') ). '</a> ';
echo ' <a class="buttonimg" href="' . tep_href_link(adminGroup::FILENAME, 'gID=' . $groups['admin_groups_id'] . '&action=edit') . '">' . tep_image(DIR_WS_ICONS . 'icon_edit.png',
__('image edit') ). '</a> ';
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/adminGroup.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/adminGroup.php 2013-02-07 14:17:34 UTC (rev 4704)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/adminGroup.php 2013-02-08 16:21:41 UTC (rev 4705)
@@ -1,10 +1,10 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 03/04/2012, 09:32
+ @date 08/02/2013, 09:32
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class adminGroup
@@ -404,22 +404,18 @@
self::$count_groups = 0;
while ($groups = $pq->fetchAssoc() ) {
-// $add_groups_prepare .= ',\'' . $groups['admin_groups_id'] . '\'' ;
- self::$count_groups++;
-// $class_s="";
-// if (((!$_GET['gID']) || ($_GET['gID'] == $groups['admin_groups_id']) || ($_GET['gID'] == 'groups')) && (!isset(self::$gInfo)) ) {
-// self::$gInfo = new objectInfo($groups);
-// }
- self::$list[]=$groups;
+ // $add_groups_prepare .= ',\'' . $groups['admin_groups_id'] . '\'' ;
+ self::$count_groups++;
+ // $class_s="";
+ // if (((!$_GET['gID']) || ($_GET['gID'] == $groups['admin_groups_id']) || ($_GET['gID'] == 'groups')) && (!isset(self::$gInfo)) ) {
+ // self::$gInfo = new objectInfo($groups);
+ // }
+ self::$list[]=$groups;
}
$li=$res=array();
foreach(self::$list as $item){
-// $li['nu']='<img src="'.DIR_WS_ICONS .'details_open.png">';
foreach(self::tep_get_modele() as $k) $li[$k]=(string)$item[$k];
-// $li['repository']=__('official');
-// $li['status']=self::get_item_status($item->ident.'_'.$item->level );
-// $li['action']=self::get_item_action($item->ident,$item->ident.'_'.$item->level,$item->url_src );
$res[]=$li;
}
@@ -436,7 +432,7 @@
$group_boxes_files['admin_boxes_id']=$group_boxes_files['admin_files_id'];
$group_boxes_files['admin_boxes_name']=$group_boxes_files['admin_files_name'];
$groupsArray =array();
-// print_r($fils);
+
if ($group_boxes_files['etat'] ==true) {
$del_boxes = array($_GET['gID']);
$groupsArray[]=$_GET['gID'];
@@ -462,7 +458,7 @@
<?php echo tep_draw_hidden_field('menu_id_' . $group_boxes_files['admin_files_id'], '', $group_boxes_files['admin_files_id']) . tep_draw_hidden_field('unchecked_' . $group_boxes_files['admin_files_id'], '', $uncheckedBox);?>
- <?php self::list_action($group_boxes_files['admin_files_id']) ?>
+ <?php if($group_boxes_files['type'] !='ss_menu') { self::list_action($group_boxes_files['admin_files_id'], $group_boxes_files['admin_files_name']); } ?>
</p>
<?php
@@ -472,14 +468,17 @@
}
- public static function list_action($admin_files_id){
+ public static function list_action($admin_files_id, $page_file){
static $cacheSess;
+ $class = $page_file;
+
+
if(!is_array($cacheSess)){
$sql ="SELECT u.files_id, u.action FROM " . TABLE_ADMIN_FILES2RIGHT." u ".
- " WHERE ( u.type = '0' AND u.ref_id = '" .(int) $_SESSION['login_groups_id'] . "' ) OR ( u.type = '1' AND u.ref_id = '" .(int) $_SESSION['login_id'] . "' ) ";
+ " WHERE ( u.type = '0' AND u.ref_id = '" .(int) $_SESSION['login_groups_id'] . "' ) OR ( u.type = '1' AND u.ref_id = '" .(int) $_SESSION['login_id'] . "' ) GROUP BY action ";
$_query = tep_db_query($sql);
@@ -493,6 +492,8 @@
if(isset($cacheSess[$admin_files_id])) {
+ if(class_exists($class))
+ echo $class;
$tmp = $cacheSess[$admin_files_id]; //['action']
$list = array();
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/rapport.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/rapport.php 2013-02-07 14:17:34 UTC (rev 4704)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/rapport.php 2013-02-08 16:21:41 UTC (rev 4705)
@@ -242,8 +242,9 @@
((isset($new->query['groupby'])) ? " GROUP BY ". $new->query['groupby'] : '').
" ORDER BY ". ((!empty($adjust->sOrder)) ? $adjust->sOrder : $new->query['orderby'] );
+// print_r($query_raw);
+// exit;
-
$_split = new splitPageResults($adjust->page, $adjust->rowbyp, $query_raw, $query_numrows);
$_query = $DB->query($query_raw);
Modified: branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/data/91_osc_configuration.sql
===================================================================
--- branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/data/91_osc_configuration.sql 2013-02-07 14:17:34 UTC (rev 4704)
+++ branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/data/91_osc_configuration.sql 2013-02-08 16:21:41 UTC (rev 4705)
@@ -14,6 +14,7 @@
delete from osc_configuration where configuration_key='DIR_FS_CIP' limit 1;
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('CUSTOMER_PUBLIC_PROFIL_S', 'CUSTOMER_PUBLIC_PROFIL', 'true', 'CUSTOMER_PUBLIC_PROFIL_L', '28', '21', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','3');
UPDATE osc_configuration SET configuration_key = 'TEMPLATE_NAME',configuration_title = 'TEMPLATE_NAME_S',configuration_description = 'TEMPLATE_NAME_L',configuration_group_id = 0,use_function = NULL,set_function = NULL,last_modified = NOW() WHERE configuration_key = 'TEMPLATE_NAME';
UPDATE osc_configuration SET configuration_key = 'DEFAULT_CURRENCY',configuration_title = 'DEFAULT_CURRENCY_S',configuration_description = 'DEFAULT_CURRENCY_L',configuration_group_id = 0,use_function = NULL,set_function = NULL,last_modified = NULL WHERE configuration_key = 'DEFAULT_CURRENCY';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
