Skip to content

Bojan Borovcanin / WBT1920_team30

Go to a project
Commit 7ba0d8dc by Luka Pavlovic
Options

class is added.

parent 54224add
Inline Side-by-side
Showing with 71 additions and 64 deletions
test/views/pages/home.php
...@@ -4,29 +4,47 @@ ...@@ -4,29 +4,47 @@
<head> <head>
<title></title> <title></title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
<meta charset="utf-8">
<link rel="stylesheet" href="<?php echo base_url();?>assets/css/bootstrap.min.css"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script> <link href="https://fonts.googleapis.com/css?family=Montserrat" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet" type="text/css">
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script> <link rel="stylesheet" href="<?php echo base_url();?>assets/css/home1.css">
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
<link rel="stylesheet" href="<?php echo base_url();?>assets/css/home.css">
</head> </head>
<body> <body data-spy="scroll" data-target=".navbar" data-offset="50">
<nav id = "navbar" class="navbar navbar-default">
<div id="navbarDiv" class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#myNavbar">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="<?php echo base_url();?>Pages/view">
<img src="<?php echo base_url();?>assets/images/ikonica.svg" width="50px">
</a>
</div>
<div class="collapse navbar-collapse" id="myNavbar">
<ul class="nav navbar-nav navbar-right">
<li>
<a href="<?php echo base_url();?>activity/showActivities">Activities </a>
</li>
<nav> <li>
<ul> <a href="#AboutSection">About</a>
<li class="prviprimjer">
<a href="<?php echo base_url();?>Pages/view"> About us!</a>
</li> </li>
<li>
<a href="#RoomsSection">Rooms</a>
</li>
<li> <li>
<a href="<?php echo base_url();?>activity/showActivities"> Activities !</a> <a href="#ContactSection">Contact </a>
</li> </li>
<?php <?php
...@@ -36,7 +54,7 @@ ...@@ -36,7 +54,7 @@
?> ?>
<li> <li>
<a href="<?php echo base_url();?>profile/myProfile">My profile</a> <a href="<?php echo base_url();?>profile/myProfile">Profile</a>
</li> </li>
<?php <?php
...@@ -51,7 +69,7 @@ ...@@ -51,7 +69,7 @@
?> ?>
<li> <li>
<a href="<?php echo base_url();?>profile/workerProfile">My profile</a> <a href="<?php echo base_url();?>profile/workerProfile">Profile</a>
</li> </li>
<?php <?php
...@@ -73,12 +91,13 @@ ...@@ -73,12 +91,13 @@
} }
?>" ?>"
> >
<span class="glyphicon glyphicon-log-in"></span>
<?php <?php
if(!$this->session->userdata('logged_in')){ if(!$this->session->userdata('logged_in')){
echo "Log in"; echo "Login";
} }
else { else {
echo "Log out"; echo "Logout";
} }
?> ?>
......
test/views/pages/login.php
...@@ -4,16 +4,14 @@ ...@@ -4,16 +4,14 @@
<head> <head>
<title>Login</title> <title>Login</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="<?php echo base_url();?>assets/css/bootstrap.min.css"> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
<link href="https://fonts.googleapis.com/css?family=Montserrat" rel="stylesheet" type="text/css">
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script> <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="<?php echo base_url();?>assets/css/home1.css">
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
</head> </head>
<body> <body>
......
test/views/templates/footer.php
<!DOCTYPE html>
<html>
</body> <head>
<title></title>
</head>
<body>
<footer class="container-fluid text-center">
<a href="<?php echo base_url();?>Pages/view" title="To Top">
<span class="glyphicon glyphicon-chevron-up"></span>
</a>
<p>Web Theme Made By <a href="<?php echo base_url();?>Pages/view" title="We hope you like it.">Luka, Milica, Bojan</a></p>
</footer>
</body>
</html> </html>
\ No newline at end of file
test/views/templates/header.php
<!DOCTYPE html>
<html> <html>
<head> <head>
<title>Trump Hotel</title> <title>Trump Hotel</title>
<style type="text/css"> <meta charset="utf-8">
body{ <meta name="viewport" content="width=device-width, initial-scale=1">
margin: auto; <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
} <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
header{ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
display: flex; <link rel="stylesheet" href="<?php echo base_url();?>assets/css/header.css">
border-bottom: 2px solid green;
border-spacing: 2px;
font-family: Barrio;
font-size: 80px;
font: green;
}
label.headerStyle{
text-align: center;
color: green;
margin-right: 20%;
margin-right: auto;
}
a{
margin-left: 25%;
margin-right: 20%;
color: green;
text-align: center;
text-decoration: none;
}
</style>
</head> </head>
<body> <body>
<header> <header>
......
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