From 261f3aa09ab8c0dc1087bc14f107fae66e4706a3 Mon Sep 17 00:00:00 2001 From: Leonardo Merlin Date: Fri, 25 Sep 2015 11:26:00 -0300 Subject: [PATCH] fix: show featured event into main area --- src/app/pages/inicio/inicio.controller.js | 11 ++++++++++- src/app/pages/inicio/inicio.html | 18 ++++++++++++------ src/app/pages/inicio/inicio.scss | 4 ++-- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/src/app/pages/inicio/inicio.controller.js b/src/app/pages/inicio/inicio.controller.js index 3070428..98d9817 100644 --- a/src/app/pages/inicio/inicio.controller.js +++ b/src/app/pages/inicio/inicio.controller.js @@ -79,7 +79,7 @@ vm.DialogaService.getEvents().then(function(data) { vm.$log.debug('getEvents.success', data); vm.events = data.articles; - + vm.featuredEvent = vm.events[0]; }, function(error) { vm.$log.debug('Error on getEvents.', error); vm.eventsError = error; @@ -165,6 +165,15 @@ vm.article.videoIsLoaded = true; }; + InicioPageController.prototype.showEventVideo = function() { + var vm = this; + + hideBackground(0); // force to hide + + vm.featuredEvent.canView = true; + vm.featuredEvent.bodyTrusted = vm.$sce.trustAsHtml(vm.featuredEvent.body); + }; + InicioPageController.prototype.submitSearch = function() { var vm = this; diff --git a/src/app/pages/inicio/inicio.html b/src/app/pages/inicio/inicio.html index 78ac812..a9206a9 100644 --- a/src/app/pages/inicio/inicio.html +++ b/src/app/pages/inicio/inicio.html @@ -5,7 +5,12 @@
-
+
+
+
+
+
+
-
+
-
DD/MM/YYYY
+
{{pageInicio.featuredEvent.start_date | date : "dd/MM/yyyy"}}
AO VIVO
-

- Lorem ipsum dolor sit amet, mei at facete constituto partiendo et. -

+
diff --git a/src/app/pages/inicio/inicio.scss b/src/app/pages/inicio/inicio.scss index 3d58eec..f407ddd 100644 --- a/src/app/pages/inicio/inicio.scss +++ b/src/app/pages/inicio/inicio.scss @@ -53,9 +53,9 @@ padding: 0; .video { + cursor: pointer; width: 100%; min-height: 125px; - background-color: #4A4A0E; background-size: cover; background-position: center; } @@ -84,7 +84,7 @@ border-radius: 20px; } - p { padding: 10px 0;} + .description { padding: 10px 0;} } @media screen and (min-width: $screen-lg) { -- libgit2 0.21.2