Permalink
Browse files

Update Freeciv-web to use help manual from the Freeciv distribution, …

…so that the Freeciv-web client has consistent help with the other clients.
  • Loading branch information...
1 parent 7d14088 commit e65e391954b495542e076ca58875ec7390e07af1 @andreasrosdal andreasrosdal committed Aug 2, 2014
Showing with 490 additions and 7,847 deletions.
  1. +4 −4 LICENSE.txt
  2. +36 −1 freeciv-web/src/main/webapp/css/civclient.css
  3. +53 −0 freeciv-web/src/main/webapp/docs/controls.txt
  4. +34 −0 freeciv-web/src/main/webapp/docs/help_intro.txt
  5. BIN freeciv-web/src/main/webapp/images/facebook-share.png
  6. BIN freeciv-web/src/main/webapp/images/facebook.gif
  7. BIN freeciv-web/src/main/webapp/images/flickr.ico
  8. BIN freeciv-web/src/main/webapp/images/freeciv-splash.jpg
  9. BIN freeciv-web/src/main/webapp/images/google.gif
  10. BIN freeciv-web/src/main/webapp/images/header.png
  11. BIN freeciv-web/src/main/webapp/images/header_small.png
  12. BIN freeciv-web/src/main/webapp/images/twitter-share.png
  13. BIN freeciv-web/src/main/webapp/images/units.jpg
  14. BIN freeciv-web/src/main/webapp/images/wordpress.ico
  15. BIN freeciv-web/src/main/webapp/images/yahoo.gif
  16. +0 −19 freeciv-web/src/main/webapp/javascript/civclient.js
  17. +247 −0 freeciv-web/src/main/webapp/javascript/helpdata.js
  18. +7 −1 freeciv-web/src/main/webapp/javascript/improvement.js
  19. +0 −4 freeciv-web/src/main/webapp/javascript/mapview.js
  20. +26 −0 freeciv-web/src/main/webapp/javascript/unit.js
  21. +9 −0 freeciv-web/src/main/webapp/javascript/utility.js
  22. +0 −741 freeciv-web/src/main/webapp/manual/buildings.jsp
  23. +0 −594 freeciv-web/src/main/webapp/manual/cities.jsp
  24. +0 −452 freeciv-web/src/main/webapp/manual/combat.jsp
  25. +0 −162 freeciv-web/src/main/webapp/manual/controls.jsp
  26. +0 −259 freeciv-web/src/main/webapp/manual/diplomacy.jsp
  27. +0 −414 freeciv-web/src/main/webapp/manual/economy.jsp
  28. +0 −230 freeciv-web/src/main/webapp/manual/government.jsp
  29. BIN freeciv-web/src/main/webapp/manual/images/Arctic.png
  30. BIN freeciv-web/src/main/webapp/manual/images/B.airport.png
  31. BIN freeciv-web/src/main/webapp/manual/images/B.apollo_program.png
  32. BIN freeciv-web/src/main/webapp/manual/images/B.aqueduct.png
  33. BIN freeciv-web/src/main/webapp/manual/images/B.asmiths_trading_co.png
  34. BIN freeciv-web/src/main/webapp/manual/images/B.bank.png
  35. BIN freeciv-web/src/main/webapp/manual/images/B.barracks.png
  36. BIN freeciv-web/src/main/webapp/manual/images/B.barracks2.png
  37. BIN freeciv-web/src/main/webapp/manual/images/B.barracks3.png
  38. BIN freeciv-web/src/main/webapp/manual/images/B.capitalization.png
  39. BIN freeciv-web/src/main/webapp/manual/images/B.cathedral.png
  40. BIN freeciv-web/src/main/webapp/manual/images/B.city_walls.png
  41. BIN freeciv-web/src/main/webapp/manual/images/B.coastal_defense.png
  42. BIN freeciv-web/src/main/webapp/manual/images/B.colosseum.png
  43. BIN freeciv-web/src/main/webapp/manual/images/B.colossus.png
  44. BIN freeciv-web/src/main/webapp/manual/images/B.copernicus_observatory.png
  45. BIN freeciv-web/src/main/webapp/manual/images/B.courthouse.png
  46. BIN freeciv-web/src/main/webapp/manual/images/B.cure_for_cancer.png
  47. BIN freeciv-web/src/main/webapp/manual/images/B.darwins_voyage.png
  48. BIN freeciv-web/src/main/webapp/manual/images/B.eiffel_tower.png
  49. BIN freeciv-web/src/main/webapp/manual/images/B.factory.png
  50. BIN freeciv-web/src/main/webapp/manual/images/B.granary.png
  51. BIN freeciv-web/src/main/webapp/manual/images/B.great_library.png
  52. BIN freeciv-web/src/main/webapp/manual/images/B.great_wall.png
  53. BIN freeciv-web/src/main/webapp/manual/images/B.hanging_gardens.png
  54. BIN freeciv-web/src/main/webapp/manual/images/B.harbour.png
  55. BIN freeciv-web/src/main/webapp/manual/images/B.hoover_dam.png
  56. BIN freeciv-web/src/main/webapp/manual/images/B.hydro_plant.png
  57. BIN freeciv-web/src/main/webapp/manual/images/B.isaac_newtons_college.png
  58. BIN freeciv-web/src/main/webapp/manual/images/B.js_bachs_cathedral.png
  59. BIN freeciv-web/src/main/webapp/manual/images/B.king_richards_crusade.png
  60. BIN freeciv-web/src/main/webapp/manual/images/B.leonardos_workshop.png
  61. BIN freeciv-web/src/main/webapp/manual/images/B.library.png
  62. BIN freeciv-web/src/main/webapp/manual/images/B.lighthouse.png
  63. BIN freeciv-web/src/main/webapp/manual/images/B.magellans_expedition.png
  64. BIN freeciv-web/src/main/webapp/manual/images/B.manhattan_project.png
  65. BIN freeciv-web/src/main/webapp/manual/images/B.marco_polos_embassy.png
  66. BIN freeciv-web/src/main/webapp/manual/images/B.marketplace.png
  67. BIN freeciv-web/src/main/webapp/manual/images/B.mass_transit.png
  68. BIN freeciv-web/src/main/webapp/manual/images/B.mfg_plant.png
  69. BIN freeciv-web/src/main/webapp/manual/images/B.michelangelos_chapel.png
  70. BIN freeciv-web/src/main/webapp/manual/images/B.nuclear_plant.png
  71. BIN freeciv-web/src/main/webapp/manual/images/B.offshore_platform.png
  72. BIN freeciv-web/src/main/webapp/manual/images/B.oracle.png
  73. BIN freeciv-web/src/main/webapp/manual/images/B.palace.png
  74. BIN freeciv-web/src/main/webapp/manual/images/B.police_station.png
  75. BIN freeciv-web/src/main/webapp/manual/images/B.port_facility.png
  76. BIN freeciv-web/src/main/webapp/manual/images/B.power_plant.png
  77. BIN freeciv-web/src/main/webapp/manual/images/B.pyramids.png
  78. BIN freeciv-web/src/main/webapp/manual/images/B.recycling_center.png
  79. BIN freeciv-web/src/main/webapp/manual/images/B.research_lab.png
  80. BIN freeciv-web/src/main/webapp/manual/images/B.sam_battery.png
  81. BIN freeciv-web/src/main/webapp/manual/images/B.sdi_defense.png
  82. BIN freeciv-web/src/main/webapp/manual/images/B.seti_program.png
  83. BIN freeciv-web/src/main/webapp/manual/images/B.sewer_system.png
  84. BIN freeciv-web/src/main/webapp/manual/images/B.shakespeares_theatre.png
  85. BIN freeciv-web/src/main/webapp/manual/images/B.space_component.png
  86. BIN freeciv-web/src/main/webapp/manual/images/B.space_modules.png
  87. BIN freeciv-web/src/main/webapp/manual/images/B.space_structural.png
  88. BIN freeciv-web/src/main/webapp/manual/images/B.statue_of_liberty.png
  89. BIN freeciv-web/src/main/webapp/manual/images/B.stock_exchange.png
  90. BIN freeciv-web/src/main/webapp/manual/images/B.sun_tzus_war_academy.png
  91. BIN freeciv-web/src/main/webapp/manual/images/B.super_highways.png
  92. BIN freeciv-web/src/main/webapp/manual/images/B.supermarket.png
  93. BIN freeciv-web/src/main/webapp/manual/images/B.temple.png
  94. BIN freeciv-web/src/main/webapp/manual/images/B.united_nations.png
  95. BIN freeciv-web/src/main/webapp/manual/images/B.university.png
  96. BIN freeciv-web/src/main/webapp/manual/images/B.womens_suffrage.png
  97. BIN freeciv-web/src/main/webapp/manual/images/Citywork21.png
  98. BIN freeciv-web/src/main/webapp/manual/images/Desert.png
  99. BIN freeciv-web/src/main/webapp/manual/images/Forest.png
  100. BIN freeciv-web/src/main/webapp/manual/images/Gov.anarchy.png
  101. BIN freeciv-web/src/main/webapp/manual/images/Gov.communism.png
  102. BIN freeciv-web/src/main/webapp/manual/images/Gov.democracy.png
  103. BIN freeciv-web/src/main/webapp/manual/images/Gov.despotism.png
  104. BIN freeciv-web/src/main/webapp/manual/images/Gov.monarchy.png
  105. BIN freeciv-web/src/main/webapp/manual/images/Gov.republic.png
  106. BIN freeciv-web/src/main/webapp/manual/images/Grassland.png
  107. BIN freeciv-web/src/main/webapp/manual/images/Hills.png
  108. BIN freeciv-web/src/main/webapp/manual/images/Jungle.png
  109. BIN freeciv-web/src/main/webapp/manual/images/Mountains.png
  110. BIN freeciv-web/src/main/webapp/manual/images/Ocean.png
  111. BIN freeciv-web/src/main/webapp/manual/images/Plains.png
  112. BIN freeciv-web/src/main/webapp/manual/images/Swamp.png
  113. BIN freeciv-web/src/main/webapp/manual/images/Ts.arctic_ivory.png
  114. BIN freeciv-web/src/main/webapp/manual/images/Ts.arctic_oil.png
  115. BIN freeciv-web/src/main/webapp/manual/images/Ts.buffalo.png
  116. BIN freeciv-web/src/main/webapp/manual/images/Ts.coal.png
  117. BIN freeciv-web/src/main/webapp/manual/images/Ts.fish.png
  118. BIN freeciv-web/src/main/webapp/manual/images/Ts.fruit.png
  119. BIN freeciv-web/src/main/webapp/manual/images/Ts.furs.png
  120. BIN freeciv-web/src/main/webapp/manual/images/Ts.gems.png
  121. BIN freeciv-web/src/main/webapp/manual/images/Ts.gold.png
  122. BIN freeciv-web/src/main/webapp/manual/images/Ts.grassland_resources.png
  123. BIN freeciv-web/src/main/webapp/manual/images/Ts.iron.png
  124. BIN freeciv-web/src/main/webapp/manual/images/Ts.oasis.png
  125. BIN freeciv-web/src/main/webapp/manual/images/Ts.oil.png
  126. BIN freeciv-web/src/main/webapp/manual/images/Ts.peat.png
  127. BIN freeciv-web/src/main/webapp/manual/images/Ts.pheasant.png
  128. BIN freeciv-web/src/main/webapp/manual/images/Ts.silk.png
  129. BIN freeciv-web/src/main/webapp/manual/images/Ts.spice.png
  130. BIN freeciv-web/src/main/webapp/manual/images/Ts.tundra_game.png
  131. BIN freeciv-web/src/main/webapp/manual/images/Ts.whales.png
  132. BIN freeciv-web/src/main/webapp/manual/images/Ts.wheat.png
  133. BIN freeciv-web/src/main/webapp/manual/images/Ts.wine.png
  134. BIN freeciv-web/src/main/webapp/manual/images/Tundra.png
  135. BIN freeciv-web/src/main/webapp/manual/images/Tx.airbase.png
  136. BIN freeciv-web/src/main/webapp/manual/images/Tx.farmland.png
  137. BIN freeciv-web/src/main/webapp/manual/images/Tx.fortress.png
  138. BIN freeciv-web/src/main/webapp/manual/images/Tx.irrigation.png
  139. BIN freeciv-web/src/main/webapp/manual/images/Tx.mine.png
  140. BIN freeciv-web/src/main/webapp/manual/images/Tx.rail.png
  141. BIN freeciv-web/src/main/webapp/manual/images/Tx.river.png
  142. BIN freeciv-web/src/main/webapp/manual/images/Tx.road.png
  143. BIN freeciv-web/src/main/webapp/manual/images/Tx.village.png
  144. BIN freeciv-web/src/main/webapp/manual/images/U.aegis_cruiser.png
  145. BIN freeciv-web/src/main/webapp/manual/images/U.alpine_troops.png
  146. BIN freeciv-web/src/main/webapp/manual/images/U.archers.png
  147. BIN freeciv-web/src/main/webapp/manual/images/U.armor.png
  148. BIN freeciv-web/src/main/webapp/manual/images/U.artillery.png
  149. BIN freeciv-web/src/main/webapp/manual/images/U.awacs.png
  150. BIN freeciv-web/src/main/webapp/manual/images/U.battleship.png
  151. BIN freeciv-web/src/main/webapp/manual/images/U.bomber.png
  152. BIN freeciv-web/src/main/webapp/manual/images/U.cannon.png
  153. BIN freeciv-web/src/main/webapp/manual/images/U.caravan.png
  154. BIN freeciv-web/src/main/webapp/manual/images/U.caravel.png
  155. BIN freeciv-web/src/main/webapp/manual/images/U.carrier.png
  156. BIN freeciv-web/src/main/webapp/manual/images/U.catapult.png
  157. BIN freeciv-web/src/main/webapp/manual/images/U.cavalry.png
  158. BIN freeciv-web/src/main/webapp/manual/images/U.chariot.png
  159. BIN freeciv-web/src/main/webapp/manual/images/U.cruise_missile.png
  160. BIN freeciv-web/src/main/webapp/manual/images/U.cruiser.png
  161. BIN freeciv-web/src/main/webapp/manual/images/U.destroyer.png
  162. BIN freeciv-web/src/main/webapp/manual/images/U.diplomat.png
  163. BIN freeciv-web/src/main/webapp/manual/images/U.dragoons.png
  164. BIN freeciv-web/src/main/webapp/manual/images/U.engineers.png
  165. BIN freeciv-web/src/main/webapp/manual/images/U.explorer.png
  166. BIN freeciv-web/src/main/webapp/manual/images/U.fighter.png
  167. BIN freeciv-web/src/main/webapp/manual/images/U.freight.png
  168. BIN freeciv-web/src/main/webapp/manual/images/U.frigate.png
  169. BIN freeciv-web/src/main/webapp/manual/images/U.galleon.png
  170. BIN freeciv-web/src/main/webapp/manual/images/U.helicopter.png
  171. BIN freeciv-web/src/main/webapp/manual/images/U.horsemen.png
  172. BIN freeciv-web/src/main/webapp/manual/images/U.howitzer.png
  173. BIN freeciv-web/src/main/webapp/manual/images/U.ironclad.png
  174. BIN freeciv-web/src/main/webapp/manual/images/U.knights.png
  175. BIN freeciv-web/src/main/webapp/manual/images/U.legion.png
  176. BIN freeciv-web/src/main/webapp/manual/images/U.marines.png
  177. BIN freeciv-web/src/main/webapp/manual/images/U.mech_inf.png
  178. BIN freeciv-web/src/main/webapp/manual/images/U.musketeers.png
  179. BIN freeciv-web/src/main/webapp/manual/images/U.nuclear.png
  180. BIN freeciv-web/src/main/webapp/manual/images/U.paratroopers.png
  181. BIN freeciv-web/src/main/webapp/manual/images/U.partisan.png
  182. BIN freeciv-web/src/main/webapp/manual/images/U.phalanx.png
  183. BIN freeciv-web/src/main/webapp/manual/images/U.pikemen.png
  184. BIN freeciv-web/src/main/webapp/manual/images/U.riflemen.png
  185. BIN freeciv-web/src/main/webapp/manual/images/U.settlers.png
  186. BIN freeciv-web/src/main/webapp/manual/images/U.spy.png
  187. BIN freeciv-web/src/main/webapp/manual/images/U.stealth_bomber.png
  188. BIN freeciv-web/src/main/webapp/manual/images/U.stealth_fighter.png
  189. BIN freeciv-web/src/main/webapp/manual/images/U.submarine.png
  190. BIN freeciv-web/src/main/webapp/manual/images/U.transport.png
  191. BIN freeciv-web/src/main/webapp/manual/images/U.trireme.png
  192. BIN freeciv-web/src/main/webapp/manual/images/U.warriors.png
  193. BIN freeciv-web/src/main/webapp/manual/images/U.worker.png
  194. +0 −65 freeciv-web/src/main/webapp/manual/index.jsp
  195. +0 −101 freeciv-web/src/main/webapp/manual/overview.jsp
  196. +0 −2,455 freeciv-web/src/main/webapp/manual/technology.jsp
  197. +0 −789 freeciv-web/src/main/webapp/manual/terrain.jsp
  198. +0 −917 freeciv-web/src/main/webapp/manual/units.jsp
  199. +0 −632 freeciv-web/src/main/webapp/manual/wonders.jsp
  200. +1 −2 freeciv-web/src/main/webapp/webclient/game.jsp
  201. +0 −4 freeciv-web/src/main/webapp/webclient/help.jsp
  202. +69 −0 scripts/helpdata_gen/helpdata_gen.py
  203. +4 −1 scripts/sync-js-hand.sh
View
@@ -1,5 +1,5 @@
-Freeciv.net is is free and open source software. The Freeciv C server is released under
-the GNU General Public License, while the Freeciv.net web client is released
+Freeciv-web is free and open source software. The Freeciv C server is released under
+the GNU General Public License, while the Freeciv-web web client is released
under the GNU Affero General Public License.
@@ -9,10 +9,10 @@ methods for playing it. Nor does copyright protect any idea, system, method, dev
trademark material involved in developing, merchandising, or playing a game. Once a game
has been made public, nothing in the copyright law prevents others from developing another
game based on similar principles. Copyright protects only the particular manner of an
-authors expression in literary, artistic, or musical form."
+author's expression in literary, artistic, or musical form."
-Freeciv.net is released under the GNU Affero General Public License, which is included here:
+Freeciv-web is released under the GNU Affero General Public License, which is included here:
@@ -580,4 +580,39 @@ button.fg-button { width:auto; overflow:visible; } /* removes extra button widt
max-height: 500px;
float: right;
margin: 5px;
- }
+}
+
+#help_menu {
+ float: left;
+ background-image: url('/images/bg.jpg');
+ color: black;
+
+}
+
+#help_info_page {
+ float: left;
+ padding-left: 30px;
+ max-width: 75%;
+}
+
+.help_submenu {
+ max-height: 600px;
+ overflow: auto;
+ min-width: 320px;
+ background-image: url('/images/bg.jpg');
+ color: black;
+}
+
+#tabs-hel.manual_doc {
+ background-image: url('/images/bg.jpg');
+ color: black;
+
+}
+
+#tabs-hel.manual_doc a {
+ color: darkgreen;
+}
+
+.ui-icon, .ui-widget-content .ui-icon {
+ background-image: url("images/ui-icons_222222_256x240.png");
+}
@@ -0,0 +1,53 @@
+<h1>Controls</h1>
+
+Unit Orders:
+============
+ a: (a)uto-settler (settler/worker units)
+ b: (b)uild city (settler units)
+ f: (f)ortify unit (military units)
+ f: build (f)ortress (settler/worker units)
+ g: (g)o to tile (then left-click mouse to select target tile)
+ h: set unit's (h)omecity (to city on current tile)
+ i: build (i)rrigation or convert terrain (settler/worker units)
+ m: build (m)ine or convert terrain (settler/worker units)
+ n: clean (n)uclear fallout
+ N: explode (N)uclear
+ o: transf(o)rm terrain (engineer unit)
+ p: clean (p)ollution (settler/worker units)
+ P: (P)illage (destroy terrain alteration)
+ r: build (r)oad/railroad (settler/worker units)
+ s: (s)entry unit
+ S: un(S)entry all units on tile
+ L: unit go (t)o/airlift to city
+ u: (u)nload unit from transporter
+ x: unit auto e(x)plore
+
+
+Unit Selection:
+==============
+ w: (w)ait: focus on next unit
+
+
+Unit Movement:
+==============
+ 1: move south-west
+ 2: move south
+ 3: move south-east
+ 4: move west
+ 6: move east
+ 7: move north-west
+ 8: move north
+ 9: move north-east
+
+Main Map (Mouse):
+=================
+ Left-click on city: Pop up city dialog
+ Left-click on unit: Select a single unit
+ (cancels any current activity if "clear
+ unit orders on selection" is set)
+ Center-click: Show tile info
+ Right-click: Center tile in view
+
+
+Shift-Return: Turn done
+
@@ -0,0 +1,34 @@
+<h1>The Freeciv Online Manual</h1>
+<img src='/images/freeciv-fp-logo-2.png'><br><br>
+
+Freeciv is a Free and Open Source empire-building strategy game inspired by the
+history of human civilization. The game commences in prehistory and your mission
+is to lead your tribe from the Stone Age to the Space Age...<br><br>
+Freeciv-web is the HTML5 web-browser version of <a href="http://www.freeciv.org" target="_new">Freeciv</a>.
+Freeciv-web is free and open source software, released under the <a href="https://www.gnu.org/licenses/agpl-3.0.html" target='_new'>
+GNU Affero General Public License</a>. The Freeciv C server is released under the
+<a href="https://www.gnu.org/licenses/gpl-2.0.html" target='_new'>GNU General
+Public License</a>. <br>
+
+Freeciv-web was created by <a href='http://www.twitter.com/andreasrosdal' target='_new'>
+Andreas R&oslash;sdal</a>. A huge list of people have contributed to the Freeciv project, see the full
+<a href='http://freeciv.wikia.com/wiki/People' target='_new'>credits for
+Freeciv</a>. Freeciv-web is always looking for game developers to help improve
+the game!
+
+<br><br>
+
+Freeciv-web and the server you are playing this game on right now, is made
+possible by <a href="http://freeciv.wikia.com/wiki/Donations"
+target="_new">donations</a> from users. <br>
+<i><b>Please support this volunteer effort by <a href="http://freeciv.wikia.com/wiki/Donations"
+target="_new">donating to Freeciv now!</a></b></i>. Thanks!
+
+<br><br>
+
+You can also find more information about Freeciv here:
+
+<br><a href='http://www.freeciv.org/wiki/' target='_new'>Freeciv Wiki</a><br>
+<a href='http://forum.freeciv.org/' target='_new'>Freeciv Forum</a><br>
+<a href='https://github.com/freeciv/freeciv-web' target='_new'>Freeciv-web on Github</a><br>
+<a href='http://freeciv.wikia.com/wiki/Bug_Reporting' target='_new'>Bug Reporting</a><br>
Deleted file not rendered
Deleted file not rendered
Binary file not shown.
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Binary file not shown.
Deleted file not rendered
@@ -397,25 +397,6 @@ function set_phase_start()
}
/**************************************************************************
- ...
-**************************************************************************/
-function show_help()
-{
- $.ajax({url: "/manual",
- async: false,
- success: function(msg){
- $("#game_manual").html(msg);
- $('#tabs_manual').tabs();
- }
- });
-
-
- $(".manual-tab").height( mapview['height'] - 200);
-
-}
-
-
-/**************************************************************************
...
**************************************************************************/
function request_observe_game()
Oops, something went wrong.

0 comments on commit e65e391

Please sign in to comment.