This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 4d0c78e4100962414d89b6c30ee9c9c86358e24f (commit)
from d270ad5a2eb2ac318ce57b0dd75292a6a87788ae (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=4d0c78e4100962414d89b6c30ee9c9c86358e24f
commit 4d0c78e4100962414d89b6c30ee9c9c86358e24f
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri Jun 3 15:11:29 2016 +0200
Use CSS; add <label>
diff --git a/src/www/news/admin/news_admin_utils.php
b/src/www/news/admin/news_admin_utils.php
index ded00a2..36bfdd8 100644
--- a/src/www/news/admin/news_admin_utils.php
+++ b/src/www/news/admin/news_admin_utils.php
@@ -43,7 +43,7 @@ function show_news_approve_form($qpa_pending, $qpa_rejected,
$qpa_approved, $for
.$row['id'].'" />';
}
echo date(_('Y-m-d'), $row['post_date']).'</td>
- <td width="45%">';
+ <td style="width: 45%">';
echo util_make_link($form_url.'?approve=1&id='.$row['id'],
$row['summary']);
echo '</td>
diff --git a/src/www/people/people_utils.php b/src/www/people/people_utils.php
index 0dee54f..dcbfcab 100644
--- a/src/www/people/people_utils.php
+++ b/src/www/people/people_utils.php
@@ -73,7 +73,7 @@ function
people_skill_year_box($name='skill_year_id',$checked='xzxz') {
//will be used many times potentially on a single page
$PEOPLE_SKILL_YEAR=db_query_params("SELECT * FROM
people_skill_year", array());
}
- return html_build_select_box ($PEOPLE_SKILL_YEAR,$name,$checked, false);
+ return html_build_select_box($PEOPLE_SKILL_YEAR,$name,$checked, false);
}
function people_job_status_box($name='status_id',$checked='xzxz') {
@@ -325,10 +325,10 @@ function people_edit_job_inventory($job_id,$group_id) {
<input type="hidden" name="job_inventory_id" value="'.
db_result($result,$i,'job_inventory_id') .'" />
<input type="hidden" name="job_id" value="'.
db_result($result,$i,'job_id') .'" />
<input type="hidden" name="group_id"
value="'.$group_id.'" />
- <td width="25%">'.
people_get_skill_name(db_result($result,$i,'skill_id')) . '</td>
- <td width="25%">'.
people_skill_level_box('skill_level_id',db_result($result,$i,'skill_level_id')).
'</td>
- <td width="25%">'.
people_skill_year_box('skill_year_id',db_result($result,$i,'skill_year_id')).
'</td>
- <td width="25%" nowrap="nowrap"><input
type="submit" name="update_job_inventory" value="'._('Update').'" />
+ <td style="width: 25%">'.
people_get_skill_name(db_result($result,$i,'skill_id')) . '</td>
+ <td style="width: 25%">'.
people_skill_level_box('skill_level_id',db_result($result,$i,'skill_level_id')).
'</td>
+ <td style="width: 25%">'.
people_skill_year_box('skill_year_id',db_result($result,$i,'skill_year_id')).
'</td>
+ <td style="width: 25%" nowrap="nowrap"><input
type="submit" name="update_job_inventory" value="'._('Update').'" />
<input type="submit"
name="delete_from_job_inventory" value="'._('Delete').'" /></td>
</form></tr>';
}
@@ -343,10 +343,10 @@ function people_edit_job_inventory($job_id,$group_id) {
<form action="'.getStringFromServer('PHP_SELF').'" method="post">
<input type="hidden" name="job_id" value="'. $job_id .'" />
<input type="hidden" name="group_id" value="'.$group_id.'" />
- <td width="25%">'. people_skill_box('skill_id'). '</td>
- <td width="25%">'. people_skill_level_box('skill_level_id').
'</td>
- <td width="25%">'. people_skill_year_box('skill_year_id').
'</td>
- <td width="25%" nowrap="nowrap"><input type="submit"
name="add_to_job_inventory" value="'._('Add Skill').'" /></td>
+ <td style="width: 25%">'. people_skill_box('skill_id'). '</td>
+ <td style="width: 25%">'.
people_skill_level_box('skill_level_id'). '</td>
+ <td style="width: 25%">'.
people_skill_year_box('skill_year_id'). '</td>
+ <td style="width: 25%" nowrap="nowrap"><input type="submit"
name="add_to_job_inventory" value="'._('Add Skill').'" /></td>
</form></tr>';
echo $HTML->listTableBottom();
diff --git a/src/www/search/include/renderers/ForumHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/ForumHtmlSearchRenderer.class.php
index 7a7bf70..ea69a8e 100644
--- a/src/www/search/include/renderers/ForumHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/ForumHtmlSearchRenderer.class.php
@@ -73,8 +73,8 @@ class ForumHtmlSearchRenderer extends HtmlGroupSearchRenderer
{
$return .= '<tr '.
$GLOBALS['HTML']->boxGetAltRowStyle($i) .'><td class="halfwidth"><a
href="'.util_make_url ('/forum/message.php?msg_id=' . $row['msg_id']).'">'
. html_image('ic/msg.png', '10', '12')
. ' '.$row['subject'].'</a></td>'
- . '<td width="30%">'.$row['realname'].'</td>'
- . '<td width="20%">'.date($dateFormat,
$row['post_date']).'</td></tr>';
+ . '<td style="width:
30%">'.$row['realname'].'</td>'
+ . '<td style="width: 20%">'.date($dateFormat,
$row['post_date']).'</td></tr>';
$i++;
}
return $return;
diff --git a/src/www/search/include/renderers/FrsHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/FrsHtmlSearchRenderer.class.php
index 4415c69..1d849bd 100644
--- a/src/www/search/include/renderers/FrsHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/FrsHtmlSearchRenderer.class.php
@@ -73,7 +73,7 @@ class FrsHtmlSearchRenderer extends HtmlGroupSearchRenderer {
$rowColor = 0;
}
$return .= '<tr '.
$GLOBALS['HTML']->boxGetAltRowStyle($rowColor) .'>'
- . '<td width="5%"> </td>'
+ . '<td style="width: 5%"> </td>'
. '<td>'.util_make_link
('/frs/?view=shownotes&group_id='.$group_id.'&release_id='.$row['release_id'],$row['release_name']).'</td>'
. '<td style="width:
15%">'.$row['realname'].'</td>'
. '<td style="width:
15%">'.relative_date($row['release_date']).'</td></tr>';
diff --git a/src/www/search/include/renderers/HtmlSearchRenderer.class.php
b/src/www/search/include/renderers/HtmlSearchRenderer.class.php
index bc0ecb6..cc6860b 100644
--- a/src/www/search/include/renderers/HtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/HtmlSearchRenderer.class.php
@@ -127,7 +127,7 @@ class HtmlSearchRenderer extends SearchRenderer {
$searchQuery =& $this->searchQuery;
$html = '<br />';
- $html .= '<table class="tablecontent" width="100%"
cellpadding="5">';
+ $html .= '<table class="tablecontent fullwidth"
cellpadding="5">';
$html .= '<tr>';
$html .= '<td>';
if ($searchQuery->getOffset() != 0) {
diff --git
a/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php
index a392027..7cf4f09 100644
--- a/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php
@@ -67,8 +67,8 @@ class PeopleHtmlSearchRenderer extends HtmlSearchRenderer {
foreach ($result as $row) {
$i++;
$return .= '<tr '.
$GLOBALS['HTML']->boxGetAltRowStyle($i) .'>'.
- '<td width="40%"><a href="'.util_make_url_u
($row['user_name'],$row['user_id']).'">'.html_image('ic/msg.png', '10', '12').'
'.$row['user_name'].'</a></td>'.
- '<td width="60%">'.$row['realname'].'</td>'.
+ '<td style="width: 40%"><a
href="'.util_make_url_u
($row['user_name'],$row['user_id']).'">'.html_image('ic/msg.png', '10', '12').'
'.$row['user_name'].'</a></td>'.
+ '<td style="width:
60%">'.$row['realname'].'</td>'.
'</tr>';
}
return $return;
diff --git
a/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php
index e97d975..bf7ab2d 100644
--- a/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php
@@ -74,10 +74,10 @@ class ProjectHtmlSearchRenderer extends HtmlSearchRenderer {
$what = 'projects';
}
$return .= '<tr
'.$GLOBALS['HTML']->boxGetAltRowStyle($i).'>'
- .'<td width="30%"><a
href="'.util_make_url('/'.$what.'/'.$row['unix_group_name'].'/').'">'
+ .'<td style="width: 30%"><a
href="'.util_make_url('/'.$what.'/'.$row['unix_group_name'].'/').'">'
.html_image('ic/msg.png', '10', '12')
.'
'.$this->highlightTargetWords($row['group_name']).'</a></td>'
- .'<td
width="70%">'.$this->highlightTargetWords($row['short_description']).'</td></tr>';
+ .'<td style="width:
70%">'.$this->highlightTargetWords($row['short_description']).'</td></tr>';
}
return $return;
diff --git a/src/www/search/include/renderers/TasksHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/TasksHtmlSearchRenderer.class.php
index 482c753..8de398d 100644
--- a/src/www/search/include/renderers/TasksHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/TasksHtmlSearchRenderer.class.php
@@ -75,7 +75,7 @@ class TasksHtmlSearchRenderer extends HtmlGroupSearchRenderer
{
$rowColor = 0;
}
$return .= '<tr '.
$GLOBALS['HTML']->boxGetAltRowStyle($rowColor) .'>'
- . ' <td width="5%"> </td>'
+ . ' <td style="width:
5%"> </td>'
. '
<td>'.$row['project_task_id'].'</td>'
. ' <td>'
. '<a
href="'.util_make_url ('/pm/task.php?func=detailtask&project_task_id=' .
$row['project_task_id'].'&group_id='.$this->groupId .
'&group_project_id='.$row['group_project_id']).'">'
diff --git
a/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php
index 50ce423..ca1b6ce 100644
--- a/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php
@@ -75,7 +75,7 @@ class TrackersHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
$rowColor = 0;
}
$return .= '<tr '.
$GLOBALS['HTML']->boxGetAltRowStyle($rowColor) .'>'
- . '<td width="5%"> </td>'
+ . '<td style="width:
5%"> </td>'
.
'<td>'.$row['artifact_id'].'</td>'
. '<td>'
. '<a
href="'.util_make_url
('/tracker/?func=detail&group_id='.$this->groupId.'&aid='.$row['artifact_id']
. '&atid='.$row['group_artifact_id']).'">'
diff --git a/src/www/survey/include/SurveyHTML.class.php
b/src/www/survey/include/SurveyHTML.class.php
index 7badb52..fa1705b 100644
--- a/src/www/survey/include/SurveyHTML.class.php
+++ b/src/www/survey/include/SurveyHTML.class.php
@@ -133,9 +133,9 @@ class SurveyHTML extends FFError {
$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 required="required" type="text" name="question"
value="'.$question.'" size="60" maxlength="150" /></p>';
- $ret.='<p>'. _('Question Type')._(':').'<br />';
+ $ret.='<label
for="question">'._('Question')._(':').'</label>'.'<br />';
+ $ret.='<input id="question" required="required" type="text"
name="question" value="'.$question.'" size="60" maxlength="150" /></p>';
+ $ret.='<p><label for="question_type">'. _('Question
Type')._(':').'</label><br />';
$result = db_query_params ('SELECT * FROM
survey_question_types', array());
$ret.=
html_build_select_box($result,'question_type',$question_type,false);
@@ -194,12 +194,14 @@ class SurveyHTML extends FFError {
$ret.='<input type="hidden" name="survey_id"
value="'.$survey_id.'" />';
$ret.='<input type="hidden" name="survey_questions"
value="'.$survey_questions.'" />';
$ret.='<input type="hidden" name="form_key" value="' .
form_generate_key() . '" />';
+ $ret.='<label for="survey_title">';
$ret.='<strong>'._('Survey
Title').utils_requiredField()._(':').'</strong>';
- $ret.= '<input required="required" type="text"
name="survey_title" value="'.$survey_title.'" size="60" maxlength="150" /></p>';
+ $ret.='</label>';
+ $ret.= '<input required="required" type="text"
name="survey_title" id="survey_title" value="'.$survey_title.'" size="60"
maxlength="150" /></p>';
$ret.='<p><strong>'. _('Is Active?').'</strong>';
- $ret.='<br /><input type="radio" name="is_active" value="1"'
.$active. '/>'._('Yes');
- $ret.='<br /><input type="radio" name="is_active" value="0"'
.$inactive. '/>'._('No');
+ $ret.='<br /><input type="radio" name="is_active"
id="is_active_yes" value="1"' .$active. '/> <label
for="is_active_yes">'._('Yes').'</label>';
+ $ret.='<br /><input type="radio" name="is_active"
id="is_active_no" value="0"' .$inactive. '/> <label
for="is_active_no">'._('No').'</label>';
$ret.='</p>';
$arr_to_add = & $s->getAddableQuestionInstances();
@@ -719,10 +721,10 @@ class SurveyHTML extends FFError {
* @return string
*/
function _makeBar($name, $percent, $color) {
- $ret = '<tr><td width="30%">'.$name.'</td><td>';
- $ret.= '<table width="'.$percent.'%"><tr>';
+ $ret = '<tr><td style=width: 30%">'.$name.'</td><td>';
+ $ret.= '<table style=width: '.$percent.'%"><tr>';
if ($percent) {
- $ret.='<td width="90%"
bgcolor="'.$color.'"> </td>';
+ $ret.='<td style=width: 90%"
bgcolor="'.$color.'"> </td>';
}
$ret.= '<td>'.sprintf("%.2f",
$percent).'%</td></tr></table></td></tr>'."\n";
-----------------------------------------------------------------------
Summary of changes:
src/www/news/admin/news_admin_utils.php | 2 +-
src/www/people/people_utils.php | 18 +++++++++---------
.../renderers/ForumHtmlSearchRenderer.class.php | 4 ++--
.../renderers/FrsHtmlSearchRenderer.class.php | 2 +-
.../include/renderers/HtmlSearchRenderer.class.php | 2 +-
.../renderers/PeopleHtmlSearchRenderer.class.php | 4 ++--
.../renderers/ProjectHtmlSearchRenderer.class.php | 4 ++--
.../renderers/TasksHtmlSearchRenderer.class.php | 2 +-
.../renderers/TrackersHtmlSearchRenderer.class.php | 2 +-
src/www/survey/include/SurveyHTML.class.php | 20 +++++++++++---------
10 files changed, 31 insertions(+), 29 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
