#13 finish user and repository search

Both are possible on explore and admin panel

5 files changed, 43 insertions, 71 deletions

diff --git a/templates/admin/base/page.tmpl b/templates/admin/base/page.tmpl
new file mode 100644
index 0000000000..b689ed0811
--- /dev/null
+++ b/templates/admin/base/page.tmpl
@@ -0,0 +1,23 @@
+	{{with .Page}}
+		{{if gt .TotalPages 1}}
+			<div class="center page buttons">
+				<div class="ui borderless pagination menu">
+					<a class="{{if .IsFirst}}disabled{{end}} item" href="{{$.Link}}?q={{$.Keyword}}"><i class="angle double left icon"></i> {{$.i18n.Tr "admin.first_page"}}</a>
+					<a class="{{if not .HasPrevious}}disabled{{end}} item" {{if .HasPrevious}}href="{{$.Link}}?page={{.Previous}}&q={{$.Keyword}}"{{end}}>
+						<i class="left arrow icon"></i> {{$.i18n.Tr "repo.issues.previous"}}
+					</a>
+					{{range .Pages}}
+						{{if eq .Num -1}}
+							<a class="disabled item">...</a>
+						{{else}}
+							<a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.Link}}?page={{.Num}}&q={{$.Keyword}}"{{end}}>{{.Num}}</a>
+						{{end}}
+					{{end}}
+					<a class="{{if not .HasNext}}disabled{{end}} item" {{if .HasNext}}href="{{$.Link}}?page={{.Next}}&q={{$.Keyword}}"{{end}}>
+						{{$.i18n.Tr "repo.issues.next"}}&nbsp;<i class="icon right arrow"></i>
+					</a>
+					<a class="{{if .IsLast}}disabled{{end}} item" href="{{$.Link}}?page={{.TotalPages}}&q={{$.Keyword}}">{{$.i18n.Tr "admin.last_page"}}&nbsp;<i class="angle double right icon"></i></a>
+				</div>
+			</div>
+		{{end}}
+	{{end}}
\ No newline at end of file
diff --git a/templates/admin/base/search.tmpl b/templates/admin/base/search.tmpl
new file mode 100644
index 0000000000..29026a11a1
--- /dev/null
+++ b/templates/admin/base/search.tmpl
@@ -0,0 +1,6 @@
+<form class="ui form">
+	<div class="ui fluid action input">
+	  <input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "explore.search"}}..." autofocus>
+	  <button class="ui blue button">{{.i18n.Tr "explore.search"}}</button>
+	</div>
+</form>
\ No newline at end of file
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl
index 0230f03021..8560d02196 100644
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -8,6 +8,9 @@
 				<h4 class="ui top attached header">
 					{{.i18n.Tr "admin.orgs.org_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
 				</h4>
+				<div class="ui attached segment">
+					{{template "admin/base/search" .}}
+				</div>
 				<div class="ui attached table segment">
 					<table class="ui very basic striped table">
 						<thead>
@@ -22,7 +25,7 @@
 							</tr>
 						</thead>
 						<tbody>
-							{{range .Orgs}}
+							{{range .Users}}
 								<tr>
 									<td>{{.Id}}</td>
 									<td><a href="{{.HomeLink}}">{{.Name}}</a></td>
@@ -37,29 +40,7 @@
 					</table>
 				</div>
 
-				{{with .Page}}
-					{{if gt .TotalPages 1}}
-						<div class="center page buttons">
-							<div class="ui borderless pagination menu">
-								<a class="{{if .IsFirst}}disabled{{end}} item" href="{{$.Link}}"><i class="angle double left icon"></i> {{$.i18n.Tr "admin.first_page"}}</a>
-								<a class="{{if not .HasPrevious}}disabled{{end}} item" {{if .HasPrevious}}href="{{$.Link}}?page={{.Previous}}"{{end}}>
-									<i class="left arrow icon"></i> {{$.i18n.Tr "repo.issues.previous"}}
-								</a>
-								{{range .Pages}}
-									{{if eq .Num -1}}
-										<a class="disabled item">...</a>
-									{{else}}
-										<a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.Link}}?page={{.Num}}"{{end}}>{{.Num}}</a>
-									{{end}}
-								{{end}}
-								<a class="{{if not .HasNext}}disabled{{end}} item" {{if .HasNext}}href="{{$.Link}}?page={{.Next}}"{{end}}>
-									{{$.i18n.Tr "repo.issues.next"}}&nbsp;<i class="icon right arrow"></i>
-								</a>
-								<a class="{{if .IsLast}}disabled{{end}} item" href="{{$.Link}}?page={{.TotalPages}}">{{$.i18n.Tr "admin.last_page"}}&nbsp;<i class="angle double right icon"></i></a>
-							</div>
-						</div>
-					{{end}}
-				{{end}}
+				{{template "admin/base/page" .}}
 			</div>
 		</div>
 	</div>
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index cbbc91f80e..6cd34855bf 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -8,6 +8,9 @@
 				<h4 class="ui top attached header">
 					{{.i18n.Tr "admin.repos.repo_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
 				</h4>
+				<div class="ui attached segment">
+					{{template "admin/base/search" .}}
+				</div>
 				<div class="ui attached table segment">
 					<table class="ui very basic striped table">
 						<thead>
@@ -41,29 +44,7 @@
 					</table>
 				</div>
 
-				{{with .Page}}
-					{{if gt .TotalPages 1}}
-						<div class="center page buttons">
-							<div class="ui borderless pagination menu">
-								<a class="{{if .IsFirst}}disabled{{end}} item" href="{{$.Link}}"><i class="angle double left icon"></i> {{$.i18n.Tr "admin.first_page"}}</a>
-								<a class="{{if not .HasPrevious}}disabled{{end}} item" {{if .HasPrevious}}href="{{$.Link}}?page={{.Previous}}"{{end}}>
-									<i class="left arrow icon"></i> {{$.i18n.Tr "repo.issues.previous"}}
-								</a>
-								{{range .Pages}}
-									{{if eq .Num -1}}
-										<a class="disabled item">...</a>
-									{{else}}
-										<a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.Link}}?page={{.Num}}"{{end}}>{{.Num}}</a>
-									{{end}}
-								{{end}}
-								<a class="{{if not .HasNext}}disabled{{end}} item" {{if .HasNext}}href="{{$.Link}}?page={{.Next}}"{{end}}>
-									{{$.i18n.Tr "repo.issues.next"}}&nbsp;<i class="icon right arrow"></i>
-								</a>
-								<a class="{{if .IsLast}}disabled{{end}} item" href="{{$.Link}}?page={{.TotalPages}}">{{$.i18n.Tr "admin.last_page"}}&nbsp;<i class="angle double right icon"></i></a>
-							</div>
-						</div>
-					{{end}}
-				{{end}}
+				{{template "admin/base/page" .}}
 			</div>
 		</div>
 	</div>
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index 670b05450c..5b5048f84a 100644
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -8,9 +8,12 @@
 				<h4 class="ui top attached header">
 					{{.i18n.Tr "admin.users.user_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
 					<div class="ui right">
-						<a class="ui blue tiny button" href="{{AppSubUrl}}/admin/users/new">{{.i18n.Tr "admin.users.new_account"}}</a>
+						<a class="ui black tiny button" href="{{AppSubUrl}}/admin/users/new">{{.i18n.Tr "admin.users.new_account"}}</a>
 					</div>
 				</h4>
+				<div class="ui attached segment">
+					{{template "admin/base/search" .}}
+				</div>
 				<div class="ui attached table segment">
 					<table class="ui very basic striped table">
 						<thead>
@@ -42,29 +45,7 @@
 					</table>
 				</div>
 
-				{{with .Page}}
-					{{if gt .TotalPages 1}}
-						<div class="center page buttons">
-							<div class="ui borderless pagination menu">
-								<a class="{{if .IsFirst}}disabled{{end}} item" href="{{$.Link}}"><i class="angle double left icon"></i> {{$.i18n.Tr "admin.first_page"}}</a>
-								<a class="{{if not .HasPrevious}}disabled{{end}} item" {{if .HasPrevious}}href="{{$.Link}}?page={{.Previous}}"{{end}}>
-									<i class="left arrow icon"></i> {{$.i18n.Tr "repo.issues.previous"}}
-								</a>
-								{{range .Pages}}
-									{{if eq .Num -1}}
-										<a class="disabled item">...</a>
-									{{else}}
-										<a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.Link}}?page={{.Num}}"{{end}}>{{.Num}}</a>
-									{{end}}
-								{{end}}
-								<a class="{{if not .HasNext}}disabled{{end}} item" {{if .HasNext}}href="{{$.Link}}?page={{.Next}}"{{end}}>
-									{{$.i18n.Tr "repo.issues.next"}}&nbsp;<i class="icon right arrow"></i>
-								</a>
-								<a class="{{if .IsLast}}disabled{{end}} item" href="{{$.Link}}?page={{.TotalPages}}">{{$.i18n.Tr "admin.last_page"}}&nbsp;<i class="angle double right icon"></i></a>
-							</div>
-						</div>
-					{{end}}
-				{{end}}
+				{{template "admin/base/page" .}}
 			</div>
 		</div>
 	</div>