OrgGo
/
Tasks
mirror of https://github.com/thewhitetulip/Tasks.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

fixed problems in search

This commit is contained in:
Suraj 2016-02-29 07:34:58 +05:30
parent 7c494ec40d
commit 49c91632e0
4 changed files with 70 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/static/css/styles.css
View File

@ -107,7 +107,7 @@ Navbar
margin-left: 25px;
font-size:1.5em;
color:white;
max-width: 2000px;
}
.btn-action{

1
templates/_head.html
View File

@ -70,6 +70,7 @@
{{ else if eq .Navigation "completed"}}
{{ else if eq .Navigation "deleted"}}
{{ else if eq .Navigation "edit"}}
{{ else if eq .Navigation "search"}}
{{else }}
<a href="/del-category/{{.Navigation}}"> <button data-original-title="Delete Category" data-placement="bottom" data-toggle="tooltip" title="" class="btn btn-action glyphicon glyphicon-trash" type="button"></button></a>
<button data-original-title="Edit Category" data-placement="bottom" data-toggle="tooltip" id="editCatFrmBtn" title="" class="btn btn-action glyphicon glyphicon-pencil" type="button"></button>

98
templates/search.html
View File

@ -1,43 +1,71 @@
{{template "_head.html" .}}
<div class="timeline">
{{ if .Tasks}}
{{range .Tasks}}
<div class="note">
<p class="noteHeading">{{.Title}}</p> <span class="toggle glyphicon glyphicon-resize-full"></span>
<span class="noteContent">{{.Content}}</span>
<span class="notefooter">
<ul class="menu">
<li role="presentation">Priority: {{.Priority}}</li>
<li role="presentation">
<span class="glyphicon glyphicon-time"></span> {{.Created}}</li>
<!-- <li role="presentation">
<a role="menuitem" tabindex="-1" href="/mask/{{.Id}}">
<span class="glyphicon glyphicon-lock"></span> Mask</a></li> !-->
<li role="presentation">
<a role="menuitem" tabindex="-1" href="/trash/{{.Id}}">
<span class="glyphicon glyphicon-trash"></span></a>
</li>
<li role="presentation">
<a role="menuitem" tabindex="-1" href="/complete/{{.Id}}">
<span class="glyphicon glyphicon-check"></span></a>
</li>
<li role="presentation">
<a role="menuitem" tabindex="-1" href="/edit/{{.Id}}">
<span class="glyphicon glyphicon-pencil"></span></a>
</li>
</ul>
</span>
</div>
{{end}} {{else}}
<div class="note">
<p class="noteHeading">No results found</p>
<p class="notefooter">Go to home page <a href="/">here</a> </p>
<div class="timeline">
{{ if .Tasks}} {{range $key, $value := .Tasks}}
<div class="note" id="{{$value.Id}}">
<p class="noteHeading">{{ $value.Title}}</p> <span class="toggle glyphicon glyphicon-resize-full"></span>
<span class="noteContent">
{{$value.Content}}
<div class="commentslist">
{{range $value.Comments}}
<div class="comment">
<span>{{.Content}}</span>
<span class="timestamp">{{.Created}}</span>
<a href="/del-comment/{{.ID}}"><span class="glyphicon glyphicon-trash timestamp"></span></a>
</div>
{{end}}
</div>
{{template "_footer.html"}}
<div class="comment">
<form method="POST" action="/add-comment/">
<textarea rows="1" cols="75" name="commentText" placeholder="Add Comment"></textarea>
<input type="text" class="hidden" name="taskID" value="{{$value.Id}}">
<input type="submit" value="Comment" class="btn btn-primary" />
</form>
</div>
</div>
</span>
<span class="notefooter">
<ul class="menu">
<li role="presentation">Priority: {{$value.Priority}}</li>
<li role="presentation">
<span class="glyphicon glyphicon-time"></span> {{$value.Created}}</li>
<li role="presentation">
<a role="menuitem" tabindex="-1" href="/mask/{{.Id}}">
<span class="glyphicon glyphicon-lock"></span></a>
</li>
<li role="presentation">
<a role="menuitem" tabindex="-1" href="/trash/{{.Id}}">
<span class="glyphicon glyphicon-trash"></span></a>
</li>
<li role="presentation">
<a role="menuitem" tabindex="-1" href="/complete/{{.Id}}">
<span class="glyphicon glyphicon-check"></span></a>
</li>
<li role="presentation">
<a role="menuitem" tabindex="-1" href="/edit/{{.Id}}">
<span class="glyphicon glyphicon-pencil"></span></a>
</li>
<li role="presentation">
<a href="/category/{{$value.Category}}"> {{$value.Category}}</a>
</li>
</ul>
</span>
</div>
{{end}} {{else}}
<div class="note">
<p class="noteHeading">No Tasks here</p>
<p class="notefooter">Create new task
<button class="floating-action-icon-add">
here </button>
</p>
</div>
{{end}}
</div>
{{template "_footer.html"}}
</body>

5
views/otherViews.go
View File

@ -79,7 +79,12 @@ func SearchTaskFunc(w http.ResponseWriter, r *http.Request) {
if r.Method == "POST" {
r.ParseForm()
query := r.Form.Get("query")
context := db.SearchTask(query)
categories := db.GetCategories()
context.Categories = categories
searchTemplate.Execute(w, context)
} else {
message = "Method not allowed"