Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/update-premium-info'
Browse files Browse the repository at this point in the history
  • Loading branch information
@cj123
cj123 committed Feb 1, 2021
2 parents f099e8a + a6b46b1 commit 8f9bdea
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 146 deletions.
4 changes: 2 additions & 2 deletions cmd/server-manager/views/layout/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ <h6 class="dropdown-header">Logged in as {{ .User.Name }} ({{ .User.Group }})</h


{{ block "showpremium" . }}
{{ if and (ne $.Request.URL.Path "/") (ne $.Request.URL.Path "/premium") }}
{{ if ne $.Request.URL.Path "/" }}
<div class="clearfix"></div>

<div class="mt-5">
Expand All @@ -278,7 +278,7 @@ <h6 class="dropdown-header">Logged in as {{ .User.Name }} ({{ .User.Group }})</h
<a href="https://github.com/JustaPenguin/assetto-server-manager" class="mr-3"><i class="fab fa-github"></i> GitHub</a>
<a href="https://github.com/JustaPenguin/assetto-server-manager/issues" class="mr-3"><i class="fas fa-bug"></i> Submit a Bug Report</a>
{{ if not $.IsPremium }}
<a href="/premium" class="mr-3"><i class="fas fa-heart"></i> Go Premium</a>
<a href="https://emperorservers.com/products/acsm" class="mr-3"><i class="fas fa-heart"></i> Go Premium</a>
{{ else }}
<a href="https://paypal.me/JustaPenguinUK" class="mr-3"><i class="fas fa-heart"></i> Donate</a>
{{ end }}
Expand Down
126 changes: 0 additions & 126 deletions cmd/server-manager/views/pages/premium.html
View file

This file was deleted.

15 changes: 8 additions & 7 deletions cmd/server-manager/views/partials/premium.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,20 @@
</li>

<li>
<strong>Go Premium</strong> - purchase Server Manager Premium with PayPal. This is a one-off purchase. If you send $10 or more,
we will email you a copy of Server Manager Premium, which includes: <a href="https://acsr.assettocorsaservers.com">Assetto Corsa Skill Ratings</a>, our powerful new <a href="/race-weekends">Race Weekends</a> feature, and Lua Scripting Hooks!
You will also receive premium versions of all future Server Manager updates!
<strong>Go Premium</strong> - purchase Server Manager Premium. This is a one-off purchase.
Server Manager Premium includes:
Our new Custom Assetto Corsa Server, built from the ground up,
<a href="https://acsr.assettocorsaservers.com">Assetto Corsa Skill Ratings</a>,
our powerful <a href="/race-weekends">Race Weekends</a> feature, Driver Swaps, Multi-server
support, Time Attack Events, Improved Live Timings, Lua Scripting Hooks and more!
You will also receive premium versions of future Server Manager updates!
</li>
</ul>
</div>
<div class="card-footer text-right">
<div class="float-left">
<a class="btn btn-primary" href="/premium">Learn more about Premium</a>
</div>
<div class="float-right text-right">
<a class="btn btn-success" href="https://emperorservers.com">Rent a Server <i class="ml-1 fas fa-server"></i></a>
<a class="btn btn-danger" href="https://paypal.me/JustaPenguinUK">Go Premium <i class="ml-1 fas fa-heart"></i></a>
<a class="btn btn-danger" href="https://emperorservers.com/products/acsm">Go Premium <i class="ml-1 fas fa-heart"></i></a>
</div>
</div>
</div>
Expand Down
14 changes: 8 additions & 6 deletions cmd/server-manager/views/partials/race-weekend-premium.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,20 @@
</li>

<li>
<strong>Go Premium</strong> - purchase Server Manager Premium with PayPal. This is a one-off purchase. If you send $10 or more, we will email you a copy of Server Manager Premium,
and all updates we make to Server Manager in the future (including Race Weekends and any new Premium features).
<strong>Go Premium</strong> - purchase Server Manager Premium. This is a one-off purchase.
Server Manager Premium includes:
Our new Custom Assetto Corsa Server, built from the ground up,
<a href="https://acsr.assettocorsaservers.com">Assetto Corsa Skill Ratings</a>,
our powerful Race Weekends feature, Driver Swaps, Multi-server
support, Time Attack Events, Improved Live Timings, Lua Scripting Hooks and more!
You will also receive premium versions of future Server Manager updates!
</li>
</ul>
</div>
<div class="card-footer">
<div class="float-left">
<a class="btn btn-primary" href="/premium">Learn more about Premium</a>
</div>
<div class="float-right text-right">
<a class="btn btn-success" href="https://emperorservers.com">Rent a Server <i class="ml-1 fas fa-server"></i></a>
<a class="btn btn-danger" href="https://paypal.me/JustaPenguinUK">Go Premium <i class="ml-1 fas fa-heart"></i></a>
<a class="btn btn-danger" href="https://emperorservers.com/products/acsm">Go Premium <i class="ml-1 fas fa-heart"></i></a>
</div>
</div>
</div>
Expand Down
1 change: 0 additions & 1 deletion router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ func Router(
// pages
r.Get("/", serverAdministrationHandler.home)
r.Get("/changelog", serverAdministrationHandler.changelog)
r.Get("/premium", serverAdministrationHandler.premium)

r.Mount("/stracker/", http.HandlerFunc(strackerHandler.proxy))

Expand Down
4 changes: 0 additions & 4 deletions server_administration.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,6 @@ func (sah *ServerAdministrationHandler) home(w http.ResponseWriter, r *http.Requ
})
}

func (sah *ServerAdministrationHandler) premium(w http.ResponseWriter, r *http.Request) {
sah.viewRenderer.MustLoadTemplate(w, r, "premium.html", nil)
}

const MOTDFilename = "motd.txt"

type motdTemplateVars struct {
Expand Down

0 comments on commit 8f9bdea

Please sign in to comment.