Merge branch 'integration' into kraikrit

www/src/Template/Layout/blank.ctp

@@ -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/UserCards/create_cards.ctp

@@ -49,7 +49,7 @@
     var date = document.getElementById("date");
     var date = document.getElementById("date");
     $(document).ready(function() {
     $(document).ready(function() {
         $("#organize_code").on('change',function(){
         $("#organize_code").on('change',function(){
-            var organize_code = document.getElementById("organize_code").value
+            var organize_code = document.getElementById("organize_code").value;
             alert(organize_code);
             alert(organize_code);
             $.post("/UserCards/checkOrg", {organize_code: organize_code}, function(data) {
             $.post("/UserCards/checkOrg", {organize_code: organize_code}, function(data) {
                 if(data!='false'){
                 if(data!='false'){

www/src/Template/UserCards/view_card.ctp

@@ -3,8 +3,7 @@
 		<div class="row">
 		<div class="row">
 		    <div class="col-xs-1 col-sm-1 col-md-1 box-arrow">
 		    <div class="col-xs-1 col-sm-1 col-md-1 box-arrow">
 			    <div>
 			    <div>
-		            <i class = "fa fa-angle-left" >
-		            </i>
+		            <i class = "fa fa-angle-left prev" > </i>
 	        	</div>
 	        	</div>
 		    </div>
 		    </div>
 		    <div class="col-xs-9 col-sm-9 col-md-9 box-card">
 		    <div class="col-xs-9 col-sm-9 col-md-9 box-card">
@@ -57,8 +56,7 @@
 		    </div>
 		    </div>
 		    <div class="col-xs-1 col-sm-1 col-md-1 box-arrow">
 		    <div class="col-xs-1 col-sm-1 col-md-1 box-arrow">
 			    <div>
 			    <div>
-		            <i class = "fa fa-angle-right" >
-		            </i>
+		            <i class = "fa fa-angle-right next" ></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">
@@ -119,6 +117,9 @@
 	border: 1px solid #ccc; 
 	border: 1px solid #ccc; 
 	height: 200px; 
 	height: 200px; 
 	margin-top: 10px;
 	margin-top: 10px;
+	border-radius: 20px;
+	box-shadow: 2px 2px 4px #ccc;
+	margin-bottom: 10px;
 }
 }
 .box-arrow{
 .box-arrow{
         font-size:36px; 
         font-size:36px; 
@@ -126,4 +127,36 @@
         padding-top:20%;
         padding-top:20%;
         cursor: pointer;
         cursor: pointer;
 	}
 	}
+
 </style>
 </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();?>