Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1315)
+++ branches/2.8.x/CHANGELOG	(revision 1316)
@@ -12,6 +12,11 @@
 
 ------------------------------------- 2.8.1 -------------------------------------
 11-Apr-2010 Dietmar Woellbrink (Luisehahne)
+#	Ticket #978 Add additional PHP 5.2 check to installation
+#	Ticket #979 False PHP 4 requirements in install
+#	Ticket #980 Usebility - Bug in the settings-interface
+#	Ticket #981 typos in backend-theme "argos" in file groups.htt
+11-Apr-2010 Dietmar Woellbrink (Luisehahne)
 #	fix ticket #975 some weird /pages/ header infos
 11-Apr-2010 Dietmar Woellbrink (Luisehahne)
 !	little fixes for backwards compatible PHP4, pls test
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1315)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1316)
@@ -52,6 +52,6 @@
 
 // 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.x');
-if(!defined('REVISION')) define('REVISION', '1315');
+if(!defined('REVISION')) define('REVISION', '1316');
 
 ?>
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/theme.css
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/theme.css	(revision 1315)
+++ branches/2.8.x/wb/templates/wb_theme/theme.css	(revision 1316)
@@ -131,7 +131,7 @@
 .c75l, .c75r, .c80l, .c80r { width: 75%; }
 
 .info { padding: 10px; margin-bottom: 0.5em; background: #f8f8f8; color: #666; font-size: 91.7%; }
-.note { border: 2px #484 solid; padding: 10px;margin: 10px 10px 10px 270px; background: #efe; color: #040; }
+.note { border: 2px #484 solid; padding: 10px;margin: 10px auto; background: #efe; color: #040; }
 .important { border: 2px #884 solid; padding: 10px;  margin-bottom: 1em; background: #ffe; color: #440; }
 .warning { border: 2px #844 solid; padding: 10px; margin-bottom: 1em; background: #fee; color: #400; }
 
Index: branches/2.8.x/wb/templates/wb_theme/templates/settings.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/settings.htt	(revision 1315)
+++ branches/2.8.x/wb/templates/wb_theme/templates/settings.htt	(revision 1316)
@@ -398,8 +398,7 @@
 			<label for="world_writeable">
 				{TEXT_WORLD_WRITEABLE_FILE_PERMISSIONS} (777)
 			</label>
-			<br />
-			<font class="note">({WORLD_WRITEABLE_WARNING})</font>
+			<span class="warning">({WORLD_WRITEABLE_WARNING})</span>
 		</div>
 		<div id="{BASIC_FILE_PERMS_ID}3" style="margin: 0; padding: 0;"></div>
 	</td>
Index: branches/2.8.x/wb/templates/argos_theme/templates/settings.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/settings.htt	(revision 1315)
+++ branches/2.8.x/wb/templates/argos_theme/templates/settings.htt	(revision 1316)
@@ -388,8 +388,7 @@
 			<label for="world_writeable">
 				{TEXT_WORLD_WRITEABLE_FILE_PERMISSIONS} (777)
 			</label>
-			<br />
-			<font class="note">({WORLD_WRITEABLE_WARNING})</font>
+			<span class="warning">({WORLD_WRITEABLE_WARNING})</span>
 		</div>
 		<div id="{BASIC_FILE_PERMS_ID}3" style="margin: 0; padding: 0;"></div>
 	</td>
Index: branches/2.8.x/wb/templates/argos_theme/templates/groups.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/groups.htt	(revision 1315)
+++ branches/2.8.x/wb/templates/argos_theme/templates/groups.htt	(revision 1316)
@@ -1,31 +1,31 @@
-<!-- BEGIN main_block -->
-
-<form name="groups" action="groups.php" method="post">
-  <input type="hidden" name="action" value="delete" />
-  
-  <table cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
-	<tr style="background:#f0f0f0;">
-		<td align="left"><h2>{HEADING_MODIFY_DELETE_GROUP}</h2></td>
-		<td align="right">
-		<!-- BEGIN manage_users_block -->
-		<a href="{ADMIN_URL}/users/index.php">{TEXT_MANAGE_USERS}</a>
-		<!-- END manage_users_block -->
-		</td>
-     </tr>
-</table>
-
-  <select name="group_id" style="width: 500px;">
-    <!-- BEGIN list_block -->
-    <option value="{VALUE}">
-    {NAME}
-    </option>
-    <!-- END list_block -->
-  </select>
-  <input type="submit" name="modify" style="width: 100px;" value="{TEXT_MODIFY}" class="{DISPLAY_MODIFY}" />
-  <input type="submit" name="delete" style="width: 100px;" value="{TEXT_DELETE}" onClick="return confirm('{CONFIRM_DELETE}');" class="{DISPLAY_DELETE}" />
-</form>
-<br />
-<h2 class="{DISPLAY_ADD}">
-  {HEADING_ADD_GROUP}
-</h2>
-<!-- END main_block -->
+<!-- BEGIN main_block -->
+
+<form name="groups" action="groups.php" method="post">
+  <input type="hidden" name="action" value="delete" />
+  
+  <table cellpadding="5" cellspacing="0" border="0" align="center" width="100%" style="margin-bottom:10px;">
+	<tr style="background:#f0f0f0;">
+		<td align="left"><h2>{HEADING_MODIFY_DELETE_GROUP}</h2></td>
+		<td align="right">
+		<!-- BEGIN manage_users_block -->
+		<a href="{ADMIN_URL}/users/index.php">{TEXT_MANAGE_USERS}</a>
+		<!-- END manage_users_block -->
+		</td>
+     </tr>
+</table>
+
+  <select name="group_id" style="width: 500px;">
+    <!-- BEGIN list_block -->
+    <option value="{VALUE}">
+    {NAME}
+    </option>
+    <!-- END list_block -->
+  </select>
+  <input type="submit" name="modify" style="width: 100px;" value="{TEXT_MODIFY}" class="{DISPLAY_MODIFY}" />
+  <input type="submit" name="delete" style="width: 100px;" value="{TEXT_DELETE}" onclick="return confirm('{CONFIRM_DELETE}');" class="{DISPLAY_DELETE}" />
+</form>
+<br />
+<h2 class="{DISPLAY_ADD}">
+  {HEADING_ADD_GROUP}
+</h2>
+<!-- END main_block -->
Index: branches/2.8.x/wb/install/stylesheet.css
===================================================================
--- branches/2.8.x/wb/install/stylesheet.css	(revision 1315)
+++ branches/2.8.x/wb/install/stylesheet.css	(revision 1316)
@@ -34,7 +34,7 @@
 	background-color: #FFFFFF;
 	padding: 15px;
 	height: 350px;
-	width: 750px;
+	width: 850px;
 	text-align: justify;
 	vertical-align: top;
 }
@@ -71,4 +71,5 @@
 }
 .hide {
 	display: none;
-}
\ No newline at end of file
+}
+.warning { border: 2px #844 solid; padding: 1px; margin: 5px auto; background: #fee; color: #ee0000; text-align: center; font-size: 1.2em; line-height: 1em; }
Index: branches/2.8.x/wb/install/index.php
===================================================================
--- branches/2.8.x/wb/install/index.php	(revision 1315)
+++ branches/2.8.x/wb/install/index.php	(revision 1316)
@@ -11,8 +11,8 @@
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 4.3.4 and higher
  * @version      	$Id$
- * @filesource		$HeadURL:  $
- * @lastmodified    $Date: $
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
  *
  */
 
@@ -90,7 +90,7 @@
 </head>
 <body>
 
-<table cellpadding="0" cellspacing="0" border="0" width="750" align="center">
+<table cellpadding="0" cellspacing="0" border="0" width="850" align="center">
 <tr>
 	<td width="60" valign="top">
 		<img src="../templates/wb_theme/images/logo.png" alt="Logo" />
@@ -108,7 +108,7 @@
 <input type="hidden" name="password_fieldname" value="admin_password" />
 <input type="hidden" name="remember" id="remember" value="true" />
 
-<table cellpadding="0" cellspacing="0" border="0" width="750" align="center" style="margin-top: 10px;">
+<table cellpadding="0" cellspacing="0" border="0" width="850" align="center" style="margin-top: 10px;">
 <tr>
 	<td class="content">
 	
@@ -131,11 +131,11 @@
 		</tr>
 		<?php } ?>
 		<tr>
-			<td width="160" style="color: #666666;">PHP Version > 4.1.0</td>
+			<td width="160" style="color: #666666;">PHP Version > 4.4.9</td>
 			<td width="60">
 				<?php
-				$phpversion = substr(PHP_VERSION, 0, 6);
-				if($phpversion > 4.1) {
+			   if (version_compare(PHP_VERSION, '4.4.9', '>='))
+			   {
 					?><font class="good">Yes</font><?php
 				} else {
 					?><font class="bad">No</font><?php
@@ -151,7 +151,7 @@
 					?><font class="good">Disabled</font><?php
 				} else {
 					?><font class="bad">Enabled</font><?php
-				}	
+				}
 				?>
 			</td>
 		</tr>
@@ -167,7 +167,18 @@
 				?>
 			</td>
 			<td colspan="4">&nbsp;</td>
+        <?php if (version_compare(PHP_VERSION, '5.2.1', '<')){ ?>
+		<tr>
+        	<td colspan="7">
+            <div class="warning">
+			<p>Your current PHP Version is: <?php print PHP_VERSION;  ?></p><h4>Please upgrade your Hosting to PHP Version 5.2.1 or higher</h4>
+			<p>PHP 4 is no longer under development nor will any security updates be released.</p>
+
+			</div>
+			</td>
 		</tr>
+        <?php } ?>
+		</tr>
 		<?php if($e_adc) { ?>
 		<tr>
 			<td colspan="6" style="font-size: 10px;" class="bad">Please note: AddDefaultCharset is set to <?php echo $e_adc;?> in apache.conf.<br />If you have to use umlauts (e.g. &auml; &aacute;) please change this to Off. - Or use <?php echo $e_adc;?> inside website baker, too.</td>

Property changes on: branches/2.8.x/wb/install/index.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property