Skip to content

Commit

Permalink
Navbar added to all pages. Minor updates for forms. #6
Browse files Browse the repository at this point in the history
  • Loading branch information
@murphy1
murphy1 committed Oct 16, 2019
1 parent 7b2dec4 commit f512dc8
Show file tree
Hide file tree
Showing 12 changed files with 386 additions and 82 deletions.
10 changes: 10 additions & 0 deletions src/main/resources/static/style.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

.navbar {
color: blue;
}

.center_div{
position: absolute;
top: 10%;
left: 20%;
}
26 changes: 26 additions & 0 deletions src/main/resources/templates/Issues.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,32 @@
</head>
<body>

<nav class="navbar navbar-expand-lg navbar-light" style="background-color: coral;">
<a class="navbar-brand" href="/">Home</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item active">
<a class="nav-link" href="/issues/new">Create Issue<span class="sr-only">(current)</span></a>
</li>
<li class="nav-item active">
<a class="nav-link" href="/service_requests/new">Create Service Request</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/profile">View Profile</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/search">Search for ticket</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/logout">Logout</a>
</li>
</ul>
</div>
</nav>

<h1>List of Issues</h1>

<!--/*@thymesVar id="issue" type="com.murphy1.serviced.serviced.model.Issue"*/-->
Expand Down
195 changes: 113 additions & 82 deletions src/main/resources/templates/forms/new_issue.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,118 +11,149 @@

<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>

<link rel="stylesheet" type="text/css" media="all"
href="../../static/style.css" th:href="@{/style.css}"/>

</head>
<body>

<nav class="navbar navbar-expand-lg navbar-light" style="background-color: coral;">
<a class="navbar-brand" href="/">Home</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item active">
<a class="nav-link" href="/issues/new">Create Issue<span class="sr-only">(current)</span></a>
</li>
<li class="nav-item active">
<a class="nav-link" href="/service_requests/new">Create Service Request</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/profile">View Profile</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/search">Search for ticket</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/logout">Logout</a>
</li>
</ul>
</div>
</nav>

<!--/*@thymesVar id="issue" type="com.murphy1.serviced.serviced.model.Issue"*/-->
<form th:object="${issue}" th:action="@{/issue/save}" method="post">

<input type="hidden" th:field="*{id}">
<div class="container center_div">
<input type="hidden" th:field="*{id}">

<div class="col-md-3 form-group" th:class="${#fields.hasErrors('name')}
? 'col-md-3 form-group has-error' : 'col-md-3 form-group'">
<label>Name:</label>
<input type="text" class="form-control" th:field="*{name}" th:errorclass="has-error"/>
<span class="help-block" th:if="${#fields.hasErrors('name')}">
<div class="col-md-6 form-group" th:class="${#fields.hasErrors('name')}
? 'col-md-6 form-group has-error' : 'col-md-6 form-group'">
<label>Name:</label>
<input type="text" class="form-control" th:field="*{name}" th:errorclass="has-error"/>
<span class="help-block" th:if="${#fields.hasErrors('name')}">
<ul>
<li th:each="err : ${#fields.errors('name')}" th:text="${err}"></li>
</ul>
</span>
</div>
</div>

<div class="col-md-3 form-group" th:class="${#fields.hasErrors('description')}
? 'col-md-3 form-group has-error' : 'col-md-3 form-group'">
<label>Description:</label>
<input type="text" class="form-control" th:field="*{description}" th:errorclass="has-error"/>
<span class="help-block" th:if="${#fields.hasErrors('description')}">
<div class="col-md-6 form-group" th:class="${#fields.hasErrors('description')}
? 'col-md-6 form-group has-error' : 'col-md-6 form-group'">
<label>Description:</label>
<input type="text" class="form-control" th:field="*{description}" th:errorclass="has-error"/>
<span class="help-block" th:if="${#fields.hasErrors('description')}">
<ul>
<li th:each="err : ${#fields.errors('description')}" th:text="${err}"></li>
</ul>
</span>
</div>
</div>

<div class="form-group">
<div class="col-3">
<label>Label:</label>
<select class="form-control" th:field="*{label}">
<option th:each="labelValue : ${T(com.murphy1.serviced.serviced.model.Label).values()}"
th:value="${labelValue.name()}"
th:text="${labelValue.name()}"
>val</option>
</select>
<select class="form-control" th:remove="all">
<option>Hardware</option>
<option>Software</option>
<option>Network</option>
<option>Access</option>
<option>Account</option>
<option>SQL</option>
<option>Java</option>
</select>
<div class="form-group">
<div class="col-6">
<label>Label:</label>
<select class="form-control" th:field="*{label}">
<option th:each="labelValue : ${T(com.murphy1.serviced.serviced.model.Label).values()}"
th:value="${labelValue.name()}"
th:text="${labelValue.name()}"
>val</option>
</select>
<select class="form-control" th:remove="all">
<option>Hardware</option>
<option>Software</option>
<option>Network</option>
<option>Access</option>
<option>Account</option>
<option>SQL</option>
<option>Java</option>
</select>
</div>
</div>
</div>

<div class="form-group">
<div class="col-3">
<label>Priority:</label>
<select class="form-control" th:field="*{priority}">
<option th:each="priorityValue : ${T(com.murphy1.serviced.serviced.model.Priority).values()}"
th:value="${priorityValue.name()}"
th:text="${priorityValue.name()}"
>val</option>
</select>
<select class="form-control" th:remove="all">
<option>Very High</option>
<option>High</option>
<option>Medium</option>
<option>Low</option>
</select>
<div class="form-group">
<div class="col-6">
<label>Priority:</label>
<select class="form-control" th:field="*{priority}">
<option th:each="priorityValue : ${T(com.murphy1.serviced.serviced.model.Priority).values()}"
th:value="${priorityValue.name()}"
th:text="${priorityValue.name()}"
>val</option>
</select>
<select class="form-control" th:remove="all">
<option>Very High</option>
<option>High</option>
<option>Medium</option>
<option>Low</option>
</select>
</div>
</div>
</div>

<div class="form-group">
<div class="col-3">
<label>Status:</label>
<select class="form-control" th:field="*{status}">
<option th:each="statusValue : ${T(com.murphy1.serviced.serviced.model.Status).values()}"
th:value="${statusValue.name()}"
th:text="${statusValue.name()}"
>val</option>
</select>
<select class="form-control" th:remove="all">
<option>In Progress</option>
<option>Need Info</option>
<option>Solved</option>
<option>Shelved</option>
<option>New</option>
<option>Assigned</option>
</select>
<div class="form-group">
<div class="col-6">
<label>Status:</label>
<select class="form-control" th:field="*{status}">
<option th:each="statusValue : ${T(com.murphy1.serviced.serviced.model.Status).values()}"
th:value="${statusValue.name()}"
th:text="${statusValue.name()}"
>val</option>
</select>
<select class="form-control" th:remove="all">
<option>In Progress</option>
<option>Need Info</option>
<option>Solved</option>
<option>Shelved</option>
<option>New</option>
<option>Assigned</option>
</select>
</div>
</div>
</div>

<input type="hidden" th:field="*{dueDate}">
<input type="hidden" th:field="*{dueDate}">

<input type="hidden" th:field="*{messages}">
<input type="hidden" th:field="*{messages}">

<div class="form-group">
<div class="col-3">
<label>Chat:</label>
<textarea rows="4" cols="50" class="form-control" th:field="*{newMessages}"></textarea>
<div class="form-group">
<div class="col-6">
<label>Chat:</label>
<textarea rows="4" cols="50" class="form-control" th:field="*{newMessages}"></textarea>
</div>
</div>
</div>

<input type="hidden" th:field="*{creator}">
<input type="hidden" th:field="*{creator}">

<div class="form-group">
<div class="col-3">
<label>Assigned To:</label>
<input type="text" class="form-control" th:field="*{assignedTo}">
<small id="assignHelp" class="form-text text-muted">Please leave this blank when creating a ticket. Our team will assign an agent.</small>
<div class="form-group">
<div class="col-6">
<label>Assigned To:</label>
<input type="text" class="form-control" th:field="*{assignedTo}">
<small id="assignHelp" class="form-text text-muted">Please leave this blank when creating a ticket. Our team will assign an agent.</small>
</div>
</div>
</div>

<div>
<input type="submit" value="Submit">
<div class="col-6">
<input type="submit" value="Submit">
</div>
</div>

</form>
Expand Down
26 changes: 26 additions & 0 deletions src/main/resources/templates/forms/new_servicerequest.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,32 @@
</head>
<body>

<nav class="navbar navbar-expand-lg navbar-light" style="background-color: coral;">
<a class="navbar-brand" href="/">Home</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item active">
<a class="nav-link" href="/issues/new">Create Issue<span class="sr-only">(current)</span></a>
</li>
<li class="nav-item active">
<a class="nav-link" href="/service_requests/new">Create Service Request</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/profile">View Profile</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/search">Search for ticket</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/logout">Logout</a>
</li>
</ul>
</div>
</nav>

<!--/*@thymesVar id="issue" type="com.murphy1.serviced.serviced.model.ServiceRequest"*/-->
<form th:object="${serviceRequest}" th:action="@{/serviceRequest/save}" method="post">

Expand Down
26 changes: 26 additions & 0 deletions src/main/resources/templates/forms/new_user.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,32 @@
</head>
<body>

<nav class="navbar navbar-expand-lg navbar-light" style="background-color: coral;">
<a class="navbar-brand" href="/">Home</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item active">
<a class="nav-link" href="/issues/new">Create Issue<span class="sr-only">(current)</span></a>
</li>
<li class="nav-item active">
<a class="nav-link" href="/service_requests/new">Create Service Request</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/profile">View Profile</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/search">Search for ticket</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/logout">Logout</a>
</li>
</ul>
</div>
</nav>

<!--/*@thymesVar id="issue" type="com.murphy1.serviced.serviced.model.User"*/-->
<form th:object="${users}" th:action="@{/user/save}" method="post">

Expand Down
26 changes: 26 additions & 0 deletions src/main/resources/templates/forms/searchform.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,32 @@
</head>
<body>

<nav class="navbar navbar-expand-lg navbar-light" style="background-color: coral;">
<a class="navbar-brand" href="/">Home</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item active">
<a class="nav-link" href="/issues/new">Create Issue<span class="sr-only">(current)</span></a>
</li>
<li class="nav-item active">
<a class="nav-link" href="/service_requests/new">Create Service Request</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/profile">View Profile</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/search">Search for ticket</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/logout">Logout</a>
</li>
</ul>
</div>
</nav>

<!--/*@thymesVar id="issue" type="com.murphy1.serviced.serviced.searching.Search"*/-->
<form th:object="${searchObject}" th:action="@{/search/submit_search}" method="post">

Expand Down
Loading

0 comments on commit f512dc8

Please # to comment.