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, 6.1 has been updated
via a522da06ed5597a3443b78db0eee0eab0e046b83 (commit)
from 6085a0a729de3f9f4c5b1b95b81d3aa52a9f92a5 (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=a522da06ed5597a3443b78db0eee0eab0e046b83
commit a522da06ed5597a3443b78db0eee0eab0e046b83
Author: Franck Villaume <[email protected]>
Date: Sat Dec 16 10:35:19 2017 +0100
tracker workflow: adjust lisibility. enforce css class in thead. add
missing title section
diff --git a/src/common/tracker/views/form-workflow.php
b/src/common/tracker/views/form-workflow.php
index 3b2714b..af8ce0e 100644
--- a/src/common/tracker/views/form-workflow.php
+++ b/src/common/tracker/views/form-workflow.php
@@ -57,33 +57,27 @@ if (!$has_error) {
$elearray = $ath->getExtraFieldElements($field_id);
$states = $elearray;
-?>
+ echo $HTML->openForm(array('action' =>
'/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID(), 'method' =>
'post'));
+ echo html_e('input', array('type' => 'hidden', 'name' => 'field_id',
'value' => $field_id));
+ echo html_e('input', array('type' => 'hidden', 'name' => 'workflow',
'value' => 1));
- <h2><?php printf(_('Allowed initial values for the %s field'),
$field_name) ?></h2>
-<?php
-echo $HTML->openForm(array('action' =>
'/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID(), 'method' =>
'post'));
-?>
- <input type="hidden" name="field_id" value="<?php echo $field_id ?>" />
- <input type="hidden" name="workflow" value="1" />
-
-<?php
$from = _('From').' ';
$to = _('To').' ';
$init = _('Initial values').' ';
- $title_arr=array();
- $to_title_arr=array();
- $class_arr=array();
- $title_arr[]=_('From Value');
- $class_arr[]=('');
- $to_title_arr[]=('');
+ $title_arr = array();
+ $to_title_arr = array();
+ $class_arr = array();
+ $title_arr[] = '';
+ $class_arr[] = '';
+ $to_title_arr[] = '';
foreach ($elearray as $status) {
$title_arr[]='<div><span>'.$status['element_name'].'</span></div>';
$to_title_arr[]='<div><span>'.$to.$status['element_name'].'</span></div>';
$class_arr[]='rotate';
}
- echo $HTML->listTableTop($title_arr, array(), 'table-header-rotated',
'', $class_arr);
- echo "\n";
+ echo html_e('h2', array(), sprintf(_('Allowed initial values for the %s
field'), $field_name));
+ echo $HTML->listTableTop($title_arr, array(), 'table-header-rotated',
'', $class_arr, array(), array(), '');
// Special treatment for the initial value (in the Submit form).
echo '<tr id="initval"><th class="row-header"
style="text-align:left">'.$init.'</th>'."\n";
@@ -105,7 +99,8 @@ echo $HTML->openForm(array('action' =>
'/tracker/admin/?group_id='.$group_id.'&a
$totitle_arr[] = $title_arr[$i]? $to_title_arr[$i] : '';
$class_arr[]='rotate';
}
- echo $HTML->listTableTop($totitle_arr, array(),
'table-header-rotated','',$class_arr);
+ echo html_e('h2', array(), _('Allowed from value to value switch'));
+ echo $HTML->listTableTop($totitle_arr, array(),
'table-header-rotated','',$class_arr, array(), array(), '');
$i=1;
foreach ($elearray as $status) {
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index fdac7cc..6995006 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -464,9 +464,10 @@ abstract class Layout extends FFError {
* @param array $thClassArray specific class for th
column
* @param array $thTitleArray specific title for th
column
* @param array $thOtherAttrsArray optional other html
attributes for the th
+ * @param string $theadClass optional thead tr css
class. default is tableheading
* @return string the html code
*/
- function listTableTop($titleArray = array(), $linksArray = array(),
$class = '', $id = '', $thClassArray = array(), $thTitleArray = array(),
$thOtherAttrsArray = array()) {
+ function listTableTop($titleArray = array(), $linksArray = array(),
$class = '', $id = '', $thClassArray = array(), $thTitleArray = array(),
$thOtherAttrsArray = array(), $theadClass = 'tableheading') {
$attrs = array();
if ($class) {
$attrs['class'] = $class;
@@ -481,7 +482,7 @@ abstract class Layout extends FFError {
if (count($titleArray)) {
$ap = html_ap();
$return .= html_ao('thead');
- $return .= html_ao('tr', array('class' =>
'tableheading'));
+ $return .= html_ao('tr', array('class' => $theadClass));
$count = count($titleArray);
for ($i = 0; $i < $count; $i++) {
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/views/form-workflow.php | 31 +++++++++++++-----------------
src/www/include/Layout.class.php | 5 +++--
2 files changed, 16 insertions(+), 20 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
