Skip to content

smart_core_connect / core-connect

Go to a project
Commit 5d36368d by Wittaya-PIM
Options

Merge branch 'integration' into wittaya

parents 7de2e5d2 eda07603
Showing with 103 additions and 28 deletions
.gitignore
...@@ -3,3 +3,4 @@ www/logs/ ...@@ -3,3 +3,4 @@ www/logs/
www/tmp/ www/tmp/
www/webroot/img/img/demos/shop/products/shop8/product2.jpg www/webroot/img/img/demos/shop/products/shop8/product2.jpg
www/webroot/img/img/demos/ www/webroot/img/img/demos/
www/src/Controller/UsersController.php.bg20180515
www/src/Template/Layout/blank.ctp
...@@ -99,6 +99,6 @@ ...@@ -99,6 +99,6 @@
<?php echo $this->Html->script('custom'); ?> <?php echo $this->Html->script('custom'); ?>
<!-- Theme Initialization Files --> <!-- Theme Initialization Files -->
<?php echo $this->Html->script('theme.init'); ?> <?php echo $this->Html->script('theme.init'); ?>
<?php echo $this->fetch('scriptBottom'); ?>
</body> </body>
</html> </html>
www/src/Template/Profiles/index.ctp
...@@ -29,20 +29,15 @@ public function generate(){ ...@@ -29,20 +29,15 @@ public function generate(){
?> ?>
<div class="row"> <div class="row">
<div class="col-xs-1 col-sm-1 col-md-1" style="font-size:36px; height: 200px; padding-top:20%;" > <div class="col-xs-1 col-sm-1 col-md-1 box-arrow" ></div>
</div>
<div class="col-xs-10 col-sm-10 col-md-10"> <div class="col-xs-10 col-sm-10 col-md-10">
<div data-toggle="modal" data-target="#defaultModal" style="text-align: center;"> <div data-toggle="modal" data-target="#defaultModal" style="text-align: center; cursor: pointer;">
<img src="/img/core/img/card-bg-front@3x-V2.png" class="img-responsive" id="img-upload" alt="Profile picture"> <img src="/img/core/img/card-bg-front@3x-V2.png" class="img-responsive" id="img-upload" alt="Profile picture">
</div> </div>
</div> </div>
<div class="col-xs-1 col-sm-1 col-md-1" style="font-size:36px; height: 200px; padding-top:20%;" > <div class="col-xs-1 col-sm-1 col-md-1 box-arrow" >
<div > <i class = "fa fa-angle-right"></i>
<i class = "fa fa-angle-right">
</i>
</div>
</div> </div>
<div style="clear: both"></div> <div style="clear: both"></div>
</div><!--/row--> </div><!--/row-->
...@@ -177,9 +172,9 @@ public function generate(){ ...@@ -177,9 +172,9 @@ public function generate(){
<div class="row"> <div class="row">
<div class="col-xs-12 col-sm-12 col-md-12"> <div class="col-xs-12 col-sm-12 col-md-12">
<div class="modal fade" id="defaultModal" tabindex="-1" role="dialog" aria-labelledby="defaultModalLabel" aria-hidden="true"> <div class="modal fade" id="defaultModal" tabindex="-1" role="dialog" aria-labelledby="defaultModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog box-ads">
<div class=""> <a class="close-modal" data-dismiss="modal">X </a>
<div class="">
<div class="container login-container"> <div class="container login-container">
<div class="owl-carousel owl-theme" data-plugin-options="{'items': 1}"> <div class="owl-carousel owl-theme" data-plugin-options="{'items': 1}">
<div> <div>
...@@ -199,9 +194,7 @@ public function generate(){ ...@@ -199,9 +194,7 @@ public function generate(){
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -268,7 +261,7 @@ public function generate(){ ...@@ -268,7 +261,7 @@ public function generate(){
// CHANGE Province According Country // CHANGE Province According Country
//================================================== //==================================================
$(document).ready(function () { $(document).ready(function () {
$("#master_country_id").on('change', function () { $("#master_country_id").on('change', function () {
var id = $(this).val(); var id = $(this).val();
if (id) { if (id) {
...@@ -286,4 +279,39 @@ public function generate(){ ...@@ -286,4 +279,39 @@ public function generate(){
}); });
}); });
</script> </script>
\ No newline at end of file <style>
.box-arrow{
font-size:36px;
height: 200px;
padding-top:20%;
cursor: pointer;
}
.box-ads{
width: 1%;
display: table;
margin: auto;
position: relative;
padding-top: 10px;
margin-top: 5px;
}
.box-ads .close-modal{
position:absolute;
top:0;
right: 0;
width: 40px;
height: 40px;
background-color: #000;
color: #fff;
cursor: pointer;
font-size: 20px;
border-radius: 20px;
padding-top: 10px;
margin-right: 10px;
text-align: center;
z-index: 9999;
}
.box-ads .close-modal:hover{
text-decoration: none;
}
</style>
\ No newline at end of file
www/src/Template/UserCards/view_card.ctp
<div class="owl-carousel owl-theme" data-plugin-options="{'items': 1}"> <div class="owl-carousel owl-theme" data-plugin-options="{'items': 1}">
<?php foreach ($UserCards as $value) { #pr($value);die;?> <?php foreach ($UserCards as $value) { #pr($value);die;?>
<div class="row"> <div class="row">
<div class="col-xs-1 col-sm-1 col-md-1" style="font-size:36px; height: 200px; padding-top:20%;"> <div class="col-xs-1 col-sm-1 col-md-1 box-arrow">
<div> <div>
<i class = "fa fa-angle-left" > <i class = "fa fa-angle-left prev" > </i>
</i>
</div> </div>
</div> </div>
<div class="col-xs-9 col-sm-9 col-md-9" style=" border: 1px solid red; height: 200px; margin-top: 10px;"> <div class="col-xs-9 col-sm-9 col-md-9 box-card">
<div class="row"> <div class="row">
<div class="col-xs-1"> <div class="col-xs-1">
</div> </div>
...@@ -55,10 +54,9 @@ ...@@ -55,10 +54,9 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-xs-1 col-sm-1 col-md-1" style="font-size:36px; height: 200px; padding-top:20%;"> <div class="col-xs-1 col-sm-1 col-md-1 box-arrow">
<div> <div>
<i class = "fa fa-angle-right" > <i class = "fa fa-angle-right next" ></i>
</i>
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-12 col-md-12"> <div class="col-xs-12 col-sm-12 col-md-12">
...@@ -112,4 +110,53 @@ ...@@ -112,4 +110,53 @@
</div> </div>
</div> </div>
<?php } ?> <?php } ?>
</div> </div>
\ No newline at end of file
<style>
.box-card{
border: 1px solid #ccc;
height: 200px;
margin-top: 10px;
border-radius: 20px;
box-shadow: 2px 2px 4px #ccc;
margin-bottom: 10px;
}
.box-arrow{
font-size:36px;
height: 200px;
padding-top:20%;
cursor: pointer;
}
</style>
<?php $this->append('scriptBottom'); ?>
<script type="text/javascript">
$('.owl-carousel').owlCarousel({
loop:false,
items:1,
rewindNav : false,
onTranslated:callBack
});
owl = $('.owl-carousel').owlCarousel();
$(".prev").click(function () {
owl.trigger('prev.owl.carousel');
});
$(".next").click(function () {
owl.trigger('next.owl.carousel');
});
function callBack(){
if($('.owl-carousel .owl-item').last().hasClass('active')){
$('.next').hide();
$('.prev').show();
}else if($('.owl-carousel .owl-item').first().hasClass('active')){
$('.prev').hide();
$('.next').show();
}
}
//$('.prev').hide();
</script>
<?php $this->end();?>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment