up2k modal wip

contrib/plugins/minimal-up2k.html

@@ -30,7 +30,6 @@
 
     /* add some margins because now it's weird */
     .opview {margin-top: 2.5em}
-    #op_up2k {margin-top: 6em}
 
     /* and embiggen the upload button */
     #u2conf #u2btn, #u2btn {padding:1.5em 0}
@@ -38,9 +37,6 @@
     /* adjust the button area a bit */
     #u2conf.w {width: 35em !important; margin: 5em auto}
 
-    /* a */
-    #op_up2k {min-height: 0}
-
 </style>
 
 <a href="#" onclick="this.parentNode.innerHTML='';">show advanced options</a>

contrib/plugins/up2k-hook-ytid.js

@@ -14,7 +14,7 @@ function up2k_namefilter(good_files, nil_files, bad_files, hooks) {
     a_up2k_namefilter(good_files, nil_files, bad_files, hooks).then(() => { });
 }
 
-// ebi('op_up2k').appendChild(mknod('input','unick'));
+// ebi('up_inner').appendChild(mknod('input','unick'));
 
 function bstrpos(buf, ptn) {
     var ofs = 0,

copyparty/web/browser.css

@@ -2600,9 +2600,6 @@ html.y #bbox-overlay figcaption a {
 
 /* upload.css */
 
-#op_up2k {
-	padding: 0 1em 1em 1em;
-}
 .modal {
 	display: none;
 	z-index: 3;
@@ -2749,7 +2746,7 @@ html.y #bbox-overlay figcaption a {
 	width: 16em;
 	cursor: pointer;
 }
-#op_up2k.srch #u2btn {
+#up_inner.srch #u2btn {
 	border-color: var(--u2-sbtn-b1);
 }
 #u2conf #u2btn {
@@ -2797,7 +2794,7 @@ html.y #bbox-overlay figcaption a {
 	max-width: 100em;
 	margin: 0 auto;
 }
-#op_up2k.srch #u2tabf {
+#up_inner.srch #u2tabf {
 	max-width: none;
 }
 #u2tab td {
@@ -2830,7 +2827,7 @@ html.y #bbox-overlay figcaption a {
 		width: 16em;
 	}
 }
-#op_up2k.srch td.prog {
+#up_inner.srch td.prog {
 	font-family: sans-serif;
 	font-family: var(--font-main), sans-serif;
 	font-size: 1em;
@@ -3003,8 +3000,8 @@ html.b #u2conf a.b:hover {
 	box-shadow: var(--btn-1h-bs);
 	border-bottom: var(--btn-1h-bb);
 }
-#op_up2k.srch #u2conf td:nth-child(2)>*,
+#up_inner.srch #u2conf td:nth-child(2)>*,
-#op_up2k.srch #u2conf td:nth-child(3)>* {
+#up_inner.srch #u2conf td:nth-child(3)>* {
 	background: #777;
 	border-color: var(--fg);
 	box-shadow: none;
@@ -3197,8 +3194,8 @@ html.ay #u2btn {
 html.dz #u2btn {
 	letter-spacing: -.033em;
 }
-html.c #op_up2k.srch #u2btn,
+html.c #up_inner.srch #u2btn,
-html.a #op_up2k.srch #u2btn {
+html.a #up_inner.srch #u2btn {
 	background: linear-gradient(to bottom, #ca3 0%, #fd8 50%, #fc6 51%, #b92 100%);
 	text-shadow: 1px 1px 1px #fc6;
 	color: #333;
@@ -3299,9 +3296,6 @@ html.b #srch_q {
 html.b #srch_q:empty {
 	margin-bottom: -1em;
 }
-html.b #op_up2k {
-	margin-top: 3em;
-}
 html.b #tree {
 	box-shadow: 0 -1px 0 rgba(128,128,128,0.4);
 }
@@ -3335,13 +3329,13 @@ html.b #files td {
 html.b .btn {
 	top: -.1em;
 }
-html.b #op_up2k.srch sup {
+html.b #up_inner.srch sup {
 	color: #fc0;
 }
 html.by #u2btn sup {
 	color: #06b;
 }
-html.by #op_up2k.srch sup {
+html.by #up_inner.srch sup {
 	color: #b70;
 }
 html.bz #u2cards a.act {
@@ -3369,7 +3363,6 @@ html.cy .mdo a {
 }
 html.cy #wrap,
 html.cy #acc_info a,
-html.cy #op_up2k,
 html.cy #files,
 html.cy #files a,
 html.cy #files tbody div a:last-child {

copyparty/web/browser.html

@@ -71,8 +71,6 @@
 
 	<div id="op_unpost" class="opview opbox"></div>
 
-	<div id="op_up2k" class="opview"></div>
-
 	<div id="op_cfg" class="opview opbox opwide"></div>
 
 	<div id="tree"></div>
@@ -188,7 +186,7 @@
 		<div id="up_outside" class="closepane" tt=""></div>
 		<div id="up_content" class="modalcontent">
 			<a id="up_header" class="modalheader" href="#">🚀 Upload</a>
-			<div id="up_inner"></div>
+			<div id="up_inner" class="opview"></div>
 			<a id="c_up_btn" href="#" class="close btn">✕</a>
 		</div>
 	</div>

copyparty/web/up2k.js

@@ -1188,7 +1188,7 @@ function up2k_init(subtle) {
         // if ((dz == 'up_dz' && uc.fsearch) || (dz == 'srch_dz' && !uc.fsearch))
         //     tgl_fsearch();
 
-        //if (!QS('#op_up2k.act'))
+        //if (!QS('#up_inner.act'))
         if(!uc.fsearch)
             goto('up2k');
 
@@ -1644,7 +1644,7 @@ function up2k_init(subtle) {
             utw_minh = parseInt(ebi('u2tabw').style.minHeight || '0');
         }
 
-        var minh = QS('#op_up2k.act') && st.is_busy ? Math.max(utw_minh, ebi('u2tab').offsetHeight + 32) : 0;
+        var minh = QS('#up_inner.act') && st.is_busy ? Math.max(utw_minh, ebi('u2tab').offsetHeight + 32) : 0;
         if (utw_minh < minh || !utw_minh) {
             utw_minh = minh;
             ebi('u2tabw').style.minHeight = utw_minh + 'px';
@@ -3308,7 +3308,7 @@ function up2k_init(subtle) {
             var ico = uc.fsearch ? '🔎' : '🚀',
                 desc = uc.fsearch ? L.ul_btns : L.ul_btnu;
 
-            clmod(ebi('op_up2k'), 'srch', uc.fsearch);
+            clmod(ebi('up_inner'), 'srch', uc.fsearch);
             ebi('u2bm').innerHTML = ico + '&nbsp; <sup>' + desc + '</sup>';
         }
         catch (ex) { }
@@ -3464,7 +3464,7 @@ ebi('ico1').onclick = function () {
 };
 
 
-if (QS('#op_up2k.act'))
+if (QS('#up_inner.act'))
     goto_up2k();
 
 apply_perms({ "perms": perms, "frand": frand, "u2ts": u2ts });