Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 2033)
+++ branches/2.8.x/CHANGELOG	(revision 2034)
@@ -11,6 +11,8 @@
 ! = Update/Change
 ===============================================================================
 
+16 Dec-2013 Build 2034 Dietmar Woellbrink (Luisehahne)
+! Changed links to WB website
 16 Dec-2013 Build 2033 Dietmar Woellbrink (Luisehahne)
 ! /include/editarea/wb_wrapper_edit_area.php:: add init parameters as Array
 ! /modules/droplets/modify_droplet.php call edit_area with Array
Index: branches/2.8.x/wb/admin/skel/themes/htt/loginBox.htt
===================================================================
--- branches/2.8.x/wb/admin/skel/themes/htt/loginBox.htt	(revision 2033)
+++ branches/2.8.x/wb/admin/skel/themes/htt/loginBox.htt	(revision 2034)
@@ -97,7 +97,7 @@
 	<tr>
 		<td>
 	      <!-- Please note: the below reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
-	      <a href="http://www.websitebaker2.org/" title="external">WebsiteBaker</a> is released under the
+	      <a href="http://www.websitebaker.org/" title="external">WebsiteBaker</a> is released under the
 	      <a href="http://www.gnu.org/licenses/gpl.html" title="WebsiteBaker is released under the GNU General Public License">GNU General Public License</a>
 	      <!-- Please note: the above reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
 		</td>
Index: branches/2.8.x/wb/admin/skel/themes/htt/maintenance.htt
===================================================================
--- branches/2.8.x/wb/admin/skel/themes/htt/maintenance.htt	(revision 2033)
+++ branches/2.8.x/wb/admin/skel/themes/htt/maintenance.htt	(revision 2034)
@@ -16,7 +16,7 @@
     <table class="header layout">
         <tr>
         	<td class="logo">
-        		<a href="http://www.websitebaker2.org/" title=""><img src="{THEME_URL}/images/logo.png" alt="Logo" /></a>
+        		<a href="http://www.websitebaker.org/" title=""><img src="{THEME_URL}/images/logo.png" alt="Logo" /></a>
         	</td>
         	<td></td>
         </tr>
@@ -43,7 +43,7 @@
         <tr>
         	<td>
               <!-- Please note: the below reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
-              <a href="http://www.websitebaker2.org/" title="external">WebsiteBaker</a> is released under the
+              <a href="http://www.websitebaker.org/" title="external">WebsiteBaker</a> is released under the
               <a href="http://www.gnu.org/licenses/gpl.html" title="WebsiteBaker is released under the GNU General Public License">GNU General Public License</a>
               <!-- Please note: the above reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
         	</td>
Index: branches/2.8.x/wb/admin/skel/themes/htt/footer.htt
===================================================================
--- branches/2.8.x/wb/admin/skel/themes/htt/footer.htt	(revision 2033)
+++ branches/2.8.x/wb/admin/skel/themes/htt/footer.htt	(revision 2034)
@@ -8,7 +8,7 @@
 <tr>
 	<td>
       <!-- Please note: the below reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
-      <a href="http://www.websitebaker2.org/" title="external">WebsiteBaker</a> is released under the
+      <a href="http://www.websitebaker.org/" title="external">WebsiteBaker</a> is released under the
       <a href="http://www.gnu.org/licenses/gpl.html" title="WebsiteBaker is released under the GNU General Public License">GNU General Public License</a>
       <!-- Please note: the above reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
 	</td>
Index: branches/2.8.x/wb/admin/skel/themes/htt/loginForgot.htt
===================================================================
--- branches/2.8.x/wb/admin/skel/themes/htt/loginForgot.htt	(revision 2033)
+++ branches/2.8.x/wb/admin/skel/themes/htt/loginForgot.htt	(revision 2034)
@@ -86,7 +86,7 @@
 	<tr>
 		<td>
 	      <!-- Please note: the below reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
-	      <a href="http://www.websitebaker2.org/" title="external">WebsiteBaker</a> is released under the
+	      <a href="http://www.websitebaker.org/" title="external">WebsiteBaker</a> is released under the
 	      <a href="http://www.gnu.org/licenses/gpl.html" title="WebsiteBaker is released under the GNU General Public License">GNU General Public License</a>
 	      <!-- Please note: the above reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
 		</td>
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 2033)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 2034)
@@ -51,5 +51,5 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.3');
-if(!defined('REVISION')) define('REVISION', '2033');
+if(!defined('REVISION')) define('REVISION', '2034');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/framework/class.database.php
===================================================================
--- branches/2.8.x/wb/framework/class.database.php	(revision 2033)
+++ branches/2.8.x/wb/framework/class.database.php	(revision 2034)
@@ -27,7 +27,7 @@
 		$msg .= '$database = new database();</span> by <span style="color:#00bb00; font-weight:bold;">';
 		$msg .= '$database = WbDatabase::getInstance();</span>.</p>';
 		$msg .= '<p>Also you can get information and help from the ';
-		$msg .= '<a href="http://www.websitebaker2.org/forum/index.php/board,2.0.html">WebsiteBaker Forum</a></p>';
+		$msg .= '<a href="http://www.websitebaker.org/forum/index.php/board,2.0.html">WebsiteBaker Forum</a></p>';
 		$msg .= '<hr />';
 		$msg .= '<p style="color: #dd0000; font-weight: bold;">Runtime Error !!</p>';
 		$msg .= '<p>Ouups...  hier wurde ein ung&uuml;ltiges Kommando gefunden!!</p>';
@@ -37,7 +37,7 @@
 		$msg .= '$database = new database();</span> durch <span style="color:#00bb00; font-weight:bold;">';
 		$msg .= '$database = WbDatabase::getInstance();</span>.</p>';
 		$msg .= '<p>Auch k&ouml;nnen sie auch Informationen und Hilfe im ';
-		$msg .= '<a href="http://www.websitebaker2.org/forum/index.php/board,31.0.html">WebsiteBaker Forum</a> finden.</p>';
+		$msg .= '<a href="http://www.websitebaker.org/forum/index.php/board,31.0.html">WebsiteBaker Forum</a> finden.</p>';
 		$msg .= '</div>';
 		die($msg);
 		
Index: branches/2.8.x/wb/templates/wb_theme/templates/warning.html
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/warning.html	(revision 2033)
+++ branches/2.8.x/wb/templates/wb_theme/templates/warning.html	(revision 2034)
@@ -1,66 +1,66 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-    <title>CMS WebsiteBaker | Excessive Invalid Logins</title>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <meta http-equiv="content-language" content="en" />
-    <meta name="description" content="Excessive Invalid Logins" />
-    <meta name="keywords" content="" />
-    <link href="../css/warn.css" rel="stylesheet" type="text/css" />
-</head>
-
-<body>
-
-<div class="main">
-    <table class="header layout">
-        <tr>
-        	<td class="logo">
-        		<a href="http://www.websitebaker2.org/" title=""><img src="../images/logo.png" alt="Logo" /></a>
-        	</td>
-        	<td></td>
-        </tr>
-    </table>
-
-    <div class="table">
-        <div class="td">
-            <div class="content">
-                <div class="login_box">
-                        <div class="topdiv">
-                        Invalid Logins
-                        </div>
-                        <div class="bottomdiv">
-                        <h1>Excessive Invalid Logins</h1>
-                        <h4>You have attempted to login too many times
-                            <div class="center">
-                            <img src="../icons/warning.png" alt="Excessive Invalid Logins" />
-                            </div>
-                        </h4>
-                        <p>Close this Tab and restart your Browser</p>
-                        </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <table class="footer">
-    <tbody>
-        <tr>
-        	<td>
-              <!-- Please note: the below reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
-              <a href="http://www.websitebaker2.org/" title="external">WebsiteBaker</a> is released under the
-              <a href="http://www.gnu.org/licenses/gpl.html" title="WebsiteBaker is released under the GNU General Public License">GNU General Public License</a>
-              <!-- Please note: the above reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
-        	</td>
-        </tr>
-        </tbody>
-    </table>
-</div>
-</body>
-</html>
-<!--- Icons from http://www.iconfinder.com Filter: Allowed for commercial use (No link required) -->
-<!--- Icon Designer Alessandro Rei - http://www.kde-look.org/usermanager/search.php?username=mentalrey License: http://www.gnu.org/copyleft/gpl.html -->
-<!--- Icon Designer Everaldo Coelho - http://www.everaldo.com/ License: http://www.gnu.org/licenses/lgpl.html -->
-<!--- Icon Designer David Vignoni - http://www.icon-king.com/ License: http://www.gnu.org/licenses/lgpl.html -->
-<!--- Icon Designer Pavel InFeRnODeMoN - http://www.kde-look.org/usermanager/search.php?username=InFeRnODeMoN License: http://www.gnu.org/copyleft/gpl.html -->
-<!--- Icon Designer Alexandre Moore - http://sa-ki.deviantart.com/ License: http://www.gnu.org/licenses/lgpl.html -->
-<!--- Icon Designer Alexandre Moore - http://sa-ki.deviantart.com/ License: http://www.gnu.org/copyleft/gpl.html -->
-<!--- Icon Designer Gnome Project - http://art.gnome.org/themes/icon/ License: http://www.gnu.org/copyleft/gpl.html -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+    <title>CMS WebsiteBaker | Excessive Invalid Logins</title>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <meta http-equiv="content-language" content="en" />
+    <meta name="description" content="Excessive Invalid Logins" />
+    <meta name="keywords" content="" />
+    <link href="../css/warn.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body>
+
+<div class="main">
+    <table class="header layout">
+        <tr>
+        	<td class="logo">
+        		<a href="http://www.websitebaker2.org/" title=""><img src="../images/logo.png" alt="Logo" /></a>
+        	</td>
+        	<td></td>
+        </tr>
+    </table>
+
+    <div class="table">
+        <div class="td">
+            <div class="content">
+                <div class="login_box">
+                        <div class="topdiv">
+                        Invalid Logins
+                        </div>
+                        <div class="bottomdiv">
+                        <h1>Excessive Invalid Logins</h1>
+                        <h4>You have attempted to login too many times
+                            <div class="center">
+                            <img src="../icons/warning.png" alt="Excessive Invalid Logins" />
+                            </div>
+                        </h4>
+                        <p>Close this Tab and restart your Browser</p>
+                        </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <table class="footer">
+    <tbody>
+        <tr>
+        	<td>
+              <!-- Please note: the below reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
+              <a href="http://www.websitebaker.org/" title="external">WebsiteBaker</a> is released under the
+              <a href="http://www.gnu.org/licenses/gpl.html" title="WebsiteBaker is released under the GNU General Public License">GNU General Public License</a>
+              <!-- Please note: the above reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
+        	</td>
+        </tr>
+        </tbody>
+    </table>
+</div>
+</body>
+</html>
+<!--- Icons from http://www.iconfinder.com Filter: Allowed for commercial use (No link required) -->
+<!--- Icon Designer Alessandro Rei - http://www.kde-look.org/usermanager/search.php?username=mentalrey License: http://www.gnu.org/copyleft/gpl.html -->
+<!--- Icon Designer Everaldo Coelho - http://www.everaldo.com/ License: http://www.gnu.org/licenses/lgpl.html -->
+<!--- Icon Designer David Vignoni - http://www.icon-king.com/ License: http://www.gnu.org/licenses/lgpl.html -->
+<!--- Icon Designer Pavel InFeRnODeMoN - http://www.kde-look.org/usermanager/search.php?username=InFeRnODeMoN License: http://www.gnu.org/copyleft/gpl.html -->
+<!--- Icon Designer Alexandre Moore - http://sa-ki.deviantart.com/ License: http://www.gnu.org/licenses/lgpl.html -->
+<!--- Icon Designer Alexandre Moore - http://sa-ki.deviantart.com/ License: http://www.gnu.org/copyleft/gpl.html -->
+<!--- Icon Designer Gnome Project - http://art.gnome.org/themes/icon/ License: http://www.gnu.org/copyleft/gpl.html -->
Index: branches/2.8.x/wb/templates/wb_theme/templates/footer.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/footer.htt	(revision 2033)
+++ branches/2.8.x/wb/templates/wb_theme/templates/footer.htt	(revision 2034)
@@ -8,7 +8,7 @@
 <tr>
 	<td>
       <!-- Please note: the below reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
-      <a href="http://www.websitebaker2.org/" title="external">WebsiteBaker</a> is released under the
+      <a href="http://www.websitebaker.org/" title="external">WebsiteBaker</a> is released under the
       <a href="http://www.gnu.org/licenses/gpl.html" title="WebsiteBaker is released under the GNU General Public License">GNU General Public License</a>
       <!-- Please note: the above reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
 	</td>