[Fusionforge-commits] r10433 - in trunk/src: common/widget www/survey/admin www/survey/include www/themes/gforge-simple-theme

Alain Peyrat aljeux at libremir.placard.fr.eu.org
Wed Sep 8 20:23:07 CEST 2010


Author: aljeux
Date: 2010-09-08 20:23:07 +0200 (Wed, 08 Sep 2010)
New Revision: 10433

Modified:
   trunk/src/common/widget/Widget_ProjectDescription.class.php
   trunk/src/www/survey/admin/add_survey.php
   trunk/src/www/survey/admin/show_results_aggregate.php
   trunk/src/www/survey/include/SurveyHTML.class.php
   trunk/src/www/themes/gforge-simple-theme/Theme.class.php
Log:
Misc minor changes

Modified: trunk/src/common/widget/Widget_ProjectDescription.class.php
===================================================================
--- trunk/src/common/widget/Widget_ProjectDescription.class.php	2010-09-08 18:23:01 UTC (rev 10432)
+++ trunk/src/common/widget/Widget_ProjectDescription.class.php	2010-09-08 18:23:07 UTC (rev 10433)
@@ -40,7 +40,7 @@
         $hp = Codendi_HTMLPurifier::instance();
 
 	$pluginManager = plugin_manager_get_object();
-	if (! $pluginManager->PluginIsInstalled('blocks') || !plugin_hook ("blocks", "summary_description")) {
+		if (! $pluginManager->PluginIsInstalled('blocks') || !plugin_hook ("blocks", 'summary_description')) {
 		$project_description = $project->getDescription();
 		if ($project_description) {
 			// need to use a litteral version for content attribute since nl2br is for HTML

Modified: trunk/src/www/survey/admin/add_survey.php
===================================================================
--- trunk/src/www/survey/admin/add_survey.php	2010-09-08 18:23:01 UTC (rev 10432)
+++ trunk/src/www/survey/admin/add_survey.php	2010-09-08 18:23:07 UTC (rev 10433)
@@ -84,7 +84,7 @@
 <br /><input type="radio" name="is_active" value="1" checked="checked" /> <?php echo _('Yes'); ?>
 <br /><input type="radio" name="is_active" value="0" /> <?php echo _('No'); ?></p>
 <p>
-<input type="submit" name="SUBMIT" value="<?php echo _('Add This Survey'); ?>" /></p>
+<input type="submit" name="SUBMIT" value="<?php echo _('Add this Survey'); ?>" /></p>
 </form></p>
 
 <?php

Modified: trunk/src/www/survey/admin/show_results_aggregate.php
===================================================================
--- trunk/src/www/survey/admin/show_results_aggregate.php	2010-09-08 18:23:01 UTC (rev 10432)
+++ trunk/src/www/survey/admin/show_results_aggregate.php	2010-09-08 18:23:07 UTC (rev 10433)
@@ -161,7 +161,6 @@
 		}
 
 		// Select the count and average of responses to this question
-
 		$result2 = db_query_params ('SELECT count(*) AS count FROM survey_responses WHERE survey_id=$1 AND question_id=$2 AND group_id=$3 AND response IN (1,5)',
 					    array ($survey_id,
 						   $quest_array[$i],
@@ -174,7 +173,6 @@
 		}
 
 		// average
-
 		$result2 = db_query_params ('SELECT avg(response::int) AS avg FROM survey_responses WHERE survey_id=$1 AND question_id=$2 AND group_id=$3  and response != $4',
 					    array ($survey_id,
 						   $quest_array[$i],

Modified: trunk/src/www/survey/include/SurveyHTML.class.php
===================================================================
--- trunk/src/www/survey/include/SurveyHTML.class.php	2010-09-08 18:23:01 UTC (rev 10432)
+++ trunk/src/www/survey/include/SurveyHTML.class.php	2010-09-08 18:23:07 UTC (rev 10433)
@@ -42,12 +42,12 @@
 		
 		if ($project =& group_get_object($group_id)){
 			if (!$project->usesSurvey()) {
-				exit_error(_('Error'), _('This Group Has Turned Off Surveys.'));
+			exit_error(_('Error'), _('This Project Has Turned Off Surveys.'));
 			}
 			
 			site_project_header($params);
 			
-			if ($is_admin_page) {
+			if ($is_admin_page && $group_id) {
 				echo ($HTML->subMenu(
 					array(
 						_('Surveys'),

Modified: trunk/src/www/themes/gforge-simple-theme/Theme.class.php
===================================================================
--- trunk/src/www/themes/gforge-simple-theme/Theme.class.php	2010-09-08 18:23:01 UTC (rev 10432)
+++ trunk/src/www/themes/gforge-simple-theme/Theme.class.php	2010-09-08 18:23:07 UTC (rev 10433)
@@ -103,7 +103,7 @@
 		}
 		?>
 
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 	<!--
 
 	function admin_window(adminurl) {
@@ -921,7 +921,7 @@
 				//task mgr
 				if (db_result($res,$i,'use_pm')) {
 					$ret .= '
-				<option value="/pm/?group_id='.db_result($res,$i,'group_id').'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Task Manager</option>';
+				<option value="/pm/?group_id='.db_result($res,$i,'group_id').'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Tasks</option>';
 					if (trim(db_result($res,$i,'admin_flags')) =='A' || db_result($res,$i,'project_flags')) {
 						$ret .= '
 				<option value="/pm/admin/?group_id='.db_result($res,$i,'group_id').'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Admin</option>';




More information about the Fusionforge-commits mailing list