Overhaul menu items and social icons (at the bottom now).

Author: ColinFinck

config.toml

@@ -16,7 +16,6 @@ paginate = 10
 
 [[menu.main]]
     name = "News"
-    url  = "/news/"
     weight = 1
     [[menu.main]]
         parent = "News"
@@ -34,162 +33,75 @@ paginate = 10
         url  = "/blogs/"
         weight = 103
 
-
 [[menu.main]]
-    identifier = "discover"
-    name = "Discover More!"
-    url  = "/blog/"
+    name = "Community"
     weight = 2
     [[menu.main]]
-        parent = "discover"
-        name = "Following!"
-        url = "/joining/"
+        parent = "Community"
+        name = "Chat"
+        url  = "https://chat.reactos.org"
         weight = 201
-        pre = "<span style='font-weight: bold;'>"
-        post = "</span>"
     [[menu.main]]
-        parent = "discover"
-        name = "Live Activity"
-        url  = "https://jira.reactos.org/secure/Dashboard.jspa#Activity-Stream/10001"
+        parent = "Community"
+        name = "Forum"
+        url  = "/forum"
         weight = 202
-    [[menu.main]]
-        parent = "discover"
-        name = "Helping us"
-        url  = "/participation/"
-        weight = 203
-    [[menu.main]]
-        parent = "discover"
-        identifier = "follow_faq"
-        name = "FAQs"
-        url  = "/joining/faqs"
-        weight = 204
 
+[[menu.main]]
+    name = "Development"
+    weight = 3
     [[menu.main]]
-        parent = "discover"
-        name = "Testing!"
-        url = "/testing/"
-        weight = 205
-        pre = "<span style='font-weight: bold;'>"
-        post = "</span>"
-    [[menu.main]]
-        parent = "discover"
-        name = "Installing ReactOS"
-        url  = "installing-reactos"
-        weight = 206
-    [[menu.main]]
-        parent = "discover"
-        name = "Filling a Bug"
-        url  = "https://reactos.org/wiki/File_Bugs"
-        weight = 207
-    [[menu.main]]
-        parent = "discover"
-        identifier = "testing_faq"
-        name = "FAQs"
-        url  = "/testing/faqs/"
-        weight = 208
-
+        parent = "Development"
+        name = "Jira"
+        url  = "https://jira.reactos.org"
+        weight = 301
     [[menu.main]]
-        parent = "discover"
-        name = "Developing!"
-        url = "/developing/"
-        weight = 209
-        pre = "<span style='font-weight: bold;'>"
-        post = "</span>"
+        parent = "Development"
+        name = "ReactOS Builds"
+        url = "/getbuilds"
+        weight = 302
     [[menu.main]]
-        parent = "discover"
-        name = "Building ReactOS"
-        url  = "/building-reactos/"
-        weight = 210
+        parent = "Development"
+        name = "ReactOS on GitHub"
+        url = "https://github.com/reactos"
+        weight = 303
     [[menu.main]]
-        parent = "discover"
-        name = "Sending Patches"
-        url  = "https://reactos.org/wiki/Submitting_Patches"
-        weight = 211
+        parent = "Development"
+        name = "Report a Bug"
+        url  = "https://reactos.org/wiki/File_Bugs"
+        weight = 304
     [[menu.main]]
-        parent = "discover"
-        name = "Testman: Your Tool"
-        url  = "https://reactos.org/testman"
-        weight = 212
+        parent = "Development"
+        name = "Testman"
+        url  = "/testman"
+        weight = 305
     [[menu.main]]
-        parent = "discover"
-        identifier = "developing_faq"
-        name = "FAQs"
-        url  = "/developing/faqs/"
-        weight = 213
-
-
-
-
-[[menu.main]]
-    name = "Jira"
-    url  = "https://jira.reactos.org"
-    weight = 3
+        parent = "Development"
+        name = "Wiki"
+        url  = "/wiki"
+        weight = 306
 
 [[menu.main]]
-    name = "Gallery"
-    url  = "/gallery/"
+    name = "Shop"
+    url  = "https://reactos.spreadshirt.net"
     weight = 4
 
 [[menu.main]]
-    name = "IRC"
-    url  = "/irc/"
+    name = "Donate"
+    url  = "/donate"
     weight = 5
 
-[[menu.main]]
-    name = "Forum"
-    url  = "/forum/"
-    weight = 6
-
-[[menu.main]]
-    name = "Shop"
-    url  = "https://reactos.spreadshirt.net/"
-    weight = 7
-
 [[menu.main]]
     name = "Download"
-    url  = "/download/"
-    weight = 8
-
-[[menu.main]]
-    name = "Donate"
-    url  = "/donate/"
-    weight = 8
-
-# Top bar social links menu
-
-[[menu.topbar]]
-    weight = 1
-    name = "GitHub"
-    url = "https://github.com/reactos/reactos"
-    pre = "<i class='fa fa-2x fa-github'></i>"
-
-[[menu.topbar]]
-    weight = 2
-    name = "Facebook"
-    url = "https://www.facebook.com/ReactOS-19143619259/"
-    pre = "<i class='fa fa-2x fa-facebook'></i>"
-
-[[menu.topbar]]
-    weight = 3
-    name = "Twitter"
-    url = "https://twitter.com/reactos"
-    pre = "<i class='fa fa-2x fa-twitter'></i>"
-
-[[menu.topbar]]
-    weight = 4
-    name = "Email"
-    url = "mailto:[email protected]"
-    pre = "<i class='fa fa-2x fa-envelope'></i>"
+    url  = "/download"
+    weight = 6
 
 [params]
     viewMorePostLink = "/news/"
     author = "DevCows"
     defaultKeywords = ["devows", "hugo", "go"]
     defaultDescription = "Site template made by devcows using hugo"
 
-    about_us = "ReactOS is a registered trademark of ReactOS Foundation in the USA and other countries. "
-    copyright = "ReactOS Project"
-
     # Format dates with Go's time formatting
     date_format = "January 2, 2006"
 
@@ -199,15 +111,6 @@ paginate = 10
 [Permalinks]
     blog = "/blog/:year/:month/:day/:filename/"
 
-# Enable or disable top bar with social icons
-[params.topbar]
-    enable = false
-    text = """<p class="hidden-sm hidden-xs">Contact us on +420 777 555 333 or [email protected].</p>
-      <p class="hidden-md hidden-lg"><a href="#" data-animate-hover="pulse"><i class="fa fa-phone"></i></a>
-      <a href="#" data-animate-hover="pulse"><i class="fa fa-envelope"></i></a>
-      </p>
-      """
-
 # Enable and disable widgets for the right sidebar
 [params.widgets]
     categories = true

themes/reactos/layouts/index.html

@@ -10,8 +10,6 @@
 
     <header>
 
-        {{ partial "top.html" . }}
-
         {{ partial "nav.html" . }}
 
     </header>

themes/reactos/layouts/partials/footer.html

@@ -8,10 +8,18 @@
 			</ul>
 		</div>
 
-		<div class="col-md-4">
+		<div class="col-md-4 text-right">
 			{{ i18n "templateBy" }} <a href="http://bootstrapious.com/free-templates">Bootstrapious</a>.
 			<!-- Not removing this link is part of the licence conditions of the template. Thanks for understanding :) -->
 			{{ i18n "portedBy" }} <a href="https://github.com/devcows/hugo-universal-theme">DevCows</a>
+
+      <div class="social">
+				<a href="https://facebook.com/ReactOS-19143619259" target="_blank"><i class="fa fa-facebook"></i></a>
+				<a href="https://github.com/reactos" target="_blank"><i class="fa fa-github"></i></a>
+				<a href="https://twitter.com/reactos" target="_blank"><i class="fa fa-twitter"></i></a>
+				<a href="https://vk.com/reactos_ru" target="_blank"><i class="fa fa-vk"></i></a>
+				<a href="https://youtube.com/c/ReactOSCommunity" target="_blank"><i class="fa fa-youtube"></i></a>
+			</div>
 		</div>
 	</div>
 </footer>

themes/reactos/layouts/partials/top.html

@@ -242,37 +242,28 @@ ul.list-style-none {
   margin: 0;
   font-size: 12px;
 }
-#top .social {
-  float: right;
-  text-align: right;
+#copyright .social i {
+  font-size: 28px;
 }
-#top .social a {
+#copyright .social a {
   color: #999999;
   display: inline-block;
-  width: 24px;
-  height: 24px;
   border-radius: 12px;
   line-height: 20px;
   font-size: 12px;
   text-align: center;
   vertical-align: bottom;
 }
-#top .social a:hover {
+#copyright .social a:hover {
   color: #fff;
 }
-#top .social a:hover.facebook {
+#copyright .social a:hover.facebook {
   background-color: #4460ae;
 }
-#top .social a:hover.gplus {
-  background-color: #c21f25;
-}
-#top .social a:hover.twitter {
+#copyright .social a:hover.twitter {
   background-color: #3cf;
 }
-#top .social a:hover.instagram {
-  background-color: #cd4378;
-}
-#top .social a:hover.email {
+#copyright .social a:hover.email {
   background-color: #4a7f45;
 }
 #top .login {