Merge branch 'master' of https://github.com/ZeroK-RTS/Zero-K-Infrastr…

…ucture into ranks
ZeroK-RTS · Dec 25, 2017 · 9d6ea62 · 9d6ea62
2 parents c9a4603 + c6a3157
commit 9d6ea62
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Zero-K.info/Views/Shared/UserDetail.cshtml b/Zero-K.info/Views/Shared/UserDetail.cshtml
@@ -119,8 +119,8 @@
                                 <td>
                                     <div class="avatarbg">
                                         <!-- @Html.AccountAvatar(Model) -->
-                                        @if (Model.Clan != null) { Html.PrintClan(Model.Clan, true, true); }
-                                        else if (Model.Faction != null) { Html.PrintFaction(Model.Faction, true); }
+                                        @if (Model.Clan != null) { @Html.PrintClan(Model.Clan, true, true); }
+                                        else if (Model.Faction != null) { @Html.PrintFaction(Model.Faction, true); }
                                     </div>
                                 </td>
                             </tr>
@@ -244,7 +244,7 @@
         </div>
 
 
-        @if (Global.IsModerator)
+        if (Global.IsModerator)
         {
             <div class="admin">
                 @Html.ActionLink("Admin user", "AdminUserDetail", "Users", new { id = Model.AccountID }, null)

diff --git a/Zero-K.info/asp.net.csproj b/Zero-K.info/asp.net.csproj
@@ -666,6 +666,7 @@
     <Content Include="Img\galaxies\origin.txt" />
     <Content Include="Img\galaxies\render_19.jpg" />
     <Content Include="Img\galaxies\render_24.jpg" />
+    <Content Include="Img\help.png" />
     <Content Include="Img\hof\r1_clans.jpg" />
     <Content Include="Img\hof\r1_map.jpg" />
     <Content Include="Img\hof\r1_winner.jpg" />