From 999a5b040b4496455e67687f33444cf906b6905b Mon Sep 17 00:00:00 2001 From: printempw Date: Sat, 23 Jul 2016 12:15:36 +0800 Subject: [PATCH] add page select for skinlib --- assets/src/js/skinlib.js | 21 ++++++++++++++++++++- assets/src/sass/skinlib.scss | 30 +++++++++++++++++++----------- resources/views/skinlib/index.tpl | 13 +++++++++++++ 3 files changed, 52 insertions(+), 12 deletions(-) diff --git a/assets/src/js/skinlib.js b/assets/src/js/skinlib.js index e3db3eb7..740d2cbb 100644 --- a/assets/src/js/skinlib.js +++ b/assets/src/js/skinlib.js @@ -2,11 +2,24 @@ * @Author: prpr * @Date: 2016-07-19 10:46:38 * @Last Modified by: printempw -* @Last Modified time: 2016-07-22 10:25:54 +* @Last Modified time: 2016-07-23 12:10:01 */ 'use strict'; +$('#page-select').on('change', function() { + // if has query strings + if (getQueryString('filter') != "" || getQueryString('sort') != "") { + if (getQueryString('page') == "") + window.location = location.href + "&page=" + $(this).val(); + else + window.location = "?filter="+getQueryString('filter')+"&sort="+getQueryString('sort')+"&page="+$(this).val(); + } else { + window.location = "?page=" + $(this).val(); + } + +}); + function addToCloset(tid) { var dom = '
'+ ''+ @@ -17,6 +30,12 @@ function addToCloset(tid) { } function ajaxAddToCloset(tid) { + // remove interference of modal which is hide + $('.modal').each(function() { + if ($(this).css('display') == "none") + $(this).remove(); + }); + var name = $('#new-name').val(); if (name == "") { diff --git a/assets/src/sass/skinlib.scss b/assets/src/sass/skinlib.scss index 42ce4212..de261e78 100644 --- a/assets/src/sass/skinlib.scss +++ b/assets/src/sass/skinlib.scss @@ -1,26 +1,31 @@ /* * @Author: printempw * @Date: 2016-07-10 17:17:07 -* @Last Modified by: prpr -* @Last Modified time: 2016-07-21 21:13:07 +* @Last Modified by: printempw +* @Last Modified time: 2016-07-23 12:12:50 */ @import "style.scss"; -.navbar-nav>.user-menu .user-image { - border-radius: 10%; +.navbar-nav { + .user-menu .user-image { + border-radius: 10%; + } } .main-header #navbar-search-input.form-control { border-radius: 4px; } -.item-footer > a { - color: #fff; -} +.item-footer { + a { + color: #fff; + } -.item-footer > .like:hover, .item-footer > .liked { - color: #e0353b; + .like:hover, + .liked { + color: #e0353b; + } } .model-label { @@ -39,7 +44,10 @@ div.likes { cursor: default; } -div.likes:hover, div.likes:active, div.likes:focus, div.likes:active:focus { +div.likes:hover, +div.likes:active, +div.likes:focus, +div.likes:active:focus { background-color: #fff; border-color: #fff; color: #e0353b; @@ -49,6 +57,6 @@ table { font-size: inherit; } -.table>tbody>tr>td { +.table > tbody > tr > td { border-top: none; } diff --git a/resources/views/skinlib/index.tpl b/resources/views/skinlib/index.tpl index fe52844f..79cbfec2 100644 --- a/resources/views/skinlib/index.tpl +++ b/resources/views/skinlib/index.tpl @@ -89,6 +89,19 @@
  • »
  • + + +

    第 {{ $page }} 页,共 {{ $total_pages }} 页