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...> - 2016-09-19 14:12:42
|
Revision: 5329
http://sourceforge.net/p/oscss/svn/5329
Author: oscim
Date: 2016-09-19 14:12:39 +0000 (Mon, 19 Sep 2016)
Log Message:
-----------
fix
Modified Paths:
--------------
tags/2.2.0/catalog/install/data/templates/appareil_photo/techno/css/theme.less
tags/2.2.0/catalog/templates/defaut/includes/gabarit/pages/sitemap.gab
Modified: tags/2.2.0/catalog/install/data/templates/appareil_photo/techno/css/theme.less
===================================================================
--- tags/2.2.0/catalog/install/data/templates/appareil_photo/techno/css/theme.less 2016-09-19 12:23:24 UTC (rev 5328)
+++ tags/2.2.0/catalog/install/data/templates/appareil_photo/techno/css/theme.less 2016-09-19 14:12:39 UTC (rev 5329)
@@ -53,6 +53,17 @@
body {
/* padding-bottom: 30px; */
/* padding-top: 70px; */
+
+ &#Page_sitemap {
+
+ section#Master{
+ li.item{
+ span{
+ float:none;
+ }
+ }
+ }
+ }
}
html,
@@ -125,6 +136,7 @@
background: @bckgrd_header_main;
width: 100%;
margin:15px 0;
+ float: left;
}
th,
tr td {
Modified: tags/2.2.0/catalog/templates/defaut/includes/gabarit/pages/sitemap.gab
===================================================================
--- tags/2.2.0/catalog/templates/defaut/includes/gabarit/pages/sitemap.gab 2016-09-19 12:23:24 UTC (rev 5328)
+++ tags/2.2.0/catalog/templates/defaut/includes/gabarit/pages/sitemap.gab 2016-09-19 14:12:39 UTC (rev 5329)
@@ -42,13 +42,14 @@
<li><?php echo '<a href="' . tep_href_link(FILENAME_CONTACT_US) . '">' . __('page contact us') . '</a>'; ?></li>
</ul>
</li>
- <li>
- <a href="<?php echo tep_href_link(FILENAME_ACCOUNT, '', 'SSL') ?>"><?php echo unhtmlentities($boxe->title); ?></a>
+ <li class="rows">
+
<?php
/**
@remarks Call widget boxe serach suggest
*/
$boxe =$page->oscss_boxes->_return('myaccount'); ?>
+ <a href="<?php echo tep_href_link(FILENAME_ACCOUNT, '', 'SSL') ?>"><?php echo unhtmlentities($boxe->title); ?></a>
<?php echo unhtmlentities($boxe->content) ?>
</li>
</ul>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2016-09-19 12:23:26
|
Revision: 5328
http://sourceforge.net/p/oscss/svn/5328
Author: oscim
Date: 2016-09-19 12:23:24 +0000 (Mon, 19 Sep 2016)
Log Message:
-----------
Fix
Adjust xml core
Modified Paths:
--------------
tags/2.2.0/catalog/Documents/oscss.version.xml
tags/2.2.0/catalog/admin/includes/gabarit/featureds/edit.tab.childs.gab
Modified: tags/2.2.0/catalog/Documents/oscss.version.xml
===================================================================
--- tags/2.2.0/catalog/Documents/oscss.version.xml 2016-09-17 16:13:24 UTC (rev 5327)
+++ tags/2.2.0/catalog/Documents/oscss.version.xml 2016-09-19 12:23:24 UTC (rev 5328)
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<core>
<version>2.2.0</version>
- <svn>5191</svn>
- <level>unstable</level>
+ <svn>5327</svn>
+ <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>
+ <urloscssorgtrac>http://sourceforge.net/apps/trac/oscss/changeset/?format=zip&new=SVN_REV_MAX&old=SVN_REV&new_path=tags%2F2.2.0%2Fcatalog&old_path=tags%2F2.2.0%2Fcatalog</urloscssorgtrac>
<urloscssgetrev>http://oscss.svn.sourceforge.net/viewvc/oscss?view=revision</urloscssgetrev>
- <pathsvnbranche>trunk/catalog/</pathsvnbranche>
+ <pathsvnbranche>tags/2.2.0/catalog/</pathsvnbranche>
</core>
Modified: tags/2.2.0/catalog/admin/includes/gabarit/featureds/edit.tab.childs.gab
===================================================================
--- tags/2.2.0/catalog/admin/includes/gabarit/featureds/edit.tab.childs.gab 2016-09-17 16:13:24 UTC (rev 5327)
+++ tags/2.2.0/catalog/admin/includes/gabarit/featureds/edit.tab.childs.gab 2016-09-19 12:23:24 UTC (rev 5328)
@@ -26,10 +26,10 @@
<tbody>
<?php foreach($page::$listchilds as $row): ?>
<tr>
- <td class="tcenter"><?php echo $row->datatype ?></td>
+ <td class="tcenter"><?php echo $row->datatype_child ?></td>
<td class="tcenter">
<strong>
- <a href="<?php //echo $page::HrefLink($row->datatype_id, 'edit', $row->datatype) ?>" ><?php echo $row->datatype_id ?></a>
+ <a href="<?php echo $page::HrefLink($row->datatype_child_id, 'edit', $row->datatype_child) ?>" ><?php echo $row->datatype_child_id ?></a>
</strong>
</td>
<td class="tcenter"><?php echo tep_date_short($row->date_added) ?></td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2016-09-17 16:13:42
|
Revision: 5327
http://sourceforge.net/p/oscss/svn/5327
Author: oscim
Date: 2016-09-17 16:13:24 +0000 (Sat, 17 Sep 2016)
Log Message:
-----------
add tags for 2.2.0
Added Paths:
-----------
tags/2.2.0/catalog/
tags/2.2.0/catalog/Documents/
tags/2.2.0/catalog/Documents/.htaccess
tags/2.2.0/catalog/Documents/admin/
tags/2.2.0/catalog/Documents/admin/backups/
tags/2.2.0/catalog/Documents/admin/cache/
tags/2.2.0/catalog/Documents/admin/contributions/
tags/2.2.0/catalog/Documents/admin/data/
tags/2.2.0/catalog/Documents/admin/data/dashboard.xml
tags/2.2.0/catalog/Documents/admin/data/geozones-modeles.xml
tags/2.2.0/catalog/Documents/admin/data/notification_src.xml
tags/2.2.0/catalog/Documents/admin/data/repository_sources.xml
tags/2.2.0/catalog/Documents/admin/images/
tags/2.2.0/catalog/Documents/admin/logs/
tags/2.2.0/catalog/Documents/admin/origin/
tags/2.2.0/catalog/Documents/admin/origin/db/
tags/2.2.0/catalog/Documents/admin/origin/db/install/
tags/2.2.0/catalog/Documents/admin/origin/db/install/data/
tags/2.2.0/catalog/Documents/admin/origin/db/install/tables/
tags/2.2.0/catalog/Documents/admin/origin/db/remove/
tags/2.2.0/catalog/Documents/admin/origin/db/remove/data/
tags/2.2.0/catalog/Documents/admin/origin/db/remove/tables/
tags/2.2.0/catalog/Documents/admin/origin/db/remove/tables/osc_featured.sql
tags/2.2.0/catalog/Documents/admin/origin/db/remove/tables/osc_featured_data.sql
tags/2.2.0/catalog/Documents/admin/origin/db/remove/tables/osc_featured_description.sql
tags/2.2.0/catalog/Documents/admin/origin/db/remove/tables/osc_manufacturers.sql
tags/2.2.0/catalog/Documents/admin/origin/db/remove/tables/osc_manufacturers_info.sql
tags/2.2.0/catalog/Documents/admin/origin/db/remove/tables/osc_products_extra_fields.sql
tags/2.2.0/catalog/Documents/admin/origin/db/remove/tables/osc_products_extra_fields_labels.sql
tags/2.2.0/catalog/Documents/admin/origin/db/remove/tables/osc_products_extra_fields_values.sql
tags/2.2.0/catalog/Documents/admin/origin/db/remove/tables/osc_products_to_products_extra_fields.sql
tags/2.2.0/catalog/Documents/admin/origin/htaccess/
tags/2.2.0/catalog/Documents/admin/origin/htaccess/htaccess_top.txt
tags/2.2.0/catalog/Documents/admin/sessions/
tags/2.2.0/catalog/Documents/admin/tmp/
tags/2.2.0/catalog/Documents/docs/
tags/2.2.0/catalog/Documents/docs/.htaccess
tags/2.2.0/catalog/Documents/images/
tags/2.2.0/catalog/Documents/images/index.html
tags/2.2.0/catalog/Documents/images/layout/
tags/2.2.0/catalog/Documents/images/mail/
tags/2.2.0/catalog/Documents/images/noscreenshot.png
tags/2.2.0/catalog/Documents/images/oscss_logo.jpg
tags/2.2.0/catalog/Documents/images/oscss_logo.png
tags/2.2.0/catalog/Documents/modeles/
tags/2.2.0/catalog/Documents/modeles/email/
tags/2.2.0/catalog/Documents/modeles/email/mouton/
tags/2.2.0/catalog/Documents/modeles/email/mouton/adminUser/
tags/2.2.0/catalog/Documents/modeles/email/mouton/adminUser/admin_account.tpl
tags/2.2.0/catalog/Documents/modeles/email/mouton/adminUser/admin_members.tpl
tags/2.2.0/catalog/Documents/modeles/email/mouton/adminUser/admin_members_new.tpl
tags/2.2.0/catalog/Documents/modeles/email/mouton/adminUser/cron_relance_order.tpl
tags/2.2.0/catalog/Documents/modeles/email/mouton/adminUser/cron_update_order.tpl
tags/2.2.0/catalog/Documents/modeles/email/mouton/adminUser/footer.inc
tags/2.2.0/catalog/Documents/modeles/email/mouton/adminUser/header.inc
tags/2.2.0/catalog/Documents/modeles/email/mouton/adminUser/headernologo.inc
tags/2.2.0/catalog/Documents/modeles/email/mouton/publicCustomers/
tags/2.2.0/catalog/Documents/modeles/email/mouton/publicCustomers/add_customer.tpl
tags/2.2.0/catalog/Documents/modeles/email/mouton/publicCustomers/checkout_process.tpl
tags/2.2.0/catalog/Documents/modeles/email/mouton/publicCustomers/create_account.tpl
tags/2.2.0/catalog/Documents/modeles/email/mouton/publicCustomers/create_account_confirm.tpl
tags/2.2.0/catalog/Documents/modeles/email/mouton/publicCustomers/defaut.tpl
tags/2.2.0/catalog/Documents/modeles/email/mouton/publicCustomers/footer.inc
tags/2.2.0/catalog/Documents/modeles/email/mouton/publicCustomers/header.inc
tags/2.2.0/catalog/Documents/modeles/email/mouton/publicCustomers/held_orders.tpl
tags/2.2.0/catalog/Documents/modeles/email/mouton/publicCustomers/mail.tpl
tags/2.2.0/catalog/Documents/modeles/email/mouton/publicCustomers/newsletter.tpl
tags/2.2.0/catalog/Documents/modeles/email/mouton/publicCustomers/orders.tpl
tags/2.2.0/catalog/Documents/modeles/email/mouton/publicCustomers/password_forgotten.tpl
tags/2.2.0/catalog/Documents/modeles/email/mouton/publicCustomers/recover_cart_sales.tpl
tags/2.2.0/catalog/Documents/modeles/pdf/
tags/2.2.0/catalog/Documents/modeles/pdf/harry/
tags/2.2.0/catalog/Documents/modeles/pdf/harry/adminUser/
tags/2.2.0/catalog/Documents/modeles/pdf/harry/harry.php
tags/2.2.0/catalog/Documents/modeles/pdf/harry/publicCustomers/
tags/2.2.0/catalog/Documents/modeles/pdf/harry/publicCustomers/.htaccess
tags/2.2.0/catalog/Documents/modeles/pdf/harry/publicCustomers/delivery.php
tags/2.2.0/catalog/Documents/modeles/pdf/harry/publicCustomers/index.html
tags/2.2.0/catalog/Documents/modeles/pdf/harry/publicCustomers/invoice.php
tags/2.2.0/catalog/Documents/modeles/pdf/harry/publicCustomers/packingslip.php
tags/2.2.0/catalog/Documents/oscss.version.xml
tags/2.2.0/catalog/Documents/public/
tags/2.2.0/catalog/Documents/public/logs/
tags/2.2.0/catalog/Documents/public/oscss_data/
tags/2.2.0/catalog/Documents/public/sessions/
tags/2.2.0/catalog/account.php
tags/2.2.0/catalog/admin/
tags/2.2.0/catalog/admin/cronfile.php
tags/2.2.0/catalog/admin/document.php
tags/2.2.0/catalog/admin/editeur/
tags/2.2.0/catalog/admin/editeur/index.html
tags/2.2.0/catalog/admin/editeur/tiny_mce/
tags/2.2.0/catalog/admin/editeur/tiny_mce/img/
tags/2.2.0/catalog/admin/editeur/tiny_mce/img/icon_edit.png
tags/2.2.0/catalog/admin/editeur/tiny_mce/langs/
tags/2.2.0/catalog/admin/editeur/tiny_mce/langs/en.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/langs/fr.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/langs/readme.txt
tags/2.2.0/catalog/admin/editeur/tiny_mce/license.txt
tags/2.2.0/catalog/admin/editeur/tiny_mce/oscss_init.php
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advhr/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advhr/css/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advhr/css/advhr.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advhr/editor_plugin.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advhr/editor_plugin_src.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advhr/images/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advhr/images/advhr.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advhr/js/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advhr/js/rule.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advhr/jscripts/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advhr/jscripts/rule.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advhr/langs/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advhr/langs/en.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advhr/langs/en_dlg.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advhr/langs/fr_dlg.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advhr/readme.txt
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advhr/rule.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advimage/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advimage/css/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advimage/css/advimage.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advimage/editor_plugin.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advimage/editor_plugin_src.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advimage/image.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advimage/images/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advimage/images/sample.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advimage/img/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advimage/img/sample.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advimage/js/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advimage/js/image.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advimage/jscripts/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advimage/jscripts/functions.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advimage/langs/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advimage/langs/en.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advimage/langs/en_dlg.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advimage/langs/fr_dlg.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advimage/readme.txt
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advlink/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advlink/css/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advlink/css/advlink.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advlink/editor_plugin.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advlink/editor_plugin_src.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advlink/js/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advlink/js/advlink.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advlink/jscripts/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advlink/jscripts/functions.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advlink/langs/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advlink/langs/en.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advlink/langs/en_dlg.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advlink/langs/fr_dlg.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advlink/link.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/advlink/readme.txt
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/contextmenu/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/contextmenu/css/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/contextmenu/css/contextmenu.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/contextmenu/editor_plugin.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/contextmenu/editor_plugin_src.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/contextmenu/images/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/contextmenu/images/spacer.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/contextmenu/readme.txt
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/fullscreen/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/fullscreen/css/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/fullscreen/css/page.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/fullscreen/editor_plugin.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/fullscreen/editor_plugin_src.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/fullscreen/fullscreen.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/fullscreen/images/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/fullscreen/images/fullscreen.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/fullscreen/langs/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/fullscreen/langs/en.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/fullscreen/readme.txt
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/iespell/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/iespell/editor_plugin.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/iespell/editor_plugin_src.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/iespell/images/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/iespell/langs/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/iespell/readme.txt
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/iframe/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/iframe/editor_plugin.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/iframe/iframe.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/iframe/langs/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/iframe/langs/fr.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/iframe/langs/nl.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/iframe/window.html
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/inlinepopups/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/inlinepopups/css/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/inlinepopups/editor_plugin.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/inlinepopups/images/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/inlinepopups/jscripts/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/inlinepopups/skins/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/inlinepopups/skins/clearlooks2/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/inlinepopups/template.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/css/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/css/content.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/css/media.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/editor_plugin.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/editor_plugin_src.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/images/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/images/flash.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/images/media.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/images/quicktime.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/images/realmedia.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/images/shockwave.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/images/windowsmedia.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/img/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/img/flash.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/img/flv_player.swf
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/img/quicktime.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/img/realmedia.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/img/shockwave.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/img/trans.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/img/windowsmedia.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/js/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/js/embed.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/js/media.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/jscripts/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/jscripts/embed.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/jscripts/media.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/langs/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/langs/en.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/langs/en_dlg.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/langs/fr_dlg.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/media/media.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/pagebreak/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/pagebreak/css/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/pagebreak/css/content.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/pagebreak/editor_plugin.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/pagebreak/editor_plugin_src.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/pagebreak/img/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/pagebreak/img/pagebreak.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/pagebreak/img/trans.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/blank.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/css/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/css/blank.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/css/pasteword.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/editor_plugin.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/editor_plugin_src.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/images/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/images/pastetext.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/images/pasteword.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/images/selectall.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/js/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/js/pastetext.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/js/pasteword.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/jscripts/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/jscripts/pastetext.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/jscripts/pasteword.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/langs/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/langs/en.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/langs/en_dlg.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/langs/fr_dlg.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/pastetext.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/pasteword.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/paste/readme.txt
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/preview/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/preview/editor_plugin.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/preview/editor_plugin_src.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/preview/example.html
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/preview/jscripts/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/preview/jscripts/embed.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/preview/preview.html
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/safari/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/safari/blank.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/safari/editor_plugin.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/safari/editor_plugin_src.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/save/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/save/editor_plugin.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/save/editor_plugin_src.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/searchreplace/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/searchreplace/css/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/searchreplace/css/searchreplace.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/searchreplace/editor_plugin.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/searchreplace/editor_plugin_src.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/searchreplace/js/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/searchreplace/js/searchreplace.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/searchreplace/langs/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/searchreplace/langs/en_dlg.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/searchreplace/langs/fr_dlg.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/searchreplace/searchreplace.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/table/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/table/cell.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/table/css/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/table/css/cell.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/table/css/row.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/table/css/table.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/table/editor_plugin.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/table/editor_plugin_src.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/table/js/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/table/js/cell.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/table/js/merge_cells.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/table/js/row.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/table/js/table.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/table/langs/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/table/langs/en_dlg.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/table/langs/fr_dlg.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/table/merge_cells.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/table/row.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/table/table.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/template/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/template/2_colonnes.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/template/blank.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/template/css/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/template/css/template.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/template/editor_plugin.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/template/editor_plugin_src.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/template/images/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/template/images/template.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/template/js/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/template/js/template.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/template/jscripts/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/template/jscripts/template.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/template/langs/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/template/langs/en.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/template/langs/en_dlg.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/template/langs/fr_dlg.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/template/template.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/config_tinybrowser.php
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/css/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/css/style_tinybrowser.css.php
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/css/stylefull_tinybrowser.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/edit.php
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/fns_tinybrowser.php
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/folders.php
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/img/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/img/asc.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/img/back.png
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/img/desc.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/img/preview.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/img/rotate_ac.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/img/rotate_c.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/img/tabs.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/js/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/js/swfobject.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/js/tinybrowser.js.php
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/langs/
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/langs/en.php
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/langs/fr.php
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/readme.txt
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/tb_standalone.js.php
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/tb_tinymce.js.php
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/tinybrowser.php
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/upload.php
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/upload_file.php
tags/2.2.0/catalog/admin/editeur/tiny_mce/plugins/tinybrowser/upload_process.php
tags/2.2.0/catalog/admin/editeur/tiny_mce/readme.txt
tags/2.2.0/catalog/admin/editeur/tiny_mce/template_html/
tags/2.2.0/catalog/admin/editeur/tiny_mce/template_html/1_col_et_central.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/template_html/2_col_equal.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/template_html/2_col_equal_central.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/template_html/2_col_et_central.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/template_html/2_col_et_central_droit.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/template_html/2_colonnes.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/about.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/anchor.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/charmap.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/color_picker.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/css/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/css/colorpicker.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/css/editor_content.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/css/editor_popup.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/css/editor_ui.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/docs/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/docs/en/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/docs/en/about.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/docs/en/common_buttons.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/docs/en/create_accessible_content.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/docs/en/images/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/docs/en/images/insert_anchor_window.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/docs/en/images/insert_image_window.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/docs/en/images/insert_link_window.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/docs/en/images/insert_table_window.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/docs/en/index.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/docs/en/insert_anchor_button.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/docs/en/insert_image_button.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/docs/en/insert_link_button.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/docs/en/insert_table_button.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/docs/en/style.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/editor_template.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/editor_template_src.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/image.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/anchor.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/bold_de_se.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/bold_es.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/bold_fr.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/bold_ru.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/bold_tw.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/browse.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/bullist.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/button_menu.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/buttons.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/cancel_button_bg.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/charmap.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/cleanup.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/close.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/code.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/color.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/colors.jpg
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/copy.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/custom_1.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/cut.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/forecolor.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/help.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/hr.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/image.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/indent.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/insert_button_bg.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/italic.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/italic_de_se.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/italic_es.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/italic_ru.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/italic_tw.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/justifycenter.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/justifyfull.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/justifyleft.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/justifyright.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/link.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/menu_check.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/newdocument.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/numlist.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/opacity.png
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/outdent.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/paste.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/redo.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/removeformat.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/separator.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/spacer.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/statusbar_resize.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/strikethrough.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/sub.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/sup.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/underline.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/underline_es.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/underline_fr.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/underline_ru.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/underline_tw.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/undo.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/unlink.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/visualaid.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/xp/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/xp/tab_bg.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/xp/tab_end.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/xp/tab_sel_bg.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/xp/tab_sel_end.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/images/xp/tabs_bg.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/img/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/img/colorpicker.jpg
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/img/icons.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/js/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/js/about.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/js/anchor.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/js/charmap.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/js/color_picker.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/js/image.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/js/link.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/js/source_editor.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/jscripts/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/jscripts/about.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/jscripts/anchor.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/jscripts/charmap.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/jscripts/color_picker.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/jscripts/image.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/jscripts/link.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/jscripts/source_editor.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/langs/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/langs/en.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/langs/en_dlg.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/langs/fr.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/langs/fr_dlg.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/link.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/skins/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/skins/default/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/skins/default/content.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/skins/default/dialog.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/skins/default/img/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/skins/default/img/buttons.png
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/skins/default/img/items.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/skins/default/img/menu_check.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/skins/default/img/progress.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/skins/default/img/tabs.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/skins/default/ui.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/skins/o2k7/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/skins/o2k7/content.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/skins/o2k7/dialog.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/skins/o2k7/img/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/skins/o2k7/ui.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/advanced/source_editor.htm
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/css/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/css/editor_content.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/css/editor_popup.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/css/editor_ui.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/editor_template.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/editor_template_src.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/bold.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/bold_de_se.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/bold_fr.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/bold_ru.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/bold_tw.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/bullist.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/buttons.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/cleanup.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/italic.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/italic_de_se.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/italic_ru.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/italic_tw.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/numlist.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/redo.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/separator.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/spacer.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/strikethrough.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/underline.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/underline_fr.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/underline_ru.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/underline_tw.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/images/undo.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/img/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/img/icons.gif
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/langs/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/langs/en.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/langs/fr.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/skins/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/skins/default/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/skins/default/content.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/skins/default/ui.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/skins/o2k7/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/skins/o2k7/content.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/skins/o2k7/img/
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png
tags/2.2.0/catalog/admin/editeur/tiny_mce/themes/simple/skins/o2k7/ui.css
tags/2.2.0/catalog/admin/editeur/tiny_mce/tiny_mce.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/tiny_mce.php
tags/2.2.0/catalog/admin/editeur/tiny_mce/tiny_mce_dev.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/tiny_mce_popup.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/tiny_mce_src.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/utils/
tags/2.2.0/catalog/admin/editeur/tiny_mce/utils/editable_selects.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/utils/form_utils.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/utils/mclayer.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/utils/mctabs.js
tags/2.2.0/catalog/admin/editeur/tiny_mce/utils/validate.js
tags/2.2.0/catalog/admin/favicon.ico
tags/2.2.0/catalog/admin/images/
tags/2.2.0/catalog/admin/images/icons/
tags/2.2.0/catalog/admin/includes/
tags/2.2.0/catalog/admin/includes/appli_top_Test.php
tags/2.2.0/catalog/admin/includes/application_bottom.php
tags/2.2.0/catalog/admin/includes/application_top.php
tags/2.2.0/catalog/admin/includes/boxes/
tags/2.2.0/catalog/admin/includes/boxes/.htaccess
tags/2.2.0/catalog/admin/includes/boxes/002_admin.php
tags/2.2.0/catalog/admin/includes/boxes/00_hidden.php
tags/2.2.0/catalog/admin/includes/boxes/01_configuration.php
tags/2.2.0/catalog/admin/includes/boxes/02_modules.php
tags/2.2.0/catalog/admin/includes/boxes/04_tools.php
tags/2.2.0/catalog/admin/includes/boxes/05_customers.php
tags/2.2.0/catalog/admin/includes/boxes/07_catalog.php
tags/2.2.0/catalog/admin/includes/boxes/08_cms.php
tags/2.2.0/catalog/admin/includes/boxes/09_commercial.php
tags/2.2.0/catalog/admin/includes/boxes/10_orders.php
tags/2.2.0/catalog/admin/includes/boxes/index.html
tags/2.2.0/catalog/admin/includes/class.interfaces.php
tags/2.2.0/catalog/admin/includes/classes/
tags/2.2.0/catalog/admin/includes/classes/.htaccess
tags/2.2.0/catalog/admin/includes/classes/DataFileSql.php
tags/2.2.0/catalog/admin/includes/classes/ErrorHandlerActive.php
tags/2.2.0/catalog/admin/includes/classes/EventsHandlerActive.php
tags/2.2.0/catalog/admin/includes/classes/GraphLoader.php
tags/2.2.0/catalog/admin/includes/classes/GraphUtility.php
tags/2.2.0/catalog/admin/includes/classes/MGabCont.php
tags/2.2.0/catalog/admin/includes/classes/MLinkTo.php
tags/2.2.0/catalog/admin/includes/classes/ModOne.php
tags/2.2.0/catalog/admin/includes/classes/ModOneSimple.php
tags/2.2.0/catalog/admin/includes/classes/ModTree.php
tags/2.2.0/catalog/admin/includes/classes/ModTreePage.php
tags/2.2.0/catalog/admin/includes/classes/ModTwo.php
tags/2.2.0/catalog/admin/includes/classes/NewslettersChargeur.php
tags/2.2.0/catalog/admin/includes/classes/SqlFilesDataDriverClass.php
tags/2.2.0/catalog/admin/includes/classes/aca.php
tags/2.2.0/catalog/admin/includes/classes/box.php
tags/2.2.0/catalog/admin/includes/classes/categorieUtility.php
tags/2.2.0/catalog/admin/includes/classes/configUtility.php
tags/2.2.0/catalog/admin/includes/classes/customerUtility.php
tags/2.2.0/catalog/admin/includes/classes/dataTableInnerHTML.php
tags/2.2.0/catalog/admin/includes/classes/dataTableJsonStatment.php
tags/2.2.0/catalog/admin/includes/classes/drivers/
tags/2.2.0/catalog/admin/includes/classes/drivers/productsACA.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqladminextra.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqladmingroups.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqladminmenu.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqladminnotification.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqladminuser.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlamattribute2template.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlamtemplate.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlcategorie.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlcategoriesextra.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlcategoriesextrafields.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlcip.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlcip_modfiles.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlconfiguration.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlcontent.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlcontentextra.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlcountries.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlcurrencie.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlcustomer.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlextrafields.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlextrafieldsFactory.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlextrafieldslabels.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlextrafieldsto.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlextrafieldsvalues.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlfeatured.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlgeozone.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlimage.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqllinkto.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlnavigation_links.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlnewsletters_modeles.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlorder.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlproduct.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlproductattribute.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlproductattributestock.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlproductoption.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlproductoptionvalue.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlproductoptionvalue2option.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlproductsextrafields.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlservices.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlshipping.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlstatus.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqltax_class.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqltax_rates.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlzones.php
tags/2.2.0/catalog/admin/includes/classes/drivers/sqlzonetogeozone.php
tags/2.2.0/catalog/admin/includes/classes/emailUtility.php
tags/2.2.0/catalog/admin/includes/classes/event_drivers/
tags/2.2.0/catalog/admin/includes/classes/event_drivers/EventMess.php
tags/2.2.0/catalog/admin/includes/classes/event_drivers/EventNotification.php
tags/2.2.0/catalog/admin/includes/classes/event_drivers/EventTriggersCache.php
tags/2.2.0/catalog/admin/includes/classes/event_drivers/EventTriggersSqlMaintenance.php
tags/2.2.0/catalog/admin/includes/classes/fileUtility.php
tags/2.2.0/catalog/admin/includes/classes/imageUtility.php
tags/2.2.0/catalog/admin/includes/classes/index.html
tags/2.2.0/catalog/admin/includes/classes/listeners/
tags/2.2.0/catalog/admin/includes/classes/listeners/EventMessListener.php
tags/2.2.0/catalog/admin/includes/classes/listeners/EventNotificationListener.php
tags/2.2.0/catalog/admin/includes/classes/listeners/EventTriggersCacheListener.php
tags/2.2.0/catalog/admin/includes/classes/listeners/EventTriggersSqlMaintenanceListener.php
tags/2.2.0/catalog/admin/includes/classes/listeners/ExtraFieldsListener.php
tags/2.2.0/catalog/admin/includes/classes/localizationUtility.php
tags/2.2.0/catalog/admin/includes/classes/login_ident.php
tags/2.2.0/catalog/admin/includes/classes/menu.php
tags/2.2.0/catalog/admin/includes/classes/modulesUtility.php
tags/2.2.0/catalog/admin/includes/classes/navigationHistory.php
tags/2.2.0/catalog/admin/includes/classes/objectInfo.php
tags/2.2.0/catalog/admin/includes/classes/osCSS_BackupProcess.php
tags/2.2.0/catalog/admin/includes/classes/osCSS_export.php
tags/2.2.0/catalog/admin/includes/classes/osCSS_messageStack.php
tags/2.2.0/catalog/admin/includes/classes/oscss_DBIndex.php
tags/2.2.0/catalog/admin/includes/classes/oscss_acl.php
tags/2.2.0/catalog/admin/includes/classes/oscss_cstr.php
tags/2.2.0/catalog/admin/includes/classes/productUtility.php
tags/2.2.0/catalog/admin/includes/classes/qtproUtility.php
tags/2.2.0/catalog/admin/includes/classes/splitPageResults.php
tags/2.2.0/catalog/admin/includes/classes/tableBlock.php
tags/2.2.0/catalog/admin/includes/classes/tracked_stock.php
tags/2.2.0/catalog/admin/includes/classes/upload.php
tags/2.2.0/catalog/admin/includes/classes/worldUtility.php
tags/2.2.0/catalog/admin/includes/content/
tags/2.2.0/catalog/admin/includes/content/.htaccess
tags/2.2.0/catalog/admin/includes/content/aca.central.inc
tags/2.2.0/catalog/admin/includes/content/aca.header.inc
tags/2.2.0/catalog/admin/includes/content/aca.top.inc
tags/2.2.0/catalog/admin/includes/content/ajax.central.inc
tags/2.2.0/catalog/admin/includes/content/ajax.top.inc
tags/2.2.0/catalog/admin/includes/content/configuration.central.inc
tags/2.2.0/catalog/admin/includes/content/configuration.header.inc
tags/2.2.0/catalog/admin/includes/content/configuration.top.inc
tags/2.2.0/catalog/admin/includes/content/forbiden.central.inc
tags/2.2.0/catalog/admin/includes/content/index.html
tags/2.2.0/catalog/admin/includes/content/modules.central.inc
tags/2.2.0/catalog/admin/includes/content/modules.top.inc
tags/2.2.0/catalog/admin/includes/content/page.central.inc
tags/2.2.0/catalog/admin/includes/content/page.header.inc
tags/2.2.0/catalog/admin/includes/content/page.top.inc
tags/2.2.0/catalog/admin/includes/database_tables.php
tags/2.2.0/catalog/admin/includes/exts/
tags/2.2.0/catalog/admin/includes/exts/.htaccess
tags/2.2.0/catalog/admin/includes/exts/PHPlot/
tags/2.2.0/catalog/admin/includes/exts/PHPlot/PHPlot.php
tags/2.2.0/catalog/admin/includes/exts/PHPlot/drivers.php
tags/2.2.0/catalog/admin/includes/exts/PHPlot/index.html
tags/2.2.0/catalog/admin/includes/exts/PHPlot/rgb.inc.php
tags/2.2.0/catalog/admin/includes/exts/index.html
tags/2.2.0/catalog/admin/includes/exts/login/
tags/2.2.0/catalog/admin/includes/exts/login/iframe.php
tags/2.2.0/catalog/admin/includes/exts/login/openid.php
tags/2.2.0/catalog/admin/includes/exts/login/oscss.php
tags/2.2.0/catalog/admin/includes/exts/package/
tags/2.2.0/catalog/admin/includes/exts/package/.htaccess
tags/2.2.0/catalog/admin/includes/exts/package/CIP.php
tags/2.2.0/catalog/admin/includes/exts/package/CipUtility.php
tags/2.2.0/catalog/admin/includes/exts/package/ci_tag.class.php
tags/2.2.0/catalog/admin/includes/exts/package/cip_modfiles.php
tags/2.2.0/catalog/admin/includes/exts/package/index.html
tags/2.2.0/catalog/admin/includes/exts/package/packageInstaller.php
tags/2.2.0/catalog/admin/includes/exts/package/packageRepository.php
tags/2.2.0/catalog/admin/includes/exts/package/packageUtility.php
tags/2.2.0/catalog/admin/includes/exts/package/tags/
tags/2.2.0/catalog/admin/includes/exts/package/tags/.htaccess
tags/2.2.0/catalog/admin/includes/exts/package/tags/add2end.php
tags/2.2.0/catalog/admin/includes/exts/package/tags/add2endlg.php
tags/2.2.0/catalog/admin/includes/exts/package/tags/addfile.php
tags/2.2.0/catalog/admin/includes/exts/package/tags/addfilelg.php
tags/2.2.0/catalog/admin/includes/exts/package/tags/addfilename.php
tags/2.2.0/catalog/admin/includes/exts/package/tags/addlangdef.php
tags/2.2.0/catalog/admin/includes/exts/package/tags/config.php
tags/2.2.0/catalog/admin/includes/exts/package/tags/datatype.php
tags/2.2.0/catalog/admin/includes/exts/package/tags/depend.php
tags/2.2.0/catalog/admin/includes/exts/package/tags/description.php
tags/2.2.0/catalog/admin/includes/exts/package/tags/extractzip.php
tags/2.2.0/catalog/admin/includes/exts/package/tags/filesql.php
tags/2.2.0/catalog/admin/includes/exts/package/tags/index.html
tags/2.2.0/catalog/admin/includes/exts/package/tags/modifytable.class.php
tags/2.2.0/catalog/admin/includes/exts/package/tags/perms.php
tags/2.2.0/catalog/admin/includes/exts/package/tags/requirements.php
tags/2.2.0/catalog/admin/includes/exts/package/tags/sql.php
tags/2.2.0/catalog/admin/includes/filenames.php
tags/2.2.0/catalog/admin/includes/footer.php
tags/2.2.0/catalog/admin/includes/functions/
tags/2.2.0/catalog/admin/includes/functions/.htaccess
tags/2.2.0/catalog/admin/includes/functions/general.php
tags/2.2.0/catalog/admin/includes/functions/html_output.php
tags/2.2.0/catalog/admin/includes/functions/index.html
tags/2.2.0/catalog/admin/includes/functions/lib.attributes.php
tags/2.2.0/catalog/admin/includes/functions/lib.cip_manager.php
tags/2.2.0/catalog/admin/includes/functions/lib.configuration.php
tags/2.2.0/catalog/admin/includes/functions/lib.customers.php
tags/2.2.0/catalog/admin/includes/functions/lib.modules.php
tags/2.2.0/catalog/admin/includes/functions/lib.orders.php
tags/2.2.0/catalog/admin/includes/functions/lib.products.php
tags/2.2.0/catalog/admin/includes/functions/sessions.php
tags/2.2.0/catalog/admin/includes/functions/unzip.php
tags/2.2.0/catalog/admin/includes/gabarit/
tags/2.2.0/catalog/admin/includes/gabarit/.htaccess
tags/2.2.0/catalog/admin/includes/gabarit/CheckCore/
tags/2.2.0/catalog/admin/includes/gabarit/CheckCore/display_view.view.gab
tags/2.2.0/catalog/admin/includes/gabarit/MGabCont/
tags/2.2.0/catalog/admin/includes/gabarit/MGabCont/display_view.delete.gab
tags/2.2.0/catalog/admin/includes/gabarit/MGabCont/display_view.edit.gab
tags/2.2.0/catalog/admin/includes/gabarit/MGabCont/display_view.import.gab
tags/2.2.0/catalog/admin/includes/gabarit/MGabCont/display_view.listing.gab
tags/2.2.0/catalog/admin/includes/gabarit/MGabCont/display_view.new.gab
tags/2.2.0/catalog/admin/includes/gabarit/MGabCont/display_view.noedit.gab
tags/2.2.0/catalog/admin/includes/gabarit/MGabCont/edit.tab.generic.gab
tags/2.2.0/catalog/admin/includes/gabarit/MGabCont/filter.dates.gab
tags/2.2.0/catalog/admin/includes/gabarit/MGabCont/filter.language.gab
tags/2.2.0/catalog/admin/includes/gabarit/MGabCont/filter.listfield.gab
tags/2.2.0/catalog/admin/includes/gabarit/MGabCont/filter.subtype.gab
tags/2.2.0/catalog/admin/includes/gabarit/SvnUpdate.form.gab
tags/2.2.0/catalog/admin/includes/gabarit/account_extra.form.gab
tags/2.2.0/catalog/admin/includes/gabarit/adminAccount/
tags/2.2.0/catalog/admin/includes/gabarit/adminAccount/display_view.page.gab
tags/2.2.0/catalog/admin/includes/gabarit/adminGroup/
tags/2.2.0/catalog/admin/includes/gabarit/adminGroup/edit.tab.acl.gab
tags/2.2.0/catalog/admin/includes/gabarit/adminGroup/edit.tab.childs.gab
tags/2.2.0/catalog/admin/includes/gabarit/adminNotif/
tags/2.2.0/catalog/admin/includes/gabarit/adminNotif/display_view.config.gab
tags/2.2.0/catalog/admin/includes/gabarit/adminNotif/display_view.listing.gab
tags/2.2.0/catalog/admin/includes/gabarit/adminNotif/display_view.view.gab
tags/2.2.0/catalog/admin/includes/gabarit/adminUsers/
tags/2.2.0/catalog/admin/includes/gabarit/attributes/
tags/2.2.0/catalog/admin/includes/gabarit/attributes/display_view.options.delete.gab
tags/2.2.0/catalog/admin/includes/gabarit/attributes/display_view.options.edit.gab
tags/2.2.0/catalog/admin/includes/gabarit/attributes/display_view.options.inline.gab
tags/2.2.0/catalog/admin/includes/gabarit/attributes/display_view.options.listing.gab
tags/2.2.0/catalog/admin/includes/gabarit/attributes/display_view.values.delete.gab
tags/2.2.0/catalog/admin/includes/gabarit/attributes/display_view.values.edit.gab
tags/2.2.0/catalog/admin/includes/gabarit/backup/
tags/2.2.0/catalog/admin/includes/gabarit/backup/display_view.backup.gab
tags/2.2.0/catalog/admin/includes/gabarit/backup/display_view.restore.gab
tags/2.2.0/catalog/admin/includes/gabarit/backup/display_view.restorelocal.gab
tags/2.2.0/catalog/admin/includes/gabarit/backup/display_view.viewalldb.gab
tags/2.2.0/catalog/admin/includes/gabarit/categories/
tags/2.2.0/catalog/admin/includes/gabarit/categories/categories_extra/
tags/2.2.0/catalog/admin/includes/gabarit/categories/categories_extra/display_edit.edit.gab
tags/2.2.0/catalog/admin/includes/gabarit/categories/display_view.inline.gab
tags/2.2.0/catalog/admin/includes/gabarit/categories/display_view.new_light.gab
tags/2.2.0/catalog/admin/includes/gabarit/categories/filter.categorie.gab
tags/2.2.0/catalog/admin/includes/gabarit/categories/rightto.edit.gab
tags/2.2.0/catalog/admin/includes/gabarit/cfg_35.form.gab
tags/2.2.0/catalog/admin/includes/gabarit/cms_content/
tags/2.2.0/catalog/admin/includes/gabarit/cms_content/display_view.inline.gab
tags/2.2.0/catalog/admin/includes/gabarit/configuration/
tags/2.2.0/catalog/admin/includes/gabarit/configuration/datatypeconfig/
tags/2.2.0/catalog/admin/includes/gabarit/configuration/datatypeconfig/generic.gab
tags/2.2.0/catalog/admin/includes/gabarit/configuration/datatypeconfig/product.gab
tags/2.2.0/catalog/admin/includes/gabarit/configuration/modadminconfig.listing.gab
tags/2.2.0/catalog/admin/includes/gabarit/configuration/modconfig/
tags/2.2.0/catalog/admin/includes/gabarit/configuration/modconfig/generic.gab
tags/2.2.0/catalog/admin/includes/gabarit/configuration/modconfigSubMod/
tags/2.2.0/catalog/admin/includes/gabarit/configuration/modconfigSubMod/modexpedition.gab
tags/2.2.0/catalog/admin/includes/gabarit/configuration/modconfigSubMod/modpayment.gab
tags/2.2.0/catalog/admin/includes/gabarit/configuration/modcorecache.listing.gab
tags/2.2.0/catalog/admin/includes/gabarit/configuration/modextrafields/
tags/2.2.0/catalog/admin/includes/gabarit/configuration/modextrafields/draw.label.delete.gab
tags/2.2.0/catalog/admin/includes/gabarit/configuration/modextrafields/draw.label.edit.gab
tags/2.2.0/catalog/admin/includes/gabarit/configuration/modextrafields/draw.label.listing.gab
tags/2.2.0/catalog/admin/includes/gabarit/configuration/modextrafields/draw.label.new.gab
tags/2.2.0/catalog/admin/includes/gabarit/configuration/modextrafields/draw.value.delete.gab
tags/2.2.0/catal...
[truncated message content] |
|
From: <os...@us...> - 2016-09-17 15:56:07
|
Revision: 5326
http://sourceforge.net/p/oscss/svn/5326
Author: oscim
Date: 2016-09-17 15:56:06 +0000 (Sat, 17 Sep 2016)
Log Message:
-----------
Added Paths:
-----------
tags/2.2.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2016-05-07 16:04:17
|
Revision: 5325
http://sourceforge.net/p/oscss/svn/5325
Author: homer8173
Date: 2016-05-07 16:04:15 +0000 (Sat, 07 May 2016)
Log Message:
-----------
Update bootstrap bad usage
Modified Paths:
--------------
trunk/catalog/templates/defaut/includes/gabarit/account/address_book/display_view.page.gab
Modified: trunk/catalog/templates/defaut/includes/gabarit/account/address_book/display_view.page.gab
===================================================================
--- trunk/catalog/templates/defaut/includes/gabarit/account/address_book/display_view.page.gab 2016-05-07 15:26:53 UTC (rev 5324)
+++ trunk/catalog/templates/defaut/includes/gabarit/account/address_book/display_view.page.gab 2016-05-07 16:04:15 UTC (rev 5325)
@@ -1,4 +1,5 @@
<?php
+
/**
@licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@@ -15,49 +16,60 @@
*/
global $language,$customer_id;
?>
-<div id="addressBook">
+<div id="addressBook container">
- <div class="contentBox primaryAddress">
- <h3><?php echo __("Adresse principale"); ?></h3>
- <p class="infoText"><?php echo __("Cette adresse est employée comme adresse principale d'expédition et de facturation pour les commandes passées sur ce magasin.<br /><br />Cette adresse est également employée comme base pour le produit et les calculs d'impôts sur le service."); ?></p>
- <h4><?php echo __("Adresse principale"); ?></h4>
- <p class="address"><?php echo tep_address_label($customer_id, address_book::$account['customers_default_address_id'], true, ' ', '<br />'); ?></p>
- </div>
+ <div class="contentBox primaryAddress row">
+ <h3 class="col-md-12"><?php echo __("Adresse principale"); ?></h3>
+ <p class="infoText col-md-12"><?php echo __("Cette adresse est employée comme adresse principale d'expédition et de facturation pour les commandes passées sur ce magasin.<br /><br />Cette adresse est également employée comme base pour le produit et les calculs d'impôts sur le service."); ?></p>
+ <div class="col-md-6">
+ <div class="panel panel-primary">
+ <div class="panel-heading">
+ <?php echo __("Adresse principale"); ?>
+ </div>
+ <div class="panel-body">
+ <?php echo tep_address_label($customer_id, address_book::$account['customers_default_address_id'], true, ' ', '<br />'); ?>
+ </div>
+ </div>
+ </div>
+ </div>
- <div class="contentBox addressBookEntry">
- <h3><?php echo __("Entrées du carnet d'adresses") ; ?></h3>
+ <hr>
+ <div class="contentBox addressBookEntry row">
+ <h3 class="col-md-12"><?php echo __("Entrées du carnet d'adresses") ; ?></h3>
<?php foreach(address_book::$adress_book as $addresses) : ?>
- <p class="infoText">
- <?php echo tep_output_string_protected($addresses['firstname'] . ' ' . $addresses['lastname']); ?>
- <?php if ($addresses['address_book_id'] == address_book::$account['customers_default_address_id']) echo ' <small>' . __('choose default') . '</small>'; ?>
- </p>
-
- <div class="form-group">
- <div class="col-sm-offset-2 col-sm-10">
- <?php echo '<a class="btn btn-default" href="' . address_book::href_link('edit' ,'id='.$addresses['address_book_id']) . '">' . __('image button edit address') . '</a>';
- if(address_book::$count >1) echo '<a class="btn btn-default" href="' . address_book::href_link('delete' ,'id='.$addresses['address_book_id']) . '">' . __('image button delete address') . '</a>'; ?>
- </div>
- </div>
-
- <p class="address"><?php echo tep_address_format(tep_get_address_format_id($addresses['country_id']), $addresses, true, ' ', '<br />'); ?></p>
-
+ <div class="col-md-6">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <?php echo tep_output_string_protected($addresses['firstname'] . ' ' . $addresses['lastname']); ?>
+ <?php if ($addresses['address_book_id'] == address_book::$account['customers_default_address_id']) echo ' <small>' . __('choose default') . '</small>'; ?>
+ </div>
+ <div class="panel-body">
+ <?php echo tep_address_format(tep_get_address_format_id($addresses['country_id']), $addresses, true, ' ', '<br />'); ?>
+ </div>
+ <div class="panel-footer">
+ <?php echo '<a class="btn btn-default" href="' . address_book::href_link('edit' ,'id='.$addresses['address_book_id']) . '">' . __('image button edit address') . '</a>';
+ if(address_book::$count >1) echo '<a class="btn btn-default" href="' . address_book::href_link('delete' ,'id='.$addresses['address_book_id']) . '">' . __('image button delete address') . '</a>'; ?>
+ </div>
+ </div>
+ </div>
<?php endforeach; ?>
- </div>
+ </div>
- <div class="form-group">
- <div class="col-sm-offset-2 col-sm-10">
+ <div class="form-group">
+ <div class="col-sm-offset-2 col-sm-10">
<?php echo '<a class="btn btn-default" href="' . tep_href_link(FILENAME_ACCOUNT, '', 'SSL') . '">' . __('image button back') . '</a>'; ?>
<?php if (tep_count_customer_address_book_entries() < MAX_ADDRESS_BOOK_ENTRIES) { ?>
<?php echo '<a class="btn btn-default" href="' . address_book::href_link('new' ) . '">' . __('image button add address') . '</a>'; ?>
<?php } ?>
- </div>
- </div>
+ </div>
+ </div>
- <p class="warning"><?php printf(__('you can use maximun %s adress entrie'), MAX_ADDRESS_BOOK_ENTRIES); ?></p>
+ <hr>
+ <p class="warning"><?php printf(__('you can use maximun %s adress entrie'), MAX_ADDRESS_BOOK_ENTRIES); ?></p>
</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: <hom...@us...> - 2016-05-07 15:26:55
|
Revision: 5324
http://sourceforge.net/p/oscss/svn/5324
Author: homer8173
Date: 2016-05-07 15:26:53 +0000 (Sat, 07 May 2016)
Log Message:
-----------
Update bootstrap bad usage
Modified Paths:
--------------
trunk/catalog/templates/defaut/includes/gabarit/account/address_book/display_view.delete.gab
trunk/catalog/templates/defaut/includes/gabarit/account/address_book/display_view.page.gab
trunk/catalog/templates/defaut/includes/gabarit/account/createfull.gab
trunk/catalog/templates/defaut/includes/gabarit/account/createsuccess.gab
trunk/catalog/templates/defaut/includes/gabarit/account/edit.gab
trunk/catalog/templates/defaut/includes/gabarit/account/history/account.display_view.page.gab
trunk/catalog/templates/defaut/includes/gabarit/account/history_info.gab
trunk/catalog/templates/defaut/includes/gabarit/account/newconfirm.gab
trunk/catalog/templates/defaut/includes/gabarit/account/newsletters.gab
trunk/catalog/templates/defaut/includes/gabarit/account/password.gab
Modified: trunk/catalog/templates/defaut/includes/gabarit/account/address_book/display_view.delete.gab
===================================================================
--- trunk/catalog/templates/defaut/includes/gabarit/account/address_book/display_view.delete.gab 2016-04-28 20:38:22 UTC (rev 5323)
+++ trunk/catalog/templates/defaut/includes/gabarit/account/address_book/display_view.delete.gab 2016-05-07 15:26:53 UTC (rev 5324)
@@ -26,7 +26,7 @@
</p>
- <div class="btn-group">
+ <div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<input type="submit" class="btn btn-default" value="<?php echo __('image button delete address'); ?>" />
Modified: trunk/catalog/templates/defaut/includes/gabarit/account/address_book/display_view.page.gab
===================================================================
--- trunk/catalog/templates/defaut/includes/gabarit/account/address_book/display_view.page.gab 2016-04-28 20:38:22 UTC (rev 5323)
+++ trunk/catalog/templates/defaut/includes/gabarit/account/address_book/display_view.page.gab 2016-05-07 15:26:53 UTC (rev 5324)
@@ -34,7 +34,7 @@
<?php if ($addresses['address_book_id'] == address_book::$account['customers_default_address_id']) echo ' <small>' . __('choose default') . '</small>'; ?>
</p>
- <div class="btn-group">
+ <div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<?php echo '<a class="btn btn-default" href="' . address_book::href_link('edit' ,'id='.$addresses['address_book_id']) . '">' . __('image button edit address') . '</a>';
if(address_book::$count >1) echo '<a class="btn btn-default" href="' . address_book::href_link('delete' ,'id='.$addresses['address_book_id']) . '">' . __('image button delete address') . '</a>'; ?>
@@ -46,7 +46,7 @@
<?php endforeach; ?>
</div>
- <div class="btn-group">
+ <div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<?php echo '<a class="btn btn-default" href="' . tep_href_link(FILENAME_ACCOUNT, '', 'SSL') . '">' . __('image button back') . '</a>'; ?>
Modified: trunk/catalog/templates/defaut/includes/gabarit/account/createfull.gab
===================================================================
--- trunk/catalog/templates/defaut/includes/gabarit/account/createfull.gab 2016-04-28 20:38:22 UTC (rev 5323)
+++ trunk/catalog/templates/defaut/includes/gabarit/account/createfull.gab 2016-05-07 15:26:53 UTC (rev 5324)
@@ -223,7 +223,7 @@
- <div class="btn-group">
+ <div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<?php echo tep_draw_hidden_field('action','process'); ?>
<input type="submit" class="btn btn-default" value="<?php echo __('image button continue'); ?>" />
Modified: trunk/catalog/templates/defaut/includes/gabarit/account/createsuccess.gab
===================================================================
--- trunk/catalog/templates/defaut/includes/gabarit/account/createsuccess.gab 2016-04-28 20:38:22 UTC (rev 5323)
+++ trunk/catalog/templates/defaut/includes/gabarit/account/createsuccess.gab 2016-05-07 15:26:53 UTC (rev 5324)
@@ -15,7 +15,7 @@
?>
</div>
- <div class="btn-group">
+ <div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<?php echo '<a class="btn btn-default" href="' . $origin_href . '">' . __('image button continue') . '</a>'; ?>
Modified: trunk/catalog/templates/defaut/includes/gabarit/account/edit.gab
===================================================================
--- trunk/catalog/templates/defaut/includes/gabarit/account/edit.gab 2016-04-28 20:38:22 UTC (rev 5323)
+++ trunk/catalog/templates/defaut/includes/gabarit/account/edit.gab 2016-05-07 15:26:53 UTC (rev 5324)
@@ -11,7 +11,7 @@
<p class="notice"><?php echo FORM_REQUIRED_INFORMATION; ?></p>
- <?php echo tep_draw_form('account_edit', tep_href_link(FILENAME_ACCOUNT, 'action=edit', 'SSL'), 'post', '') ;?>
+ <?php echo tep_draw_form('account_edit', tep_href_link(FILENAME_ACCOUNT, 'action=edit', 'SSL'), 'post', ' class="form-horizontal"') ;?>
<fieldset class="account">
<legend><?php echo __('account legend section login'); ?></legend>
@@ -92,17 +92,18 @@
</fieldset>
-
+<?php $extra_fileds = tep_get_extra_fields('customer', $cust['customers_id']);
+ if ($extra_fileds) : ?>
<fieldset class="account">
<legend><?php echo __('category extra fields') ?></legend>
- <?php echo tep_get_extra_fields('customer', $cust['customers_id']);?>
+ <?php echo $extra_fileds?>
<!-- // EOF Customers Generic extra fields -->
</fieldset>
+<?php endif; ?>
-
- <div class="btn-group">
+ <div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<?php echo '<a class="btn btn-default" href="' . tep_href_link(FILENAME_ACCOUNT) . '">' . __('image button back') . '</a>'; ?>
Modified: trunk/catalog/templates/defaut/includes/gabarit/account/history/account.display_view.page.gab
===================================================================
--- trunk/catalog/templates/defaut/includes/gabarit/account/history/account.display_view.page.gab 2016-04-28 20:38:22 UTC (rev 5323)
+++ trunk/catalog/templates/defaut/includes/gabarit/account/history/account.display_view.page.gab 2016-05-07 15:26:53 UTC (rev 5324)
@@ -35,7 +35,7 @@
<td><?php echo $row->date_purchased ; ?></td>
<td><?php echo $row->count_products; ?></td>
<td><?php echo unhtmlentities($row->order_total); ?></td>
- <td class="btn-group">
+ <td class="form-group">
<span class="btn btn-default linkDuplicate">
<a class="navBtMini" href="<?php echo $row->linkDuplicate ?>" >
<?php echo __('history small image button duplicate'); ?>
@@ -70,7 +70,7 @@
<?php endif; ?>
- <div class="btn-group">
+ <div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<?php echo '<a class="btn btn-default" href="' . tep_href_link(FILENAME_ACCOUNT, '', 'SSL') . '">' . __('image button back') . '</a>'; ?>
</div>
Modified: trunk/catalog/templates/defaut/includes/gabarit/account/history_info.gab
===================================================================
--- trunk/catalog/templates/defaut/includes/gabarit/account/history_info.gab 2016-04-28 20:38:22 UTC (rev 5323)
+++ trunk/catalog/templates/defaut/includes/gabarit/account/history_info.gab 2016-05-07 15:26:53 UTC (rev 5324)
@@ -107,7 +107,7 @@
<?php if (_cst_bool('DOWNLOAD_ENABLED')) include(DIR_WS_MODULES . 'downloads.php'); ?>
- <div class="btn-group">
+ <div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<a href="<?php echo tep_href_link(FILENAME_ACCOUNT, '', 'SSL'); ?>" class="btn btn-default" ><?php echo __('image button back'); ?></a>
</div>
Modified: trunk/catalog/templates/defaut/includes/gabarit/account/newconfirm.gab
===================================================================
--- trunk/catalog/templates/defaut/includes/gabarit/account/newconfirm.gab 2016-04-28 20:38:22 UTC (rev 5323)
+++ trunk/catalog/templates/defaut/includes/gabarit/account/newconfirm.gab 2016-05-07 15:26:53 UTC (rev 5324)
@@ -29,7 +29,7 @@
- <div class="btn-group">
+ <div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<?php echo '<a class="btn btn-default" href="' . tep_href_link(FILENAME_LOGIN, '', 'SSL') . '">' . __('image button back') . '</a>'; ?>
<input type="submit" class="btn btn-default" value="<?php echo __('image button continue'); ?>" />
Modified: trunk/catalog/templates/defaut/includes/gabarit/account/newsletters.gab
===================================================================
--- trunk/catalog/templates/defaut/includes/gabarit/account/newsletters.gab 2016-04-28 20:38:22 UTC (rev 5323)
+++ trunk/catalog/templates/defaut/includes/gabarit/account/newsletters.gab 2016-05-07 15:26:53 UTC (rev 5324)
@@ -1,4 +1,5 @@
<?php
+
/**
@licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
@package osCSS-2 <www http://www.oscss.org>
@@ -11,36 +12,38 @@
?>
- <?php echo tep_draw_form('account_newsletter', tep_href_link(FILENAME_ACCOUNT, 'action=newsletters', 'SSL')); ?>
+ <?php echo tep_draw_form('account_newsletter', tep_href_link(FILENAME_ACCOUNT, 'action=newsletters', 'SSL'), 'post', ' class="form-horizontal"'); ?>
- <fieldset class="account">
- <legend><?php echo __('my newsletters title'); ?></legend>
+<fieldset class="account">
+ <legend><?php echo __('my newsletters title'); ?></legend>
- <div class="checkbox">
- <label for="newsletter_general" class="col-sm-10 control-label"><?php echo __('my newsletters general newsletter label'); ?>
+ <div class="form-group">
+ <label for="newsletter_general" class="col-sm-8 control-label"><?php echo __('my newsletters general newsletter label'); ?></label>
+ <div class="col-sm-4">
<?php echo tep_draw_checkbox_field('newsletter_general', 'newsletter_general', '1', $cust['customers_newsletter'], ' class="form-control form-control-static"'); ?>
- </label>
- </div>
+ </div>
+ </div>
- <div class="checkbox">
- <label for="newsletter_product_notification" class="col-sm-10 control-label"><?php echo __('my newsletters general p notification label'); ?>
+ <div class="form-group">
+ <label for="newsletter_product_notification" class="col-sm-8 control-label"><?php echo __('my newsletters general p notification label'); ?></label>
+ <div class="col-sm-4">
<?php echo tep_draw_checkbox_field('newsletter_product_notification', 'newsletter_product_notification', '1', $cust['global_product_notifications'], ' class="form-control form-control-static" '); ?>
- </label>
- </div>
+ </div>
+ </div>
- <p><?php echo __('my newsletters general newsletter description'); ?></p>
+ <p><?php echo __('my newsletters general newsletter description'); ?></p>
- <div class="btn-group">
- <div class="col-sm-offset-2 col-sm-10">
+ <div class="form-group">
+ <div class="col-sm-offset-8 col-sm-4">
<?php echo '<a class="btn btn-default" href="' . tep_href_link(FILENAME_ACCOUNT, '', 'SSL') . '">' . __('image button back') . '</a>'; ?>
<?php echo tep_draw_hidden_field('action', 'process'); ?>
- <input type="submit" class="btn btn-default" value="<?php echo __('image button continue'); ?>" />
- </div>
- </div>
+ <input type="submit" class="btn btn-default" value="<?php echo __('image button continue'); ?>" />
+ </div>
+ </div>
- </fieldset>
+</fieldset>
- </form>
+</form>
Modified: trunk/catalog/templates/defaut/includes/gabarit/account/password.gab
===================================================================
--- trunk/catalog/templates/defaut/includes/gabarit/account/password.gab 2016-04-28 20:38:22 UTC (rev 5323)
+++ trunk/catalog/templates/defaut/includes/gabarit/account/password.gab 2016-05-07 15:26:53 UTC (rev 5324)
@@ -12,14 +12,14 @@
?>
- <?php echo tep_draw_form('account_password', tep_href_link(FILENAME_ACCOUNT, 'action=password', 'SSL'), 'post', '') ; ?>
+ <?php echo tep_draw_form('account_password', tep_href_link(FILENAME_ACCOUNT, 'action=password', 'SSL'), 'post', ' class="form-horizontal"') ; ?>
<fieldset class="account">
<legend><?php echo __('account legend section password'); ?></legend>
<div class="form-group">
<label for="password" class="col-sm-2 control-label"><?php echo __('entry password current'); ?></label>
- <div class="col-sm-10">
+ <div class="col-sm-10 input-group">
<?php echo tep_draw_password_field('password_current','password_current','', true, ' class="form-control" placeholder="Password" '); ?>
<?php $page->messageStack->_draw_inline('password'); ?>
</div>
@@ -27,7 +27,7 @@
<div class="form-group">
<label for="password" class="col-sm-2 control-label"><?php echo __('entry password new'); ?></label>
- <div class="col-sm-10">
+ <div class="col-sm-10 input-group">
<?php echo tep_draw_password_field('password_new','password_new','', true, ' class="form-control" placeholder="Password" '); ?>
<?php $page->messageStack->_draw_inline('password'); ?>
</div>
@@ -35,18 +35,18 @@
<div class="form-group">
<label for="confirmation" class="col-sm-2 control-label"><?php echo __('entry password confirmation'); ?></label>
- <div class="col-sm-10">
+ <div class="col-sm-10 input-group">
<?php echo tep_draw_password_field('password_confirmation','password_confirmation','', true, ' class="form-control" placeholder="Confirmation" '); ?>
<?php $page->messageStack->_draw_inline('confirmation'); ?>
</div>
</div>
- <div class="btn-group">
+ <div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<?php echo '<a class="btn btn-default" href="' . tep_href_link(FILENAME_ACCOUNT) . '">' . __('image button back') . '</a>'; ?>
<?php echo tep_draw_hidden_field('action','process'); ?>
- <input type="submit" class="btn btn-default" value="<?php echo __('image button continue'); ?>" />
+ <input type="submit" class="btn btn-success" value="<?php echo __('image button continue'); ?>" />
</div>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2016-04-28 20:38:26
|
Revision: 5323
http://sourceforge.net/p/oscss/svn/5323
Author: homer8173
Date: 2016-04-28 20:38:22 +0000 (Thu, 28 Apr 2016)
Log Message:
-----------
UPDATE : bootstrap was obsolet, new version 3.3.6
bad badge support etc ...
Modified Paths:
--------------
trunk/catalog/templates/defaut/css/bootstrap-theme.css
trunk/catalog/templates/defaut/css/bootstrap-theme.min.css
trunk/catalog/templates/defaut/css/bootstrap.css
trunk/catalog/templates/defaut/css/bootstrap.min.css
Modified: trunk/catalog/templates/defaut/css/bootstrap-theme.css
===================================================================
--- trunk/catalog/templates/defaut/css/bootstrap-theme.css 2016-04-27 08:21:03 UTC (rev 5322)
+++ trunk/catalog/templates/defaut/css/bootstrap-theme.css 2016-04-28 20:38:22 UTC (rev 5323)
@@ -1,22 +1,18 @@
/*!
- * Bootstrap v3.0.2 by @fat and @mdo
- * Copyright 2013 Twitter, Inc.
- * Licensed under http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world by @mdo and @fat.
+ * Bootstrap v3.3.6 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
-
.btn-default,
.btn-primary,
.btn-success,
.btn-info,
.btn-warning,
.btn-danger {
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, .2);
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
}
-
.btn-default:active,
.btn-primary:active,
.btn-success:active,
@@ -29,431 +25,562 @@
.btn-info.active,
.btn-warning.active,
.btn-danger.active {
- -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
- box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+ -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+ box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
}
-
+.btn-default.disabled,
+.btn-primary.disabled,
+.btn-success.disabled,
+.btn-info.disabled,
+.btn-warning.disabled,
+.btn-danger.disabled,
+.btn-default[disabled],
+.btn-primary[disabled],
+.btn-success[disabled],
+.btn-info[disabled],
+.btn-warning[disabled],
+.btn-danger[disabled],
+fieldset[disabled] .btn-default,
+fieldset[disabled] .btn-primary,
+fieldset[disabled] .btn-success,
+fieldset[disabled] .btn-info,
+fieldset[disabled] .btn-warning,
+fieldset[disabled] .btn-danger {
+ -webkit-box-shadow: none;
+ box-shadow: none;
+}
+.btn-default .badge,
+.btn-primary .badge,
+.btn-success .badge,
+.btn-info .badge,
+.btn-warning .badge,
+.btn-danger .badge {
+ text-shadow: none;
+}
.btn:active,
.btn.active {
background-image: none;
}
-
.btn-default {
text-shadow: 0 1px 0 #fff;
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#e0e0e0));
- background-image: -webkit-linear-gradient(top, #ffffff 0%, #e0e0e0 100%);
- background-image: -moz-linear-gradient(top, #ffffff 0%, #e0e0e0 100%);
- background-image: linear-gradient(to bottom, #ffffff 0%, #e0e0e0 100%);
+ background-image: -webkit-linear-gradient(top, #fff 0%, #e0e0e0 100%);
+ background-image: -o-linear-gradient(top, #fff 0%, #e0e0e0 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#e0e0e0));
+ background-image: linear-gradient(to bottom, #fff 0%, #e0e0e0 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
border-color: #dbdbdb;
border-color: #ccc;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
}
-
.btn-default:hover,
.btn-default:focus {
background-color: #e0e0e0;
background-position: 0 -15px;
}
-
.btn-default:active,
.btn-default.active {
background-color: #e0e0e0;
border-color: #dbdbdb;
}
-
+.btn-default.disabled,
+.btn-default[disabled],
+fieldset[disabled] .btn-default,
+.btn-default.disabled:hover,
+.btn-default[disabled]:hover,
+fieldset[disabled] .btn-default:hover,
+.btn-default.disabled:focus,
+.btn-default[disabled]:focus,
+fieldset[disabled] .btn-default:focus,
+.btn-default.disabled.focus,
+.btn-default[disabled].focus,
+fieldset[disabled] .btn-default.focus,
+.btn-default.disabled:active,
+.btn-default[disabled]:active,
+fieldset[disabled] .btn-default:active,
+.btn-default.disabled.active,
+.btn-default[disabled].active,
+fieldset[disabled] .btn-default.active {
+ background-color: #e0e0e0;
+ background-image: none;
+}
.btn-primary {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#2d6ca2));
- background-image: -webkit-linear-gradient(top, #428bca 0%, #2d6ca2 100%);
- background-image: -moz-linear-gradient(top, #428bca 0%, #2d6ca2 100%);
- background-image: linear-gradient(to bottom, #428bca 0%, #2d6ca2 100%);
+ background-image: -webkit-linear-gradient(top, #337ab7 0%, #265a88 100%);
+ background-image: -o-linear-gradient(top, #337ab7 0%, #265a88 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#265a88));
+ background-image: linear-gradient(to bottom, #337ab7 0%, #265a88 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
- border-color: #2b669a;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+ border-color: #245580;
}
-
.btn-primary:hover,
.btn-primary:focus {
- background-color: #2d6ca2;
+ background-color: #265a88;
background-position: 0 -15px;
}
-
.btn-primary:active,
.btn-primary.active {
- background-color: #2d6ca2;
- border-color: #2b669a;
+ background-color: #265a88;
+ border-color: #245580;
}
-
+.btn-primary.disabled,
+.btn-primary[disabled],
+fieldset[disabled] .btn-primary,
+.btn-primary.disabled:hover,
+.btn-primary[disabled]:hover,
+fieldset[disabled] .btn-primary:hover,
+.btn-primary.disabled:focus,
+.btn-primary[disabled]:focus,
+fieldset[disabled] .btn-primary:focus,
+.btn-primary.disabled.focus,
+.btn-primary[disabled].focus,
+fieldset[disabled] .btn-primary.focus,
+.btn-primary.disabled:active,
+.btn-primary[disabled]:active,
+fieldset[disabled] .btn-primary:active,
+.btn-primary.disabled.active,
+.btn-primary[disabled].active,
+fieldset[disabled] .btn-primary.active {
+ background-color: #265a88;
+ background-image: none;
+}
.btn-success {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5cb85c), to(#419641));
background-image: -webkit-linear-gradient(top, #5cb85c 0%, #419641 100%);
- background-image: -moz-linear-gradient(top, #5cb85c 0%, #419641 100%);
- background-image: linear-gradient(to bottom, #5cb85c 0%, #419641 100%);
+ background-image: -o-linear-gradient(top, #5cb85c 0%, #419641 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#5cb85c), to(#419641));
+ background-image: linear-gradient(to bottom, #5cb85c 0%, #419641 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
border-color: #3e8f3e;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
}
-
.btn-success:hover,
.btn-success:focus {
background-color: #419641;
background-position: 0 -15px;
}
-
.btn-success:active,
.btn-success.active {
background-color: #419641;
border-color: #3e8f3e;
}
-
+.btn-success.disabled,
+.btn-success[disabled],
+fieldset[disabled] .btn-success,
+.btn-success.disabled:hover,
+.btn-success[disabled]:hover,
+fieldset[disabled] .btn-success:hover,
+.btn-success.disabled:focus,
+.btn-success[disabled]:focus,
+fieldset[disabled] .btn-success:focus,
+.btn-success.disabled.focus,
+.btn-success[disabled].focus,
+fieldset[disabled] .btn-success.focus,
+.btn-success.disabled:active,
+.btn-success[disabled]:active,
+fieldset[disabled] .btn-success:active,
+.btn-success.disabled.active,
+.btn-success[disabled].active,
+fieldset[disabled] .btn-success.active {
+ background-color: #419641;
+ background-image: none;
+}
+.btn-info {
+ background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
+ background-image: -o-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#5bc0de), to(#2aabd2));
+ background-image: linear-gradient(to bottom, #5bc0de 0%, #2aabd2 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ background-repeat: repeat-x;
+ border-color: #28a4c9;
+}
+.btn-info:hover,
+.btn-info:focus {
+ background-color: #2aabd2;
+ background-position: 0 -15px;
+}
+.btn-info:active,
+.btn-info.active {
+ background-color: #2aabd2;
+ border-color: #28a4c9;
+}
+.btn-info.disabled,
+.btn-info[disabled],
+fieldset[disabled] .btn-info,
+.btn-info.disabled:hover,
+.btn-info[disabled]:hover,
+fieldset[disabled] .btn-info:hover,
+.btn-info.disabled:focus,
+.btn-info[disabled]:focus,
+fieldset[disabled] .btn-info:focus,
+.btn-info.disabled.focus,
+.btn-info[disabled].focus,
+fieldset[disabled] .btn-info.focus,
+.btn-info.disabled:active,
+.btn-info[disabled]:active,
+fieldset[disabled] .btn-info:active,
+.btn-info.disabled.active,
+.btn-info[disabled].active,
+fieldset[disabled] .btn-info.active {
+ background-color: #2aabd2;
+ background-image: none;
+}
.btn-warning {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f0ad4e), to(#eb9316));
background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
- background-image: -moz-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
- background-image: linear-gradient(to bottom, #f0ad4e 0%, #eb9316 100%);
+ background-image: -o-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#f0ad4e), to(#eb9316));
+ background-image: linear-gradient(to bottom, #f0ad4e 0%, #eb9316 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
border-color: #e38d13;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
}
-
.btn-warning:hover,
.btn-warning:focus {
background-color: #eb9316;
background-position: 0 -15px;
}
-
.btn-warning:active,
.btn-warning.active {
background-color: #eb9316;
border-color: #e38d13;
}
-
+.btn-warning.disabled,
+.btn-warning[disabled],
+fieldset[disabled] .btn-warning,
+.btn-warning.disabled:hover,
+.btn-warning[disabled]:hover,
+fieldset[disabled] .btn-warning:hover,
+.btn-warning.disabled:focus,
+.btn-warning[disabled]:focus,
+fieldset[disabled] .btn-warning:focus,
+.btn-warning.disabled.focus,
+.btn-warning[disabled].focus,
+fieldset[disabled] .btn-warning.focus,
+.btn-warning.disabled:active,
+.btn-warning[disabled]:active,
+fieldset[disabled] .btn-warning:active,
+.btn-warning.disabled.active,
+.btn-warning[disabled].active,
+fieldset[disabled] .btn-warning.active {
+ background-color: #eb9316;
+ background-image: none;
+}
.btn-danger {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9534f), to(#c12e2a));
background-image: -webkit-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
- background-image: -moz-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
- background-image: linear-gradient(to bottom, #d9534f 0%, #c12e2a 100%);
+ background-image: -o-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#d9534f), to(#c12e2a));
+ background-image: linear-gradient(to bottom, #d9534f 0%, #c12e2a 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
border-color: #b92c28;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
}
-
.btn-danger:hover,
.btn-danger:focus {
background-color: #c12e2a;
background-position: 0 -15px;
}
-
.btn-danger:active,
.btn-danger.active {
background-color: #c12e2a;
border-color: #b92c28;
}
-
-.btn-info {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5bc0de), to(#2aabd2));
- background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
- background-image: -moz-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
- background-image: linear-gradient(to bottom, #5bc0de 0%, #2aabd2 100%);
- background-repeat: repeat-x;
- border-color: #28a4c9;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+.btn-danger.disabled,
+.btn-danger[disabled],
+fieldset[disabled] .btn-danger,
+.btn-danger.disabled:hover,
+.btn-danger[disabled]:hover,
+fieldset[disabled] .btn-danger:hover,
+.btn-danger.disabled:focus,
+.btn-danger[disabled]:focus,
+fieldset[disabled] .btn-danger:focus,
+.btn-danger.disabled.focus,
+.btn-danger[disabled].focus,
+fieldset[disabled] .btn-danger.focus,
+.btn-danger.disabled:active,
+.btn-danger[disabled]:active,
+fieldset[disabled] .btn-danger:active,
+.btn-danger.disabled.active,
+.btn-danger[disabled].active,
+fieldset[disabled] .btn-danger.active {
+ background-color: #c12e2a;
+ background-image: none;
}
-
-.btn-info:hover,
-.btn-info:focus {
- background-color: #2aabd2;
- background-position: 0 -15px;
-}
-
-.btn-info:active,
-.btn-info.active {
- background-color: #2aabd2;
- border-color: #28a4c9;
-}
-
.thumbnail,
.img-thumbnail {
- -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
- box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
+ box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
}
-
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus {
background-color: #e8e8e8;
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f5f5f5), to(#e8e8e8));
background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
- background-image: -moz-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
- background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
+ background-image: -o-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#f5f5f5), to(#e8e8e8));
+ background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
}
-
.dropdown-menu > .active > a,
.dropdown-menu > .active > a:hover,
.dropdown-menu > .active > a:focus {
- background-color: #357ebd;
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#357ebd));
- background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
- background-image: -moz-linear-gradient(top, #428bca 0%, #357ebd 100%);
- background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
+ background-color: #2e6da4;
+ background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+ background-image: -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
+ background-image: linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
}
-
.navbar-default {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#f8f8f8));
- background-image: -webkit-linear-gradient(top, #ffffff 0%, #f8f8f8 100%);
- background-image: -moz-linear-gradient(top, #ffffff 0%, #f8f8f8 100%);
- background-image: linear-gradient(to bottom, #ffffff 0%, #f8f8f8 100%);
+ background-image: -webkit-linear-gradient(top, #fff 0%, #f8f8f8 100%);
+ background-image: -o-linear-gradient(top, #fff 0%, #f8f8f8 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#f8f8f8));
+ background-image: linear-gradient(to bottom, #fff 0%, #f8f8f8 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
border-radius: 4px;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
}
-
+.navbar-default .navbar-nav > .open > a,
.navbar-default .navbar-nav > .active > a {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ebebeb), to(#f3f3f3));
- background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f3f3f3 100%);
- background-image: -moz-linear-gradient(top, #ebebeb 0%, #f3f3f3 100%);
- background-image: linear-gradient(to bottom, #ebebeb 0%, #f3f3f3 100%);
+ background-image: -webkit-linear-gradient(top, #dbdbdb 0%, #e2e2e2 100%);
+ background-image: -o-linear-gradient(top, #dbdbdb 0%, #e2e2e2 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#dbdbdb), to(#e2e2e2));
+ background-image: linear-gradient(to bottom, #dbdbdb 0%, #e2e2e2 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdbdbdb', endColorstr='#ffe2e2e2', GradientType=0);
background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff3f3f3', GradientType=0);
- -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.075);
- box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.075);
+ -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
+ box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
}
-
.navbar-brand,
.navbar-nav > li > a {
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
+ text-shadow: 0 1px 0 rgba(255, 255, 255, .25);
}
-
.navbar-inverse {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#3c3c3c), to(#222222));
- background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #222222 100%);
- background-image: -moz-linear-gradient(top, #3c3c3c 0%, #222222 100%);
- background-image: linear-gradient(to bottom, #3c3c3c 0%, #222222 100%);
+ background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #222 100%);
+ background-image: -o-linear-gradient(top, #3c3c3c 0%, #222 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#3c3c3c), to(#222));
+ background-image: linear-gradient(to bottom, #3c3c3c 0%, #222 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+ border-radius: 4px;
}
-
+.navbar-inverse .navbar-nav > .open > a,
.navbar-inverse .navbar-nav > .active > a {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#222222), to(#282828));
- background-image: -webkit-linear-gradient(top, #222222 0%, #282828 100%);
- background-image: -moz-linear-gradient(top, #222222 0%, #282828 100%);
- background-image: linear-gradient(to bottom, #222222 0%, #282828 100%);
+ background-image: -webkit-linear-gradient(top, #080808 0%, #0f0f0f 100%);
+ background-image: -o-linear-gradient(top, #080808 0%, #0f0f0f 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#080808), to(#0f0f0f));
+ background-image: linear-gradient(to bottom, #080808 0%, #0f0f0f 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);
background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff282828', GradientType=0);
- -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.25);
- box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.25);
+ -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
+ box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
}
-
.navbar-inverse .navbar-brand,
.navbar-inverse .navbar-nav > li > a {
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, .25);
}
-
.navbar-static-top,
.navbar-fixed-top,
.navbar-fixed-bottom {
border-radius: 0;
}
-
+@media (max-width: 767px) {
+ .navbar .navbar-nav .open .dropdown-menu > .active > a,
+ .navbar .navbar-nav .open .dropdown-menu > .active > a:hover,
+ .navbar .navbar-nav .open .dropdown-menu > .active > a:focus {
+ color: #fff;
+ background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+ background-image: -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
+ background-image: linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
+ background-repeat: repeat-x;
+ }
+}
.alert {
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.2);
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+ text-shadow: 0 1px 0 rgba(255, 255, 255, .2);
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
}
-
.alert-success {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#dff0d8), to(#c8e5bc));
background-image: -webkit-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
- background-image: -moz-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
- background-image: linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
+ background-image: -o-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#dff0d8), to(#c8e5bc));
+ background-image: linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
background-repeat: repeat-x;
border-color: #b2dba1;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
}
-
.alert-info {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9edf7), to(#b9def0));
background-image: -webkit-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
- background-image: -moz-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
- background-image: linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
+ background-image: -o-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#d9edf7), to(#b9def0));
+ background-image: linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
background-repeat: repeat-x;
border-color: #9acfea;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
}
-
.alert-warning {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fcf8e3), to(#f8efc0));
background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
- background-image: -moz-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
- background-image: linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
+ background-image: -o-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#fcf8e3), to(#f8efc0));
+ background-image: linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
background-repeat: repeat-x;
border-color: #f5e79e;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
}
-
.alert-danger {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f2dede), to(#e7c3c3));
background-image: -webkit-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
- background-image: -moz-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
- background-image: linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
+ background-image: -o-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#f2dede), to(#e7c3c3));
+ background-image: linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
background-repeat: repeat-x;
border-color: #dca7a7;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
}
-
.progress {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ebebeb), to(#f5f5f5));
background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
- background-image: -moz-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
- background-image: linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
+ background-image: -o-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#ebebeb), to(#f5f5f5));
+ background-image: linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
}
-
.progress-bar {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3071a9));
- background-image: -webkit-linear-gradient(top, #428bca 0%, #3071a9 100%);
- background-image: -moz-linear-gradient(top, #428bca 0%, #3071a9 100%);
- background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
+ background-image: -webkit-linear-gradient(top, #337ab7 0%, #286090 100%);
+ background-image: -o-linear-gradient(top, #337ab7 0%, #286090 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#286090));
+ background-image: linear-gradient(to bottom, #337ab7 0%, #286090 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff286090', GradientType=0);
background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
}
-
.progress-bar-success {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5cb85c), to(#449d44));
background-image: -webkit-linear-gradient(top, #5cb85c 0%, #449d44 100%);
- background-image: -moz-linear-gradient(top, #5cb85c 0%, #449d44 100%);
- background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
+ background-image: -o-linear-gradient(top, #5cb85c 0%, #449d44 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#5cb85c), to(#449d44));
+ background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
}
-
.progress-bar-info {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5bc0de), to(#31b0d5));
background-image: -webkit-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
- background-image: -moz-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
- background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
+ background-image: -o-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#5bc0de), to(#31b0d5));
+ background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
}
-
.progress-bar-warning {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f0ad4e), to(#ec971f));
background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
- background-image: -moz-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
- background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
+ background-image: -o-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#f0ad4e), to(#ec971f));
+ background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
}
-
.progress-bar-danger {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9534f), to(#c9302c));
background-image: -webkit-linear-gradient(top, #d9534f 0%, #c9302c 100%);
- background-image: -moz-linear-gradient(top, #d9534f 0%, #c9302c 100%);
- background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
+ background-image: -o-linear-gradient(top, #d9534f 0%, #c9302c 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#d9534f), to(#c9302c));
+ background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
}
-
+.progress-bar-striped {
+ background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+ background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+ background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+}
.list-group {
border-radius: 4px;
- -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
- box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
+ box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
}
-
.list-group-item.active,
.list-group-item.active:hover,
.list-group-item.active:focus {
- text-shadow: 0 -1px 0 #3071a9;
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3278b3));
- background-image: -webkit-linear-gradient(top, #428bca 0%, #3278b3 100%);
- background-image: -moz-linear-gradient(top, #428bca 0%, #3278b3 100%);
- background-image: linear-gradient(to bottom, #428bca 0%, #3278b3 100%);
+ text-shadow: 0 -1px 0 #286090;
+ background-image: -webkit-linear-gradient(top, #337ab7 0%, #2b669a 100%);
+ background-image: -o-linear-gradient(top, #337ab7 0%, #2b669a 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2b669a));
+ background-image: linear-gradient(to bottom, #337ab7 0%, #2b669a 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2b669a', GradientType=0);
background-repeat: repeat-x;
- border-color: #3278b3;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);
+ border-color: #2b669a;
}
-
+.list-group-item.active .badge,
+.list-group-item.active:hover .badge,
+.list-group-item.active:focus .badge {
+ text-shadow: none;
+}
.panel {
- -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
- box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
+ box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
}
-
.panel-default > .panel-heading {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f5f5f5), to(#e8e8e8));
background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
- background-image: -moz-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
- background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
+ background-image: -o-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#f5f5f5), to(#e8e8e8));
+ background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
}
-
.panel-primary > .panel-heading {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#357ebd));
- background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
- background-image: -moz-linear-gradient(top, #428bca 0%, #357ebd 100%);
- background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
+ background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+ background-image: -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
+ background-image: linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
}
-
.panel-success > .panel-heading {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#dff0d8), to(#d0e9c6));
background-image: -webkit-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
- background-image: -moz-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
- background-image: linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
+ background-image: -o-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#dff0d8), to(#d0e9c6));
+ background-image: linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
}
-
.panel-info > .panel-heading {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9edf7), to(#c4e3f3));
background-image: -webkit-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
- background-image: -moz-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
- background-image: linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
+ background-image: -o-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#d9edf7), to(#c4e3f3));
+ background-image: linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);
background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);
}
-
.panel-warning > .panel-heading {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fcf8e3), to(#faf2cc));
background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
- background-image: -moz-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
- background-image: linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
+ background-image: -o-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#fcf8e3), to(#faf2cc));
+ background-image: linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
}
-
.panel-danger > .panel-heading {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f2dede), to(#ebcccc));
background-image: -webkit-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
- background-image: -moz-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
- background-image: linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
+ background-image: -o-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#f2dede), to(#ebcccc));
+ background-image: linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
}
-
.well {
- background-image: -webkit-gradient(linear, left 0%, left 100%, from(#e8e8e8), to(#f5f5f5));
background-image: -webkit-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
- background-image: -moz-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
- background-image: linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%);
+ background-image: -o-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#f5f5f5));
+ background-image: linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);
background-repeat: repeat-x;
border-color: #dcdcdc;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);
- -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
- box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
-}
\ No newline at end of file
+ -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
+ box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
+}
Modified: trunk/catalog/templates/defaut/css/bootstrap-theme.min.css
===================================================================
--- trunk/catalog/templates/defaut/css/bootstrap-theme.min.css 2016-04-27 08:21:03 UTC (rev 5322)
+++ trunk/catalog/templates/defaut/css/bootstrap-theme.min.css 2016-04-28 20:38:22 UTC (rev 5323)
@@ -1,9 +1,6 @@
/*!
- * Bootstrap v3.0.2 by @fat and @mdo
- * Copyright 2013 Twitter, Inc.
- * Licensed under http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world by @mdo and @fat.
- */
-
-.btn-default,.btn-primary,.btn-success,.btn-info,.btn-warning,.btn-danger{text-shadow:0 -1px 0 rgba(0,0,0,0.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075)}.btn-default:active,.btn-primary:active,.btn-success:active,.btn-info:active,.btn-warning:active,.btn-danger:active,.btn-default.active,.btn-primary.active,.btn-success.active,.btn-info.active,.btn-warning.active,.btn-danger.active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn:active,.btn.active{background-image:none}.btn-default{text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left 0,left 100%,from(#fff),to(#e0e0e0));background-image:-webkit-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:-moz-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:linear-gradient(to bottom,#fff 0,#e0e0e0 100%);background-repeat:repeat-x;border-color:#dbdbdb;border-color:#ccc;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe0e0e0',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-default:hover,.btn-default:focus{background-color:#e0e0e0;background-position:0 -15px}.btn-default:active,.btn-default.active{background-color:#e0e0e0;border-color:#dbdbdb}.btn-primary{background-image:-webkit-gradient(linear,left 0,left 100%,from(#428bca),to(#2d6ca2));background-image:-webkit-linear-gradient(top,#428bca 0,#2d6ca2 100%);background-image:-moz-linear-gradient(top,#428bca 0,#2d6ca2 100%);background-image:linear-gradient(to bottom,#428bca 0,#2d6ca2 100%);background-repeat:repeat-x;border-color:#2b669a;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff2d6ca2',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-primary:hover,.btn-primary:focus{background-color:#2d6ca2;background-position:0 -15px}.btn-primary:active,.btn-primary.active{background-color:#2d6ca2;border-color:#2b669a}.btn-success{background-image:-webkit-gradient(linear,left 0,left 100%,from(#5cb85c),to(#419641));background-image:-webkit-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:-moz-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:linear-gradient(to bottom,#5cb85c 0,#419641 100%);background-repeat:repeat-x;border-color:#3e8f3e;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c',endColorstr='#ff419641',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-success:hover,.btn-success:focus{background-color:#419641;background-position:0 -15px}.btn-success:active,.btn-success.active{background-color:#419641;border-color:#3e8f3e}.btn-warning{background-image:-webkit-gradient(linear,left 0,left 100%,from(#f0ad4e),to(#eb9316));background-image:-webkit-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:-moz-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:linear-gradient(to bottom,#f0ad4e 0,#eb9316 100%);background-repeat:repeat-x;border-color:#e38d13;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e',endColorstr='#ffeb9316',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-warning:hover,.btn-warning:focus{background-color:#eb9316;background-position:0 -15px}.btn-warning:active,.btn-warning.active{background-color:#eb9316;border-color:#e38d13}.btn-danger{background-image:-webkit-gradient(linear,left 0,left 100%,from(#d9534f),to(#c12e2a));background-image:-webkit-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:-moz-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:linear-gradient(to bottom,#d9534f 0,#c12e2a 100%);background-repeat:repeat-x;border-color:#b92c28;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f',endColorstr='#ffc12e2a',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-danger:hover,.btn-danger:focus{background-color:#c12e2a;background-position:0 -15px}.btn-danger:active,.btn-danger.active{background-color:#c12e2a;border-color:#b92c28}.btn-info{background-image:-webkit-gradient(linear,left 0,left 100%,from(#5bc0de),to(#2aabd2));background-image:-webkit-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:-moz-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:linear-gradient(to bottom,#5bc0de 0,#2aabd2 100%);background-repeat:repeat-x;border-color:#28a4c9;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2aabd2',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-info:hover,.btn-info:focus{background-color:#2aabd2;background-position:0 -15px}.btn-info:active,.btn-info.active{background-color:#2aabd2;border-color:#28a4c9}.thumbnail,.img-thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.075);box-shadow:0 1px 2px rgba(0,0,0,0.075)}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-color:#e8e8e8;background-image:-webkit-gradient(linear,left 0,left 100%,from(#f5f5f5),to(#e8e8e8));background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-moz-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#ffe8e8e8',GradientType=0)}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{background-color:#357ebd;background-image:-webkit-gradient(linear,left 0,left 100%,from(#428bca),to(#357ebd));background-image:-webkit-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:-moz-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:linear-gradient(to bottom,#428bca 0,#357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff357ebd',GradientType=0)}.navbar-default{background-image:-webkit-gradient(linear,left 0,left 100%,from(#fff),to(#f8f8f8));background-image:-webkit-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:-moz-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:linear-gradient(to bottom,#fff 0,#f8f8f8 100%);background-repeat:repeat-x;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#fff8f8f8',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 5px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 5px rgba(0,0,0,0.075)}.navbar-default .navbar-nav>.active>a{background-image:-webkit-gradient(linear,left 0,left 100%,from(#ebebeb),to(#f3f3f3));background-image:-webkit-linear-gradient(top,#ebebeb 0,#f3f3f3 100%);background-image:-moz-linear-gradient(top,#ebebeb 0,#f3f3f3 100%);background-image:linear-gradient(to bottom,#ebebeb 0,#f3f3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb',endColorstr='#fff3f3f3',GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,0.075);box-shadow:inset 0 3px 9px rgba(0,0,0,0.075)}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,0.25)}.navbar-inverse{background-image:-webkit-gradient(linear,left 0,left 100%,from(#3c3c3c),to(#222));background-image:-webkit-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:-moz-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:linear-gradient(to bottom,#3c3c3c 0,#222 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c',endColorstr='#ff222222',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.navbar-inverse .navbar-nav>.active>a{background-image:-webkit-gradient(linear,left 0,left 100%,from(#222),to(#282828));background-image:-webkit-linear-gradient(top,#222 0,#282828 100%);background-image:-moz-linear-gradient(top,#222 0,#282828 100%);background-image:linear-gradient(to bottom,#222 0,#282828 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222',endColorstr='#ff282828',GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,0.25);box-shadow:inset 0 3px 9px rgba(0,0,0,0.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-static-top,.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}.alert{text-shadow:0 1px 0 rgba(255,255,255,0.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.25),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.25),0 1px 2px rgba(0,0,0,0.05)}.alert-success{background-image:-webkit-gradient(linear,left 0,left 100%,from(#dff0d8),to(#c8e5bc));background-image:-webkit-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:-moz-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:linear-gradient(to bottom,#dff0d8 0,#c8e5bc 100%);background-repeat:repeat-x;border-color:#b2dba1;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8',endColorstr='#ffc8e5bc',GradientType=0)}.alert-info{background-image:-webkit-gradient(linear,left 0,left 100%,from(#d9edf7),to(#b9def0));background-image:-webkit-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:-moz-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:linear-gradient(to bottom,#d9edf7 0,#b9def0 100%);background-repeat:repeat-x;border-color:#9acfea;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7',endColorstr='#ffb9def0',GradientType=0)}.alert-warning{background-image:-webkit-gradient(linear,left 0,left 100%,from(#fcf8e3),to(#f8efc0));background-image:-webkit-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:-moz-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:linear-gradient(to bottom,#fcf8e3 0,#f8efc0 100%);background-repeat:repeat-x;border-color:#f5e79e;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3',endColorstr='#fff8efc0',GradientType=0)}.alert-danger{background-image:-webkit-gradient(linear,left 0,left 100%,from(#f2dede),to(#e7c3c3));background-image:-webkit-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:-moz-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:linear-gradient(to bottom,#f2dede 0,#e7c3c3 100%);background-repeat:repeat-x;border-color:#dca7a7;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede',endColorstr='#ffe7c3c3',GradientType=0)}.progress{background-image:-webkit-gradient(linear,left 0,left 100%,from(#ebebeb),to(#f5f5f5));background-image:-webkit-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:-moz-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:linear-gradient(to bottom,#ebebeb 0,#f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb',endColorstr='#fff5f5f5',GradientType=0)}.progress-bar{background-image:-webkit-gradient(linear,left 0,left 100%,from(#428bca),to(#3071a9));background-image:-webkit-linear-gradient(top,#428bca 0,#3071a9 100%);background-image:-moz-linear-gradient(top,#428bca 0,#3071a9 100%);background-image:linear-gradient(to bottom,#428bca 0,#3071a9 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff3071a9',GradientType=0)}.progress-bar-success{background-image:-webkit-gradient(linear,left 0,left 100%,from(#5cb85c),to(#449d44));background-image:-webkit-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:-moz-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:linear-gradient(to bottom,#5cb85c 0,#449d44 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c',endColorstr='#ff449d44',GradientType=0)}.progress-bar-info{background-image:-webkit-gradient(linear,left 0,left 100%,from(#5bc0de),to(#31b0d5));background-image:-webkit-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:-moz-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:linear-gradient(to bottom,#5bc0de 0,#31b0d5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff31b0d5',GradientType=0)}.progress-bar-warning{background-image:-webkit-gradient(linear,left 0,left 100%,from(#f0ad4e),to(#ec971f));background-image:-webkit-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:-moz-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:linear-gradient(to bottom,#f0ad4e 0,#ec971f 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e',endColorstr='#ffec971f',GradientType=0)}.progress-bar-danger{background-image:-webkit-gradient(linear,left 0,left 100%,from(#d9534f),to(#c9302c));background-image:-webkit-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:-moz-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:linear-gradient(to bottom,#d9534f 0,#c9302c 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f',endColorstr='#ffc9302c',GradientType=0)}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.075);box-shadow:0 1px 2px rgba(0,0,0,0.075)}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{text-shadow:0 -1px 0 #3071a9;background-image:-webkit-gradient(linear,left 0,left 100%,from(#428bca),to(#3278b3));background-image:-webkit-linear-gradient(top,#428bca 0,#3278b3 100%);background-image:-moz-linear-gradient(top,#428bca 0,#3278b3 100%);background-image:linear-gradient(to bottom,#428bca 0,#3278b3 100%);background-repeat:repeat-x;border-color:#3278b3;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff3278b3',GradientType=0)}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.panel-default>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#f5f5f5),to(#e8e8e8));background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-moz-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#ffe8e8e8',GradientType=0)}.panel-primary>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#428bca),to(#357ebd));background-image:-webkit-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:-moz-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:linear-gradient(to bottom,#428bca 0,#357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff357ebd',GradientType=0)}.panel-success>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#dff0d8),to(#d0e9c6));background-image:-webkit-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:-moz-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:linear-gradient(to bottom,#dff0d8 0,#d0e9c6 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8',endColorstr='#ffd0e9c6',GradientType=0)}.panel-info>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#d9edf7),to(#c4e3f3));background-image:-webkit-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:-moz-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:linear-gradient(to bottom,#d9edf7 0,#c4e3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7',endColorstr='#ffc4e3f3',GradientType=0)}.panel-warning>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#fcf8e3),to(#faf2cc));background-image:-webkit-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:-moz-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:linear-gradient(to bottom,#fcf8e3 0,#faf2cc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3',endColorstr='#fffaf2cc',GradientType=0)}.panel-danger>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#f2dede),to(#ebcccc));background-image:-webkit-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:-moz-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:linear-gradient(to bottom,#f2dede 0,#ebcccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede',endColorstr='#ffebcccc',GradientType=0)}.well{background-image:-webkit-gradient(linear,left 0,left 100%,from(#e8e8e8),to(#f5f5f5));background-image:-webkit-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:-moz-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:linear-gradient(to bottom,#e8e8e8 0,#f5f5f5 100%);background-repeat:repeat-x;border-color:#dcdcdc;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8',endColorstr='#fff5f5f5',GradientType=0);-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,0.05),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 3px rgba(0,0,0,0.05),0 1px 0 rgba(255,255,255,0.1)}
\ No newline at end of file
+ * Bootstrap v3.3.6 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */.btn-danger,.btn-default,.btn-info,.btn-primary,.btn-success,.btn-warning{text-shadow:0 -1px 0 rgba(0,0,0,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1...
[truncated message content] |
|
From: <os...@us...> - 2016-04-27 08:21:06
|
Revision: 5322
http://sourceforge.net/p/oscss/svn/5322
Author: oscim
Date: 2016-04-27 08:21:03 +0000 (Wed, 27 Apr 2016)
Log Message:
-----------
Fix error in extension special and manufacturer
Fix approximat in date avaible for product
Add spec in price for return type or value if special
Modified Paths:
--------------
trunk/catalog/common/classes/price.php
trunk/catalog/includes/classes/drivers/data/product.php
trunk/extensions/MANUFACTURERS_stable/catalog/common/classes/datatype_drivers/Data_manufacturer.php
trunk/extensions/SPECIALS_stable/catalog/admin/includes/javascript/modules/products/specials.js.php
trunk/extensions/SPECIALS_stable/catalog/templates/defaut/includes/boxes/specials.php
trunk/extensions/SPECIALS_stable/install.xml
Modified: trunk/catalog/common/classes/price.php
===================================================================
--- trunk/catalog/common/classes/price.php 2016-04-27 05:40:33 UTC (rev 5321)
+++ trunk/catalog/common/classes/price.php 2016-04-27 08:21:03 UTC (rev 5322)
@@ -93,13 +93,20 @@
/**
Gabarit prix normal
*/
- protected static $modele = array( 'price_model' => array( 'text'=>'%pprice', // Modèle Brut
- 'html'=>'<span class="normalprice">%pprice</span>', // Modèle HTML
- 'rss'=>' <price>%pprice</price>' // Modèle rss
+ protected static $modele = array(
+ 'price_model' => array(
+ 'text'=>'%pprice'// Modèle Brut
+ ,'html'=>'<span class="normalprice">%pprice</span>' // Modèle HTML
+ ,'rss'=>' <price>%pprice</price>' // Modèle rss
+ ,'value_fixe'=>'%pprice' //
+ ,'type'=>'normal' //
),
- 'special_model'=> array( 'text'=>'%sprice', // Modèle Brut
- 'html'=>'<del>%pprice</del> <span class="productSpecialPrice">%sprice</span>',// Modèle HTML
- 'rss'=>" <price>%pprice</price> \n <specialprice>%sprice</specialprice>" // Modèle rss
+ 'special_model'=> array(
+ 'text'=>'%sprice' // Modèle Brut
+ ,'html'=>'<del>%pprice</del> <span class="productSpecialPrice">%sprice</span>'// Modèle HTML
+ ,'rss'=>" <price>%pprice</price> \n <specialprice>%sprice</specialprice>" // Modèle rss
+ ,'value_fixe'=>'%pprice-%sprice' //
+ ,'type'=>'special' //
),
);
@@ -669,14 +676,28 @@
$style = strtolower($style);
- $output_price = $this->currency_format($res_array['price_ttc']).($tax_sym?$this->display_tax_symbol($style):'');
- $output_special = $this->currency_format($res_array['sprice_ttc']).($tax_sym?$this->display_tax_symbol($style):'');
- $output = '';
+ if( substr($style,0,5) =='value') {
+ $tax_sym = false;
+
+ if ((int)$res_array['sprice_ttc'] && $res_array['sprice_ttc'] != $res_array['price_ttc'])
+ $output = $res_array['sprice_ttc'] - $res_array['price_ttc'];
+ else
+ $output = $res_array['price_ttc'];
+
+
+ $output = $this->currency_format($output).($tax_sym?$this->display_tax_symbol($style):'');
+ }
+ else{
+ $output_price = $this->currency_format($res_array['price_ttc']).($tax_sym?$this->display_tax_symbol($style):'');
+ $output_special = $this->currency_format($res_array['sprice_ttc']).($tax_sym?$this->display_tax_symbol($style):'');
+ $output = '';
- if ((int)$res_array['sprice_ttc'] && $res_array['sprice_ttc'] != $res_array['price_ttc'])
- $output = str_replace('%pprice', $output_price, str_replace('%sprice', $output_special, self::getModele($products_id,'special_model',$style) /*self::$special_model[$style]*/));
- elseif($products_price)
- $output = str_replace('%pprice', $output_price,self::getModele($products_id,'price_model',$style) /*self::$price_model[$style]*/);
+ if ((int)$res_array['sprice_ttc'] && $res_array['sprice_ttc'] != $res_array['price_ttc'])
+ $output = str_replace('%pprice', $output_price, str_replace('%sprice', $output_special, self::getModele($products_id,'special_model',$style) /*self::$special_model[$style]*/));
+ elseif($products_price)
+ $output = str_replace('%pprice', $output_price,self::getModele($products_id,'price_model',$style) /*self::$price_model[$style]*/);
+ }
+
return $output;
}
Modified: trunk/catalog/includes/classes/drivers/data/product.php
===================================================================
--- trunk/catalog/includes/classes/drivers/data/product.php 2016-04-27 05:40:33 UTC (rev 5321)
+++ trunk/catalog/includes/classes/drivers/data/product.php 2016-04-27 08:21:03 UTC (rev 5322)
@@ -254,7 +254,8 @@
$DataRow->SetWeight($content['products_weight']);
$DataRow->SetQuantity($content['products_quantity']);
$DataRow->SetViewed($content['products_viewed']);
- $DataRow->SetDateAvailable($content['products_date_available']);
+ if($content['products_date_available'] != '1000-01-01 00:00:00')
+ $DataRow->SetDateAvailable($content['products_date_available']);
$DataRow->SetDateAdded($content['products_date_added']);
$DataRow->SetViewed($content['products_viewed']);
$DataRow->SetExternalUrl($content['products_url']);
Modified: trunk/extensions/MANUFACTURERS_stable/catalog/common/classes/datatype_drivers/Data_manufacturer.php
===================================================================
--- trunk/extensions/MANUFACTURERS_stable/catalog/common/classes/datatype_drivers/Data_manufacturer.php 2016-04-27 05:40:33 UTC (rev 5321)
+++ trunk/extensions/MANUFACTURERS_stable/catalog/common/classes/datatype_drivers/Data_manufacturer.php 2016-04-27 08:21:03 UTC (rev 5322)
@@ -1,271 +1,664 @@
-<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+<?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 16/03/2012, 16:16
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ \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.1.2
+ \date 25/07/2013, 11:33
+ \author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ \encode UTF-8
*/
-class Data_manufacturer {
+require_once(DIR_FS_CATALOG . DIR_WS_CLASSES . 'DataStatmentFO.php');
+require_once(DIR_FS_CATALOG . DIR_WS_CLASSES . 'drivers/DataListenerRow.php');
+require_once(DIR_FS_CATALOG . DIR_WS_CLASSES . 'drivers/DataListenerRowFeatured.php');
+/**
+ \class manufacturer
+ \brief Control init et gestion des data product
+*/
+class manufacturer {
- /**
- @var DataType string
+ //! @p object
+ protected static $_instance;
+
+ public static $modules;
+
+ /**
+ */
+ protected function __construct($full) {
+ global $languages_id;
+
+ DataTypes::CompletRequest('leftto', 'manufacturer');
+
+ if($full) self::start_module();
+ }
+
+ protected static function start_module(){
+ $pdm=manufacturerModule::getInstance();
+ self::$modules=$pdm->ret_modules();
+ return $pdm;
+ }
+
+ public static function getInstance($full=true) {
+ if(self::$_instance == null) self::$_instance = new self($full);
+ return self::$_instance;
+ }
+
+ public static function resetInstance(){
+ self::$_instance = null;
+ return self::getInstance();
+ }
+
+ /**
+ Module configuration
+ */
+// public function ret_modules(){ self::start_module(); return self::$modules;}
+
+
+ /**
+ Data function
+ */
+ public static function get_path($current_manufacturer_id = '',$value=false){ return manufacturerData::get_path($current_manufacturer_id,$value); }
+ public static function get_count_products_in_manufacturer($manufacturer_id, $include_inactive = false){ return manufacturerData::get_count_products_in_manufacturer($manufacturer_id,$include_inactive); }
+ public static function get_count_content_in_manufacturer($manufacturer_id){ return manufacturerData::get_count_content_in_manufacturer($manufacturer_id); }
+// public static function get_has_manufacturer_submanufacturers($manufacturer_id){ return manufacturerData::get_has_manufacturer_submanufacturers($manufacturer_id); }
+// public static function get_parent_manufacturers(&$manufacturers, $manufacturers_id) { return manufacturerData::get_parent_manufacturers($manufacturers, $manufacturers_id); }
+// public static function get_submanufacturers(&$submanufacturers_array, $parent_id = 0){ return manufacturerData::get_submanufacturers($submanufacturers_array, $parent_id); }
+ public static function get_manufacturers($manufacturers_array = '', $parent_id = '0', $indent = '') { return manufacturerData::get_manufacturers($manufacturers_array , $parent_id, $indent); }
+
+ public static function get_query($id='',$search='',$exclude='',$option=''){ global $languages_id; return manufacturerData::get_query($id,$search,$exclude,$option); }
+ public static function get_item($id){ return manufacturerData::get_item($id); }
+ public static function add_where_query($where){ return manufacturerData::add_where_query($where); }
+
+ /**
+ \fn manufacturer::resetCacheId($id);
+ \brief delet item in cache
+ \param $id integer id cat
+ */
+ public static function resetCacheId($id){ /*return manufacturerData::resetCacheId($id);*/ }
+
+ /**
+ * \fn ret_modules()
+ * \brief Retour tableau des modules type products actif
+ * @return plusieurs modules via array(object)
+ */
+ public function ret_modules(){ /*self::start_module(); return self::$modules;*/}
+ /**
+ * \fn get_option_data($product_array)
+ * \brief adjust products, depend class price, execute by productData
+ * @param $product_array array
+ */
+ public static function get_option_data($_array){ /*$pdm=self::start_module();return $pdm->get_option_data($_array);*/}
+ /**
+ * \fn get_extra_manufacturer($_id, $key='')
*/
- public $DataType = 'manufacturer';
+ public static function get_extra_manufacturer($_id, $key='') { new self(); return manufacturerData::GetExtraFields($_id, $key); }
+ /**
+ @fn get_extra($id, $key='')
+ @brief call extra data for this categorie
+ this extra proceded by common extra
+ @param $id int id categorie
+ @param $key string name of key for this extra (if extra key exists)
+ @return array
+ */
+ public static function get_extra($id, $key=''){ new self(); return manufacturerData::GetExtra($id, $key); }
+}
+
+
+
+/**
+ @class productData
+ Traitement sql des cat
+*/
+class manufacturerData
+ extends DataStatmentFO
+ implements Interfacedata{
/**
- @var DataType array reg for seo class
+ @var array
*/
- public $reg_anchors = array(
- 'manufacturers_id' => 'm'
- );
+ public static $opt=array();
/**
- @var DataType array reg check for control get params , please respect order $reg_anchors
+ @var array cache
*/
- public $reg_check = array(
- '([0-9]*)' // unique page
- );
+ public static $array_data=array();
/**
- @var DataType files for folder /content
+ @var object
*/
- public $reg_filenames = array(
- 'FILENAME_MANUFACTURER' => FILENAME_DEFAULT // unique page
- );
+ protected static $_instance;
/**
- @var DataType Tables define
+ @var array cache
*/
- public $db_tables = array(
- 'TABLE_MANUFACTURERS' => 'manufacturers', //
- 'TABLE_MANUFACTURERS_INFO' => 'manufacturers_info' //
- );
-
+ public static $object_data;
/**
- @var DataType dynamic
+ @var $cache array cache result
*/
- public $DataTypeDynamic = true;
+ public static $cache=array();
+ /**
+ */
+ protected function __construct() {
+ global $languages_id;
+ }
- /**
- @var DataType root listing
- Use for generate listing based on current data type precised in array
- based on conf DATATYPES_ROOTLISTING_MANUFACTURER
- */
- public $RootListing = array();
- /**
- @var prefix alias a utilise systematiquement dans les requete sql
- */
- public $p = 'm';
+ /**
+ * \brief Prepa donnée sortie
+ * @param $content_query
+ * @param $exclude array
+ * @param $search string
+ */
+ protected static function statment_query($_query,$exclude='',$search=''){
+ $display_lang=self::$obj_language->fetchAssoc();
+ if (empty($exclude))$exclude=array();
+ $tabl=$res=array();
- /**
- @brief constructor
- @param next bool true for complete load , but use 2 call
- */
- function __construct($next=false){
- $this->RootListing = array_map('trim',explode(',',DATATYPES_ROOTLISTING_MANUFACTURER));
- }
+ if(!$_query)
+ return false;
+
+ $listlinkto = DataTypes::GetLeftRoot('manufacturer');
+
+ while ($thisrow = $_query->fetchAssoc()) {
+ if (!in_array($thisrow['name'],$exclude)) {
+ $res=$thisrow;
-
- /**
- @brief sql for sitemap index
- @param $mode le type de control (public)
- @return true
- */
- function Sitemap($mode='public'){
- global $languages_id;
+ $DataRow = new DataListenerRowFeatured(
+ $thisrow['id'],
+ $thisrow['type'],
+ tep_href_link( FILENAME_DEFAULT,'manufacturers_id=' . $thisrow['id'] ),
+ $thisrow['id'],
+ $thisrow['title'],
+ $thisrow['title']
+ );
+
+// $res=explode('|', $thisrow['images']);
+// if(is_array($res)) {
+// $DataRow->SetImages($res);
+// $DataRow->SetImage($res[0]);
+// }
+ $DataRow->SetExtra( self::GetExtraFields($thisrow['id']) );
+
+ $DataRow->SetText($thisrow['text']);
- $this->listing_sql['tables'] = " FROM " . TABLE_MANUFACTURERS . " ".$this->p." ".
- " LEFT JOIN " . TABLE_MANUFACTURERS_INFO . " ".$this->p."d ON( ".$this->p."d.manufacturers_id = ".$this->p.".manufacturers_id AND ".$this->p."d.languages_id = '" . (int)$languages_id . "' ) ".
- "";
- // permanente contrainte
- $this->listing_sql['where'] = " WHERE 1 ";
- // sort in sitemap
- $this->listing_sql['sort'] = " ".$this->p.".manufacturers_name ";
- // l id
- $this->listing_sql['id'] = " ".$this->p.".manufacturers_id ";
- // colone utilsie pour le ratio
- $this->listing_sql['ratio'] = " ".$this->p."d.url_clicked ";
- // list normalise date
- $this->listing_sql['dates'] = " ".$this->p.".date_added as added, ".$this->p.".last_modified as modified ";
+ foreach($listlinkto as $row){
+
+ $namerow = $row.'_id';
+ // retro compatibilité
+ if(!isset($thisrow[$namerow]))
+ $namerow = $row.'s_id';
+
+ if(isset($thisrow[$namerow]))
+ $DataRow->SetLinkTo($row, $thisrow[$namerow] );
- return true;
- }
-
- /**
- @brief this methode construct sql base for link in childs data
- this categorie use sub tables nameofdata _ to_categories
- For history this child data product, use 's' in name of table and name of cols
- @param $type string name of child type
- @param $mode string anchor key used
- @return array
- */
-// public function GetLinkTo($type, $mode='leftto'){
-//
-// // for letto
-// $this->listing_sql['leftto']['rows'] = array(
-// "".$this->p.".manufacturers_id as manufacturers_id"=>0,
-// // // " GROUP_CONCAT(".$this->p."data.datatype_parent_id) as featured_ids "=>0,
-// );
-//
-//
-// // $this->listing_sql['leftto']['tables'] .= " LEFT JOIN " . TABLE_MANUFACTURERS . " ".$this->p." ON ( ".$this->p.".id = ".$this->p.".manufacturers_id ) ";
-// // $this->listing_sql['leftto']['tables'] .= " LEFT JOIN " . TABLE_MANUFACTURERS_INFO . " ".$this->p."d ON( ".$this->p."d.manufacturers_id = ".$this->p.".manufacturers_id AND ".$this->p."d.languages_id = '%s' ) ";
-//
-// return $this->listing_sql['leftto'];
-//
-// }
- /**
- @brief test si al page est du type produits
- @param $mode le type de control (page/cpath/seo)
- */
- public function is_type($mode='unique'){
+ if(preg_match('#([0-9]*,)*#', $thisrow[ $row.'_ids'])){
+ $li = explode(',',$thisrow[ $row.'_ids']);
+ foreach($li as $id){
+ $DataRow->SetLinkTo($row, $id);
+ }
+ }
+ }
+
+ self::$object_data[$thisrow['id']]=$tabl[$thisrow['id']]=$DataRow ; //new objectInfo($res);
+// self::$array_data[$thisrow['id']]->text=self::parse_featured($res['text'],$thisrow['id']);
+ self::add_cache($thisrow['id']);
+ }
+ }
+
- switch(strtolower($mode)){
+ return $tabl;
+ }
- case 'preload_root':
- $page = page::getInstance();
+ /**
+ * \brief Ajout constrainte clause where
+ * @param $add
+ */
+ public static function add_where_query($add){ self::$where_query .=' '.$add.' '; }
- $category_depth = $page->GetVar('category_depth');
+ /**
+ * \fn reset_query()
+ */
+ protected static function reset_query() { self::$where_query=''; }
- if($category_depth == 'top'){
- $category_depth = 'product';
- $page->add_var_page('category_depth',$category_depth);
- }
- break;
- case 'transversal':
- case 'listing':
- if( isset($_GET['manufacturers_id']) && is_numeric($_GET['manufacturers_id']) )
- return true;
- break;
-
- // listing mode, block home page
- case 'unique':
- if( isset($_GET['manufacturers_id']) && is_numeric($_GET['manufacturers_id']) )
- DataTypes::ForceChilds($this->DataType, 'product');
- break;
- }
- return false;
+
+ /**
+ * \fn cstr_query($orderby='', $limit='', $option='')
+ * \brief Requeteur
+ * @param $orderby
+ * @param $limit
+ * @param $option
+ */
+ protected static function cstr_query($orderby='', $limit='', $option=''){
+ $query="SELECT
+ c.manufacturers_id as id ,
+ c.manufacturers_image as image,
+ c.manufacturers_name as title
+
+ FROM " . TABLE_MANUFACTURERS . " c, " . TABLE_MANUFACTURERS_INFO . " cd WHERE c.manufacturers_id = cd.manufacturers_id AND cd.languages_id = '" . self::$lg_id . "' ";
+
+ $query .=self::$where_query;
+ $query .=' ORDER BY ' .(!tep_not_null($orderby)? ' c.manufacturers_name ASC ' : $orderby) ;
+ if($limit!='0')
+ $query .=' LIMIT '.(!tep_not_null($limit)? '50' : $limit) ;
+
+ return $query;
+ }
+
+
+
+
+
+ /**
+ * \brief Appel item
+
+ * @param $id int l'Id
+ * @param $search string content_name le nom du titre
+ * @param $exclude array tableau d'exclusion de nom
+ * @param $option array option
+ */
+ public static function get_query($id='',$search='', $exclude='',$option=''){
+ global $languages_id;
+
+ self::start();
+ $DB=Database::getInstance();
+ self::$lg_id=(int)$languages_id;
+ $search=tep_db_prepare_input($search);
+
+ //! soit id soit sherach name key
+ self::add_where_query((tep_not_null($id) && is_numeric($id) ? " AND c.manufacturers_id = '" . (int)$id . "' ": (!empty($search)?" AND c.manufacturers_name LIKE '%" . tep_db_input($search) . "%' ":'') ));
+ $sql=self::cstr_query( (isset($option['orderby'])?(string)$option['orderby']:''),(isset($option['limit'])?(int)$option['limit']:''),(array)@$option) ;
+
+ $content_query = $DB->query($sql);
+ self::reset_query();
+ return self::statment_query($content_query,$exclude,$search);
+ }
+
+ /**
+ * \brief Alias unique ID
+ * @param $id int
+ */
+ public static function get_item($id){
+ self::reset_query();
+ $db_list=self::get_query($id);
+
+ if(is_numeric($id) && isset($db_list[(int)$id])){
+ return $db_list[$id];
+ }else{
+ $db_list=self::get_query('',$id);
+ foreach($db_list as $item)
+ if((string)$id==(string)$item->name)return $item;
+ }
+ return false;
+ }
+
+ /**
+ * \fn get_path($current_manufacturer_id = '',$value=false)
+ * \brief Generate a path to manufacturers
+ * @param $current_manufacturer_id int cat ID
+ * @param $value bool si false, sortie string "cPath=1_3" si true, sortie string "1_3"
+ */
+ public static function get_path($current_manufacturer_id = '',$value=false) {
+ global $cPath_array;
+
+ if (tep_not_null($current_manufacturer_id)) {
+ $cp_size = sizeof($cPath_array);
+ if ($cp_size == 0) {
+ $cPath_new = $current_manufacturer_id;
+ } else {
+ $cPath_new = '';
+ $last_manufacturer_query = tep_db_query("select parent_id from " . TABLE_MANUFACTURERS . " where manufacturers_id = '" . (int)$cPath_array[($cp_size-1)] . "'");
+ $last_manufacturer = tep_db_fetch_array($last_manufacturer_query);
+
+ $current_manufacturer_query = tep_db_query("select parent_id from " . TABLE_MANUFACTURERS . " where manufacturers_id = '" . (int)$current_manufacturer_id . "'");
+ $current_manufacturer = tep_db_fetch_array($current_manufacturer_query);
+
+ if ($last_manufacturer['parent_id'] == $current_manufacturer['parent_id']) {
+ for ($i=0; $i<($cp_size-1); $i++) {
+ $cPath_new .= '_' . $cPath_array[$i];
+ }
+ } else {
+ for ($i=0; $i<$cp_size; $i++) {
+ $cPath_new .= '_' . $cPath_array[$i];
+ }
+ }
+ $cPath_new .= '_' . $current_manufacturer_id;
+
+ if (substr($cPath_new, 0, 1) == '_') {
+ $cPath_new = substr($cPath_new, 1);
+ }
}
+ } else {
+ $cPath_new = implode('_', $cPath_array);
+ }
+ if ($value) return 'cPath=' . $cPath_new;
+ else return $cPath_new;
+ }
+
+ /**
+ * \brief Return the number of products and manufacturer child in a manufacturer
+ // TABLES: products, products_to_manufacturers, manufacturers
+ */
+ public static function get_count_products_in_manufacturer($manufacturer_id, $include_inactive = false) {
+
+// if(isset(self::$object_data[$manufacturer_id]->count_products)) return self::$object_data[$manufacturer_id]->count_products;
+
+ $products_count = 0;
+// $DB=Database::getInstance();
+// if ($include_inactive == true) {
+// $products_query = $DB->query("select count(p.products_id) as total from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c where p.products_id = p2c.products_id and p2c.manufacturers_id = '" . (int)$manufacturer_id . "'");
+// } else {
+// $products_query = $DB->query("select count(p.products_id) as total from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c where p.products_id = p2c.products_id and p.products_status = '1' and p2c.manufacturers_id = '" .(int) $manufacturer_id . "' ");
+// }
+// if($products_query->__get('numRows')>0 ) $products = $products_query->fetchAssoc();
+// else $products['total']= 0;
+// $products_count += $products['total'];
+//
+// if(!isset(self::$object_data[$manufacturer_id]) || !self::get_item($manufacturer_id)) return false;
+// self::$object_data[$manufacturer_id]->count_products=(int)$products_count;
+//
+// self::add_where_query(" AND parent_id = '" . (int)$manufacturer_id . "' ");
+// $db_list=self::get_query('','','',array('limit'=>'30'));
+//
+// foreach($db_list as $cat)
+// if($cat->key !=(int)$manufacturer_id && (int)$manufacturer_id ==$cat->parent_id) {
+// $products_count +=(isset($cat->count_products) ? $cat->count_products : self::get_count_products_in_manufacturer($cat->manufacturers_id) );
+// }
+
+ return $products_count;
+ }
+
+ /**
+ * \brief Return the number of products and manufacturer child in a manufacturer
+ // TABLES: products, products_to_manufacturers, manufacturers
+ */
+ public static function get_count_content_in_manufacturer($manufacturer_id) {
+ $products_count = 0;
+// $DB=Database::getInstance();
+//
+// $products_query = $DB->query("select count(c.content_id) as total from " . TABLE_CONTENT . " c , " . TABLE_CONTENT_TO_CATEGORIES . " c2c where c.content_id = c2c.content_id and c2c.manufacturers_id = '" . (int)$manufacturer_id . "' and c.content_status='1' ");
+//
+// if($products_query->__get('numRows')>0 ) $products = $products_query->fetchAssoc();
+// else $products['total']= 0;
+// $products_count += $products['total'];
+//
+// if(!isset(self::$object_data[$manufacturer_id]) || !self::get_item($manufacturer_id)) return false;
+// self::$object_data[$manufacturer_id]->count_products=(int)$products_count;
+//
+// self::add_where_query(" AND parent_id = '" . (int)$manufacturer_id . "' ");
+// $db_list=self::get_query('','','',array('limit'=>'30'));
+//
+// foreach($db_list as $cat)
+// if($cat->key !=(int)$manufacturer_id && (int)$manufacturer_id ==$cat->parent_id) {
+// $products_count +=(isset($cat->count_products) ? $cat->count_products : self::get_count_products_in_manufacturer($cat->manufacturers_id) );
+// }
+
+ return $products_count;
+ }
+
+ /**
+ * \brief Return false if not the manufacturer has submanufacturers or nbr manufacturer
+ */
+ public static function get_has_manufacturer_submanufacturers($manufacturer_id) {
+/*
+ self::add_where_query(" AND parent_id = '" . (int)$manufacturer_id . "' ");
+ $db_list=self::get_query();
+
+ if (($count=count($db_list)) && $count > 0) return $count;
+ else return 0;*/
+
+ }
+
/**
- @brief calcul du cpath specifique a ce tyep de donnée
+ * \brief Construction d'un select sur les catégories actives
*/
- function GetcPath(){
- return false;
+ public static function get_manufacturers($manufacturers_array = '', $parent_id = '0', $indent = '') {
+ // global $languages_id;
+ // if (!is_array($manufacturers_array)) $manufacturers_array = array();
+ // $manufacturers_query = tep_db_query("select c.manufacturers_id, cd.manufacturers_name from " . TABLE_MANUFACTURERS . " c, " . TABLE_MANUFACTURERS_DESCRIPTION . " cd where parent_id = '" . (int)$parent_id . "' and c.manufacturers_status='1' and c.manufacturers_id = cd.manufacturers_id and cd.language_id = '" . (int)$languages_id . "' order by sort_order, cd.manufacturers_name");
+ // while ($manufacturers = tep_db_fetch_array($manufacturers_query)) {
+ // $manufacturers_array[] = array('id' => $manufacturers['manufacturers_id'], 'text' => $indent . $manufacturers['manufacturers_name']);
+ //
+ // if ($manufacturers['manufacturers_id'] != $parent_id) $manufacturers_array = tep_get_manufacturers($manufacturers_array, $manufacturers['manufacturers_id'], $indent . ' ');
+ // }
+ //
+ // return $manufacturers_array;
}
+ public static function GetExtraFields($_id, $key=''){
+ $array= array();
+ if(isset(self::$object_data[(int)$_id]) && isset(self::$object_data[(int)$_id]->extra) && empty($key) )$array= self::$object_data[(int)$_id]->extra;
+ else {
+ $DB=Database::getInstance();
+ $array=array();
+ $sql = "SELECT
+ e.fields_id as id,
+ e.fields_input_type as input_type,
+ e.fields_key as fkey,
+ fields_advanced_search,
+ e.fields_active_value_language as value_language,
+ l.fields_name as label,
+ l.fields_format as input_format,
+ p2epf.value as value
+ FROM " . TABLE_EXTRA_FIELDS_TO . " p2epf ,
+ " . TABLE_EXTRA_FIELDS . " e
+ JOIN " . TABLE_EXTRA_FIELDS_LABELS . " l ON e.fields_id = l.fields_id
+ WHERE
+ p2epf.fields_id=e.fields_id
+ AND data_type='manufacturer'
+ AND data_id = '" . (int)$_id . "'
+ AND ( l.languages_id='".self::$lg_id."' OR l.languages_id= 0)
+ AND fields_special_mod='".$key."'
+ ORDER BY fields_sort ASC " ;
+ $epf_query = $DB->query($sql);
+
+ while( $e = $epf_query->fetchAssoc() ) {
+
+
+ $val = $DB->query( $sql ="SELECT p2epf.value as value FROM " . TABLE_EXTRA_FIELDS_TO . " p2epf WHERE p2epf.fields_id=".$e['id']." AND data_type='manufacturer' AND data_id = '" . (int)$_id . "' AND languages_id='". (($e['value_language']==1 && !in_array( (int)$e['input_type'] , array(4,2)) )? self::$lg_id : 0)."' ");
+ $result = $val->fetchAssoc();
+
+ switch((int)$e['input_type'] ) {
+ case 2: // radio
+ case 4: // select
+ case 6: // select mutli
+ case 7: // checkbox mutli
+ case 3: // checkbox
+ $val = self::GetEFValue($e['id'] ,$result['value'] , (($e['value_language']==1)? self::$lg_id : 0) );
+ break;
+ case 0: // classic
+ case 1: // textarea
+ case 5: // hidden
+ default:
+ $val = $result['value'];
+ }
+
+ $array[ (!empty($e['epf_key'])?$e['fkey'] :$e['id']) ]=new objectInfo( array(
+ 'label'=>(string)$e['label'],
+ 'name'=>(string)$e['label'], // obsolete
+ 'value' => $val, // obsolete
+ 'input_value' => $val,
+ 'epf_key'=>(string)$e['fkey'],
+ 'epf_id'=>(int)$e['id'], // obsolete
+ 'id'=>(int)$e['id'],
+// 'epf_show_in_listing'=>(int)$e['epf_show_in_listing'],
+ 'input_type'=>(int)$e['input_type'],
+ 'input_format'=>$e['input_format'],
+ 'required_status'=>0,
+ // 'epf_advanced_search'=>(int)$e['epf_advanced_search']
+ ) );
+
+
+ }
+
+ if(!isset(self::$object_data[(int)$_id]))self::$object_data[(int)$_id]=new objectInfo(array());
+ self::$object_data[(int)$_id]->extra = $array;
+ }
+
+ return $array;
+ }
+
/**
- @brief Prepare an retrun result Seo request
- @param $mode string anchor key used
- @param $subtype Not used
- @param $id integer current id
- @param $language_id integer current language id
- @return array (
- ID => '',
- tName => '',
- head_desc_tag => '',
- head_keywords_tag =>''
- )
+ @fn GetEFValue($epfid,$values, $languages_id, $separator = ', ')
+ @brief get in db for extract all value for EF stocked in id value and not string
+ @param $epfid int
+ @param $values string (id, id,...)
+ @param $languages_id int or 0 for value not multi language
+ @param $separator seperator result
*/
- public function SeoGetQuery($mode, $subtype, $id, $language_id){
+ public static function GetEFValue($epfid,$values, $languages_id, $separator = ', '){
$DB=Database::getInstance();
+ $val = '';
+ $s='';
- switch($mode){
- default:
- $sql = "SELECT manufacturers_id as ID , manufacturers_name as tName FROM ".TABLE_MANUFACTURERS." WHERE manufacturers_id='".(int)$id."' LIMIT 1";
- $rsql = $DB->query($sql);
- $result = $rsql->fetchAssoc();
- $result['head_desc_tag']='';
- $result['head_keywords_tag']='';
+ $a = explode(',',$values);
+ foreach($a as $r)
+ if(!empty($r))$val .=(int)$r.",";
- $result['sql']=$sql;
- }
+ if(strlen($val) <= 0)
+ return '';
- return $result;
+ $val = $DB->query( $sql ="SELECT fields_value as value FROM " . TABLE_EXTRA_FIELDS_VALUES . " p2epf WHERE value_id IN (".substr($val, 0, -1).") AND fields_id = '" . (int)$epfid . "' AND languages_id='".(int) $languages_id."' ORDER BY sort_order ");
+ $result = $val->fetchAllAssoc();
+
+ foreach($result as $r)
+ $s .=$r['value'] .$separator;
+
+ return substr($s, 0, -1);
}
- /**
- @brief chargement des données transversal
- @param $type string name childs type for listing
- @param subtype object childs DataType
- */
- function FO_load_listing(listing $listing, DataTypesChildListing $subtype, $type){
- global $current_category_id, $languages_id;
- $page = page::getInstance();
- $category_depth = $page->GetVar('category_depth');
- $DB=Database::getInstance();
- $this->ChildsType = $type;
+}
- $sql_tmp = $subtype->listing_sql;
-
- if (isset($_GET['manufacturers_id'])) {
+/**
+ * \class productModule
+ * \brief Traitement des modules associé
+*/
+class manufacturerModule
+ extends AbstractAcaModule
+ implements InterfaceAcaGene{
- $breadcrumb=$page->return_object('breadcrumb');
-
- $manufacturer = manufacturer::get_item((int)$_GET['manufacturers_id']);
+ /**
+ flag de la class
+ @param string
+ */
+ var $name;
+ /**
+ Les modules actif
+ @param string
+ */
+ var $modules;
+ /**
+ Pile des images du porduit
+ @param array
+ */
+ var $pile_img;
- if ( ! is_object($manufacturer) )
- return false;
- $breadcrumb->add( __('@manufacturer breadcrumb root'), $manufacturer->href );
- $breadcrumb->add( $manufacturer->title , $manufacturer->href );
-
-// $page->SetVar('manufacturers',$manuf);
+ protected static $_instance;
- // var use in draw master detail listing
- $obj = new stdClass();
- $obj->type = $this->DataType ;
- $obj->gabarit = $this->DataType.'/listing.detail' ;
-// $obj->image = $manuf['manufacturers_image'];
-// $obj->name = $manuf['manufacturers_name'];
-// $obj->description = false;
- $obj->image = $manufacturer->image ;
- $obj->name = $manufacturer->title ;
- $obj->href = $manufacturer->href ;
- $obj->description = false;
-
- $page->SetVar('RootListing',$obj);
- $page->SetVar('current_id',(int)$_GET['manufacturers_id']);
- $page->SetVar('current_type',(string)'manufacturer');
- $page->SetVar('current_object', $manufacturer);
+ /**
+ */
+ protected function __construct() {
+ global $language, $page;
+ $this-> name=__CLASS__;
+ $this->type_flag=1;
+ $this-> products_id='';
+ $this-> image_handler='';
- $listing->QueryAddWhere( " AND p.manufacturers_id= '".$_GET['manufacturers_id']."' ");
- return true;
- }
-
- }
+ $this->modules=array();
+ $this->pile_img=array();
+ $list_mod=array();
+ foreach(parent::initialise_type('MODULE_ACAMANUF_INSTALLED','manufacturers') as $class){
+ $cl[$class]=new $class ();
+ $list_mod[$class] = $cl[$class]->sort_order;
+ }
+ asort($list_mod);
+ foreach($list_mod as $class=>$s){
+ $this->modules[$class] =$cl[$class];
+ }
+ unset($cl);unset($list_mod);
+ return $this->modules;
+ }
- /**
- @brief calcul du cpath specifique a ce tyep de donnée
- */
- function FO_load_page($mode='unique'){
- global $aca_product,$product_info, $page_content, $language, $cPath, $languages_id;
+ public static function getInstance() {
+ if(self::$_instance == null) self::$_instance = new self();
+ return self::$_instance;
+ }
- $page = page::getInstance();
- $DB=Database::getInstance();
+ public static function resetInstance(){
+ self::$_instance = null;
+ return self::getInstance();
+ }
- switch($mode){
- case 'transversal':
- case 'listing':
+ public function get_option_data($_array){
+ if(isset($this->modules) && is_array($this->modules))
+ foreach ($this->modules as $key=>$module) {
+ if ( $module->enabled && (method_exists($module, 'get_option_data' ))) {
+ $_array=$this->modules[$key]->get_option_data($_array);
+ }
+ }
+ return $_array;
+ }
- break;
- }
+ /**
+ * \brief Affiche module elemennt html
+ * Block principal d'affichage, liste ou vue des élément. Block principal de page
+ * @param $pID int $pID le Id du produits
+ * @param @classe string le nom de la class appelé, ou vide pour toutes les class enfants
+ */
+ public function display_view($pID,$classe=''){
+ global $page;
+ if (!empty($classe)) {
+ if (isset($this->modules[$classe]) && $this->modules[$classe]->enabled and (method_exists($classe, 'display_view' ))){
+ $this->modules[$classe]->load_db_values($pID);
+ return $this->modules[$classe]->display_view($pID);
+ }
+ } else {
+ $c='';
+ if(isset($this->modules) && is_array($this->modules))
+ foreach ($this->modules as $key=>$module) {
+ if (($module->enabled) and (method_exists($module, 'display_view' ))) {
+ $this->modules[$key]->load_db_values($pID);
+ $c .=$this->modules[$key]->display_view($pID);
+ }
+ }
+ return $c;
+ }
+ }
- return $page_content;
- }
+ /**
+ * \brief Affiche module display_view mini
+ * @param $cID int cID le Id du customers
+ * @param $class string class le nom de la class appelé, ou vide pour toutes les class enfants
+ */
+ public function display_view_min($cID,$class=''){
+ global $page;
+ if (!empty($class)) {
+ if (isset($this->modules[$class]) && $this->modules[$class]->enabled and (method_exists($module, 'display_view_min' ))){
+ $this->modules[$class]->load_db_values($cID);
+ return $this->modules[$class]->display_view_min($cID);
+ }
+ } else {
+ $c='';
+ foreach ($this->modules as $key=>$module) {
+ if (($module->enabled) and (method_exists($module, 'display_view_min' ))) {
+ $this->modules[$key]->load_db_values($cID);
+ $c .=$this->modules[$key]->display_view_min($cID);
+ }
+ }
+ return $c;
+ }
+ }
}
-?>
+
+?>
\ No newline at end of file
Modified: trunk/extensions/SPECIALS_stable/catalog/admin/includes/javascript/modules/products/specials.js.php
===================================================================
--- trunk/extensions/SPECIALS_stable/catalog/admin/includes/javascript/modules/products/specials.js.php 2016-04-27 05:40:33 UTC (rev 5321)
+++ trunk/extensions/SPECIALS_stable/catalog/admin/includes/javascript/modules/products/specials.js.php 2016-04-27 08:21:03 UTC (rev 5322)
@@ -23,6 +23,7 @@
// Check
DisplayAdjust:function( ) {
+ var master = OSCSS_JSCORE.products.utlis;
// adjust input disabled based on select mode (% / FIXE )
$("select.special_mode").change(function(){
@@ -179,7 +180,7 @@
// trick JavaScript pour émuler le self:: en PHP : on utilise une variable locale
var self = OSCSS_JSCORE.specials.utlis;
-var master = OSCSS_JSCORE.products.utlis;
+
})(); // fin de scope locale
//--></script>
Modified: trunk/extensions/SPECIALS_stable/catalog/templates/defaut/includes/boxes/specials.php
===================================================================
--- trunk/extensions/SPECIALS_stable/catalog/templates/defaut/includes/boxes/specials.php 2016-04-27 05:40:33 UTC (rev 5321)
+++ trunk/extensions/SPECIALS_stable/catalog/templates/defaut/includes/boxes/specials.php 2016-04-27 08:21:03 UTC (rev 5322)
@@ -55,14 +55,9 @@
$li[]=(int)$row['id'];
$obj = product::get_item((int)$row['id']);
- $tmp = new stdClass;
- $tmp->name = $obj->products_name;
- $tmp->title = $obj->products_name;
- $tmp->href = $obj->href;
- $tmp->image = $obj->products_image;
- $tmp->price = ( ($obj->products_price > 0) ?$price->print_products_price($obj->products_id,'html') : false );
- $list[] = $tmp;
+
+ $list[] = $obj;
}
}
Modified: trunk/extensions/SPECIALS_stable/install.xml
===================================================================
--- trunk/extensions/SPECIALS_stable/install.xml 2016-04-27 05:40:33 UTC (rev 5321)
+++ trunk/extensions/SPECIALS_stable/install.xml 2016-04-27 08:21:03 UTC (rev 5322)
@@ -31,7 +31,7 @@
<file name="admin/includes/languages/%LANGUAGE%/modules/products/specials.txt" lgref="fr_FR" />
<file name="includes/languages/%LANGUAGE%/listing_specials.php" lgref="fr_FR" />
- <file name="includes/languages/%LANGUAGE%/boxes/specials.php" lgref="fr_FR" />
+<!-- <file name="includes/languages/%LANGUAGE%/boxes/specials.php" lgref="fr_FR" /> -->
</addfilelg>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2016-04-27 05:40:35
|
Revision: 5321
http://sourceforge.net/p/oscss/svn/5321
Author: homer8173
Date: 2016-04-27 05:40:33 +0000 (Wed, 27 Apr 2016)
Log Message:
-----------
FIX bootstrap implementation in login and create gabarit
Modified Paths:
--------------
trunk/catalog/templates/defaut/includes/gabarit/account/create.gab
trunk/catalog/templates/defaut/includes/gabarit/account/login.gab
Modified: trunk/catalog/templates/defaut/includes/gabarit/account/create.gab
===================================================================
--- trunk/catalog/templates/defaut/includes/gabarit/account/create.gab 2016-04-26 16:15:52 UTC (rev 5320)
+++ trunk/catalog/templates/defaut/includes/gabarit/account/create.gab 2016-04-27 05:40:33 UTC (rev 5321)
@@ -8,7 +8,7 @@
@encode UTF-8
*/
?>
-<?php echo tep_draw_form('login_form', tep_href_link(FILENAME_CREATE_ACCOUNT, 'action=checkmail', 'SSL')); ?>
+<?php echo tep_draw_form('login_form', tep_href_link(FILENAME_CREATE_ACCOUNT, 'action=checkmail', 'SSL'), 'post',' role="form" class="form-horizontal"'); ?>
<fieldset class="returningCustomer">
@@ -22,7 +22,7 @@
</div>
- <div class="btn-group">
+ <div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<input type="submit" class="btn btn-default" value="<?php echo __('image button create'); ?>" />
</div>
Modified: trunk/catalog/templates/defaut/includes/gabarit/account/login.gab
===================================================================
--- trunk/catalog/templates/defaut/includes/gabarit/account/login.gab 2016-04-26 16:15:52 UTC (rev 5320)
+++ trunk/catalog/templates/defaut/includes/gabarit/account/login.gab 2016-04-27 05:40:33 UTC (rev 5321)
@@ -1,4 +1,5 @@
<?php
+
/**
@licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
@package osCSS-2 <www http://www.oscss.org>
@@ -8,34 +9,36 @@
@encode UTF-8
*/
?>
-<?php echo tep_draw_form('login_form', tep_href_link(FILENAME_LOGIN, 'action=process', 'SSL'),'post', ' role="form" '); ?>
+<?php echo tep_draw_form('login_form', tep_href_link(FILENAME_LOGIN, 'action=process', 'SSL'),'post', ' role="form" class="form-horizontal"'); ?>
- <fieldset >
+<fieldset class="col-lg-12">
- <legend><?php echo __('@login text returning customer'); ?></legend>
+ <legend><?php echo __('@login text returning customer'); ?></legend>
- <div class="form-group">
- <label for="email_address" class="col-sm-2 control-label"><?php echo __('entry email address'); ?></label>
- <div class="col-sm-10">
+ <div class="form-group">
+ <label for="email_address" class="col-sm-4 control-label"><?php echo __('entry email address'); ?></label>
+ <div class="col-sm-8 input-group">
<?php echo tep_draw_input_field('email_address','email_address',(isset($_SESSION['guest_email']) ? $_SESSION['guest_email'] : ''), ' class="form-control" placeholder="Email" ', true); ?>
- </div>
- </div>
+ </div>
+ </div>
- <div class="form-group">
- <label for="password" class="col-sm-2 control-label"><?php echo __('entry password'); ?></label>
- <div class="col-sm-10">
+ <div class="form-group">
+ <label for="password" class="col-sm-4 control-label"><?php echo __('entry password'); ?></label>
+ <div class="col-sm-8 input-group">
<?php echo tep_draw_password_field('password','password','', true,' class="form-control" placeholder="'.__('entry password').'" '); ?>
- </div>
- </div>
+ </div>
+ </div>
- <p class="infoText">
+ <p class="infoText text-right">
+ <small>
<?php printf(__('@login password forgotten %s'), '<a href="' . tep_href_link(FILENAME_PASSWORD_FORGOTTEN, '', 'SSL') . '">' . __('@login password forgotten text') . '</a>' ); ?>
- </p>
+ </small>
+ </p>
- <div class="btn-group">
- <div class="col-sm-offset-2 col-sm-10">
- <input type="submit" class="btn btn-default" value="<?php echo __('image button login'); ?>" />
- </div>
- </div>
- </fieldset>
+ <div class="form-group">
+ <div class="col-sm-offset-4 col-sm-8">
+ <input type="submit" class="btn btn-default" value="<?php echo __('image button login'); ?>" />
+ </div>
+ </div>
+</fieldset>
</form>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2016-04-26 16:15:54
|
Revision: 5320
http://sourceforge.net/p/oscss/svn/5320
Author: homer8173
Date: 2016-04-26 16:15:52 +0000 (Tue, 26 Apr 2016)
Log Message:
-----------
MAJ footer according to new conf details
Modified Paths:
--------------
trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/footer.php
Modified: trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/footer.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/footer.php 2016-04-26 15:47:07 UTC (rev 5319)
+++ trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/footer.php 2016-04-26 16:15:52 UTC (rev 5320)
@@ -8,98 +8,101 @@
@note La Licence OpenSource d'osCSS, vous impose de conserver le liens vers le site de la communauté. C'est la seul contrepartie imposé part l'utilisation de cette solution , qui est diffusé gratuitement, dans le cadre de ca licence.
Si vous supprimer la référence à osCSS, la commuanté se reserve le droit de faire valoir ces droits aupres des organisme dedié à la protection de cette licence.
- CE template est livré gratuitement pour donner un aperçu des disponibilités du moteur de templates.
- Veuillez respecter les termes et conditions générales d'utilisation.
- Vous pouvez employer nos templates sous n'importe quel site Web publiquement accessible selon les termes et conditions générales du contrat Creative Commons
-*/
+ CE template est livré gratuitement pour donner un aperçu des disponibilités du moteur de templates.
+ Veuillez respecter les termes et conditions générales d'utilisation.
+ Vous pouvez employer nos templates sous n'importe quel site Web publiquement accessible selon les termes et conditions générales du contrat Creative Commons
+ */
global $template;
?>
<div id="push"></div>
<footer class="footer">
- <div class="row">
- <div class="col-sm-2">
- <h3><span class="sprite-info rotator"></span>Informations</h3>
- <div class="footer_box">
- <?php $boxe =$page->oscss_boxes->_return('information');
- echo unhtmlentities($boxe->content) ?>
- </div>
- </div>
- <div class="col-sm-2">
- <h3><span class="sprite-client rotator"></span><?= __('service client') ?></h3>
- <ul class="FooterBoxWrapper">
- <li class="first"><a href="<?php echo tep_href_link(FILENAME_CONTACT_US) ?>"><?php echo __('contact us') ?></a></li>
- <li><a href="/">Retours</a></li>
- <li><a href="/">Livreurs</a></li>
- <li class="last"><a href="<?php echo tep_href_link(FILENAME_SITEMAP) ?>"><?php echo __('sitemap') ?></a></li>
- </ul>
- </div>
- <div class="col-sm-2">
- <h3><span class="sprite-extra rotator"></span>Bonus</h3>
- <ul class="FooterBoxWrapper">
- <li class="first"><a href="/">Nos marques</a></li>
- <li><a href="/">Bon cadeaux</a></li>
- <li><a href="<?php echo tep_href_link(FILENAME_DEFAULT, 'featured=2') ?>"><?= __('offers moment') ?></a></li>
- <li><a href="<?php echo tep_href_link('rss.php') ?>"><?php echo __('rss') ?></a></li>
- </ul>
- </div>
- <div class="col-sm-2">
- <h3><span class="sprite-follow rotator"></span><?= __('nous suivre footer') ?></h3>
- <ul class="FooterBoxWrapper">
- <li class="first"><i class="sprite-facebook rotator"></i><a target="_blank" href="https://www.facebook.com/oscss.org">Facebook</a></li>
- <li><i class="sprite-tweeter rotator"></i><a target="_blank" href="https://twitter.com/osCSS">Tweeter</a></li>
- <li><i class="sprite-pinterest rotator"></i><a target="_blank" href="http://forums.oscss.org/forum.html"><?= __('Forum footer') ?></a></li>
- <li><i class="sprite-googlep rotator"></i><a target="_blank" href="https://plus.google.com/107698144587463763937/posts">Google +</a></li>
- </ul>
- </div>
- <div class="col-sm-2">
- <h3><span class="sprite-account rotator"></span><?= __('my account') ?></h3>
- <div class="footer_box">
- <?php $boxe =$page->oscss_boxes->_return('myaccount');
- echo unhtmlentities($boxe->content) ?>
- </div>
- </div>
- <div class="col-sm-2">
- <?php $r = explode(",", STORE_NAME_ADDRESS); $r1 = explode("-", str_replace('\r\n',"",$r[2])); ?>
- <h3><span class="sprite-contact rotator"></span><?= __('nous contacter footer') ?></h3>
- <address class="vcard">
- <h4 class="name"><?php echo $r[0] ?></h4>
- <div>
- <i class="sprite-address"></i>
- <a class="adr" target="_blank" href="https://www.google.fr/maps/place/5 impasse de la cerisaie,+28240+La Loupe">
-
- <span class="street-address"><?php echo str_replace('\r\n',"",$r[1]) ?></span>
- <span class="postal-code"><?php echo $r1[0] ?></span><br />
- <span class="locality"><?php echo $r1[1] ?></span>,
- <span class="country-name"><?php echo str_replace('\r\n',"",$r[3]) ?></span>
- </a>
- </div>
- <div class="tel"><i class="sprite-tel"></i><a href="tel:+33458005391">+33 (0)4 58 00 53 91</a></div>
- <div class="email"><i class="sprite-email"></i><a href="mailto:su...@os...">su...@os...</a></div>
- </address>
- </div>
- </div>
+ <div class="row">
+ <div class="col-sm-2">
+ <h3><span class="sprite-info rotator"></span>Informations</h3>
+ <div class="footer_box">
+ <?php $boxe = $page->oscss_boxes->_return('information');
+ echo unhtmlentities($boxe->content)
+ ?>
+ </div>
+ </div>
+ <div class="col-sm-2">
+ <h3><span class="sprite-client rotator"></span><?= __('service client') ?></h3>
+ <ul class="FooterBoxWrapper">
+ <li class="first"><a href="<?php echo tep_href_link(FILENAME_CONTACT_US) ?>"><?php echo __('contact us') ?></a></li>
+ <li><a href="/">Retours</a></li>
+ <li><a href="/">Livreurs</a></li>
+ <li class="last"><a href="<?php echo tep_href_link(FILENAME_SITEMAP) ?>"><?php echo __('sitemap') ?></a></li>
+ </ul>
+ </div>
+ <div class="col-sm-2">
+ <h3><span class="sprite-extra rotator"></span>Bonus</h3>
+ <ul class="FooterBoxWrapper">
+ <li class="first"><a href="/">Nos marques</a></li>
+ <li><a href="/">Bon cadeaux</a></li>
+ <li><a href="<?php echo tep_href_link(FILENAME_DEFAULT, 'featured=2') ?>"><?= __('offers moment') ?></a></li>
+ <li><a href="<?php echo tep_href_link('rss.php') ?>"><?php echo __('rss') ?></a></li>
+ </ul>
+ </div>
+ <div class="col-sm-2">
+ <h3><span class="sprite-follow rotator"></span><?= __('nous suivre footer') ?></h3>
+ <ul class="FooterBoxWrapper">
+ <li class="first"><i class="sprite-facebook rotator"></i><a target="_blank" href="https://www.facebook.com/oscss.org">Facebook</a></li>
+ <li><i class="sprite-tweeter rotator"></i><a target="_blank" href="https://twitter.com/osCSS">Tweeter</a></li>
+ <li><i class="sprite-pinterest rotator"></i><a target="_blank" href="http://forums.oscss.org/forum.html"><?= __('Forum footer') ?></a></li>
+ <li><i class="sprite-googlep rotator"></i><a target="_blank" href="https://plus.google.com/107698144587463763937/posts">Google +</a></li>
+ </ul>
+ </div>
+ <div class="col-sm-2">
+ <h3><span class="sprite-account rotator"></span><?= __('my account') ?></h3>
+ <div class="footer_box">
+ <?php $boxe = $page->oscss_boxes->_return('myaccount');
+ echo unhtmlentities($boxe->content)
+ ?>
+ </div>
+ </div>
+ <div class="col-sm-2">
+<?php $r = explode(",", STORE_NAME_ADDRESS);
+$r1 = explode("-", str_replace('\r\n', "", $r[2])); ?>
+ <h3><span class="sprite-contact rotator"></span><?= __('nous contacter footer') ?></h3>
+ <address class="vcard">
+ <h4 class="name"><?php echo $r[0] ?></h4>
+ <div>
+ <i class="sprite-address"></i>
+ <a class="adr" target="_blank" href="https://www.google.fr/maps/place/<?php echo STORE_POS_ADDRESS ?>,+<?php echo STORE_POS_POSTCODE ?>+<?php echo STORE_POS_CITY ?>">
+
+ <span class="street-address"><?php echo STORE_POS_ADDRESS ?></span>
+ <span class="postal-code"><?php STORE_POS_POSTCODE ?></span><br />
+ <span class="locality"><?php echo STORE_POS_CITY ?></span>,
+ <span class="country-name"><?php echo str_replace('\r\n', "", $r[3]) ?></span>
+ </a>
+ </div>
+ <div class="tel"><i class="sprite-tel"></i><a href="tel:<?php echo STORE_OWNER_PHONE_NUMBER ?>"><?php echo STORE_OWNER_PHONE_NUMBER ?></a></div>
+ <div class="email"><i class="sprite-email"></i><a href="mailto:<?php echo STORE_OWNER_EMAIL_ADDRESS ?>"><?php echo STORE_OWNER_EMAIL_ADDRESS ?></a></div>
+ </address>
+ </div>
+ </div>
</footer>
- <footer class="footer_blue">
-
- <div><i class="sprite-row"></i></div>
- <div class="container bas">
- <p class="text-center"><i class="sprite-cb"></i></p>
- <p class="text-muted text-center">~ Design <a target="_blank" href="http://www.oscss.biz"><b>osCSS-Shop</b></a> - ©<?php echo date('Y') ?>
- ~ Propulsé par <a target="_blank" href="http://www.oscss.org/" title=" osCSS "><b>osCSS-2</b></a> ~</p>
- </div>
- </footer>
+<footer class="footer_blue">
+
+ <div><i class="sprite-row"></i></div>
+ <div class="container bas">
+ <p class="text-center"><i class="sprite-cb"></i></p>
+ <p class="text-muted text-center">~ Design <a target="_blank" href="http://www.oscss.org"><b>osCSS-Shop</b></a> ~ ©<?php echo date('Y') ?>
+ ~ Propulsé par <a target="_blank" href="http://www.oscss.org/" title=" osCSS "><b>osCSS-2</b></a> ~</p>
+ </div>
+</footer>
</main>
<!-- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
+<!-- Placed at the end of the document so the pages load faster -->
<!-- <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script> -->
- <script src="<?php echo 'templates/defaut'.'/'; ?>js/bootstrap.min.js"></script>
+<script src="<?php echo 'templates/defaut' . '/'; ?>js/bootstrap.min.js"></script>
- <script type="text/javascript">
- $(".alert").alert()
- </script>
+<script type="text/javascript">
+ $(".alert").alert()
+</script>
- <?php /** Fichier appel bottom page */ $this->draw_file_footer(); ?>
\ No newline at end of file
+<?php /** Fichier appel bottom page */ $this->draw_file_footer(); ?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2016-04-26 15:47:10
|
Revision: 5319
http://sourceforge.net/p/oscss/svn/5319
Author: homer8173
Date: 2016-04-26 15:47:07 +0000 (Tue, 26 Apr 2016)
Log Message:
-----------
FIX manufacturer filter tab
Modified Paths:
--------------
trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/languages/fr_FR/modules/products/manufacturers.txt
Modified: trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/languages/fr_FR/modules/products/manufacturers.txt
===================================================================
--- trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/languages/fr_FR/modules/products/manufacturers.txt 2016-04-26 15:34:00 UTC (rev 5318)
+++ trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/languages/fr_FR/modules/products/manufacturers.txt 2016-04-26 15:47:07 UTC (rev 5319)
@@ -22,4 +22,6 @@
$lang['@manufactures heading inline']= "Fabricant";
$lang['@manufacturers txt status']= "definir fabricant";
$lang['@manufacturers select']= "Fabricants...";
+
+$lang['@filters filter tab manufacturer'] = "Fabricants" ;
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2016-04-26 15:34:03
|
Revision: 5318
http://sourceforge.net/p/oscss/svn/5318
Author: homer8173
Date: 2016-04-26 15:34:00 +0000 (Tue, 26 Apr 2016)
Log Message:
-----------
ADD Owner details in configuration table , update and language file
Modified Paths:
--------------
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/my_boutique.txt
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration.sql
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/my_boutique.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/my_boutique.txt 2016-04-26 12:36:52 UTC (rev 5317)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/my_boutique.txt 2016-04-26 15:34:00 UTC (rev 5318)
@@ -37,8 +37,22 @@
$lang['STORE_OWNER_S']="Propriétaire de la boutique" ;
$lang['STORE_OWNER_L']="Indiquer le nom du propriétaire de la boutique." ;
-$lang['STORE_OWNER_EMAIL_ADDRESS_S']="Adresse Email" ;
+$lang['STORE_OWNER_EMAIL_ADDRESS_S']="Adresse Email" ;
$lang['STORE_OWNER_EMAIL_ADDRESS_L']="L'adresse Email du gérant de la boutique." ;
+$lang['STORE_OWNER_PHONE_NUMBER_S']="Numéro de Téléphone" ;
+$lang['STORE_OWNER_PHONE_NUMBER_L']="Le numéro de téléphone communiqué au public." ;
+
+$lang['STORE_POS_ADDRESS_S']="Adresse du point de vente" ;
+$lang['STORE_POS_ADDRESS_L']="Rue, quartier, adresse où le point de vente est situé." ;
+$lang['STORE_POS_POSTCODE_S']="Code postal du point de vente" ;
+$lang['STORE_POS_POSTCODE_L']="Le code postal où le point de vente est situé." ;
+$lang['STORE_POS_CITY_S']="Ville du point de vente" ;
+$lang['STORE_POS_CITY_L']="La ville où le point de vente est situé." ;
+$lang['STORE_POS_OPENING_HOURS_S']="Horaires du point de vente" ;
+$lang['STORE_POS_OPENING_HOURS_L']="Décrivez rapidement vos horaires." ;
+$lang['STORE_POS_OPENING_HOURS_MICROFORMAT_S']="Horaires microformat" ;
+$lang['STORE_POS_OPENING_HOURS_MICROFORMAT_L']="En anglais, <a href='http://schema.org/openingHours' target='_blank'>Voir ici</a>." ;
+
$lang['EMAIL_FROM_S']="Champ 'From' d'un Email envoyé" ;
$lang['EMAIL_FROM_L']="L'adresse Email utilisée pour identifier l'expéditeur des Emails envoyés par la boutique." ;
$lang['STORE_COUNTRY_S']="Pays" ;
Modified: trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql 2016-04-26 12:36:52 UTC (rev 5317)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql 2016-04-26 15:34:00 UTC (rev 5318)
@@ -30,6 +30,15 @@
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added) values ('STORE_NAME_S', 'STORE_NAME', 'osCSS Demo Shop', 'STORE_NAME_L', '1', '1', NULL, NOW());
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added) values ('STORE_OWNER_S', 'STORE_OWNER', 'osCSS Demo Shop', 'STORE_OWNER_L', '1', '2', NULL, NOW());
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('STORE_OWNER_EMAIL_ADDRESS_S', 'STORE_OWNER_EMAIL_ADDRESS', 'root@localhost', 'STORE_OWNER_EMAIL_ADDRESS_L', '1', '3', NULL, NOW(), 2);
+
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('STORE_OWNER_PHONE_NUMBER_S', 'STORE_OWNER_PHONE_NUMBER', '+33633323234', 'STORE_OWNER_PHONE_NUMBER_L', 1, 19, NULL, NOW(), 2);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('STORE_POS_ADDRESS_S', 'STORE_POS_ADDRESS', '5 impasse de la cerisaie', 'STORE_POS_ADDRESS_L', 1, 20, NULL, NOW(), 2);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('STORE_POS_POSTCODE_S', 'STORE_POS_POSTCODE', '28240', 'STORE_POS_POSTCODE_L', 1, 21, NULL, NOW(), 2);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('STORE_POS_CITY_S', 'STORE_POS_CITY', 'La Loupe', 'STORE_POS_CITY_L', 1, 22, NULL, NOW(), 2);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('STORE_POS_OPENING_HOURS_S', 'STORE_POS_OPENING_HOURS', 'Ven-Mer 17h00 - 21h00 <small> - (fermé le jeudi)</small>', 'STORE_POS_OPENING_HOURS_L', 1, 23, NULL, NOW(), 2);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('STORE_POS_OPENING_HOURS_MICROFORMAT_S', 'STORE_POS_OPENING_HOURS_MICROFORMAT', 'Fr-We 17:00-21:00', 'STORE_POS_OPENING_HOURS_MICROFORMAT_L', 1, 24, NULL, NOW(), 2);
+
+
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('EMAIL_FROM_S', 'EMAIL_FROM', 'root@localhost', 'EMAIL_FROM_L', '1', '4', NULL, NOW(), '2');
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) values ('STORE_COUNTRY_S', 'STORE_COUNTRY', '73', 'STORE_COUNTRY_L', '1', '6', NULL, NOW(),'tep_get_country_name', 'tep_cfg_pull_down_country_list(');
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) values ('STORE_ZONE_S', 'STORE_ZONE', '256', 'STORE_ZONE_L', '1', '7', NULL, NOW(), 'tep_cfg_get_zone_name', 'tep_cfg_pull_down_zone_list(');
Modified: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration.sql 2016-04-26 12:36:52 UTC (rev 5317)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration.sql 2016-04-26 15:34:00 UTC (rev 5318)
@@ -35,6 +35,12 @@
insert IGNORE 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 ('DATATYPES_ROOTLISTING_CATEGORIE_S', 'DATATYPES_ROOTLISTING_CATEGORIE', 'product,content,nested', 'DATATYPES_ROOTLISTING_CATEGORIE_L', '128', '0', NOW(), NOW(),NULL, NULL, 2);
+insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('STORE_OWNER_PHONE_NUMBER_S', 'STORE_OWNER_PHONE_NUMBER', '+33633323234', 'STORE_OWNER_PHONE_NUMBER_L', 1, 19, NULL, NOW(), 2);
+insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('STORE_POS_ADDRESS_S', 'STORE_POS_ADDRESS', '5 impasse de la cerisaie', 'STORE_POS_ADDRESS_L', 1, 20, NULL, NOW(), 2);
+insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('STORE_POS_POSTCODE_S', 'STORE_POS_POSTCODE', '28240', 'STORE_POS_POSTCODE_L', 1, 21, NULL, NOW(), 2);
+insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('STORE_POS_CITY_S', 'STORE_POS_CITY', 'La Loupe', 'STORE_POS_CITY_L', 1, 22, NULL, NOW(), 2);
+insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('STORE_POS_OPENING_HOURS_S', 'STORE_POS_OPENING_HOURS', 'Ven-Mer 17h00 - 21h00 <small> - (fermé le jeudi)</small>', 'STORE_POS_OPENING_HOURS_L', 1, 23, NULL, NOW(), 2);
+insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('STORE_POS_OPENING_HOURS_MICROFORMAT_S', 'STORE_POS_OPENING_HOURS_MICROFORMAT', 'Fr-We 17:00-21:00', 'STORE_POS_OPENING_HOURS_MICROFORMAT_L', 1, 24, NULL, NOW(), 2);
insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SMTP_MAIL_SERVER_S', 'SMTP_MAIL_SERVER', 'localhost', 'SMTP_MAIL_SERVER_L', '12', '1', NOW(), NOW(), NULL, NULL);
insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SMTP_PORT_NUMBER_S', 'SMTP_PORT_NUMBER', '25', 'SMTP_PORT_NUMBER_L', '12', '1', NOW(), NOW(), NULL, NULL);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2016-04-26 12:36:55
|
Revision: 5317
http://sourceforge.net/p/oscss/svn/5317
Author: oscim
Date: 2016-04-26 12:36:52 +0000 (Tue, 26 Apr 2016)
Log Message:
-----------
Fix detail for customer in line
Modified Paths:
--------------
trunk/catalog/admin/includes/modules/pages/customers.php
Modified: trunk/catalog/admin/includes/modules/pages/customers.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/customers.php 2016-04-26 12:00:41 UTC (rev 5316)
+++ trunk/catalog/admin/includes/modules/pages/customers.php 2016-04-26 12:36:52 UTC (rev 5317)
@@ -832,12 +832,8 @@
$DB=Database::getInstance();
-
$action=self::$action;
-// var_dump(self::$Id);
switch ($action) {
-
-
case 'detail':
case 'delete':
case 'view':
@@ -976,14 +972,17 @@
public static function detail_row_page($id){
- // force rattribution id
- $_REQUEST['cID'] = (int)$id;
+
self::GetConf();
- self::load_db_values((int)$id);
+ self::$Id = (int)$id;
+ self::$Info = self::GetDBValue();
- $res=tep_db_query($customers_query_raw = "select sum(op.products_quantity * op.final_price) as ordersum from " . TABLE_CUSTOMERS . " c, " . TABLE_ORDERS_PRODUCTS . " op, " . TABLE_ORDERS . " o where c.customers_id = o.customers_id and c.customers_id='".(int)$id."' and o.orders_id = op.orders_id group by c.customers_firstname, c.customers_lastname order by ordersum DESC");
+ $res=tep_db_query($customers_query_raw = "select sum(op.products_quantity * op.final_price) as ordersum from " . TABLE_CUSTOMERS . " c, " . TABLE_ORDERS_PRODUCTS . " op, " . TABLE_ORDERS . " o where c.customers_id = o.customers_id and c.customers_id='".self::$Id."' and o.orders_id = op.orders_id group by c.customers_firstname, c.customers_lastname order by ordersum DESC");
+
$r=tep_db_fetch_array($res);
self::$Info->orders_sum=$r['ordersum'];
+
+
return MGabCont::CallGab('inline','display_view',__CLASS__);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2016-04-26 12:00:44
|
Revision: 5316
http://sourceforge.net/p/oscss/svn/5316
Author: oscim
Date: 2016-04-26 12:00:41 +0000 (Tue, 26 Apr 2016)
Log Message:
-----------
Fix error in box recently viewed content
Fix link js in product module gab
Modified Paths:
--------------
trunk/catalog/install/data/templates/appareil_photo/techno/includes/gabarit/product/module.gab
trunk/catalog/templates/defaut/includes/boxes/recently_viewed_content.php
Modified: trunk/catalog/install/data/templates/appareil_photo/techno/includes/gabarit/product/module.gab
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/techno/includes/gabarit/product/module.gab 2016-04-26 09:05:35 UTC (rev 5315)
+++ trunk/catalog/install/data/templates/appareil_photo/techno/includes/gabarit/product/module.gab 2016-04-26 12:00:41 UTC (rev 5316)
@@ -10,7 +10,9 @@
*/
global $page, $ele, $load, $themodule;
-
+// print_r($ele);
+// var_dump((_test_bool($ele->action['buy'] ) && count(product_attribut_info($ele->GetId())) == 0) );
+// exit;
?>
<div class="product_block equal-height_listing_block" style="min-height: 556px;">
<div class="img-thumbnail product">
@@ -24,7 +26,7 @@
<?php endif; ?>
<?php if(isset($ele->linkto['featured']) && !empty($ele->linkto['featured'][0]) ): ?>
- <div class="label featured_label en"><strong>featured</strong></div>
+ <div class="label featured_label en"><strong><?php echo __('featured')?></strong></div>
<?php endif; ?>
<!-- <div class="label top_label en"><strong>best sellers</strong></div> -->
@@ -50,21 +52,35 @@
<div><?php echo substr(strip_tags($ele->GetDescription()),0,170).'..'; ?>
</div>
</div>
- <?php if($load->module !='child' || ( $load->module =='child' && tep_not_null($themodule->module_db->title) ) ) : ?>
+ <?php if($load->module !='child' || ( $load->module =='child' && !tep_not_null($themodule->module_db->title) ) ) : ?>
<div class="table">
- <table><tbody><tr class="first">
- <td class="td_left"><?= __('model') ?>:</td>
- <td class="td_right"><?php echo $ele->GetModel(); ?></td>
- </tr><tr>
- <td class="td_left"><?= __('manufacturer') ?>:</td>
- <td class="td_right"><a href="http://www.responsive-shops.org/osc/tstore/31/index.php/brand-name-m-1">Brand Name 1</a></strong></td>
- </tr> <tr>
- <td class="td_left"><?= __('quantity') ?>:</td>
- <td class="td_right"><?php echo $ele->GetQuantity() ?></td>
- </tr><tr class="last">
- <td class="td_left"><?= __('weight') ?>:</td>
- <td class="td_right"><?php echo $ele->GetWeight() ?></td>
- </tr></tbody></table>
+ <table>
+ <tbody>
+ <tr class="first">
+ <td class="td_left"><?= __('model') ?>:</td>
+ <td class="td_right"><?php echo $ele->GetModel(); ?></td>
+ </tr>
+
+ <?php if(isset($ele->linkto['manufacturer']) && !empty($ele->linkto['manufacturer'][0]) ):
+ $ObjManufacturer = manufacturer::get_item($ele->linkto['manufacturer'][0]);
+ ?>
+ <tr>
+ <td class="td_left"><?= __('manufacturer') ?>:</td>
+ <td class="td_right"><a href="<?= $ObjManufacturer->GetHref() ?>"><?= $ObjManufacturer->GetName() ?></a></strong></td>
+ </tr>
+ <?php endif; ?>
+ <tr>
+ <td class="td_left"><?= __('quantity') ?>:</td>
+ <td class="td_right"><?php echo $ele->GetQuantity() ?></td>
+ </tr>
+ <?php if( !in_array( $ele->GetType(), explode(',',TYPE_VIRTUAL_PRODUCTS) ) ) : ?>
+ <tr class="last">
+ <td class="td_left"><?= __('weight') ?>:</td>
+ <td class="td_right"><?php echo $ele->GetWeight() ?></td>
+ </tr>
+ <?php endif; ?>
+ </tbody>
+ </table>
</div>
<?php endif; ?>
<div class="row_02">
@@ -81,20 +97,29 @@
<?php if (_test_bool($ele->action['buy'] ) && count(product_attribut_info($ele->GetId())) == 0): ?>
<?php echo tep_draw_form($themodule->id.'cart_quantity'.$ele->GetId(), tep_href_link(FILENAME_DEFAULT, tep_get_all_get_params(array('action')) . 'action=add_product'), 'post', ' class="addcart"'); ?>
- <?php echo tep_draw_hidden_field('products_id', $ele->GetId()). tep_draw_hidden_field('products_quantity', '1'); ?>
- <?php endif; ?>
+ <?php echo tep_draw_hidden_field('products_id', $ele->GetId()). tep_draw_hidden_field('products_quantity', '1'); ?>
<strong class="button_content button_content1">
<strong class="button bg_button button1">
- <a class="btn btn-default button1" role="button" href="<?php echo $ele->GetHref() ?>" >
+ <a class="btn btn-default button1" role="button" >
<span class="ui-button-text">
<?php echo __('add to cart') ?>
</span>
</a>
</strong>
</strong>
- <?php if (_test_bool($ele->action['buy'] ) && count(product_attribut_info($ele->GetId())) == 0): ?>
</form>
- <?php endif; ?>
+ <?php else: ?>
+ <strong class="button_content button_content1">
+ <strong class="button bg_button button1">
+ <a class="btn btn-default button1" role="button" href="<?php echo $ele->GetHref() ?>" >
+ <span class="ui-button-text">
+ <?php echo __('add to cart') ?>
+ </span>
+ </a>
+ </strong>
+ </strong>
+ <?php endif; ?>
+
<strong class="button_content button_content2">
<strong class="button bg_button button2">
Modified: trunk/catalog/templates/defaut/includes/boxes/recently_viewed_content.php
===================================================================
--- trunk/catalog/templates/defaut/includes/boxes/recently_viewed_content.php 2016-04-26 09:05:35 UTC (rev 5315)
+++ trunk/catalog/templates/defaut/includes/boxes/recently_viewed_content.php 2016-04-26 12:00:41 UTC (rev 5316)
@@ -48,24 +48,15 @@
foreach ($rec_products as $recent) {
if (strlen($recent) >0 && $count<=$page->_conf_value('MAX_DISPLAY_RECENTLY_VIEWED') && ( !isset($_GET['content']) || (isset($_GET['content']) && (int)$_GET['content'] !=$recent)) ) {
- $count++;
+ $count++;
- $obj = content::get_item((int)$recent, true);
-
- $tmp = new stdClass;
- $tmp->type = $type;
- $tmp->name = $obj->title;
- $tmp->title = $obj->title;
- $tmp->href = $obj->href;
- $tmp->image = $obj->orginial;
- $tmp->price = false ;
-
- $list[] = $tmp;
+ $obj = content::get_item((int)$recent, true);
+ $list[] = $obj;
}
}
- if($count<=0)
- return false;
+ if($count<=0)
+ return false;
/**
@remarks Transmit var array for master construtor boxes
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2016-04-26 09:05:36
|
Revision: 5315
http://sourceforge.net/p/oscss/svn/5315
Author: homer8173
Date: 2016-04-26 09:05:35 +0000 (Tue, 26 Apr 2016)
Log Message:
-----------
ADD land file featured
Added Paths:
-----------
trunk/catalog/includes/languages/fr_FR/featured.txt
Added: trunk/catalog/includes/languages/fr_FR/featured.txt
===================================================================
--- trunk/catalog/includes/languages/fr_FR/featured.txt (rev 0)
+++ trunk/catalog/includes/languages/fr_FR/featured.txt 2016-04-26 09:05:35 UTC (rev 5315)
@@ -0,0 +1,14 @@
+<?php
+/**
+ @licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.2.0
+ @date 18/12/2013, 08:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+/* featured */
+ $lang['@featured breadcrumb root']="Accueil Mise en avant" ;
+
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2016-04-26 08:53:22
|
Revision: 5314
http://sourceforge.net/p/oscss/svn/5314
Author: oscim
Date: 2016-04-26 08:53:21 +0000 (Tue, 26 Apr 2016)
Log Message:
-----------
adjust dasboard admin
Modified Paths:
--------------
trunk/catalog/Documents/admin/data/dashboard.xml
Modified: trunk/catalog/Documents/admin/data/dashboard.xml
===================================================================
--- trunk/catalog/Documents/admin/data/dashboard.xml 2016-04-26 08:51:11 UTC (rev 5313)
+++ trunk/catalog/Documents/admin/data/dashboard.xml 2016-04-26 08:53:21 UTC (rev 5314)
@@ -233,5 +233,17 @@
<widget>info_connexion</widget>
</right>
</system>
-
+ <apparence>
+ <left>
+ <widget>view_template</widget>
+ </left>
+ <right>
+ </right>
+ </apparence>
+ <taxes_in_zone>
+ <left>
+ </left>
+ <right>
+ </right>
+ </taxes_in_zone>
</root>
\ 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...> - 2016-04-26 08:51:13
|
Revision: 5313
http://sourceforge.net/p/oscss/svn/5313
Author: oscim
Date: 2016-04-26 08:51:11 +0000 (Tue, 26 Apr 2016)
Log Message:
-----------
Correction fr
Add item manquant
add widget
Modified Paths:
--------------
trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/index.txt
trunk/catalog/admin/includes/modules/pages/index.php
trunk/test/phpunit/Back/modules/pages/pagecustomersTest.php
Added Paths:
-----------
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_19.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_27.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/view_template.txt
trunk/catalog/admin/includes/widget/view_template.php
Modified: trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php 2016-04-04 11:23:02 UTC (rev 5312)
+++ trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php 2016-04-26 08:51:11 UTC (rev 5313)
@@ -29,7 +29,7 @@
define('BOX_HEADING_CONF_APPARENCE_GENERAL',"Apparence générale" );
define('BOX_HEADING_CONF_PAGE_PRODUCT_DETAIL',"Page produit" );
define('BOX_HEADING_CONF_OPEN_BOX',"Gestion des boîtes" );
- define('BOX_CONFIGURATION_TEMPLATE',"Template" );
+ define('BOX_CONFIGURATION_TEMPLATE',"Modèle de site" );
define('BOX_HEADING_CONF_LIST_PRODUTCS',"Liste produits" );
define('BOX_HEADING_CONF_IMAGES',"Images" );
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_19.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_19.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_19.txt 2016-04-26 08:51:11 UTC (rev 5313)
@@ -0,0 +1,13 @@
+<?php
+/**
+ @licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.2.0
+ @date 24/01/2014, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @dir admin/includes/languages/fr_FR/modules/configuration/
+*/
+$lang['modconfig heading title 19']="Options page produits" ;
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_27.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_27.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_27.txt 2016-04-26 08:51:11 UTC (rev 5313)
@@ -0,0 +1,13 @@
+<?php
+/**
+ @licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.2.0
+ @date 24/01/2014, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @dir admin/includes/languages/fr_FR/modules/configuration/
+*/
+$lang['modconfig heading title 27']="Option aparence générale" ;
+
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/index.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/index.txt 2016-04-04 11:23:02 UTC (rev 5312)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/index.txt 2016-04-26 08:51:11 UTC (rev 5313)
@@ -25,6 +25,22 @@
$lang['heading title shipping']="Tableau de bord des expeditions" ;
$lang['heading title system']="Systeme " ;
+$lang['heading title CONFIGURATION config_52']="Configuration Globale " ;
+$lang['heading title APPARENCE config_51']="Apparence " ;
+$lang['heading title CONFIG_COMM config_57']="Commerciale " ;
+$lang['heading title CONFIG_AVANCE config_53']="Configuration Avancé " ;
+$lang['heading title ESPACE_ADMIN config_56']="Espace Admin " ;
+$lang['heading title taxes_in_zone']="Taxe et zone" ;
+
+
+$lang['heading title OPTION_CONTENT config_43']="Options des contenus page " ;
+$lang['heading title OPTION_CATEGORIE config_45']="Options des Catégories " ;
+$lang['heading title OPTION_PRODUCTS config_35']="Options des produits " ;
+$lang['heading title OPTION_ORDERS config_40']="Options des commandes " ;
+$lang['heading title OPTION_CUSTOMERS config_39']="Options des clients/membres " ;
+$lang['heading title OPTION_ORDERS config_40']="Options des commandes " ;
+
+
$lang['heading title config_100']="Configuration de l'apparence" ;
$lang['heading title config_110']="Configuration de base" ;
$lang['heading title config_120']="Configuration avancée" ;
Added: trunk/catalog/admin/includes/languages/fr_FR/widget/view_template.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/view_template.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/view_template.txt 2016-04-26 08:51:11 UTC (rev 5313)
@@ -0,0 +1,14 @@
+<?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 22/09/11, 19:25
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['view_template title']="Votre modèle public" ;
+$lang['change your template or configure']="Changer votre modèle " ;
+
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/modules/pages/index.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/index.php 2016-04-04 11:23:02 UTC (rev 5312)
+++ trunk/catalog/admin/includes/modules/pages/index.php 2016-04-26 08:51:11 UTC (rev 5313)
@@ -51,7 +51,13 @@
*/
public function __construct() {
self::$code=__CLASS__;
- self::$type=(isset($_GET['type'])? $_GET['type'] : 'home');
+ $type=(isset($_GET['type'])? $_GET['type'] : 'home');
+
+ if( strpos(trim($type),' ') ===false )
+ self::$type=strtolower(trim($type)) ;
+ else
+ self::$type=strtolower(substr(trim($type),0, strpos(trim($type),' ') )) ;
+
}
public function check_action($actions){
Added: trunk/catalog/admin/includes/widget/view_template.php
===================================================================
--- trunk/catalog/admin/includes/widget/view_template.php (rev 0)
+++ trunk/catalog/admin/includes/widget/view_template.php 2016-04-26 08:51:11 UTC (rev 5313)
@@ -0,0 +1,36 @@
+<?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 22/09/11, 17:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$theme = TEMPLATE_NAME;
+$file = DIR_FS_TEMPLATES . $theme .'/desc.xml' ;
+$template_infos = @simplexml_load_file($file);
+
+if (!empty($template_infos->thumb) && file_exists(DIR_FS_TEMPLATES.$theme.'/'.$template_infos->thumb)) {
+ $picture = '<img title="image" alt="image" src="'.DIR_WS_TEMPLATES.$theme . '/' . $template_infos->thumb.'" width="250" />';
+}
+else $picture = __('text no preview');
+
+?>
+
+
+
+<div id="info_shop" class="<?php echo $widg['class'] ?>" >
+ <h3><?php echo __('view_template title') ?></h3>
+
+ <h4><?php echo __('config brief environement') ?></a></h4>
+ <ul>
+ <li><a href="<?php echo tep_href_link(FILENAME_CONFIGURATION,'gparentID=51&gID=29') ?>" ><?php echo __('change your template or configure')?> </a></li>
+ </ul>
+
+
+ <p><?php echo $picture ?> </p>
+
+</div>
\ No newline at end of file
Modified: trunk/test/phpunit/Back/modules/pages/pagecustomersTest.php
===================================================================
--- trunk/test/phpunit/Back/modules/pages/pagecustomersTest.php 2016-04-04 11:23:02 UTC (rev 5312)
+++ trunk/test/phpunit/Back/modules/pages/pagecustomersTest.php 2016-04-26 08:51:11 UTC (rev 5313)
@@ -139,10 +139,7 @@
$res = $this->CallGetDBValue($objtmp,$action, $get);
- ob_start();
- $this->CheckAction($objtmp);
- $res = ob_get_contents();
- ob_end_clean();
+ $res = $this->CheckAction($objtmp);
$this->assertTrue ( ( strlen($res) >300) , 'Error retrun action::'.$action) ;
}
@@ -186,10 +183,7 @@
$get = array();
$res = $this->CallGetDBValue($objtmp,$action, $get);
- ob_start();
- $this->CheckAction($objtmp);
- $res = ob_get_contents();
- ob_end_clean();
+ $res = $this->CheckAction($objtmp);
$this->assertTrue ( ( strlen($res) > 700) , 'Error retrun action::'.$action ) ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2016-04-04 11:23:04
|
Revision: 5312
http://sourceforge.net/p/oscss/svn/5312
Author: oscim
Date: 2016-04-04 11:23:02 +0000 (Mon, 04 Apr 2016)
Log Message:
-----------
Add new template techno in install
Added Paths:
-----------
trunk/catalog/install/data/templates/appareil_photo/techno/
trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/
trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/boxe.php
trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/content.php
trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/footer.php
trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/header.php
trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/module.php
trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/module.slideshow.php
trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/sidebar.php
trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/ssheader.php
trunk/catalog/install/data/templates/appareil_photo/techno/cfg/
trunk/catalog/install/data/templates/appareil_photo/techno/cfg/configuration.php
trunk/catalog/install/data/templates/appareil_photo/techno/cfg/init.php
trunk/catalog/install/data/templates/appareil_photo/techno/css/
trunk/catalog/install/data/templates/appareil_photo/techno/css/color.less
trunk/catalog/install/data/templates/appareil_photo/techno/css/color.less.bak
trunk/catalog/install/data/templates/appareil_photo/techno/css/images/
trunk/catalog/install/data/templates/appareil_photo/techno/css/theme.less
trunk/catalog/install/data/templates/appareil_photo/techno/desc.xml
trunk/catalog/install/data/templates/appareil_photo/techno/fonts/
trunk/catalog/install/data/templates/appareil_photo/techno/fonts/glyphicons-halflings-regular.eot
trunk/catalog/install/data/templates/appareil_photo/techno/fonts/glyphicons-halflings-regular.svg
trunk/catalog/install/data/templates/appareil_photo/techno/fonts/glyphicons-halflings-regular.ttf
trunk/catalog/install/data/templates/appareil_photo/techno/fonts/glyphicons-halflings-regular.woff
trunk/catalog/install/data/templates/appareil_photo/techno/img/
trunk/catalog/install/data/templates/appareil_photo/techno/img/bg_add_cart.png
trunk/catalog/install/data/templates/appareil_photo/techno/img/brands-arrows.png
trunk/catalog/install/data/templates/appareil_photo/techno/img/cart3.png
trunk/catalog/install/data/templates/appareil_photo/techno/img/footer_contact.png
trunk/catalog/install/data/templates/appareil_photo/techno/img/stay_connected.png
trunk/catalog/install/data/templates/appareil_photo/techno/img/user_menu3.png
trunk/catalog/install/data/templates/appareil_photo/techno/includes/
trunk/catalog/install/data/templates/appareil_photo/techno/includes/gabarit/
trunk/catalog/install/data/templates/appareil_photo/techno/includes/gabarit/box.generic.gab
trunk/catalog/install/data/templates/appareil_photo/techno/includes/gabarit/module.other.gab
trunk/catalog/install/data/templates/appareil_photo/techno/includes/gabarit/module.product.gab
trunk/catalog/install/data/templates/appareil_photo/techno/includes/gabarit/product/
trunk/catalog/install/data/templates/appareil_photo/techno/includes/gabarit/product/module.gab
trunk/catalog/install/data/templates/appareil_photo/techno/includes/gabarit/product/view.gab
trunk/catalog/install/data/templates/appareil_photo/techno/includes/languages/
trunk/catalog/install/data/templates/appareil_photo/techno/includes/languages/fr_FR.txt
trunk/catalog/install/data/templates/appareil_photo/techno/includes/plugins/
trunk/catalog/install/data/templates/appareil_photo/techno/includes/plugins/product/
trunk/catalog/install/data/templates/appareil_photo/techno/includes/plugins/product/lightbox/
trunk/catalog/install/data/templates/appareil_photo/techno/includes/plugins/product/lightbox/inc/
trunk/catalog/install/data/templates/appareil_photo/techno/includes/plugins/product/lightbox/inc/imagelightbox.min.js
trunk/catalog/install/data/templates/appareil_photo/techno/includes/plugins/product/lightbox/inc/lightbox.css
trunk/catalog/install/data/templates/appareil_photo/techno/includes/plugins/product/lightbox/includes_header.php
trunk/catalog/install/data/templates/appareil_photo/techno/js/
trunk/catalog/install/data/templates/appareil_photo/techno/js/bootstrap.js
trunk/catalog/install/data/templates/appareil_photo/techno/js/bootstrap.min.js
trunk/catalog/install/data/templates/appareil_photo/techno/js/less-1.3.3.min.js
trunk/catalog/install/data/templates/appareil_photo/techno/sample.css
trunk/catalog/install/data/templates/appareil_photo/techno/template.php
trunk/catalog/install/data/templates/appareil_photo/techno/thumb.jpg
Added: trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/boxe.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/boxe.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/boxe.php 2016-04-04 11:23:02 UTC (rev 5312)
@@ -0,0 +1,21 @@
+<?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 04/03/2012, 21:54
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<section id="Box-<?php echo $boxe->name_clean; ?>" class="boxe">
+ <header>
+ <h3 class="boxe title"><?php echo unhtmlentities($boxe->title) ;?></h3>
+ </header>
+
+ <div class="infoBoxContents">
+ <?php echo unhtmlentities($boxe->content) ?>
+ </div>
+
+</section>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/content.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/content.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/content.php 2016-04-04 11:23:02 UTC (rev 5312)
@@ -0,0 +1,38 @@
+<?php
+/**
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @version 2.2.0
+ @encode UTF-8
+ @file content.php
+ @dir templates/defaut/Childs_tpl/
+*/
+global $page;
+
+require_once($page->oscss_content());
+
+if(!isset($SectionTplPC) || !is_object($SectionTplPC)){
+ $SectionTplPC = new SectionTpl(
+ tep_output_string_protected(tep_get_include_contents('pages/'.substr($page->oscss_body_id(),5 )),false,true) ,
+ __('heading title '.str_replace('_', ' ',substr($page->oscss_body_id(),5 ) ) )
+ );
+}
+
+?>
+
+
+<?php if( $SectionTplPC->GetContinue() ): ?>
+
+<header>
+ <h1 class="main-content title <?php echo $language ;?>"><?php echo unhtmlentities( $SectionTplPC->GetTitle() ); ?></h1>
+</header>
+
+
+<section id="Master<?php $page->the_type() ?>" class="<?php $page->the_type() ?>" >
+
+ <?php echo unhtmlentities( $SectionTplPC->GetContent() ) ?>
+
+</section>
+
+<?php endif; ?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/footer.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/footer.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/footer.php 2016-04-04 11:23:02 UTC (rev 5312)
@@ -0,0 +1,105 @@
+<?php
+/**
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+
+ @note La Licence OpenSource d'osCSS, vous impose de conserver le liens vers le site de la communauté. C'est la seul contrepartie imposé part l'utilisation de cette solution , qui est diffusé gratuitement, dans le cadre de ca licence.
+ Si vous supprimer la référence à osCSS, la commuanté se reserve le droit de faire valoir ces droits aupres des organisme dedié à la protection de cette licence.
+
+ CE template est livré gratuitement pour donner un aperçu des disponibilités du moteur de templates.
+ Veuillez respecter les termes et conditions générales d'utilisation.
+ Vous pouvez employer nos templates sous n'importe quel site Web publiquement accessible selon les termes et conditions générales du contrat Creative Commons
+*/
+global $template;
+?>
+
+
+<div id="push"></div>
+<footer class="footer">
+ <div class="row">
+ <div class="col-sm-2">
+ <h3><span class="sprite-info rotator"></span>Informations</h3>
+ <div class="footer_box">
+ <?php $boxe =$page->oscss_boxes->_return('information');
+ echo unhtmlentities($boxe->content) ?>
+ </div>
+ </div>
+ <div class="col-sm-2">
+ <h3><span class="sprite-client rotator"></span><?= __('service client') ?></h3>
+ <ul class="FooterBoxWrapper">
+ <li class="first"><a href="<?php echo tep_href_link(FILENAME_CONTACT_US) ?>"><?php echo __('contact us') ?></a></li>
+ <li><a href="/">Retours</a></li>
+ <li><a href="/">Livreurs</a></li>
+ <li class="last"><a href="<?php echo tep_href_link(FILENAME_SITEMAP) ?>"><?php echo __('sitemap') ?></a></li>
+ </ul>
+ </div>
+ <div class="col-sm-2">
+ <h3><span class="sprite-extra rotator"></span>Bonus</h3>
+ <ul class="FooterBoxWrapper">
+ <li class="first"><a href="/">Nos marques</a></li>
+ <li><a href="/">Bon cadeaux</a></li>
+ <li><a href="<?php echo tep_href_link(FILENAME_DEFAULT, 'featured=2') ?>"><?= __('offers moment') ?></a></li>
+ <li><a href="<?php echo tep_href_link('rss.php') ?>"><?php echo __('rss') ?></a></li>
+ </ul>
+ </div>
+ <div class="col-sm-2">
+ <h3><span class="sprite-follow rotator"></span><?= __('nous suivre footer') ?></h3>
+ <ul class="FooterBoxWrapper">
+ <li class="first"><i class="sprite-facebook rotator"></i><a target="_blank" href="https://www.facebook.com/oscss.org">Facebook</a></li>
+ <li><i class="sprite-tweeter rotator"></i><a target="_blank" href="https://twitter.com/osCSS">Tweeter</a></li>
+ <li><i class="sprite-pinterest rotator"></i><a target="_blank" href="http://forums.oscss.org/forum.html"><?= __('Forum footer') ?></a></li>
+ <li><i class="sprite-googlep rotator"></i><a target="_blank" href="https://plus.google.com/107698144587463763937/posts">Google +</a></li>
+ </ul>
+ </div>
+ <div class="col-sm-2">
+ <h3><span class="sprite-account rotator"></span><?= __('my account') ?></h3>
+ <div class="footer_box">
+ <?php $boxe =$page->oscss_boxes->_return('myaccount');
+ echo unhtmlentities($boxe->content) ?>
+ </div>
+ </div>
+ <div class="col-sm-2">
+ <?php $r = explode(",", STORE_NAME_ADDRESS); $r1 = explode("-", str_replace('\r\n',"",$r[2])); ?>
+ <h3><span class="sprite-contact rotator"></span><?= __('nous contacter footer') ?></h3>
+ <address class="vcard">
+ <h4 class="name"><?php echo $r[0] ?></h4>
+ <div>
+ <i class="sprite-address"></i>
+ <a class="adr" target="_blank" href="https://www.google.fr/maps/place/5 impasse de la cerisaie,+28240+La Loupe">
+
+ <span class="street-address"><?php echo str_replace('\r\n',"",$r[1]) ?></span>
+ <span class="postal-code"><?php echo $r1[0] ?></span><br />
+ <span class="locality"><?php echo $r1[1] ?></span>,
+ <span class="country-name"><?php echo str_replace('\r\n',"",$r[3]) ?></span>
+ </a>
+ </div>
+ <div class="tel"><i class="sprite-tel"></i><a href="tel:+33458005391">+33 (0)4 58 00 53 91</a></div>
+ <div class="email"><i class="sprite-email"></i><a href="mailto:su...@os...">su...@os...</a></div>
+ </address>
+ </div>
+ </div>
+</footer>
+ <footer class="footer_blue">
+
+ <div><i class="sprite-row"></i></div>
+ <div class="container bas">
+ <p class="text-center"><i class="sprite-cb"></i></p>
+ <p class="text-muted text-center">~ Design <a target="_blank" href="http://www.oscss.biz"><b>osCSS-Shop</b></a> - ©<?php echo date('Y') ?>
+ ~ Propulsé par <a target="_blank" href="http://www.oscss.org/" title=" osCSS "><b>osCSS-2</b></a> ~</p>
+ </div>
+ </footer>
+</main>
+
+<!-- ================================================== -->
+ <!-- Placed at the end of the document so the pages load faster -->
+<!-- <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script> -->
+ <script src="<?php echo 'templates/defaut'.'/'; ?>js/bootstrap.min.js"></script>
+
+ <script type="text/javascript">
+ $(".alert").alert()
+ </script>
+
+
+ <?php /** Fichier appel bottom page */ $this->draw_file_footer(); ?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/header.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/header.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/header.php 2016-04-04 11:23:02 UTC (rev 5312)
@@ -0,0 +1,98 @@
+<?php
+/**
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+
+
+ Dans Ce fichier, les element du constructeur sont accessible directement, via la variable this.
+ Chaque sous object est nommé comme la variable habituelle
+ ex: $breadcrumb == $this->breadcrumb
+
+ Les variable local, de la page application top par exemple, eux ne le sont pas. Tout les appel ici, doit utiliser l'object constructeur
+
+ La configuration du theme: editer le fichier /cfg/init.php
+
+
+ @note
+ Ce fichier assure le chargement de l'entete de page, et des element qu'il doit contenir (css , javascript, meta, title) de maniere dynamqiue.
+ En générale, il n'est pas necessaire de modifié celui ci .
+
+ Les variable accessible au sein de ce fichier pour traité les parametre sont:
+ - $page : object contrusteur
+ - $load : configuration fournis en arguement de l'appel de ce fichier
+
+
+ C'est le fichier de template Master, qui est chargée de l'appel de ce fichier.
+ Pour intégrer celui ci dans u fichier master il est necessaire d'utiliser cette forme
+
+ echo $page->tep_get_header('file='.$page->the_var('PathChildGab').'header') ;
+
+ L'arguement est optionnel, il permet le cas echeants de transmettre un chemin autre que le chemin par default
+ Sans arguement la function cherche a charger un fichier header.php palcé à la racine du theme
+*/
+
+?>
+<!DOCTYPE html>
+<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
+<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
+<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
+<html >
+ <head>
+ <meta charset="<?php echo CHARSET; ?>">
+
+ <title><?php echo $page->GetHtmlMeta(); ?></title>
+ <meta name="description" content="<?php echo $page->GetHtmlMeta('description'); ?>" />
+ <meta name="keywords" content="<?php echo $page->GetHtmlMeta('keywords'); ?>" />
+ <meta http-equiv="content-type" content="text/html; charset=<?php echo CHARSET; ?>" />
+
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <meta name="author" content="oscim"/>
+ <meta name="reply-to" content="<?php echo HEAD_REPLY_TAG_ALL ?>" />
+ <meta name="robots" content="all" />
+ <meta name="generator" content="osCSS-2" />
+ <base href="<?php echo tep_get_httpdir() ; ?>" />
+
+
+ <link rel="stylesheet" type="text/css" href="<?php echo 'templates/defaut/css/'; ?>bootstrap.css" media="screen"/>
+ <link rel="stylesheet" type="text/css" href="<?php echo 'templates/defaut/css/'; ?>bootstrap-theme.css" media="screen"/>
+
+
+ <!--[if lte IE 8]>
+ <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
+
+ <?php if(OSCSS_DEBUG): ?>
+ <script type="text/javascript">
+ var less = {
+ env:"development",
+// dumpLineNumbers:'mediaquery'
+ };
+ </script>
+ <?php endif; ?>
+
+ <link rel="stylesheet/less" href="<?php echo 'templates/'.$template.'/css/'; ?>theme.less" type="text/css" />
+ <script type="text/javascript" src="<?php echo 'templates/'.$template.'/js/'; ?>less-1.3.3.min.js" ></script>
+
+ <script type="text/javascript" src="includes/general.js" ></script>
+
+ <?php /**
+ @remarks Cette fonction doit necessairement être chargée lors de l'appel du gabarit,
+ sans quoi l'initialisation du template n'et pas achevé
+ */
+ $this->draw_file_header(); ?>
+
+
+ <script type="text/javascript" src="<?php echo 'templates/'.$template.'/'; ?>js/libs.js" ></script>
+
+
+ <link rel="shortcut icon" type="images/x-icon" href="favicon.ico"/>
+ <link rel="alternate" type="application/rss+xml" title="global" href="<?php echo tep_get_httpdir().'rss.php' ?>" />
+ <link rel="canonical" href="<?php echo $page->GetHtmlMeta('canonical'); ?>" />
+</head>
+ <body id="<?php echo page::oscss_body_id() ; ?>" class="<?php echo 'Type_'.$page->the_type(); ?> <?php echo 'Class_'.$page->the_typeClass('class'); ?>">
+
Added: trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/module.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/module.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/module.php 2016-04-04 11:23:02 UTC (rev 5312)
@@ -0,0 +1,76 @@
+<?php
+/**
+ @licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.2.0
+ @date 12/11/2011, 19:30
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $load;
+
+?>
+
+
+ <section class="module ">
+ <?php if($load->module =='child' && tep_not_null($themodule->module_db->title) ) : ?>
+ <header>
+ <h2 class="main title"><?php echo unhtmlentities($themodule->module_db->title) ;?></h2>
+ </header>
+ <?php endif; ?>
+
+ <?php if(isset($themodule->module_db->text)): ?>
+ <p><?php echo unhtmlentities($themodule->module_db->text) ;?></p>
+ <?php endif; ?>
+
+
+ <?php if ( isset($themodule->module_db->split) && ($themodule->module_db->split->number_of_rows > 0) && (in_array(PREV_NEXT_BAR_LOCATION ,array('1','3') )) ) { ?>
+ <div class="btn-toolbar" role="toolbar">
+ <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')), ' class="btn-group" '); ?></p>
+ </div>
+ <?php } ?>
+
+
+ <?php /**
+ * Loop Data
+ */
+ $i = 0; foreach($themodule->module_db->content as $ele):/* print_r($ele); exit;*/ ?>
+
+ <div class=" one <?php echo $ele->data ?>">
+
+ <?php if(tep_get_include_contents($ele->data .'/module' ) !=false): ?>
+
+ <section class="col-lg-4 col-md-6 col-sm-6 col-xs-6 ">
+ <?php echo tep_get_include_contents($ele->data .'/module' ); ?>
+ </section>
+
+ <?php else : /** Other */ ?>
+
+ <section class="col-lg-4 col-sm-6 col-xs-6 outerblock">
+ <?php echo tep_get_include_contents('module.other'); ?>
+ </section>
+
+ <?php endif; ?>
+
+
+ </div>
+
+
+ <?php $i++; endforeach; ?>
+
+
+
+
+ <?php if ( isset($themodule->module_db->split) && ($themodule->module_db->split->number_of_rows > 0)&& (in_array(PREV_NEXT_BAR_LOCATION ,array('2','3') )) ) { ?>
+ <section >
+ <p class="sP1"><?php echo $themodule->module_db->split->display_count(TEXT_DISPLAY_NUMBER_OF); ?></p>
+ <div class="btn-toolbar" role="toolbar">
+ <?php echo /*TEXT_RESULT_PAGE . ' ' .*/ $themodule->module_db->split->display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info'))); ?>
+ </div>
+ </section>
+ <?php } ?>
+
+ </section>
+<?php ?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/module.slideshow.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/module.slideshow.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/module.slideshow.php 2016-04-04 11:23:02 UTC (rev 5312)
@@ -0,0 +1,63 @@
+<?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 12/11/11, 19:30
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $load, $themodule;
+?>
+
+
+<div id="slider" class="module">
+
+ <ul class="module carousel-inner">
+
+ <?php if(isset($themodule->module_db->content) )foreach($themodule->module_db->content as $ele): ?>
+
+ <?php if($ele->type =='product'): /** PRODUCTS */ ?>
+ <li class="item one product">
+ <section class="outerblock">
+ <div class="innerblock">
+ <?php if ($page->_draw_in_page('PRODUCT_LIST_NAME')) { ?>
+ <p class="carousel-caption product"><?php echo '<a href="' . $ele->GetHref() . '" title="header=['.$ele->GetName().'] body=[ ] fade=[on]">' . $ele->GetName() . '</a>' ;?></p>
+ <?php } ?>
+
+ <?php if ($page->_draw_in_page('PRODUCT_LIST_IMAGE')) { ?>
+ <p class="img product"><?php echo '<a href="' . $ele->href . '" title="header=['.$ele->GetName().'] body=[ ] fade=[on]" >' . tep_image(DIR_WS_IMAGES . @$ele->products_image, $ele->GetName(), $page->_conf_value('SMALL_IMAGE_WIDTH'), $page->_conf_value('SMALL_IMAGE_HEIGHT')) . '</a>' ; ?></p>
+ <?php } ?>
+
+ <?php if (tep_not_null($ele->GetPrice()) && $page->_draw_in_page('PRODUCT_LIST_PRICE')) { ?>
+ <p class="price prod">
+ <?php echo print_products_price_rv($ele->GetId()) ?>
+ </p>
+ <?php } ?>
+
+ <a class="btn btn-lg btn-primary" href="<?php echo $ele->GetHref() ?>" title="header=<?php echo __('view more') ?>" role="button"><?php echo __('more') ?></a>
+
+ </div>
+ </section>
+ </li>
+ <?php else : /** Other */ ?>
+ <li class="item one content">
+ <section class="outerblock">
+ <div class="innerblock">
+ <p class="carousel-caption content">
+ <a id="<?php echo $ele->GetId(); ?>" href="<?php echo $ele->GetHref() ; ?>" ><?php echo $ele->GetTitle() ?></a>
+ </p>
+ <div class="chapo content">
+ <?php echo $ele->GetText() ?>
+ </div>
+ </div>
+ </section>
+ </li>
+ <?php endif; ?>
+
+ <?php endforeach; ?>
+
+ </ul>
+
+</div>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/sidebar.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/sidebar.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/sidebar.php 2016-04-04 11:23:02 UTC (rev 5312)
@@ -0,0 +1,28 @@
+<?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 04/03/2012, 21:54
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+/** Page produits */ if(isset($_GET['products_id'])) $product_info=$page->the_var('product_info');
+?>
+
+ <?php while($boxe=templ_draw_list('type=boxes&pile='.$page->the_type().'')):
+ if (!$page->is_page_here($boxe->name_clean) ) : ?>
+ <div id="<?php echo $boxe->name_clean; ?>Box" class="ui-widget infoBoxContainer">
+ <?php include('boxe.php'); ?>
+ </div>
+ <?php endif; endwhile; ?>
+
+ <?php while($boxe=templ_draw_list('type=boxes&pile=sidebar')):
+ if (!$page->is_page_here($boxe->name_clean) ) : ?>
+ <div id="<?php echo $boxe->name_clean; ?>Box" class="ui-widget infoBoxContainer">
+ <?php include('boxe.php'); ?>
+ </div>
+ <?php endif; endwhile; ?>
+
Added: trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/ssheader.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/ssheader.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/techno/Childs_tpl/ssheader.php 2016-04-04 11:23:02 UTC (rev 5312)
@@ -0,0 +1,96 @@
+<?php
+/**
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $customer_id;
+
+?>
+
+<main class="container theme-showcase" id="content" role="main">
+
+ <div class="main">
+
+ <div>
+ <a class="fa-home" href="<?php echo tep_href_link() ?>"><img src="<?php echo STORE_LOGO ?>" alt="<?php echo STORE_NAME ?>" title="<?php echo STORE_NAME ?>" /></a>
+ </div>
+ </div>
+
+
+<header class="navbar navbar-inverse " role="banner">
+
+
+ <div class="container">
+ <div class="navbar-header">
+ <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+
+<!-- <a class="navbar-brand" href="<?php echo tep_href_link() ?>"><?php echo STORE_NAME ?></a> -->
+
+ </div>
+
+ <nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
+ <ul class="nav navbar-nav">
+ <li><a href="<?php echo tep_href_link() ?>" ><?php echo __('page home') ?></a></li>
+ <li class="dropdown">
+ <a data-toggle="dropdown" class="dropdown-toggle" href="#" ><?php echo __('link heading title selection') ?><b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="<?php echo tep_href_link(FILENAME_SMALL_PRICE) ?>" ><?php echo __('link small price') ?></a></li>
+ <li><a href="<?php echo tep_href_link(FILENAME_PRODUCTS_NEW) ?>" ><?php echo __('link product new') ?></a></li>
+ <li><a href="<?php echo tep_href_link(FILENAME_BEST_SELLERS) ?>" ><?php echo __('link best sellers') ?></a></li>
+ <?php if(tep_cst_define('MODULE_ACA_SPECIALS_SORT_ORDER') !='false') : ?>
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_SPECIALS) . '">' . __('link specials') . '</a>'; ?></li>
+ <?php endif; ?>
+ </ul>
+ </li>
+ <li>
+ <a href="<?php echo tep_href_link(FILENAME_ACCOUNT) ?>"><?php echo __('page account manager') ?></a>
+ </li>
+ <li>
+ <a href="<?php echo tep_href_link(FILENAME_SHOPPING_CART) ?>"><?php echo __('page shopping cart') ?></a>
+ <div id="screencart" class="dir"> </div>
+ </li>
+ <li class="dropdown">
+ <a data-toggle="dropdown" class="dropdown-toggle" href="#" ><?php echo __('link heading title support') ?><b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_ADVANCED_SEARCH) . '">' . __('link advanced search') . '</a>'; ?></li>
+ <li><a href="<?php echo tep_href_link(FILENAME_CONTACT_US) ?>" ><?php echo __('page contact us') ?></a></li>
+ <li><a href="<?php echo tep_href_link(FILENAME_SITEMAP) ?>" ><?php echo __('sitemap') ?></a></li>
+ </ul>
+ </li>
+ </ul>
+ </nav>
+ </div>
+
+</header>
+
+
+
+
+
+<?php if($load->mode =='home') : ?>
+ <section id="myCarousel" class="carousel slide" data-ride="carousel">
+<!-- <div class="intro content"> -->
+
+ <?php /**
+ @brief Call featured for slideshow
+ */
+ global $themodule;
+ $themodule=templ_draw_list('type=modules&pile=slideshow');
+ include('module.slideshow.php'); ?>
+<!-- </div> -->
+ </section>
+<?php endif; ?>
+
+<?php if($load->mode !='home') : ?>
+ <nl role="breadcrumbs" id="breadcrumbs" class="breadcrumb">
+ <?php echo $page->draw_breadcrumb(''); ?>
+ </nl>
+<?php endif; ?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/techno/cfg/configuration.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/techno/cfg/configuration.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/techno/cfg/configuration.php 2016-04-04 11:23:02 UTC (rev 5312)
@@ -0,0 +1,120 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template boostrap
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.2
+ @date 08/11/2013, 21:14
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+
+
+// print_r($_REQUEST);
+if( !isset($_REQUEST['action2']) ) {
+
+ $v = file_get_contents( substr(dirname(__FILE__),0,-3 ).'css/color.less' );
+ $r=explode('//', $v);
+
+
+ echo '<form method="post" action="'.$_SERVER['REQUEST_URI'].'">';
+ foreach($r as $k=>$row){
+
+ $lin = explode("\n", $row);
+ $lin1 = explode(":", $lin[1]) ;
+
+ if(!empty($lin[0]) || !empty($lin1[0]) )
+ echo '<p>'.
+ $lin[0].
+ '<input type="text" name="thistemplate['.$lin1[0].']" value="'.trim(str_replace(';','',$lin1[1])).'" />'.
+ '</p>';
+
+ }
+ echo '<input type="hidden" name="action2" value="valider"/>';
+ echo '<input type="submit" value="valider"/>';
+ echo '</form>';
+
+
+
+
+}
+elseif(isset($_REQUEST['action2'])) {
+
+
+ $v = file_get_contents( substr(dirname(__FILE__),0,-3 ).'css/color.less' );
+ $r=explode('//', $v);
+
+
+ $fp= fopen(substr(dirname(__FILE__),0,-3 ).'css/color.less' , 'w+');
+
+ foreach($r as $k=>$row){
+
+ $lin = explode("\n", $row);
+ $lin1 = explode(":", $lin[1]) ;
+
+ if(!empty($lin[0]) || !empty($lin1[0]) )
+ $strg.= '//'.$lin[0]."\n".''.$lin1[0].':'.$_POST['thistemplate'][$lin1[0]].';'."\n";
+
+ }
+ fwrite($fp, $strg);
+ fclose($fp);
+}
+
+
+/* Config divers */
+UpConfigKey('SMALL_IMAGE_WIDTH','60');
+UpConfigKey('SMALL_IMAGE_HEIGHT','60');
+UpConfigKey('HEADING_IMAGE_WIDTH','160');
+UpConfigKey('HEADING_IMAGE_HEIGHT','250');
+UpConfigKey('SUBCATEGORY_IMAGE_WIDTH','120');
+UpConfigKey('SUBCATEGORY_IMAGE_HEIGHT','120');
+UpConfigKey('POPUP_IMAGE_WIDTH','600');
+UpConfigKey('POPUP_IMAGE_HEIGHT','600');
+UpConfigKey('STACK_IMAGE_WIDTH','50');
+UpConfigKey('STACK_IMAGE_HEIGHT','50');
+UpConfigKey('JPEG_QUALITY','95');
+
+UpConfigKey('PRODUCT_LIST_WEIGHT','false');
+UpConfigKey('PRODUCT_LIST_MODEL','false');
+UpConfigKey('PRODUCT_LIST_DESCRIPTION','false');
+UpConfigKey('PRODUCT_LIST_MANUFACTURER','false');
+UpConfigKey('PRODUCT_LIST_PRICE','false');
+UpConfigKey('PRODUCT_LIST_WEIGHT','false');
+UpConfigKey('PRODUCT_LIST_QUANTITY','false');
+
+/* Config des plugins */
+ResetConfigKey('PLUGIN_ACCOUNT_INSTALLED');
+ResetConfigKey('PLUGIN_GENERIC_INSTALLED');
+ResetConfigKey('PLUGIN_HOME_INSTALLED');
+ResetConfigKey('PLUGIN_LISTING_INSTALLED');
+ResetConfigKey('PLUGIN_PRODUCT_INSTALLED');
+
+
+/* Config des modules base */
+ResetConfigKey('MODULE_ACAPRO_INSTALLED');
+ResetConfigKey('MODULE_ACCOUNT_INSTALLED');
+ResetConfigKey('MODULE_GENERIC_INSTALLED');
+
+ResetConfigKey('MODULE_ACAPRO_INSTALLED_BO');
+ResetConfigKey('MODULE_ACCOUNT_INSTALLED_BO');
+ResetConfigKey('MODULE_ACACAT_INSTALLED_BO');
+ResetConfigKey('MODULE_CONTENT_INSTALLED_BO');
+
+
+addConfigModule('MODULE_ACAPRO_INSTALLED', 'desc_base.php');
+addConfigModule('MODULE_ACAPRO_INSTALLED_BO', 'desc_base.php');
+
+addConfigModule('MODULE_ACAPRO_INSTALLED_BO', 'header_tags.php');
+addConfigModule('MODULE_ACACAT_INSTALLED_BO', 'header_tags.php');
+addConfigModule('MODULE_CONTENT_INSTALLED_BO', 'header_tags.php');
+
+
+/* Purge du repertoire de miniature */
+$path = DIR_FS_ROOT_DOCS.DIR_WS_IMAGES.'imagecache/' ;
+$dir = @opendir($path);
+$templates = array();
+while ($file = @readdir($dir)) {
+ if($file != '..' && $file !='.' && $file !='') @unlink($path.$file);
+}
+@closedir($dir);
Added: trunk/catalog/install/data/templates/appareil_photo/techno/cfg/init.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/techno/cfg/init.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/techno/cfg/init.php 2016-04-04 11:23:02 UTC (rev 5312)
@@ -0,0 +1,247 @@
+<?php
+/**
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template boostrap
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+
+
+
+ @note
+ Dans Ce fichier, les element du constructeur sont accessible directement, via la variable this.
+ Chaque sous object est nommé comme la variable habituelle
+ ex: $breadcrumb == $this->breadcrumb
+
+ Les variable locales, du application_top par exemple, ne le sont pas.
+ Tout les appels ici, doit utiliser l'object constructeur
+
+
+ Utilisation de l'objet local
+ $load
+
+ Cet object est specifique au templae, il est initialisé avant l'appel de fichier, est accesible depuis tous les elemnts inclus de ce theme
+ Il transmet ainsi tout calcul ou opertaion necessitant un transport d'informations
+*/
+
+$load = $page->GetThemeLoad();
+
+
+/**
+ @var PathChildGab Path
+ Childs html tpl files
+*/
+ $this->add_var_page('PathChildGab','Childs_tpl/');
+
+
+/**
+ image
+*/
+ $this->add_var_page('SIDEBAR_IMG_WIDTH','100');
+ $this->add_var_page('SIDEBAR_IMG_HEIGHT','100');
+ $this->add_var_page('HEADING_IMG_WIDTH','250');
+ $this->add_var_page('HEADING_IMG_HEIGHT','250');
+ $this->add_var_page('SMALL_IMAGE_WIDTH','250');
+ $this->add_var_page('SMALL_IMAGE_HEIGHT','250');
+ $this->add_var_page('HEADING_IMAGE_WIDTH','250');
+ $this->add_var_page('HEADING_IMAGE_HEIGHT','250');
+
+/**
+ Listing
+*/
+ /**
+ Nbr maxi dans les listes (shearch, listing)
+ */
+ $this->add_var_page('MAX_DISPLAY_SEARCH_RESULTS','10');
+ $this->add_var_page('MAX_DISPLAY_PAGE_LINKS','15');
+ $this->add_var_page('MAX_DISPLAY_PRODUCTS_NEW','15');
+ $this->add_var_page('MAX_DISPLAY_NEW_PRODUCTS','15');
+ $this->add_var_page('MAX_DISPLAY_PRODUCTS_NEW','25');
+
+ /**
+ Display block
+ */
+ $this->add_var_page('PRODUCT_LIST_IMAGE','true');
+ $this->add_var_page('PRODUCT_LIST_BUY_NOW','true');
+ $this->add_var_page('PRODUCT_LIST_NAME','true');
+ $this->add_var_page('PRODUCT_LIST_PRICE','true');
+
+
+
+/**
+ Fix format and css class for display message
+*/
+ $Ms = $this->getMessageStack();
+ $Ms->setPrefix('alert');
+ $Ms->setRowsBlock('<div %s >%s</div>');
+ $Ms->setTypeArray(0, 'danger');
+
+
+
+
+/**
+ Configuration des boxes
+Les boxes sont appelé via les lg suivant.
+$this->oscss_boxes(Nom de la boxes, parent);
+@param string boxe: juste le nom, sans ext, et sans path
+@param string parent: le nom dans lesquel l'element sera stocké
+*/
+
+
+
+
+ $this->oscss_boxes->_add('myaccount', 'permanent' ,array('cache'=>false,'sort'=>30));
+
+
+ $this->oscss_boxes->_add('languages', 'headertop');
+/** Boite de recherche */
+ $this->oscss_boxes->_addWidget('Widget_search_suggest', 'headertop');
+
+ $this->oscss_boxes->_add('currencies', 'header');
+
+ $this->oscss_boxes->_add('information', 'header');
+
+if(self::oscss_body_id() !='Page_shopping_cart')
+ $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
+
+
+ /**
+ @var mode used in template.php for adjust affichage
+ mixed type and other control for determine mode
+ */
+ $load->mode = $page->GetPageType();
+ /**
+ @var module default child, else master
+ master is mode full screen , and child is complete existant page
+ */
+ $load->module = 'child';
+
+/**
+ @brief Estimate environement, for choose block load
+*/
+
+switch($page->GetPageType()){
+
+
+ case 'home':
+
+ $this->add_var_page('MAX_DISPLAY_PRODUCTS_NEW','4');
+ $this->add_var_page('MAX_DISPLAY_NEW_PRODUCTS','4');
+
+// $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));
+ $this->oscss_boxes->_add('best_sellers', 'sidebar', array('cache'=>false));
+ $this->oscss_boxes->_add('selections', 'sidebar', array('cache'=>false));
+
+ $this->oscss_boxes->_add('bann_type', 'sidebar', array('cache'=>false));
+
+ $load->mode = 'home';
+
+ // force put key for load specific featured
+ $this->add_var_page('featured_key','home_slideshow');
+ $this->oscss_modules->_add('featured.php','slideshow',array('sort'=>60));
+
+ $this->oscss_modules->_add(FILENAME_NEW_PRODUCTS,'center',array('sort'=>60));
+ break;
+
+ case 'checkout':
+ case 'cart':
+ $this->oscss_boxes->_add('checkout_progressbar', 'progressbar');
+ $this->oscss_boxes->_add('categories', 'sidebar');
+ $this->oscss_boxes->_add('whats_new', 'sidebar', array('cache'=>false));
+ $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+ break;
+
+
+ case 'account':
+ $this->oscss_boxes->_add('myaccount', 'sidebar' ,array('cache'=>false,'sort'=>30));
+ $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+ break;
+
+ case 'content':
+ $this->oscss_boxes->_add('categories', 'sidebar');
+ $this->oscss_boxes->_add('cms_last_post', 'sidebar', array('cache'=>false));
+ //
+ $this->oscss_boxes->_add('recently_viewed_content', 'sidebar', array('cache'=>false));
+ break;
+
+ case 'product':
+ $this->oscss_boxes->_add('categories', 'sidebar');
+
+ //
+ $this->oscss_boxes->_add('recently_viewed', 'sidebar', array('cache'=>false));
+ // required manufacturer exts
+ $this->oscss_boxes->_add('manufacturer_info', 'sidebar');
+ // required specials exts
+ $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+
+
+
+ // load generic module in childs module in page
+ $this->oscss_modules->_add(FILENAME_ALSO_PURCHASED_PRODUCTS,'center',array('sort'=>60));
+ $this->oscss_modules->_add(FILENAME_UPCOMING_PRODUCTS,'center',array('sort'=>61));
+ break;
+
+ case 'listing': // obsolete
+ case 'categorie':
+ $this->oscss_boxes->_add('categories', 'sidebar');
+
+ //
+ $this->oscss_boxes->_add('recently_viewed', 'sidebar', array('cache'=>false));
+ // required specials exts
+ $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+ //
+ $this->oscss_boxes->_add('whats_new', 'sidebar', array('cache'=>false));
+
+
+ $this->oscss_boxes->_add('very_viewed', 'sidebar', array('cache'=>false));
+ $load->module = 'child';
+
+
+
+ break;
+
+
+ case 'diver':
+ case 'none':
+ default:
+
+ $this->oscss_boxes->_add('categories', 'sidebar');
+ //
+ $this->oscss_boxes->_add('recently_viewed', 'sidebar', array('cache'=>false));
+ $this->oscss_boxes->_add('whats_new', 'sidebar', array('cache'=>false));
+ // required specials exts
+ $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+
+
+ // precise si module utilisé comme pleine page
+ switch(self::oscss_body_id()){
+
+ case '404':
+ $this->oscss_modules->_add(FILENAME_NEW_PRODUCTS,'center',array('sort'=>60));
+ break;
+
+ case 'Page_shopping_cart':
+ $this->oscss_boxes->_add('checkout_progressbar', 'progressbar');
+ break;
+
+ case 'Page_listing_small_price':
+ case 'Page_listing_best_sellers':
+ case 'Page_listing_specials':
+ case 'Page_listing_products_new':
+ $load->module = 'master';
+ break;
+ case 'Page_sitemap':
+ $this->oscss_boxes->_add('selections', 'ponctual');
+ $this->oscss_boxes->_add('information', 'ponctual');
+ break;
+ default:
+ }
+
+}
+
+
+
+
+?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/techno/css/color.less
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/techno/css/color.less (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/techno/css/color.less 2016-04-04 11:23:02 UTC (rev 5312)
@@ -0,0 +1,32 @@
+// text generic heading color
+@heading_text :#fff;
+// text generic color
+@text_color :#959595;
+// text color price
+@color_price :#0e7ac4;
+// text del color price
+@color_price_del :black;
+// text date name color
+@date_color:#0e7ac4;
+// text required color
+@color_required :red;
+// link text color
+@link_text_color :#222222;
+// link text color hover
+@link_text_color_hover :#f5791f;
+// link text color top bot
+@link_text_color_topbot :#fff;
+// lin ktext color main
+@link_text_color_main :#000;
+// lin ktext color product
+@link_text_color_product :#222222;
+// border color
+@border:#e5e5e5;
+// backgound footer
+@bckgrd_footer :#252424;
+// backgound header
+@bckgrd_header :#3b3b3b;
+// backgound header main
+@bckgrd_header_main :#eeeeee;
+// border raduis
+@radius :5px;
Added: trunk/catalog/install/data/templates/appareil_photo/techno/css/color.less.bak
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/techno/css/color.less.bak (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/techno/css/color.less.bak 2016-04-04 11:23:02 UTC (rev 5312)
@@ -0,0 +1,50 @@
+
+
+
+ // text generic heading color
+@heading_text : white;
+// text generic color
+@text_color : #959595 ;
+// text color price
+@color_price : #0e7ac4;
+// text del color price
+@color_price_del : black;
+// text date name color
+@date_color: #0e7ac4;
+// text required color
+@color_required : red;
+
+
+
+// link
+@link_text_color : #222222 ;
+//
+@link_text_color_hover : #f5791f;
+//
+@link_text_color_topbot : #fff;
+//
+@link_text_color_main : #000;
+
+//
+@link_text_color_product : #222222 ;
+
+// border
+@border: #e5e5e5 ;
+
+
+ // footer
+ @bckgrd_footer : #252424;
+ //
+ @bckgrd_header : #3b3b3b;
+ //
+ @bckgrd_header_main : #eeeeee;
+ //
+ @radius : 5px;
+
+
+
+
+
+
+
+
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/techno/css/theme.less
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/techno/css/theme.less (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/techno/css/theme.less 2016-04-04 11:23:02 UTC (rev 5312)
@@ -0,0 +1,642 @@
+/*
+ *
+*/
+
+@import "color.less";
+
+
+
+
+
+
+ @bckgrd_box_title: rgba(0, 0, 0, 0) linear-gradient(to bottom, @bckgrd_header 0%, #303030 100%) repeat scroll 0 0;
+
+.border-radius(@radius: 5px) {
+ -webkit-border-radius: @radius;
+ -moz-border-radius: @radius;
+ border-radius: @radius;
+}
+
+
+.habill_header_title(@bckgrd_box_title , @link_text_color_topbot, @radius){
+ background: @bckgrd_box_title ;
+ color: @link_text_color_topbot;
+
+ font-weight: normal;
+ text-transform: uppercase;
+ .border-radius(@radius);
+ float:none;
+ margin: 15px 0 15px 0;
+ clear: both;
+ transition: all 300ms linear 0s;
+ overflow: hidden;
+
+ h1,h2,h3,h4,a{
+ text-transform: uppercase;
+ margin:0;
+ }
+}
+
+.padding_titleinbox(){
+ padding: 9px 20px 7px 19px;
+ font-size: 1.143em;
+}
+
+
+
+
+
+
+
+
+
+body {
+/* padding-bottom: 30px; */
+/* padding-top: 70px; */
+}
+
+html,
+body {
+ height: 100%;
+ color:@text_color;
+/* The html and body elements cannot have any padding or margin. */
+}
+.theme-dropdown .dropdown-menu {
+ display: block;
+ margin-bottom: 20px;
+ position: static;
+}
+.theme-showcase > p > .btn {
+ margin: 5px 0;
+}
+
+.module .innerblock {
+ text-align:center;
+
+ .img-thumbnail {
+ height:110px;
+ }
+}
+
+
+// generic link color
+a {
+ color: @link_text_color;
+ font-weight: normal;
+ text-decoration: none;
+
+ &:hover{
+ color: @link_text_color_hover;
+ text-decoration:none;
+ }
+}
+
+// generic Color alert
+.required {
+ color:@color_required;
+ float:left;
+ position:relative;
+}
+
+//Specififc display date
+.date{
+ span{
+ color:@date_color;
+ }
+}
+
+
+.fl_left {
+ float: left;
+}
+.fl_right {
+ float: right;
+}
+.cl_both {
+ clear: both;
+}
+.ofh {
+ overflow: hidden;
+}
+
+
+ .table{
+ table{
+ background: @bckgrd_header_main;
+ width: 100%;
+ margin:15px 0;
+ }
+ th,
+ tr td {
+ border-top: 1px solid @border;
+ line-height: 1.6em;
+ font-size:0.85em;
+ font-weight: 100;
+ }
+ }
+
+.container{
+ padding: 0;
+
+ .checkout .orderProcess ul {
+ list-style:none;
+ padding-left:5px;
+ }
+}
+
+.container .addressbook .addressBookEntry .col-xs-4{
+ height:180px;
+
+}
+
+footer{
+ display:block;
+ background: @bckgrd_footer none repeat scroll 0 0;
+ border-radius: @radius @radius 0 0;
+ overflow: hidden;
+ padding: 10px 12px 20px 20px;
+ margin: 0 -15px 0 0;
+
+
+ h3{
+ text-rendering: optimizelegibility;
+ color:@heading_text;
+ text-transform : uppercase;
+ font-size:1.2em;
+ }
+
+ a{
+ color: @text_color;
+ text-transform : capitalize;
+
+ &:hover{
+ color:@link_text_color_topbot;
+ }
+ }
+
+ ul.FooterBoxWrapper,
+ ul.inner-boxe {
+ list-style: outside none none;
+ margin: 0;
+ padding: 0;
+
+ li{
+ border-top: 1px solid @border;
+
+
+
+ &.first,
+ &:first-child{
+ border-top:none;
+ }
+
+/* &.last{
+ border-top: 1px solid #343333;
+ }*/
+ }
+ }
+
+
+ &.footer_blue{
+ border-radius: 0 0 @radius @radius;
+ border-bottom: 1px solid @border;
+ border-top: 1px solid @border;
+ background: rgba(0, 0, 0, 0) linear-gradient(to bottom, #383838 0%, #343434 50%, #323232 100%) repeat scroll 0 0;
+ }
+}
+
+main#content{
+ min-height: 100%;
+ height: auto !important;
+ height: 100%;
+ margin: 0 auto -60px;
+ display: block;
+
+ article{
+ header{
+ .habill_header_title(@bckgrd_header_main , @link_text_color_main, @radius);
+ margin-top:15px;
+ font-weight: normal;
+
+ h1, h2{
+ padding: 9px 20px 7px 19px;
+ font-size: 1.143em;
+ }
+ }
+ }
+}
+
+
+
+.img-thumbnail {
+ border: 1px solid @border;
+ .border-radius(@radius);
+ clear: both;
+ margin-bottom: 3px;
+ margin-top: 5px;
+ padding: 2px;
+ transition: all 300ms linear 0s;
+ text-align: center;
+ vertical-align: middle;
+
+ img{
+ max-width: 100%;
+ text-align: center;
+ border: 0 none;
+ vertical-align: middle;
+ }
+}
+
+
+ .btn-toolbar,
+ .sP1,
+ .sP2{
+ clear:both;
+ }
+
+.product_button_wrapper {
+ border-top: 1px solid @border;
+ padding-top: 15px;
+ text-align: right;
+ clear: both;
+ height:60px;
+
+ .button_content {
+/* display: inline-block; */
+ float:left;
+ overflow: hidden;
+ position: relative;
+ background:transparent;
+ padding:0;
+
+ .btn-default{
+ background:transparent;
+ }
+
+ .bg_button{
+ display: inline-block;
+ overflow: hidden;
+ background: @bckgrd_header none repeat scroll 0 0;
+ border-radius: 5px 0 0 5px;
+ box-shadow: 0 0 12px 0 rgba(0, 0, 0, 0.07) inset;
+ transition: all 300ms linear 0s;
+ padding:0;
+
+ .btn{
+ padding:0;
+ }
+
+ &.button1{
+ background: @bckgrd_header none repeat scroll 0 0;
+ }
+
+ .button1{
+ font-size: 0;
+ line-height: 0;
+
+ .ui-button-text {
+ display: block;
+ background: rgba(0, 0, 0, 0) url("../img/bg_add_cart.png") no-repeat scroll 0 0;
+ font-size: 0;
+ line-height: 0;
+ padding: 18px 20px;
+ background-position: 0 -36px;
+ }
+ }
+
+ &.button2{
+ background: #ededed none repeat scroll 0 0;
+ }
+
+ .button2{
+ font-size: 0;
+ line-height: 0;
+
+ .ui-button-text {
+ display: block;
+ background: rgba(0, 0, 0, 0) url("../img/bg_add_cart.png") no-repeat scroll 0 0;
+ font-size: 0;
+ line-height: 0;
+ padding: 18px 20px;
+ background-position: -40px 0 ;
+ }
+ }
+ }
+ }
+
+}
+
+
+
+aside{
+
+ section{
+ &.boxe{
+
+ header{
+ .habill_header_title(@bckgrd_box_title , @link_text_color_topbot, @radius);
+
+ h3{
+ .padding_titleinbox();
+ a{
+ color:@link_text_color_topbot;
+ }
+ }
+ }
+
+ .infoBoxContents{
+ border: 1px solid @border;
+ .border-radius(@radius);
+
+
+ ul {
+ list-style:none;
+ padding-left:10px;
+
+ li{
+ border-bottom:1px solid @border;
+ width:95%;
+ padding:7px 10px 7px 0;
+
+ &:last-child{
+ border:none;
+ }
+ }
+
+ &.list{
+
+ }
+ &.unique{
+ padding-left:0;
+
+ li{
+ text-align:center;
+ border:none;
+
+ span{
+ display:inline-block;
+ float:none;
+
+ &.img-thumbnail {
+ min-height:120px;
+ img{
+ }
+ }
+
+ &.price{
+ float:none;
+ display:inline-block;
+ white-space: nowrap;
+ padding:0;
+ font-size: 1.128em;
+ text-align:right;
+ border-bottom: 1px solid @border;
+
+ .normalprice{
+ width:auto;
+ float:none;
+
+ .tax_symbol{
+ display:none;
+ }
+ }
+
+ }
+ }
+
+
+ }
+ }
+ }
+
+ }
+ }
+ }
+}
+
+.nopadding{
+ padding:0;
+}
+.productPrice {
+ float: left;
+
+ &.price{
+ color: @color_price;
+ font-size: 1.428em;
+ text-transform: uppercase;
+
+ del{
+ font-size: 0.8em;
+ color:@color_price_del;
+
+ span.tax_symbol{
+ display:none;
+ }
+ }
+
+ span.tax_symbol{
+ font-size: 0.8em;
+ display:none;
+ }
+ }
+}
+
+
+#push {
+ height: 60px;
+}
+
+
+div.one.product{
+
+ section {
+
+ &.col-xs-6{
+
+ .productPrice {
+ float: left;
+
+ &.price{
+ font-size: 1.2em;
+
+ del{
+ font-size: 0.6em;
+
+ span.tax_symbol{
+ display:none;
+ }
+ }
+
+ span.tax_symbol{
+ font-size: 0.6em;
+ }
+ }
+ }
+
+ }
+
+
+
+
+ transition: all 300ms linear 0s;
+ float:left;
+ padding:0;
+
+
+
+
+ .data {
+ font-size: 0.88em;
+ overflow: hidden;
+ padding-top: 7px;
+ }
+ .listing th {
+ background: @bckgrd_header_main none repeat scroll 0 0;
+ padding-bottom: 5px;
+ padding-top: 5px;
+ }
+
+
+
+ .td_left, .td_center.first {
+ padding-left: 10px;
+ text-align: left;
+ }
+ .td_right {
+ padding-right: 10px;
+ text-align: right;
+ }
+
+ div.product_block{
+
+ border: 1px solid @border;
+ .border-radius(@radius);
+ padding:15px;
+
+ h3.title.product {
+ font-size:1.043em;
+ line-height:1.35em;
+ font-weight: bold;
+ text-rendering: optimizelegibility;
+ a{
+ color: @link_text_color_product;
+ &:hover{
+ color:@link_text_color_hover;
+ }
+ }
+ }
+
+ .product_desc_wrapper{
+ height:100px;
+ font-size:0.95em;
+ }
+
+ .img-thumbnail {
+ min-height: 270px;
+ min-width: 250px;
+ img{
+ }
+ }
+
+ .label{
+
+ height: 120px;
+ left: -1px;
+ overflow: hidden;
+ padding: 0;
+ position: absolute;
+ top: -1px;
+ width: 120px;
+ z-index: 8;
+/* display:none; */
+
+
+ strong {
+ color: #000;
+ display: block;
+ font-size: 10px;
+ font-weight: 400;
+ line-height: 14px;
+ margin-left: -73px;
+ margin-top: 12px;
+ padding: 1px 0;
+ text-align: center;
+ text-transform: uppercase;
+ transform: rotate(-40deg);
+ }
+
+ &.new_label strong {
+ background: rgba(71, 177, 190, 0.7) none repeat scroll 0 0;
+ }
+ &.featured_label strong {
+ background: rgba(162, 209, 62, 0.7) none repeat scroll 0 0;
+ margin-left: -65px;
+ margin-top: 25px;
+ width: 200px;
+ }
+
+ &.top_label strong {
+ background: rgba(248, 203, 27, 0.7) none repeat scroll 0 0;
+ margin-left: -75px;
+ margin-top: 35px;
+ width: 250px;
+ }
+ }
+
+
+
+ .cl_both {
+ clear: both;
+ }
+ .button_content {
+ display: inline-block;
+ overflow: hidden;
+ position: relative;
+ }
+ .block .data {
+ float: right;
+ padding-top: 0;
+ text-align: right;
+ }
+
+
+
+ }
+ }
+
+}
+
+.in_tabs{
+ margin-top:15px;
+
+
+ .tabnav{
+ padding:0;
+ margin:0;
+
+
+ li{
+
+ .habill_header_title(@bckgrd_box_title , @link_text_color_topbot, @radius);
+ .padding_titleinbox();
+
+ width: 50%;
+ display: block;
+ float: left;
+ position: relative;
+
+ a{
+ color:@heading_text;
+ }
+ }
+
+
+ }
+
+ .tabcontent{
+ clear:both;
+ border-color: @border;
+ padding: 10px 19px;
+ }
+
+}
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/techno/desc.xml
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/techno/desc.xml (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/techno/desc.xml 2016-04-04 11:23:02 UTC (rev 5312)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<template>
+ <name>techno</name>
+ <version>1.0.0</version>
+ <author>oscim</author>
+ <desc>Thème generic, 2 colonnes, classique ecommerce. use less framework <br />
+ Ce template exploite jquery et des plugins pour jquery.<br />
+ Html5 </desc>
+ <thumb>thumb.jpg</thumb>
+</template>
+
Added: trunk/catalog/install/data/templates/appareil_photo/techno/fonts/glyphicons-halflings-regular.eot
===================================================================
(Binary files differ)
Index: trunk/catalog/install/data/templates/appareil_photo/techno/fonts/glyphicons-halflings-regular.eot
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/techno/fonts/glyphicons-halflings-regular.eot 2016-04-04 11:22:10 UTC (rev 5311)
+++ trunk/catalog/install/data/templates/appareil_photo/techno/fonts/glyphicons-halflings-regular.eot 2016-04-04 11:23:02 UTC (rev 5312)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/techno/fonts/glyphicons-halflings-regular.eot
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/catalog/install/data/templates/appareil_photo/techno/fonts/glyphicons-halflings-regular.svg
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/techno/fonts/glyphicons-halflings-regular.svg (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/techno/fonts/glyphicons-halflings-regular.svg 2016-04-04 11:23:02 UTC (rev 5312)
@@ -0,0 +1,229 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata></metadata>
+<defs>
+<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
+<font-face units-per-em="1200" ascent="960" descent="-240" />
+<missing-glyph horiz-adv-x="500" />
+<glyph />
+<glyph />
+<glyph unicode="
" />
+<glyph unicode=" " />
+<glyph unicode="*" d="M100 500v200h259l-183 183l141 141l183 -183v259h200v-259l183 183l141 -141l-183 -183h259v-200h-259l183 -183l-141 -141l-183 183v-259h-200v259l-183 -183l-141 141l183 183h-259z" />
+<glyph unicode="+" d="M0 400v300h400v400h300v-400h400v-300h-400v-400h-300v400h-400z" />
+<glyph unicode=" " />
+<glyph unicode=" " horiz-adv-x="652" />
+<glyph unicode=" " horiz-adv-x="1304" />
+<glyph unicode=" " horiz-adv-x="652" />
+<glyph unicode=" " horiz-adv-x="1304" />
+<glyph unicode=" " horiz-adv-x="434" />
+<glyph unicode=" " horiz-adv-x="326" />
+<glyph unicode=" " horiz-adv-x="217" />
+<glyph unicode=" " horiz-adv-x="217" />
+<glyph unicode=" " horiz-adv-x="163" />
+<glyph unicode=" " horiz-adv-x="260" />
+<glyph unicode=" " horiz-adv-x="72" />
+<glyph unicode=" " horiz-adv-x="260" />
+<glyph unicode=" " horiz-adv-x="326" />
+<glyph unicode="€" d="M100 500l100 100h113q0 47 5 100h-218l100 100h135q37 167 112 257q117 141 297 141q242 0 354 -189q60 -103 66 -209h-181q0 55 -25.5 99t-63.5 68t-75 36.5t-67 12.5q-24 0 -52.5 -10t-62.5 -32t-65.5 -67t-50.5 -107h379l-100 -100h-300q-6 -46 -6 -100h406l-100 -100 h-300q9 -74 33 -132t52.5 -91t62 -54.5t59 -29t46.5 -7.5q29 0 66 13t75 37t63.5 67.5t25.5 96.5h174q-31 -172 -128 -278q-107 -117 -274 -117q-205 0 -324 158q-36 46 -69 131.5t-45 205.5h-217z" />
+<glyph unicode="−" d="M200 400h900v300h-900v-300z" />
+<glyph unicode="☁" d="M-14 494q0 -80 56.5 -137t135.5 -57h750q120 0 205 86t85 208q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5z" />
+<glyph unicode="✉" d="M0 100l400 400l200 -200l200 200l400 -400h-1200zM0 300v600l300 -300zM0 1100l600 -603l600 603h-1200zM900 600l300 300v-600z" />
+<glyph unicode="✏" d="M-13 -13l333 112l-223 223zM187 403l214 -214l614 614l-214 214zM887 1103l214 -214l99 92q13 13 13 32.5t-13 33.5l-153 153q-15 13 -33 13t-33 -13z" />
+<glyph unicode="" horiz-adv-x="500" d="M0 0z" />
+<glyph unicode="" d="M0 1200h1200l-500 -550v-550h300v-100h-800v100h300v550z" />
+<glyph unicode="" d="M14 84q18 -55 86 -75.5t147 5.5q65 21 109 69t44 90v606l600 155v-521q-64 16 -138 -7q-79 -26 -122.5 -83t-25.5 -111q17 -55 85.5 -75.5t147.5 4.5q70 23 111.5 63.5t41.5 95.5v881q0 10 -7 15.5t-17 2.5l-752 -193q-10 -3 -17 -12.5t-7 -19.5v-689q-64 17 -138 -7 q-79 -25 -122.5 -82t-25.5 -112z" />
+<glyph unicode="" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233z" />
+<glyph unicode="" d="M100 784q0 64 28 123t73 100.5t104.5 64t119 20.5t120 -38.5t104.5 -104.5q48 69 109.5 105t121.5 38t118.5 -20.5t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-149.5 152.5t-126.5 127.5 t-94 124.5t-33.5 117.5z" />
+<glyph unicode="" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1z" />
+<glyph unicode="" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1zM237 700l196 -142l-73 -226l192 140l195 -141l-74 229l193 140h-235l-77 211l-78 -211h-239z" />
+<glyph unicode="" d="M0 0v143l400 257v100q-37 0 -68.5 74.5t-31.5 125.5v200q0 124 88 212t212 88t212 -88t88 -212v-200q0 -51 -31.5 -125.5t-68.5 -74.5v-100l400 -257v-143h-1200z" />
+<glyp...
[truncated message content] |
|
From: <os...@us...> - 2016-04-04 11:22:13
|
Revision: 5311
http://sourceforge.net/p/oscss/svn/5311
Author: oscim
Date: 2016-04-04 11:22:10 +0000 (Mon, 04 Apr 2016)
Log Message:
-----------
Fix
Modified Paths:
--------------
trunk/catalog/common/classes/datatype_drivers/Data_featured.php
trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/classes/drivers/sqlmanufacturer.php
trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/modules/pages/manufacturers.php
trunk/extensions/MANUFACTURERS_stable/catalog/common/classes/datatype_drivers/Data_manufacturer.php
trunk/extensions/MANUFACTURERS_stable/catalog/includes/classes/drivers/data/manufacturer.php
trunk/extensions/MANUFACTURERS_stable/install.xml
Modified: trunk/catalog/common/classes/datatype_drivers/Data_featured.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_featured.php 2016-03-31 09:06:13 UTC (rev 5310)
+++ trunk/catalog/common/classes/datatype_drivers/Data_featured.php 2016-04-04 11:22:10 UTC (rev 5311)
@@ -133,8 +133,6 @@
*/
public function is_type($mode='unique'){
-// print_r($_GET);
-// if( isset($_GET['featured']) )
switch(strtolower($mode)){
case 'preload_root':
@@ -150,7 +148,6 @@
case 'transversal':
case 'listing':
-// case 'unique':
if( isset($_GET['featured']) && is_numeric($_GET['featured']) )
return true;
break;
Modified: trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/classes/drivers/sqlmanufacturer.php
===================================================================
--- trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/classes/drivers/sqlmanufacturer.php 2016-03-31 09:06:13 UTC (rev 5310)
+++ trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/classes/drivers/sqlmanufacturer.php 2016-04-04 11:22:10 UTC (rev 5311)
@@ -270,7 +270,7 @@
@fn CleanKey()
@brief Clean string name key
*/
- private static function CleanKey($array){
+ public static function CleanKey($array){
self::getInstance();
$object= new stdclass();
@@ -324,4 +324,107 @@
}
+/**
+ @class sqlmanufacturerdata
+ @brief for manage linkto
+*/
+class sqlmanufacturerdata
+ extends sqllinkto{
+
+ protected static $datatype_parent = 'manufacturer';
+
+ /**
+ @brief create new ligne in table configuration
+ */
+ public static function create($option){
+
+// $tmp = array();
+// // $tmp['datatype_parent'] = self::$datatype_parent;
+// $tmp['manufacturers_id'] = tep_db_prepare_input($option['id']);
+//
+// $tmp['datatype_child'] = tep_db_prepare_input($option['datatype']);
+// $tmp['datatype_child_id'] = tep_db_prepare_input($option['datatype_id']);
+//
+// $option['sqlarray'] = $tmp ;
+
+
+
+ return self::update($option);
+ }
+
+ /**
+ @brief update ligne in table configuration
+ */
+ public static function update($option){
+// $tmp = array();
+// $tmp['datatype_parent'] = self::$datatype_parent;
+// $tmp['datatype_parent_id'] = tep_db_prepare_input($option['id']);
+//
+// $tmp['datatype_child'] = tep_db_prepare_input($option['datatype']);
+// $tmp['datatype_child_id'] = tep_db_prepare_input($option['datatype_id']);
+//
+// $option['sqlarray'] = $tmp ;
+ $DB=Database::getInstance();
+
+ return $DB->query($sql="UPDATE " . TABLE_PRODUCTS . " SET manufacturers_id='".tep_db_prepare_input($option['id'])."' where products_id='".tep_db_prepare_input($option['datatype_id'])."' ");;
+ }
+
+ /**
+ @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)
+ @param $shortkey use cleankey for return short key
+ @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){
+ $tmp = array();
+ $tmp['datatype_parent'] = self::$datatype_parent;
+ if(isset($option['id']) )
+ $tmp['datatype_parent_id'] = tep_db_prepare_input($option['id']);
+
+ if(isset($option['datatype']) )
+ $tmp['datatype_child'] = tep_db_prepare_input($option['datatype']);
+ if(isset($option['datatype_id']) )
+ $tmp['datatype_child_id'] = tep_db_prepare_input($option['datatype_id']);
+
+
+ return parent::fetch($tmp,$shortkey);
+ }
+
+ /**
+ @brief delete row
+ */
+ public static function delete($option){
+ $tmp = array();
+ $tmp['datatype_parent'] = self::$datatype_parent;
+ if(isset($option['id']) )
+ $tmp['datatype_parent_id'] = tep_db_prepare_input($option['id']);
+
+ if(isset($option['datatype']) )
+ $tmp['datatype_child'] = tep_db_prepare_input($option['datatype']);
+ if(isset($option['datatype_id']) )
+ $tmp['datatype_child_id'] = tep_db_prepare_input($option['datatype_id']);
+
+
+ return parent::delete($tmp);
+ }
+
+
+
+
+}
?>
\ No newline at end of file
Modified: trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/modules/pages/manufacturers.php
===================================================================
--- trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/modules/pages/manufacturers.php 2016-03-31 09:06:13 UTC (rev 5310)
+++ trunk/extensions/MANUFACTURERS_stable/catalog/admin/includes/modules/pages/manufacturers.php 2016-04-04 11:22:10 UTC (rev 5311)
@@ -10,8 +10,12 @@
@class manufacturers
*/
+
+
+require_once(DIR_FS_ADMIN . DIR_WS_CLASSES .'ModTree.php');
+
class manufacturers
- extends ModTwo /// new abstract class for nextgen module
+ extends ModTree /// new abstract class for nextgen module
implements
InterfaceModule,
/*IntModTwo, */ /// new interface module for nextgen module
Modified: trunk/extensions/MANUFACTURERS_stable/catalog/common/classes/datatype_drivers/Data_manufacturer.php
===================================================================
--- trunk/extensions/MANUFACTURERS_stable/catalog/common/classes/datatype_drivers/Data_manufacturer.php 2016-03-31 09:06:13 UTC (rev 5310)
+++ trunk/extensions/MANUFACTURERS_stable/catalog/common/classes/datatype_drivers/Data_manufacturer.php 2016-04-04 11:22:10 UTC (rev 5311)
@@ -69,6 +69,7 @@
$this->RootListing = array_map('trim',explode(',',DATATYPES_ROOTLISTING_MANUFACTURER));
}
+
/**
@brief sql for sitemap index
@param $mode le type de control (public)
@@ -93,15 +94,37 @@
return true;
}
-
+
/**
+ @brief this methode construct sql base for link in childs data
+ this categorie use sub tables nameofdata _ to_categories
+ For history this child data product, use 's' in name of table and name of cols
+ @param $type string name of child type
+ @param $mode string anchor key used
+ @return array
+ */
+// public function GetLinkTo($type, $mode='leftto'){
+//
+// // for letto
+// $this->listing_sql['leftto']['rows'] = array(
+// "".$this->p.".manufacturers_id as manufacturers_id"=>0,
+// // // " GROUP_CONCAT(".$this->p."data.datatype_parent_id) as featured_ids "=>0,
+// );
+//
+//
+// // $this->listing_sql['leftto']['tables'] .= " LEFT JOIN " . TABLE_MANUFACTURERS . " ".$this->p." ON ( ".$this->p.".id = ".$this->p.".manufacturers_id ) ";
+// // $this->listing_sql['leftto']['tables'] .= " LEFT JOIN " . TABLE_MANUFACTURERS_INFO . " ".$this->p."d ON( ".$this->p."d.manufacturers_id = ".$this->p.".manufacturers_id AND ".$this->p."d.languages_id = '%s' ) ";
+//
+// return $this->listing_sql['leftto'];
+//
+// }
+ /**
@brief test si al page est du type produits
@param $mode le type de control (page/cpath/seo)
*/
public function is_type($mode='unique'){
- if( isset($_GET['manufacturers_id']) )
switch(strtolower($mode)){
case 'preload_root':
@@ -116,13 +139,14 @@
break;
case 'transversal':
- return true;
- break;
case 'listing':
+ if( isset($_GET['manufacturers_id']) && is_numeric($_GET['manufacturers_id']) )
return true;
break;
+
// listing mode, block home page
case 'unique':
+ if( isset($_GET['manufacturers_id']) && is_numeric($_GET['manufacturers_id']) )
DataTypes::ForceChilds($this->DataType, 'product');
break;
}
@@ -172,24 +196,53 @@
@param $type string name childs type for listing
@param subtype object childs DataType
*/
- function FO_load_listing($type,$subtype){
+ function FO_load_listing(listing $listing, DataTypesChildListing $subtype, $type){
global $current_category_id, $languages_id;
$page = page::getInstance();
$category_depth = $page->GetVar('category_depth');
-
+ $DB=Database::getInstance();
$this->ChildsType = $type;
$sql_tmp = $subtype->listing_sql;
- $this->listing_sql =
- "SELECT DISTINCT ". $sql_tmp['col_count'] ." ".
- $sql_tmp['tables'] .
- $sql_tmp['where'] .
- " AND manufacturers_id = '" . (int)$_GET['manufacturers_id'] . "' ";
- $this->listing_sort = $sql_tmp['sort'] ;
- $this->listing_col_count = $sql_tmp['col_count'] ;
+
+ if (isset($_GET['manufacturers_id'])) {
+
+ $breadcrumb=$page->return_object('breadcrumb');
+
+ $manufacturer = manufacturer::get_item((int)$_GET['manufacturers_id']);
+
+ if ( ! is_object($manufacturer) )
+ return false;
+
+ $breadcrumb->add( __('@manufacturer breadcrumb root'), $manufacturer->href );
+ $breadcrumb->add( $manufacturer->title , $manufacturer->href );
+
+// $page->SetVar('manufacturers',$manuf);
+
+ // var use in draw master detail listing
+ $obj = new stdClass();
+ $obj->type = $this->DataType ;
+ $obj->gabarit = $this->DataType.'/listing.detail' ;
+// $obj->image = $manuf['manufacturers_image'];
+// $obj->name = $manuf['manufacturers_name'];
+// $obj->description = false;
+ $obj->image = $manufacturer->image ;
+ $obj->name = $manufacturer->title ;
+ $obj->href = $manufacturer->href ;
+ $obj->description = false;
+
+ $page->SetVar('RootListing',$obj);
+ $page->SetVar('current_id',(int)$_GET['manufacturers_id']);
+ $page->SetVar('current_type',(string)'manufacturer');
+ $page->SetVar('current_object', $manufacturer);
+
+ $listing->QueryAddWhere( " AND p.manufacturers_id= '".$_GET['manufacturers_id']."' ");
+ return true;
+ }
+
}
@@ -206,32 +259,7 @@
switch($mode){
case 'transversal':
case 'listing':
- case 'unique':
- /// get the categorie name and put it on the header
- if (isset($_GET['manufacturers_id'])) {
-
- $man=$DB->query("select * from " . TABLE_MANUFACTURERS . " m LEFT JOIN ".TABLE_MANUFACTURERS_INFO." mi ON(m.manufacturers_id = mi.manufacturers_id AND languages_id = '".$languages_id."') where m.manufacturers_id = '" . (int)$_GET['manufacturers_id'] . "' ");
- $manuf= $man->fetchAssoc();
- tep_db_free_result($man);
- $image = $manuf['manufacturers_image'];
- $page->breadcrumb->add($manuf['manufacturers_name'], tep_href_link(FILENAME_DEFAULT, 'manufacturers_id=' . $_GET['manufacturers_id']));
-
-
- $page->add_var_page('manufacturers',$manuf);
-
- // var use in draw master detail listing
- $obj = new stdClass();
- $obj->type = $this->DataType ;
- $obj->gabarit = $this->DataType.'/listing.detail' ;
- $obj->image = $manuf['manufacturers_image'];
- $obj->name = $manuf['manufacturers_name'];
- $obj->description = false;
-
-
- $page->add_var_page('RootListing',$obj);
- $page->add_var_page('current_id',(int)$_GET['manufacturers_id']);
- }
break;
}
Modified: trunk/extensions/MANUFACTURERS_stable/catalog/includes/classes/drivers/data/manufacturer.php
===================================================================
--- trunk/extensions/MANUFACTURERS_stable/catalog/includes/classes/drivers/data/manufacturer.php 2016-03-31 09:06:13 UTC (rev 5310)
+++ trunk/extensions/MANUFACTURERS_stable/catalog/includes/classes/drivers/data/manufacturer.php 2016-04-04 11:22:10 UTC (rev 5311)
@@ -10,7 +10,9 @@
*/
-
+require_once(DIR_FS_CATALOG . DIR_WS_CLASSES . 'DataStatmentFO.php');
+require_once(DIR_FS_CATALOG . DIR_WS_CLASSES . 'drivers/DataListenerRow.php');
+require_once(DIR_FS_CATALOG . DIR_WS_CLASSES . 'drivers/DataListenerRowFeatured.php');
/**
\class manufacturer
\brief Control init et gestion des data product
@@ -26,7 +28,9 @@
*/
protected function __construct($full) {
global $languages_id;
-// productData::start();
+
+ DataTypes::CompletRequest('leftto', 'manufacturer');
+
if($full) self::start_module();
}
@@ -86,7 +90,19 @@
* @param $product_array array
*/
public static function get_option_data($_array){ /*$pdm=self::start_module();return $pdm->get_option_data($_array);*/}
-
+ /**
+ * \fn get_extra_manufacturer($_id, $key='')
+ */
+ public static function get_extra_manufacturer($_id, $key='') { new self(); return manufacturerData::GetExtraFields($_id, $key); }
+ /**
+ @fn get_extra($id, $key='')
+ @brief call extra data for this categorie
+ this extra proceded by common extra
+ @param $id int id categorie
+ @param $key string name of key for this extra (if extra key exists)
+ @return array
+ */
+ public static function get_extra($id, $key=''){ new self(); return manufacturerData::GetExtra($id, $key); }
}
@@ -100,48 +116,123 @@
extends DataStatmentFO
implements Interfacedata{
/**
+ @var array
+ */
+ public static $opt=array();
+ /**
+ @var array cache
+ */
+ public static $array_data=array();
+ /**
+ @var object
+ */
+ protected static $_instance;
+ /**
+ @var array cache
+ */
+ public static $object_data;
+ /**
@var $cache array cache result
*/
public static $cache=array();
+ /**
+ */
+ protected function __construct() {
+ global $languages_id;
+ }
- //! @p object cache
- public static $object_data;
- //! @p array cache
- public static $array_data=array();
- //! @p string
- private static $where_query='';
-
-
-
-
/**
* \brief Prepa donnée sortie
* @param $content_query
* @param $exclude array
* @param $search string
*/
- protected static function statment_query($content_query,$exclude='',$search=''){
+ protected static function statment_query($_query,$exclude='',$search=''){
- $display_lang=self::$obj_language->fetchAssoc();
+ $display_lang=self::$obj_language->fetchAssoc();
if (empty($exclude))$exclude=array();
$tabl=$res=array();
- while ($content = $content_query->fetchAssoc()) {
- if(count(self::$cache)>0 && in_array($content['manufacturers_id'],self::$cache) ) $tabl[$content['manufacturers_id']]=self::$object_data[$content['manufacturers_id']];
- elseif (!in_array($content['manufacturers_name'],$exclude)) {
- $res=$content;
- $res['href']=tep_href_link(FILENAME_DEFAULT,'manufacturers_id=' . $content['manufacturers_id'] );
- $res['key']=$content['manufacturers_id'];
- $res['id']=$content['manufacturers_id'];
- $res['title']=$content['manufacturers_name'];
- $res['name']=$content['manufacturers_name'];
- // $res=manufacturer::get_option_data($res);
+ if(!$_query)
+ return false;
+
+ $listlinkto = DataTypes::GetLeftRoot('manufacturer');
+
+ while ($thisrow = $_query->fetchAssoc()) {
+ if (!in_array($thisrow['name'],$exclude)) {
+ $res=$thisrow;
- self::$object_data[$content['manufacturers_id']]=$tabl[$content['manufacturers_id']]=new objectInfo($res);
- self::add_cache($content['manufacturers_id']);
+ $DataRow = new DataListenerRowFeatured(
+ $thisrow['id'],
+ $thisrow['type'],
+ tep_href_link( FILENAME_DEFAULT,'manufacturers_id=' . $thisrow['id'] ),
+ $thisrow['id'],
+ $thisrow['title'],
+ $thisrow['title']
+ );
+
+// $res=explode('|', $thisrow['images']);
+// if(is_array($res)) {
+// $DataRow->SetImages($res);
+// $DataRow->SetImage($res[0]);
+// }
+ $DataRow->SetExtra( self::GetExtraFields($thisrow['id']) );
+
+ $DataRow->SetText($thisrow['text']);
+
+// $res['href']=tep_href_link(FILENAME_FEATURED,'featured=' . $thisrow['id']);
+// $res['title']=$thisrow['featured_title'];
+// $res['name']=$thisrow['featured_title'];
+// $res['original']=$thisrow['featured_description'];
+//
+// $res['images']=explode('|', $thisrow['images']);
+// $res['image']= @$res['images'][0];
+//
+ foreach($listlinkto as $row){
+
+ $namerow = $row.'_id';
+ // retro compatibilité
+ if(!isset($thisrow[$namerow]))
+ $namerow = $row.'s_id';
+
+ if(isset($thisrow[$namerow]))
+ $DataRow->SetLinkTo($row, $thisrow[$namerow] );
+
+ if(preg_match('#([0-9]*,)*#', $thisrow[ $row.'_ids'])){
+
+ $li = explode(',',$thisrow[ $row.'_ids']);
+ foreach($li as $id){
+ $DataRow->SetLinkTo($row, $id);
+ }
+ }
+ }
+
+ self::$object_data[$thisrow['id']]=$tabl[$thisrow['id']]=$DataRow ; //new objectInfo($res);
+// self::$array_data[$thisrow['id']]->text=self::parse_featured($res['text'],$thisrow['id']);
+ self::add_cache($thisrow['id']);
}
}
+
+// $display_lang=self::$obj_language->fetchAssoc();
+// if (empty($exclude))$exclude=array();
+// $tabl=$res=array();
+// while ($content = $content_query->fetchAssoc()) {
+// if(count(self::$cache)>0 && in_array($content['manufacturers_id'],self::$cache) ) $tabl[$content['manufacturers_id']]=self::$object_data[$content['manufacturers_id']];
+// elseif (!in_array($content['manufacturers_name'],$exclude)) {
+// $res=$content;
+// $res['href']=tep_href_link(FILENAME_DEFAULT,'manufacturers_id=' . $content['manufacturers_id'] );
+// $res['key']=$content['manufacturers_id'];
+// $res['id']=$content['manufacturers_id'];
+// $res['title']=$content['manufacturers_name'];
+// $res['name']=$content['manufacturers_name'];
+//
+// // $res=manufacturer::get_option_data($res);
+//
+// self::$object_data[$content['manufacturers_id']]=$tabl[$content['manufacturers_id']]=new objectInfo($res);
+// self::add_cache($content['manufacturers_id']);
+// }
+// }
return $tabl;
}
@@ -166,7 +257,12 @@
* @param $option
*/
protected static function cstr_query($orderby='', $limit='', $option=''){
- $query="SELECT c.manufacturers_id, c.manufacturers_image, c.manufacturers_name FROM " . TABLE_MANUFACTURERS . " c, " . TABLE_MANUFACTURERS_INFO . " cd WHERE c.manufacturers_id = cd.manufacturers_id AND cd.languages_id = '" . self::$lg_id . "' ";
+ $query="SELECT
+ c.manufacturers_id as id ,
+ c.manufacturers_image as image,
+ c.manufacturers_name as title
+
+ FROM " . TABLE_MANUFACTURERS . " c, " . TABLE_MANUFACTURERS_INFO . " cd WHERE c.manufacturers_id = cd.manufacturers_id AND cd.languages_id = '" . self::$lg_id . "' ";
$query .=self::$where_query;
$query .=' ORDER BY ' .(!tep_not_null($orderby)? ' c.manufacturers_name ASC ' : $orderby) ;
@@ -342,50 +438,6 @@
}
- /**
- * \brief Recursively go through the manufacturers and retreive all parent manufacturers IDs
- // TABLES: manufacturers
- */
-// public static function get_parent_manufacturers(&$manufacturers, $manufacturers_id) {
-//
-// if(!isset(self::$object_data[$manufacturers_id]->parent_array)) {
-// $db_list=self::get_query((int)$manufacturers_id);
-// foreach($db_list as $cats) {
-// if ($cats->parent_id == 0) return true;
-// $manufacturers[sizeof($manufacturers)] = $cats->parent_id;
-// if ($cats->parent_id != $manufacturers_id) {
-// self::get_parent_manufacturers($manufacturers, $cats->parent_id);
-// }
-// }
-// // self::$object_data[$manufacturers_id]->parent_array=$manufacturers;
-// } else $manufacturers=self::$object_data[$manufacturers_id]->parent_array;
-//
-//
-// // $parent_manufacturers_query = tep_db_query("select parent_id from " . TABLE_MANUFACTURERS . " where manufacturers_id = '" . (int)$manufacturers_id . "' ");
-// // while ($parent_manufacturers = tep_db_fetch_array($parent_manufacturers_query)) {
-// // if ($parent_manufacturers['parent_id'] == 0) return true;
-// // $manufacturers[sizeof($manufacturers)] = $parent_manufacturers['parent_id'];
-// // if ($parent_manufacturers['parent_id'] != $manufacturers_id) {
-// // self::tep_get_parent_manufacturers($manufacturers, $parent_manufacturers['parent_id']);
-// // }
-// // }
-//
-// }
-
-/**
- * \brief
- Return all submanufacturer IDs. Recursivite
- TABLES: manufacturers
-*/
-// public static function get_submanufacturers(&$submanufacturers_array, $parent_id = 0) {
-// $submanufacturers_query = tep_db_query("select manufacturers_id from " . TABLE_MANUFACTURERS . " where parent_id = '" . (int)$parent_id . "' and manufacturers_status='1' ");
-// while ($submanufacturers = tep_db_fetch_array($submanufacturers_query)) {
-// $submanufacturers_array[sizeof($submanufacturers_array)] = $submanufacturers['manufacturers_id'];
-// if ($submanufacturers['manufacturers_id'] != $parent_id)
-// tep_get_submanufacturers($submanufacturers_array, $submanufacturers['manufacturers_id']);
-// }
-// }
-
/**
* \brief Construction d'un select sur les catégories actives
*/
@@ -401,7 +453,109 @@
//
// return $manufacturers_array;
}
+ public static function GetExtraFields($_id, $key=''){
+ $array= array();
+ if(isset(self::$object_data[(int)$_id]) && isset(self::$object_data[(int)$_id]->extra) && empty($key) )$array= self::$object_data[(int)$_id]->extra;
+ else {
+ $DB=Database::getInstance();
+ $array=array();
+ $sql = "SELECT
+ e.fields_id as id,
+ e.fields_input_type as input_type,
+ e.fields_key as fkey,
+ fields_advanced_search,
+ e.fields_active_value_language as value_language,
+ l.fields_name as label,
+ l.fields_format as input_format,
+ p2epf.value as value
+ FROM " . TABLE_EXTRA_FIELDS_TO . " p2epf ,
+ " . TABLE_EXTRA_FIELDS . " e
+ JOIN " . TABLE_EXTRA_FIELDS_LABELS . " l ON e.fields_id = l.fields_id
+ WHERE
+ p2epf.fields_id=e.fields_id
+ AND data_type='manufacturer'
+ AND data_id = '" . (int)$_id . "'
+ AND ( l.languages_id='".self::$lg_id."' OR l.languages_id= 0)
+ AND fields_special_mod='".$key."'
+ ORDER BY fields_sort ASC " ;
+ $epf_query = $DB->query($sql);
+
+ while( $e = $epf_query->fetchAssoc() ) {
+
+
+ $val = $DB->query( $sql ="SELECT p2epf.value as value FROM " . TABLE_EXTRA_FIELDS_TO . " p2epf WHERE p2epf.fields_id=".$e['id']." AND data_type='manufacturer' AND data_id = '" . (int)$_id . "' AND languages_id='". (($e['value_language']==1 && !in_array( (int)$e['input_type'] , array(4,2)) )? self::$lg_id : 0)."' ");
+ $result = $val->fetchAssoc();
+
+ switch((int)$e['input_type'] ) {
+ case 2: // radio
+ case 4: // select
+ case 6: // select mutli
+ case 7: // checkbox mutli
+ case 3: // checkbox
+ $val = self::GetEFValue($e['id'] ,$result['value'] , (($e['value_language']==1)? self::$lg_id : 0) );
+ break;
+ case 0: // classic
+ case 1: // textarea
+ case 5: // hidden
+ default:
+ $val = $result['value'];
+ }
+
+ $array[ (!empty($e['epf_key'])?$e['fkey'] :$e['id']) ]=new objectInfo( array(
+ 'label'=>(string)$e['label'],
+ 'name'=>(string)$e['label'], // obsolete
+ 'value' => $val, // obsolete
+ 'input_value' => $val,
+ 'epf_key'=>(string)$e['fkey'],
+ 'epf_id'=>(int)$e['id'], // obsolete
+ 'id'=>(int)$e['id'],
+// 'epf_show_in_listing'=>(int)$e['epf_show_in_listing'],
+ 'input_type'=>(int)$e['input_type'],
+ 'input_format'=>$e['input_format'],
+ 'required_status'=>0,
+ // 'epf_advanced_search'=>(int)$e['epf_advanced_search']
+ ) );
+
+
+ }
+
+ if(!isset(self::$object_data[(int)$_id]))self::$object_data[(int)$_id]=new objectInfo(array());
+ self::$object_data[(int)$_id]->extra = $array;
+ }
+
+ return $array;
+ }
+
+ /**
+ @fn GetEFValue($epfid,$values, $languages_id, $separator = ', ')
+ @brief get in db for extract all value for EF stocked in id value and not string
+ @param $epfid int
+ @param $values string (id, id,...)
+ @param $languages_id int or 0 for value not multi language
+ @param $separator seperator result
+ */
+ public static function GetEFValue($epfid,$values, $languages_id, $separator = ', '){
+ $DB=Database::getInstance();
+ $val = '';
+ $s='';
+
+ $a = explode(',',$values);
+ foreach($a as $r)
+ if(!empty($r))$val .=(int)$r.",";
+
+ if(strlen($val) <= 0)
+ return '';
+
+ $val = $DB->query( $sql ="SELECT fields_value as value FROM " . TABLE_EXTRA_FIELDS_VALUES . " p2epf WHERE value_id IN (".substr($val, 0, -1).") AND fields_id = '" . (int)$epfid . "' AND languages_id='".(int) $languages_id."' ORDER BY sort_order ");
+ $result = $val->fetchAllAssoc();
+
+ foreach($result as $r)
+ $s .=$r['value'] .$separator;
+
+ return substr($s, 0, -1);
+ }
+
}
Modified: trunk/extensions/MANUFACTURERS_stable/install.xml
===================================================================
--- trunk/extensions/MANUFACTURERS_stable/install.xml 2016-03-31 09:06:13 UTC (rev 5310)
+++ trunk/extensions/MANUFACTURERS_stable/install.xml 2016-04-04 11:22:10 UTC (rev 5311)
@@ -38,6 +38,8 @@
<file name="common/classes/datatype_drivers/Data_manufacturer.php" />
+ <file name="includes/classes/drivers/data/manufacturer.php" />
+
<file name="templates/defaut/includes/boxes/manufacturers.php" />
<file name="templates/defaut/includes/boxes/manufacturer_info.php" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2016-03-31 09:06:16
|
Revision: 5310
http://sourceforge.net/p/oscss/svn/5310
Author: oscim
Date: 2016-03-31 09:06:13 +0000 (Thu, 31 Mar 2016)
Log Message:
-----------
Fix
add sgment of gabarit for loop module
Modified Paths:
--------------
trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/product/view.gab
trunk/catalog/templates/defaut/Childs_tpl/module.php
Added Paths:
-----------
trunk/catalog/templates/defaut/includes/gabarit/module.other.gab
trunk/catalog/templates/defaut/includes/gabarit/module.product.gab
Modified: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/product/view.gab
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/product/view.gab 2016-03-23 14:33:40 UTC (rev 5309)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/product/view.gab 2016-03-31 09:06:13 UTC (rev 5310)
@@ -90,56 +90,6 @@
</div>
<hr class="sprite-row" />
</div>
- <div class="order-area col-md-3">
- <ul class="list-group">
- <li class="list-group-item text-center">
- <?php echo print_products_price_rv($objectProduct); ?>
- </li>
- <li class="list-group-item text-center ">
- <?php if ( $objectProduct->GetTrackStock() == 3 && $objectProduct->GetQuanity() <= 0): ?>
- <!-- this product is definitive enought stock -->
- <div class="h4"><span class="label label-warning"><?php echo __('products info stock finish in limited') ?></span></div>
- <?php else: ?>
- <div class="h3"><span class="label label-success"><?php echo __('products info stock ok') ?></span></div>
- <?php endif;?>
- </li>
- <li class="list-group-item text-center ">
- <?php if ( _test_bool($objectProduct->GetAction('buy')) /*_test_bool($product_info['action']['buy'])*/): ?>
- <!-- this product is avaible for add cart -->
- <?php echo tep_draw_form('cart_quantity', tep_href_link(FILENAME_PRODUCT_INFO, tep_get_all_get_params(array('action')) . 'action=add_product', 'post', 'class="addcart"')); ?>
-
- <?php /** Aca Attribute Products */ if(isset($module['attributeManager'])) echo $module['attributeManager']->display_view_master($objectProduct->GetId());?>
-
- <?php /** Aca Attribute Products */ if(isset($module['Abonnement'])) echo $module['Abonnement']->display_view_master($objectProduct->GetId());?>
- <?php echo tep_draw_hidden_field('products_id', $objectProduct->GetId()); ?>
- <div class="input-group">
- <?php echo tep_draw_input_field('products_quantity', 'products_quantity', '1', 'size="2" placeholder="'.__('text prefix qty').'" min="1" class="form-control"', false, 'number'); ?>
- <span class="input-group-btn"><input type="submit" class="btn btn-warning" value="<?php echo __('image button in cart'); ?>"></span>
- </div>
-
- </form>
-
- <?php else: ?>
-
- <?php if ( $objectProduct->GetTrackStock() == 3 && $objectProduct->GetQuanity() <= 0): ?>
- <!-- this product is definitive enought stock -->
- <p>
- <?php echo __('products info stock finish in limited') ?>
- </p>
- <?php endif;?>
-
- <?php endif ; ?>
- </li>
- <li class="list-group-item text-center">15 jours pour changer d'avis.<br />Satisfait ou remboursé.</li>
- <li class="list-group-item text-center">Livraison offerte à partir de<br /> 89€ d'achats en Colissimo.</li>
- <li class="list-group-item text-center">Paiements sécurisés.<br />Débit à l'expédition.</li>
- <li class="list-group-item text-center">Suivi de colis pas SMS.</li>
- <li class="list-group-item text-center">
- <h4 class="text-center">Question, conseil, commande</h4>
- <p class="h3 text-center diff-font"><a href="tel:0033633323234">+336 33 32 32 34</a></p>
- </li>
- </ul>
- </div>
</div>
</article>
Modified: trunk/catalog/templates/defaut/Childs_tpl/module.php
===================================================================
--- trunk/catalog/templates/defaut/Childs_tpl/module.php 2016-03-23 14:33:40 UTC (rev 5309)
+++ trunk/catalog/templates/defaut/Childs_tpl/module.php 2016-03-31 09:06:13 UTC (rev 5310)
@@ -37,96 +37,30 @@
* Loop Data
*/
$i = 0; foreach($themodule->module_db->content as $ele): ?>
-
- <?php if( $i%4 ==0 ) : ?>
- <?php if( $i>0 ) : ?>
- </div>
- <?php endif; ?>
- <div class="row">
- <?php endif; ?>
+
-
- <div class=" one <?php echo $ele->data ?>">
+ <div class=" one <?php echo $ele->data ?>">
- <?php if($ele->data =='product'): /** PRODUCTS */ ?>
+ <?php if(tep_get_include_contents('module.'.$ele->data ) !=false): ?>
+
<section class="col-sm-3 col-xs-6 outerblock">
- <div class="innerblock">
- <?php if (tep_not_null( $ele->GetPrice() ) && $page->_draw_in_page('PRODUCT_LIST_PRICE')) { ?>
- <p class="price product">
- <?php echo print_products_price_rv($ele) ?>
- </p>
- <?php } ?>
-
- <?php if ($page->_draw_in_page('PRODUCT_LIST_NAME')) { ?>
- <p class="title product">
- <?php echo '<a href="' . $ele->GetHref() . '" title="'.$ele->GetName().'">' . $ele->GetName() . '</a>' ;?>
- </p>
- <?php } ?>
-
- <?php if ($page->_draw_in_page('PRODUCT_LIST_IMAGE')) { ?>
- <p class="img-thumbnail product">
- <?php echo '<a href="' . $ele->GetHref() . '" title="'.$ele->GetTitle().'" >' . tep_image(DIR_WS_IMAGES . $ele->GetImage(), $ele->GetTitle(), $page->_conf_value('SMALL_IMAGE_WIDTH'), $page->_conf_value('SMALL_IMAGE_HEIGHT')) . '</a>' ; ?>
- </p>
- <?php } ?>
-
-
-
- <div class="hidden-xs innerblock-more">
- <div class="btn-group" >
- <?php if ( $page->_draw_in_page('PRODUCT_LIST_BUY_NOW')) { ?>
-
- <?php /** @remarks If buy possible and attribute , force choose attribute */ ?>
-
- <?php if (_test_bool($ele->action['buy'] ) && count(product_attribut_info($ele->GetId())) != 0): ?>
-
- <a class="btn btn-default" href="<?php echo $ele->GetHref() ?>" ><?php echo __('add to cart') ?></a>
-
-
- <?php /** @remarks If buy possible and attribute */ ?>
-
- <?php elseif (_test_bool($ele->action['buy'] )) : ?>
- <?php echo tep_draw_form($themodule->id.'cart_quantity'.$ele->GetId(), tep_href_link(FILENAME_DEFAULT, tep_get_all_get_params(array('action')) . 'action=add_product'), 'post', ' class="addcart"'); ?>
-
- <?php echo tep_draw_hidden_field('products_id', $ele->GetId()). tep_draw_hidden_field('products_quantity', '1'); ?>
- <input type="button" class="btn btn-default" title="<?php echo __('add to cart') ?>" value="<?php echo __('add to cart') ?>"/>
-
- </form>
- <?php endif; ?>
- <?php } ?>
-
-
- <a class="btn btn-default details product" href="<?php echo $ele->GetHref() ?>" title="<?php echo __('view more') ?>"><?php echo __('view more') ?></a>
- </div>
- </div>
- </div>
+ <?php echo tep_get_include_contents('module.'.$ele->data ); ?>
</section>
-
-
-
<?php else : /** Other */ ?>
+
<section class="col-sm-3 col-xs-6 outerblock">
- <div class="innerblock">
- <p class="title <?php echo $ele->data ?>">
- <a href="<?php echo $ele->GetHref() ; ?>" ><?php echo $ele->GetTitle() ?></a>
- </p>
- <p class="img-thumbnail <?php echo $ele->data ?>">
- <?php echo '<a href="' . $ele->GetHref(). '">' . tep_image(DIR_WS_IMAGES . $ele->GetImage(), $ele->GetTitle(), $page->_conf_value('SIDEBAR_IMG_WIDTH'), $page->_conf_value('SIDEBAR_IMAGE_HEIGHT')) . '</a>' ;?>
- </p>
- <p class="preview <?php echo $ele->data ?>">
- <?php echo truncate(strip_tags(unhtmlentities( $ele->GetText() )), 100) ?>
- </p>
- </div>
+ <?php echo tep_get_include_contents('module.other'); ?>
</section>
+
<?php endif; ?>
</div>
<?php $i++; endforeach; ?>
- </div> <!--Last Div for loop and class row -->
Added: trunk/catalog/templates/defaut/includes/gabarit/module.other.gab
===================================================================
--- trunk/catalog/templates/defaut/includes/gabarit/module.other.gab (rev 0)
+++ trunk/catalog/templates/defaut/includes/gabarit/module.other.gab 2016-03-31 09:06:13 UTC (rev 5310)
@@ -0,0 +1,29 @@
+<?php
+/**
+ @licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.2.0
+ @date 05/10/2013, 14:32
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+global $page, $ele;
+
+?>
+<div class="innerblock">
+
+ <p class="title <?php echo $ele->data ?>">
+ <a href="<?php echo $ele->GetHref() ; ?>" ><?php echo $ele->GetTitle() ?></a>
+ </p>
+
+ <p class="img-thumbnail <?php echo $ele->data ?>">
+ <?php echo '<a href="' . $ele->GetHref(). '">' . tep_image(DIR_WS_IMAGES . $ele->GetImage(), $ele->GetTitle(), $page->_conf_value('SIDEBAR_IMG_WIDTH'), $page->_conf_value('SIDEBAR_IMAGE_HEIGHT')) . '</a>' ;?>
+ </p>
+
+ <p class="preview <?php echo $ele->data ?>">
+ <?php echo truncate(strip_tags(unhtmlentities( $ele->GetText() )), 100) ?>
+ </p>
+
+</div>
\ No newline at end of file
Added: trunk/catalog/templates/defaut/includes/gabarit/module.product.gab
===================================================================
--- trunk/catalog/templates/defaut/includes/gabarit/module.product.gab (rev 0)
+++ trunk/catalog/templates/defaut/includes/gabarit/module.product.gab 2016-03-31 09:06:13 UTC (rev 5310)
@@ -0,0 +1,63 @@
+<?php
+/**
+ @licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.2.0
+ @date 05/10/2013, 14:32
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+global $page, $ele;
+
+?>
+ <div class="innerblock">
+ <?php if (tep_not_null( $ele->GetPrice() ) && $page->_draw_in_page('PRODUCT_LIST_PRICE')) { ?>
+ <p class="price product">
+ <?php echo print_products_price_rv($ele) ?>
+ </p>
+ <?php } ?>
+
+ <?php if ($page->_draw_in_page('PRODUCT_LIST_NAME')) { ?>
+ <p class="title product">
+ <?php echo '<a href="' . $ele->GetHref() . '" title="'.$ele->GetName().'">' . $ele->GetName() . '</a>' ;?>
+ </p>
+ <?php } ?>
+
+ <?php if ($page->_draw_in_page('PRODUCT_LIST_IMAGE')) { ?>
+ <p class="img-thumbnail product">
+ <?php echo '<a href="' . $ele->GetHref() . '" title="'.$ele->GetTitle().'" >' . tep_image(DIR_WS_IMAGES . $ele->GetImage(), $ele->GetTitle(), $page->_conf_value('SMALL_IMAGE_WIDTH'), $page->_conf_value('SMALL_IMAGE_HEIGHT')) . '</a>' ; ?>
+ </p>
+ <?php } ?>
+
+
+
+ <div class="hidden-xs innerblock-more">
+ <div class="btn-group" >
+ <?php if ( $page->_draw_in_page('PRODUCT_LIST_BUY_NOW')) { ?>
+
+ <?php /// @remarks If buy possible and attribute , force choose attribute ?>
+
+ <?php if (_test_bool($ele->action['buy'] ) && count(product_attribut_info($ele->GetId())) != 0): ?>
+
+ <a class="btn btn-default" href="<?php echo $ele->GetHref() ?>" ><?php echo __('add to cart') ?></a>
+
+
+ <?php /// @remarks If buy possible and attribute ?>
+
+ <?php elseif (_test_bool($ele->action['buy'] )) : ?>
+ <?php echo tep_draw_form($themodule->id.'cart_quantity'.$ele->GetId(), tep_href_link(FILENAME_DEFAULT, tep_get_all_get_params(array('action')) . 'action=add_product'), 'post', ' class="addcart"'); ?>
+
+ <?php echo tep_draw_hidden_field('products_id', $ele->GetId()). tep_draw_hidden_field('products_quantity', '1'); ?>
+ <input type="button" class="btn btn-default" title="<?php echo __('add to cart') ?>" value="<?php echo __('add to cart') ?>"/>
+
+ </form>
+ <?php endif; ?>
+ <?php } ?>
+
+
+ <a class="btn btn-default details product" href="<?php echo $ele->GetHref() ?>" title="<?php echo __('view more') ?>"><?php echo __('view more') ?></a>
+ </div>
+ </div>
+ </div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2016-03-23 14:33:42
|
Revision: 5309
http://sourceforge.net/p/oscss/svn/5309
Author: homer8173
Date: 2016-03-23 14:33:40 +0000 (Wed, 23 Mar 2016)
Log Message:
-----------
Backoffice new: responsive BO
Modified Paths:
--------------
trunk/catalog/admin/includes/template/oscss/css/less/header.less
Modified: trunk/catalog/admin/includes/template/oscss/css/less/header.less
===================================================================
--- trunk/catalog/admin/includes/template/oscss/css/less/header.less 2016-03-23 14:07:44 UTC (rev 5308)
+++ trunk/catalog/admin/includes/template/oscss/css/less/header.less 2016-03-23 14:33:40 UTC (rev 5309)
@@ -340,6 +340,7 @@
+
/* Responsive version */
@media all and (max-width: 960px){
div.fleft, div.fright{
@@ -349,10 +350,11 @@
min-width:100% !important;
}
header#header{
- width:100px;
+ width:70px;
}
nav ul.menu_left > li > a {
text-shadow: none;
+ padding: 0 0 0 5px;
&:hover {
text-shadow: none;
color: transparent;
@@ -361,12 +363,16 @@
display: none;
}
}
- #headInfos h1 img {
- max-width: 90%;
- height: auto;
+ #headInfos{
+ font-size:8px;
+ h2 { display: none !important;}
+ h1 img {
+ max-width: 90%;
+ height: auto;
+ }
}
div#glob {
- padding-left: 100px!important;
+ padding-left: 70px!important;
}
.dataTable {
max-width: 100% !important;
@@ -381,7 +387,7 @@
}
div#bas {
- padding-left: 100px !important;
+ padding-left: 70px !important;
font-size: 0;
overflow: hidden;
a {
@@ -391,6 +397,6 @@
}
footer {
- padding-left: 100px!important;
+ padding-left: 70px!important;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2016-03-23 14:07:46
|
Revision: 5308
http://sourceforge.net/p/oscss/svn/5308
Author: homer8173
Date: 2016-03-23 14:07:44 +0000 (Wed, 23 Mar 2016)
Log Message:
-----------
Backoffice new: responsive BO
Modified Paths:
--------------
trunk/catalog/admin/includes/template/oscss/css/less/header.less
trunk/catalog/admin/includes/template/oscss/gabarit-1.php
Modified: trunk/catalog/admin/includes/template/oscss/css/less/header.less
===================================================================
--- trunk/catalog/admin/includes/template/oscss/css/less/header.less 2016-03-22 17:02:19 UTC (rev 5307)
+++ trunk/catalog/admin/includes/template/oscss/css/less/header.less 2016-03-23 14:07:44 UTC (rev 5308)
@@ -335,3 +335,62 @@
/* Specifique menu */
+
+
+
+
+
+/* Responsive version */
+@media all and (max-width: 960px){
+ div.fleft, div.fright{
+ width:100% !important;
+ }
+ div#center {
+ min-width:100% !important;
+ }
+ header#header{
+ width:100px;
+ }
+ nav ul.menu_left > li > a {
+ text-shadow: none;
+ &:hover {
+ text-shadow: none;
+ color: transparent;
+ }
+ &:after {
+ display: none;
+ }
+ }
+ #headInfos h1 img {
+ max-width: 90%;
+ height: auto;
+ }
+ div#glob {
+ padding-left: 100px!important;
+ }
+ .dataTable {
+ max-width: 100% !important;
+ }
+ ul.menu_top {
+ height: 25px;
+ }
+ ul.menu_top > li > a,
+ ul.menu_top > li div.bookmarks {
+ height: 25px;
+ line-height: 25px;
+ }
+
+ div#bas {
+ padding-left: 100px !important;
+ font-size: 0;
+ overflow: hidden;
+ a {
+ padding: 2px 0 0 10px !important;
+ font-size: 11px;
+ }
+ }
+
+ footer {
+ padding-left: 100px!important;
+ }
+}
Modified: trunk/catalog/admin/includes/template/oscss/gabarit-1.php
===================================================================
--- trunk/catalog/admin/includes/template/oscss/gabarit-1.php 2016-03-22 17:02:19 UTC (rev 5307)
+++ trunk/catalog/admin/includes/template/oscss/gabarit-1.php 2016-03-23 14:07:44 UTC (rev 5308)
@@ -22,6 +22,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>" />
<title><?php echo $page_admin . ' | ' . TITLE; ?></title>
<base href="<?php echo tep_get_http() . DIR_WS_ADMIN ?>" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<?php if (OSCSS_DEBUG == true): ?>
<script type="text/javascript">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2016-03-22 17:02:21
|
Revision: 5307
http://sourceforge.net/p/oscss/svn/5307
Author: oscim
Date: 2016-03-22 17:02:19 +0000 (Tue, 22 Mar 2016)
Log Message:
-----------
Modified Paths:
--------------
trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/footer.php
trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/languages/fr_FR.txt
Added Paths:
-----------
trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/pages/password_forgotten.gab
Modified: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/footer.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/footer.php 2016-03-22 16:34:50 UTC (rev 5306)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/footer.php 2016-03-22 17:02:19 UTC (rev 5307)
@@ -1,14 +1,15 @@
<?php
/**
- @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template Modern Responsive web design
@package osCSS-2 <www http://www.oscss.org>
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @author NP <mail no...@os...> <www http://www.oscss-shop.fr>
@encode UTF-8
- @note La Licence OpenSource d'osCSS, vous impose de conserver le liens vers le site de la communauté. C'est la seul contrepartie imposé part l'utilisation de cette solution , qui est diffusé gratuitement, dans le cadre de ca licence.
- Si vous supprimer la référence à osCSS, la commuanté se reserve le droit de faire valoir ces droits aupres des organisme dedié à la protection de cette licence.
+ @note La Licence OpenSource d'osCSS, vous impose de conserver le liens vers le site de la communauté. C'est la seul contrepartie imposé part l'utilisation de cette solution , qui est diffusé gratuitement, dans le cadre de sa licence.
+ Si vous supprimer la référence à osCSS, la commuanté se reserve le droit de faire valoir ces droits aupres des organismes dediés à la protection de cette licence.
- CE template est livré gratuitement pour donner un aperçu des disponibilités du moteur de templates.
+ Ce template est livré gratuitement pour donner un aperçu des possibilités du moteur de templates.
Veuillez respecter les termes et conditions générales d'utilisation.
Vous pouvez employer nos templates sous n'importe quel site Web publiquement accessible selon les termes et conditions générales du contrat Creative Commons
*/
@@ -16,45 +17,107 @@
?>
</main>
+<div id="push"></div>
+<footer class="footer_white">
+ <div><i class="sprite-row"></i></div>
+ <div class="container haut">
+ <div class="row">
+ <div class="col-sm-3">
+ <h3><span class="sprite-negoce rotator"></span><?= __('negociant en prix footer') ?></h3>
+ <p class="text-muted justified"><?= __('negociant en prix details footer') ?></p>
+ </div>
+ <div class="col-sm-3">
+ <h3><span class="sprite-about rotator"></span><?= __('a propos footer') ?></h3>
+ <p class="text-muted justified"><?= __('a propos details footer') ?></p>
- <footer class="container" role="contentinfo">
- <div class="left_footer">
- </div>
- <div class="center_footer">
- ~ Réalisation <a href="http://www.oscim.fr">oscim</a> 2010-<?php echo date('Y') ?> ~<br />
- ~ <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @twbootstrap</a> ~<br />
- ~ Propulsé par <a href="http://www.oscss.org/" title=" osCSS ">osCSS</a> ~<br />
- ~ Valid <a href="http://validator.w3.org/check?uri=referer" title=" validate XHTML ">XHTML</a>
- · <a href="http://jigsaw.w3.org/css-validator/check/referer" title=" validate CSS ">CSS</a> ~
- </div>
- <div class="right_footer">
- <a href="<?php echo tep_href_link() ?>"><?php echo __('home') ?></a>
- <a href="<?php echo tep_href_link(FILENAME_TEMPLATE) ?>"><?php echo __('about') ?></a>
- <a href="<?php echo tep_href_link(FILENAME_SITEMAP) ?>"><?php echo __('sitemap') ?></a>
- <a href="<?php echo tep_href_link('rss.php') ?>"><?php echo __('rss') ?></a>
- <a href="<?php echo tep_href_link(FILENAME_CONTACT_US) ?>"><?php echo __('contact us') ?></a>
- </div>
-
- <?php $box_left=$page->oscss_boxes->_call('','hidden');
- while($box=each($box_left)) : $boxe =$page->oscss_boxes->_return($box['key']);
- if (!$page->is_page_here($boxe->name_clean)) : ?>
- <div id="<?php echo $boxe->name_clean; ?>Box" class="<?php echo $boxe->name_clean; ?>">
- <?php include('boxe.php'); ?>
- </div>
- <?php endif; endwhile; ?>
-
- <?php /** Retour d'erreur sur la boutique */ $this->messageStack->_draw('error'); ?>
-
- </footer>
-
-<!-- ================================================== -->
+ </div>
+ <div class="col-sm-3">
+ <h3><span class="sprite-contact rotator"></span><?= __('Nous contacter footer') ?></h3>
+ <address class="vcard">
+ <h4 class="name">osCSS-Shop</h4>
+ <div>
+ <i class="sprite-address"></i>
+ <a class="adr" target="_blank" href="https://www.google.fr/maps/place/5 impasse de la cerisaie,+28240+La Loupe">
+ <span class="street-address">5 Impasse de la cerisaie</span>
+ <span class="postal-code">28240</span><br />
+ <span class="locality">La Loupe</span>,
+ <span class="country-name">France</span>
+ </a>
+ </div>
+ <div class="tel"><i class="sprite-tel"></i><a href="tel:+33458005391">+33 (0)4 58 00 53 91</a></div>
+ <div class="email"><i class="sprite-email"></i><a href="mailto:su...@os...">su...@os...</a></div>
+ </address>
+ </div>
+ <div class="col-sm-3">
+ <h3><span class="sprite-follow rotator"></span><?= __('Nous suivre footer') ?></h3>
+ <i class="sprite-facebook rotator"></i><a target="_blank" href="https://www.facebook.com/oscss.org">Facebook</a><br />
+ <i class="sprite-tweeter rotator"></i><a target="_blank" href="https://twitter.com/osCSS">Tweeter</a><br />
+ <i class="sprite-pinterest rotator"></i><a target="_blank" href="http://forums.oscss.org/forum.html"><?= __('Forum footer') ?></a><br />
+ <i class="sprite-googlep rotator"></i><a target="_blank" href="https://plus.google.com/107698144587463763937/posts">Google +</a><br />
+ </div>
+ </div>
+ </div>
+ </footer>
+ <footer class="footer_blue">
+ <div class="container milieu">
+ <div class="row">
+ <div class="col-sm-3">
+ <h3><span class="sprite-info rotator"></span>Informations</h3>
+ <div class="footer_box">
+ <?php $boxe =$page->oscss_boxes->_return('information');
+ echo unhtmlentities($boxe->content) ?>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <h3><span class="sprite-client rotator"></span>Service client</h3>
+ <div class="footer_box">
+ <p><a href="<?php echo tep_href_link(FILENAME_CONTACT_US) ?>"><?php echo __('contact us') ?></a></p>
+ <p><a href="/">Retours</a></p>
+ <p><a href="/">Livreurs</a></p>
+ <p><a href="<?php echo tep_href_link(FILENAME_SITEMAP) ?>"><?php echo __('sitemap') ?></a></p>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <h3><span class="sprite-extra rotator"></span>Bonus</h3>
+ <div class="footer_box">
+ <p><a href="/">Nos marques</a></p>
+ <p><a href="/">Bon cadeaux</a></p>
+ <p><a href="<?php echo tep_href_link(FILENAME_DEFAULT, 'featured=2') ?>">Offres du moment</a></p>
+ <p><a href="<?php echo tep_href_link('rss.php') ?>"><?php echo __('rss') ?></a></p>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <h3><span class="sprite-account rotator"></span>Mon compte</h3>
+ <div class="footer_box">
+<!--
+ <p><a href="/">Liste de voeux</a></p>
+ -->
+ <?php $boxe =$page->oscss_boxes->_return('myaccount2');
+ echo unhtmlentities($boxe->content) ?>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div><i class="sprite-row"></i></div>
+ <div class="container bas">
+ <p class="text-center"><i class="sprite-cb"></i></p>
+ <p class="text-muted text-center">~ Design <a target="_blank" href="http://www.oscss.biz"><b>osCSS-Shop</b></a> - ©<?php echo date('Y') ?>
+ ~ Based on <a target="_blank" href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true"><b>@twbootstrap</b></a>
+ ~ Propulsé par <a target="_blank" href="http://www.oscss.org/" title=" osCSS "><b>osCSS-2</b></a> ~</p>
+ </div>
+ </footer>
<!-- Placed at the end of the document so the pages load faster -->
- <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
- <script src="<?php echo 'templates/'.$template.'/'; ?>js/bootstrap.min.js"></script>
+ <script src="<?php echo 'templates/'.$template.'/js/'; ?>bootstrap.min.js"></script>
- <script type="text/javascript">
- $(".alert").alert()
- </script>
+ <script>
+ $('#nav').affix({ // used to make a magic menu
+ offset: {
+ top: $('header').height()-80
+ }
+ });
+
+ $(".alert").alert()
+ </script>
-
+ <div id="hover_zone"></div>
<?php /** Fichier appel bottom page */ $this->draw_file_footer(); ?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/pages/password_forgotten.gab
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/pages/password_forgotten.gab (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/pages/password_forgotten.gab 2016-03-22 17:02:19 UTC (rev 5307)
@@ -0,0 +1,46 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.2
+ @date 18/12/2013, 08:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $SectionTplPC, $email_address;
+?>
+
+<div id="passwordForgotten">
+ <div class="infoText"><?php echo __('text main password forgotten'); ?></div>
+
+ <?php echo tep_draw_form('password_forgotten', tep_href_link(FILENAME_PASSWORD_FORGOTTEN, 'action=process', 'SSL')); ?>
+
+ <fieldset class="logoff">
+
+ <div class="form-group">
+ <label for="email_address" class="col-sm-3 control-label"><?php echo __('entry email address'); ?></label>
+ <div class="col-sm-9">
+ <div class="form-group">
+ <div class="input-group">
+ <?php echo tep_draw_input_field('email_address','email_address', (isset($email_address)? $email_address: ''), ' class="form-control" placeholder="Email" ' ,true); ?>
+ </div>
+ </div>
+
+
+ </div>
+ </div>
+
+
+ <div class="btn-group">
+ <div class="col-sm-offset-2 col-sm-10">
+ <input type="submit" class="btn btn-default" value="<?php echo __('image button continue'); ?>" />
+
+ <a class="btn btn-default" href="<?php echo tep_href_link(FILENAME_LOGIN, '', 'SSL') ?>"><?php echo __('image button back') ?></a>
+ </div>
+ </div>
+
+ </fieldset>
+
+ </form>
+
+</div>
Modified: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/languages/fr_FR.txt
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/languages/fr_FR.txt 2016-03-22 16:34:50 UTC (rev 5306)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/languages/fr_FR.txt 2016-03-22 17:02:19 UTC (rev 5307)
@@ -21,9 +21,9 @@
$lang['link text login'] = "Connexion";
$lang['my account page'] = "Espace utilisateur";
$lang['link category'] = "Catégories";
+ $lang['entry keywords'] = "Recherche";
$lang[''] = "";
$lang[''] = "";
$lang[''] = "";
- $lang[''] = "";
?>
\ 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...> - 2016-03-22 16:34:53
|
Revision: 5306
http://sourceforge.net/p/oscss/svn/5306
Author: oscim
Date: 2016-03-22 16:34:50 +0000 (Tue, 22 Mar 2016)
Log Message:
-----------
Add sample in featured
Fix link to footer
add featured in install base
Modified Paths:
--------------
trunk/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql
trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/footer.php
trunk/catalog/install/includes/sql/mysql/data/40_osc_featured.sql
trunk/catalog/install/includes/sql/mysql/data/40_osc_featured_description.sql
Modified: trunk/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql
===================================================================
--- trunk/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql 2016-03-22 12:55:09 UTC (rev 5305)
+++ trunk/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql 2016-03-22 16:34:50 UTC (rev 5306)
@@ -211,11 +211,11 @@
--- INSERT IGNORE INTO osc_linkto (row_id, featured_id, datatype, datatype_id, date_added, user_added, date_update, user_update, date_start, date_end) VALUES
--- (2, 1, 'product', 11, '2012-07-04 08:37:58', 1, '0000-00-00 00:00:00', 0, '1000-01-01 00:00:00', '1000-01-01 00:00:00'),
--- (3, 1, 'product', 12, '2012-07-04 08:38:07', 1, '0000-00-00 00:00:00', 0, '1000-01-01 00:00:00', '1000-01-01 00:00:00');
+INSERT INTO osc_linkto (row_id, datatype_parent, datatype_parent_id, datatype_child, datatype_child_id, date_added, user_added, date_update, user_update) VALUES
+(1, 'featured', 2, 'product', 11, '2016-03-22 16:27:05', 1, '0000-00-00 00:00:00', 0);
+INSERT INTO osc_linkto (row_id, datatype_parent, datatype_parent_id, datatype_child, datatype_child_id, date_added, user_added, date_update, user_update) VALUES
+(2, 'featured', 2, 'product', 12, '2016-03-22 16:27:05', 1, '0000-00-00 00:00:00', 0);
-
INSERT IGNORE INTO osc_images ( pathkey, path, file, date_added, last_modified, width, height, ext) VALUES
( '692b75fc6312e428109e1f9312cfa007', 'images/sony.png', 'sony.png', '2012-12-26 23:40:29', '0000-00-00 00:00:00', 300, 191, 'png'),
( 'cba0825cec275d062a22572011c55c48', 'images/D40x.jpg', 'D40x.jpg', '2012-12-26 23:40:29', '0000-00-00 00:00:00', 841, 650, 'jpeg'),
Modified: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/footer.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/footer.php 2016-03-22 12:55:09 UTC (rev 5305)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/footer.php 2016-03-22 16:34:50 UTC (rev 5306)
@@ -1,15 +1,14 @@
<?php
/**
- @licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
- @subpackage Template Modern Responsive web design
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
@package osCSS-2 <www http://www.oscss.org>
- @author NP <mail no...@os...> <www http://www.oscss-shop.fr>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
- @note La Licence OpenSource d'osCSS, vous impose de conserver le liens vers le site de la communauté. C'est la seul contrepartie imposé part l'utilisation de cette solution , qui est diffusé gratuitement, dans le cadre de sa licence.
- Si vous supprimer la référence à osCSS, la commuanté se reserve le droit de faire valoir ces droits aupres des organismes dediés à la protection de cette licence.
+ @note La Licence OpenSource d'osCSS, vous impose de conserver le liens vers le site de la communauté. C'est la seul contrepartie imposé part l'utilisation de cette solution , qui est diffusé gratuitement, dans le cadre de ca licence.
+ Si vous supprimer la référence à osCSS, la commuanté se reserve le droit de faire valoir ces droits aupres des organisme dedié à la protection de cette licence.
- Ce template est livré gratuitement pour donner un aperçu des possibilités du moteur de templates.
+ CE template est livré gratuitement pour donner un aperçu des disponibilités du moteur de templates.
Veuillez respecter les termes et conditions générales d'utilisation.
Vous pouvez employer nos templates sous n'importe quel site Web publiquement accessible selon les termes et conditions générales du contrat Creative Commons
*/
@@ -17,107 +16,45 @@
?>
</main>
-<div id="push"></div>
-<footer class="footer_white">
- <div><i class="sprite-row"></i></div>
- <div class="container haut">
- <div class="row">
- <div class="col-sm-3">
- <h3><span class="sprite-negoce rotator"></span><?= __('negociant en prix footer') ?></h3>
- <p class="text-muted justified"><?= __('negociant en prix details footer') ?></p>
- </div>
- <div class="col-sm-3">
- <h3><span class="sprite-about rotator"></span><?= __('a propos footer') ?></h3>
- <p class="text-muted justified"><?= __('a propos details footer') ?></p>
- </div>
- <div class="col-sm-3">
- <h3><span class="sprite-contact rotator"></span><?= __('Nous contacter footer') ?></h3>
- <address class="vcard">
- <h4 class="name">osCSS-Shop</h4>
- <div>
- <i class="sprite-address"></i>
- <a class="adr" target="_blank" href="https://www.google.fr/maps/place/5 impasse de la cerisaie,+28240+La Loupe">
- <span class="street-address">5 Impasse de la cerisaie</span>
- <span class="postal-code">28240</span><br />
- <span class="locality">La Loupe</span>,
- <span class="country-name">France</span>
- </a>
- </div>
- <div class="tel"><i class="sprite-tel"></i><a href="tel:+33458005391">+33 (0)4 58 00 53 91</a></div>
- <div class="email"><i class="sprite-email"></i><a href="mailto:su...@os...">su...@os...</a></div>
- </address>
- </div>
- <div class="col-sm-3">
- <h3><span class="sprite-follow rotator"></span><?= __('Nous suivre footer') ?></h3>
- <i class="sprite-facebook rotator"></i><a target="_blank" href="https://www.facebook.com/oscss.org">Facebook</a><br />
- <i class="sprite-tweeter rotator"></i><a target="_blank" href="https://twitter.com/osCSS">Tweeter</a><br />
- <i class="sprite-pinterest rotator"></i><a target="_blank" href="http://forums.oscss.org/forum.html"><?= __('Forum footer') ?></a><br />
- <i class="sprite-googlep rotator"></i><a target="_blank" href="https://plus.google.com/107698144587463763937/posts">Google +</a><br />
- </div>
- </div>
- </div>
- </footer>
- <footer class="footer_blue">
- <div class="container milieu">
- <div class="row">
- <div class="col-sm-3">
- <h3><span class="sprite-info rotator"></span>Informations</h3>
- <div class="footer_box">
- <?php $boxe =$page->oscss_boxes->_return('information');
- echo unhtmlentities($boxe->content) ?>
- </div>
- </div>
- <div class="col-sm-3">
- <h3><span class="sprite-client rotator"></span>Service client</h3>
- <div class="footer_box">
- <p><a href="<?php echo tep_href_link(FILENAME_CONTACT_US) ?>"><?php echo __('contact us') ?></a></p>
- <p><a href="/">Retours</a></p>
- <p><a href="/">Livreurs</a></p>
- <p><a href="<?php echo tep_href_link(FILENAME_SITEMAP) ?>"><?php echo __('sitemap') ?></a></p>
- </div>
- </div>
- <div class="col-sm-3">
- <h3><span class="sprite-extra rotator"></span>Bonus</h3>
- <div class="footer_box">
- <p><a href="/">Nos marques</a></p>
- <p><a href="/">Bon cadeaux</a></p>
- <p><a href="/">Offres du moment</a></p>
- <p><a href="<?php echo tep_href_link('rss.php') ?>"><?php echo __('rss') ?></a></p>
- </div>
- </div>
- <div class="col-sm-3">
- <h3><span class="sprite-account rotator"></span>Mon compte</h3>
- <div class="footer_box">
-<!--
- <p><a href="/">Liste de voeux</a></p>
- -->
- <?php $boxe =$page->oscss_boxes->_return('myaccount2');
- echo unhtmlentities($boxe->content) ?>
- </div>
- </div>
- </div>
- </div>
- <div><i class="sprite-row"></i></div>
- <div class="container bas">
- <p class="text-center"><i class="sprite-cb"></i></p>
- <p class="text-muted text-center">~ Design <a target="_blank" href="http://www.oscss.biz"><b>osCSS-Shop</b></a> - ©<?php echo date('Y') ?>
- ~ Based on <a target="_blank" href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true"><b>@twbootstrap</b></a>
- ~ Propulsé par <a target="_blank" href="http://www.oscss.org/" title=" osCSS "><b>osCSS-2</b></a> ~</p>
- </div>
- </footer>
+ <footer class="container" role="contentinfo">
+ <div class="left_footer">
+ </div>
+ <div class="center_footer">
+ ~ Réalisation <a href="http://www.oscim.fr">oscim</a> 2010-<?php echo date('Y') ?> ~<br />
+ ~ <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @twbootstrap</a> ~<br />
+ ~ Propulsé par <a href="http://www.oscss.org/" title=" osCSS ">osCSS</a> ~<br />
+ ~ Valid <a href="http://validator.w3.org/check?uri=referer" title=" validate XHTML ">XHTML</a>
+ · <a href="http://jigsaw.w3.org/css-validator/check/referer" title=" validate CSS ">CSS</a> ~
+ </div>
+ <div class="right_footer">
+ <a href="<?php echo tep_href_link() ?>"><?php echo __('home') ?></a>
+ <a href="<?php echo tep_href_link(FILENAME_TEMPLATE) ?>"><?php echo __('about') ?></a>
+ <a href="<?php echo tep_href_link(FILENAME_SITEMAP) ?>"><?php echo __('sitemap') ?></a>
+ <a href="<?php echo tep_href_link('rss.php') ?>"><?php echo __('rss') ?></a>
+ <a href="<?php echo tep_href_link(FILENAME_CONTACT_US) ?>"><?php echo __('contact us') ?></a>
+ </div>
+
+ <?php $box_left=$page->oscss_boxes->_call('','hidden');
+ while($box=each($box_left)) : $boxe =$page->oscss_boxes->_return($box['key']);
+ if (!$page->is_page_here($boxe->name_clean)) : ?>
+ <div id="<?php echo $boxe->name_clean; ?>Box" class="<?php echo $boxe->name_clean; ?>">
+ <?php include('boxe.php'); ?>
+ </div>
+ <?php endif; endwhile; ?>
+
+ <?php /** Retour d'erreur sur la boutique */ $this->messageStack->_draw('error'); ?>
+
+ </footer>
+
+<!-- ================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
- <script src="<?php echo 'templates/'.$template.'/js/'; ?>bootstrap.min.js"></script>
+ <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
+ <script src="<?php echo 'templates/'.$template.'/'; ?>js/bootstrap.min.js"></script>
- <script>
- $('#nav').affix({ // used to make a magic menu
- offset: {
- top: $('header').height()-80
- }
- });
-
- $(".alert").alert()
- </script>
+ <script type="text/javascript">
+ $(".alert").alert()
+ </script>
- <div id="hover_zone"></div>
+
<?php /** Fichier appel bottom page */ $this->draw_file_footer(); ?>
\ No newline at end of file
Modified: trunk/catalog/install/includes/sql/mysql/data/40_osc_featured.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/40_osc_featured.sql 2016-03-22 12:55:09 UTC (rev 5305)
+++ trunk/catalog/install/includes/sql/mysql/data/40_osc_featured.sql 2016-03-22 16:34:50 UTC (rev 5306)
@@ -17,3 +17,6 @@
INSERT IGNORE INTO osc_featured (row_id, k_status_type, featured_uniqkey, featured_min, featured_max, featured_status, date_added, user_added, date_update, user_update) VALUES
(1, 1, 'home_slideshow', 1, 10, 1, NOW(), 1, NOW(), 1);
+INSERT IGNORE INTO osc_featured (row_id, k_status_type, featured_uniqkey, featured_min, featured_max, featured_status, date_added, user_added, date_update, user_update) VALUES
+(2, 1, 'offresdumoment', 1, 10, 1, NOW(), 1, NOW(), 1);
+
Modified: trunk/catalog/install/includes/sql/mysql/data/40_osc_featured_description.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/40_osc_featured_description.sql 2016-03-22 12:55:09 UTC (rev 5305)
+++ trunk/catalog/install/includes/sql/mysql/data/40_osc_featured_description.sql 2016-03-22 16:34:50 UTC (rev 5306)
@@ -17,3 +17,5 @@
INSERT IGNORE INTO osc_featured_description (featured_id, languages_id, featured_title) VALUES
(1, 1, 'Diaporama accueil');
+INSERT IGNORE INTO osc_featured_description (featured_id, languages_id, featured_title) VALUES
+(2, 1, 'Offres du moment');
\ 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...> - 2016-03-22 12:55:11
|
Revision: 5305
http://sourceforge.net/p/oscss/svn/5305
Author: oscim
Date: 2016-03-22 12:55:09 +0000 (Tue, 22 Mar 2016)
Log Message:
-----------
Add box for template FO modernRWD
Added Paths:
-----------
trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/boxes/information.php
Added: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/boxes/information.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/boxes/information.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/boxes/information.php 2016-03-22 12:55:09 UTC (rev 5305)
@@ -0,0 +1,50 @@
+<?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.2
+ *\date 04/10/2013, 08:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @group boxes
+ @file includes/boxes/information.php
+*/
+
+ //! @remarks depend Data_content active
+ if( ! DataTypes::is_active('content'))
+ return false;
+
+/**
+ @remarks Process Specific Boxes
+*/
+ global $template,$page;
+ global $list, $type;
+ $type = 'content';
+ $max = 20;
+ $list = array();
+ $language=$page->the_var('language');
+ $language=$page->GetVar('language');
+ $_query=content::get_query('','informationBox_','',array('limit'=>20));
+ if($_query ==false)
+ return false;
+
+ foreach($_query as $objectContent){
+ $list[] = $objectContent;
+ }
+
+
+
+
+/**
+ @remarks Transmit var array for master construtor boxes
+*/
+
+ if( count($list) > 0 )
+ $array= array(
+ 'title'=>BOX_HEADING_INFORMATION,
+ 'content'=>tep_output_string_protected(tep_get_include_contents('box.generic2'),false,true),
+ 'class'=> $type,
+ );
+
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|