diff --git a/webapp/css/satbd.sateliite.bar.css b/webapp/css/satbd.sateliite.bar.css
index b32e0ef..7a19422 100644
--- a/webapp/css/satbd.sateliite.bar.css
+++ b/webapp/css/satbd.sateliite.bar.css
@@ -31,6 +31,10 @@ body > .container-fluid {
}
}
+.album a {
+ color: #333;
+}
+
.cover-container {
width:100%;
display: inline-block;
@@ -53,7 +57,30 @@ body > .container-fluid {
overflow:hidden;
}
+.cover-container .cover .rating {
+ position: absolute;
+ bottom:0px;
+ right:0px;
+ width:100%;
+ background-color: rgba(255,255,255,0.4);
+ text-align:right;
+ padding:5px;
+}
+.album-ellipsis {
+}
+
+.album .album-ellipsis p{
+ width:100%;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow:ellipsis;
+ margin-bottom: 0px;
+}
+
+.album .album-ellipsis p:last-child{
+ margin-bottom: 15px;
+}
/* @media (max-width: 767px) { */
/* .album { */
/* height: 50vw; */
diff --git a/webapp/html/albumModal.html b/webapp/html/albumModal.html
new file mode 100644
index 0000000..48fc14a
--- /dev/null
+++ b/webapp/html/albumModal.html
@@ -0,0 +1,10 @@
+
+
+ Mais bite quoi
+
+
diff --git a/webapp/js/directives.js b/webapp/js/directives.js
index 3f18b3f..8269324 100644
--- a/webapp/js/directives.js
+++ b/webapp/js/directives.js
@@ -1,4 +1,7 @@
-var directives = angular.module('satbd.satellite.bar.directives',[])
+var directives = angular.module('satbd.satellite.bar.directives',[
+ 'ui.bootstrap',
+ 'ngAnimate'
+])
directives.directive('album', function() {
return {
@@ -11,11 +14,32 @@ directives.directive('album', function() {
};
});
-directives.controller('AlbumCtrl', function($scope,$http,$log,albumService) {
+directives.controller('AlbumCtrl', function($scope,$http,$log,$uibModal,albumService) {
+ $scope.album = { Note:-1};
albumService.get($scope.id)
.then(function(data) {
$scope.album = data;
}, function(err) {
$log.error('Could not fetch album' + $scope.id + ' :' + err);
});
+ $scope.openAlbumModal = function() {
+ var albumModalInstance = $uibModal.open({
+ templateUrl: 'html/albumModal.html',
+ controller: 'AlbumModalInstanceCtrl',
+ size: 'lg',
+ keyboard: true,
+ resolve: {
+ album: function() {
+ return $scope.album;
+ }
+ }
+ });
+ };
+});
+
+directives.controller('AlbumModalInstanceCtrl', function($scope,$uibModalInstance,album) {
+ $scope.album = album;
+ $scope.ok = function() {
+ $uibModalInstance.close('');
+ };
});
diff --git a/webapp/js/directives/album.html b/webapp/js/directives/album.html
index b5e15f1..85ecbb2 100644
--- a/webapp/js/directives/album.html
+++ b/webapp/js/directives/album.html
@@ -1,7 +1,14 @@
-
-
-
{{album.serie}}
-
+
+
{{album.serieDisplay || '-'}}
+
{{album.titleDisplay}}
+
+
diff --git a/webapp/js/views/recents/recents.html b/webapp/js/views/recents/recents.html
index eb185eb..042509b 100644
--- a/webapp/js/views/recents/recents.html
+++ b/webapp/js/views/recents/recents.html
@@ -1,5 +1,5 @@
Albums Récents
-