Added links to wiki + tool tips

Red-Cross-Knight · Red-Cross-Knight · commit 84b426ee437e · 2012-08-11T02:03:54.000-04:00
Added some tool tips per: smrealms#12 Added link to wiki per: smrealms#18 Also added 2 images, 1 informational (tool tips), 1 help (links to wiki) Added links to wiki pages on various pages.
diff --git a/admin/Default/1.6/universe_create_save_processing.php b/admin/Default/1.6/universe_create_save_processing.php
@@ -645,8 +645,8 @@ function createGame($gameID) {
 	
 	$db->query('REPLACE INTO alliance_thread_topic (game_id, alliance_id, thread_id, topic) VALUES (' . $db->escapeNumber($gameID) . ', ' . $db->escapeNumber(NHA_ID) . ', 22, \'Ships\')');
 	$text = 'Everything you do in SMR is done while you are flying some kind of ship - it can be anything from an escape pod to a huge IkThorne mothership, but you are always the pilot of something. In addition to the neutral ships, each race also has unique ships that only race members can purchase. You can find the SMR shiplist here:<br />
-	<br />
-	<a href="http://www.smrealms.de/manual.php?52">http://www.smrealms.de/manual.php?52</a><br />
+	<a href="http://www.smrealms.de/ship_list.php target="_blank">http://www.smrealms.de/ship_list.php</a> <br />
+	Additional information relating to ships can be found in the <a href="http://wiki.smrealms.de/" target="_blank">SMR wiki</a><br />
 	<br />
 	It is important to choose ships to match your budget and your needs, and the biggest or most expensive ships are not always the best ones for all purposes.<br />
 	<br />
@@ -674,7 +674,7 @@ function createGame($gameID) {
 	$db->query('REPLACE INTO alliance_thread_topic (game_id, alliance_id, thread_id, topic) VALUES (' . $db->escapeNumber($gameID) . ', ' . $db->escapeNumber(NHA_ID) . ', 23, \'Weapons\')');
 	$text = 'SMR has a wide variety of weapons with which to arm your ships, and information on weapon capabilities can be found here:<br />
 	<br />
-	<a href="http://www.smrealms.de/manual.php?53">http://www.smrealms.de/manual.php?53</a><br />
+	<a href="http://www.smrealms.de/weapon_list.php">http://www.smrealms.de/weapon_list.php</a><br />
 	<br />
 	There are a few things to consider when choosing weapons, and the weapon combination that works for one player may not be suited to the style or the needs of another.<br />
 	<br />
diff --git a/admin/Default/universe_create_end.php b/admin/Default/universe_create_end.php
@@ -237,8 +237,8 @@
 
 $db->query('REPLACE INTO alliance_thread_topic (game_id, alliance_id, thread_id, topic) VALUES ('.$game_id.', 302, 22, \'Ships\')');
 $text = 'Everything you do in SMR is done while you are flying some kind of ship - it can be anything from an escape pod to a huge IkThorne mothership, but you are always the pilot of something. In addition to the neutral ships, each race also has unique ships that only race members can purchase. You can find the SMR shiplist here:<br />	
-<br />
-<a href="http://www.smrealms.de/manual.php?52">http://www.smrealms.de/manual.php?52</a><br />
+<a href="http://www.smrealms.de/ship_list.php target="_blank">http://www.smrealms.de/ship_list.php</a> <br />
+Additional information relating to ships can be found in the <a href="http://wiki.smrealms.de/" target="_blank">SMR wiki</a><br />
 <br />
 It is important to choose ships to match your budget and your needs, and the biggest or most expensive ships are not always the best ones for all purposes.<br />
 <br />
@@ -266,7 +266,7 @@
 $db->query('REPLACE INTO alliance_thread_topic (game_id, alliance_id, thread_id, topic) VALUES ('.$game_id.', 302, 23, \'Weapons\')');
 $text = 'SMR has a wide variety of weapons with which to arm your ships, and information on weapon capabilities can be found here:<br />
 <br />
-<a href="http://www.smrealms.de/manual.php?53">http://www.smrealms.de/manual.php?53</a><br />
+<a href="http://www.smrealms.de/weapon_list.php">http://www.smrealms.de/weapon_list.php</a><br />>
 <br />
 There are a few things to consider when choosing weapons, and the weapon combination that works for one player may not be suited to the style or the needs of another.<br />
 <br />
diff --git a/engine/Default/alliance_forces.php b/engine/Default/alliance_forces.php
@@ -52,7 +52,7 @@
 AND expire_time >= ' . $db->escapeNumber(TIME) . '
 ORDER BY ' . $categorySQL . ', ' . $subcategory);
 
-$PHP_OUTPUT.= '<div align="center">';
+$PHP_OUTPUT.= '<div align="center"><a href="http://wiki.smrealms.de/index.php?title=Game_Guide:_Forces" target="_blank"><img align="right" src="images/silk/help.png" width="16" height="16" alt="Wiki Link" title="Goto SMR Wiki: Forces"/></a>';
 
 if ($db->getNumRows() > 0) {
 	$PHP_OUTPUT.= 'Your alliance currently has ';
diff --git a/engine/Default/forces_list.php b/engine/Default/forces_list.php
@@ -37,6 +37,7 @@
 	$container['subcategory'] = $category;
 
 	$PHP_OUTPUT.=create_table();
+	$PHP_OUTPUT.=('<a href="http://wiki.smrealms.de/index.php?title=Game_Guide:_Forces" target="_blank"><img align="right" src="images/silk/help.png" width="16" height="16" alt="Wiki Link" title="Goto SMR Wiki: Forces"/></a><br />');
 	$PHP_OUTPUT.=('<tr>');
 	setCategories($container,'sector_id',$category,$categorySQL,$subcategory);
 	$PHP_OUTPUT.=('<th align="center">');
@@ -76,7 +77,7 @@
 }
 
 else
-	$PHP_OUTPUT.=('You have no deployed forces');
+	$PHP_OUTPUT.=('You have no deployed forces <a href="http://wiki.smrealms.de/index.php?title=Game_Guide:_Forces" target="_blank"><img src="images/silk/help.png" width="16" height="16" alt="Wiki Link" title="Goto SMR Wiki: Forces"/></a>');
 
 
 function setCategories(&$container,$newCategory,$oldCategory,$oldCategorySQL,$subcategory) {
diff --git a/engine/Default/game_join_processing.php b/engine/Default/game_join_processing.php
@@ -187,7 +187,7 @@
 	$db->query('INSERT INTO player_has_alliance_role (game_id, account_id, role_id,alliance_id) VALUES ('.$db->escapeNumber($gameID).', '.$db->escapeNumber($account->getAccountID()).', 2,'.$db->escapeNumber(NHA_ID).')');
 	//we need to send them some messages
 	$message = 'Welcome to Space Merchant Realms, this message is to get you underway with information to start you off in the game. All newbie and beginner rated player are placed into a teaching alliance run by a Veteran player who is experienced enough to answer all your questions and give you a helping hand at learning the basics of the game.<br /><br />
-	Apart from your leader (denoted with a star on your alliance roster) there are various other ways to get information and help. Newbie helpers are players in Blue marked on the Current Players List which you can view by clicking the link on the left-hand side of the screen that says "Current Players". Also you can visit the SMR Manual via a link on the left which gives detailed information on all aspects fo the game.<br /><br />
+	Apart from your leader (denoted with a star on your alliance roster) there are various other ways to get information and help. Newbie helpers are players in Blue marked on the Current Players List which you can view by clicking the link on the left-hand side of the screen that says "Current Players". Also you can visit the SMR Wiki via a link on the left which gives detailed information on all aspects fo the game.<br /><br />
 	SMR is a very community orientated game and as such there is an IRC Chat server setup for people to talk with each other and coordinate your alliances. There is a link on the left which will take you directly to the main SMR room where people come to hang out and chat. You can also get help in the game in the #smr room. You can access this by typing /join #smr-help in the server window. If you prefer to use a dedicated program to access IRC Chat rather than a browser you can goto http://www.mirc.com which is a good shareware program (asks to register the program after 30 days but you can still use it after 30 days so you won\'t get cut off from using it) or http://www.xchat.org which is a free alternative. In the options of either program you will need to enter the server information to access the server. Add a new server and enter the server address irc.coldfront.net using port 6667. Once connected you can use the /join command to join #smr (/join #smr) or any other room on the server as normal.<br /><br />
 	Apart from this you can view the webboard via a link on the left to join in community chat and conversations, ask questions for help and make suggestions for the game in various forums.<br /><br />
 	To get underway, click the alliance link on the left where you can get more information on 	how to get started on the alliance message board which will get you into your alliance chat 	on IRC so you can get started and have your questions answered.<br /><br />Depending on the size and resolution of your monitor the default font size may be too large or small. This can be changed using the preferences link on the left panel.';
diff --git a/engine/Default/preferences_processing.php b/engine/Default/preferences_processing.php
@@ -56,7 +56,7 @@
 		'You changed your email address registered within SMR and need to revalidate now!'.EOL.EOL.
 		'   Your new validation code is: '.$account->getValidationCode().EOL.EOL.
 		'The Space Merchant Realms server is on the web at '.URL.'/.'.EOL.
-		'You\'ll find a quick how-to-play here '.URL.'/manual.php'.EOL.
+		'You\'ll find a quick how-to-play here <a href="http://wiki.smrealms.de/index.php?title=Video_Tutorials#A_Look_At_The_Game">SMR Wiki: A look at the game</a>'.EOL.
 		'Please verify within the next 7 days or your account will be automatically deleted.',
 		'From: support@smrealms.de');
 
diff --git a/engine/Default/trader_status.php b/engine/Default/trader_status.php
@@ -9,7 +9,7 @@
 
 $PHP_OUTPUT.= '<table class="standard fullwidth"><tr><td style="width:50%" class="top">';
 
-$PHP_OUTPUT.= '<span class="yellow bold">Protection</span><br />';
+$PHP_OUTPUT.= '<span class="yellow bold">Protection</span><a href="http://wiki.smrealms.de/index.php?title=Game_Guide:_Federal_Protection" target="_blank"><img src="images/silk/help.png" width="16" height="16" alt="Wiki Link" title="Goto SMR Wiki: Protection"/></a><br />';
 if($player->getNewbieTurns()) {
 	$PHP_OUTPUT.= 'You are under <span class="green">NEWBIE</span> protection.<br /><br />';
 
@@ -38,7 +38,7 @@
 $PHP_OUTPUT.= '<br />';
 
 $container['body'] = 'council_list.php';
-$PHP_OUTPUT.=create_link($container, '<span class="yellow bold">Politics</span>');
+$PHP_OUTPUT.=create_link($container, '<span class="yellow bold">Politics</span><a href="http://wiki.smrealms.de/index.php?title=Game_Guide:_Politics_and_the_Ruling_Council" target="_blank"><img src="images/silk/help.png" width="16" height="16" alt="Wiki Link" title="Goto SMR Wiki: Politics"/></a>');
 $PHP_OUTPUT.= '<br />';
 
 require_once(get_file_loc('council.inc'));
@@ -58,7 +58,7 @@
 $PHP_OUTPUT.= '<br /><br />';
 
 $container['body'] = 'trader_savings.php';
-$PHP_OUTPUT.=create_link($container, '<span class="yellow bold">Savings</span>');
+$PHP_OUTPUT.=create_link($container, '<span class="yellow bold">Savings</span><a href="http://wiki.smrealms.de/index.php?title=Banks" target="_blank"><img src="images/silk/help.png" width="16" height="16" alt="Wiki Link" title="Goto SMR Wiki: Banks"/></a>');
 $PHP_OUTPUT.= '<br />You have <span class="yellow">';
 
 $PHP_OUTPUT.= number_format($player->getBank());
@@ -67,7 +67,7 @@
 $PHP_OUTPUT.= '</td><td class="top" style="width:50%">';
 
 $container['body'] = 'trader_bounties.php';
-$PHP_OUTPUT.=create_link($container, '<span class="yellow bold">Bounties</span>');
+$PHP_OUTPUT.=create_link($container, '<span class="yellow bold">Bounties</span><a href="http://wiki.smrealms.de/index.php?title=Headquarters" target="_blank"><img src="images/silk/help.png" width="16" height="16" alt="Wiki Link" title="Goto SMR Wiki: Bounties"/></a>');
 
 $PHP_OUTPUT.= '<br /><span class="green">Federal: </span>';
 $bounty = $player->getCurrentBounty('HQ');
@@ -82,14 +82,14 @@
 else
 	$PHP_OUTPUT.= 'None';
 
-$PHP_OUTPUT.= '<br /><br /><span class="yellow bold">Ship</span><br />Name: ';
+$PHP_OUTPUT.= '<br /><br /><span class="yellow bold">Ship</span><a href="http://www.smrealms.de/ship_list.php" target="_blank"><img src="images/silk/help.png" width="16" height="16" alt="Wiki Link" title="Goto SMR Ship List"/></a><br />Name: ';
 
 $PHP_OUTPUT.= $ship->getName();
 $PHP_OUTPUT.= '<br />Speed: ';
 $PHP_OUTPUT.= $ship->getRealSpeed();
 $PHP_OUTPUT.= ' turns/hour<br />Max: ';
 $PHP_OUTPUT.= $player->getMaxTurns();
-$PHP_OUTPUT.= ' turns<br /><br /><span class="yellow bold">Supported Hardware</span><br />';
+$PHP_OUTPUT.= ' turns<br /><br /><span class="yellow bold">Supported Hardware</span><a href="http://wiki.smrealms.de/index.php?title=Game_Guide:_Technologies" target="_blank"><img src="images/silk/help.png" width="16" height="16" alt="Wiki Link" title="Goto SMR Wiki: Technologies"/></a><br />';
 
 if (!$ship->canHaveScanner() &&
 	!$ship->canHaveIllusion() &&
@@ -104,7 +104,7 @@
 	if ($ship->canHaveDCS()) $PHP_OUTPUT.= 'Drone Scrambler<br />';
 }
 
-$PHP_OUTPUT.= '<br /><a href="'.URL.'/level_requirements.php" target="levelRequirements"><span class="yellow bold">Next Level</span></a><br />';
+$PHP_OUTPUT.= '<br /><a href="'.URL.'/level_requirements.php" target="levelRequirements"><span class="yellow bold">Next Level</span></a><a href="http://wiki.smrealms.de/index.php?title=Game_Guide:_Experience_Levels" target="_blank"><img src="images/silk/help.png" width="16" height="16" alt="Wiki Link" title="Goto SMR Wiki: Experience Levels"/></a><br />';
 $db->query('SELECT level_name,requirement FROM level WHERE requirement>' . $db->escapeNumber($player->getExperience()) . ' ORDER BY requirement ASC LIMIT 1');
 if(!$db->nextRecord()) {
 	$db->query('SELECT level_name,requirement FROM level ORDER BY requirement DESC LIMIT 1');
@@ -143,12 +143,12 @@
 
 $container = array();
 $container['url'] = 'note_add_processing.php';
-$form = create_form($container,'New Note');
+$form = create_form($container,'Create New Note');
 $PHP_OUTPUT.= $form['form'];
 $PHP_OUTPUT.= '<table cellspacing="0" cellpadding="0" class="nobord nohpad">
 	<tr>
-		<td class="top">Note:&nbsp;</td>
-		<td colspan="2"><textarea spellcheck="true" name="note"></textarea></td>
+	Enter text in the box below to create a new note.<br />(examples:  trade routes, weapon locations, key alliance related locations)
+	<td><textarea spellcheck="true" name="note"></textarea></td>
 	</tr>
 </table><br />';
 $PHP_OUTPUT.= $form['submit'];
diff --git a/htdocs/email_processing.php b/htdocs/email_processing.php
@@ -59,7 +59,7 @@
 		'You changed your email address registered within SMR and need to revalidate now!'.EOL.EOL.
 		'   Your new validation code is: '.$account->getValidationCode().EOL.EOL.
 		'The Space Merchant Realms server is on the web at '.URL.'/.'.EOL.
-		'You\'ll find a quick how-to-play here '.URL.'/manual.php'.EOL.
+		'You\'ll find a quick how-to-play here <a href="http://wiki.smrealms.de/index.php?title=Video_Tutorials#A_Look_At_The_Game">SMR Wiki: A look at the game</a>'.EOL.
 		'Please verify within the next 7 days or your account will be automatically deleted.',
 		'From: support@smrealms.de');
 
diff --git a/htdocs/images/silk/help.png b/htdocs/images/silk/help.png
diff --git a/htdocs/images/silk/information.png b/htdocs/images/silk/information.png
diff --git a/templates/Default/engine/Default/alliance_planets.php b/templates/Default/engine/Default/alliance_planets.php
@@ -1,4 +1,5 @@
 <div align="center">
+<a href="http://wiki.smrealms.de/index.php?title=Planets" target="_blank"><img align="right" src="images/silk/help.png" width="16" height="16" alt="Wiki Link" title="Goto SMR Wiki: Planets"/></a>
 	<?php
 	if (count($AlliancePlanets) > 0) { ?>
 		Your alliance currently has <?php echo count($AlliancePlanets); ?> planets in the universe!<br /><br /><?php
diff --git a/templates/Default/engine/Default/council_embassy.php b/templates/Default/engine/Default/council_embassy.php
@@ -1,3 +1,4 @@
+<a href="http://wiki.smrealms.de/index.php?title=Game_Guide:_Politics_and_the_Ruling_Council" target="_blank"><img align="right" src="images/silk/help.png" width="16" height="16" alt="Wiki Link" title="Goto SMR Wiki: Politics"/></a>
 <div class="center bold">Diplomatic Treaties</div><br />
 <div class="center standard">
 	Welcome President <?php echo $ThisPlayer->getDisplayName(); ?>,<br /><br />
diff --git a/templates/Default/engine/Default/council_list.php b/templates/Default/engine/Default/council_list.php
@@ -1,3 +1,4 @@
+<a href="http://wiki.smrealms.de/index.php?title=Game_Guide:_Politics_and_the_Ruling_Council" target="_blank"><img align="right" src="images/silk/help.png" width="16" height="16" alt="Wiki Link" title="Goto SMR Wiki: Politics"/></a>
 <div class="center bold">President</div><br /><?php
 $President =& Council::getPresident($ThisPlayer->getGameID(),$RaceID);
 if ($President !== false) { ?>
diff --git a/templates/Default/engine/Default/council_politics.php b/templates/Default/engine/Default/council_politics.php
@@ -1,3 +1,4 @@
+<a href="http://wiki.smrealms.de/index.php?title=Game_Guide:_Politics_and_the_Ruling_Council" target="_blank"><img align="right" src="images/silk/help.png" width="16" height="16" alt="Wiki Link" title="Goto SMR Wiki: Politics"/></a>
 <div class="center">
 	<p>We currently have the following diplomatic relationships:</p>
 	<table class="center">
diff --git a/templates/Default/engine/Default/council_vote.php b/templates/Default/engine/Default/council_vote.php
@@ -1,3 +1,4 @@
+<a href="http://wiki.smrealms.de/index.php?title=Game_Guide:_Politics_and_the_Ruling_Council" target="_blank"><img align="right" src="images/silk/help.png" width="16" height="16" alt="Wiki Link" title="Goto SMR Wiki: Politics"/></a>
 <div class="center bold">Diplomatic Relations</div><br />
 <div class="center standard">
 	Each member of the council is entitled to one vote daily.<br />
diff --git a/templates/Default/engine/Default/course_plot.php b/templates/Default/engine/Default/course_plot.php
@@ -1,5 +1,7 @@
+<a href="http://wiki.smrealms.de/index.php?title=Game_Guide:_How_your_ship_works" target="_blank"><img align="right" src="images/silk/help.png" width="16" height="16" alt="Wiki Link" title="Goto SMR Wiki: How Your Ship Works"/></a>
 <form class="standard" id="PlotCourseForm" method="POST" action="<?php echo $PlotCourseFormLink; ?>">
-	<h2>Conventional</h2><br />
+	<h2>Conventional</h2>
+	<div class="standard">Enter a destination sector.</div>
 	<table class="nobord nohpad">
 		<tr>
 			<td>From:&nbsp;</td>
@@ -14,7 +16,8 @@
 $this->includeTemplate('includes/JumpDrive.inc'); ?>
 
 <br />
-<h2>Plot To Nearest</h2><br />
+<h2>Plot To Nearest</h2>
+<div class="standard">Select a location to plot to. You are only able to plot to sectors you have explored.</div><br />
 <form class="standard" id="SelectXTypeForm" method="POST" action="">
 	<select name="xtype" onchange="this.form.submit()"><?php
 	foreach($AllXTypes as $EachXType) {
@@ -25,7 +28,7 @@
 </form><?php
 if(isset($XType)) { ?>
 	<form class="standard" id="PlotNearestForm" method="POST" action="<?php echo $PlotNearestFormLink; ?>">
-		<input type="hidden" name="xtype" value="<?php echo $XType; ?>" /><br /><br />
+		<input type="hidden" name="xtype" value="<?php echo $XType; ?>" /><br />
 		<select name="X" onchange="this.form.submit()"><?php
 			switch($XType) {
 				case 'Technology':
diff --git a/templates/Default/engine/Default/includes/LeftPanel.inc b/templates/Default/engine/Default/includes/LeftPanel.inc
@@ -56,7 +56,7 @@ else {
 }
 //<a href="http://www.azool.us/baalz/" target="manual">Help Pages</a><br />
 ?>
-<a href="manual.php" target="manual">Manual</a><br /><?php
+<a href="http://wiki.smrealms.de" target="_blank">SMR Wiki</a><br /><?php
 if(isset($GameID)) {
 	?><a href="<?php echo Globals::getSmrFileCreateHREF(); ?>">DL Sectors File</a><br /><?php
 } ?>
diff --git a/templates/Default/engine/Default/includes/RightPanel.inc b/templates/Default/engine/Default/includes/RightPanel.inc
@@ -35,7 +35,7 @@ if(isset($GameID)) { ?>
 	Credits : <span id="creds"><?php echo number_format($ThisPlayer->getCredits()); ?></span><br />
 	Experience : <span id="exp"><?php echo number_format($ThisPlayer->getExperience()); ?></span><br />
 	Level : <a href="<?php echo URL; ?>/level_requirements.php" target="levelRequirements"><span id="lvl"><?php echo $ThisPlayer->getLevelID(); ?></span></a><br />
-	Next Level :<br /><?php
+	Next Level: <a href="http://wiki.smrealms.de/index.php?title=Game_Guide:_Experience_Levels" target="_blank"><img src="images/silk/help.png" width="16" height="16" alt="Wiki Link" title="Goto SMR Wiki: Experience Levels"/></a><br /><?php
 	$NextLevelExperience = number_format($ThisPlayer->getNextLevelExperience());
 	$Experience = number_format($ThisPlayer->getExperience()); ?>
 	<span id="lvlBar">
diff --git a/templates/Default/engine/Default/newbie_warning.php b/templates/Default/engine/Default/newbie_warning.php
@@ -20,4 +20,4 @@
 
 <p>Plan for your safety now. Remember to use federal protection (Must have an acceptable attack rating, this increases/decreases with your align so it is safest to have an attack rating of 0 if unsure, also make sure to stick to the federal space of friendly races), know where your alliances strongest planets are, and watch out for the people looking for you.</p>
 
-<p>For more information visit the <a href="<?php echo URL; ?>/manual.php">help files</a></p>
+<p>For more information visit the <a href="http://wiki.smrealms.de">SMR Wiki</a></p>
diff --git a/templates/Default/engine/Default/planet_main.php b/templates/Default/engine/Default/planet_main.php
diff --git a/templates/Default/engine/Default/trader_planet.php b/templates/Default/engine/Default/trader_planet.php
