Merge branch 'integration' into teeradone

www/composer.json

@@ -11,8 +11,10 @@
         "cakephp/migrations": "^1.0",
         "cakephp/migrations": "^1.0",
         "cakephp/plugin-installer": "^1.0",
         "cakephp/plugin-installer": "^1.0",
         "josegonzalez/dotenv": "2.*",
         "josegonzalez/dotenv": "2.*",
+        "league/oauth2-github": "^2.0",
         "maiconpinto/cakephp-adminlte-theme": "^1.0",
         "maiconpinto/cakephp-adminlte-theme": "^1.0",
-        "mobiledetect/mobiledetectlib": "2.*"
+        "mobiledetect/mobiledetectlib": "2.*",
+        "muffin/oauth2": "dev-master"
     },
     },
     "require-dev": {
     "require-dev": {
         "cakephp/bake": "^1.1",
         "cakephp/bake": "^1.1",

www/src/Template/UserCards/view_card.ctp

@@ -177,11 +177,11 @@ use Cake\I18n\Time;
 		<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">
 				<div class="col-md-6">
 				<div class="col-md-6">
-					<div class = "row rotate270 form_1"
+					<div class = "">
 						<div class="owl-carousel owl-theme" data-plugin-options="{'items': 1, 'margin': 10}">
 						<div class="owl-carousel owl-theme" data-plugin-options="{'items': 1, 'margin': 10}">
-							<div>
+							<div class = "row rotate270 form_1">
 								<?php echo $this->Html->image('/img/core/img/card-bg-front@3x.png', array('div' => false, 'class' => 'img-responsive img-rounded','style' => 'position: absolute;')); ?>
 								<?php echo $this->Html->image('/img/core/img/card-bg-front@3x.png', array('div' => false, 'class' => 'img-responsive img-rounded','style' => 'position: absolute;')); ?>
-								<div class="row">
+								<div class="row date-name">
 									<div class="col-xs-1">
 									<div class="col-xs-1">
 									</div>
 									</div>
 									<div class="col-xs-6">
 									<div class="col-xs-6">
@@ -209,7 +209,7 @@ use Cake\I18n\Time;
 										<label style="font-size: 17px">ตำแหน่ง</label> <?php echo $value['position_name'] ?>
 										<label style="font-size: 17px">ตำแหน่ง</label> <?php echo $value['position_name'] ?>
 									</div>
 									</div>
 								</div>
 								</div>
-								<div class="row date-date">
+								<div class="row date-time">
 									<div class="col-xs-1">
 									<div class="col-xs-1">
 									</div>
 									</div>
 									<div class="col-xs-5">
 									<div class="col-xs-5">
@@ -246,6 +246,7 @@ use Cake\I18n\Time;
 				</div>
 				</div>
 		    </div>
 		    </div>
 		</div>
 		</div>
+	</div>
 </div>
 </div>
 
 
 <style>
 <style>
@@ -271,6 +272,22 @@ use Cake\I18n\Time;
     writing-mode: rl-tb;
     writing-mode: rl-tb;
     position: absolute;
     position: absolute;
 }
 }
+
+.form_1 .date-name{
+	width: 150px;
+	margin: 100% 0% 0% 62%;
+}
+
+.form_1 .date-position{
+	width: 150px;
+	margin: 100% 0% 0% 62%;
+}
+
+.form_1 .date-time{
+	width: 150px;
+	margin: 100% 0% 0% 62%;
+}
+
 .form_1 .date-label{
 .form_1 .date-label{
 	width: 150px;
 	width: 150px;
 	margin: 100% 0% 0% 62%;
 	margin: 100% 0% 0% 62%;