- added an idea icon

- modified ok icon (was 64x62, now 64x64)
- replaced warning icon
- added size tags to warning image in configBasic
- replaced bad icon for hints on status page by new icons

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3677 6c8d7289-2bf4-0310-a012-ef5d649a1542

htroot/ConfigBasic.html

@@ -32,7 +32,7 @@
           </fieldset>
         </li>
         <li>
-          #(statusPassword)#<img src="/env/grafics/warning.png" alt="warning" />&nbsp;Please set a password for your peer to protect your settings (> 3 characters); if this is successful you will be asked to log in with these values immediately.::<img src="/env/grafics/ok.png" height="32px" width="32px" alt="ok" />&nbsp;Password is set#(/statusPassword)#<br />
+          #(statusPassword)#<img src="/env/grafics/warning.png" height="32px" width="32px" alt="warning" />&nbsp;Please set a password for your peer to protect your settings (> 3 characters); if this is successful you will be asked to log in with these values immediately.::<img src="/env/grafics/ok.png" height="32px" width="32px" alt="ok" />&nbsp;Password is set#(/statusPassword)#<br />
           <fieldset>
             <dl class="userConfig">
               <dt><label for="adminuser">Peer User:</label></dt>
@@ -45,7 +45,7 @@
           </fieldset>
         </li>
         <li>
-          #(statusName)#<img src="/env/grafics/warning.png" alt="warning" />&nbsp;Your peer name has not been customized; please set your own peer name::<img src="/env/grafics/ok.png" height="32px" width="32px" alt="ok" />&nbsp;You have a nice peer name#(/statusName)#<br />
+          #(statusName)#<img src="/env/grafics/warning.png" height="32px" width="32px" alt="warning" />&nbsp;Your peer name has not been customized; please set your own peer name::<img src="/env/grafics/ok.png" height="32px" width="32px" alt="ok" />&nbsp;You have a nice peer name#(/statusName)#<br />
           <fieldset>
             <dl>
               <dt><label for="peername">Peer Name: </label></dt>
@@ -56,7 +56,7 @@
           </fieldset>
         </li>
         <li>
-          #(statusPort)#<img src="/env/grafics/warning.png" alt="warning" />&nbsp;Your peer cannot be reached from outside (what is not fatal, but would be good for the YaCy network); please open your firewall for this port and/or set a virtual server option in your router to allow connections on this port.::<img src="/env/grafics/ok.png" height="32px" width="32px" alt="ok" />&nbsp;Your peer can be reached by other peers#(/statusPort)#<br />
+          #(statusPort)#<img src="/env/grafics/warning.png" height="32px" width="32px" alt="warning" />&nbsp;Your peer cannot be reached from outside (what is not fatal, but would be good for the YaCy network); please open your firewall for this port and/or set a virtual server option in your router to allow connections on this port.::<img src="/env/grafics/ok.png" height="32px" width="32px" alt="ok" />&nbsp;Your peer can be reached by other peers#(/statusPort)#<br />
           <fieldset>
             <dl>
               <dt><label for="port">Peer Port: </label></dt>

htroot/Status.html

@@ -16,28 +16,46 @@
     <!-- urgent -->
 
     #(urgentSetPassword)#::
-    <dt><img src="env/grafics/start.gif"></dt>
+    <dt><img src="env/grafics/warning.png" width="32" height="32"></dt>
     <dd><strong>Your settings are _not_ protected!</strong>
     Please open the <a href="ConfigBasic.html">settings</a> page <strong>immediately</strong>
     and set an administration password.
     </dd>
     #(/urgentSetPassword)#
 
+	#(urgentStatusVirgin)#::
+    <dt><img src="env/grafics/warning.png" width="32" height="32"></dt>
+    <dd>You have not published your peer seed yet. This happens automatically, just wait.
+    While you have this status you are not allowed to search other peers.
+    </dd>
+    #(/urgentStatusVirgin)#
    
     <!-- warnings -->
     
     #(warningGoOnline)#::
-    <dt><img src="env/grafics/start.gif"></dt>
+    <dt><img src="env/grafics/warning.png" width="32" height="32"></dt>
     <dd>The peer must go online to get a peer address.
       If you don't know how to configure your system to use a proxy,
       see the <a href="http://www.yacy.net/yacy/Installation.html#wininst">installation instructions</a>.
     </dd>
     #(/warningGoOnline)#
     
-    <!-- hints -->
+    #(warningStatusJunior)#::
+    <dt><img src="env/grafics/warning.png" width="32" height="32"></dt>
+    <dd>You cannot be reached from outside.
+    A possible reason is that you are behind a firewall, NAT or Router.
+    But you can <a href="index.html">search the internet</a> using the other peers'
+    global index on your own search page.
+    We encourage you to open your firewall for the port you configured (usually: 8080),
+    or to set up a 'virtual server' in your router settings (often called DMZ).
+    Please be fair, contribute your own index to the global index.
+    </dd>
+    #(/warningStatusJunior)#
+    
+     <!-- hints -->
     
     #(hintVersionAvailable)#::
-    <dt><img src="env/grafics/start.gif"></dt>
+    <dt><img src="env/grafics/idea.png" width="32" height="32"></dt>
     <dd>Latest public version is v#[latestVersion]#.
       You can download a more recent version of YaCy. Click here to install this update and restart YaCy: 
       <form action="Status.html" method="get" class="PeerControl">
@@ -56,34 +74,15 @@
     </dd>
     #(/hintVersionDownload)#
     -->
-    #(hintStatusVirgin)#::
-    <dt><img src="env/grafics/start.gif"></dt>
-    <dd>You have not published your peer seed yet. This happens automatically, just wait.
-    While you have this status you are not allowed to search other peers.
-    </dd>
-    #(/hintStatusVirgin)#
-    
-    #(hintStatusJunior)#::
-    <dt><img src="env/grafics/start.gif"></dt>
-    <dd>You cannot be reached from outside.
-    A possible reason is that you are behind a firewall, NAT or Router.
-    But you can <a href="index.html">search the internet</a> using the other peers'
-    global index on your own search page.
-    We encourage you to open your firewall for the port you configured (usually: 8080),
-    or to set up a 'virtual server' in your router settings (often called DMZ).
-    Please be fair, contribute your own index to the global index.
-    </dd>
-    #(/hintStatusJunior)#
-    
     #(hintStatusSenior)#::
-    <dt><img src="env/grafics/start.gif"></dt>
+    <dt><img src="env/grafics/ok.png" width="32" height="32"></dt>
     <dd>You are running a server in senior mode and you support the global internet index,
     which you can also <a href="index.html">search yourself</a>.
     </dd>
     #(/hintStatusSenior)#
     
     #(hintStatusPrincipal)#::
-    <dt><img src="env/grafics/start.gif"></dt>
+    <dt><img src="env/grafics/ok.png" width="32" height="32"></dt>
     <dd>You have a principal peer because you publish your seed-list to a public accessible server
     where it can be retrieved using the URL <a href="#[seedURL]#">#[seedURL]#</a>.
     </dd>

htroot/Status.java

@@ -61,7 +61,6 @@ import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 import de.anomic.yacy.yacyCore;
 import de.anomic.yacy.yacySeed;
-import de.anomic.yacy.yacyVersion;
 
 public class Status {
 
@@ -248,10 +247,10 @@ public class Status {
         final String peerStatus = ((yacyCore.seedDB.mySeed == null) ? yacySeed.PEERTYPE_VIRGIN : yacyCore.seedDB.mySeed.get(yacySeed.PEERTYPE, yacySeed.PEERTYPE_VIRGIN));
         if (peerStatus.equals(yacySeed.PEERTYPE_VIRGIN)) {
             prop.put(PEERSTATUS, 0);
-            prop.put("hintStatusVirgin", 1);
+            prop.put("urgentStatusVirgin", 1);
         } else if (peerStatus.equals(yacySeed.PEERTYPE_JUNIOR)) {
             prop.put(PEERSTATUS, 1);
-            prop.put("hintStatusJunior", 1);
+            prop.put("warningStatusJunior", 1);
         } else if (peerStatus.equals(yacySeed.PEERTYPE_SENIOR)) {
             prop.put(PEERSTATUS, 2);
             prop.put("hintStatusSenior", 1);