diff --git a/htdocs/css/openwebrx-globals.css b/htdocs/css/openwebrx-globals.css index 41ef284..f3748ee 100644 --- a/htdocs/css/openwebrx-globals.css +++ b/htdocs/css/openwebrx-globals.css @@ -6,3 +6,7 @@ html, body font-family: "DejaVu Sans", Verdana, Geneva, sans-serif; } +.sprite { + background-image: url(../gfx/openwebrx-sprites.png); + display: inline-block; +} diff --git a/htdocs/css/openwebrx-header.css b/htdocs/css/openwebrx-header.css index 8c43360..0b33a36 100644 --- a/htdocs/css/openwebrx-header.css +++ b/htdocs/css/openwebrx-header.css @@ -192,3 +192,44 @@ text-shadow: none; } +.sprite-panel-log { + background-position: 0 0; + width: 38px; + height: 38px; +} + +.sprite-panel-receiver { + background-position: -38px 0; + width: 40px; + height: 38px; +} + +.sprite-panel-map { + background-position: -78px 0; + width: 38px; + height: 38px; +} + +.sprite-panel-settings { + background-position: -116px 0; + width: 38px; + height: 38px; +} + +.sprite-panel-status { + background-position: -154px 0; + width: 44px; + height: 38px; +} + +.sprite-rx-details-arrow-down { + background-position: -141px -467px; + width: 43px; + height: 12px; +} + +.sprite-rx-details-arrow-up { + background-position: -141px -455px; + width: 43px; + height: 12px; +} \ No newline at end of file diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css index fee3153..aa54163 100644 --- a/htdocs/css/openwebrx.css +++ b/htdocs/css/openwebrx.css @@ -1162,3 +1162,79 @@ img.openwebrx-mirror-img margin: -10px; } +.sprite-zoom { + background-size: 55px 151px; + width: 27px; + height: 27px; +} + +.sprite-zoom-in { + background-position: 0 -10px; +} + +.sprite-zoom-out { + background-position: 0 -38px; +} + +.sprite-zoom-in-total { + background-size: 49px 133px; + background-position: 0 -57.5px; + width: 24px; +} + +.sprite-zoom-out-total { + background-size: 50px 139px; + background-position: 0 -88.5px; + width: 25px; +} + +.sprite-edit { + background-size: 70.7px 193.2px; + background-position: -35px -145.25px; + width: 14px; + height: 14px; +} + +.sprite-trashcan { + background-size: 70.7px 193.2px; + background-position: -49px -145.25px; + width: 14px; + height: 14px; +} + +.sprite-speaker { + background-size: 29.2px 79.7px; + width: 14px; + height: 14.6px; +} + +#openwebrx-mute-on .sprite-speaker { + background-position: -14.4px -20.4px; +} + +#openwebrx-mute-off .sprite-speaker { + background-position: -14.4px -5.8px; +} + +.sprite-squelch { + background-size: 28.3px 77.3px; + background-position: 0 -64.3px; + width: 14px; + height: 13px; +} + +.sprite-waterfall { + background-size: 27.7px 75.8px; +} + +.sprite-waterfall-auto { + background-position: -13.7px -45.6px; + width: 14px; + height: 11.4px; +} + +.sprite-waterfall-default { + background-position: -13.7px -33.2px; + width: 14px; + height: 12.5px; +} \ No newline at end of file diff --git a/htdocs/gfx/openwebrx-sprites.png b/htdocs/gfx/openwebrx-sprites.png new file mode 100644 index 0000000..fc3dee1 Binary files /dev/null and b/htdocs/gfx/openwebrx-sprites.png differ diff --git a/htdocs/include/header.include.html b/htdocs/include/header.include.html index d4a2b53..c66aed1 100644 --- a/htdocs/include/header.include.html +++ b/htdocs/include/header.include.html @@ -9,14 +9,14 @@
- - + +
-
Status
Status
-
Log
Log
-
Receiver
Receiver
- Map
Map
+

Status
+

Log
+

Receiver
+
Map
${settingslink}
diff --git a/htdocs/index.html b/htdocs/index.html index 22f33bb..0bd5332 100644 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -162,22 +162,22 @@
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
0 dB
diff --git a/htdocs/lib/BookmarkBar.js b/htdocs/lib/BookmarkBar.js index ecae43b..35e8919 100644 --- a/htdocs/lib/BookmarkBar.js +++ b/htdocs/lib/BookmarkBar.js @@ -87,8 +87,8 @@ BookmarkBar.prototype.render = function(){ var $bookmark = $( '
' + '
' + - '
' + - '
' + + '
' + + '
' + '
' + '
' + b.name + '
' + '
' diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js index 4e33a94..c597e2d 100644 --- a/htdocs/openwebrx.js +++ b/htdocs/openwebrx.js @@ -44,13 +44,11 @@ function toggleMute() { if (mute) { mute = false; e("openwebrx-mute-on").id = "openwebrx-mute-off"; - e("openwebrx-mute-img").src = "static/gfx/openwebrx-speaker.png"; e("openwebrx-panel-volume").disabled = false; e("openwebrx-panel-volume").value = volumeBeforeMute; } else { mute = true; e("openwebrx-mute-off").id = "openwebrx-mute-on"; - e("openwebrx-mute-img").src = "static/gfx/openwebrx-speaker-muted.png"; e("openwebrx-panel-volume").disabled = true; volumeBeforeMute = e("openwebrx-panel-volume").value; e("openwebrx-panel-volume").value = 0;