[evolvis-commits] r14583: xhtml and minor changes mostly.

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 04:36:24 CET 2011


Author: mirabilos
Date: 2011-02-28 04:36:23 +0100 (Mon, 28 Feb 2011)
New Revision: 14583

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/www/frs/admin/deletepackage.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/index.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/task.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/tools.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/project/request.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/register/projectinfo.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/survey/admin/survey.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/survey/include/SurveyHTML.class.php
Log:
xhtml and minor changes mostly.

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/frs/admin/deletepackage.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/frs/admin/deletepackage.php	2011-02-28 03:36:12 UTC (rev 14582)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/frs/admin/deletepackage.php	2011-02-28 03:36:23 UTC (rev 14583)
@@ -52,14 +52,11 @@
 }
 
 /*
-
 	Relatively simple form to delete packages of releases
-
 */
 
-frs_admin_header(array('title'=>_('Release Edit/File Releases'),'group'=>$group_id));
+frs_admin_header(array('title'=>sprintf(_('Delete Package: %1$s'), $frsp->getName()),'group'=>$group_id));
 
-	echo '<p><strong>'.$frsp->getName().'</strong></p>';
 	echo '
 	<form action="/frs/admin/?group_id='.$group_id.'" method="post">
 	<p>
@@ -68,9 +65,10 @@
 	'._('You are about to permanently and irretrievably delete this package and all its releases and files!').'
         </p> 
         <p> 
-	<input type="checkbox" name="sure" value="1" />'._('I\'m Sure').'<br />
-        <br /> 
-	<input type="checkbox" name="really_sure" value="1" />'._('I\'m Really Sure').'<br />
+	<input type="checkbox" name="sure" value="1" />'._('I\'m Sure').'
+        </p> 
+        <p> 
+	<input type="checkbox" name="really_sure" value="1" />'._('I\'m Really Sure').'
         </p>
         <p>
 	<input type="submit" name="submit" value="'._('Delete').'" />

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/index.php	2011-02-28 03:36:12 UTC (rev 14582)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/index.php	2011-02-28 03:36:23 UTC (rev 14583)
@@ -81,11 +81,11 @@
 		echo '
 		<tr '. $HTML->boxGetAltRowStyle($j) . '>
 			<td><a href="'.util_make_url ('/pm/task.php?group_project_id='. $pg_arr[$j]->getID().'&group_id='.$group_id.'&func=browse').'">' .
-		html_image("ic/taskman20w.png","20","20",array("border"=>"0")) . '  '.
+		html_image("ic/taskman20w.png","20","20",array("border"=>"0", "align"=>"middle")) . '  '.
 		$pg_arr[$j]->getName() .'</a></td>
 			<td>'.$pg_arr[$j]->getDescription() .'</td>
-			<td style="text-align:center">'. (int) $pg_arr[$j]->getOpenCount().'</td>
-			<td style="text-align:center">'. (int) $pg_arr[$j]->getTotalCount().'</td>
+			<td style="text-align:right">'. (int) $pg_arr[$j]->getOpenCount().'</td>
+			<td style="text-align:right">'. (int) $pg_arr[$j]->getTotalCount().'</td>
 		</tr>';
 		}
 	}

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/task.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/task.php	2011-02-28 03:36:12 UTC (rev 14582)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/task.php	2011-02-28 03:36:23 UTC (rev 14583)
@@ -280,7 +280,10 @@
 					unset($pt);
 				}
 			}
-			if (!$was_error) {
+			if ($count == 0) {
+				$warning_msg = _('No task selected');
+			}
+			elseif (!$was_error) {
 				$feedback = _('Task Updated Successfully');
 			}
 			include $gfwww.'pm/browse_task.php';

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/tools.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/tools.php	2011-02-28 03:36:12 UTC (rev 14582)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/tools.php	2011-02-28 03:36:23 UTC (rev 14583)
@@ -177,7 +177,7 @@
 <input type="checkbox" name="use_pm" value="1" <?php echo c($group->usesPM()); ?> />
 </td>
 <td>
-<strong><?php echo _('Use Task Manager') ?></strong>
+<strong><?php echo _('Use Tasks') ?></strong>
 </td>
 </tr>
 <?php
@@ -300,7 +300,7 @@
 	<p><a href="/mail/admin/?group_id=<?php echo $group->getID(); ?>"><?php echo _('Mailing Lists Admin') ?></a></p>
 <?php }
 if($group->usesPM()) { ?>
-	<p><a href="/pm/admin/?group_id=<?php echo $group->getID(); ?>"><?php echo _('Task Manager Admin') ?></a></p>
+	<p><a href="/pm/admin/?group_id=<?php echo $group->getID(); ?>"><?php echo _('Tasks Admin') ?></a></p>
 <?php }
 if($group->usesDocman()) { ?>
 	<p><a href="/docman/admin/?group_id=<?php echo $group->getID(); ?>"><?php echo _('Documents Admin') ?></a></p>

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/project/request.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/project/request.php	2011-02-28 03:36:12 UTC (rev 14582)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/project/request.php	2011-02-28 03:36:23 UTC (rev 14583)
@@ -62,8 +62,8 @@
 <form action="<?php echo getStringFromServer('PHP_SELF')."?group_id=$group_id"; ?>" method="post">
 <p>
 <?php echo ngettext('You must send a comment to the administrator:', 'You must send a comment to the administrators:',$nbadmins); echo utils_requiredField(); ?><br>
+</p>
 <textarea name="comments" rows="15" cols="60"><?php echo $comments ?></textarea>
-</p>
 <p>
 	<input type="submit" name="submit" value="<?php echo _('Submit'); ?>" />
 </p>

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/register/projectinfo.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/register/projectinfo.php	2011-02-28 03:36:12 UTC (rev 14582)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/register/projectinfo.php	2011-02-28 03:36:23 UTC (rev 14583)
@@ -133,24 +133,24 @@
 
 <form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="post">
 <input type="hidden" name="form_key" value="<?php echo form_generate_key(); ?>"/>
-<?php echo _('<h3>1. Project full name</h3>You should start with specifying the name of your project. The "Full Name" is descriptive, and has no arbitrary restrictions (except a 40 character limit).<p/>Full Name:<br/>') ?>
+<?php echo _('<h2>1. Project full name</h2>You should start with specifying the name of your project. The "Full Name" is descriptive, and has no arbitrary restrictions (except a 40 character limit).<p/>Full Name:<br/>') ?>
 
 <input size="40" maxlength="40" type="text" name="full_name" value="<?php echo htmlspecialchars(stripslashes($full_name)); ?>"/>
 
-<?php printf(_('<h3>2. Project Purpose And Summarization</h3><strong> Please provide detailed, accurate description of your project and what %1$s resources and in which way you plan to use. This description will be the basis for the approval or rejection of your project\'s hosting on %1$s, and later, to ensure that you are using the services in the intended way. This description will not be used as a public description of your project. It must be written in English.</strong>'), forge_get_config ('forge_name'))?>
+<?php printf(_('<h2>2. Project Purpose And Summarization</h2><strong> Please provide detailed, accurate description of your project and what %1$s resources and in which way you plan to use. This description will be the basis for the approval or rejection of your project\'s hosting on %1$s, and later, to ensure that you are using the services in the intended way. This description will not be used as a public description of your project. It must be written in English.</strong>'), $GLOBALS['sys_name'])?>
 <p/>
 <textarea name="purpose" cols="70" rows="10">
-<?php echo htmlspecialchars(stripslashes($purpose)); ?>
+<?php echo htmlspecialchars($purpose); ?>
 </textarea>
 
-<?php echo _('<h3>3. Project Public Description</h3><p>This is the description of your project which will be shown on the Project Summary page, in search results, etc. It should not be as comprehensive and formal as Project Purpose description (step 2), so feel free to use concise and catchy wording. Maximum length is 255 chars.</p>')?>
+<?php echo _('<h2>3. Project Public Description</h2><p>This is the description of your project which will be shown on the Project Summary page, in search results, etc. It should not be as comprehensive and formal as Project Purpose description (step 2), so feel free to use concise and catchy wording. Maximum length is 255 chars.</p>')?>
 <br />
 <br />
 <textarea name="description" cols="70" rows="5">
 <?php echo htmlspecialchars(stripslashes($description)); ?>
 </textarea>
 
-<?php printf(_('<h3>4. Project Unix Name</h3>In addition to full project name, you will need to choose short,"Unix" name for your project.<p/> The "Unix Name" has several restrictions because it is used in so many places around the site. They are:<ul><li>Cannot match the unix name of any other project</li><li>Must be between 3 and 15 characters in length</li><li>Must be in lower case</li><li>Can only contain characters, numbers, and dashes</li><li>Must be a valid unix username</li><li>Cannot match one of our reserved domains</li><li>Unix name will never change for this project</li></ul><p/>Your unix name is important, however, because it will be used for many things, including:<ul><li>A web site at <tt>unixname.%1$s</tt></li><li>A CVS Repository root of <tt>/cvsroot/unixname</tt> at <tt>cvs.unixname.%1$s</tt></li><li>Shell access to <tt>unixname.%1$s</tt></li><li>Search engines throughout the site</li></ul><p/>Unix Name:<br/>'), $GLOBALS['sys_default_domain']) ?>
+<?php printf(_('<h2>4. Project Unix Name</h2>In addition to full project name, you will need to choose short,"Unix" name for your project.<p/> The "Unix Name" has several restrictions because it is used in so many places around the site. They are:<ul><li>Cannot match the unix name of any other project</li><li>Must be between 3 and 15 characters in length</li><li>Must be in lower case</li><li>Can only contain characters, numbers, and dashes</li><li>Must be a valid unix username</li><li>Cannot match one of our reserved domains</li><li>Unix name will never change for this project</li></ul><p/>Your unix name is important, however, because it will be used for many things, including:<ul><li>A web site at <tt>unixname.%1$s</tt></li><li>A CVS Repository root of <tt>/cvsroot/unixname</tt> at <tt>cvs.unixname.%1$s</tt></li><li>Shell access to <tt>unixname.%1$s</tt></li><li>Search engines throughout the site</li></ul><p/>Unix Name:<br/>'), $GLOBALS['sys_default_domain']) ?>
 
 <input type="text" maxlength="15" size="15" name="unix_name" value="<?php echo htmlspecialchars(stripslashes($unix_name)); ?>"/>
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/survey/admin/survey.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/survey/admin/survey.php	2011-02-28 03:36:12 UTC (rev 14582)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/survey/admin/survey.php	2011-02-28 03:36:23 UTC (rev 14583)
@@ -74,13 +74,15 @@
     form_release_key(getStringFromRequest("form_key"));
 } 
 
+$sh->header(array('title'=>_('Add a Survey')));
+
 echo ($sh->ShowAddSurveyForm($s));
 
-/* Show list of Servey */
+/* Show list of Survey */
 $sf = new SurveyFactory($g);
 $ss = & $sf->getSurveys();
 if (!$ss) {
-    echo (_('No Survey Question is found'));
+    echo '<div class="warning_msg">' . _('No Survey Question is found') . '</div>';
 } else {
     echo($sh->ShowSurveys($ss, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1));
 }

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/survey/include/SurveyHTML.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/survey/include/SurveyHTML.class.php	2011-02-28 03:36:12 UTC (rev 14582)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/survey/include/SurveyHTML.class.php	2011-02-28 03:36:23 UTC (rev 14583)
@@ -99,8 +99,8 @@
 		global $group_id;
 
 		/* Default is add */
-		$title = _('Add A Question');
-		$question_button = _('Add This Question.');
+		$title = _('Add a Question');
+		$question_button = _('Add this Question');
 
 		/* If we have a question object, it is a Modify */
 		if ($q && is_object($q) && !$q->isError() && $q->getID()) {
@@ -119,17 +119,17 @@
 			$question_type = '';
 		}
 
-		$ret = '<h2>'. $title. '</h2>';
+		$ret = '<h1>'. $title. '</h1>';
 		$ret.= $warning;
 		$ret.='<form action="'.getStringFromServer('PHP_SELF').'" method="post">';
-		$ret.='<input type="hidden" name="post" value="Y" />';
+		$ret.='<p><input type="hidden" name="post" value="Y" />';
 		$ret.='<input type="hidden" name="group_id" value="'.$group_id.'" />';
 		$ret.='<input type="hidden" name="question_id" value="'.$question_id.'" />';
 		$ret.='<input type="hidden" name="form_key" value="' . form_generate_key() . '" />';
 		$ret.=_('Question').':<br />';
-		$ret.='<input type="text" name="question" value="'.$question.'" size="60" maxlength="150" />';
-		$ret.='<p>'. _('Question type').':<br />';
-
+		$ret.='<input type="text" name="question" value="'.$question.'" size="60" maxlength="150" /></p>';
+		$ret.='<p>'. _('Question Type').':<br />';
+	
 		$result = db_query_params ('SELECT * FROM survey_question_types',
 					   array());
 		$ret.= html_build_select_box($result,'question_type',$question_type,false);
@@ -149,9 +149,18 @@
 		global $group_id;
 		global $survey_id;
 
+		/* If no question is available */
+		if (! $survey_id && ! count($s->getAddableQuestionInstances())) {
+			$ret = '<p>' . sprintf(_('Please %1$s create a question %2$s before creating a survey'),
+								  '<a href="'.util_make_url('/survey/admin/question.php?group_id='.$group_id).'">',
+             					  '</a>') .
+				   '</p>';
+			return $ret;
+		}
+		
 		/* Default is add */
-		$title = _('Add A Survey');
-		$survey_button = _('Add This Survey');
+		$title = _('Add a Survey');
+		$survey_button = _('Add this Survey');
 		$active = ' checked="checked" ';
 		$inactive = '';
 
@@ -193,7 +202,7 @@
 		$arr_to_del = & $s->getQuestionInstances();
 		
 		if (count($arr_to_add)>0) {
-			$ret.='<p><strong>'. _('Addable Questions').'</strong>';
+			$ret.='<h2>'. _('Addable Questions').'</h2>';
 			$title_arr[] = " ";
 			$title_arr[] = _('Questions');
 			$title_arr[] = " ";
@@ -233,7 +242,7 @@
 	
 		/* Deletable questions */
 		if (count($arr_to_del) > 0) {
-			$ret.='<p><strong>'. _('Questions in this Survey').'</strong>';
+			$ret.='<p><strong>'. _('Questions in this Survey').'</strong></p>';
 			$title_arr = array('Question ID', 'Question', 'Type', 'Order', 'Delete from this Survey');
 			$ret.=$GLOBALS['HTML']->listTableTop ($title_arr);
 		}
@@ -451,7 +460,7 @@
 		
 		$ret="";
 		if ($s->isUserVote(user_getid())) {
-			$ret.= '<span class="error">'. _('Warning - you are about to vote a second time on this survey.').'</span>';
+			$ret.= '<div class="error">'. _('Warning - you are about to vote a second time on this survey.').'</div>';
 		} 
 		$ret.= '<form action="/survey/survey_resp.php" method="post">'.
 			'<input type="hidden" name="group_id" value="'.$group_id.'" />'.



More information about the evolvis-commits mailing list