From 0e2037f30854bd2d9def6f86f4ac9bd820a0102d Mon Sep 17 00:00:00 2001 From: calzoneman Date: Tue, 21 Jan 2014 22:41:53 -0600 Subject: [PATCH] Tweak playlist and search UI --- templates/channel.jade | 2 +- www/assets/js/callbacks.js | 5 +++-- www/css/cytube.css | 22 ++++++++++++++++++++-- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/templates/channel.jade b/templates/channel.jade index 08fe7d5a..af526c4e 100644 --- a/templates/channel.jade +++ b/templates/channel.jade @@ -130,7 +130,7 @@ html(lang="en") #queuefail.col-lg-12.col-md-12 .vertical-spacer .col-lg-12.col-md-12 - #queue.videolist + ul#queue.videolist #plmeta span#plcount 0 items span#pllength 00:00:00 diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js index b1dcb8eb..dc307642 100644 --- a/www/assets/js/callbacks.js +++ b/www/assets/js/callbacks.js @@ -862,11 +862,12 @@ Callbacks = { $(li).appendTo($("#library")); }, - itemsPerPage: 100 + itemsPerPage: 10 }; var p = Paginate(data.results, opts); - p.paginator.insertBefore($("#library")) + p.paginator.insertAfter($("#library")) + .addClass("pull-right") .attr("id", "search_pagination"); $("#library").data("paginator", p); }, diff --git a/www/css/cytube.css b/www/css/cytube.css index 3ce2fdac..ac5f556f 100644 --- a/www/css/cytube.css +++ b/www/css/cytube.css @@ -28,7 +28,7 @@ border-radius: 5px; } -#playlist, #userlist { +#userlist { list-style: none outside none; padding: 0; } @@ -199,6 +199,7 @@ #library { padding-left: 0; padding-right: 0; + margin-bottom: 5px; } #library_search, #queue_next, #ce_queue_next { @@ -230,10 +231,10 @@ .queue_entry { line-height: 22px; background-color: #ffffff; - margin: 0 0 2px auto; padding: 2px; font-size: 8pt; border: 1px solid #aaaaaa; + border-top-width: 0; } .queue_temp { @@ -245,11 +246,24 @@ border-color: #bce8f1; } +#queue { + padding: 0; + margin: 0; +} + #queue > li:last-child { border-bottom: 0; margin-bottom: 0; } +.videolist > li:first-child { + border-top-width: 1px; +} + +li.ui-sortable-helper, li.ui-sortable-placeholder + li.queue_entry { + border-top-width: 1px; +} + .qe_btn { height: 20px; font-family: Monospace; @@ -499,3 +513,7 @@ #cs-chatfilters-exporttext { margin-top: 5px; } + +.pagination { + margin: 0; +}