From 8f731dadc275e3e61ba8c15f9ad6bcfa64a213b9 Mon Sep 17 00:00:00 2001 From: VnPower Date: Mon, 12 Feb 2024 19:27:27 +0700 Subject: [PATCH] Move go to page button --- serve/template.go | 46 ++++++++++++++++++++--------------------- views/css/style.css | 7 ++++--- views/css/style.css.map | 2 +- views/css/style.scss | 8 ++++--- 4 files changed, 33 insertions(+), 30 deletions(-) diff --git a/serve/template.go b/serve/template.go index 769aa75..9d062c3 100644 --- a/serve/template.go +++ b/serve/template.go @@ -132,6 +132,29 @@ func CreatePaginator(base, ending string, current_page, max_page int) template.H pages := "" pages += `
` + { // "jump to page"
+ hidden_section := "" + urlParsed, err := url.Parse(base) + if err != nil { + panic(err) + } + for k, vs := range urlParsed.Query() { + if k == "page" { + continue + } + for _, v := range vs { + hidden_section += fmt.Sprintf(``, k, v) + } + } + + max_section := "" + if hasMaxPage { + max_section = fmt.Sprintf(`max="%d"`, max_page) + } + + pages += fmt.Sprintf(`%s
`, pageUrl(current_page), hidden_section, current_page, 1, max_section) + pages += "
" + } { // previous,first (two buttons) pages += `` @@ -153,29 +176,6 @@ func CreatePaginator(base, ending string, current_page, max_page int) template.H count++ } - { // "jump to page"
- hidden_section := "" - urlParsed, err := url.Parse(base) - if err != nil { - panic(err) - } - for k, vs := range urlParsed.Query() { - if k == "page" { - continue - } - for _, v := range vs { - hidden_section += fmt.Sprintf(``, k, v) - } - } - - max_section := "" - if hasMaxPage { - max_section = fmt.Sprintf(`max="%d"`, max_page) - } - - pages += fmt.Sprintf(`%s
`, pageUrl(current_page), hidden_section, current_page, 1, max_section) - } - // next,last (two buttons) pages += `` if hasMaxPage { diff --git a/views/css/style.css b/views/css/style.css index 90caf23..5a7a316 100644 --- a/views/css/style.css +++ b/views/css/style.css @@ -186,10 +186,11 @@ input[type=submit][hidden] { .pagination { text-align: center; } +.pagination form { + display: inline-block; +} .pagination .pagination-buttons { - display: flex; - flex-wrap: wrap; - align-items: center; + text-align: center; } .pagination .pagination-button { margin-right: 5px; diff --git a/views/css/style.css.map b/views/css/style.css.map index 43031c6..013700f 100644 --- a/views/css/style.css.map +++ b/views/css/style.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["style.scss"],"names":[],"mappings":"AAgBA;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EAEA,kBA5BG;EA6BH,OA3BG;EA6BH;EACA,aApBY;EAsBZ;;AACA;EAXF;IAYI;;;;AAIJ;EACE,OArCK;EAsCL;;;AAGF;AACA;EACI;;;AAKJ;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI,kBA1DG;EA2DH;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;AAAA;AAAA;AAAA;EAIE;EACA;EACA;;;AAGF;AAAA;EAEE;;;AAGF;AAAA;EAEE;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;AAAA;AAAA;EAGE;EACA,eAvGc;EAwGd;EACA;;;AAGF;AAAA;EAEE;EACA,kBApHa;EAqHb,OAnHa;;;AAsHf;AAAA;EAEE,kBA1Ha;;;AA6Hf;EACE;EACA;;;AAGF;EACE;EACA,eA/Hc;EAgId;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;;AAIJ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAQE,eApJc;EAqJd;EACA;EACA;EACA,aAvJY;EAwJZ;EACA;;;AAGF;AAAA;AAAA;AAAA;EAIE,aA3JY;;;AA8Jd;AAAA;AAAA;AAAA;EAIE;;;AAGF;AAAA;AAAA;AAAA;EAIE;EACA;;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;EAME,kBA3LK;EA4LL;EACA,OA/LG;;;AAkML;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;AAEA;EACE;EACA;EACA;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;EACA,kBA/NW;EAgOX;;;AAIJ;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;EACA,OArPH;;AA0PC;EACE;EACA;;AAKF;EACE;;AAIJ;EACE;;AAEA;EACE;;AAIJ;EACE;EACA;;AAGF;EACE,kBAtRD;EAuRC;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EAEA;EACA;;AAEA;EACE;EACA;EACA;EACA,OA5SL;EA6SK;EACA;EACA;;AAEA;EACE,kBAnTG;;AAsTL;EACE;EACA;EACA;EACA;;;AAoBZ;EAEI;IACE;;;AAKN;EACE;EACA;EACA;;AAEA;EACE;EACA;;;AAIJ;EACE;EACA;EACA;;AACA;EAJF;IAKI;;;;AAIJ;EACE;EACA;EACA;EACA;;;AAGF;EACE;EAEA;EAIA;EACA;;;AAGF;EACE;EACA;EACA;;;AAKA;AAAA;EACE;EACA,OArYC;;AAyYD;AAAA;EACE,OA9XgB;EA+XhB,QA/XgB;;AAkYlB;AAAA;EACE,WAnYgB;;AAsYlB;AAAA;EACE,WAvYgB;;AAwYhB;AAAA;EACE,WA1Yc;;AAgZlB;AAAA;EACE,OAjZgB;EAkZhB,QAlZgB;;AAqZlB;AAAA;EACE,WAtZgB;;AAyZlB;AAAA;EACE,WA1ZgB;;AA4ZhB;AAAA;EACE,WA7Zc;;AAkapB;AAAA;EACE;EACA;EACA;;AAEA;AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA,kBA7cI;EA8cJ,OAjdH;;AAodC;AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA,OA5dH;EA6dG;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;EACE;;AAKN;AAAA;EACE;EACA;EACA,eAzeU;;AA4eZ;AAAA;EACE;EACA;;AAEA;AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAIJ;AAAA;EACE;EACA;;AAEA;AAAA;EACE;EACA;;AAEA;AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;AAAA;EACE;EACA;EACA;EACA;EACA;;;AAOV;EACE,kBA/hBa;EAgiBb,eA3hBc;EA4hBd;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAGF;EACE;;AAEA;EACE;;AAEF;EACE;;AACA;EACE,OApkBK;;AA0kBb;EACE;;AAGF;EACE;;AAEA;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAIJ;EACE;;AAEA;EACE,OAhmBI;;AAmmBN;EACE,OArmBD;EAsmBC;EACA;;AAKN;EACE;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAKF;EACE;EACA;EACA;EACA,OAjpBD;;AAmpBC;EACE;EACA;EACA;EACA;EACA;;;AAMR;EACE;EAOA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;;AAIJ;EACE;EACA;EACA;;;AAGF;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAEA;EACE;EACA;EACA;;AAIJ;EACE;;AAEA;EACE;;;AAKN;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;;AACA;EACE;;;AAKN;EACE;EACA;;;AAGF;AAAA;EAEE;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA,kBA/vBa;EAgwBb;;AAEA;EACE;EACA,OAnwBC;EAowBD,kBArwBW;EAswBX;EACA;EACA;EACA;EACA;EACA;EACA;;;AAIJ;EACE;IACE;;EAGF;AAAA;IAEE;;;AAIJ;EACE;;AAEA;EACE;EACA;EACA;EACA;EAEA;EACA;;AAIA;EACE;;;AAKN;EACE,kBAhzBa;EAizBb;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEF;EACE;EACA","file":"style.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["style.scss"],"names":[],"mappings":"AAgBA;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EAEA,kBA5BG;EA6BH,OA3BG;EA6BH;EACA,aApBY;EAsBZ;;AACA;EAXF;IAYI;;;;AAIJ;EACE,OArCK;EAsCL;;;AAGF;AACA;EACI;;;AAKJ;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI,kBA1DG;EA2DH;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;AAAA;AAAA;AAAA;EAIE;EACA;EACA;;;AAGF;AAAA;EAEE;;;AAGF;AAAA;EAEE;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;AAAA;AAAA;EAGE;EACA,eAvGc;EAwGd;EACA;;;AAGF;AAAA;EAEE;EACA,kBApHa;EAqHb,OAnHa;;;AAsHf;AAAA;EAEE,kBA1Ha;;;AA6Hf;EACE;EACA;;;AAGF;EACE;EACA,eA/Hc;EAgId;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;;AAIJ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAQE,eApJc;EAqJd;EACA;EACA;EACA,aAvJY;EAwJZ;EACA;;;AAGF;AAAA;AAAA;AAAA;EAIE,aA3JY;;;AA8Jd;AAAA;AAAA;AAAA;EAIE;;;AAGF;AAAA;AAAA;AAAA;EAIE;EACA;;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;EAME,kBA3LK;EA4LL;EACA,OA/LG;;;AAkML;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;AAEA;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;EACA,kBAjOW;EAkOX;;;AAIJ;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;EACA,OAvPH;;AA4PC;EACE;EACA;;AAKF;EACE;;AAIJ;EACE;;AAEA;EACE;;AAIJ;EACE;EACA;;AAGF;EACE,kBAxRD;EAyRC;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EAEA;EACA;;AAEA;EACE;EACA;EACA;EACA,OA9SL;EA+SK;EACA;EACA;;AAEA;EACE,kBArTG;;AAwTL;EACE;EACA;EACA;EACA;;;AAoBZ;EAEI;IACE;;;AAKN;EACE;EACA;EACA;;AAEA;EACE;EACA;;;AAIJ;EACE;EACA;EACA;;AACA;EAJF;IAKI;;;;AAIJ;EACE;EACA;EACA;EACA;;;AAGF;EACE;EAEA;EAIA;EACA;;;AAGF;EACE;EACA;EACA;;;AAKA;AAAA;EACE;EACA,OAvYC;;AA2YD;AAAA;EACE,OAhYgB;EAiYhB,QAjYgB;;AAoYlB;AAAA;EACE,WArYgB;;AAwYlB;AAAA;EACE,WAzYgB;;AA0YhB;AAAA;EACE,WA5Yc;;AAkZlB;AAAA;EACE,OAnZgB;EAoZhB,QApZgB;;AAuZlB;AAAA;EACE,WAxZgB;;AA2ZlB;AAAA;EACE,WA5ZgB;;AA8ZhB;AAAA;EACE,WA/Zc;;AAoapB;AAAA;EACE;EACA;EACA;;AAEA;AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA,kBA/cI;EAgdJ,OAndH;;AAsdC;AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA,OA9dH;EA+dG;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;EACE;;AAKN;AAAA;EACE;EACA;EACA,eA3eU;;AA8eZ;AAAA;EACE;EACA;;AAEA;AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAIJ;AAAA;EACE;EACA;;AAEA;AAAA;EACE;EACA;;AAEA;AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;AAAA;EACE;EACA;EACA;EACA;EACA;;;AAOV;EACE,kBAjiBa;EAkiBb,eA7hBc;EA8hBd;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAGF;EACE;;AAEA;EACE;;AAEF;EACE;;AACA;EACE,OAtkBK;;AA4kBb;EACE;;AAGF;EACE;;AAEA;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAIJ;EACE;;AAEA;EACE,OAlmBI;;AAqmBN;EACE,OAvmBD;EAwmBC;EACA;;AAKN;EACE;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAKF;EACE;EACA;EACA;EACA,OAnpBD;;AAqpBC;EACE;EACA;EACA;EACA;EACA;;;AAMR;EACE;EAOA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;;AAIJ;EACE;EACA;EACA;;;AAGF;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAEA;EACE;EACA;EACA;;AAIJ;EACE;;AAEA;EACE;;;AAKN;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;;AACA;EACE;;;AAKN;EACE;EACA;;;AAGF;AAAA;EAEE;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA,kBAjwBa;EAkwBb;;AAEA;EACE;EACA,OArwBC;EAswBD,kBAvwBW;EAwwBX;EACA;EACA;EACA;EACA;EACA;EACA;;;AAIJ;EACE;IACE;;EAGF;AAAA;IAEE;;;AAIJ;EACE;;AAEA;EACE;EACA;EACA;EACA;EAEA;EACA;;AAIA;EACE;;;AAKN;EACE,kBAlzBa;EAmzBb;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEF;EACE;EACA","file":"style.css"} \ No newline at end of file diff --git a/views/css/style.scss b/views/css/style.scss index 45ab9ef..1691a04 100644 --- a/views/css/style.scss +++ b/views/css/style.scss @@ -206,10 +206,12 @@ input[type="submit"][hidden] { .pagination { text-align: center; + form { + display: inline-block; + } + .pagination-buttons { - display: flex; - flex-wrap: wrap; - justify-content: center; + text-align: center; } .pagination-button {