*) Some enhancements to the statuspage, which save one point from the advanced config

*) ant clean now doesn't remove RPMs anymore

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

build.xml

@@ -594,7 +594,6 @@
     <fileset dir="${src}" includes="**/*.class" />
     <fileset dir="${build}" includes="**/*.class" />
     <fileset dir="${htroot}" includes="**/*.class" />
-	<fileset dir="${release}" includes="*.rpm" />
   </delete>
 </target>
 

htroot/SettingsAck_p.java

@@ -364,18 +364,6 @@ public class SettingsAck_p {
             return prop;
         }
 
-        if (post.containsKey("dispop")) {
-            env.setConfig("browserPopUpTrigger", "false");
-            prop.put("info", 9);//popup disabled
-            return prop;
-        }
-        
-        if (post.containsKey("enpop")) {
-            env.setConfig("browserPopUpTrigger", "true");
-            prop.put("info", 10);//popup enabled
-            return prop;
-        }
-        
         if (post.containsKey("pmode")) {
             env.setConfig("onlineMode", "2");
             prop.put("info", 11);//permanent online mode

htroot/Settings_Http.inc

@@ -25,7 +25,7 @@
     <td>Specifies if the proxy should send the X-Forwarded-For http header.</td>
   </tr> 
   <tr valign="top">
-    <td colspan="3"><input type="submit" name="httpNetworking" value="submit">&nbsp;<i>Changes will take effect immediately.</i></td>
+    <td colspan="3"><input type="submit" name="httpNetworking" value="Submit">&nbsp;<i>Changes will take effect immediately.</i></td>
   </tr>  
 </table>
 </fieldset>

htroot/Settings_MessageForwarding.inc

@@ -19,7 +19,7 @@
     <td><i>The recipient email-address.<br> e.g.:</i>&nbsp;<code>root@localhost</code></td>
   </tr>
   <tr valign="top">
-    <td colspan="3"><input type="submit" name="msgForwarding" value="submit">&nbsp;<i>Changes will take effect immediately.</i></td>
+    <td colspan="3"><input type="submit" name="msgForwarding" value="Submit">&nbsp;<i>Changes will take effect immediately.</i></td>
   </tr>    
   
 </table>

htroot/Settings_Parser.inc

@@ -37,7 +37,7 @@ For a detailed description of the various MIME-types take a look at <a href="htt
     <td class="small">&nbsp;</td>
   </tr>
   <tr class="TableCellDark">
-    <td colspan="#[parser.colspan]#" class="small" ><input type="submit" name="parserSettings" value="submit">&nbsp;Changes take effect immediately</td>
+    <td colspan="#[parser.colspan]#" class="small" ><input type="submit" name="parserSettings" value="Submit">&nbsp;Changes take effect immediately</td>
   </tr>
 </table>
 </fieldset>

htroot/Settings_Proxy.inc

@@ -58,7 +58,7 @@
   
   <!-- submit button -->
   <tr valign="top">
-    <td colspan="4"><input type="submit" name="proxysettings" value="submit">&nbsp;  <em>Changes will take effect immediately.</em></td>
+    <td colspan="4"><input type="submit" name="proxysettings" value="Submit">&nbsp;  <em>Changes will take effect immediately.</em></td>
   </tr>
 </table>
 </fieldset>

htroot/Settings_Seed.inc

@@ -27,7 +27,7 @@ but only if there have been changes to the seed-list.
            http://www.&lt;my-host&gt;.net/yacy/seed.txt'</i></td>
   </tr>  
   <tr>
-    <td colspan="3"><input type="submit" name="seedSettings" value="submit"></td>
+    <td colspan="3"><input type="submit" name="seedSettings" value="Submit"></td>
   </tr>  
 </table>
 </form>

htroot/Settings_Seed_UploadFile.inc

@@ -9,7 +9,7 @@
     <td><i>Here you can specify the path within the filesystem where the seed-list file should be stored.</i></td>
   </tr>  
   <tr>
-    <td colspan="3"><input type="submit" name="seedFileSettings" value="submit"></td>
+    <td colspan="3"><input type="submit" name="seedFileSettings" value="Submit"></td>
   </tr>  
 </table>
 </form>

htroot/Settings_Seed_UploadFtp.inc

@@ -29,7 +29,7 @@ but only if there had been changes to the seed-list.
     <td><i>The password</i></td>
   </tr>
   <tr>
-    <td colspan="3"><input type="submit" name="seedFtpSettings" value="submit"></td>
+    <td colspan="3"><input type="submit" name="seedFtpSettings" value="Submit"></td>
   </tr>
 </table>
 </form>

htroot/Settings_Seed_UploadScp.inc

@@ -30,7 +30,7 @@
     <td><i>The password</i></td>
   </tr>
   <tr>
-    <td colspan="3"><input type="submit" name="seedScpSettings" value="submit"></td>
+    <td colspan="3"><input type="submit" name="seedScpSettings" value="Submit"></td>
   </tr>
 </table>
 </form>

htroot/Settings_ServerAccess.inc

@@ -44,7 +44,7 @@
            you will not be able to access the server pages anymore.</td>
   </tr>
   <tr valign="top">
-    <td colspan="3"><input type="submit" name="serveraccount" value="submit"></td>
+    <td colspan="3"><input type="submit" name="serveraccount" value="Submit"></td>
   </tr>
 </table>
 </fieldset>

htroot/Settings_SystemBehaviour.inc

@@ -1,8 +0,0 @@
-<p><form action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
-<fieldset><legend id="SystemBehaviour">System Behaviour Settings</legend>
-<table>
-<tr><td>Auto pop-up of status page on start-up:</td>
-<td><input type="submit" name="enpop" value="enable"> / <input type="submit" name="dispop" value="disable"></td></tr>
-</table>
-</fieldset>
-</form><br>

htroot/Settings_p.html

@@ -35,7 +35,6 @@
       <li><a href="?page=http">HTTP Networking</a></li>
       <li><a href="?page=proxy">Remote Proxy (optional)</a></li>
       <li><a href="?page=portForwarding">Port Forwarding (optional)</a></li>
-      <li><a href="?page=SystemBehaviour">System Behaviour Settings</a></li>
       <li><a href="?page=seed">Seed Upload Settings</a></li>
       <li><a href="?page=messageForwarding">Message Forwarding (optional)</a></li>
     </ul>

htroot/Status.java

@@ -97,7 +97,25 @@ public class Status {
                 } else if (post.containsKey("ResetTraffic")) {
                     httpdByteCountInputStream.resetCount();
                     httpdByteCountOutputStream.resetCount();
+                //enables or disables the browser popup on Yacy-start
+                } else if (post.containsKey("popup")) {
+                String trigger_enabled = (String) post.get("popup");
+                if (trigger_enabled.equals("false")) {
+                    env.setConfig("browserPopUpTrigger", "false");
+                } else if (trigger_enabled.equals("true")){
+                    env.setConfig("browserPopUpTrigger", "true");
                 }
+                }
+                
+                /*
+                } else if (post.containsKey("popup")) {
+                    env.setConfig("browserPopUpTrigger", "false");
+                    prop.put("info", 9); //popup disabled
+                } else if (post.containsKey("enpop")) { 
+                    env.setConfig("browserPopUpTrigger", "true");
+                    prop.put("info", 10); //popup enabled
+                } */
+                
                 prop.put("LOCATION","");
             }
             return prop;

htroot/Status_p.inc

@@ -11,7 +11,7 @@
     <td>Protection</td>
     <td>
       #(protection)#
-      <strong>Your settings are _not_ protected!</strong> Please go to the <a href="Settings_p.html?page=admin">settings</a> page <strong>immediately</strong> and set an administration password.
+      <strong>Your settings are _not_ protected!</strong> Please go to the <a href="ConfigBasic.html">settings</a> page <strong>immediately</strong> and set an administration password.
       ::
       Your settings are protected by a password.
       #(/protection)#
@@ -35,14 +35,22 @@
   </tr>
   <tr class="TableCellDark">
     <td>Auto-popup on start-up</td>
-    <td>
       #(popup)#
-      Disabled. To enable this again please use the <a href="Settings_p.html?page=SystemBehaviour">Settings</a> page.
+      <td>
+      Disabled
+      </td>
+      <td>
+      <a href="Status.html?popup=true">[Enable]</a>
+      </td>
       ::
-      Enabled. To disable this please use the <a href="Settings_p.html?page=SystemBehaviour">Settings</a> page.
+      <td>
+      Enabled
+      </td>
+      <td>
+      <a href="Status.html?popup=false">[Disable]</a>
+      </td>
       #(/popup)#
     </td>
-    <td></td>
   </tr>
   <tr class="TableCellLight">
     <td>Memory Usage</td>
@@ -121,7 +129,10 @@
   </tr>
   <tr class="TableCellLight"><td>Seed server</td><td>
     #(seedServer)#
-      Disabled. To enable this you need a FTP account where you can upload files to a web space. If you do that, you become a YaCy root server. You can configure your account details on the <a href="Settings_p.html#seed">Settings page</a>.
+      Disabled. To enable this you need a FTP account where you can upload files to a web space. If you do that, you become a YaCy root server.
+      </td>
+      <td>
+      <a href="Settings_p.html#seed">[Configure]</a>.
       ::
       Enabled: Updating periodically to server #[seedServer]#.
       Last upload: #[lastUpload]# ago.
@@ -129,5 +140,5 @@
       Enabled: Updating periodically to file #[seedFile]#.
       Last upload: #[lastUpload]# ago.
     #(/seedServer)#
-  </td><td></td></tr>
+  </td></tr>
 </table>

locales/de.lng

@@ -1530,6 +1530,11 @@ You are in <em>permanent</em> mode.==Sie sind im <em>permanenten</em> Modus.
 Last Refresh:==Letzte Aktualisierung:
 Click here to==Klicken Sie
 log in</a> as administrator and see full status.==hier</a>, um sich als Administrator einzuloggen und den vollst&auml;ndigen Status zu sehen.
+Disable==Abschalten
+Disabled==Abgeschaltet
+Enable==Anschalten
+Enabled==Angeschaltet
+
 
 #-----------------------------