PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2024-11-25 06:27:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

New HWC announcement style

Browse source
This commit is contained in:
Josef Citrine 2016-11-27 03:58:13 +00:00
parent 41cbdb2e97
commit 84feb56f86
5 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/images/hwc/hwc-announcement.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 70 KiB

9
public/templates/partials/announcements/hwc/initial.html Normal file
View file

@ -0,0 +1,9 @@
<div class="announce-content">
<h2>{{ ::announcement.title }}</h2>
<p marked="announcement.text_content"></p>
</div>
<div class="announce-actions">
<a ng-repeat="link in announcement.links" ng-href="{{ ::link.url }}" target="_blank">{{ ::link.title }}</a>
<a href="#" ng-click="announcement.dontShowAgain()">Don't show again</a>
</div>
<a href="#" class="dismiss-button" ng-click="announcement.dismiss()"><i class="fa fa-times"></i></a>

3
resources/assets/scripts/app/controllers/dashboard.coffee
View file

@ -62,7 +62,8 @@ module.exports = angular.module('ponyfm').controller "dashboard", [
$scope.announceWrapperClass = null $scope.announceWrapperClass = null
$scope.loadAnnouncementTemplate('partials/alert-announcement.html') $scope.loadAnnouncementTemplate('partials/alert-announcement.html')
when 4 when 4
console.log $scope.announcement.template_file
$scope.announcementClass = $scope.announcement.css_class $scope.announcementClass = $scope.announcement.css_class
$scope.announceWrapperClass = null $scope.announceWrapperClass = null
$scope.loadAnnouncementTemplate($scope.announcement.template_url) $scope.loadAnnouncementTemplate($scope.announcement.template_file)
] ]

3
resources/assets/scripts/app/controllers/home.coffee
View file

@ -63,7 +63,8 @@ module.exports = angular.module('ponyfm').controller "home", [
$scope.announceWrapperClass = null $scope.announceWrapperClass = null
$scope.loadAnnouncementTemplate('partials/alert-announcement.html') $scope.loadAnnouncementTemplate('partials/alert-announcement.html')
when 4 when 4
console.log $scope.announcement.template_file
$scope.announcementClass = $scope.announcement.css_class $scope.announcementClass = $scope.announcement.css_class
$scope.announceWrapperClass = null $scope.announceWrapperClass = null
$scope.loadAnnouncementTemplate($scope.announcement.template_url) $scope.loadAnnouncementTemplate($scope.announcement.template_file)
] ]

26
resources/assets/styles/dashboard.less vendored
View file

@ -198,6 +198,32 @@
left: auto; 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;
}
}
}
} }
} }