From 6492368c7d0e516a8110b94b380f95e2b4cfa2c3 Mon Sep 17 00:00:00 2001
From: Michael <Michael@some.where>
Date: Sat, 8 Apr 2017 19:31:00 -0400
Subject: [PATCH] Move footer
---
Project-Unite/Views/Shared/_Layout.cshtml | 83 ++++++++++++-----------
1 file changed, 43 insertions(+), 40 deletions(-)
diff --git a/Project-Unite/Views/Shared/_Layout.cshtml b/Project-Unite/Views/Shared/_Layout.cshtml
index 673a571..b929261 100644
--- a/Project-Unite/Views/Shared/_Layout.cshtml
+++ b/Project-Unite/Views/Shared/_Layout.cshtml
@@ -178,51 +178,54 @@
}<hr />
- <footer class="navbar navbar-default">
+ </div>
- <p>© @DateTime.Now.Year Michael VanOverbeek and the ShiftOS Dev Team</p>
- <p>Website styling courtesy of <a href="http://vicr123.github.io/">Victor Tran</a>.</p>
-
- <div class="row">
- <div class="col-xs-4">
- <p><strong>Community</strong></p>
- <ul>
- <li>@Html.ActionLink("Forums", "Index", "Forum")</li>
- <li>@Html.ActionLink("Discord", "Discord", "Home")</li>
- <li>@Html.ActionLink("Wiki", "Index", "Wiki")</li>
- <li>@Html.ActionLink("Skin Repository", "Index", "Skins")</li>
- </ul>
- </div>
- <div class="col-xs-4">
- <p><strong>Discover</strong></p>
- <ul>
- <li><a href="http://youtube.com/ShiftOS">YouTube</a></li>
- <li><a href="http://github.com/shiftos-game">ShiftOS on GitHub</a></li>
- <li><a href="http://github.com/ShiftOS-CSharp/TheShiftOSMemorial">The Memorial</a></li>
- </ul>
- </div>
- <div class="col-xs-4">
- <p><strong>Help & About</strong></p>
- <ul>
- <li>@Html.ActionLink("Terms of service", "TOS", "Legal")</li>
- <li>@Html.ActionLink("Privacy Policy", "Privacy", "Legal")</li>
- <li>@Html.ActionLink("About Project: Unite", "AboutUnite", "Home")</li>
- <li>@Html.ActionLink("About ShiftOS", "About", "Home")</li>
- <li>@Html.ActionLink("Get in touch", "Contact", "Home")</li>
- </ul>
- </div>
-
+ <footer class="navbar navbar-default">
+
+ <p>© @DateTime.Now.Year Michael VanOverbeek and the ShiftOS Dev Team</p>
+ <p>Website styling courtesy of <a href="http://vicr123.github.io/">Victor Tran</a>.</p>
+
+ <div class="row">
+ <div class="col-xs-4">
+ <p><strong>Community</strong></p>
+ <ul>
+ <li>@Html.ActionLink("Forums", "Index", "Forum")</li>
+ <li>@Html.ActionLink("Discord", "Discord", "Home")</li>
+ <li>@Html.ActionLink("Wiki", "Index", "Wiki")</li>
+ <li>@Html.ActionLink("Skin Repository", "Index", "Skins")</li>
+ </ul>
+ </div>
+ <div class="col-xs-4">
+ <p><strong>Discover</strong></p>
+ <ul>
+ <li><a href="http://youtube.com/ShiftOS">YouTube</a></li>
+ <li><a href="http://github.com/shiftos-game">ShiftOS on GitHub</a></li>
+ <li><a href="http://github.com/ShiftOS-CSharp/TheShiftOSMemorial">The Memorial</a></li>
+ </ul>
+ </div>
+ <div class="col-xs-4">
+ <p><strong>Help & About</strong></p>
+ <ul>
+ <li>@Html.ActionLink("Terms of service", "TOS", "Legal")</li>
+ <li>@Html.ActionLink("Privacy Policy", "Privacy", "Legal")</li>
+ <li>@Html.ActionLink("About Project: Unite", "AboutUnite", "Home")</li>
+ <li>@Html.ActionLink("About ShiftOS", "About", "Home")</li>
+ <li>@Html.ActionLink("Get in touch", "Contact", "Home")</li>
+ </ul>
</div>
- <p><strong>We'd like to formally thank Philip Adams.</strong> Without him, we would not exist. Phil has contributed years of work and help to ShiftOS and is the original developer of the game. He has written code that is still used to this day in modern ShiftOS, and much of the ideas and mechanics in the game are from his mind.</p>
- <p>Check Phil out on YouTube: <a href="http://youtube.com/OSFirstTimer">OSFirstTimer</a> | <a href="https://www.youtube.com/user/AstralPhaser">AstralPhaser</a> | <a href="https://www.youtube.com/channel/UC2wLfbZrHQOxP2e5zkxYRjA">YouTube Millionaire</a></p>
+ </div>
- @if (ACL.Granted(User.Identity.Name, "CanAccessAdminCP"))
+ <p><strong>We'd like to formally thank Philip Adams.</strong> Without him, we would not exist. Phil has contributed years of work and help to ShiftOS and is the original developer of the game. He has written code that is still used to this day in modern ShiftOS, and much of the ideas and mechanics in the game are from his mind.</p>
+ <p>Check Phil out on YouTube: <a href="http://youtube.com/OSFirstTimer">OSFirstTimer</a> | <a href="https://www.youtube.com/user/AstralPhaser">AstralPhaser</a> | <a href="https://www.youtube.com/channel/UC2wLfbZrHQOxP2e5zkxYRjA">YouTube Millionaire</a></p>
+
+ @if (ACL.Granted(User.Identity.Name, "CanAccessAdminCP"))
{
- <p>@Html.ActionLink("Administrator Control Panel", "Index", "Admin")</p>
- }
- </footer>
- </div>
+ <p>@Html.ActionLink("Administrator Control Panel", "Index", "Admin")</p>}
+ </footer>
+
+
+
@Scripts.Render("~/bundles/jquery")
@Scripts.Render("~/bundles/bootstrap")