Merge pull request #1844 from rern/UPDATE

Update
rern · Dec 11, 2024 · 173623c · 173623c
2 parents 83d84f3 + c08de19
commit 173623c
Show file tree

Hide file tree

Showing 31 changed files with 410 additions and 421 deletions.
diff --git a/install.sh b/install.sh
@@ -4,6 +4,10 @@ alias=r1
 
 . /srv/http/bash/settings/addons.sh
 
+# 20241212
+file=$dirsystem/display.json
+! grep -q overlayno $file && sed -i '/composername/ a\  "overlayno": false,' $file
+
 # 20241208
 rm -f $dirshm/playlist*
 

diff --git a/srv/http/assets/css/addons.css b/srv/http/assets/css/addons.css
@@ -119,8 +119,6 @@ a:hover {
 }
 .infobtn.disabled {
 	pointer-events: auto;
-	-webkit-user-select: none;
-	user-select: none;
 }
 #list,
 #list li {

diff --git a/srv/http/assets/css/camilla.css b/srv/http/assets/css/camilla.css
@@ -101,10 +101,13 @@
 	width: 230px;
 }
 #divvolume .col-l a {
-	width: 128px;
+	max-width: calc( 100% - 25px );
 }
 #divvolume .col-l i {
+	margin: 0 -15px 0 0;
+	width: 40px;
 	line-height: 40px;
+	text-align: center;
 }
 #divvolume .col-r {
 	white-space: nowrap;
@@ -331,9 +334,6 @@ i.disabled {
 .liinput .i-volume::before {
 	margin-left: 7px !important;
 }
-#divvolume c {
-	margin: 0 -4px;
-}
 .i-volume.mute {
 	color: var( --cml ) !important;
 }
@@ -474,9 +474,3 @@ i.disabled {
 #filters li {
 	cursor: default !important;
 }
-#divvolume,
-.i-minus,
-.i-plus {
-	-webkit-user-select: none;
-	user-select: none;
-}
diff --git a/srv/http/assets/css/common.css b/srv/http/assets/css/common.css
@@ -5,11 +5,12 @@
 #data,
 #degug        { z-index: 110 }
 .head         { z-index: 95 }
+.fader        { z-index: 20 !important }
 .albumrefresh { z-index: 1 }
 
 @font-face {
 	font-family : rern;
-	src         : url( '/assets/fonts/rern.woff2?v=1733554181' );
+	src         : url( '/assets/fonts/rern.woff2?v=1733897751' );
 }
 @font-face {
 	font-family : Lato;
@@ -255,6 +256,12 @@ body {
 	-moz-box-sizing    :border-box;
 	box-sizing         :border-box;
 }
+i,
+.infobtn,
+#debug {
+	-webkit-user-select: none;
+	user-select: none;
+}
 sp {
 	display: inline-block;
 	height: 0;
@@ -271,30 +278,20 @@ sp {
 	animation: blinkopaque 1.5s linear infinite;
 	text-shadow: none !important;
 }
-.infobtn,
-.infomessage,
-#debug,
-#infoOverlay {
-	-webkit-user-select: text;
-	user-select: text;
-}
 input:focus {
 	outline: none;
 }
 .select2-container.focus {
 	outline: 2px solid var(--cgl );
 	outline-offset: 1px;
 }
-#loader,
-#fader {
+#loader {
 	position   : fixed;
 	top        : 0;
 	width      : 100%;
 	height     : 100%;
-	background : rgba(0, 0, 0, 0.8);
-}
-#fader {
-	z-index: 20;
+	background : #000000;
+	opacity    : 0.8;
 }
 #loader svg {
 	position  : absolute;
@@ -377,7 +374,7 @@ codered  {
 .head .title {
 	display: inline-block;
 	margin-left: 15px;
-	width: calc( 100% - 135px );
+	max-width: calc( 100% - 135px );
 	line-height: 40px;
 	font-size: 26px;
 	font-weight: 300;
@@ -1110,9 +1107,6 @@ input[ type=radio ]:disabled {
 }
 
 @supports ( -webkit-touch-callout: none ) { /* ios only */
-	.head i {
-		line-height: 42px;
-	}
 	input[ type=checkbox ]:checked:disabled {
 		background-color: var( --cml );
 	}

diff --git a/srv/http/assets/css/main.css b/srv/http/assets/css/main.css
@@ -218,13 +218,6 @@ i.map.disabled, .map.disabled i {
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
-.page,
-#bar-bottom,
-#bar-top,
-#settings {
-	-webkit-user-select: none;
-	user-select: none;
-}
 #bar-top.disabled,
 #bar-bottom.disabled,
 .content-top.disabled,
@@ -242,14 +235,9 @@ i.map.disabled, .map.disabled i {
 	position: fixed;
 	width: 100%;
 	height: 40px;
-	background: linear-gradient( to left, var( --cg ) calc( 100% - 50px ), var( --cgd ) 100% );
-}
-#bar-bottom {
-	bottom: 0;
-	background: none;
 }
-#bar-bottom.transparent {
-	display: block !important;
+#bar-top {
+	background: linear-gradient( to left, var( --cg ) calc( 100% - 50px ), var( --cgd ) 100% );
 }
 .content-top,
 .licover,
@@ -296,12 +284,16 @@ i.map.disabled, .map.disabled i {
 }
 /* ---------------------- bar-bottom ----------------------*/
 #bar-bottom {
+	bottom: 0;
 	font-size: 28px;
 	line-height: 40px;
 	color: var( --cw );
+	background: none;
+}
+#bar-bottom.transparent {
+	display: block !important;
 }
 #bar-bottom i {
-	display: inline-block;
 	width: calc( 100% / 3 );
 	text-align: center;
 }

diff --git a/srv/http/assets/css/settings.css b/srv/http/assets/css/settings.css
@@ -1,5 +1,5 @@
+#bar-bottom { z-index: 95 }
 .menu { z-index: 11 }
-#bar-bottom { z-index: 5 }
 .container input[type=checkbox] { z-index: 1 }
 
 #listwlscan .i-lock { font-size: 16px; vertical-align: 1px }
@@ -30,15 +30,6 @@
 	text-shadow: var( --shadow-text );
 }
 
-heading,
-.col-l,
-.entries li {
-	-webkit-user-select: none;
-	user-select: none;
-}
-#loader {
-	background: #000000;
-}
 .head,
 #bar-bottom {
 	box-shadow: var( --shadow-bar );
@@ -283,41 +274,32 @@ heading i.disabled {
 	bottom: 0;
 	width: 100%;
 	height: 40px;
-	padding: 0 55px;
-	font-size: 28px;
-	line-height: 35px;
 	text-align: center;
 	background: var( --cga );
 	touch-action: manipulation; /* fix: Unable to preventDefault inside passive event listener */
 }
-@supports ( -webkit-touch-callout: none ) { /* ios only */
-	#bar-bottom { line-height: 30px }
-	.helpblock i { vertical-align: 0 }
-}
 #bar-bottom div {
 	display: inline-block;
 	width: calc( 100% / 5 );
-	max-width: 160px;
+	max-width: 162px;
 	height: 40px;
+	line-height: 40px;
+	font-size: 16px;
+	font-weight: 300;
+	color: var( --cg60 );
 	cursor: pointer;
 }
-#bar-bottom.guide div {
-	width: calc( 100% / 4 );
-}
-#bar-bottom div.active a {
+#bar-bottom div.active {
 	color: var( --cw ) !important;
 }
 #bar-bottom i {
-	width: 30px;
-	vertical-align: -3px;
+	vertical-align: middle;
 	font-size: 24px;
 	color: var( --cw );
 	text-shadow: var( --shadow-text );
 }
-#bar-bottom a {
-	font-size: 16px;
-	font-weight: 300;
-	color: var( --cg60 );
+#bar-bottom span {
+	margin-left: 10px;
 }
 .transparent {
 	opacity: 0 !important;
@@ -508,9 +490,6 @@ input.disabled + .switchlabel:after {
 	padding: 0 calc( ( 100% - 650px ) / 2 ) 80px;
 	overflow: auto;
 }
-.container.addonsprogress {
-	padding-bottom: 0;
-}
 .col-l,
 .col-r {
 	float: left;
@@ -607,51 +586,23 @@ input.disabled + .switchlabel:after {
 .head .i-gear {
 	display: none;
 }
-#guideimg {
-	display: block;
-	margin: 50vh auto 0;
-	transform: translateY(-50%);
-	width: auto;
-	height: auto;
-	max-width: 650px;
-	max-height: calc( 100% - 80px );
-	border: 1px solid hsl(0,0%,15%);
-}
-#prev,
-#next {
-	display: none;
-	width: 40px !important;
-	line-height: 40px;
-}
 #divsoxr .helpblock span {
 	display: inline-block;
 	width: 112px;
 }
 
-@media (max-height: 730px) {
-	#guideimg {
-		margin-top: 40px;
-		transform: unset;
-	}
-}
 @media (max-height: 570px) {
 	.helphead { margin-right: 0 }
 	.head .i-gear { display: inline-block }
 	.container { height: calc( 100% - 40px ) }
-	#guideimg { max-height: calc( 100% - 40px ) }
 	#bar-bottom { display: none }
 }
-@media (max-width: 800px) {
-	#bar-bottom { padding: 0 20px }
-}
 @media (max-width: 700px) {
 	.container { padding: 0 10px 80px }
 }
-@media (max-width: 650px) {
-	#guideimg { max-width: 100% }
-}
 @media ( max-width: 580px ) {
 	.head { padding-right: 0 !important }
+	#bar-bottom span,
 	wide { display: none }
 }
 @media (max-width: 515px) {
@@ -675,7 +626,6 @@ input.disabled + .switchlabel:after {
 	.listtitle a { width: calc( 100% / 13 ) }
 }
 @media (max-width: 615px) {
-	#bar-bottom { padding: 0 }
 	#bar-bottom a,
 	#debug { display: none }
 }
@@ -688,13 +638,7 @@ input.disabled + .switchlabel:after {
 	#divmpd .help { display: none }
 }
 @media (hover: hover) {
-	#bar-bottom.guide div { width: calc( 100% / 5 ) }
-	#prev,
-	#next { display: inline-block }
-	#fader { z-index: 5 }
 	#bar-bottom div:hover,
-	#next:hover,
-	#prev:hover { background-color: var( --cgd ) }
 	#bar-bottom div.active:hover { background-color: var( --cma ) }
 	a:hover { text-decoration: none }
 	.entries li:hover { background: var( --cga ) }
@@ -707,7 +651,7 @@ input.disabled + .switchlabel:after {
 	.back,
 	.btn,
 	.clipped::after,
-	.close,
+	.i-close,
 	.code,
 	.col-l.icon,
 	.divgain i,
@@ -719,7 +663,6 @@ input.disabled + .switchlabel:after {
 	.img,
 	.listtitle,
 	.page-icon,
-	.prev-next,
 	.setting,
 	.settings,
 	.settingedit,
@@ -771,3 +714,6 @@ input.disabled + .switchlabel:after {
 		outline: none;
 	}
 }
+@supports ( -webkit-touch-callout: none ) { /* ios only */
+	#bar-bottom i { vertical-align: -3px !important }
+}
diff --git a/srv/http/assets/js/addons.js b/srv/http/assets/js/addons.js
@@ -2,6 +2,7 @@ V              = {} // var global
 var icon       = 'addons';
 var keys       = [ 'installurl', 'postinfo', 'title', 'uninstall', 'version' ];
 
+$( '.helphead' ).remove();
 if ( [ 'localhost', '127.0.0.1' ].includes( location.hostname ) ) $( 'a' ).removeAttr( 'href' );
 $( '.container' ).on( 'click', '.revision', function() {
 	$this = $( this );
@@ -138,8 +139,8 @@ function renderPage() {
 	} );
 	html       = '<ul id="list">'+ list +'</ul>'+ addons;
 	$( '.container' ).html( html ).promise().done( function() {
-		$( '.container' ).removeClass( 'hide' );
 		if ( ! S.status.online ) $( '.infobtn' ).addClass( 'disabled' );
+		$( '.head, .container, #bar-bottom' ).removeClass( 'hide' );
 		loaderHide();
 		$( 'a[ href ]' ).prop( 'tabindex', -1 );
 		$( '.infobtn:not(.disabled)' ).prop( 'tabindex', 0 );