Merge all pagination-templates into 'base/paginate'

to reduce code-duplicity

diff --git a/templates/admin/base/page.tmpl b/templates/admin/base/page.tmpl
deleted file mode 100644 (file)
index 564d7de..0000000
--- a/templates/admin/base/page.tmpl
+++ /dev/null
@@ -1,23 +0,0 @@
-       {{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}}

diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl
index 6b9423d03e5792f02e81ea08f1bb073f22d7c9fc..244f915c974e7cd00e432a3e3cfd1f6224e89a64 100644 (file)
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -40,7 +40,7 @@
                                        </table>
                                </div>
 
-                               {{template "admin/base/page" .}}
+                               {{template "base/paginate" .}}
                        </div>
                </div>
        </div>

diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index 4b1d98b94b9281f6d219f11c66b1c681bb3ada68..8db51489d7c12b3d8eee1cc5d55e3e74a50e71c9 100644 (file)
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -44,7 +44,7 @@
                                        </table>
                                </div>
 
-                               {{template "admin/base/page" .}}
+                               {{template "base/paginage" .}}
                        </div>
                </div>
        </div>

diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index 8c7a0c9a905dbfe05471113af9c97f0d69b3d5ca..f1ebf4a3406b1d4f8db412979c341c971e12022a 100644 (file)
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -45,7 +45,7 @@
                                        </table>
                                </div>
 
-                               {{template "admin/base/page" .}}
+                               {{template "base/paginate" .}}
                        </div>
                </div>
        </div>

diff --git a/templates/base/paginate.tmpl b/templates/base/paginate.tmpl
new file mode 100644 (file)
index 0000000..afe34c6
--- /dev/null
+++ b/templates/base/paginate.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}}

diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl
index 6953414e851211c83ea219b378333ffc52feb3dc..c44456be4c70b6ee5f2f4ea1618563639c4917db 100644 (file)
--- a/templates/explore/organizations.tmpl
+++ b/templates/explore/organizations.tmpl
@@ -27,7 +27,7 @@
                                        {{end}}
                                </div>
 
-                               {{template "explore/page" .}}
+                               {{template "base/paginate" .}}
                        </div>
                </div>
        </div>

diff --git a/templates/explore/page.tmpl b/templates/explore/page.tmpl
deleted file mode 100644 (file)
index fd3e7a7..0000000
--- a/templates/explore/page.tmpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{with .Page}}
-       {{if gt .TotalPages 1}}
-               <div class="center page buttons">
-                       <div class="ui borderless pagination menu">
-                               <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"}} <i class="icon right arrow"></i>
-                               </a>
-                       </div>
-               </div>
-       {{end}}
-{{end}}

diff --git a/templates/explore/repos.tmpl b/templates/explore/repos.tmpl
index 080a5076f1101433147f46bd8d64398049b45c97..eac3f1d26ca6551d5258485380bf4b359ccb1257 100644 (file)
--- a/templates/explore/repos.tmpl
+++ b/templates/explore/repos.tmpl
@@ -6,7 +6,7 @@
                        <div class="twelve wide column content">
                                {{template "explore/search" .}}
                                {{template "explore/repo_list" .}}
-                               {{template "explore/page" .}}
+                               {{template "base/paginate" .}}
                        </div>
                </div>
        </div>

diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl
index c13ccc6977154b0bbb5a7ec7617fa8da0b81c64f..ce356f4fdebbb240588ae307bba4dbaf35a3e2b3 100644 (file)
--- a/templates/explore/users.tmpl
+++ b/templates/explore/users.tmpl
@@ -27,7 +27,7 @@
                                        {{end}}
                                </div>
 
-                               {{template "explore/page" .}}
+                               {{template "base/paginate" .}}
                        </div>
                </div>
        </div>

diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index 17b0ade8c99750f6db4c028f188ed280d37aacb2..69de8d3481012565060e641142bb807ce92db699 100644 (file)
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -32,7 +32,7 @@
                                        <div class="ui divider"></div>
                                {{end}}
                                {{template "explore/repo_list" .}}
-                               {{template "explore/page" .}}
+                               {{template "base/paginate" .}}
                        </div>
 
                        <div class="ui five wide column">

diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl
index c22897c51ebbf5515cd29fcd6af11b5eef6e1328..477ab6b5243cad0670e38805941086d10703cd28 100644 (file)
--- a/templates/repo/release/list.tmpl
+++ b/templates/repo/release/list.tmpl
@@ -75,7 +75,7 @@
                                </li>
                        {{end}}
                </ul>
-               {{template "admin/base/page" .}}
+               {{template "base/paginage" .}}
        </div>
 </div>
 {{template "base/footer" .}}

diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index 4bcc92d95d508db78891eb6d4740bcb5ae021c05..a7edd88c6dcdd18e5cf45b1fc82caa79fae9f402 100644 (file)
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -86,7 +86,7 @@
                                </div>
                                {{if ne .TabName "activity"}}
                                        {{template "explore/repo_list" .}}
-                                       {{template "explore/page" .}}
+                                       {{template "base/paginate" .}}
                                {{else}}
                                        <br>
                                        <div class="feeds">