[evolvis-commits] r15702: Misc minor changes
mirabilos at evolvis.org
mirabilos at evolvis.org
Tue Mar 1 00:25:23 CET 2011
Author: mirabilos
Date: 2011-03-01 00:25:23 +0100 (Tue, 01 Mar 2011)
New Revision: 15702
Modified:
trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_ProjectDescription.class.php
trunk/gforge_base/evolvisforge-5.1/src/www/survey/admin/add_survey.php
trunk/gforge_base/evolvisforge-5.1/src/www/survey/admin/show_results_aggregate.php
trunk/gforge_base/evolvisforge-5.1/src/www/survey/include/SurveyHTML.class.php
trunk/gforge_base/evolvisforge-5.1/src/www/themes/gforge-simple-theme/Theme.class.php
Log:
Misc minor changes
Modified: trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_ProjectDescription.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_ProjectDescription.class.php 2011-02-28 23:25:21 UTC (rev 15701)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_ProjectDescription.class.php 2011-02-28 23:25:23 UTC (rev 15702)
@@ -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/gforge_base/evolvisforge-5.1/src/www/survey/admin/add_survey.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/survey/admin/add_survey.php 2011-02-28 23:25:21 UTC (rev 15701)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/survey/admin/add_survey.php 2011-02-28 23:25:23 UTC (rev 15702)
@@ -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/gforge_base/evolvisforge-5.1/src/www/survey/admin/show_results_aggregate.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/survey/admin/show_results_aggregate.php 2011-02-28 23:25:21 UTC (rev 15701)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/survey/admin/show_results_aggregate.php 2011-02-28 23:25:23 UTC (rev 15702)
@@ -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/gforge_base/evolvisforge-5.1/src/www/survey/include/SurveyHTML.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/survey/include/SurveyHTML.class.php 2011-02-28 23:25:21 UTC (rev 15701)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/survey/include/SurveyHTML.class.php 2011-02-28 23:25:23 UTC (rev 15702)
@@ -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/gforge_base/evolvisforge-5.1/src/www/themes/gforge-simple-theme/Theme.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/gforge-simple-theme/Theme.class.php 2011-02-28 23:25:21 UTC (rev 15701)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/gforge-simple-theme/Theme.class.php 2011-02-28 23:25:23 UTC (rev 15702)
@@ -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').'"> Task Manager</option>';
+ <option value="/pm/?group_id='.db_result($res,$i,'group_id').'"> 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').'"> Admin</option>';
More information about the evolvis-commits
mailing list