diff --git a/src/jdbc.properties b/src/jdbc.properties index 9314c2dd98fa7e820fb3e7de66119d5edfa76064..a2bb72ec91697819fe3891f07a700674c3b450a3 100644 --- a/src/jdbc.properties +++ b/src/jdbc.properties @@ -1,4 +1,4 @@ url=jdbc:mysql://localhost:3306/eportfolio_database?useUnicode=true&characterEncoding=utf-8&useSSL=false user=root -password=root +password=1234 driver=com.mysql.jdbc.Driver \ No newline at end of file diff --git a/web/css/admin.css b/web/css/admin.css index bdd997e1390895daa37a09f123f6ce25f91d694a..a229a387a393b68e0b68e34d0f0d3c6d10d15f01 100644 --- a/web/css/admin.css +++ b/web/css/admin.css @@ -1770,7 +1770,7 @@ td i{ color:#999; } td span{ - color:#fff; + color:#000000; font-size: 0.8em; padding: 4px 7px; font-family: 'Muli-Regular'; diff --git a/web/js/Project/load_project_according_tag.js b/web/js/Project/load_project_according_tag.js index 4f5798e8039a48190a2ab0a51e47089175e5e051..c745a1f7705dbcc9cb78008552ef8fb427e2a95e 100644 --- a/web/js/Project/load_project_according_tag.js +++ b/web/js/Project/load_project_according_tag.js @@ -15,7 +15,7 @@ $.extend({ 'getUrlParam' : function(){ var query = window.location.href; console.log(query); - var tag = query.split('='); + var tag = query.split('keywords='); return tag[1]; } }); diff --git a/web/webpage/admin-related/admin-account.html b/web/webpage/admin-related/admin-account.html index 707f07793989264824e6c021a51b0f4c9e7110bc..d7a54e23b04f843b213b9edec60614265cf53272 100644 --- a/web/webpage/admin-related/admin-account.html +++ b/web/webpage/admin-related/admin-account.html @@ -15,10 +15,12 @@ <!-- Custom and plugin javascript --> <link href="../../css/custom.css" rel="stylesheet"> - <!--<script src="../../js/custom.js"></script>--> - <!--<script src="../../js/jquery.metisMenu.js"></script>--> + <link href="/datepicker/dist/css/bootstrap-datepicker3.min.css" rel="stylesheet"> + <!--<!–<script src="../../js/custom.js"></script>–>--> + <!--<!–<script src="../../js/jquery.metisMenu.js"></script>–>--> <script src="../../js/scripts2.js"></script> <script src="/js/People/change-personal-Info.js"></script> + <script src="/datepicker/dist/js/bootstrap-datepicker.js"></script> @@ -197,6 +199,16 @@ </div> </div> </div> + + <script type="text/javascript"> + $('#dob').datepicker({ + autoclose: true, + clearBtn: true, + todayBtn: true, + todayHighlight: true, + format: 'yyyy-mm-dd' + }); + </script> </body> </html> diff --git a/web/webpage/admin-related/admin-background.html b/web/webpage/admin-related/admin-background.html index d4045415cdcf8f2d2c2dbbaa18025cdb19fae463..28a0e0f3af2c2ba099d9f7894775b06f530e7f18 100644 --- a/web/webpage/admin-related/admin-background.html +++ b/web/webpage/admin-related/admin-background.html @@ -196,7 +196,7 @@ </div> <div class="form-group"> <label class="col-sm-2 control-label" style="font-weight: 400">Degree</label> - <div class="col-sm-8"><select id="degree" name="selector1" class="form-control1" style="background-color: #fff"> + <div class="col-sm-8"><select id="degree" class="form-control1" style="background-color: #fff"> <option value="PHD">PHD</option> <option value="Master">Master</option> <option value="Bachelor">Bachelor</option> @@ -221,7 +221,7 @@ <div class="form-group"> <label class="col-sm-2 control-label" style="font-weight: 400">Main Course</label> <div class="col-sm-8"> - <textarea id="maincourse" name="mainC" type="text" class="form-control1" placeholder="Input Your Main Course Here" style="background-color: #fff"></textarea> + <textarea id="maincourse" type="text" class="form-control1" placeholder="Input Your Main Course Here" style="background-color: #fff"></textarea> </div> </div>