Refactoring for publish, and also addition of "Services" page
@@ -77,10 +77,10 @@ fabric.properties
|
|||||||
# Android studio 3.1+ serialized cache file
|
# Android studio 3.1+ serialized cache file
|
||||||
.idea/caches/build_file_checksums.ser
|
.idea/caches/build_file_checksums.ser
|
||||||
|
|
||||||
/Secure/
|
/HalbearNetLanding/MainSite/Secure/
|
||||||
/Hidden/
|
/HalbearNetLanding/Hidden/
|
||||||
/AccountCentre/AccountActions/
|
/HalbearNetLanding/AccountCentre/AccountActions/
|
||||||
/AccountCentre/AccountActions/
|
/HalbearNetLanding/AccountCentre/AccountActions/
|
||||||
/HalbearNetLanding/.idea/.gitignore
|
/HalbearNetLanding/.idea/.gitignore
|
||||||
/HalbearNetLanding/.idea/HalbearNetLanding.iml
|
/HalbearNetLanding/.idea/HalbearNetLanding.iml
|
||||||
/HalbearNetLanding/.idea/modules.xml
|
/HalbearNetLanding/.idea/modules.xml
|
||||||
|
|||||||
@@ -96,7 +96,7 @@
|
|||||||
transform: translate(-50%,-50%);
|
transform: translate(-50%,-50%);
|
||||||
}
|
}
|
||||||
.ErrorMessageImage{
|
.ErrorMessageImage{
|
||||||
background-image: url("../GeneralAssets/mascotchibi/chibilost.png");
|
background-image: url("../Desktop/GeneralAssets/mascotchibi/chibilost.png");
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-size: 7.5vh;
|
background-size: 7.5vh;
|
||||||
transition: 0.25s;
|
transition: 0.25s;
|
||||||
@@ -111,7 +111,7 @@
|
|||||||
max-width: 6.43vh !important;
|
max-width: 6.43vh !important;
|
||||||
min-height: 8.9375vh !important;
|
min-height: 8.9375vh !important;
|
||||||
background-position-y: 105%;
|
background-position-y: 105%;
|
||||||
background-image: url("../GeneralAssets/mascotchibi/chibiquestion.png");
|
background-image: url("../Desktop/GeneralAssets/mascotchibi/chibiquestion.png");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.ErrorMessage{
|
.ErrorMessage{
|
||||||
@@ -255,7 +255,7 @@
|
|||||||
transform: translate(-50%,-50%);
|
transform: translate(-50%,-50%);
|
||||||
}
|
}
|
||||||
.ErrorMessageImage{
|
.ErrorMessageImage{
|
||||||
background-image: url("../GeneralAssets/mascotchibi/chibilost.png");
|
background-image: url("../Desktop/GeneralAssets/mascotchibi/chibilost.png");
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-size: 15vh;
|
background-size: 15vh;
|
||||||
transition: 0.25s;
|
transition: 0.25s;
|
||||||
@@ -270,7 +270,7 @@
|
|||||||
max-width: 12.86vh !important;
|
max-width: 12.86vh !important;
|
||||||
min-height: 17.875vh !important;
|
min-height: 17.875vh !important;
|
||||||
background-position-y: 105%;
|
background-position-y: 105%;
|
||||||
background-image: url("../GeneralAssets/mascotchibi/chibiquestion.png");
|
background-image: url("../Desktop/GeneralAssets/mascotchibi/chibiquestion.png");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.ErrorMessage{
|
.ErrorMessage{
|
||||||
@@ -1,21 +1,21 @@
|
|||||||
<?php
|
<?php
|
||||||
$HomeLocation = "../HalbearNetlanding/index.php";
|
$HomeLocation = "../index.php";
|
||||||
if(isset($_SESSION["ReturnPage"])) {
|
if(isset($_SESSION["ReturnPage"])) {
|
||||||
switch($_SESSION["ReturnPage"]) {
|
switch($_SESSION["ReturnPage"]) {
|
||||||
case "Forum":
|
case "Forum":
|
||||||
$HomeLocation = '../Forum.php';
|
$HomeLocation = 'https://halbear.net/Desktop/Forum.php';
|
||||||
break;
|
break;
|
||||||
case "Index":
|
case "Index":
|
||||||
$HomeLocation = '../index.php';
|
$HomeLocation = 'https://halbear.net/Desktop/index.php';
|
||||||
break;
|
break;
|
||||||
case "Software":
|
case "Software":
|
||||||
$HomeLocation = '../Software.php';
|
$HomeLocation = 'https://halbear.net/Desktop/Software.php';
|
||||||
break;
|
break;
|
||||||
case "Artwork":
|
case "Artwork":
|
||||||
$HomeLocation = '../Artwork.php';
|
$HomeLocation = 'https://halbear.net/Desktop/Artwork.php';
|
||||||
break;
|
break;
|
||||||
case "Contact":
|
case "Contact":
|
||||||
$HomeLocation = '../Contact.php';
|
$HomeLocation = 'https://halbear.net/Desktop/Contact.php';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -356,18 +356,18 @@ Button{
|
|||||||
}
|
}
|
||||||
.ExitButton{
|
.ExitButton{
|
||||||
transition: 0.25s;
|
transition: 0.25s;
|
||||||
background-image: url("../GeneralAssets/ExitButton.png");
|
background-image: url("../Desktop/GeneralAssets/ExitButton.png");
|
||||||
}
|
}
|
||||||
.ExitButton:hover{
|
.ExitButton:hover{
|
||||||
transform: scale(1.2);
|
transform: scale(1.2);
|
||||||
background-image: url("../GeneralAssets/ExitButtonHover.png");
|
background-image: url("../Desktop/GeneralAssets/ExitButtonHover.png");
|
||||||
}
|
}
|
||||||
.MinimiseButton{
|
.MinimiseButton{
|
||||||
background-image: url("../GeneralAssets/MinimiseButton.png");
|
background-image: url("../Desktop/GeneralAssets/MinimiseButton.png");
|
||||||
margin-right: 0.25vh;
|
margin-right: 0.25vh;
|
||||||
}
|
}
|
||||||
.MinimiseButton:hover{
|
.MinimiseButton:hover{
|
||||||
background-image: url("../GeneralAssets/MinimiseButtonHover.png");
|
background-image: url("../Desktop/GeneralAssets/MinimiseButtonHover.png");
|
||||||
}
|
}
|
||||||
.appTitleButton:hover{
|
.appTitleButton:hover{
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<div id='FormBox' class="PopUpWrapper minimised animationTransition">
|
<div id='FormBox' class="PopUpWrapper minimised animationTransition">
|
||||||
<div class="WindowTitleBar">
|
<div class="WindowTitleBar">
|
||||||
<div class="WindowTitleBarContainer">
|
<div class="WindowTitleBarContainer">
|
||||||
<div class="WindowThumbnail" style="background-image: url('../GeneralAssets/windowsbutton.png');"></div>
|
<div class="WindowThumbnail" style="background-image: url('../Desktop/GeneralAssets/windowsbutton.png');"></div>
|
||||||
<div class="WindowTitle">log In</div>
|
<div class="WindowTitle">log In</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="WindowTitleBarContainer">
|
<div class="WindowTitleBarContainer">
|
||||||
|
Before Width: | Height: | Size: 6.4 KiB After Width: | Height: | Size: 6.4 KiB |
@@ -1,7 +1,7 @@
|
|||||||
<div id='FormBox' class="PopUpWrapper minimised animationTransition">
|
<div id='FormBox' class="PopUpWrapper minimised animationTransition">
|
||||||
<div class="WindowTitleBar">
|
<div class="WindowTitleBar">
|
||||||
<div class="WindowTitleBarContainer">
|
<div class="WindowTitleBarContainer">
|
||||||
<div class="WindowThumbnail" style="background-image: url('../GeneralAssets/windowsbutton.png');"></div>
|
<div class="WindowThumbnail" style="background-image: url('../Desktop/GeneralAssets/windowsbutton.png');"></div>
|
||||||
<div class="WindowTitle">Sign Up</div>
|
<div class="WindowTitle">Sign Up</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="WindowTitleBarContainer">
|
<div class="WindowTitleBarContainer">
|
||||||
|
After Width: | Height: | Size: 92 KiB |
|
After Width: | Height: | Size: 171 KiB |
@@ -1,7 +1,4 @@
|
|||||||
<?php
|
|
||||||
$UniqueSession = false;
|
|
||||||
require("../Hidden/Security/StartSession.php");
|
|
||||||
?>
|
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
|
|||||||
@@ -1,7 +1,4 @@
|
|||||||
<?php
|
|
||||||
$UniqueSession = false;
|
|
||||||
require("../Hidden/Security/StartSession.php");
|
|
||||||
?>
|
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
|
|||||||
@@ -1,7 +1,4 @@
|
|||||||
<?php
|
|
||||||
$UniqueSession = false;
|
|
||||||
require("../Hidden/Security/StartSession.php");
|
|
||||||
?>
|
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
|
|||||||
@@ -1,7 +1,4 @@
|
|||||||
<?php
|
|
||||||
$UniqueSession = false;
|
|
||||||
require("Hidden/Security/StartSession.php");
|
|
||||||
?>
|
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
@@ -1,7 +1,4 @@
|
|||||||
<?php
|
|
||||||
$UniqueSession = false;
|
|
||||||
require("Hidden/Security/StartSession.php");
|
|
||||||
?>
|
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
@@ -1,3 +1,3 @@
|
|||||||
<div style="width: 100%; height: 100%; display: flex; flex-direction: column; justify-content: center; align-content: center; align-items: center;">
|
<div style="width: 100%; height: 100%; display: flex; flex-direction: column; justify-content: center; align-content: center; align-items: center;">
|
||||||
<iframe src="http://what.everboard.art" style="width: 100%; height: 100%; border:none;"></iframe>
|
<iframe src="https://what.everboard.art" style="width: 100%; height: 100%; border:none;"></iframe>
|
||||||
</div>
|
</div>
|
||||||
@@ -1,7 +1,4 @@
|
|||||||
<?php
|
|
||||||
$UniqueSession = false;
|
|
||||||
require("Hidden/Security/StartSession.php");
|
|
||||||
?>
|
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
@@ -1,7 +1,4 @@
|
|||||||
<?php
|
|
||||||
$UniqueSession = false;
|
|
||||||
require("Hidden/Security/StartSession.php");
|
|
||||||
?>
|
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
<p class="16 whiteText variableFont" style="overflow: hidden; padding: 1vh; margin: 0">It seems you are not logged in, users need to be signed in to post on the forums and to view restricted or private posts<br><br>if you don't intend to do that, close this and continue</p>
|
<p class="16 whiteText variableFont" style="overflow: hidden; padding: 1vh; margin: 0">It seems you are not logged in, users need to be signed in to post on the forums and to view restricted or private posts<br><br>if you don't intend to do that, close this and continue</p>
|
||||||
<div style="height: 100px; width: 100%; color:transparent;">sigma</div>
|
<div style="height: 100px; width: 100%; color:transparent;">sigma</div>
|
||||||
<img src="GeneralAssets/cricket.png" style="height: 40%; width: auto; position: absolute; top: 50%; left: 50%; transform: translateX(-50%) translateY(-25%);">
|
<img src="GeneralAssets/cricket.png" style="height: 40%; width: auto; position: absolute; top: 50%; left: 50%; transform: translateX(-50%) translateY(-25%);">
|
||||||
<div class="hotbarButton" id="SignInBtn" onclick="document.location.href='AccountCentre/AccountCentre.php?Action=LogIn&SourcePage=Forum';">
|
<div class="hotbarButton" id="SignInBtn" onclick="document.location.href='../../AccountCentre/AccountCentre.php';">
|
||||||
<a class="buttontext">Log In?</a>
|
<a class="buttontext">Log In?</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -1,7 +1,4 @@
|
|||||||
<?php
|
<?php
|
||||||
$UniqueSession = false;
|
|
||||||
require("Hidden/Security/StartSession.php");
|
|
||||||
|
|
||||||
if(isset($_GET['desktop'])) $_SESSION['desktop'] = $_GET['desktop'];
|
if(isset($_GET['desktop'])) $_SESSION['desktop'] = $_GET['desktop'];
|
||||||
if(isset($_GET['fullscreen']) && $_GET['fullscreen']){
|
if(isset($_GET['fullscreen']) && $_GET['fullscreen']){
|
||||||
$Page = "Forum";
|
$Page = "Forum";
|
||||||
|
Before Width: | Height: | Size: 852 B After Width: | Height: | Size: 852 B |
|
Before Width: | Height: | Size: 868 B After Width: | Height: | Size: 868 B |
|
Before Width: | Height: | Size: 885 B After Width: | Height: | Size: 885 B |
|
Before Width: | Height: | Size: 314 B After Width: | Height: | Size: 314 B |
|
Before Width: | Height: | Size: 420 B After Width: | Height: | Size: 420 B |
|
Before Width: | Height: | Size: 414 B After Width: | Height: | Size: 414 B |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 897 B After Width: | Height: | Size: 897 B |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 359 B After Width: | Height: | Size: 359 B |
|
Before Width: | Height: | Size: 282 B After Width: | Height: | Size: 282 B |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 6.4 KiB After Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 65 KiB After Width: | Height: | Size: 65 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 819 B After Width: | Height: | Size: 819 B |
|
Before Width: | Height: | Size: 6.4 KiB After Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 397 B After Width: | Height: | Size: 397 B |
|
Before Width: | Height: | Size: 389 B After Width: | Height: | Size: 389 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 674 B After Width: | Height: | Size: 674 B |
|
Before Width: | Height: | Size: 456 B After Width: | Height: | Size: 456 B |
|
Before Width: | Height: | Size: 268 B After Width: | Height: | Size: 268 B |
|
Before Width: | Height: | Size: 279 B After Width: | Height: | Size: 279 B |
|
Before Width: | Height: | Size: 471 B After Width: | Height: | Size: 471 B |
|
Before Width: | Height: | Size: 455 B After Width: | Height: | Size: 455 B |
|
Before Width: | Height: | Size: 694 B After Width: | Height: | Size: 694 B |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 620 B After Width: | Height: | Size: 620 B |
|
Before Width: | Height: | Size: 1.3 MiB After Width: | Height: | Size: 1.3 MiB |
|
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 39 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 9.3 KiB After Width: | Height: | Size: 9.3 KiB |
|
Before Width: | Height: | Size: 312 B After Width: | Height: | Size: 312 B |
|
Before Width: | Height: | Size: 281 B After Width: | Height: | Size: 281 B |
|
Before Width: | Height: | Size: 3.2 MiB After Width: | Height: | Size: 3.2 MiB |
|
Before Width: | Height: | Size: 8.7 KiB After Width: | Height: | Size: 8.7 KiB |
|
Before Width: | Height: | Size: 2.5 MiB After Width: | Height: | Size: 2.5 MiB |
|
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 68 KiB |