Skip to content
Snippets Groups Projects
Commit 71f1e32c authored by Mikhael Artur Darmakesuma's avatar Mikhael Artur Darmakesuma
Browse files

Added pref loc in database, minor fix pref loc

parent 2a8ee898
1 merge request!42Projekers - 13515051 - Girvandi Ilyas
Hide whitespace changes
Inline Side-by-side
css/edit-prefered-location.css
+ 5
− 2
View file @ 71f1e32c
...@@ -12,6 +12,9 @@ th{ ...@@ -12,6 +12,9 @@ th{
text-align: center; text-align: center;
} }
td{
height: 30;
}
th, td, tr{ th, td, tr{
padding: 2; padding: 2;
} }
...@@ -36,7 +39,7 @@ table, th, td, tr{ ...@@ -36,7 +39,7 @@ table, th, td, tr{
#locationinput{ #locationinput{
display: none; display: none;
width: 100%; width: 100%;
height: 30; height: 100%;
} }
button{ button{
...@@ -47,7 +50,7 @@ button{ ...@@ -47,7 +50,7 @@ button{
padding: 0; padding: 0;
} }
.editbutton{ .editsavebutton{
height: 25; height: 25;
width: 25; width: 25;
} }
......
css/login.css
+ 1
− 4
View file @ 71f1e32c
.kotak{ .container{
background-color: #8BBD3C; background-color: #8BBD3C;
border-color: #02702C; border-color: #02702C;
border-width: 10px; border-width: 10px;
border-style: solid; border-style: solid;
border-radius: 50px; border-radius: 50px;
width: 30%;
margin: 20 35% 0 35%;
padding: 10 10 10 10;
} }
.horizontal{ .horizontal{
......
data/projekers.sql
+ 29
− 4
View file @ 71f1e32c
-- MySQL dump 10.13 Distrib 5.7.14, for Win64 (x86_64) -- MySQL dump 10.16 Distrib 10.1.21-MariaDB, for Win32 (AMD64)
-- --
-- Host: localhost Database: projekers -- Host: localhost Database: localhost
-- ------------------------------------------------------ -- ------------------------------------------------------
-- Server version 5.5.5-10.1.25-MariaDB -- Server version 10.1.21-MariaDB
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
...@@ -15,6 +15,31 @@ ...@@ -15,6 +15,31 @@
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
--
-- Table structure for table `pref_loc`
--
DROP TABLE IF EXISTS `pref_loc`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `pref_loc` (
`id` int(11) NOT NULL,
`location` varchar(50) NOT NULL,
KEY `id` (`id`),
CONSTRAINT `pref_loc_ibfk_1` FOREIGN KEY (`id`) REFERENCES `user` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `pref_loc`
--
LOCK TABLES `pref_loc` WRITE;
/*!40000 ALTER TABLE `pref_loc` DISABLE KEYS */;
INSERT INTO `pref_loc` VALUES (1,'Tubagus Ismail'),(1,'Dago Asri'),(1,'Kopo');
/*!40000 ALTER TABLE `pref_loc` ENABLE KEYS */;
UNLOCK TABLES;
-- --
-- Table structure for table `user` -- Table structure for table `user`
-- --
...@@ -54,4 +79,4 @@ UNLOCK TABLES; ...@@ -54,4 +79,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2017-09-30 0:24:39 -- Dump completed on 2017-09-30 10:55:55
js/edit-prefered-location.js 0 → 100644
+ 21
− 0
View file @ 71f1e32c
var textHidden = false;
function hideMe(){
textHidden = !textHidden;
var textBox = document.getElementById("locationtext");
var inputBox = document.getElementById("locationinput");
var image = document.getElementById("imageeditsave");
if(textHidden){
textBox.setAttribute("style","display:none");
inputBox.setAttribute("style","display:block");
inputBox.value = textBox.innerHTML;
image.src = "../img/floppy.png";
}
else{
textBox.setAttribute("style","display:block");
inputBox.setAttribute("style","display:none");
textBox.innerHTML = inputBox.value;
image.src = "../img/pencil.png";
}
}
\ No newline at end of file
view/Login.html
+ 2
− 2
View file @ 71f1e32c
<html> <html>
<head> <head>
<title>Projekers - Login</title> <title>Projekers - Login</title>
<link rel = "stylesheet" href = "../css/login.css">
<link rel = "stylesheet" href = "../css/primary.css"> <link rel = "stylesheet" href = "../css/primary.css">
<link rel = "stylesheet" href = "../css/login.css">
</head> </head>
<body> <body>
<div class = "kotak"> <div class = "container">
<div> <div>
<div class = "horizontal"></div> <div class = "horizontal"></div>
<div class = "judul">LOGIN</div> <div class = "judul">LOGIN</div>
......
view/edit-prefered-locations.html
+ 6
− 5
View file @ 71f1e32c
<html> <html>
<head> <head>
<title>Projekers - Login</title> <title>Projekers - Edit Prefered Location</title>
<link rel = "stylesheet" href = "../css/edit-prefered-location.css"> <link rel = "stylesheet" href = "../css/edit-prefered-location.css">
<link rel = "stylesheet" href = "../css/primary.css"> <link rel = "stylesheet" href = "../css/primary.css">
<script src = "../js/edit-prefered-location.js"></script>
</head> </head>
<body> <body>
<div class = "kotak"> <div class = "container">
<h1>EDIT PREFERED LOCATION</h1> <h1>EDIT PREFERED LOCATION</h1>
<table class="tab"> <table class="tab">
<tr> <tr>
...@@ -16,14 +17,14 @@ ...@@ -16,14 +17,14 @@
<tr> <tr>
<td class="tabno">1</td> <td class="tabno">1</td>
<td class="tabloc"> <td class="tabloc">
<div id="locationtext">2</div> <div id="locationtext">Bandung</div>
<input id="locationinput" type="text"> <input id="locationinput" type="text">
</td> </td>
<td class="tabact"> <td class="tabact">
<div class="addset" align="center"> <div class="addset" align="center">
<div margin-right=50> <div class="editsavebox">
<button onClick=hideMe() class="editsave"> <button onClick=hideMe() class="editsave">
<img src="../img/pencil.png" class="editbutton" id="imageeditsave"> <img src="../img/pencil.png" class="editsavebutton" id="imageeditsave">
</button> </button>
</div> </div>
<div> <div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment