[Fusionforge-commits] r14722 - in trunk/src/www: developer frs/reporting include my pm pm/admin project/admin

Alain Peyrat aljeux at fusionforge.org
Wed Oct 26 14:00:32 CEST 2011


Author: aljeux
Date: 2011-10-26 14:00:31 +0200 (Wed, 26 Oct 2011)
New Revision: 14722

Modified:
   trunk/src/www/developer/diary.php
   trunk/src/www/frs/reporting/downloads.php
   trunk/src/www/include/Layout.class.php
   trunk/src/www/include/my_utils.php
   trunk/src/www/include/vote_function.php
   trunk/src/www/my/dashboard.php
   trunk/src/www/pm/admin/index.php
   trunk/src/www/pm/deletetask.php
   trunk/src/www/pm/detail_task.php
   trunk/src/www/pm/index.php
   trunk/src/www/pm/mod_task.php
   trunk/src/www/project/admin/tools.php
   trunk/src/www/project/admin/users.php
   trunk/src/www/project/admin/vhost.php
Log:
Mostly HTML & indent changes

Modified: trunk/src/www/developer/diary.php
===================================================================
--- trunk/src/www/developer/diary.php	2011-10-26 09:45:15 UTC (rev 14721)
+++ trunk/src/www/developer/diary.php	2011-10-26 12:00:31 UTC (rev 14722)
@@ -55,7 +55,7 @@
 	}
 
 	echo $HTML->boxTop(_('Existing Diary And Note Entries'));
-	echo '<table cellspacing="2" cellpadding="0" width="100%" border="0">';
+	echo '<table cellspacing="2" width="100%">';
 	/*
 		List all diary entries
 	*/

Modified: trunk/src/www/frs/reporting/downloads.php
===================================================================
--- trunk/src/www/frs/reporting/downloads.php	2011-10-26 09:45:15 UTC (rev 14721)
+++ trunk/src/www/frs/reporting/downloads.php	2011-10-26 12:00:31 UTC (rev 14722)
@@ -86,6 +86,13 @@
 		 'pagename'=>'project_showfiles',
 		 'sectionvals'=>group_getname($group_id)));
 
+$report=new ReportDownloads($group_id,$package_id,$start,$end);
+if ($report->isError()) {
+	echo '<p class="information">'.$report->getErrorMessage().'</p>';
+	frs_footer();
+	exit;
+}
+
 ?>
 
 <form action="<?php echo util_make_url('/frs/reporting/downloads.php') ?>" method="get">
@@ -103,7 +110,6 @@
 
 <?php
 
-$report=new ReportDownloads($group_id,$package_id,$start,$end);
 $data = $report->getData();
 
 if (count($data) == 0) {
@@ -123,7 +129,7 @@
 		'<td>'. $data[$i][1] .'</td>'.
 		'<td>'. basename($data[$i][2]) .'</td>'.
 		'<td><a href="/users/'.urlencode($data[$i][5]).'/">'. $data[$i][3] .'</a></td>'.
-		'<td align="center">'. $date .'</td></tr>';
+		'<td class="align-center">'. $date .'</td></tr>';
 
     }
 

Modified: trunk/src/www/include/Layout.class.php
===================================================================
--- trunk/src/www/include/Layout.class.php	2011-10-26 09:45:15 UTC (rev 14721)
+++ trunk/src/www/include/Layout.class.php	2011-10-26 12:00:31 UTC (rev 14722)
@@ -7,6 +7,7 @@
  * Copyright 2010-2011, Franck Villaume - Capgemini
  * Copyright 2010-2011, Alain Peyrat - Alcatel-Lucent
  * Copyright © 2011 Thorsten Glaser – tarent GmbH
+ * Copyright 2011 - Marc-Etienne Vargenau, Alcatel-Lucent
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;

Modified: trunk/src/www/include/my_utils.php
===================================================================
--- trunk/src/www/include/my_utils.php	2011-10-26 09:45:15 UTC (rev 14721)
+++ trunk/src/www/include/my_utils.php	2011-10-26 12:00:31 UTC (rev 14722)
@@ -71,7 +71,7 @@
                 $hide_url= '<a href="?hide_'.$svc.'=0&hide_item_id='.$db_item_id.'"><img src="../images/pointer_right.png"  border="0" title="'._('Expand').'" alt="'._('Expand').'" /></a> ';
                 $hide_now = true;
     } else {
-                $hide_url= '<a href="?hide_'.$svc.'=1&hide_item_id='.$db_item_id.'"><img src="../images/pointer_down.png"   border="0" title="'._('Collapse').'" alt="'._('Collapse').'" /></a> ';
+                $hide_url= '<a href="?hide_'.$svc.'=1&hide_item_id='.$db_item_id.'"><img src="../images/pointer_down.png"  title="'._('Collapse').'" alt="'._('Collapse').'" /></a> ';
                 $hide_now = false;
     }
 

Modified: trunk/src/www/include/vote_function.php
===================================================================
--- trunk/src/www/include/vote_function.php	2011-10-26 09:45:15 UTC (rev 14721)
+++ trunk/src/www/include/vote_function.php	2011-10-26 12:00:31 UTC (rev 14722)
@@ -404,8 +404,8 @@
 
 	global $USER_RATING_VALUES,$USER_RATING_QUESTIONS,$USER_RATING_POPUP1,$USER_RATING_POPUP2,$USER_RATING_POPUP3,$USER_RATING_POPUP4,$USER_RATING_POPUP5;
 	echo '
+	<table>
     <form action="/developer/rate.php" method="post">
-	<table class="align-left">';
 
 	for ($i=1; $i<=count($USER_RATING_QUESTIONS); $i++) {
 		$popup="USER_RATING_POPUP$i";

Modified: trunk/src/www/my/dashboard.php
===================================================================
--- trunk/src/www/my/dashboard.php	2011-10-26 09:45:15 UTC (rev 14721)
+++ trunk/src/www/my/dashboard.php	2011-10-26 12:00:31 UTC (rev 14722)
@@ -173,7 +173,7 @@
 
 //second column of "my" page
 
-	echo '</td><td valign="top"></td></tr>
+	echo '</td><td class="top"></td></tr>
 
 	<!--  Bottom Row   -->
 <!--

Modified: trunk/src/www/pm/admin/index.php
===================================================================
--- trunk/src/www/pm/admin/index.php	2011-10-26 09:45:15 UTC (rev 14721)
+++ trunk/src/www/pm/admin/index.php	2011-10-26 12:00:31 UTC (rev 14722)
@@ -138,14 +138,13 @@
 		if (!$pg->update($project_name,$description,$send_all_posts_to)) {
 			exit_error($pg->getErrorMessage(),'pm');
 		} else {
-			$feedback .= _('Updated successfully');
+			$feedback .= _('Subproject Updated successfully');
 		}
 
 	} else if ($delete) {
 		$sure = getStringFromRequest('sure');
 		$really_sure = getStringFromRequest('really_sure');
 
-
 		/*
 			Delete a subproject
 		*/
@@ -154,7 +153,7 @@
 		if (!$pg->delete(getStringFromRequest('sure'),getStringFromRequest('really_sure'))) {
 			exit_error($pg->getErrorMessage(),'pm');
 		} else {
-			$feedback .= _('Successfully Deleted');
+			$feedback .= _('Subproject Successfully Deleted');
 			$group_project_id=0;
 			$delete=false;
 		}
@@ -184,7 +183,6 @@
 		List of possible categories for this ArtifactType
 	*/
 	$result=$pg->getCategories();
-	echo "<p />";
 	$rows=db_numrows($result);
 	if ($result && $rows > 0) {
 		$title_arr=array();
@@ -204,20 +202,19 @@
 		echo $GLOBALS['HTML']->listTableBottom();
 
 	} else {
-		echo "\n<p class=\"warning_msg\">"._('No categories defined')."</p>";
+		echo "\n<p class=\"information\">"._('No categories defined')."</p>";
 	}
 
 	?>
-	<p />
 	<form action="<?php echo getStringFromServer('PHP_SELF').'?group_id='.$group_id; ?>" method="post">
+	<p>
 	<input type="hidden" name="add_cat" value="y" />
 	<input type="hidden" name="group_project_id" value="<?php echo $pg->getID(); ?>" />
 	<strong><?php echo _('Category Name') ?>:</strong><br />
-	<input type="text" name="name" value="" size="15" maxlength="30" /><br />
-	<p />
-	<span class="important"><?php echo _('Once you add a category, it cannot be deleted') ?></span>
-	<p />
-	<input type="submit" name="post_changes" value="<?php echo _('Submit') ?>" />
+	<input type="text" name="name" value="" size="15" maxlength="30" />
+	</p>
+	<p class="important"><?php echo _('Once you add a category, it cannot be deleted') ?></p>
+	<p><input type="submit" name="post_changes" value="<?php echo _('Submit') ?>" /></p>
 	</form>
 	<?php
 
@@ -280,15 +277,14 @@
 	?>
 	<p><?php echo _('Add a new subproject to the Tasks. <strong>This is different than adding a task to a subproject.</strong>') ?></p>
 
-	<p />
 	<form action="<?php echo getStringFromServer('PHP_SELF')."?group_id=$group_id"; ?>" method="post">
+	<p>
 	<input type="hidden" name="addproject" value="y" />
 	<input type="hidden" name="post_changes" value="y" />
-	<p />
 	<strong><?php echo _('Is Public?')?></strong><br />
 	<input type="radio" name="is_public" value="1" checked="checked" /><?php echo _('Yes') ?><br />
-	<input type="radio" name="is_public" value="0" /><?php echo _('No') ?><p />
-	<p />
+	<input type="radio" name="is_public" value="0" /><?php echo _('No') ?>
+	</p>
 	<strong><?php echo _('New Subproject Name').utils_requiredField()?></strong>
 	<br />
 	<input type="text" name="project_name" value="" size="15" maxlength="30" />
@@ -370,7 +366,6 @@
 
 } else if ($delete && $group_project_id) {
 
-
 	$pg = new ProjectGroup($g,$group_project_id);
 	if (!$pg || !is_object($pg)) {
 		exit_error(_('Could Not Get ProjectGroup'),'pm');
@@ -427,7 +422,7 @@
 	$pg_arr = $pgf->getProjectGroups();
 
 	if (count($pg_arr) < 1 || $pg_arr == false) {
-		echo '<h2>' . _('No Subprojects Found in this Project') . '</h2>';
+		echo '<p class="information">' . _('No Subprojects Found in this Project') . '</p>';
 		echo '<p>' . _('You may add new Subprojects using the "Add a Subproject" link above.') . '</p>';
 		echo db_error();
 	} else {

Modified: trunk/src/www/pm/deletetask.php
===================================================================
--- trunk/src/www/pm/deletetask.php	2011-10-26 09:45:15 UTC (rev 14721)
+++ trunk/src/www/pm/deletetask.php	2011-10-26 12:00:31 UTC (rev 14722)
@@ -31,13 +31,13 @@
 <input type="hidden" name="func" value="postdeletetask" />
 <input type="hidden" name="project_task_id" value="<?php echo $project_task_id; ?>" />
 
-<table border="0" align="center">
+<table align="center">
 
 	<tr>
 		<td ><span class="veryimportant"><?php echo _('Are you sure you want to delete this task?'); ?></span>
 			<h3>"<?php echo $pt->getSummary(); ?>"</h3></td>
 	</tr>
-	<tr align="center">
+	<tr class="align-center">
 		<td style="text-align:center"><input type="checkbox" value="1" name="confirm_delete" /> <?php echo _('Yes, I want to delete this task'); ?></td>
 	</tr>
 	<tr>

Modified: trunk/src/www/pm/detail_task.php
===================================================================
--- trunk/src/www/pm/detail_task.php	2011-10-26 09:45:15 UTC (rev 14721)
+++ trunk/src/www/pm/detail_task.php	2011-10-26 12:00:31 UTC (rev 14722)
@@ -33,7 +33,7 @@
 
 ?>
 
-<table border="0" width="100%">
+<table class="fullwidth">
 
         <tr>
                 <td><strong><?php echo _('Submitted by') ?>:</strong><br /><?php echo $pt->getSubmittedRealName(); ?> (<?php echo $pt->getSubmittedUnixName(); ?>)</td>
@@ -112,7 +112,7 @@
 	</tr>
 
 	<tr>
-		<td valign="top">
+		<td class="top">
 		<?php
 		/*
 			Get the list of ids this is assigned to and convert to array
@@ -125,7 +125,7 @@
 		ShowResultSet($result2,_('Assigned to'), false, false);
 		?>
 		</td>
-		<td valign="top">
+		<td class="top">
 		<?php
 		/*
 			Get the list of ids this is dependent on and convert to array

Modified: trunk/src/www/pm/index.php
===================================================================
--- trunk/src/www/pm/index.php	2011-10-26 09:45:15 UTC (rev 14721)
+++ trunk/src/www/pm/index.php	2011-10-26 12:00:31 UTC (rev 14722)
@@ -58,7 +58,7 @@
 plugin_hook("blocks", "tasks index");
 
 if (count($pg_arr) < 1 || $pg_arr == false) {
-	echo '<p class="warning_msg">'._('No Subprojects Found').'</p>';
+	echo '<p class="information">'._('No Subprojects Found').'</p>';
 	echo '<p>'._('No subprojects have been set up, or you cannot view them.').'</p>';
 	echo '<p class="important">'._('The Admin for this project will have to set up subprojects using the admin page.').'</p>';
 } else {

Modified: trunk/src/www/pm/mod_task.php
===================================================================
--- trunk/src/www/pm/mod_task.php	2011-10-26 09:45:15 UTC (rev 14721)
+++ trunk/src/www/pm/mod_task.php	2011-10-26 12:00:31 UTC (rev 14722)
@@ -44,7 +44,7 @@
 <input type="hidden" name="func" value="postmodtask" />
 <input type="hidden" name="project_task_id" value="<?php echo $project_task_id; ?>" />
 
-<table border="0" width="100%" class="mod_task">
+<table class="fullwidth mod_task">
 
 	<tr>
 		<td><strong><?php echo _('Submitted by') ?>:</strong><br />

Modified: trunk/src/www/project/admin/tools.php
===================================================================
--- trunk/src/www/project/admin/tools.php	2011-10-26 09:45:15 UTC (rev 14721)
+++ trunk/src/www/project/admin/tools.php	2011-10-26 12:00:31 UTC (rev 14722)
@@ -105,9 +105,9 @@
 
 project_admin_header(array('title'=>_('Tools'),'group'=>$group->getID()));
 
-echo '<table width="100%">';
-echo '<tr valign="top">';
-echo '<td width="50%">';
+echo '<table class="fullwidth">';
+echo '<tr class="top">';
+echo '<td class="halfwidth">';
 
 echo $HTML->boxTop(_('Active Tools').'');
 ?>

Modified: trunk/src/www/project/admin/users.php
===================================================================
--- trunk/src/www/project/admin/users.php	2011-10-26 09:45:15 UTC (rev 14721)
+++ trunk/src/www/project/admin/users.php	2011-10-26 12:00:31 UTC (rev 14722)
@@ -91,9 +91,7 @@
 
 if (getStringFromRequest('submit')) {
 	if (getStringFromRequest('adduser')) {
-		/*
-			add user to this project
-			*/
+		/* Add user to this project */
 		$form_unix_name = getStringFromRequest('form_unix_name');
 		$user_object = &user_get_object_by_name($form_unix_name);
 		if ($user_object === false) {
@@ -119,7 +117,7 @@
 			}
 		}
 	} else if (getStringFromRequest('rmuser')) {
-		/* remove a member from this project */
+		/* Remove a member from this project */
 		$user_id = getIntFromRequest('user_id');
 		$role_id = getIntFromRequest('role_id');
 		$role = RBACEngine::getInstance()->getRoleById($role_id) ;
@@ -148,9 +146,7 @@
 			}
 		}
 	} elseif (getStringFromRequest('acceptpending')) {
-		/*
-			add user to this project
-			*/
+		/* Add user to this project */
 		$role_id = getIntFromRequest('role_id');
 		if (!$role_id) {
 			$warning_msg .= _("Role not selected");
@@ -170,9 +166,7 @@
 			}
 		}
 	} elseif (getStringFromRequest('rejectpending')) {
-		/*
-			reject adding user to this project
-			*/
+		/* Reject adding user to this project */
 		$form_userid = getIntFromRequest('form_userid');
 		$gjr=new GroupJoinRequest($group,$form_userid);
 		if (!$gjr || !is_object($gjr) || $gjr->isError()) {

Modified: trunk/src/www/project/admin/vhost.php
===================================================================
--- trunk/src/www/project/admin/vhost.php	2011-10-26 09:45:15 UTC (rev 14721)
+++ trunk/src/www/project/admin/vhost.php	2011-10-26 12:00:31 UTC (rev 14722)
@@ -115,7 +115,7 @@
 ?>
 
 <form name="new_vhost" action="<?php echo getStringFromServer('PHP_SELF').'?group_id='.$group->getID().'&createvhost=1'; ?>" method="post">
-<table border="0">
+<table>
 <tr>
 	<td> <?php echo _('New Virtual Host <em>(e.g. vhost.org)</em>') ?> </td>
 	<td> <input type="text" size="15" maxlength="255" name="vhost_name" /> </td>




More information about the Fusionforge-commits mailing list