[evolvis-commits] r15641: Messages improved.

mirabilos at evolvis.org mirabilos at evolvis.org
Tue Mar 1 00:22:32 CET 2011


Author: mirabilos
Date: 2011-03-01 00:22:32 +0100 (Tue, 01 Mar 2011)
New Revision: 15641

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/www/admin/admin_table.php
   trunk/gforge_base/evolvisforge-5.1/src/www/admin/approve-pending.php
   trunk/gforge_base/evolvisforge-5.1/src/www/admin/groupdelete.php
   trunk/gforge_base/evolvisforge-5.1/src/www/admin/vhost.php
   trunk/gforge_base/evolvisforge-5.1/src/www/forum/message.php
   trunk/gforge_base/evolvisforge-5.1/src/www/forum/monitor.php
Log:
Messages improved.

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/admin/admin_table.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/admin/admin_table.php	2011-02-28 23:22:29 UTC (rev 15640)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/admin/admin_table.php	2011-02-28 23:22:32 UTC (rev 15641)
@@ -136,8 +136,10 @@
 
 	if ($result) {
 		$cols = db_numfields($result);
-
-		printf(_('Are you sure you want to delete this %1$s?'), getUnitLabel($unit)).'<ul>';
+		echo '<p>';
+		printf(_('Are you sure you want to delete this %1$s?'), getUnitLabel($unit));
+		echo '</p>';
+		echo '<ul>';
 		for ($i = 0; $i < $cols; $i++) {
 			echo '<li><strong>'.db_fieldname($result,$i).'</strong> '.db_result($result,0,$i).'</li>';
 		}

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/admin/approve-pending.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/admin/approve-pending.php	2011-02-28 23:22:29 UTC (rev 15640)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/admin/approve-pending.php	2011-02-28 23:22:32 UTC (rev 15641)
@@ -93,7 +93,7 @@
 	
 	$group =& group_get_object($group_id);
 	if (!$group || !is_object($group)) {
-		exit_error('Error','Could Not Get Group');
+		exit_no_group();
 	} elseif ($group->isError()) {
 		exit_error('Error',$group->getErrorMessage());
 	}
@@ -123,8 +123,8 @@
 	}
 }
 
-
 site_admin_header(array('title'=>_('Approving Pending Projects')));
+echo '<h1>' . _('Approving Pending Projects') . '</h1>';
 
 // get current information
 $res_grp = db_query_params("SELECT * FROM groups WHERE status='P'", array(), $LIMIT);
@@ -132,8 +132,7 @@
 $rows = db_numrows($res_grp);
 
 if ($rows < 1) {
-	print "<h1>"._('None Found'). "</h1>";
-	print "<p>"._('No Pending Projects to Approve')."</p>";
+	print '<div class="warning_msg">'._('No Pending Projects to Approve').'</div>';
 	site_admin_footer(array());
 	exit;
 }
@@ -227,8 +226,7 @@
 			.'</p>' ;
 	}
 	
-	echo "<p> </p><hr /><p> </p>";
-
+	echo "<hr />";
 }
 
 //list of group_id's of pending projects
@@ -236,12 +234,13 @@
 $group_list=implode($arr,',');
 
 echo '
-	<div align="center">
 	<form action="'.getStringFromServer('PHP_SELF').'" method="post">
+	<p style="text-align: center;">
 	<input type="hidden" name="action" value="activate" />
 	<input type="hidden" name="list_of_groups" value="'.$group_list.'" />
 	<input type="submit" name="submit" value="'._('Approve All On This Page').'" />
-	</form></div>
+	</p>
+	</form>
 	';
 
 site_admin_footer(array());

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/admin/groupdelete.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/admin/groupdelete.php	2011-02-28 23:22:29 UTC (rev 15640)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/admin/groupdelete.php	2011-02-28 23:22:32 UTC (rev 15641)
@@ -45,14 +45,14 @@
 		exit_error('Error',$group->getErrorMessage());
 	} else {
 		plugin_hook('delete_link',$_GET['group_id']) ;
-		header("Location: ".util_make_url("/admin/?feedback=DELETED"));
+		header("Location: ".util_make_url("/admin/?feedback=Project+successfully+deleted"));
 	}
 }
 
-site_admin_header(array('title'=>_('Permanently Delete Project')));
+$title = _('Permanently and irretrievably delete project').': '.$group->getPublicName();
+site_admin_header(array('title'=>$title));
+echo '<h1>'.$title.'</h1>'; ?>
 
-echo '<h2>'._('Permanently and irretrievably delete project').': '.$group->getPublicName().'</h2>' ;?>
-
 <form action="<?php echo getStringFromServer('PHP_SELF').'?group_id='.$group_id; ?>" method="post">
 <input type="checkbox" value="1" name="sure" /> <?php echo _('Confirm Delete'); ?><br />
 <input type="checkbox" value="1" name="reallysure" /> <?php echo _('Confirm Delete'); ?><br />

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/admin/vhost.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/admin/vhost.php	2011-02-28 23:22:29 UTC (rev 15640)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/admin/vhost.php	2011-02-28 23:22:32 UTC (rev 15641)
@@ -74,8 +74,7 @@
 			if (!$res || db_affected_rows($res) < 1) {
 				$feedback .= _('Error adding VHOST:') .db_error();
 			} else {
-				$feedback .= sprintf(_("Virtual host <strong>%s</strong> scheduled for creation on group <em>%s</em>"),
-				    $vhost_name, $group->getUnixName());
+				$feedback .= _('Virtual Host:'). "<strong>".$vhost_name."</strong>" ._('scheduled for creation on group'). "<em>".$group->getUnixName()."</em>";
 			}
 		} else {
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/forum/message.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/forum/message.php	2011-02-28 23:22:29 UTC (rev 15640)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/forum/message.php	2011-02-28 23:22:32 UTC (rev 15641)
@@ -213,13 +213,13 @@
 		/*
 			Show post followup form
 		*/
-		echo '<div align="center"><h3>'._('Post a followup to this message').'</h3></div>';
+		echo '<h3>'._('Post a followup to this message').'</h3>';
 		$fh->showPostForm($fm->getThreadID(), $msg_id, $fm->getSubject());
 	}
 
 } else {
-	forum_header(array('title'=>_('Must Choose A Message First')));
-	echo '<h1>'._('You Must Choose A Message First').'</h1>';
+	forum_header(array('title'=>_('You Must Choose a Message First')));
+	echo '<div class="error">'._('You Must Choose a Message First').'</div>';
 
 }
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/forum/monitor.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/forum/monitor.php	2011-02-28 23:22:29 UTC (rev 15640)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/forum/monitor.php	2011-02-28 23:22:32 UTC (rev 15641)
@@ -7,7 +7,6 @@
  *
  */
 
-
 /*
     Message Forums
     By Tim Perdue, Sourceforge, 11/99
@@ -22,7 +21,6 @@
 require_once $gfwww.'forum/include/ForumHTML.class.php';
 require_once $gfcommon.'forum/Forum.class.php';
 
-
 if (session_loggedin()) {
 	$forum_id = getIntFromRequest('forum_id');
 	$group_id = getIntFromRequest('group_id');
@@ -50,7 +48,7 @@
 				exit;
 			}
 			if (!$confirm) {
-				forum_header(array('title'=>_('My Monitored Forums')));
+				forum_header(array('title'=>_('Stop Monitoring')));
 				echo $HTML->confirmBox('You are about to stop monitoring the '.$f->getName().
 					' forum.<br/><br/>Do you really want to unsubscribe ?', 
 					array('group_id' => $group_id, 'forum_id' => $forum_id, 'stop' => 1),



More information about the evolvis-commits mailing list