Merge pull request #52 from Kaan2106/master

fixed navbar and various backgrounds
Quackster · Oct 25, 2024 · 5989e7c · 5989e7c
2 parents 9eaaa87 + 2537d52
commit 5989e7c
Show file tree

Hide file tree

Showing 5 changed files with 14,976 additions and 23 deletions.
diff --git a/Havana-Web/src/main/java/org/alexdev/http/controllers/groups/GroupDiscussionsController.java b/Havana-Web/src/main/java/org/alexdev/http/controllers/groups/GroupDiscussionsController.java
@@ -50,6 +50,24 @@ public static void viewDiscussions(WebConnection webConnection) {
             return;
         }
 
+        if (group.getAlias() != null) {
+            if (group.getAlias().equalsIgnoreCase("battleball_rebound")) {
+                webConnection.session().set("page", "games");
+            }
+
+            if (group.getAlias().equalsIgnoreCase("lido")) {
+                webConnection.session().set("page", "games");
+            }
+
+            if (group.getAlias().equalsIgnoreCase("snow_storm")) {
+                webConnection.session().set("page", "games");
+            }
+
+            if (group.getAlias().equalsIgnoreCase("wobble_squabble")) {
+                webConnection.session().set("page", "games");
+            }
+        }
+
         var template = webConnection.template("groups/view_discussions");
         template.set("group", group);
         render(webConnection, group, template, 1);
@@ -97,6 +115,24 @@ public static void viewDiscussionsPage(WebConnection webConnection) {
 
         }
 
+        if (group.getAlias() != null) {
+            if (group.getAlias().equalsIgnoreCase("battleball_rebound")) {
+                webConnection.session().set("page", "games");
+            }
+
+            if (group.getAlias().equalsIgnoreCase("lido")) {
+                webConnection.session().set("page", "games");
+            }
+
+            if (group.getAlias().equalsIgnoreCase("snow_storm")) {
+                webConnection.session().set("page", "games");
+            }
+
+            if (group.getAlias().equalsIgnoreCase("wobble_squabble")) {
+                webConnection.session().set("page", "games");
+            }
+        }
+
         var template = webConnection.template("groups/view_discussions");
         template.set("group", group);
         render(webConnection, group, template, page);

diff --git a/tools/groups.sql b/tools/groups.sql
@@ -96,7 +96,7 @@ INSERT INTO `cms_stickers` (`id`, `user_id`, `x`, `y`, `z`, `sticker_id`, `skin_
 	(42, 1, '85', '383', '94', 13, 0, 2, '[b][color=#ffce00]Power Drill: [/color][/b][color=#fe6301]Bounce on any tile in \rthe field to clear it. [/color]', 1, ''),
 	(43, 1, '369', '317', '20', 13, 4, 2, '[b]Free Battleball[/b]\r\rYes until further notice we\'re letting you play both SnowStorm and Battleball for free - no tickets required.\r\r[b]Please note:[/b]\r* skill levels don\'t apply for the free games - everyone can play everyone', 1, ''),
 	(44, 1, '86', '318', '100', 13, 0, 2, '[b][color=#ffce00]Battle Bomb: [/color][/b][color=#fe6301]Clears all tiles \raround it- even yours![/color]', 1, ''),
-	(45, 1, '30', '30', '16', 13, 2, 2, '[b]Want to know how to play?\r\rRead the instructions in our [url=https://classichabbo.com/groups/1/id/discussions]discussion forum[/url][/b]', 1, ''),
+	(45, 1, '30', '30', '16', 13, 2, 2, '[b]Want to know how to play?\r\rRead the instructions in our [url=/groups/2/id/discussions]discussion forum[/url][/b]', 1, ''),
 	(46, 1, '84', '452', '83', 13, 0, 2, '[b][color=#ffce00]Light Bulb: [/color][/b][color=#fe6301]Turns all the tiles in a \rsmall area your colour.[/color]', 1, ''),
 	(47, 1, '84', '584', '96', 13, 0, 2, '[b][color=#ffce00]Flashlight: [/color][/b][color=#fe6301]Colours all the tiles in a\r straight line in front of you[/color]', 1, ''),
 	(48, 1, '85', '255', '89', 13, 0, 2, '[b][color=#ffce00]Box of pins: [/color][/b][color=#fe6301]Bouncing on these\rwill burst your ball![/color]', 1, ''),
@@ -157,7 +157,7 @@ INSERT INTO `cms_stickers` (`id`, `user_id`, `x`, `y`, `z`, `sticker_id`, `skin_
 	(103, 0, '644', '11', '19', 11000, 5, 5, '', 1, ''),
 	(104, 0, '0', '0', '0', 11200, 1, 5, '', 0, ''),
 	(105, 0, '0', '0', '0', 11300, 1, 5, '', 0, ''),
-	(106, 1, '69', '194', '6', 13, 2, 5, '[b]Hey dude! Don\'t you know the rules? Check out the How to Play thread in the [url=https://classichabbo.com/groups/snowstorm/discussions]discussion forum[/url][/b]', 1, ''),
+	(106, 1, '69', '194', '6', 13, 2, 5, '[b]Hey dude! Don\'t you know the rules? Check out the How to Play thread in the [url=/groups/5/id/discussions]discussion forum[/url][/b]', 1, ''),
 	(107, 1, '516', '1083', '1', 13, 2, 5, '[b]Not again...[/b]', 1, ''),
 	(108, 1, '556', '317', '4', 183, 0, 5, '', 1, '');
 /*!40000 ALTER TABLE `cms_stickers` ENABLE KEYS */;

diff --git a/tools/www-tpl/default-en/groups/discussion.tpl b/tools/www-tpl/default-en/groups/discussion.tpl
@@ -97,18 +97,50 @@ body { behavior: url({{ site.staticContentPath }}/web-gallery/js/csshover.htc);
 
 <div id="content-container">
 
-<div id="navi2-container" class="pngbg">
-    <div id="navi2" class="pngbg clearfix">
+	{% if session.currentPage == "games" %}
+	<div id="navi2-container" class="pngbg">
+		<div id="navi2" class="pngbg clearfix">
 		<ul>
-    		<li class="">
-				<a href="{{ site.sitePath }}/community">Community</a>    		</li>
-    		<li class="">
-				<a href="{{ site.sitePath }}/articles">News</a>    		</li>
-    		<li class=" last">
-				<a href="{{ site.sitePath }}/tag">Tags</a>    		</li>
+				<li class="">
+					<a href="/games">Games</a>
+				</li>
+				<li class="{% if group.getAlias() == 'battleball_rebound' %}selected{% endif %}">
+					<a href="/groups/battleball_rebound">BattleBall: Rebound!</a>
+				</li>
+				<li class="{% if group.getAlias() == 'snow_storm' %}selected{% endif %}">
+					<a href="/groups/snow_storm">SnowStorm</a>
+				</li>
+				<li class="{% if group.getAlias() == 'wobble_squabble' %}selected{% endif %}">
+					<a href="/groups/wobble_squabble">Wobble Squabble</a>
+				</li>
+				<li class="{% if group.getAlias() == 'lido' %}selected{% endif %} last">
+					<a href="/groups/lido">Lido Diving</a>
+				</li>
 		</ul>
-    </div>
-</div>
+		</div>
+	</div>
+	{% endif %}
+
+	{% if session.currentPage == "community" %}
+	<div id="navi2-container" class="pngbg">
+		<div id="navi2" class="pngbg clearfix">
+			<ul>
+				<li class="">
+					<a href="{{ site.sitePath }}/community">Community</a>    		</li>
+				<li class="">
+					<a href="{{ site.sitePath }}/articles">News</a>    		</li>
+				<li class="">
+					<a href="{{ site.sitePath }}/tag">Tags</a>    		</li>
+				<!-- <li class="">
+					<a href="{{ site.sitePath }}/community/photos">Photos</a>    		</li> -->
+				<li class="">
+					<a href="{{ site.sitePath }}/community/events">Events</a>    		</li>
+				<li class=" last">
+					<a href="{{ site.sitePath }}/community/fansites">Fansites</a>    		</li>
+			</ul>
+		</div>
+	</div>
+	{% endif %}
 </div>
 
 <div id="container">
@@ -381,4 +413,4 @@ HabboView.run();
 
 
 </body>
-</html>
+</html>
diff --git a/tools/www-tpl/default-en/groups/view_discussions.tpl b/tools/www-tpl/default-en/groups/view_discussions.tpl
@@ -97,18 +97,50 @@ body { behavior: url({{ site.staticContentPath }}/web-gallery/js/csshover.htc);
 
 <div id="content-container">
 
-<div id="navi2-container" class="pngbg">
-    <div id="navi2" class="pngbg clearfix">
+	{% if session.currentPage == "games" %}
+	<div id="navi2-container" class="pngbg">
+		<div id="navi2" class="pngbg clearfix">
 		<ul>
-    		<li class="">
-				<a href="{{ site.sitePath }}/community">Community</a>    		</li>
-    		<li class="">
-				<a href="{{ site.sitePath }}/articles">News</a>    		</li>
-    		<li class=" last">
-				<a href="{{ site.sitePath }}/tag">Tags</a>    		</li>
+				<li class="">
+					<a href="/games">Games</a>
+				</li>
+				<li class="{% if group.getAlias() == 'battleball_rebound' %}selected{% endif %}">
+					<a href="/groups/battleball_rebound">BattleBall: Rebound!</a>
+				</li>
+				<li class="{% if group.getAlias() == 'snow_storm' %}selected{% endif %}">
+					<a href="/groups/snow_storm">SnowStorm</a>
+				</li>
+				<li class="{% if group.getAlias() == 'wobble_squabble' %}selected{% endif %}">
+					<a href="/groups/wobble_squabble">Wobble Squabble</a>
+				</li>
+				<li class="{% if group.getAlias() == 'lido' %}selected{% endif %} last">
+					<a href="/groups/lido">Lido Diving</a>
+				</li>
 		</ul>
-    </div>
-</div>
+		</div>
+	</div>
+	{% endif %}
+
+	{% if session.currentPage == "community" %}
+	<div id="navi2-container" class="pngbg">
+		<div id="navi2" class="pngbg clearfix">
+			<ul>
+				<li class="">
+					<a href="{{ site.sitePath }}/community">Community</a>    		</li>
+				<li class="">
+					<a href="{{ site.sitePath }}/articles">News</a>    		</li>
+				<li class="">
+					<a href="{{ site.sitePath }}/tag">Tags</a>    		</li>
+				<!-- <li class="">
+					<a href="{{ site.sitePath }}/community/photos">Photos</a>    		</li> -->
+				<li class="">
+					<a href="{{ site.sitePath }}/community/events">Events</a>    		</li>
+				<li class=" last">
+					<a href="{{ site.sitePath }}/community/fansites">Fansites</a>    		</li>
+			</ul>
+		</div>
+	</div>
+	{% endif %}
 
 <div id="container">
 	<div id="content" style="position: relative" class="clearfix">