<iframe> and <object> tags. CUSTOM EMBEDS CANNOT BE SYNCHRONIZED.
- textarea#customembed-content.input-block-level.form-control(rows="3")
- #playlistmanager.collapse.plcontrol-collapse.col-lg-12.col-md-12
- .vertical-spacer
- .input-group
- input#userpl_name.form-control(type="text", placeholder="Playlist Name")
- span.input-group-btn
- button#userpl_save.btn.btn-default Save
- .checkbox
- label
- input.add-temp(type="checkbox")
- | Add as temporary
- ul#userpl_list.videolist
+ #searchcontrol.collapse.plcontrol-collapse.col-lg-12.col-md-12
+ .vertical-spacer
+ .input-group
+ input#library_query.form-control(type="text", placeholder="Search query")
+ span.input-group-btn
+ button#library_search.btn.btn-default Library
+ span.input-group-btn
+ button#youtube_search.btn.btn-default YouTube
+ .checkbox
+ label
+ input.add-temp(type="checkbox")
+ | Add as temporary
+ ul#library.videolist.col-lg-12.col-md-12
+ #addfromurl.collapse.plcontrol-collapse.col-lg-12.col-md-12
+ .vertical-spacer
+ .input-group
+ input#mediaurl.form-control(type="text", placeholder="Media URL")
+ span.input-group-btn
+ button#queue_next.btn.btn-default Queue next
+ span.input-group-btn
+ button#queue_end.btn.btn-default Queue last
+ span.input-group-btn#showcustomembed
+ button#showcustomembed.btn.btn-default(title="Embed a custom frame", data-toggle="collapse", data-target="#customembed")
+ span.glyphicon.glyphicon-th-large
+ .checkbox
+ label
+ input.add-temp(type="checkbox")
+ | Add as temporary
+ div#addfromurl-queue
+ #customembed.collapse.plcontrol-collapse.col-lg-12.col-md-12
+ .vertical-spacer
+ .input-group
+ input#customembed-title.form-control(type="text", placeholder="Title (optional)")
+ span.input-group-btn
+ button#ce_queue_next.btn.btn-default Queue next
+ span.input-group-btn
+ button#ce_queue_end.btn.btn-default Queue last
+ .checkbox
+ label
+ input.add-temp(type="checkbox")
+ | Add as temporary
+ | Paste the embed code below and click Next or At End.
+ | Acceptable embed codes are <iframe> and <object> tags. CUSTOM EMBEDS CANNOT BE SYNCHRONIZED.
+ textarea#customembed-content.input-block-level.form-control(rows="3")
+ #playlistmanager.collapse.plcontrol-collapse.col-lg-12.col-md-12
+ .vertical-spacer
+ .input-group
+ input#userpl_name.form-control(type="text", placeholder="Playlist Name")
+ span.input-group-btn
+ button#userpl_save.btn.btn-default Save
+ .checkbox
+ label
+ input.add-temp(type="checkbox")
+ | Add as temporary
+ ul#userpl_list.videolist
#queuefail.col-lg-12.col-md-12
.col-lg-12.col-md-12
ul#queue.videolist
diff --git a/templates/index.pug b/templates/index.pug
index c65dc99a..b1fae06c 100644
--- a/templates/index.pug
+++ b/templates/index.pug
@@ -39,7 +39,7 @@ block content
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
- .col-lg-9.col-md-9
+ .channel-list
h3 Public Channels
table.table.table-bordered.table-striped
thead
diff --git a/templates/useroptions.pug b/templates/useroptions.pug
index 9f6ed902..2da8f6a8 100644
--- a/templates/useroptions.pug
+++ b/templates/useroptions.pug
@@ -122,3 +122,4 @@ mixin us-mod
+rcheckbox("us-modflair", "Show name color")
+rcheckbox("us-shadowchat", "Show shadowmuted messages")
+rcheckbox("us-show-ip-in-tooltip", "Show IP addresses in profile tooltip")
+ +rcheckbox("us-show-playlist", "Legacy Playlist")
diff --git a/www/css/cytube.css b/www/css/cytube.css
index 3a1839bd..d5cb3c96 100644
--- a/www/css/cytube.css
+++ b/www/css/cytube.css
@@ -40,21 +40,49 @@ body{
max-width: 100%;
overflow-x: hidden;
}
+
+#mp-show-ip-in-tooltip{
+ margin-top: 0.5em;
+}
#main, #titles{
display: flex;
}
+.static-cont{
+ position: absolute;
+ width: auto !important;
+ height: auto !important;
+ min-width: 100%;
+ min-height: 100%;
+}
+.qt{
+ margin: 0.5em 0;
+}
+#qt-clearuser{
+ margin: 0 0.5em;
+}
.container-fluid {
padding-left: 15px;
padding-right: 15px;
margin-left: auto;
margin-right: auto;
}
-
+.nmenu{
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ display: flex;
+ z-index: 1;
+}
+.nmenu-btn{
+ flex-grow: 1;
+}
#minicontrol{
display: none;
margin: 0 0.5em 0 0.5em;
}
+
#vidplay{
}
#viddur{
@@ -63,7 +91,14 @@ body{
#loginform > .form-group {
margin-right: 5px;
}
-
+#npoll-timeout{
+ width: 4em;
+}
+#npopt{
+ display: flex;
+ height: 1.6em;
+ margin: 0.5em 0;
+}
.center {
text-align: center;
}
@@ -98,7 +133,7 @@ body{
#messagebuffer, #userlist {
height: 329px;
overflow-x: hidden;
- overflow-y: scroll;
+ overflow-y: auto;
margin-bottom: 0;
}
@@ -107,7 +142,12 @@ body{
border-top-left-radius: 0;
border-top-right-radius: 0;
}
-
+.floatcont{
+ position: absolute;
+ right: 0;
+ left: 0;
+ z-index: 1;
+}
.linewrap, .linewrap code {
white-space: pre-wrap; /* css-3 */
white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
@@ -420,7 +460,8 @@ label[for="emotealphabox"]{
font-family: Monospace;
}
.fpcont{
- overflow: scroll;
+ overflow-y: auto;
+ overflow-x: hidden;
}
#optedit, #permedit, #filteredit, #motdedit, #cssedit, #jsedit,
#banlist, #loginhistory, #channelranks, #chanlog {
diff --git a/www/css/themes/fore.st.css b/www/css/themes/fore.st.css
index 06093c1a..2b747784 100644
--- a/www/css/themes/fore.st.css
+++ b/www/css/themes/fore.st.css
@@ -88,7 +88,13 @@ sub,sup{
font-size:75%;
line-height:0;
position:relative;
- vertical-align:baseline
+ vertical-align:baseline;
+}
+.btn.btn-sm.btn-default.nmenu-btn.nmenu-border{
+ border-left: 1px #949494 solid;
+}
+.nmenu{
+ border-top: 1px #949494 solid;
}
.label-admin, .label.label-admin{
background-color: #cc0000;
@@ -5492,11 +5498,17 @@ a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover{
text-decoration: none;
}
-#pollopenbtn, #prefopenbtn, #emoteopenbtn, #chatsend, #motdwrap, #chatline, #rightcontrols, #chatheader, #userlist, #messagebuffer, #videowrap-header, .embed-responsive, #rightpane, #mainrow{
+.panelback, .embed-responsive{
background-color: #111111C0;
backdrop-filter: blur(12px);
}
+
+.nmenu-btn{
+ background-color: #00000000;
+ backdrop-filter: blur(12px);
+}
+
#fpaneldiv{
border: 1px #949494 solid;
background-color: #1119;
@@ -5513,6 +5525,15 @@ a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover{
background-color: #111111C0;
padding: 10px;
border: 1px solid #949494;
+ position:absolute;
+ left: 50%;
+ right 50%;
+ transform: translate(-50%);
+ top: 10%;
+ width: 40%;
+}
+.npoll-opt{
+ width: 50%;
}
#chatwrap, #videowrap{
padding-right: 0px;
diff --git a/www/js/callbacks.js b/www/js/callbacks.js
index 886289a8..fd097a7c 100644
--- a/www/js/callbacks.js
+++ b/www/js/callbacks.js
@@ -222,7 +222,9 @@ Callbacks = {
$("").appendTo(div)
.html("Go watch one of the channels that actually exists here.");
- $("#ytapiplayer").append('