diff --git a/public/images/hwc/hwc-announcement.jpg b/public/images/hwc/hwc-announcement.jpg new file mode 100644 index 00000000..8ba8f0e0 Binary files /dev/null and b/public/images/hwc/hwc-announcement.jpg differ diff --git a/public/templates/partials/announcements/hwc/initial.html b/public/templates/partials/announcements/hwc/initial.html new file mode 100644 index 00000000..7d0e71bd --- /dev/null +++ b/public/templates/partials/announcements/hwc/initial.html @@ -0,0 +1,9 @@ +
+

{{ ::announcement.title }}

+

+
+
+ {{ ::link.title }} + Don't show again +
+ diff --git a/resources/assets/scripts/app/controllers/dashboard.coffee b/resources/assets/scripts/app/controllers/dashboard.coffee index 3a3e17c7..fba76779 100644 --- a/resources/assets/scripts/app/controllers/dashboard.coffee +++ b/resources/assets/scripts/app/controllers/dashboard.coffee @@ -62,7 +62,8 @@ module.exports = angular.module('ponyfm').controller "dashboard", [ $scope.announceWrapperClass = null $scope.loadAnnouncementTemplate('partials/alert-announcement.html') when 4 + console.log $scope.announcement.template_file $scope.announcementClass = $scope.announcement.css_class $scope.announceWrapperClass = null - $scope.loadAnnouncementTemplate($scope.announcement.template_url) + $scope.loadAnnouncementTemplate($scope.announcement.template_file) ] diff --git a/resources/assets/scripts/app/controllers/home.coffee b/resources/assets/scripts/app/controllers/home.coffee index 187df7df..0f92f4ca 100644 --- a/resources/assets/scripts/app/controllers/home.coffee +++ b/resources/assets/scripts/app/controllers/home.coffee @@ -63,7 +63,8 @@ module.exports = angular.module('ponyfm').controller "home", [ $scope.announceWrapperClass = null $scope.loadAnnouncementTemplate('partials/alert-announcement.html') when 4 + console.log $scope.announcement.template_file $scope.announcementClass = $scope.announcement.css_class $scope.announceWrapperClass = null - $scope.loadAnnouncementTemplate($scope.announcement.template_url) + $scope.loadAnnouncementTemplate($scope.announcement.template_file) ] diff --git a/resources/assets/styles/dashboard.less b/resources/assets/styles/dashboard.less index 5e1b4599..a8fd6e5d 100644 --- a/resources/assets/styles/dashboard.less +++ b/resources/assets/styles/dashboard.less @@ -198,6 +198,32 @@ left: auto; } } + + &.hwc-announce { + height: 150px; + background-color: #68a1ee; + background-image: url(/images/hwc/hwc-announcement.jpg); + background-size: 300px; + background-repeat: no-repeat; + background-position: left center; + + @media (max-width: 720px) { + height: auto; + background-image: none; + } + + .announce-actions { + background: none; + } + + .announce-actions, .announce-content { + padding-left: 300px; + + @media (max-width: 720px) { + padding-left: 15px; + } + } + } } }