Much design work.

This commit is contained in:
Greg Edwards
2015-01-26 01:26:01 -05:00
parent 97458067e5
commit 4ab1d972db
9 changed files with 227 additions and 53 deletions

Binary file not shown.

View File

@@ -1,13 +1,73 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/masters/ThreeColumn.master" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="PkmnFoundations.GTS.Default" %>
<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.Web" Assembly="PkmnFoundations.GTS" %>
<%@ Register TagPrefix="pf" TagName="LabelTextBox" Src="~/controls/LabelTextBox.ascx" %>
<asp:Content ID="Content1" ContentPlaceHolderID="cpHead" runat="server">
<asp:Content ID="conHead" ContentPlaceHolderID="cpHead" runat="server">
<pf:HeaderColour ID="HeaderColour1" CssClass="home" runat="server" />
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="cpMain" runat="server">
<asp:Content ID="conLeft" ContentPlaceHolderID="cpLeft" runat="server">
<div>
<pf:RequireCss Key="login" CssUrl="~/css/login.css" After="main" runat="server" />
<div class="gtsSection gtsLogin">
<form id="theForm" runat="server">
<pf:LabelTextBox ID="txtUsername" Label="Username" runat="server" />
<pf:LabelTextBox ID="txtPassword" Label="Password" TextMode="Password" runat="server" />
<asp:Button ID="btnSubmit" CssClass="large" Text="Login" runat="server" />
</form>
<asp:HyperLink ID="hlRegister" Text="Create an account" NavigateUrl="#" runat="server" />
</div>
<div class="gtsSection gtsInfo">
<p>Maintenance periods are <strong>Thursdays</strong> at
<strong>UTC 0500</strong>.</p>
</div>
<div class="gtsSection gtsInfo">
<p>Supported games: <strong>Diamond</strong>, <strong>Pearl</strong>,
<strong>Platinum</strong>, <strong>Heart Gold</strong>,
<strong>Soul Silver</strong>, <strong>Black</strong>,
<strong>White</strong>, <strong>Black 2</strong>,
<strong>White 2</strong>.</p>
</div>
<div class="gtsSection gtsInfo">
<p>Supported features: <strong>Wi-Fi Club</strong><sup title="Support provided by AltWFC servers">altwfc</sup>,
<strong>GTS</strong>, <strong>Battle Videos</strong>,
<strong>Random Matchup</strong></p>
</div>
<div class="gtsSection gtsTwitter">
<a class="twitter-timeline" data-dnt="true"
href="https://twitter.com/pcnstatus" data-widget-id="559566696667561986"
height="400px">Tweets by @pcnstatus</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
</div>
</asp:Content>
<asp:Content ID="conRight" ContentPlaceHolderID="cpRight" runat="server">
</asp:Content>
<asp:Content ID="conMain" ContentPlaceHolderID="cpMain" runat="server">
<h1>How to connect</h1>
<ol>
<li>Obtain an Action Replay code for your game. (complete list coming
soon)<br />If you are using an emulator, you can patch your game with
<a href="https://github.com/AdmiralCurtiss/WfcPatcher/releases">WfcPatcher</a>.</li>
<li>If applicable, enable the code and launch your game.</li>
<li>On your DS, set the DNS to <strong>104.131.93.87</strong>.</li>
<li>Connect!</li>
</ol>
<p>Complete instructions can be found at
<a href="https://github.com/polaris-/dwc_network_server_emulator/wiki#nintendo-dsdsi3ds2ds-configuration">the
AltWFC Wiki</a>.</p>
<hr />
<h1>Update - August 29:</h1>
<p>Wi-fi Battle Tower and Battle Subway are now available!
@@ -22,39 +82,5 @@
</p>
<p>Dressup photos, box uploads, and musical photos are also available.</p>
<h1>What is Foundations GTS?</h1>
<p>Foundations GTS aims to re-create the same functionality of the original
<abbr title="Global Trading Station">GTS</abbr> service found in the games, Pokémon Diamond,
Pearl, Platinum, Heart Gold, Soul Silver, Black, White, Black 2, and White 2, in an open source
project.</p>
<p>The main reason I chose to write my own GTS is because of the
<a href="http://www.nintendo.com/whatsnew/detail/vyWpoM6CBIe6FjW8NIY7bvzOrgBURhzw">shutdown
of Nintendo Wi-fi Connection services</a> on May 20. To allow players to
continue trading, someone would need to make a replacement server, so I decided to help out.</p>
<p><strong style="color: #cc0000;">This is a WORK IN PROGRESS. I make no promises that your
Pokémon will be safe or that you will get them back. If you find any problems, please
report them in the
<asp:HyperLink ID="hlIssueTracker" NavigateUrl="https://github.com/mm201/pkmnFoundations/issues" runat="server">
issue tracker</asp:HyperLink> with complete replication steps, and Wireshark captures if possible.
Thanks.
</strong></p>
<h1>What is Pokémon Foundations?</h1>
<p>Pokémon Foundations is going to be a collection of utilities dealing with the logic, math,
and data related to the main series of Pokémon RPG videogames. Planned is a Pokédex, stat calculator,
damage calculator, and possibly more! (For now, it’s just a GTS.)</p>
<h1>How do I use this GTS?</h1>
<p>Connections are made through the <a href="https://github.com/polaris-/nintendo_dwc_emulator/wiki">
DWC Network Server Emulator (altWFC)</a>. Complete instructions on how to patch your game are found at the
above link.</p>
<p>To preview the latest features, you can use this alternate DNS:</p>
<p class="code">191.236.98.208</p>
<p>Please note that using this DNS server may interfere with the operation of some other
titles besides Pokémon.</p>
</div>
</asp:Content>

View File

@@ -21,6 +21,51 @@ namespace PkmnFoundations.GTS {
/// </remarks>
protected global::PkmnFoundations.Web.HeaderColour HeaderColour1;
/// <summary>
/// theForm control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm theForm;
/// <summary>
/// txtUsername control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::PkmnFoundations.GTS.controls.LabelTextBox txtUsername;
/// <summary>
/// txtPassword control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::PkmnFoundations.GTS.controls.LabelTextBox txtPassword;
/// <summary>
/// btnSubmit control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnSubmit;
/// <summary>
/// hlRegister control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HyperLink hlRegister;
/// <summary>
/// hlBattleVideos control.
/// </summary>
@@ -29,14 +74,5 @@ namespace PkmnFoundations.GTS {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HyperLink hlBattleVideos;
/// <summary>
/// hlIssueTracker control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HyperLink hlIssueTracker;
}
}

View File

@@ -1,7 +1,7 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="LabelTextBox.ascx.cs" Inherits="PkmnFoundations.GTS.controls.LabelTextBox" %>
<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.Web" Assembly="PkmnFoundations.GTS" %>
<pf:RequireCss Key="form" CssUrl="~/css/form.css" runat="server" />
<pf:RequireCss Key="form" CssUrl="~/css/form.css" After="main" runat="server" />
<pf:RequireScript Key="jquery" ScriptUrl="~/script/jquery-1.11.1.min.js" runat="server" />
<pf:RequireScript Key="form" ScriptUrl="~/script/form.js" runat="server" />

View File

@@ -4,11 +4,13 @@
border: 1px solid #999999;
background-color: white;
box-shadow: 0 1px 2px 0 rgba(0,0,0,0.1) inset;
width: 200px;
width: 230px;
height: 14px;
padding: 2px;
padding: 3px 2px;
font-size: 10pt;
font-family: Arial,Helvetica,sans-serif;
margin-bottom: 4px;
border-radius: 2px;
}
input[type=text]:focus, input[type=password]:focus, select, textarea:focus,
@@ -17,10 +19,44 @@ input[type=text]:focus, input[type=password]:focus, select, textarea:focus
}
input[type=submit], button
{
height: 28px;
margin-bottom: 4px;
border-radius: 2px;
background-color: #008fc4;
background-image: -moz-linear-gradient(top, #008fc4 0%, #00749f 100%); /* FF3.6+ */
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#008fc4), color-stop(100%,#00749f)); /* Chrome,Safari4+ */
background-image: -webkit-linear-gradient(top, #008fc4 0%,#00749f 100%); /* Chrome10+,Safari5.1+ */
background-image: -o-linear-gradient(top, #008fc4 0%,#00749f 100%); /* Opera 11.10+ */
background-image: -ms-linear-gradient(top, #008fc4 0%,#00749f 100%); /* IE10+ */
background-image: linear-gradient(to bottom, #008fc4 0%,#00749f 100%); /* W3C */
background-size: 100%;
box-shadow: 0 2px 1px -1px #89b4d5 inset, 0 1px 2px 0 rgba(0,0,0,0.1);
border: 1px solid;
border-color: #bcd1e4 #00749f #004a68 #89b4d5;
color: white;
text-shadow: 0 1px 0 #004a68;
font-family: Lato,Candara,'Meiryo UI',Arial,sans-serif;
font-weight: bold;
cursor: pointer;
}
input[type=submit].large, button.large
{
width: 236px;
}
.pfLabelTextBox
{
position: relative;
font-family: Arial,Helvetica,sans-serif
background-color: white;
font-family: Arial,Helvetica,sans-serif;
display: inline-block;
margin: 0; padding: 0;
margin-bottom: 4px;
vertical-align: top;
border-radius: 2px;
}
.pfLabelTextBox label
@@ -29,7 +65,7 @@ input[type=text]:focus, input[type=password]:focus, select, textarea:focus
height: 0;
overflow: visible;
position: relative;
top: 2px; left: 3px;
top: 3px; left: 3px;
color: #cccccc;
}
@@ -38,6 +74,7 @@ input[type=text]:focus, input[type=password]:focus, select, textarea:focus
display: block;
background-color: transparent;
position: relative;
margin-bottom: 0;
}
.pfLabelTextBox input:focus, .pfLabelTextBox input.hasContent

5
gts/css/login.css Normal file
View File

@@ -0,0 +1,5 @@
.gtsLogin
{
width: 236px;
}

View File

@@ -15,6 +15,38 @@ h1, h2, h3, h4, strong
font-weight: 700;
}
hr
{
margin: 16px 0;
border: 1px solid #cccccc;
border-width: 1px 0 0;
}
a
{
color: #00749f;
}
a:hover
{
color: #004a68;
}
a:visited
{
color: #7e3bd0;
}
a:visited:hover
{
color: #512489;
}
li
{
margin: 4px 0;
}
.setWidth
{
width: 980px;
@@ -37,7 +69,7 @@ h1, h2, h3, h4, strong
width: 160px; height: 160px;
}
.github
.github, a.github, a.github:hover
{
width: 300px;
height: 20px;
@@ -80,6 +112,33 @@ h1, h2, h3, h4, strong
display: block;
}
.gtsInfo
{
margin-left: 40px;
position: relative;
}
.gtsInfo::before
{
width: 24px;
height: 0;
padding: 12px 0;
position: absolute;
left: -40px;
top: calc(50% - 16px);
content: 'i';
border: 4px solid #999999;
color: #999999;
font-family: Arial,Helvetica,sans-serif;
line-height: 0;
vertical-align: middle;
border-radius: 100%;
font-size: 24px;
font-weight: bold;
text-align: center;
display: block;
}
#gtsHeader
{
padding-top: 16px;
@@ -92,6 +151,11 @@ h1, h2, h3, h4, strong
position: relative;
}
#gtsHeader a, #gtsHeader a:visited
{
color: white;
}
#gtsHeader #gtsLogo
{
width: 276px;
@@ -106,7 +170,6 @@ h1, h2, h3, h4, strong
text-decoration: none;
}
#gtsHeader #gtsLogo .gtsLogoImage, #gtsHeader #gtsLogo .gtsLogoWord
{
display: block;
@@ -277,6 +340,11 @@ h1, h2, h3, h4, strong
width: 728px;
}
#gtsMain .gtsColumn .gtsSection
{
margin-bottom: 16px;
}
#gtsSubNav
{
border: 1px solid #cccccc;

View File

@@ -81,6 +81,7 @@
<Content Include="admin\Sessions.aspx" />
<Content Include="controls\LabelTextBox.ascx" />
<Content Include="css\form.css" />
<Content Include="css\login.css" />
<Content Include="favicon.ico" />
<Content Include="gts\Default.aspx" />
<Content Include="battlevideo\Default.aspx" />

View File

@@ -35,6 +35,7 @@
<div id="gtsHeadMain">
<ul class="gtsHeadContent">
<li>Powered by <a href="http://altwfc.net/">AltWFC</a></li>
<li>DNS: <strong>104.131.93.87</strong></li>
<li><asp:Literal ID="litPokemon" runat="server" />
Pokémon available for offer.</li>