diff --git a/templates/clan_group.html b/templates/clan_group.html index 4bc57f4..708d11e 100644 --- a/templates/clan_group.html +++ b/templates/clan_group.html @@ -3,57 +3,57 @@ NoCompile=true */}} {{ define "clanGroup" }} {{ with . }} -
- {{ $teamJSON := teamJSON }} - {{ range .members }} - {{/* ignore fokabot */}} - {{ if ne (int .id) 999 }} - {{ $tj := index $teamJSON (print .id)}} -
-
-
- Avatar -
-
- {{ country .country false }}{{ .username }} - {{ with $tj.real_name }} -
- {{ . }} -
- {{ end }} - {{ with $tj.role }} -
- {{ . }} -
- {{ end }} -
-
-
- - {{ time .registered_on }} -
-
- - {{ time .latest_activity }} -
-
- {{ if or $tj.twitter $tj.mail $tj.github }} -
-
- {{ range $k, $v := $tj }} - {{ if and $v (in $k "github" "twitter" "mail") }} - - - - {{ end }} - {{ end }} -
-
- {{ end }} -
-
+
+ {{ $teamJSON := teamJSON }} + {{ range .members }} + {{/* ignore fokabot */}} + {{ if ne (int .id) 999 }} + {{ $tj := index $teamJSON (print .id)}} +
+
+
+ Avatar +
+
+ {{ country .country false }}{{ .username }} + {{ with $tj.real_name }} +
+ {{ . }} +
{{ end }} + {{ with $tj.role }} +
+ {{ . }} +
+ {{ end }} +
+
+
+ + {{ time .registered_on }} +
+
+ + {{ time .latest_activity }} +
+
+ {{ if or $tj.twitter $tj.mail $tj.github }} +
+
+ {{ range $k, $v := $tj }} + {{ if and $v (in $k "github" "twitter" "mail") }} + + + + {{ end }} + {{ end }} +
+
{{ end }}
+
{{ end }} - {{ end }} \ No newline at end of file + {{ end }} +
+{{ end }} +{{ end }} \ No newline at end of file diff --git a/templates/clan_members.html b/templates/clan_members.html index 3b5eebc..215ce3d 100644 --- a/templates/clan_members.html +++ b/templates/clan_members.html @@ -2,40 +2,40 @@ NoCompile=true */}} {{ define "clanMembers" }} - {{ with . }} -
- {{ $teamJSON := teamJSON }} - {{ range .members }} - {{/* ignore fokabot */}} - {{ if ne (int .id) 999 }} - {{ $tj := index $teamJSON (print .id)}} -
-
-
- Avatar -
-
- {{ country .country false }}{{ .username }} - {{ with $tj.real_name }} -
- {{ . }} -
- {{ end }} -
-
-
- - {{ time .registered_on }} -
-
- - {{ time .latest_activity }} -
-
-
-
+{ with . }} +
+ {{ $teamJSON := teamJSON }} + {{ range .members }} + {{/* ignore fokabot */}} + {{ if ne (int .id) 999 }} + {{ $tj := index $teamJSON (print .id)}} +
+
+
+ Avatar +
+
+ {{ country .country false }}{{ .username }} + {{ with $tj.real_name }} +
+ {{ . }} +
{{ end }} - {{ end }} +
+
+
+ + {{ time .registered_on }} +
+
+ + {{ time .latest_activity }} +
+
+
{{ end }} - {{ end }} \ No newline at end of file + {{ end }} +
+{{ end }} +{{ end }} \ No newline at end of file diff --git a/templates/clanboard.html b/templates/clanboard.html index bfc6d54..9682289 100644 --- a/templates/clanboard.html +++ b/templates/clanboard.html @@ -3,42 +3,42 @@ Handler=/clans TitleBar=Clans KyutGrill=leaderboard2.jpg */}} - {{ define "tpl" }} -
- {{ $favMode := _or (atoi (.Gin.Query "mode")) }} - - - - - {{ template "simplepag" 4 }} - - - - - - -
{{ .T "Rank" }} {{ .T "Clan" }} {{ .T "PP/Score" }} {{ .T "Playcount" }}
- - - {{ range (.Get "clans/stats/all?m=$d" $favMode).clans }} - {{ if .name }} - - - - - - - {{end}} - {{end}} - -
#{{ .rank }} {{ .name }}{{ .chosen_mode.pp }}pp ({{ humanize .chosen_mode.total_score }}){{ .chosen_mode.playcount }}
+{{ define "tpl" }} +
+ {{ $favMode := _or (atoi (.Gin.Query "mode")) }} + + - {{ end }} \ No newline at end of file + + + {{ template "simplepag" 4 }} + + + + + + +
{{ .T "Rank" }} {{ .T "Clan" }} {{ .T "PP/Score" }} {{ .T "Playcount" }}
+ + + {{ range (.Get "clans/stats/all?m=$d" $favMode).clans }} + {{ if .name }} + + + + + + + {{end}} + {{end}} + +
#{{ .rank }} {{ .name }}{{ .chosen_mode.pp }}pp ({{ humanize .chosen_mode.total_score }}){{ .chosen_mode.playcount }}
+
+{{ end }} \ No newline at end of file diff --git a/templates/clansample.html b/templates/clansample.html index c47c9a2..91b41d8 100644 --- a/templates/clansample.html +++ b/templates/clansample.html @@ -2,127 +2,134 @@ Include=clan_members.html */}} {{ define "tpl" }} -
- - {{ if .ClanID }} - {{ $gqm := .Gin.Query "mode" }} - {{ $global := . }} - {{ $favouritemode := $gqm }} - {{ range (.Get "clans?id=%d" .ClanID).clans }} -
-
- {{ if .icon }} -
- icon -
- {{ end }} -
-

- - {{ $global.T "%s" .name | html }} -

-
- {{ $global.T "(%s)" (.tag | htmlescaper) | html }} -
-
-
+
+ + {{ if .ClanID }} + {{ $gqm := .Gin.Query "mode" }} + {{ $global := . }} + {{ $favouritemode := $gqm }} + {{ range (.Get "clans?id=%d" .ClanID).clans }} +
+
+ {{ if .icon }} +
+ icon
- -
-
-
-
- - {{ $global.T "%s" (.description | htmlescaper) | html }} - {{ end }} -

- - {{ with (.Get "clans/stats?id=%d&m=%d" .ClanID (.Gin.Query "mode"))}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{end}} - {{ range (.Get "clans?id=%d" .ClanID).clans }} - -
{{ $global.T "Global Rank" }}#{{ humanize .rank }}
{{ $global.T "PP" }}{{ humanize .chosen_mode.pp }}
{{ $global.T "Ranked Score" }}{{ humanize .chosen_mode.ranked_score }}
{{ $global.T "Total Score" }}{{ humanize .chosen_mode.total_score }}
{{ $global.T "Total Playcount" }}{{ humanize .chosen_mode.playcount }}
{{ $global.T "Total Replays Watched" }}{{ humanize .chosen_mode.replays_watched }}
{{ $global.T "Total Hits" }}{{ humanize .chosen_mode.total_hits }}
{{ end }} -
-
- {{ if $global.Context.User.ID }} - {{ $d := qb "SELECT user, clan, perms FROM user_clans WHERE user = ? LIMIT 1" .Context.User.ID }} - {{ $p := qb "SELECT user, clan, perms FROM user_clans WHERE user = ? AND perms = 8 LIMIT 1" .Context.User.ID }} - {{ $tc := qb "SELECT user, clan, perms FROM user_clans WHERE user = ? AND clan = ? LIMIT 1" .Context.User.ID .ClanID }} - {{ $uc := or $d.clan.Int -1 }} - {{ if $d }} - {{ if $tc }} - {{ if $p }} -
- {{ ieForm .Gin }} -
-
- {{ else }} -
- {{ ieForm .Gin }} -
-
- {{ end }} - {{ else }} - - {{end}} - {{ else }} - - {{ end }} - {{ else }} - - - {{ end }} -

{{ .T "Clan Owner" }}

-

- {{ .T "The leader of the clan." }}
-

- {{ template "clanMembers" (.Get "clans/members?id=%d&r=%d" .ClanID 8) }} -
-
-
-
-

{{ .T "Members" }}

-

- {{ .T "The members of the clan." }}
-

- {{ template "clanMembers" (.Get "clans/members?id=%d&r=%d" .ClanID 1) }} -
-
{{ end }} +
+

+ + {{ $global.T "%s" .name | html }} +

+
+ {{ $global.T "(%s)" (.tag | htmlescaper) | html }} +
+
+
- {{ end }} \ No newline at end of file + +
+
+
+
+ + {{ $global.T "%s" (.description | htmlescaper) | html }} + {{ end }} +

+ + + {{ with (.Get "clans/stats?id=%d&m=%d" .ClanID (.Gin.Query "mode"))}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{end}} + {{ range (.Get "clans?id=%d" .ClanID).clans }} + +
{{ $global.T "Global Rank" }}#{{ humanize .rank }}
{{ $global.T "PP" }}{{ humanize .chosen_mode.pp }}
{{ $global.T "Ranked Score" }}{{ humanize .chosen_mode.ranked_score }}
{{ $global.T "Total Score" }}{{ humanize .chosen_mode.total_score }}
{{ $global.T "Total Playcount" }}{{ humanize .chosen_mode.playcount }}
{{ $global.T "Total Replays Watched" }}{{ humanize .chosen_mode.replays_watched }}
{{ $global.T "Total Hits" }}{{ humanize .chosen_mode.total_hits }}
{{ end }} +
+
+ {{ if $global.Context.User.ID }} + {{ $d := qb "SELECT user, clan, perms FROM user_clans WHERE user = ? LIMIT 1" .Context.User.ID }} + {{ $p := qb "SELECT user, clan, perms FROM user_clans WHERE user = ? AND perms = 8 LIMIT 1" .Context.User.ID }} + {{ $tc := qb "SELECT user, clan, perms FROM user_clans WHERE user = ? AND clan = ? LIMIT 1" .Context.User.ID .ClanID }} + {{ $uc := or $d.clan.Int -1 }} + {{ if $d }} + {{ if $tc }} + {{ if $p }} +
+ {{ ieForm .Gin }} +
+
+ {{ else }} +
+ {{ ieForm .Gin }} +
+
+ {{ end }} + {{ else }} + + {{end}} + {{ else }} + + {{ end }} + {{ else }} + + + {{ end }} +

{{ .T "Clan Owner" }}

+

+ {{ .T "The leader of the clan." }}
+

+ {{ template "clanMembers" (.Get "clans/members?id=%d&r=%d" .ClanID 8) }} +
+
+
+
+

{{ .T "Members" }}

+

+ {{ .T "The members of the clan." }}
+

+ {{ template "clanMembers" (.Get "clans/members?id=%d&r=%d" .ClanID 1) }} +
+
+ {{ end }} +
+{{ end }} \ No newline at end of file