Menu
▾
▴
[Oscss-commit] SF.net SVN: oscss:[5306] trunk/catalog/install
|
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.
|
