diff options
author | piernov <piernov@piernov.org> | 2016-04-25 19:10:53 +0200 |
---|---|---|
committer | piernov <piernov@piernov.org> | 2016-04-25 19:10:53 +0200 |
commit | 8770f9ddccfafaad935f66ccbf254624b41545f3 (patch) | |
tree | e07d2e93e95a34e9f70f22f52aafa82c09682e4b /index.xhtml | |
parent | b141eb3d70b3dc2d75ee8f2bf2edba1fed71f5b6 (diff) | |
parent | 8140617aeb2f32f7095a443ca743c6d6915739c6 (diff) | |
download | candybox-8770f9ddccfafaad935f66ccbf254624b41545f3.tar.gz candybox-8770f9ddccfafaad935f66ccbf254624b41545f3.tar.bz2 candybox-8770f9ddccfafaad935f66ccbf254624b41545f3.tar.xz candybox-8770f9ddccfafaad935f66ccbf254624b41545f3.zip |
Merge remote-tracking branch 'origin/alexichi' into piernov
Diffstat (limited to 'index.xhtml')
-rw-r--r-- | index.xhtml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/index.xhtml b/index.xhtml index 6ec45ef..aa29615 100644 --- a/index.xhtml +++ b/index.xhtml @@ -12,6 +12,7 @@ <meta name="author" content="Alexandre Renoux,Pierre-Emmanuel Novac"/> <title>CraftMine</title> <script type="text/javascript" charset="utf-8" src="js/craftmine.js"></script> + <script type="text/javascript" charset="utf-8" src="js/guild.js"></script> <script type="text/javascript" charset="utf-8" src="js/shop.js"></script> <script type="text/javascript" charset="utf-8" src="js/gui.js"></script> </head> @@ -26,8 +27,11 @@ <div class="col-md-10"> <span id="gold">0</span> <span id="mine">0</span> + <p>Miners : <span id="miners">0</span></p> + <span id="guild"></span> <form class="form-horizontal" method="post" action="craftmine.php"> <button class="btn btn-default" type="button" name="withdraw" onclick="withdrawMine()">Withdraw</button> + <button class="btn btn-default" type="button" name="HireMiner" onclick="hireMiner()">Hire one miner</button> </form> </div> </div> @@ -63,7 +67,7 @@ <div class="tab-pane" id="tab1"> <h4>Select a building to build:</h4> <ul class="list-inline"> - <li><button class="btn btn-default" type="button" onclick="">Miner's guild</button></li> + <li><button class="btn btn-default" type="button" onclick="createGuild()">Miner's guild</button></li> <li><button class="btn btn-default" type="button" onclick="buildShop()">Shop</button></li> </ul> </div> |