[PlaneShift-svn] SF.net SVN: planeshift:[7648] www/webconsole-new

[<lpa...@us...>]

Revision: 7648
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7648&view=rev
Author:   lpancallo
Date:     2011-09-20 14:45:23 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
moved natural res to crafting

Modified Paths:
--------------
    www/webconsole-new/crafting/craftingmain.php
    www/webconsole-new/index.php
    www/webconsole-new/rules/rulesmain.php

Modified: www/webconsole-new/crafting/craftingmain.php
===================================================================
--- www/webconsole-new/crafting/craftingmain.php	2011-09-17 12:01:55 UTC (rev 7647)
+++ www/webconsole-new/crafting/craftingmain.php	2011-09-20 14:45:23 UTC (rev 7648)
@@ -13,6 +13,8 @@
             echo '<a href="./index.php?do=createtransform">Create Transform</a> <br/>';
             echo '<a href="./index.php?do=createpattern">Create Pattern</a> <br/>';
         }
+        echo '<hr/><a href="./index.php?do=resource">List Natural Resources</a><br/>';
+        echo '<a href="./index.php?do=resourcemap">List Resource Map</a><br/>';
         echo '<hr/><a href="./index.php">Return to main page.</a>';
         echo '</div><div class="main">';
     }

Modified: www/webconsole-new/index.php
===================================================================
--- www/webconsole-new/index.php	2011-09-17 12:01:55 UTC (rev 7647)
+++ www/webconsole-new/index.php	2011-09-20 14:45:23 UTC (rev 7648)
@@ -447,18 +447,6 @@
         rulesmain();
         createspell();
         break;
-      case 'resource':
-        include('./rules/rulesmain.php');
-        include('./rules/resources.php');
-        rulesmain();
-        listresources();
-        break;
-      case 'resourcemap':
-        include('./rules/rulesmain.php');
-        include('./rules/resourcemap.php');
-        rulesmain();
-        natural_resources_map();
-        break;
       case 'waypoint':
         include('./rules/rulesmain.php');
         include('./rules/waypoints.php');
@@ -673,6 +661,18 @@
         craftingmain();
         deleteprocess();
         break;
+      case 'resource':
+        include('./rules/craftingmain.php');
+        include('./rules/resources.php');
+        craftingmain();
+        listresources();
+        break;
+      case 'resourcemap':
+        include('./rules/craftingmain.php');
+        include('./rules/resourcemap.php');
+        craftingmain();
+        natural_resources_map();
+        break;
       case 'other':
         include('./other/othermain.php');
         othermain();

Modified: www/webconsole-new/rules/rulesmain.php
===================================================================
--- www/webconsole-new/rules/rulesmain.php	2011-09-17 12:01:55 UTC (rev 7647)
+++ www/webconsole-new/rules/rulesmain.php	2011-09-20 14:45:23 UTC (rev 7648)
@@ -18,9 +18,7 @@
         {
             echo '<a href="./index.php?do=createspell">Create Spell</a><br/>';
         }
-        echo '<hr/><a href="./index.php?do=resource">List Natural Resources</a><br/>';
-        echo '<a href="./index.php?do=resourcemap">List Resource Map</a><br/>';
-        echo '<a href="./index.php?do=waypoint">List Waypoints</a><br/>';
+        echo '<hr/><a href="./index.php?do=waypoint">List Waypoints</a><br/>';
         echo '<a href="./index.php?do=waypointalias">List Waypoint Aliases</a><br/>';
         echo '<a href="./index.php?do=listwaypointlinks">List Waypoint links</a><br/>';
         echo '<a href="./index.php?do=waypointmap">List Waypoint Map</a><br/>';

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.