Skip to content

Commit

Permalink
dashboard style impact #550 ; 3.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rello
Rello committed Aug 20, 2021
1 parent 3208999 commit fcf5a6c
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 37 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Changelog
All notable changes to the Audio Player project will be documented in this file.

## 3.2.1 - 2021-08-20
### Fixed
- dashboard style impact #550

## 3.2.0 - 2021-08-19
### Added
- NC22
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
- [ID3 editor](https://github.com/rello/audioplayer_editor) via add-on
See [README](https://github.com/rello/audioplayer/blob/master/README.md) file for all supported MIME types and additional information.]]></description>
<version>3.2.0</version>
<version>3.2.1</version>
<licence>agpl</licence>
<author>Marcel Scherello</author>
<namespace>audioplayer</namespace>
Expand Down
42 changes: 21 additions & 21 deletions css/dashboard.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,42 +17,42 @@
@include icon-color('app', 'audioplayer', $color-black, 1);
}

.panel--content .playerButton {
.panel--content .APplayerButton {
width: 40px;
height: 40px;
position: relative;
display: inline-block;
}

.panel--content .playerBar {
.panel--content .APplayerBar {
width: 130px;
margin: auto;
}

.panel--content .categoryBar,
.panel--content .coverBar,
.panel--content .itemBar,
.panel--content .titleBar {
.panel--content .APcategoryBar,
.panel--content .APcoverBar,
.panel--content .APitemBar,
.panel--content .APtitleBar {
margin: auto;
width: 180px;
margin-top: 10px;
}

.panel--content .titleBar {
.panel--content .APtitleBar {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}

.panel--content .coverBar .cover {
.panel--content .APcoverBar .APcover {
width: 180px;
height: 180px;
text-align: center;
font-size: 60px;
line-height: 150px;
}

.panel--content .button {
.panel--content .APbutton {
background-size: 80%;
background-position: center center;
position: absolute;
Expand All @@ -63,35 +63,35 @@
opacity: 0.4;
}

.panel--content .button.previous {
.panel--content .APbutton.APprevious {
@include icon-color('previous', 'audioplayer', $color-black, 1);
}

.panel--content .button.next {
.panel--content .APbutton.APnext {
@include icon-color('next', 'audioplayer', $color-black, 1);
}

.panel--content .button.play-pause {
.panel--content .APbutton.APplay-pause {
@include icon-color('play', 'audioplayer', $color-black, 1);
}

.panel--content .button.play-pause.playing {
.panel--content .APbutton.APplay-pause.playing {
@include icon-color('pause', 'audioplayer', $color-black, 1);
}

.panel--content .button.previous,
.panel--content .button.play-pause,
.panel--content .button.previous,
.panel--content .button.next {
.panel--content .APbutton.APprevious,
.panel--content .APbutton.APplay-pause,
.panel--content .APbutton.APprevious,
.panel--content .APbutton.APnext {
background-size: 80%;
background-position: center center;
opacity: 0.5;
}

.panel--content .button.previous:hover,
.panel--content .button.play-pause:hover,
.panel--content .button.previous:hover,
.panel--content .button.next:hover {
.panel--content .APbutton.APprevious:hover,
.panel--content .APbutton.APplay-pause:hover,
.panel--content .APbutton.APprevious:hover,
.panel--content .APbutton.APnext:hover {
opacity: 1;
}

Expand Down
28 changes: 14 additions & 14 deletions js/dashboard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ OCA.Audioplayer.Player = {
}
// new track to be played
if (trackToPlay.src !== this.html5Audio.getAttribute('src')) {
document.getElementById('playerPlay').classList.replace('play-pause', 'icon-loading')
document.getElementById('playerPlay').classList.replace('APplay-pause', 'icon-loading')
this.lastSavedSecond = 0;
this.html5Audio.setAttribute('src', trackToPlay.src);
this.html5Audio.load();
Expand All @@ -124,14 +124,14 @@ OCA.Audioplayer.Player = {
let playPromise = this.html5Audio.play();
if (playPromise !== undefined) {
playPromise.then(_ => {
document.getElementById('playerPlay').classList.replace('icon-loading', 'play-pause');
document.getElementById('playerPlay').classList.replace('icon-loading', 'APplay-pause');
document.getElementById('playerPlay').classList.add('playing');
OCA.Audioplayer.Player.indicateCurrentPlayingTrack();
})
.catch(error => {
OCA.Audioplayer.Player.stop();
document.getElementById('playerPlay').classList.replace('icon-loading','icon-loading');
document.getElementById('playerPlay').classList.replace('play-pause','play');
document.getElementById('playerPlay').classList.replace('APplay-pause','play');
});
}

Expand Down Expand Up @@ -243,17 +243,17 @@ OCA.Audioplayer.Dashboard = {
},

buildPlayer: function () {
return '<div id="" class="playerBar">'
+ '<div class="playerButton" title="' + t('audioplayer', 'Previous track') + '">'
+ '<div id="playerPrev" class="button previous"></div></div>'
+ '<div class="playerButton" title="' + t('audioplayer', 'Play/Pause') + '">'
+ '<div id="playerPlay" class="button play-pause"></div></div>'
+ '<div class="playerButton" title="' + t('audioplayer', 'Next track') + '">'
+ '<div id="playerNext" class="button next"></div></div><audio id="html5Audio" hidden=""></audio></div>';
return '<div id="" class="APplayerBar">'
+ '<div class="APplayerButton" title="' + t('audioplayer', 'Previous track') + '">'
+ '<div id="playerPrev" class="APbutton button APprevious"></div></div>'
+ '<div class="APplayerButton" title="' + t('audioplayer', 'Play/Pause') + '">'
+ '<div id="playerPlay" class="APbutton button APplay-pause"></div></div>'
+ '<div class="APplayerButton" title="' + t('audioplayer', 'Next track') + '">'
+ '<div id="playerNext" class="APbutton button APnext"></div></div><audio id="html5Audio" hidden=""></audio></div>';
},

buildCategoryDropdown: function () {
return '<div class="categoryBar">\n' +
return '<div class="APcategoryBar">\n' +
'<select id="audiplayerCategory" style="width: 180px;">\n' +
'<option value="" selected>' + t('audioplayer', 'Selection') + '</option>\n' +
'<option value="Playlist">' + t('audioplayer', 'Playlists') + '</option>\n' +
Expand All @@ -270,21 +270,21 @@ OCA.Audioplayer.Dashboard = {
},

buildItemDropdown: function () {
return '<div class="itemBar">\n' +
return '<div class="APitemBar">\n' +
'<select id="audioplayerItem" style="width: 180px;">\n' +
'</select>\n' +
'</div>\n'
},

buildItemCover: function () {
return '<div class="coverBar">\n' +
return '<div class="APcoverBar">\n' +
'<div id="audioplayerLoading" style="text-align:center; padding-top:100px" class="icon-loading" hidden></div>' +
'<div id="audioplayerCover" class="cover"></div>' +
'</div>\n'
},

buildCurrentTitle: function () {
return '<div class="titleBar">\n' +
return '<div class="APtitleBar">\n' +
'<div id="audioplayerTitle" style="width: 180px;">\n' +
'</div>\n' +
'</div>\n'
Expand Down
2 changes: 1 addition & 1 deletion lib/Migration/Version3002Date20210019213332.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function postSchemaChange(IOutput $output, Closure $schemaClosure, array
$query = $this->connection->getQueryBuilder();
$query->insert('audioplayer_whats_new')
->values([
'version' => $query->createNamedParameter('3.2.0'),
'version' => $query->createNamedParameter('3.2.1'),
'data' => $query->createNamedParameter('{"changelogURL":"https:\/\/github.com\/rello\/audioplayer\/blob\/master\/CHANGELOG.md","whatsNew":{
"en":{"regular":["Collaborative tags support","Dashboard widget"],"admin":["New Features apply to users"]},
"de":{"regular":["Collaborative tags support","Dashboard widget"],"admin":["Nur User Features"]}
Expand Down

0 comments on commit fcf5a6c

Please sign in to comment.