Skip to content

update lobby #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: lobby now conforms to the new API, slight API updates (mainly convention)
merged 16 commits into from
Aug 7, 2015
Merged

update lobby #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ef23e76
Merge pull request #23 from Cardshifter/lobby
sirpython Aug 7, 2015
29930c5
Merge pull request #24 from Cardshifter/lobby
sirpython Aug 7, 2015
66c4f1f
Update login.html
Phrancis Aug 7, 2015
b24fa93
Update login.html
Phrancis Aug 7, 2015
3d801e3
Update cardshifter.css
Phrancis Aug 7, 2015
98c864c
Create top_navbar.html
Phrancis Aug 7, 2015
3943e9b
Update cardshifter.css
Phrancis Aug 7, 2015
d39704b
Update login.html
Phrancis Aug 7, 2015
2e28a4c
Delete login_alt.html
Phrancis Aug 7, 2015
19dd9cc
Update cardshifter.css
Phrancis Aug 7, 2015
1f35b90
Update login.html
Phrancis Aug 7, 2015
da9be96
Update top_navbar.html
Phrancis Aug 7, 2015
422538e
Update cardshifter.html
Phrancis Aug 7, 2015
580500b
Merge pull request #32 from Cardshifter/sections-layout
Phrancis Aug 7, 2015
7bafea6
merge
acostarelli Aug 7, 2015
14e9d67
Merge branch 'lobby'
acostarelli Aug 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 38 additions & 4 deletions cardshifter.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ button, input, select, textarea {
padding-bottom; 0px;
}




/* FORMATTING FOR TOP NAV BAR */

.csh-top-link {
Expand All @@ -32,6 +29,33 @@ button, input, select, textarea {
font-size: 2em;
}

a.csh-dropdown-link,
a.csh-dropdown-link:visited {
color: #DDDDDD;
font-size: 1.4em;
font-family: Georgia, Times, "Times New Roman", serif;
}

a.csh-dropdown-link:hover,
a.csh-dropdown-link:active {
color: #DDDDDD;
text-decoration: underline;
font-family: Georgia, Times, "Times New Roman", serif;
}

.btn.btn-navbar {
color: #DDDDDD;
background-color: #000000;
/* background-image: linear-gradient(to bottom, #8f8f8f, #4a4a49); */
border-color: #DDDDDD #DDDDDD #DDDDDD;
}
.btn.btn-navbar:hover {
color: #FFFFFF;
background-color: #DDDDDD;
background-image: linear-gradient(to bottom, #4a4a49, #4a4a49);
border-color: #FFFFFF #FFFFFF #FFFFFF;
}

.csh-twitter-top-bar {
list-style: none;
margin: 0;
Expand Down Expand Up @@ -128,7 +152,7 @@ body {
border-bottom: 1px solid #eee;
}

h1, h2, h3, blockquote {
h1, h2, h3, h4, blockquote {
font-family: Georgia, Times, "Times New Roman", serif;
}

Expand Down Expand Up @@ -160,6 +184,16 @@ div.contributor {
width: 350px;
}

/* MOD-SPECIFIC FORMATTING */

.cyborg-font {
font-family: Consolas, Monaco, "Courier New", monospace;
}

.mythos-font {
font-family: Copperplate, Copperplate Gothic Light, fantasy;
}

/* FORMATTING FOR ARTICLES */

article {}
Expand Down
75 changes: 74 additions & 1 deletion cardshifter.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,80 @@
<script src="lobby/lobby_controller.js"></script>
</head>
<body>



<!-- Top Navbar will be injected here -->



<nav class="navbar navbar-inverse">
<div class="container-fluid">

<!-- BRAND -->
<div class="navbar-header">
<div class="navbar-brand csh-top-link">Cardshifter | {{username}} </div>
</div>

<form class="navbar-form">

<!-- DROPDOWNS -->

<!-- MODS -->
<ul class ="navbar-form navbar-left" style="margin-top: 8px;">
<li class="dropdown">
<a href="#" class="dropdown-toggle csh-dropdown-link" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
Mods
<span class="caret"></span></a>
<ul class="dropdown-menu">
<!-- CYBORG CHRONICLES -->
<li class="cyborg-font"><a href=#>Cyborg Chronicles</a></li>
<li role="separator" class="divider"></li>
<li class="cyborg-font"><a href=#>Game rules</a></li>
<li class="cyborg-font"><a href=#>Cards</a></li>
<!-- MYTHOS -->
<li class="mythos-font"><a href=#>Mythos</a></li>
<li role="separator" class="divider"></li>
<li class="mythos-font"><a href=#>Game rules</a></li>
<li class="mythos-font"><a href=#>Cards</a></li>
</ul>
</li>
</ul>
<!-- HELP -->
<ul class ="navbar-form navbar-left" style="margin-top: 8px;">
<li class="dropdown">
<a href="#" class="dropdown-toggle csh-dropdown-link" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
Help
<span class="caret"></span></a>
</li>
</ul>
<!-- ABOUT -->
<ul class ="navbar-form navbar-left" style="margin-top: 8px;">
<li class="dropdown">
<a href="#" class="dropdown-toggle csh-dropdown-link" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
About
<span class="caret"></span></a>
</li>
</ul>


<!-- BUTTONS -->
<div class="form-group navbar-form navbar-left">
<input name="disconnect_websocket" id="disconnect_websocket" type="button" value="Log Out" class="btn btn-navbar csh-button" />
</div>

</form> <!-- /.navbar-form -->

</div> <!-- /.container-fluid -->
</nav>




<!-- Application pages will be injected here -->
<div ng-view></div>



</body>
</html>
</html>
59 changes: 45 additions & 14 deletions login/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,69 @@
<!-- LOGIN PAGE -->

<div class="col-sm-9 col-md-10 main csh-body">
<h1>Cardshifter login</h1>

<!-- LOGIN FORM -->

<h4>Please log in to continue, or see below for instructions and assistance.</h4>

<form name="login_information" id="login_information" class="login-form">
<div class="form-group">
<label for="server" aria-label="Server">Server:</label>
<select ng-model="server" name="server" id="server" class="form-control">
<option value="ws://127.0.0.1:4243">Local host</option>
<option value="ws://dwarftowers.com:4243">dwarftowers.com</option>
<option value="ws://echo.websocket.org/">WebSocket.org echo test</option>
<option value="ws://stats.zomis.net:4243">zomis.net</option>
<option value="other">Other...</option>
</select>
<label for="secure">Is secure server:</label>
<input ng-model="is_secure" name="secure" id="secure" type="checkbox" value="secure" />
</div>
<div class="form-group">
<div ng-show="server=='other'" id="server_other">
<label for="server_other_input">Other Server:</label>
<input ng-model="other_server" name="server_other_input" id="server_other_input" type="text" class="form-control" />
<br/>
<!-- Could localhost be secure too? (SirPython)-->
<label for="secure">Is secure server:</label>
<input ng-model="is_secure" name="secure" id="secure" type="checkbox" value="secure" />
<br/>
</div>
</div>
<div class="form-group">
<label for="username">Username:</label>
<input ng-model="username" name="username" id="username" type="text" class="form-control" placeholder="Enter name..." />
</div>
<div class="form-group">
<label for="test_message">Test message to server:</label>
<input name="test_message" id="test_message" type="text" size="100" class="form-control" placeholder="Optional... Leave blank unless using for testing." />
</div>
<div class="form-group">
<input ng-click="login()" ng-disabled="loggedIn" name="submit" id="submit" type="submit" value="Log in" class="btn btn-success" />
<input name="test_websocket" id="test_websocket" type="button" value="Test WebSocket" class="btn btn-primary" />
<input name="disconnect_websocket" id="disconnect_websocket" type="button" value="Disconnect WebSocket" class="btn btn-danger" />
<input ng-click="login()" ng-disabled="loggedIn" name="submit" id="submit" type="button" value="Log in" class="btn btn-success" />
</div>
</form>

<!-- WELCOME AND HELP LINK -->

<h3>Getting started</h3>

<p>To begin playing, first select the server you would like to connect to:</p>
<ul>
<li><strong>Local Host: </strong>Select this if you are hosting a local game server on your own machine.</li>
<li><strong>dwarftowers.com: </strong><a href="http://www.dwarftowers.com">dwarftowers.com</a> server hosted by our development team.</li>
<li><strong>zomis.net: </strong><a href="http://www.zomis.net/">Zomis Productions</a> server hosted by our development team.</li>
<li><strong>Other: </strong> Enter a server address manually.</li>
</ul>
<p>Then enter a user name and click <strong>Log in</strong>.</p>
<p style="font-style: italic;">Note: You can expand the Server Console below if you would like to see server messages.</p>

<h3 class="cyborg-font" style="font-weight: bold;">Cyborg Chronicles</h3>
<p class="cyborg-font">A dystopian, cyberpunk themed game featuring human factions, war machines and interplanetary conflict.</p>
<ul>
<li><h4 class="cyborg-font"><a href=#>Game rules</a></h4></li>
<li><h4 class="cyborg-font"><a href=#>Cards</a></h4></li>
</ul>

<h3 class="mythos-font" style="font-weight: bold;">Mythos</h3>
<p class="mythos-font">Magical and Mythical Creatures clash while Gods, Goddesses and Heroes of Legend fight for human worship.</p>
<ul>
<li><h4 class="mythos-font"><a href=#>Game rules</a></h4></li>
<li><h4 class="mythos-font"><a href=#>Cards</a></h4></li>
</ul>
<h3 style="text-decoration: underline;">About Cardshifter</h3>

<ul>
<li><h4><a href="http://stats.zomis.net/io-web">Official Website</a></h4></li>
<li><h4><a href="https://github.com/Cardshifter">On GitHub</a></h4></li>
</ul>
</div>
108 changes: 0 additions & 108 deletions login/login_alt.html
View file
Open in desktop

This file was deleted.

Loading