Skip to content

Commit

Permalink
Feat: central form2json and json2form functions
Browse files Browse the repository at this point in the history
  • Loading branch information
jcorporation committed Aug 2, 2023
1 parent 47fe6ea commit 8b8ff60
Show file tree
Hide file tree
Showing 28 changed files with 862 additions and 810 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@ Describe the release here.

### Changelog

- Feat: move song fingerprint calculation in worker thread
- Feat: move song fingerprint calculation in worker thread #1046
- Feat: display album tags in jukebox album list #1069
- Feat: add option for compact grids #1074
- Feat: add advanced search to more views #1048
- Feat: add more inline help text's #1072
- Upd: some code enhancements #1045
- Upd: merge MYMPD_API_QUEUE_SEARCH_ADV and MYMPD_API_QUEUE_LIST into MYMPD_API_QUEUE_SEARCH
- Upd: Bootstrap 5.3.1
- Upd: rework settings
- Fix: calculate correct position for jukebox list
- Fix: calculate correct position for playlist content list

Expand Down
24 changes: 12 additions & 12 deletions docs/references/translating_status.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
- es-AR: 78 missing phrases
- es-ES: 733 missing phrases
- es-VE: 740 missing phrases
- fi-FI: 736 missing phrases
- fr-FR: 78 missing phrases
- it-IT: 78 missing phrases
- ja-JP: 80 missing phrases
- ko-KR: 78 missing phrases
- nl-NL: 78 missing phrases
- pl-PL: 920 missing phrases
- ru-RU: 177 missing phrases
- zh-Hans: 78 missing phrases
- es-AR: 80 missing phrases
- es-ES: 735 missing phrases
- es-VE: 742 missing phrases
- fi-FI: 738 missing phrases
- fr-FR: 80 missing phrases
- it-IT: 80 missing phrases
- ja-JP: 82 missing phrases
- ko-KR: 80 missing phrases
- nl-NL: 80 missing phrases
- pl-PL: 922 missing phrases
- ru-RU: 179 missing phrases
- zh-Hans: 80 missing phrases
15 changes: 8 additions & 7 deletions htdocs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -1486,9 +1486,9 @@ <h4 data-phrase="Statistics"></h4>
<h4 data-phrase="Smart playlists"></h4>
<div id="SettingSmartplsWarn" class="alert alert-warning d-none" data-phrase="MPD does not support playlists"></div>
<div class="mb-3 row">
<label class="col-sm-4 col-form-label" for="SettingSmartplsEnableBtn" data-phrase="Smart playlists"></label>
<label class="col-sm-4 col-form-label" for="SettingSmartplsEnableInput" data-phrase="Smart playlists"></label>
<div class="col-sm-8 ">
<button id="SettingSmartplsEnableBtn" data-bs-toggle="collapse" data-bs-target="#SettingSmartplsCollapse" data-href='{"cmd": "toggleBtnChk", "options": []}' type="button" class="btn btn-sm btn-secondary mi"></button>
<button id="SettingSmartplsEnableInput" data-bs-toggle="collapse" data-bs-target="#SettingSmartplsCollapse" data-href='{"cmd": "toggleBtnChk", "options": []}' type="button" class="btn btn-sm btn-secondary mi"></button>
</div>
</div>
<div class="collapse" id="SettingSmartplsCollapse">
Expand Down Expand Up @@ -1547,25 +1547,26 @@ <h4 data-phrase="Notifications"></h4>
<form id="settingsNotificationsFrm"></form>
<div id="SettingNotifyWebWarn" class="alert alert-warning d-none" data-phrase="Web notifications are blocked by the browser"></div>
<hr/>
<h4 data-phrase="Facilities"></h4>
<form id="settingsFacilitiesFrm"></form>
</div>
<div class="tab-pane" id="tabEnableFeatures">
<h4 data-phrase="Lyrics"></h4>
<div class="mb-3 row">
<label class="col-sm-4 col-form-label" for="SettingLyricsEnableBtn" data-phrase="Enable"></label>
<label class="col-sm-4 col-form-label" for="SettingEnableLyricsInput" data-phrase="Enable"></label>
<div class="col-sm-8 ">
<button id="SettingLyricsEnableBtn" data-bs-toggle="collapse" data-bs-target="#SettingLyricsCollapse" data-href='{"cmd": "toggleBtnChk", "options": []}' type="button" class="btn btn-sm btn-secondary mi"></button>
<button id="SettingEnableLyricsInput" data-bs-toggle="collapse" data-bs-target="#SettingLyricsCollapse" data-href='{"cmd": "toggleBtnChk", "options": []}' type="button" class="btn btn-sm btn-secondary mi"></button>
<small class="help" data-phrase="helpSettingsEnableLyrics"></small>
</div>
</div>
<div class="collapse" id="SettingLyricsCollapse"></div>
<div id="SettingLyricsEnableBtnWarn" class="alert alert-warning" data-phrase="Music directory not available"></div>
<div id="SettingEnableLyricsInputWarn" class="alert alert-warning" data-phrase="Music directory not available"></div>
<hr/>
<h4 data-phrase="Local playback"></h4>
<div class="mb-3 row">
<label class="col-sm-4 col-form-label" for="SettingLocalPlaybackEnableBtn" data-phrase="Enable"></label>
<label class="col-sm-4 col-form-label" for="SettingEnableLocalPlaybackInput" data-phrase="Enable"></label>
<div class="col-sm-8 ">
<button id="SettingLocalPlaybackEnableBtn" data-bs-toggle="collapse" data-bs-target="#SettingLocalPlaybackCollapse" data-href='{"cmd": "toggleBtnChk", "options": []}' type="button" class="btn btn-sm btn-secondary mi"></button>
<button id="SettingEnableLocalPlaybackInput" data-bs-toggle="collapse" data-bs-target="#SettingLocalPlaybackCollapse" data-href='{"cmd": "toggleBtnChk", "options": []}' type="button" class="btn btn-sm btn-secondary mi"></button>
<small class="help" data-phrase="helpSettingsEnableLocalPlayback"></small>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion htdocs/js/clickActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ function seekRelative(offset) {
function clickPlay() {
switch(currentState.state) {
case 'play':
if (settings.webuiSettings.uiFooterPlaybackControls === 'stop' ||
if (settings.webuiSettings.footerPlaybackControls === 'stop' ||
isStreamUri(currentSongObj.uri) === true)
{
//always stop streams
Expand Down
4 changes: 2 additions & 2 deletions htdocs/js/features.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ function setFeatures() {
//web ui features
features.featCacert = settings.features.featCacert;
features.featHome = settings.webuiSettings.enableHome;
features.featVolumeLevel = settings.webuiSettings.uiFooterVolumeLevel;
features.featVolumeLevel = settings.webuiSettings.footerVolumeLevel;
features.featLocalPlayback = settings.webuiSettings.enableLocalPlayback === true ?
(settings.partition.mpdStreamPort > 0 || settings.partition.streamUri.length > 0 ? true : false) : false;
features.featScripting = settings.webuiSettings.enableScripting === true ?
settings.features.featScripting : false;
features.featTimer = settings.webuiSettings.enableTimer;
features.featTrigger = settings.webuiSettings.enableTrigger;
features.featMediaSession = checkMediaSessionSupport();
features.featFooterNotifications = settings.webuiSettings.uiFooterNotifications;
features.featFooterNotifications = settings.webuiSettings.footerNotifications;
features.featSession = settings.pin;

//mpd features
Expand Down
Loading

0 comments on commit 8b8ff60

Please sign in to comment.