Skip to content

Issues-505: Use global primary color for email action button, Issues-507: Use default order of forums from settings #509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 29, 2021
Merged

Issues-505: Use global primary color for email action button, Issues-507: Use default order of forums from settings #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b582169
Issues-505: Use global primary color for email action button
atelomycterus Mar 29, 2021
e28a3c9
Issues-507: Use default order of forums from settings
atelomycterus Mar 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion vanilla/applications/dashboard/views/email/email-basic.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
margin-bottom: 15px'>{$email.message}</p>
{if $email.button}
<div style="margin: 0;padding: 0; text-align: center">
<a class="button" href="{$email.button.url}" style="margin: 0;padding: 0;color: {$email.button.textColor};
<a class="button" href="{$email.button.url}" style="margin: 0;padding: 0;color: #137d60;
cursor: pointer;display: inline-block;" rel=" noopener noreferrer" target="_blank">{$email.button.text}</a>
</div>
{/if}
Expand Down
2 changes: 1 addition & 1 deletion vanilla/applications/vanilla/controllers/class.categoriescontroller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ public function all($Category = '', $displayAs = '') {
}
// FIX: https://github.com/topcoder-platform/forums/issues/422
// Sorting for Flat type in SQL
if($displayAs != 'Flat') {
if($displayAs != 'Flat' && $Category) {
if ($this->data('CategorySort')) {
if ($this->data('CategorySort') == self::SORT_OLDEST_POST) {
usort($categoryTree, function ($a, $b) {
Expand Down