diff --git a/src/manager.c b/src/manager.c index 86c3ba3..a3c16d5 100644 --- a/src/manager.c +++ b/src/manager.c @@ -3810,7 +3810,7 @@ static int mgr_get_param(void *inst, const char *key, char *b, int n) { web_link(m, u, sizeof u); if (!u[0]) snprintf(b, n, " "); else if (key[0] == 'h') snprintf(b, n, "WEB PAGE %s", u + 7); /* the header: no "http://", browsers add it */ - else snprintf(b, n, "Open %s on your phone or computer", u); + else snprintf(b, n, "%s", u); /* SETTINGS: the full address; the row text below says what it is for */ } else if (!strcmp(key, "set_web_txt")) snprintf(b, n, "%s%s", m->web_pref ? "ON" : "OFF", m->web_pref != m->web_on ? " \xc2\xb7 restart" : ""); else if (!strcmp(key, "set_bgsrv_txt")) { diff --git a/tests/run.sh b/tests/run.sh index 0ba8e63..2482180 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -253,7 +253,7 @@ grep -qF "before: beta=SHOWN web=ON" /tmp/settings.out && grep -qF "after: beta= # the web page address in the PLUGINS header and on the SETTINGS row while the page is served (users could not find it) rm -f /tmp/openmpc-pm/.openmpcpm-settings /media/*/.openmpcpm-settings /sdcard/.openmpcpm-settings 2>/dev/null || true /tmp/drive_addins settings > /tmp/settings_web.out -grep -qE "web address: header=\|WEB PAGE [0-9.]+:8790\| settings=\|Open http://[0-9.]+:8790 on your phone or computer\|" /tmp/settings_web.out || { grep "web address" /tmp/settings_web.out; exit 1; } +grep -qE "web address: header=\|WEB PAGE [0-9.]+:8790\| settings=\|http://[0-9.]+:8790\|" /tmp/settings_web.out || { grep "web address" /tmp/settings_web.out; exit 1; } grep -qF "cache queued: |99% used ยท clears on APPLY| apply=1" /tmp/settings.out || { cat /tmp/settings.out; exit 1; } grep -qx "beta=1" /media/az01-internal/.openmpcpm-settings && grep -qx "web=0" /media/az01-internal/.openmpcpm-settings || { cat /media/az01-internal/.openmpcpm-settings; exit 1; } # ABOUT: the page names the running version (PM_VERSION) and this MPC, and never claims an installed copy it cannot see diff --git a/vst/layout.conf b/vst/layout.conf index 6ad4e3b..14609f4 100644 --- a/vst/layout.conf +++ b/vst/layout.conf @@ -1782,7 +1782,8 @@ readout box=0 w=260 h=30 cx=930 cy=297 label="" key=set_beta_txt tsize=22 tweigh art file=images/set_row_web.svg x=24 y=346 w=1232 h=82 button cx=1160 cy=387 label="" key=set_web_btn img=images/set_btn.svg w=150 h=46 readout box=0 w=260 h=30 cx=930 cy=387 label="" key=set_web_txt tsize=22 tweight=bold tcolor=ececed talign=right tpad=0 -readout box=0 w=560 h=28 cx=500 cy=374 label="" key=set_web_url tsize=22 tweight=bold tcolor=ececed talign=left tpad=0 +# the address beside the WEB PAGE title, the title's size (22 read small and high on a Force, 1.3.5) +readout box=0 w=460 h=40 cx=455 cy=372 label="" key=set_web_url tsize=32 tweight=bold tcolor=ececed talign=left tpad=0 art file=images/set_row_bgsrv.svg x=24 y=436 w=1232 h=82 button cx=1160 cy=477 label="" key=set_bgsrv_btn img=images/set_btn.svg w=150 h=46 readout box=0 w=300 h=30 cx=890 cy=477 label="" key=set_bgsrv_txt tsize=22 tweight=bold tcolor=ececed talign=right tpad=0