-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #15 from jeroentvb/dev
- Loading branch information
Showing
15 changed files
with
102 additions
and
102 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,33 @@ | ||
| <% include head %> | ||
|
|
||
| <% include nav %> | ||
|
|
||
| <main> | ||
| <section class="content"> | ||
| <h1><%= lang.account.login %></h1> | ||
|
|
||
| <form action="/sign-in" method="post"> | ||
| <fieldset class="fieldset--margin"> | ||
| <div class="field field--first"> | ||
| <label for="email">E-mail</label> | ||
| <input class="input" type="email" name="email" id="email" required> | ||
| </div> | ||
|
|
||
| <div class="field field--second field--last"> | ||
| <label for="password"><%= lang.account.password %></label> | ||
| <input class="input" type="password" name="password" id="password" required> | ||
| </div> | ||
| </fieldset> | ||
|
|
||
| <fieldset> | ||
| <input type="submit" name="submit" id="submit"> | ||
| </fieldset> | ||
| </form> | ||
|
|
||
| <% if (config.allowRegister) { %> | ||
| <p>Don't have an account? Register <a href="/register">here</a></p> | ||
| <% } %> | ||
| </section> | ||
| </main> | ||
| <% include tail %> | ||
| <% include ../partials/head %> | ||
|
|
||
| <% include ../partials/nav %> | ||
|
|
||
| <main> | ||
| <section class="content"> | ||
| <h1><%= lang.account.login %></h1> | ||
|
|
||
| <form action="/sign-in" method="post"> | ||
| <fieldset class="fieldset--margin"> | ||
| <div class="field field--first"> | ||
| <label for="email">E-mail</label> | ||
| <input class="input" type="email" name="email" id="email" required> | ||
| </div> | ||
|
|
||
| <div class="field field--second field--last"> | ||
| <label for="password"><%= lang.account.password %></label> | ||
| <input class="input" type="password" name="password" id="password" required> | ||
| </div> | ||
| </fieldset> | ||
|
|
||
| <fieldset> | ||
| <input type="submit" name="submit" id="submit"> | ||
| </fieldset> | ||
| </form> | ||
|
|
||
| <% if (config.allowRegister) { %> | ||
| <p>Don't have an account? Register <a href="/register">here</a></p> | ||
| <% } %> | ||
| </section> | ||
| </main> | ||
| <% include ../partials/tail %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
88 changes: 44 additions & 44 deletions
88
templates/statistics.ejs → templates/pages/statistics.ejs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,44 @@ | ||
| <% include head %> | ||
|
|
||
| <% include nav %> | ||
|
|
||
| <main id="statistics"> | ||
| <section class="content"> | ||
| <noscript> | ||
| <p><%= lang.page.statistics.noscript %></p> | ||
| <a href="/all-stats" class="button"><%= lang.page.statistics.all_stats %></a> | ||
| </noscript> | ||
|
|
||
| <h2><%= lang.page.statistics.statistics_for %>: <%= loginStatus.name %></h2> | ||
| <p><%= lang.page.statistics.total_sessions %>: <span id="total-sessions">0</span></p> | ||
|
|
||
| <form> | ||
| <fieldset class="fieldset radio-buttons"> | ||
| <div class="field field--first field--last"> | ||
| <label for="select-year"><%= lang.page.statistics.select_year %></label> | ||
| <select id="select-year" class="input" name="select-year"></select> | ||
| </div> | ||
| </fieldset> | ||
| </form> | ||
|
|
||
| <h3><%= lang.page.statistics.session_amount %></h3> | ||
| <svg id="session-amount" class="datavis"></svg> | ||
|
|
||
|
|
||
| <h3><%= lang.page.statistics.sail_usage %></h3> | ||
| <svg id="sail-usage" class="datavis"></svg> | ||
|
|
||
| <h3><%= lang.page.statistics.board_usage %></h3> | ||
| <svg id="board-usage" class="datavis"></svg> | ||
|
|
||
| <h3><%= lang.page.statistics.spot_visits %></h3> | ||
| <svg id="spot-visits" class="datavis"></svg> | ||
|
|
||
| <a href="/all-stats" class="button"><%= lang.page.statistics.all_stats %></a> | ||
| </section> | ||
| </main> | ||
|
|
||
| <script src="js/d3.min.js"></script> | ||
| <script src="js/datavis.min.js"></script> | ||
|
|
||
| <% include tail %> | ||
| <% include ../partials/head %> | ||
|
|
||
| <% include ../partials/nav %> | ||
|
|
||
| <main id="statistics"> | ||
| <section class="content"> | ||
| <noscript> | ||
| <p><%= lang.page.statistics.noscript %></p> | ||
| <a href="/all-stats" class="button"><%= lang.page.statistics.all_stats %></a> | ||
| </noscript> | ||
|
|
||
| <h2><%= lang.page.statistics.statistics_for %>: <%= loginStatus.name %></h2> | ||
| <p><%= lang.page.statistics.total_sessions %>: <span id="total-sessions">0</span></p> | ||
|
|
||
| <form> | ||
| <fieldset class="fieldset radio-buttons"> | ||
| <div class="field field--first field--last"> | ||
| <label for="select-year"><%= lang.page.statistics.select_year %></label> | ||
| <select id="select-year" class="input" name="select-year"></select> | ||
| </div> | ||
| </fieldset> | ||
| </form> | ||
|
|
||
| <h3><%= lang.page.statistics.session_amount %></h3> | ||
| <svg id="session-amount" class="datavis"></svg> | ||
|
|
||
|
|
||
| <h3><%= lang.page.statistics.sail_usage %></h3> | ||
| <svg id="sail-usage" class="datavis"></svg> | ||
|
|
||
| <h3><%= lang.page.statistics.board_usage %></h3> | ||
| <svg id="board-usage" class="datavis"></svg> | ||
|
|
||
| <h3><%= lang.page.statistics.spot_visits %></h3> | ||
| <svg id="spot-visits" class="datavis"></svg> | ||
|
|
||
| <a href="/all-stats" class="button"><%= lang.page.statistics.all_stats %></a> | ||
| </section> | ||
| </main> | ||
|
|
||
| <script src="js/d3.min.js"></script> | ||
| <script src="js/datavis.min.js"></script> | ||
|
|
||
| <% include ../partials/tail %> |
File renamed without changes.
File renamed without changes.
File renamed without changes.