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 ab50b0b5e4910db1da1016a66390342d52db24e3 (commit)
via ee9491db26ed3cd01c50f51da92df5520945866d (commit)
via f9b645c2e05a22b06132dc613282fccb7676d888 (commit)
from a725804a2385dfdee11cafee77faf69d0fb98719 (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=ab50b0b5e4910db1da1016a66390342d52db24e3
commit ab50b0b5e4910db1da1016a66390342d52db24e3
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri Jul 1 14:51:36 2016 +0200
html_image: width and height are integers, not strings
diff --git a/src/common/docman/views/listtrashfile.php
b/src/common/docman/views/listtrashfile.php
index 31d362a..2e2309a 100644
--- a/src/common/docman/views/listtrashfile.php
+++ b/src/common/docman/views/listtrashfile.php
@@ -159,11 +159,11 @@ if (isset($nested_docs[$dirid]) &&
is_array($nested_docs[$dirid])) {
$cells[][] = html_e('input', array('type' => 'checkbox',
'class' => 'checkeddocidactive', 'value' => $d->getID(), 'title' => _('Select /
Deselect this document for massaction'), 'onClick' =>
'controllerListFile.checkgeneral("active")'));
switch ($d->getFileType()) {
case 'URL': {
- $cells[][] = util_make_link($d->getFileName(),
html_image($d->getFileTypeImage(), '22', '22', array('alt' =>
$d->getFileType())), array('title' => _('Visit this link')));
+ $cells[][] = util_make_link($d->getFileName(),
html_image($d->getFileTypeImage(), 22, 22, array('alt' => $d->getFileType())),
array('title' => _('Visit this link')));
break;
}
default: {
- $cells[][] =
util_make_link('/docman/view.php/'.$group_id.'/'.$d->getID().'/'.urlencode($d->getFileName()),
html_image($d->getFileTypeImage(), '20', '20', array('alt' =>
$d->getFileType())), array('title' => _('View this document')));
+ $cells[][] =
util_make_link('/docman/view.php/'.$group_id.'/'.$d->getID().'/'.urlencode($d->getFileName()),
html_image($d->getFileTypeImage(), 20, 20, array('alt' => $d->getFileType())),
array('title' => _('View this document')));
}
}
$nextcell ='';
diff --git a/src/common/docman/views/pendingfiles.php
b/src/common/docman/views/pendingfiles.php
index 15e2a09..5f3d652 100644
--- a/src/common/docman/views/pendingfiles.php
+++ b/src/common/docman/views/pendingfiles.php
@@ -71,11 +71,11 @@ jQuery(document).ready(function() {
$cells[][] = html_e('input', array('type' =>
'checkbox', 'value' => $d->getID(), 'class' => 'checkeddocidpending', 'title'
=> _('Select / Deselect this document for massaction'), 'onClick' =>
'controllerListPending.checkgeneral("pending")'));
switch ($d->getFileType()) {
case 'URL': {
- $cells[][] =
util_make_link($d->getFileName(), html_image($d->getFileTypeImage(), '22',
'22', array('alt'=>$d->getFileType())), array('title' => _('Visit this link')),
true);
+ $cells[][] =
util_make_link($d->getFileName(), html_image($d->getFileTypeImage(), 22, 22,
array('alt'=>$d->getFileType())), array('title' => _('Visit this link')), true);
break;
}
default: {
- $cells[][] =
util_make_link('/docman/view.php/'.$g->getID().'/'.$d->getID().'/'.urlencode($d->getFileName()),
html_image($d->getFileTypeImage(), '20', '20',
array('alt'=>$d->getFileType())), array('title' => _('View this document')));
+ $cells[][] =
util_make_link('/docman/view.php/'.$g->getID().'/'.$d->getID().'/'.urlencode($d->getFileName()),
html_image($d->getFileTypeImage(), 20, 20, array('alt'=>$d->getFileType())),
array('title' => _('View this document')));
}
}
$nextcell = '';
diff --git a/src/common/forum/AttachManager.class.php
b/src/common/forum/AttachManager.class.php
index 9a0f498..a1f3f00 100644
--- a/src/common/forum/AttachManager.class.php
+++ b/src/common/forum/AttachManager.class.php
@@ -134,7 +134,7 @@ class AttachManager extends FFError {
}
if ($attachid) {
$attach = "<br/>
- <a
href=\"javascript:manageattachments('".util_make_url("/forum/attachment.php?attachid=$attachid&group_id=$group_id&forum_id=$forum_id$pend")."','no');\">"
. html_image('ic/cfolder15.png',"15","13") . db_result($res,0,'filename') .
"</a> (" . db_result($res,0,'counter') . ") downloads";
+ <a
href=\"javascript:manageattachments('".util_make_url("/forum/attachment.php?attachid=$attachid&group_id=$group_id&forum_id=$forum_id$pend")."','no');\">"
. html_image('ic/cfolder15.png', 15, 13) . db_result($res,0,'filename') .
"</a> (" . db_result($res,0,'counter') . ") downloads";
$attach_userid = db_result($res,0,'userid');
$f = $msg->getForum();
@@ -144,8 +144,8 @@ class AttachManager extends FFError {
if ( ((user_getid() == $attach_userid)
|| (forge_check_perm ('forum_admin',
$f->Group->getID())))
&& (!$msg->isPending()) ) { //only permit
the user who created the attach to delete it, or an admin
- $attach .= " <a
href=\"javascript:manageattachments('/forum/attachment.php?attachid=$attachid&group_id=$group_id&forum_id=$forum_id&msg_id=$msg_id&edit=yes','no');\">"
. "<font size=\"-3\">" .
html_image('ic/forum_edit.gif','37','15',array('alt'=>_("Edit"))) .
"</font></a>";
- $attach .= " <a
href=\"javascript:manageattachments('/forum/attachment.php?attachid=$attachid&group_id=$group_id&forum_id=$forum_id&delete=yes','yes');\">"
. "<font size=\"-3\">" .
html_image('ic/forum_delete.gif','16','18',array('alt'=>_("Delete"))) .
"</font></a>";
+ $attach .= " <a
href=\"javascript:manageattachments('/forum/attachment.php?attachid=$attachid&group_id=$group_id&forum_id=$forum_id&msg_id=$msg_id&edit=yes','no');\">"
. "<font size=\"-3\">" . html_image('ic/forum_edit.gif', 37, 15,
array('alt'=>_("Edit"))) . "</font></a>";
+ $attach .= " <a
href=\"javascript:manageattachments('/forum/attachment.php?attachid=$attachid&group_id=$group_id&forum_id=$forum_id&delete=yes','yes');\">"
. "<font size=\"-3\">" . html_image('ic/forum_delete.gif', 16, 18,
array('alt'=>_("Delete"))) . "</font></a>";
}
}
} else {
@@ -154,12 +154,12 @@ class AttachManager extends FFError {
if (!$f || !is_object($f)) {
exit_error(_('Could Not Get Forum
Object'),'forums');
} else {
-// $attach =
html_image('ic/cfolder15.png',"15","13") . _('No attachment found');
+// $attach = html_image('ic/cfolder15.png', 15,
13) . _('No attachment found');
$attach = '';
if ( ((user_getid() == $msg->getPosterID())
|| (forge_check_perm ('forum_admin',
$f->Group->getID())))
&& (!$msg->isPending()) ) { //only permit
the user who created the message to insert an attach
- $attach .= " <a
href=\"javascript:manageattachments('".util_make_url
("/forum/attachment.php?attachid=0&group_id=$group_id&forum_id=$forum_id&msg_id=$msg_id&edit=yes")."','no');\">"
. "<font size=\"-3\">" .
html_image('ic/forum_add.gif','37','15',array('alt'=>_("Add"))) . "</font></a>";
+ $attach .= " <a
href=\"javascript:manageattachments('".util_make_url
("/forum/attachment.php?attachid=0&group_id=$group_id&forum_id=$forum_id&msg_id=$msg_id&edit=yes")."','no');\">"
. "<font size=\"-3\">" . html_image('ic/forum_add.gif', 37, 15,
array('alt'=>_("Add"))) . "</font></a>";
}
}
}
diff --git a/src/common/forum/ForumAdmin.class.php
b/src/common/forum/ForumAdmin.class.php
index a7d9808..f4e2e7a 100644
--- a/src/common/forum/ForumAdmin.class.php
+++ b/src/common/forum/ForumAdmin.class.php
@@ -56,15 +56,15 @@ class ForumAdmin extends FFError {
*/
function
PrintAdminMessageOptions($msg_id,$group_id,$thread_id=0,$forum_id=0,$return_to_message=0)
{
- $return =
util_make_link('/forum/admin/?movethread='.$thread_id.'&msg_id='.$msg_id.'&group_id='.$group_id.'&forum_id='.$forum_id.'&return_to_message='.$return_to_message,
html_image('ic/forum_move.gif', '37', '15', array('alt' => _('Move Thread'))));
+ $return =
util_make_link('/forum/admin/?movethread='.$thread_id.'&msg_id='.$msg_id.'&group_id='.$group_id.'&forum_id='.$forum_id.'&return_to_message='.$return_to_message,
html_image('ic/forum_move.gif', 37, 15, array('alt' => _('Move Thread'))));
// Following code (if ...) is to keep old implementation but
need to be cleaned
if ($return_to_message) {
$thread_id = 0;
}
- $return .=
util_make_link('/forum/admin/?editmsg='.$msg_id.'&group_id='.$group_id.'&thread_id='.$thread_id.'&forum_id='.$forum_id,
html_image('ic/forum_edit.gif', '37', '15', array('alt' => _("Edit"))));
- $return .=
util_make_link('/forum/admin/?deletemsg='.$msg_id.'&group_id='.$group_id.'&thread_id='.$thread_id.'&forum_id='.$forum_id,
html_image('ic/forum_delete.gif', '16', '18', array('alt'=>_("Delete"))));
+ $return .=
util_make_link('/forum/admin/?editmsg='.$msg_id.'&group_id='.$group_id.'&thread_id='.$thread_id.'&forum_id='.$forum_id,
html_image('ic/forum_edit.gif', 37, 15, array('alt' => _("Edit"))));
+ $return .=
util_make_link('/forum/admin/?deletemsg='.$msg_id.'&group_id='.$group_id.'&thread_id='.$thread_id.'&forum_id='.$forum_id,
html_image('ic/forum_delete.gif', 16, 18, array('alt'=>_("Delete"))));
// $return .= "<br />";
return $return;
}
diff --git a/src/common/forum/ForumHTML.class.php
b/src/common/forum/ForumHTML.class.php
index 194229e..f027897 100644
--- a/src/common/forum/ForumHTML.class.php
+++ b/src/common/forum/ForumHTML.class.php
@@ -150,7 +150,7 @@ function forum_header($params) {
if ($f && $forum_id) {
echo util_make_link
('/forum/new.php?forum_id='.$forum_id.'&group_id='.$group_id,
-
html_image('ic/write16w.png','20','20',array('alt'=>_('Start New Thread'))) .'
'.
+ html_image('ic/write16w.png', 20, 20,
array('alt'=>_('Start New Thread'))) .' '.
_('Start New Thread'));
}
}
diff --git a/src/common/include/Plugin.class.php
b/src/common/include/Plugin.class.php
index 5a0b6c9..7cb30f4 100644
--- a/src/common/include/Plugin.class.php
+++ b/src/common/include/Plugin.class.php
@@ -276,7 +276,7 @@ class Plugin extends FFError {
printf(_("Use %s"), $this->text);
echo "</strong>";
echo " ";
- echo html_image($imgStatus, '16',
'16',array('alt'=>$title, 'title'=>$title));
+ echo html_image($imgStatus, 16, 16,
array('alt'=>$title, 'title'=>$title));
echo "</td>\n";
echo "</tr>\n";
}
@@ -324,7 +324,7 @@ class Plugin extends FFError {
}
echo " />\n";
printf(_("Use %s"), $this->text);
- echo html_image($imgStatus, '16',
'16',array('alt'=>$title, 'title'=>$title));
+ echo html_image($imgStatus, 16, 16,
array('alt'=>$title, 'title'=>$title));
echo '</div>';
}
}
diff --git a/src/common/tracker/actions/detail.php
b/src/common/tracker/actions/detail.php
index d325b44..555dda5 100644
--- a/src/common/tracker/actions/detail.php
+++ b/src/common/tracker/actions/detail.php
@@ -73,7 +73,7 @@ if (session_loggedin()) { ?>
$key = 'pointer_up';
$txt = _('Cast Vote');
}
- echo
util_make_link('/tracker/?group_id='.$group_id.'&aid='.$ah->getID().'&atid='.$ath->getID().'&func='.$key,
html_image('ic/'.$key.'.png', 16, 16, array('border' => 0)), array('id' =>
'tracker-vote', 'alt' => $txt, 'title' =>
util_html_secure(html_get_tooltip_description('vote'))));
+ echo
util_make_link('/tracker/?group_id='.$group_id.'&aid='.$ah->getID().'&atid='.$ath->getID().'&func='.$key,
html_image('ic/'.$key.'.png', 16, 16), array('id' => 'tracker-vote', 'alt' =>
$txt, 'title' => util_html_secure(html_get_tooltip_description('vote'))));
}
?>
</td>
diff --git a/src/common/tracker/actions/ind.php
b/src/common/tracker/actions/ind.php
index 6383082..2fa4d95 100644
--- a/src/common/tracker/actions/ind.php
+++ b/src/common/tracker/actions/ind.php
@@ -62,7 +62,7 @@ if (!$at_arr || count($at_arr) < 1) {
} else {
$cells = array();
$cells[][] =
util_make_link('/tracker/?atid='.$at_arr[$j]->getID().'&group_id='.$group_id.'&func=browse',
-
html_image("ic/tracker20w.png","20","20").' '.$at_arr[$j]->getName());
+
html_image("ic/tracker20w.png", 20, 20).' '.$at_arr[$j]->getName());
$cells[][] = $at_arr[$j]->getDescription();
$cells[] = array((int) $at_arr[$j]->getOpenCount(),
'class' => 'align-center');
$cells[] = array((int) $at_arr[$j]->getTotalCount(),
'class' => 'align-center');
diff --git a/src/common/tracker/actions/mod-limited.php
b/src/common/tracker/actions/mod-limited.php
index 01e8007..bb5ced2 100644
--- a/src/common/tracker/actions/mod-limited.php
+++ b/src/common/tracker/actions/mod-limited.php
@@ -83,13 +83,13 @@ if (session_loggedin()) {
$key = 'pointer_up';
$txt = _('Cast Vote');
}
- echo
util_make_link('/tracker/?group_id='.$group_id.'&aid='.$ah->getID().'&atid='.$ath->getID().'&func='.$key,
html_image('ic/'.$key.'.png', 16, 16, array('border' => 0)), array('id' =>
'tracker-vote', 'alt' => $txt, 'title' =>
util_html_secure(html_get_tooltip_description('vote'))));
+ echo
util_make_link('/tracker/?group_id='.$group_id.'&aid='.$ah->getID().'&atid='.$ath->getID().'&func='.$key,
html_image('ic/'.$key.'.png', 16, 16), array('id' => 'tracker-vote', 'alt' =>
$txt, 'title' => util_html_secure(html_get_tooltip_description('vote'))));
}
?>
</td>
<td><?php
if ($group->usesPM()) {
- echo
util_make_link('/tracker/?func=taskmgr&group_id='.$group_id.'&atid='.$atid.'&aid='.$aid,
html_image('ic/taskman20w.png','20','20').html_e('strong', array(), _('Build
Task Relation')));
+ echo
util_make_link('/tracker/?func=taskmgr&group_id='.$group_id.'&atid='.$atid.'&aid='.$aid,
html_image('ic/taskman20w.png', 20, 20).html_e('strong', array(), _('Build
Task Relation')));
}
?>
</td>
diff --git a/src/common/tracker/actions/mod.php
b/src/common/tracker/actions/mod.php
index 49cbe7f..ca410f2 100644
--- a/src/common/tracker/actions/mod.php
+++ b/src/common/tracker/actions/mod.php
@@ -72,7 +72,7 @@ if (session_loggedin()) {
$img="mail16w.png";
$text=_('Monitor');
}
- echo
util_make_link('/tracker/?group_id='.$group_id.'&artifact_id='.$ah->getID().'&atid='.$ath->getID().'&func=monitor',
html_e('strong', array(), html_image('ic/'.$img.'','20','20').' '.$text),
array('id' => 'tracker-monitor', 'title' =>
util_html_secure(html_get_tooltip_description('monitor'))));
+ echo
util_make_link('/tracker/?group_id='.$group_id.'&artifact_id='.$ah->getID().'&atid='.$ath->getID().'&func=monitor',
html_e('strong', array(), html_image('ic/'.$img, 20, 20).' '.$text),
array('id' => 'tracker-monitor', 'title' =>
util_html_secure(html_get_tooltip_description('monitor'))));
?>
</td>
<td><?php
@@ -86,19 +86,19 @@ if (session_loggedin()) {
$key = 'pointer_up';
$txt = _('Cast Vote');
}
- echo
util_make_link('/tracker/?group_id='.$group_id.'&aid='.$ah->getID().'&atid='.$ath->getID().'&func='.$key,
html_image('ic/'.$key.'.png', 16, 16, array('border' => 0)), array('id' =>
'tracker-vote', 'alt' => $txt, 'title' =>
util_html_secure(html_get_tooltip_description('vote'))));
+ echo
util_make_link('/tracker/?group_id='.$group_id.'&aid='.$ah->getID().'&atid='.$ath->getID().'&func='.$key,
html_image('ic/'.$key.'.png', 16, 16), array('id' => 'tracker-vote', 'alt' =>
$txt, 'title' => util_html_secure(html_get_tooltip_description('vote'))));
}
?>
</td>
<td><?php
if ($group->usesPM()) {
- echo
util_make_link('/tracker/?func=taskmgr&group_id='.$group_id.'&atid='.$atid.'&aid='.$aid,
html_image('ic/taskman20w.png','20','20').'<strong>'._('Build Task
Relation').'</strong>');
+ echo
util_make_link('/tracker/?func=taskmgr&group_id='.$group_id.'&atid='.$atid.'&aid='.$aid,
html_image('ic/taskman20w.png', 20, 20).'<strong>'._('Build Task
Relation').'</strong>');
}
?>
</td>
<td>
<?php
- echo
util_make_link('/tracker/?func=deleteartifact&aid='.$aid.'&group_id='.$group_id.'&atid='.$atid,
html_image('ic/trash.png','16','16').html_e('strong', array(), _('Delete')));
+ echo
util_make_link('/tracker/?func=deleteartifact&aid='.$aid.'&group_id='.$group_id.'&atid='.$atid,
html_image('ic/trash.png', 16, 16).html_e('strong', array(), _('Delete')));
?>
</td>
<td>
diff --git a/src/common/tracker/include/ArtifactHtml.class.php
b/src/common/tracker/include/ArtifactHtml.class.php
index f76e1ea..d407169 100644
--- a/src/common/tracker/include/ArtifactHtml.class.php
+++ b/src/common/tracker/include/ArtifactHtml.class.php
@@ -44,7 +44,7 @@ class ArtifactHtml extends Artifact {
if ($editable === true) {
$title_arr[] = '<div style="width:100%;">' .
'<div style="float:left">' . _('Detailed
description')._(':') . '</div>' .
- '<div>' .
html_image('ic/forum_edit.gif','37','15',array('title'=>_('Edit this message'),
'alt'=>_('Edit this message'), 'class' => 'mini_buttons tip-ne',
'onclick'=>"switch2edit(this, 'showdescription', 'editdescription')")) .
'</div>' .
+ '<div>' . html_image('ic/forum_edit.gif', 37,
15, array('title'=>_('Edit this message'), 'alt'=>_('Edit this message'),
'class' => 'mini_buttons tip-ne', 'onclick'=>"switch2edit(this,
'showdescription', 'editdescription')")) . '</div>' .
'</div>';
} else {
$title_arr[] = _('Detailed description');
diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php
b/src/common/tracker/include/ArtifactTypeHtml.class.php
index 001084b..8ef2679 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -326,7 +326,7 @@ class ArtifactTypeHtml extends ArtifactType {
$str =
$this->renderRelationField($efarr[$i]['extra_field_id'],$selected[$efarr[$i]['extra_field_id']],$efarr[$i]['attribute1'],$efarr[$i]['attribute2'],
$attrs);
if ($mode == 'UPDATE') {
- $post_name =
html_image('ic/forum_edit.gif','37','15',array('title'=>"Click to edit",
'alt'=>"Click to edit", 'onclick'=>"switch2edit(this, 'show$i', 'edit$i')"));
+ $post_name =
html_image('ic/forum_edit.gif', 37, 15, array('title'=>"Click to edit",
'alt'=>"Click to edit", 'onclick'=>"switch2edit(this, 'show$i', 'edit$i')"));
}
} elseif ($efarr[$i]['field_type'] ==
ARTIFACT_EXTRAFIELDTYPE_USER) {
$str =
$this->renderUserField($efarr[$i]['extra_field_id'],$selected[$efarr[$i]['extra_field_id']],$efarr[$i]['show100'],$efarr[$i]['show100label'],$show_any,$text_any,false,
$attrs);
@@ -908,7 +908,7 @@ EOS;
return html_e('input', array_merge(array('type'=>'text',
'name'=>'extra_fields['.$extra_field_id.']', 'value'=>$contents, 'size'=>$size,
'maxlength'=>$maxlength), $attrs));
}
- /**()
+ /**
* renderRelationField - this function builds a relation field.
*
* @param int $extra_field_id The ID of this field.
diff --git a/src/common/tracker/views/form-adminroadmap.php
b/src/common/tracker/views/form-adminroadmap.php
index 18fb32a..7520622 100644
--- a/src/common/tracker/views/form-adminroadmap.php
+++ b/src/common/tracker/views/form-adminroadmap.php
@@ -380,10 +380,10 @@ if (getIntFromRequest('manage_release') ||
'</td>'."\n".
'<td
class="align-center">'.'   '.
util_make_link('/tracker/admin/?group_id='.$group_id.'&roadmap_id='.$roadmap_id.'&admin_roadmap=1&updownorder_release=1&old_pos='.$pos.'&new_pos='.(($pos
== count($release_order) - 1) ? $pos : $pos + 1),
-
html_image('ic/btn_up.png','19','18',array('alt'=>"Up"))).
+
html_image('ic/btn_up.png', 19, 18, array('alt'=>'Up'))).
'  '.
util_make_link('/tracker/admin/?group_id='.$group_id.'&roadmap_id='.$roadmap_id.'&admin_roadmap=1&updownorder_release=1&old_pos='.$pos.'&new_pos='.(($pos
== 0) ? $pos : $pos - 1),
-
html_image('ic/btn_down.png','19','18',array('alt'=>"Down"))).
+
html_image('ic/btn_down.png', 19, 18, array('alt'=>'Down'))).
'</td>'."\n".
'</tr>'."\n";
}
@@ -460,10 +460,10 @@ if (! isset($ihm) || $ihm !== true) {
'</td>'."\n".
'<td
class="align-center">'.'   '.
'<a
href="index.php?group_id='.$group_id.'&roadmap_id='.$roadmap->getID().
-
'&customize_list=1&post_changes=1&updownorder_release=1&new_pos='.(($pos
== 0)? $pos + 1 :
$pos).'">'.html_image('ic/btn_up.png','19','18',array('alt'=>"Up")).'</a>'.
+
'&customize_list=1&post_changes=1&updownorder_release=1&new_pos='.(($pos
== 0)? $pos + 1 : $pos).'">'.html_image('ic/btn_up.png', 19, 18,
array('alt'=>'Up')).'</a>'.
'  '.
'<a
href="index.php?group_id='.$group_id.'&roadmap_id='.$roadmap->getID().
-
'&customize_list=1&post_changes=1&updownorder_release=1&new_pos='.(($pos
== count($browse_fields) - 1)? $pos + 1 : $pos +
2).'">'.html_image('ic/btn_down.png','19','18',array('alt'=>"Down")).'</a>'.
+
'&customize_list=1&post_changes=1&updownorder_release=1&new_pos='.(($pos
== count($browse_fields) - 1)? $pos + 1 : $pos +
2).'">'.html_image('ic/btn_down.png', 19, 18, array('alt'=>'Down')).'</a>'.
'</td>'."\n".
*/
'<td class="align-center">'.
diff --git a/src/common/tracker/views/form-customizelist.php
b/src/common/tracker/views/form-customizelist.php
index ff70d04..160663b 100644
--- a/src/common/tracker/views/form-customizelist.php
+++ b/src/common/tracker/views/form-customizelist.php
@@ -74,8 +74,8 @@ foreach ($fields as $f => $name) {
($pos + 1).' --> <input type="text"
name="order['.$f.']" value="" size="3" maxlength="3" />'.
'</td>'."\n".
'<td class="align-center">'.
-
util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&id='.$f.'&customize_list=1&post_changes=1&updownorder_field=1&new_pos='.(($pos
== 0)? $pos + 1 : $pos), html_image('ic/btn_up.png','19','18',array('alt' =>
_('Up')))).
-
util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&id='.$f.'&customize_list=1&post_changes=1&updownorder_field=1&new_pos='.(($pos
== count($browse_fields) - 1)? $pos + 1 : $pos + 2),
html_image('ic/btn_down.png','19','18',array('alt' => _('Down')))).
+
util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&id='.$f.'&customize_list=1&post_changes=1&updownorder_field=1&new_pos='.(($pos
== 0)? $pos + 1 : $pos), html_image('ic/btn_up.png', 19, 18, array('alt' =>
_('Up')))).
+
util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&id='.$f.'&customize_list=1&post_changes=1&updownorder_field=1&new_pos='.(($pos
== count($browse_fields) - 1)? $pos + 1 : $pos + 2),
html_image('ic/btn_down.png', 19, 18, array('alt' => _('Down')))).
'</td>'."\n".
'<td class="align-center">'.
util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&id='.$f.'&customize_list=1&post_changes=1&delete_field=1',
html_image('ic/trash.png','','',array('alt' => _('Delete')))).
diff --git a/src/common/widget/Widget_MyProjectsLastDocuments.class.php
b/src/common/widget/Widget_MyProjectsLastDocuments.class.php
index f4cc97b..7c4a69b 100644
--- a/src/common/widget/Widget_MyProjectsLastDocuments.class.php
+++ b/src/common/widget/Widget_MyProjectsLastDocuments.class.php
@@ -106,11 +106,11 @@ class Widget_MyProjectsLastDocuments extends Widget {
$html .= '<tr
'. $HTML->boxGetAltRowStyle($j) .'>';
switch
($doc->getFileType()) {
case
"URL": {
-
$docurl = util_make_link($doc->getFileName(),
html_image($doc->getFileTypeImage(), '22', '22',
array('alt'=>$doc->getFileType())), array(), true);
+
$docurl = util_make_link($doc->getFileName(),
html_image($doc->getFileTypeImage(), 22, 22,
array('alt'=>$doc->getFileType())), array(), true);
break;
}
default: {
-
$docurl =
util_make_link('/docman/view.php/'.$g->getID().'/'.$doc->getID().'/'.urlencode($doc->getFileName()),
html_image($doc->getFileTypeImage(), '22', '22',
array('alt'=>$doc->getFileType())));
+
$docurl =
util_make_link('/docman/view.php/'.$g->getID().'/'.$doc->getID().'/'.urlencode($doc->getFileName()),
html_image($doc->getFileTypeImage(), 22, 22,
array('alt'=>$doc->getFileType())));
}
}
$html .=
'<td>'.$docurl.'</td>';
diff --git a/src/docs/README.Themes b/src/docs/README.Themes
index c2f5420..55df509 100644
--- a/src/docs/README.Themes
+++ b/src/docs/README.Themes
@@ -118,7 +118,7 @@ http://.../projects/siteadmin/
| print 'class=tabs ';
| }
| print 'href="'. $url .'">';
-| print html_image($this->imgroot .
$icon,'24','24',array('alt'=>"$title",'border'=>($selected?'1':'0')));
+| print html_image($this->imgroot .
$icon,24,24,array('alt'=>"$title",'border'=>($selected?'1':'0')));
| print '</A>';
| }
`----
diff --git a/src/plugins/globalsearch/www/index.php
b/src/plugins/globalsearch/www/index.php
index 40c1be6..28acccc 100644
--- a/src/plugins/globalsearch/www/index.php
+++ b/src/plugins/globalsearch/www/index.php
@@ -180,7 +180,7 @@ if (!$result || $rows < 1) {
print "<tr ". $HTML->boxGetAltRowStyle($i)."><td><a
href=\""
. db_result($result, $i, 'project_link')."\"
target=\"blank\">"
- .
html_image("ic/msg.png","10","12",array("border"=>"0"))." "
+ . html_image("ic/msg.png", 10, 12)." "
. highlight_target_words($array,db_result($result, $i,
'project_title'))."</a></td>
<td>".highlight_target_words($array,html_entity_decode(db_result($result,$i,'project_description')))."</td>
<td><center><a href=\"".db_result($result,$i,'link')."\" target=\"_blank\">"
@@ -210,7 +210,7 @@ if ( !$no_rows && ( ($rows_returned > $rows) || ($offset !=
0) ) ) {
if ( $rows_returned > $rows) {
echo "<span style=\"font-family:arial,
helvetica;text-decoration: none\">";
echo "<a
href=\"/plugins/globalsearch/?gwords=".urlencode($gwords)."&order=".urlencode($order)."&gexact=$gexact&offset=".($offset+25);
- echo "\"><strong>"._("Next Results") .
html_image("t.png","15","15",array("border"=>"0","align"=>"middle")) .
"</strong></a></span>";
+ echo "\"><strong>"._("Next Results") . html_image("t.png", 15,
15, array("align"=>"middle")) . "</strong></a></span>";
} else {
echo " ";
}
diff --git a/src/plugins/wiki/common/WikiHtmlSearchRenderer.class.php
b/src/plugins/wiki/common/WikiHtmlSearchRenderer.class.php
index fd8b40e..3380b23 100644
--- a/src/plugins/wiki/common/WikiHtmlSearchRenderer.class.php
+++ b/src/plugins/wiki/common/WikiHtmlSearchRenderer.class.php
@@ -65,7 +65,7 @@ class WikiHtmlSearchRenderer extends HtmlGroupSearchRenderer {
$page_name = preg_replace('/%2f/i', '/',
rawurlencode($row['pagename']));
$return .= '<tr '.
$GLOBALS['HTML']->boxGetAltRowStyle($i) .'>'
. '<td><a href="/wiki/g/'. $group_name.'/'.
$page_name .'">'
- . html_image('ic/msg.png', '10', '12')
+ . html_image('ic/msg.png', 10, 12)
. ' '.$row['pagename'].'</a></td>
<td style="width: 15%">'.$data['author'].'</td>
<td style="width:
15%">'.relative_date($row['mtime']).'</td></tr>';
diff --git a/src/plugins/wiki/common/WikiPlugin.class.php
b/src/plugins/wiki/common/WikiPlugin.class.php
index 8e098b7..9bc1444 100644
--- a/src/plugins/wiki/common/WikiPlugin.class.php
+++ b/src/plugins/wiki/common/WikiPlugin.class.php
@@ -200,7 +200,7 @@ page edits displayed on activity tab, and multi-project
wiki preferences.");
$arr['user_name'] =
$cache[$data['author']]['user_name'];
$arr['user_id'] =
$cache[$data['author']]['user_id'];
$arr['realname'] =
$data['author'];
-
$arr['icon']=html_image("ic/wiki20g.png","20","20",array("alt"=>"Wiki"));
+
$arr['icon']=html_image("ic/wiki20g.png", 20, 20, array('alt'=>'Wiki'));
$arr['title'] = 'Wiki Page
'.$arr['pagename'];
$arr['link'] =
'/wiki/g/'.$group_name.'/'.$page_name;
$arr['description']=
$arr['title'];
diff --git a/src/www/admin/cronman.php b/src/www/admin/cronman.php
index 4f45b8c..eb1a65a 100644
--- a/src/www/admin/cronman.php
+++ b/src/www/admin/cronman.php
@@ -92,7 +92,7 @@ if ($totalCount) {
<td><?php
if ($offset != 0) {
echo
util_make_link('/admin/cronman.php?which='.$which.'&offset='.($offset -
ADMIN_CRONMAN_ROWS),
- html_image('t2.png',
'15', '15').' '._('Previous'),
+ html_image('t2.png',
15, 15).' '._('Previous'),
array('class' =>
'prev'));
} else {
echo ' ';
@@ -100,7 +100,7 @@ if ($totalCount) {
echo '</td><td class="align-right">';
if ($totalCount > $offset + ADMIN_CRONMAN_ROWS) {
echo
util_make_link('/admin/cronman.php?which='.$which.'&offset='.($offset +
ADMIN_CRONMAN_ROWS),
- _('Next').'
'.html_image('t.png', '15', '15'),
+ _('Next').'
'.html_image('t.png', 15, 15),
array('class' =>
'next'));
} else {
echo ' ';
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index e40777c..cd9f7c0 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -430,7 +430,7 @@ class Layout extends FFError {
<div class="header">
<table class="fullwidth" id="headertable">
<tr>
- <td><?php util_make_link('/',
html_image('logo.png',198,52,array('border'=>'0'))); ?></td>
+ <td><?php util_make_link('/', html_image('logo.png',
198, 52)); ?></td>
<td><?php $this->searchBox(); ?></td>
<td align="right"><?php
$items = $this->navigation->getUserLinks();
@@ -1032,7 +1032,7 @@ if (isset($params['group']) && $params['group']) {
function confirmBox($msg, $params, $buttons, $image='*none*') {
if ($image == '*none*') {
- $image = html_image('stop.png','48','48',array());
+ $image = html_image('stop.png', 48, 48);
}
foreach ($params as $b => $v) {
diff --git a/src/www/include/note.php b/src/www/include/note.php
index 452c3cf..4a0c138 100644
--- a/src/www/include/note.php
+++ b/src/www/include/note.php
@@ -42,7 +42,7 @@ function notepad_button_raw($str, $form, $wrap, $rows, $cols)
{
}
function notepad_button($form) {
- $icon = html_image('ic/msg.png','12','14',array('alt'=>'Notepad'));
+ $icon = html_image('ic/msg.png', 12, 14, array('alt'=>'Notepad'));
return notepad_button_raw($icon, $form, "SOFT", "45", "80");
}
diff --git a/src/www/include/project_summary.php
b/src/www/include/project_summary.php
index 4159b9b..1c583e2 100644
--- a/src/www/include/project_summary.php
+++ b/src/www/include/project_summary.php
@@ -120,7 +120,7 @@ function project_summary($group_id, $mode, $no_table) {
if ($project->usesTracker()) {
$return .= '<a href="'.util_make_url
('/tracker/?group_id='.$group_id).'">';
- $return .=
html_image("ic/tracker20g.png",'20','20',array('alt'=>'Tracker'));
+ $return .= html_image("ic/tracker20g.png", 20, 20,
array('alt'=>'Tracker'));
$return .= ' Tracker</a>';
if ($mode != 'compact') {
@@ -156,7 +156,7 @@ function project_summary($group_id, $mode, $no_table) {
<hr />';
$return .= '<a href="'.util_make_url
('/forum/?group_id='.$group_id).'">';
- $return .=
html_image("ic/forum20g.png","20","20",array("alt"=>"Forums"));
+ $return .= html_image("ic/forum20g.png", 20, 20,
array("alt"=>"Forums"));
$return .= ' Forums</a>';
$ff = new ForumFactory($project);
@@ -182,7 +182,7 @@ function project_summary($group_id, $mode, $no_table) {
<hr />';
$return .= '<a href="'.util_make_url
('/docman/?group_id='.$group_id).'">';
- $return .=
html_image("ic/docman16b.png","20","20",array("alt"=>"Docs"));
+ $return .= html_image("ic/docman16b.png", 20, 20,
array("alt"=>"Docs"));
$return .= ' Doc Manager</a>';
}
@@ -193,7 +193,7 @@ function project_summary($group_id, $mode, $no_table) {
<hr />';
$return .= '<a href="'.util_make_url
('/mail/?group_id='.$group_id).'">';
- $return .=
html_image("ic/mail16b.png","20","20",array("alt"=>"Mail Lists"));
+ $return .= html_image("ic/mail16b.png", 20, 20,
array("alt"=>"Mail Lists"));
$return .= ' Mailing Lists</a>';
if ($mode != 'compact') {
@@ -208,7 +208,7 @@ function project_summary($group_id, $mode, $no_table) {
<hr />';
$return .= '<a href="'.util_make_url
('/pm/?group_id='.$group_id).'">';
- $return .=
html_image("ic/taskman20g.png","20","20",array("alt"=>"Tasks"));
+ $return .= html_image("ic/taskman20g.png", 20, 20,
array("alt"=>"Tasks"));
$return .= ' Task Manager</a>';
if ($mode != 'compact') {
@@ -237,7 +237,7 @@ function project_summary($group_id, $mode, $no_table) {
<hr />';
$return .= '<a href="'.util_make_url
('/survey/?group_id='.$group_id).'">';
- $return .=
html_image("ic/survey16b.png","20","20",array("alt"=>"Surveys"));
+ $return .= html_image("ic/survey16b.png", 20, 20,
array("alt"=>"Surveys"));
$return .= " Surveys</a>";
if ($mode != 'compact') {
$return .= ' ( <strong>'.
project_get_survey_count($group_id) .'</strong> surveys )';
@@ -251,7 +251,7 @@ function project_summary($group_id, $mode, $no_table) {
<hr />';
$return .= '<a href="'.util_make_url
('/scm/?group_id='.$group_id).'">';
- $return .=
html_image("ic/cvs16b.png","20","20",array("alt"=>"SCM"));
+ $return .= html_image("ic/cvs16b.png", 20, 20,
array("alt"=>"SCM"));
$return .= " SCM Tree</a>";
if ($mode != 'compact') {
@@ -268,7 +268,7 @@ function project_summary($group_id, $mode, $no_table) {
<hr />';
$return .= '<a href="'.util_make_url
('/project/showfiles.php?group_id='.$group_id).'">';
- $return .=
html_image("ic/ftp16b.png","20","20",array("alt"=>"FTP"));
+ $return .= html_image("ic/ftp16b.png", 20, 20,
array("alt"=>"FTP"));
$return .= " Released Files</a>";
}
diff --git a/src/www/include/user_home.php b/src/www/include/user_home.php
index 4ec4e06..d35a951 100644
--- a/src/www/include/user_home.php
+++ b/src/www/include/user_home.php
@@ -69,7 +69,7 @@ if (forge_get_config('use_diary')) {
echo '</p>
<p>';
echo
util_make_link('/developer/monitor.php?diary_user='.$user_id,
-
html_image("ic/check.png",'15','13',array(),0) ._('Monitor this Diary')
+ html_image("ic/check.png", 15,
13) ._('Monitor this Diary')
) ;
echo '</p>';
$hookparams['user_id'] = $user_id;
diff --git a/src/www/include/vote_function.php
b/src/www/include/vote_function.php
index 8056d79..b882406 100644
--- a/src/www/include/vote_function.php
+++ b/src/www/include/vote_function.php
@@ -40,10 +40,10 @@ function vote_number_to_stars($raw) {
$return ='';
$count=intval($raw/2);
for ($i=0; $i<$count; $i++) {
- $return .= html_image("ic/check.png","15","16");
+ $return .= html_image("ic/check.png", 15, 16);
}
if ($show_half==1) {
- $return .= html_image("ic/halfcheck.png","15","16");
+ $return .= html_image("ic/halfcheck.png", 15, 16);
}
return $return;
}
@@ -118,11 +118,11 @@ function vote_show_release_radios ($vote_on_id, $flag) {
<input type="radio" name="redirect_to" value="<?php echo
urlencode(getStringFromServer('REQUEST_URI')); ?>" />
<input type="radio" name="flag" value="<?php echo $flag; ?>" />
<div style="margin-left: auto; margin-right: auto;">
- <?php echo html_image("rateit.png","100","9"); ?>
+ <?php echo html_image("rateit.png", 100, 9); ?>
<br />
<?php
echo html_blankimage(1,$rating);
- echo html_image("ic/caret.png","9","6");
+ echo html_image("ic/caret.png", 9, 6);
?>
<br />
<input type="radio" name="response" value="1" />
diff --git a/src/www/new/index.php b/src/www/new/index.php
index 2ffca7c..e863136 100644
--- a/src/www/new/index.php
+++ b/src/www/new/index.php
@@ -131,7 +131,7 @@ if (!$res_new || db_numrows($res_new) < 1) {
echo '<tr class="content"><td>';
if ($offset != 0) {
print '<a href="'.util_make_url
('/new/?offset='.($offset-20)).'">'.
- html_image("t2.png","15","15").
+ html_image("t2.png", 15, 15).
' <strong>'._('Newer Releases').'</strong></a>';
} else {
print ' ';
@@ -140,7 +140,7 @@ if (!$res_new || db_numrows($res_new) < 1) {
echo '</td><td colspan="2" style="text-align:right">"';
if (db_numrows($res_new)>$rows) {
print '<a href="'.util_make_url
('/new/?offset='.($offset+20).'"><strong>'._('Older Releases').'</strong> ') .
- html_image("t.png","15","15") .
+ html_image("t.png", 15, 15) .
'</a>';
} else {
print " ";
diff --git a/src/www/pm/browse_task.php b/src/www/pm/browse_task.php
index b27d0db..44576b8 100644
--- a/src/www/pm/browse_task.php
+++ b/src/www/pm/browse_task.php
@@ -240,9 +240,7 @@ if ($rows < 1) {
echo '
<tr class="priority'.$pt_arr[$i]->getPriority().'"><td
style="width:16px; background-color:#FFFFFF">' .
util_make_link('/export/rssAboTask.php?tid=' .
- $pt_arr[$i]->getID(), html_image('ic/rss.png',
- 16, 16, array('border' => '0'))
- ) . "</td>\n" .
+ $pt_arr[$i]->getID(), html_image('ic/rss.png', 16,
16)) . "</td>\n" .
'<td>'.
($IS_ADMIN?'<input type="checkbox"
name="project_task_id_list[]" value="'.
$pt_arr[$i]->getID() .'" /> ':'').
diff --git a/src/www/pm/detail_task.php b/src/www/pm/detail_task.php
index 0735e5f..c650d51 100644
--- a/src/www/pm/detail_task.php
+++ b/src/www/pm/detail_task.php
@@ -52,7 +52,7 @@ echo $HTML->multiTableRow(array(), $cells);
$cells = array();
$cells[][] = '<strong>'._('Percent Complete')._(':').'</strong><br
/>'.$pt->getPercentComplete().'%';
$cells[][] = '<strong>'._('Priority')._(':').'</strong><br
/>'.$pt->getPriority();
-$cells[][] = util_make_link('/export/rssAboTask.php?tid='.$project_task_id,
html_image('ic/rss.png',16, 16, array('border' => '0')).' '._('Subscribe to
task'));
+$cells[][] = util_make_link('/export/rssAboTask.php?tid='.$project_task_id,
html_image('ic/rss.png', 16, 16).' '._('Subscribe to task'));
echo $HTML->multiTableRow(array(), $cells);
$cells = array();
$cells[][] = '<strong>'._('Start Date')._(':').'</strong><br
/>'.date(_('Y-m-d'), $pt->getStartDate());
diff --git a/src/www/pm/index.php b/src/www/pm/index.php
index 971f24c..24ce957 100644
--- a/src/www/pm/index.php
+++ b/src/www/pm/index.php
@@ -168,7 +168,7 @@ if (count($pg_arr) < 1 || $pg_arr == false) {
} else {
echo '
<tr '. $HTML->boxGetAltRowStyle($j) . '>
-
<td>'.util_make_link('/pm/task.php?group_project_id='.$pg_arr[$j]->getID().'&group_id='.$group_id.'&func=browse',
html_image("ic/taskman20w.png","20","20") . '
'.$pg_arr[$j]->getID()).'</td>
+
<td>'.util_make_link('/pm/task.php?group_project_id='.$pg_arr[$j]->getID().'&group_id='.$group_id.'&func=browse',
html_image("ic/taskman20w.png", 20, 20) . '
'.$pg_arr[$j]->getID()).'</td>
<td>'.util_make_link('/pm/task.php?group_project_id='.$pg_arr[$j]->getID().'&group_id='.$group_id.'&func=browse',
$pg_arr[$j]->getName()).'</td>
<td>'.$pg_arr[$j]->getDescription() .'</td>
<td class="align-right">'. (int)
$pg_arr[$j]->getOpenCount().'</td>
diff --git a/src/www/pm/mod_task.php b/src/www/pm/mod_task.php
index 1e49eea..215bce3 100644
--- a/src/www/pm/mod_task.php
+++ b/src/www/pm/mod_task.php
@@ -106,7 +106,7 @@ echo $HTML->openForm(array('action' =>
'/pm/task.php?group_id='.$group_id.'&grou
</td>
<td>
<?php echo
util_make_link('/export/rssAboTask.php?tid='.$project_task_id,
- html_image('ic/rss.png', 16,
16, array('border' => '0')).' '._('Subscribe to task'));
+ html_image('ic/rss.png', 16,
16).' '._('Subscribe to task'));
?>
</td>
</tr>
diff --git
a/src/www/search/include/renderers/DocsAllHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/DocsAllHtmlSearchRenderer.class.php
index cee48ad..6c8d1a3 100644
--- a/src/www/search/include/renderers/DocsAllHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/DocsAllHtmlSearchRenderer.class.php
@@ -91,7 +91,7 @@ class DocsAllHtmlSearchRenderer extends HtmlSearchRenderer {
$document = document_get_object($row['docid'],
$row['group_id']);
$currentDocGroup = $row['project_name'];
if ($lastGroupID != $document->Group->getID()) {
- $cells[] = array(html_image('ic/home16b.png',
10, 12, array('border' =>
0)).'<b>'.util_make_link('/docman/?group_id='.$document->Group->getID(),$currentDocGroup).'</b>',
'colspan' => 4);
+ $cells[] = array(html_image('ic/home16b.png',
10,
12).'<b>'.util_make_link('/docman/?group_id='.$document->Group->getID(),$currentDocGroup).'</b>',
'colspan' => 4);
$lastGroupID = $document->Group->getID();
$rowColor = 0;
$return .= $HTML->multiTableRow(array(),
$cells);
@@ -99,7 +99,7 @@ class DocsAllHtmlSearchRenderer extends HtmlSearchRenderer {
$cells = array();
$cells[][] = ' ';
if ($lastDocGroupID != $document->getDocGroupID()) {
- $cells[][] = html_image('ic/folder.png', 22,
22, array('border' =>
0)).util_make_link('/docman/?group_id='.$document->Group->getID().'&view=listfile&dirid='.$document->getDocGroupID(),$row['groupname']);
+ $cells[][] = html_image('ic/folder.png', 22,
22).util_make_link('/docman/?group_id='.$document->Group->getID().'&view=listfile&dirid='.$document->getDocGroupID(),$row['groupname']);
$lastDocGroupID = $document->getDocGroupID();
} else {
$cells[][] = ' ';
diff --git a/src/www/search/include/renderers/ForumHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/ForumHtmlSearchRenderer.class.php
index c328c22..3fdc85a 100644
--- a/src/www/search/include/renderers/ForumHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/ForumHtmlSearchRenderer.class.php
@@ -69,7 +69,7 @@ class ForumHtmlSearchRenderer extends HtmlGroupSearchRenderer
{
$i = 0;
foreach ($result as $row) {
$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')
+ . html_image('ic/msg.png', 10, 12)
. ' '.$row['subject'].'</a></td>'
. '<td style="width:
30%">'.$row['realname'].'</td>'
. '<td style="width: 20%">'.date($dateFormat,
$row['post_date']).'</td></tr>';
diff --git
a/src/www/search/include/renderers/ForumsHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/ForumsHtmlSearchRenderer.class.php
index 23fc44a..2d48051 100644
--- a/src/www/search/include/renderers/ForumsHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/ForumsHtmlSearchRenderer.class.php
@@ -71,7 +71,7 @@ class ForumsHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
$return .= '<tr '.
$GLOBALS['HTML']->boxGetAltRowStyle($rowColor) .'>'
. '<td width="5%"></td>'
. '<td><a href="'.util_make_url
('/forum/message.php?msg_id='. $row['msg_id']).'">'
- .
html_image('ic/msg.png', '10', '12').' '.$row['subject']
+ .
html_image('ic/msg.png').' '.$row['subject']
.'</a></td>'
. '<td style="width:
15%">'.$row['realname'].'</td>'
. '<td style="width:
15%">'.relative_date($row['post_date']).'</td></tr>';
diff --git a/src/www/search/include/renderers/HtmlSearchRenderer.class.php
b/src/www/search/include/renderers/HtmlSearchRenderer.class.php
index b9dbb02..db02104 100644
--- a/src/www/search/include/renderers/HtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/HtmlSearchRenderer.class.php
@@ -129,7 +129,7 @@ class HtmlSearchRenderer extends SearchRenderer {
$html .= '<tr>';
$html .= '<td>';
if ($searchQuery->getOffset() != 0) {
- $html .= util_make_link($this->getPreviousResultsUrl(),
html_image('t2.png', '15', '15').' '._('Previous Results'), array('class' =>
'prev'));
+ $html .= util_make_link($this->getPreviousResultsUrl(),
html_image('t2.png', 15, 15).' '._('Previous Results'), array('class' =>
'prev'));
} else {
$html .= ' ';
}
@@ -137,7 +137,7 @@ class HtmlSearchRenderer extends SearchRenderer {
$result =
$this->searchQuery->getData($this->searchQuery->getRowsPerPage(),$this->searchQuery->getOffset());
error_log(count($result));
if ($searchQuery->getRowsTotalCount() >
$this->searchQuery->getRowsPerPage()+$this->searchQuery->getOffset()) {
- $html .= util_make_link($this->getNextResultsUrl(),
_('Next Results').' '.html_image('t.png', '15', '15'), array('class' =>
'next'));
+ $html .= util_make_link($this->getNextResultsUrl(),
_('Next Results').' '.html_image('t.png', 15, 15), array('class' => 'next'));
} else {
$html .= ' ';
}
diff --git a/src/www/search/include/renderers/NewsHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/NewsHtmlSearchRenderer.class.php
index 1b58b20..834ea1e 100644
--- a/src/www/search/include/renderers/NewsHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/NewsHtmlSearchRenderer.class.php
@@ -62,7 +62,7 @@ class NewsHtmlSearchRenderer extends HtmlGroupSearchRenderer {
foreach ($result as $row) {
$return .= '<tr '.
$GLOBALS['HTML']->boxGetAltRowStyle($i) .'>'
. '<td><a href="'.util_make_url
('/forum/forum.php?forum_id='. $row['forum_id']).'">'
- . html_image('ic/msg.png', '10', '12')
+ . html_image('ic/msg.png', 10, 12)
. ' '.$row['summary'].'</a></td>
<td style="width: 15%">'.$row['realname'].'</td>
<td style="width:
15%">'.relative_date($row['post_date']).'</td></tr>';
diff --git
a/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php
index 833f73a..04af18b 100644
--- a/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php
@@ -65,7 +65,7 @@ class PeopleHtmlSearchRenderer extends HtmlSearchRenderer {
foreach ($result as $row) {
$i++;
$return .= '<tr '.
$GLOBALS['HTML']->boxGetAltRowStyle($i) .'>'.
- '<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: 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>';
}
diff --git
a/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php
index 8bb8dac..62b7b71 100644
--- a/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php
@@ -73,7 +73,7 @@ class ProjectHtmlSearchRenderer extends HtmlSearchRenderer {
}
$return .= '<tr
'.$GLOBALS['HTML']->boxGetAltRowStyle($i).'>'
.'<td style="width: 30%"><a
href="'.util_make_url('/'.$what.'/'.$row['unix_group_name'].'/').'">'
- .html_image('ic/msg.png', '10', '12')
+ .html_image('ic/msg.png', 10, 12)
.'
'.$this->highlightTargetWords($row['group_name']).'</a></td>'
.'<td style="width:
70%">'.$this->highlightTargetWords($row['short_description']).'</td></tr>';
}
diff --git a/src/www/search/include/renderers/TasksHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/TasksHtmlSearchRenderer.class.php
index aceca9a..b71fc70 100644
--- a/src/www/search/include/renderers/TasksHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/TasksHtmlSearchRenderer.class.php
@@ -76,7 +76,7 @@ class TasksHtmlSearchRenderer extends HtmlGroupSearchRenderer
{
. '
<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']).'">'
- .
html_image('ic/msg.png', '10', '12').' '
+ .
html_image('ic/msg.png', 10, 12).' '
.
$row['summary'].'</a></td>'
. ' <td style="width:
15%">'.relative_date($row['start_date']).'</td>'
. ' <td style="width:
15%">'.relative_date($row['end_date']).'</td>'
diff --git a/src/www/snippet/add_snippet_to_package.php
b/src/www/snippet/add_snippet_to_package.php
index 4250e83..1c63389 100644
--- a/src/www/snippet/add_snippet_to_package.php
+++ b/src/www/snippet/add_snippet_to_package.php
@@ -188,7 +188,7 @@ for ($i=0; $i<$combolistrows; $i++)
echo '
<tr '. $HTML->boxGetAltRowStyle($i) .'><td
class="align-center">'.
util_make_link('/snippet/delete.php?type=frompackage&snippet_version_id='.db_result($result,$i,'snippet_version_id').'&snippet_package_version_id='.$snippet_package_version_id,
-
html_image("ic/trash.png","16","16")).'</td><td style="width:99%">'.
+ html_image("ic/trash.png", 16,
16)).'</td><td style="width:99%">'.
db_result($result,$i,'name').'
'.db_result($result,$i,'version')."</td></tr>";
$last_group=db_result($result,$i,'group_id');
diff --git a/src/www/snippet/detail.php b/src/www/snippet/detail.php
index 72e4a4d..d0edf0a 100644
--- a/src/www/snippet/detail.php
+++ b/src/www/snippet/detail.php
@@ -83,7 +83,7 @@ if ($type=='snippet') {
util_make_link('/snippet/download.php?type=snippet&id='.db_result($result,$i,'snippet_version_id'),
'<strong>'. db_result($result,$i,'version').'</strong>').'</td><td>'.
date(_('Y-m-d
H:i'),db_result($result,$i,'post_date')).'</td><td>'.
util_make_link_u(db_result($result, $i,
'user_name'), db_result($result, $i, 'user_id'), db_result($result, $i,
'realname')).'</td>'.
- '<td
class="align-center">'.util_make_link('/snippet/delete.php?type=snippet&snippet_version_id='.db_result($result,$i,'snippet_version_id'),
html_image("ic/trash.png","16","16",array("border"=>"0"))).'</td></tr>';
+ '<td
class="align-center">'.util_make_link('/snippet/delete.php?type=snippet&snippet_version_id='.db_result($result,$i,'snippet_version_id'),
html_image("ic/trash.png", 16, 16)).'</td></tr>';
if ($i != ($rows - 1)) {
echo '
@@ -168,9 +168,9 @@ if ($type=='snippet') {
date(_('Y-m-d
H:i'),db_result($result,$i,'post_date')).'</td><td>'.
util_make_link_u (db_result($result, $i,
'user_name'), db_result($result, $i, 'user_id'),db_result($result, $i,
'realname')).'</td>'.
'<td class="align-center">'.
-
util_make_link('/snippet/add_snippet_to_package.php?snippet_package_version_id='.db_result($result,$i,'snippet_package_version_id'),
html_image("ic/pencil.png","20","25")).
+
util_make_link('/snippet/add_snippet_to_package.php?snippet_package_version_id='.db_result($result,$i,'snippet_package_version_id'),
html_image("ic/pencil.png", 20, 25)).
' '.
-
util_make_link('/snippet/delete.php?type=package&snippet_package_version_id='.db_result($result,$i,'snippet_package_version_id'),
html_image("ic/trash.png","16","16")).'</td></tr>';
+
util_make_link('/snippet/delete.php?type=package&snippet_package_version_id='.db_result($result,$i,'snippet_package_version_id'),
html_image("ic/trash.png", 16, 16)).'</td></tr>';
}
echo $HTML->listTableBottom();
diff --git a/src/www/softwaremap/trove_list.php
b/src/www/softwaremap/trove_list.php
index d4a8de9..d86fb29 100644
--- a/src/www/softwaremap/trove_list.php
+++ b/src/www/softwaremap/trove_list.php
@@ -158,7 +158,7 @@ if ( $cat === 'c' ) {
$folders_len = count($folders);
print "<p>";
- print html_image("category.png",'32','33',array('alt'=>""));
+ print html_image("category.png", 32, 33, array('alt'=>""));
print " ";
for ($i = 0; $i < $folders_len; $i++) {
diff --git a/src/www/trove/index.php b/src/www/trove/index.php
index 516a0c3..cb89476 100644
--- a/src/www/trove/index.php
+++ b/src/www/trove/index.php
@@ -103,11 +103,11 @@ if($filter) {
if (($rootCategory->getID() ==
$category->getRootParentId())
|| ($rootCategory->getID() ==
$category->getID())) {
- echo
html_image('ic/ofolder15.png','15','13',array());
+ echo html_image('ic/ofolder15.png', 15,
13);
echo '
<strong>'.$rootCategory->getLocalizedLabel().'</strong>';
} else {
echo '<a
href="?form_cat='.$rootCategory->getID().@$discrim_url.'">';
- echo html_image('ic/cfolder15.png',
'15', '13', array());
+ echo html_image('ic/cfolder15.png', 15,
13);
echo '
'.$rootCategory->getLocalizedLabel();
echo '</a>';
}
@@ -121,7 +121,7 @@ if($filter) {
for ($i=0, $count = sizeof($parentCategories); $i <
$count; $i++) {
echo str_repeat(' ', $i * 2);
- echo html_image('ic/ofolder15.png', '15', '13',
array());
+ echo html_image('ic/ofolder15.png', 15, 13);
echo ' ';
if($parentCategories[$i]['id'] !=
$category->getID()) {
echo '<a
href="?form_cat='.$parentCategories[$i]['id'].$discrim_url.'">';
@@ -146,7 +146,7 @@ if($filter) {
echo $currentIndent;
echo '<a
href="?form_cat='.$childCategory->getID().@$discrim_url.'">';
- echo html_image('ic/cfolder15.png', '15', '13',
array());
+ echo html_image('ic/cfolder15.png', 15, 13);
echo '
'.$childCategory->getLocalizedLabel().'</a>';
echo ' <em>('
.sprintf(_('%s projects'),
$childCategory->getSubProjectsCount())
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ee9491db26ed3cd01c50f51da92df5520945866d
commit ee9491db26ed3cd01c50f51da92df5520945866d
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri Jul 1 14:49:26 2016 +0200
Indent
diff --git a/src/common/tracker/views/form-workflow_required_fields.php
b/src/common/tracker/views/form-workflow_required_fields.php
index 2ff695c..4421eb9 100644
--- a/src/common/tracker/views/form-workflow_required_fields.php
+++ b/src/common/tracker/views/form-workflow_required_fields.php
@@ -30,65 +30,65 @@ require_once 'common/tracker/ArtifactWorkflow.class.php';
global $HTML;
- $from = getIntFromRequest('from');
- $next = getIntFromRequest('next');
+$from = getIntFromRequest('from');
+$next = getIntFromRequest('next');
// FORM TO UPDATE ARTIFACT TYPES
- /*
- List of possible user built Selection Boxes for an
ArtifactType
- */
- $efarr =
$ath->getExtraFields(array(ARTIFACT_EXTRAFIELDTYPE_STATUS));
- if (count($efarr) === 0) {
- // TODO: Normal status is not implemented right now.
- return false;
- } elseif (count($efarr) !== 1) {
- // Internal error.
- return false;
- }
+/*
+ List of possible user built Selection Boxes for an ArtifactType
+*/
+$efarr = $ath->getExtraFields(array(ARTIFACT_EXTRAFIELDTYPE_STATUS));
+if (count($efarr) === 0) {
+ // TODO: Normal status is not implemented right now.
+ return false;
+} elseif (count($efarr) !== 1) {
+ // Internal error.
+ return false;
+}
- $keys=array_keys($efarr);
- $field_id = $keys[0];
+$keys=array_keys($efarr);
+$field_id = $keys[0];
- $atw = new ArtifactWorkflow($ath, $field_id);
- $requiredFields = $atw->getRequiredFields($from, $next);
+$atw = new ArtifactWorkflow($ath, $field_id);
+$requiredFields = $atw->getRequiredFields($from, $next);
- $elearray = $ath->getExtraFieldElements($field_id);
- foreach ($elearray as $e) {
- $name[ $e['element_id'] ] = $e['element_name'];
- }
+$elearray = $ath->getExtraFieldElements($field_id);
+foreach ($elearray as $e) {
+ $name[ $e['element_id'] ] = $e['element_name'];
+}
- $title = sprintf(_('Configuring required files for the
transitions from %1$s to %2$s'), $name[$from], $name[$next]);
- $ath->adminHeader(array('title'=>$title,
- 'pagename'=>'tracker_admin_customize_liste',
- 'titlevals'=>array($ath->getName())));
+$title = sprintf(_('Configuring required files for the transitions from %1$s
to %2$s'), $name[$from], $name[$next]);
+$ath->adminHeader(array('title'=>$title,
+ 'pagename'=>'tracker_admin_customize_liste',
+ 'titlevals'=>array($ath->getName())));
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_required_fields" value="1"
/>
- <input type="hidden" name="from" value="<?php echo $from ?>" />
- <input type="hidden" name="next" value="<?php echo $next ?>" />
+<input type="hidden" name="field_id" value="<?php echo $field_id ?>" />
+<input type="hidden" name="workflow_required_fields" value="1" />
+<input type="hidden" name="from" value="<?php echo $from ?>" />
+<input type="hidden" name="next" value="<?php echo $next ?>" />
<?php
- $extra_fields = $ath->getExtraFields() ;
- //sortRoleList ($group_roles) ;
- foreach ($extra_fields as $key => $row) {
- $extra_fields_names[$key] = $row['field_name'];
- }
- array_multisort($extra_fields_names, SORT_ASC,
SORT_LOCALE_STRING | SORT_FLAG_CASE, $extra_fields);
+$extra_fields = $ath->getExtraFields() ;
+//sortRoleList ($group_roles) ;
+foreach ($extra_fields as $key => $row) {
+ $extra_fields_names[$key] = $row['field_name'];
+}
+array_multisort($extra_fields_names, SORT_ASC, SORT_LOCALE_STRING |
SORT_FLAG_CASE, $extra_fields);
- foreach ($extra_fields as $field) {
- if ($field['field_type'] !=
ARTIFACT_EXTRAFIELDTYPE_STATUS) {
- $value = in_array($field['extra_field_id'],
$requiredFields)? ' checked="checked"' : '';
- $str = '<input type="checkbox"
name="extrafield['.$field['extra_field_id'].']"'.$value.' />';
- $str .= ' '.$field['field_name'];
- echo $str."<br />\n";
- }
- }
+foreach ($extra_fields as $field) {
+ if ($field['field_type'] != ARTIFACT_EXTRAFIELDTYPE_STATUS) {
+ $value = in_array($field['extra_field_id'], $requiredFields)? '
checked="checked"' : '';
+ $str = '<input type="checkbox"
name="extrafield['.$field['extra_field_id'].']"'.$value.' />';
+ $str .= ' '.$field['field_name'];
+ echo $str."<br />\n";
+ }
+}
?>
- <p>
- <input type="submit" name="post_changes" value="<?php echo
_('Submit') ?>" /></p>
- <?php
+<p>
+<input type="submit" name="post_changes" value="<?php echo _('Submit') ?>"
/></p>
+<?php
echo $HTML->closeForm();
- $ath->footer();
+$ath->footer();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=f9b645c2e05a22b06132dc613282fccb7676d888
commit f9b645c2e05a22b06132dc613282fccb7676d888
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri Jul 1 14:47:40 2016 +0200
Indent
diff --git a/src/common/tracker/views/form-addextrafieldoption.php
b/src/common/tracker/views/form-addextrafieldoption.php
index 6182953..eee9f6c 100644
--- a/src/common/tracker/views/form-addextrafieldoption.php
+++ b/src/common/tracker/views/form-addextrafieldoption.php
@@ -28,103 +28,103 @@ global $HTML;
//
// FORM TO ADD ELEMENTS TO EXTRA FIELD
//
- $boxid = getIntFromRequest('boxid');
- $ac = new ArtifactExtraField($ath,$boxid);
- if (!$ac || !is_object($ac)) {
- exit_error(_('Unable to create ArtifactExtraField
Object'),'tracker');
- } elseif ($ac->isError()) {
- exit_error($ac->getErrorMessage(),'tracker');
- } else {
- $efearr=$ath->getExtraFieldElements($boxid);
- $title = sprintf(_('Add/Update Custom Field Elements in %s'),
$ath->getName());
- $ath->adminHeader(array('title'=>$title));
- echo html_e('h2', array(), _('Custom Field Name')._(':
').$ac->getName());
- $efType = $ac->getType();
- if ($efType != ARTIFACT_EXTRAFIELDTYPE_USER) {
- $rows=count($efearr);
- if ($rows > 0) {
- echo $HTML->openForm(array('action' =>
'/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&boxid='.$boxid,
'method' => 'post'));
- $title_arr=array();
- $title_arr[]=_('Current / New positions');
- if ($efType == ARTIFACT_EXTRAFIELDTYPE_STATUS) {
- $title_arr[] = _('Mapping');
- }
- $title_arr[]=_('Up/Down positions');
- $title_arr[]=_('Elements Defined');
- $title_arr[]='';
- echo $HTML->listTableTop ($title_arr,false, '
');
- for ($i=0; $i < $rows; $i++) {
- $row_attrs =
array('class'=>$HTML->boxGetAltRowStyle($i,true));
- $cells = array();
- $content = ($i + 1).'
-->'.html_e('input', array('type'=>'text', 'name'=>'order['.
$efearr[$i]['element_id'] .']', 'value'=>'', 'size'=>'3', 'maxlength'=>'3'));
- $cells[] = array($content,
'class'=>'align-right');
- if ($efType ==
ARTIFACT_EXTRAFIELDTYPE_STATUS) {
- $cells[] =
array($ath->getStatusName($efearr[$i]['status_id']));
- }
- $content =
util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&boxid='.$boxid.'&id='.$efearr[$i]['element_id'].'&updownorder_opt=1&new_pos='.(($i
== 0)? $i + 1 : $i), html_image('ic/btn_up.png','19','18',array('alt'=>'Up',
'title'=>_('Move Up this custom field element'))));
- $content .=
util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&boxid='.$boxid.'&id='.$efearr[$i]['element_id'].'&updownorder_opt=1&new_pos='.(($i
== $rows - 1)? $i + 1 : $i + 2),
html_image('ic/btn_down.png','19','18',array('alt'=>'Down', 'title'=>_('Move
Down this custom field element'))));
- $cells[] = array($content,
'class'=>'align-center');
- $cells[] =
array($efearr[$i]['element_name']);
- $content =
util_make_link('/tracker/admin/?update_opt=1&id='.$efearr[$i]['element_id'].'&boxid='.$boxid.'&group_id='.$group_id.'&atid='.
$ath->getID(), html_image('ic/configure.png','22','22',array('alt'=>_('Edit'),
'title'=>_('Edit custom field element'))));
- $cells[] = array($content,
'class'=>'align-center');
- echo $HTML->multiTableRow($row_attrs,
$cells);
- }
- $row_attrs = array('class'=>'noborder');
+$boxid = getIntFromRequest('boxid');
+$ac = new ArtifactExtraField($ath,$boxid);
+if (!$ac || !is_object($ac)) {
+ exit_error(_('Unable to create ArtifactExtraField Object'),'tracker');
+} elseif ($ac->isError()) {
+ exit_error($ac->getErrorMessage(),'tracker');
+} else {
+ $efearr=$ath->getExtraFieldElements($boxid);
+ $title = sprintf(_('Add/Update Custom Field Elements in %s'),
$ath->getName());
+ $ath->adminHeader(array('title'=>$title));
+ echo html_e('h2', array(), _('Custom Field Name')._(':
').$ac->getName());
+ $efType = $ac->getType();
+ if ($efType != ARTIFACT_EXTRAFIELDTYPE_USER) {
+ $rows=count($efearr);
+ if ($rows > 0) {
+ echo $HTML->openForm(array('action' =>
'/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&boxid='.$boxid,
'method' => 'post'));
+ $title_arr=array();
+ $title_arr[]=_('Current / New positions');
+ if ($efType == ARTIFACT_EXTRAFIELDTYPE_STATUS) {
+ $title_arr[] = _('Mapping');
+ }
+ $title_arr[]=_('Up/Down positions');
+ $title_arr[]=_('Elements Defined');
+ $title_arr[]='';
+ echo $HTML->listTableTop ($title_arr,false, ' ');
+ for ($i=0; $i < $rows; $i++) {
+ $row_attrs =
array('class'=>$HTML->boxGetAltRowStyle($i,true));
$cells = array();
- $content = html_e('input',
array('type'=>'submit', 'name'=>'post_changes_order', 'value'=>_('Reorder')));
+ $content = ($i + 1).' -->'.html_e('input',
array('type'=>'text', 'name'=>'order['. $efearr[$i]['element_id'] .']',
'value'=>'', 'size'=>'3', 'maxlength'=>'3'));
$cells[] = array($content,
'class'=>'align-right');
- $cells[] = array('');
if ($efType == ARTIFACT_EXTRAFIELDTYPE_STATUS) {
- $cells[] = array('');
+ $cells[] =
array($ath->getStatusName($efearr[$i]['status_id']));
}
- $content = html_e('input',
array('type'=>'submit', 'name'=>'post_changes_alphaorder',
'value'=>_('Alphabetical order')));
- $cells[] = array($content,
'class'=>'align-left');
+ $content =
util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&boxid='.$boxid.'&id='.$efearr[$i]['element_id'].'&updownorder_opt=1&new_pos='.(($i
== 0)? $i + 1 : $i), html_image('ic/btn_up.png','19','18',array('alt'=>'Up',
'title'=>_('Move Up this custom field element'))));
+ $content .=
util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&boxid='.$boxid.'&id='.$efearr[$i]['element_id'].'&updownorder_opt=1&new_pos='.(($i
== $rows - 1)? $i + 1 : $i + 2),
html_image('ic/btn_down.png','19','18',array('alt'=>'Down', 'title'=>_('Move
Down this custom field element'))));
+ $cells[] = array($content,
'class'=>'align-center');
+ $cells[] = array($efearr[$i]['element_name']);
+ $content =
util_make_link('/tracker/admin/?update_opt=1&id='.$efearr[$i]['element_id'].'&boxid='.$boxid.'&group_id='.$group_id.'&atid='.
$ath->getID(), html_image('ic/configure.png','22','22',array('alt'=>_('Edit'),
'title'=>_('Edit custom field element'))));
+ $cells[] = array($content,
'class'=>'align-center');
echo $HTML->multiTableRow($row_attrs, $cells);
- echo $HTML->listTableBottom();
- echo $HTML->closeForm();
- } else {
- echo html_e('strong', array(), _('You have not
defined any elements.'));
}
- echo html_e('br').html_e('br');
- echo $HTML->openForm(array('action' =>
'/tracker/admin/?group_id='.$group_id.'&boxid='.$boxid.'&atid='.$ath->getID(),
'method' => 'post'));
- echo html_e('input', array('type'=>'hidden',
'name'=>'add_opt', 'value'=>'y'));
- echo html_e('label',
array('for'=>'name'),html_e('strong', array(), _('Add New Element')._(':')));
- echo html_e('input', array('type'=>'text',
'id'=>'name', 'name'=>'name', 'value'=>'', 'size'=>'15', 'maxlength'=>'30'));
- // Show a pop-up box to choose the possible statuses
that this element will map to
+ $row_attrs = array('class'=>'noborder');
+ $cells = array();
+ $content = html_e('input', array('type'=>'submit',
'name'=>'post_changes_order', 'value'=>_('Reorder')));
+ $cells[] = array($content, 'class'=>'align-right');
+ $cells[] = array('');
if ($efType == ARTIFACT_EXTRAFIELDTYPE_STATUS) {
- echo html_e('strong', array(), _('Status'));
- echo $ath->statusBox('status_id',1,false,false);
+ $cells[] = array('');
}
- echo html_e('input', array( 'type'=>'submit',
'name'=>'post_changes', 'value'=>_('Submit')));
+ $content = html_e('input', array('type'=>'submit',
'name'=>'post_changes_alphaorder', 'value'=>_('Alphabetical order')));
+ $cells[] = array($content, 'class'=>'align-left');
+ echo $HTML->multiTableRow($row_attrs, $cells);
+ echo $HTML->listTableBottom();
echo $HTML->closeForm();
} else {
- // $efType == ARTIFACT_EXTRAFIELDTYPE_USER
- $vals = array();
- // specific for user select box
- echo html_e('p',array(),_('Choose roles used for the
user select box'));
- $g=$ath->getGroup();
- $roles = $g->getRoles();
- foreach ($roles as $role) {
- $vals[$role->getID()]=$role->getName();
- }
- // end
- asort($vals,SORT_FLAG_CASE);
- $rows=count($efearr);
- // change by:
- // $checked_array = array_column($efearr,
'element_name');
- // for php>=5.5.0
- $checked_array = array();
- for ($i=0; $i < $rows; $i++) {
- $checked_array []= $efearr[$i]['element_name'];
- }
-
- echo $HTML->openForm(array('action' =>
'/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&boxid='.$boxid,
'method' => 'post'));
- echo html_e('input', array('type'=>'hidden',
'name'=>'update_checked_opt', 'value'=>'y'));
- echo html_build_checkboxes_from_array($vals, 'element',
$checked_array, true);
- echo html_e('input', array('type'=>'submit',
'name'=>'post_changes', 'value'=>_('Submit')));
- echo $HTML->closeForm();
+ echo html_e('strong', array(), _('You have not defined
any elements.'));
}
- $ath->footer();
+ echo html_e('br').html_e('br');
+ echo $HTML->openForm(array('action' =>
'/tracker/admin/?group_id='.$group_id.'&boxid='.$boxid.'&atid='.$ath->getID(),
'method' => 'post'));
+ echo html_e('input', array('type'=>'hidden', 'name'=>'add_opt',
'value'=>'y'));
+ echo html_e('label', array('for'=>'name'),html_e('strong',
array(), _('Add New Element')._(':')));
+ echo html_e('input', array('type'=>'text', 'id'=>'name',
'name'=>'name', 'value'=>'', 'size'=>'15', 'maxlength'=>'30'));
+ // Show a pop-up box to choose the possible statuses that this
element will map to
+ if ($efType == ARTIFACT_EXTRAFIELDTYPE_STATUS) {
+ echo html_e('strong', array(), _('Status'));
+ echo $ath->statusBox('status_id',1,false,false);
+ }
+ echo html_e('input', array( 'type'=>'submit',
'name'=>'post_changes', 'value'=>_('Submit')));
+ echo $HTML->closeForm();
+ } else {
+ // $efType == ARTIFACT_EXTRAFIELDTYPE_USER
+ $vals = array();
+ // specific for user select box
+ echo html_e('p',array(),_('Choose roles used for the user
select box'));
+ $g=$ath->getGroup();
+ $roles = $g->getRoles();
+ foreach ($roles as $role) {
+ $vals[$role->getID()]=$role->getName();
+ }
+ // end
+ asort($vals,SORT_FLAG_CASE);
+ $rows=count($efearr);
+ // change by:
+ // $checked_array = array_column($efearr, 'element_name');
+ // for php>=5.5.0
+ $checked_array = array();
+ for ($i=0; $i < $rows; $i++) {
+ $checked_array []= $efearr[$i]['element_name'];
+ }
+
+ echo $HTML->openForm(array('action' =>
'/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&boxid='.$boxid,
'method' => 'post'));
+ echo html_e('input', array('type'=>'hidden',
'name'=>'update_checked_opt', 'value'=>'y'));
+ echo html_build_checkboxes_from_array($vals, 'element',
$checked_array, true);
+ echo html_e('input', array('type'=>'submit',
'name'=>'post_changes', 'value'=>_('Submit')));
+ echo $HTML->closeForm();
+ }
+ $ath->footer();
}
// Local Variables:
diff --git a/src/common/tracker/views/form-deleteextrafield.php
b/src/common/tracker/views/form-deleteextrafield.php
index ed116bf..a4caa38 100644
--- a/src/common/tracker/views/form-deleteextrafield.php
+++ b/src/common/tracker/views/form-deleteextrafield.php
@@ -30,41 +30,41 @@ $ath->adminHeader(array('title'=>sprintf(_('Delete a custom
field for %s'),
$id = getStringFromRequest('id');
?>
- <table class="centered">
- <tr>
- <td>
- <fieldset>
- <legend><?php echo _('Confirm Delete') ?></legend>
+<table class="centered">
+<tr>
+<td>
+<fieldset>
+<legend><?php echo _('Confirm Delete') ?></legend>
<?php
echo $HTML->openForm(array('action' =>
'/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID(), 'method' =>
'post'));
?>
- <p>
- <input type="hidden" name="deleteextrafield" value="y" />
- <input type="hidden" name="id" value="<?php echo $id; ?>" />
- <?php echo _('You are about to permanently and irretrievably
delete this custom field and all its contents!'); ?>
- </p>
- <p>
- <input id="sure" type="checkbox" name="sure" value="1" />
- <label for="sure">
- <?php echo _("I am Sure") ?><br />
- </label>
- <input id="really_sure" type="checkbox" name="really_sure"
value="1" />
- <label for="really_sure">
- <?php echo _("I am Really Sure") ?>
- </label>
- </p>
- <p>
- <input type="submit" name="post_changes" value="<?php echo
_('Delete') ?>" /></p>
+<p>
+<input type="hidden" name="deleteextrafield" value="y" />
+<input type="hidden" name="id" value="<?php echo $id; ?>" />
+<?php echo _('You are about to permanently and irretrievably delete this
custom field and all its contents!'); ?>
+</p>
+<p>
+<input id="sure" type="checkbox" name="sure" value="1" />
+<label for="sure">
+<?php echo _("I am Sure") ?><br />
+</label>
+<input id="really_sure" type="checkbox" name="really_sure" value="1" />
+<label for="really_sure">
+<?php echo _("I am Really Sure") ?>
+</label>
+</p>
+<p>
+<input type="submit" name="post_changes" value="<?php echo _('Delete') ?>"
/></p>
<?php
echo $HTML->closeForm();
?>
- </fieldset>
- </td>
- </tr>
- </table>
- <?php
+</fieldset>
+</td>
+</tr>
+</table>
+<?php
- $ath->footer();
+$ath->footer();
// Local Variables:
// mode: php
diff --git a/src/common/tracker/views/form-deleteextrafieldelement.php
b/src/common/tracker/views/form-deleteextrafieldelement.php
index dac654f..b9f1648 100644
--- a/src/common/tracker/views/form-deleteextrafieldelement.php
+++ b/src/common/tracker/views/form-deleteextrafieldelement.php
@@ -28,72 +28,72 @@ global $HTML;
//
// FORM TO DELETE POP-UP CHOICES FOR A BOX
//
- /*
- Allow deletion of a Choice for a Pop-up Box
- */
- $boxid = getIntFromRequest('boxid');
- $ac = new ArtifactExtraField($ath,$boxid);
- if (!$ac || !is_object($ac)) {
- exit_error(_('Unable to create ArtifactExtraField
Object'),'tracker');
- } elseif ($ac->isError()) {
- exit_error($ac->getErrorMessage(),'tracker');
+/*
+ Allow deletion of a Choice for a Pop-up Box
+*/
+$boxid = getIntFromRequest('boxid');
+$ac = new ArtifactExtraField($ath,$boxid);
+if (!$ac || !is_object($ac)) {
+ exit_error(_('Unable to create ArtifactExtraField Object'),'tracker');
+} elseif ($ac->isError()) {
+ exit_error($ac->getErrorMessage(),'tracker');
+} else {
+ $id = getStringFromRequest('id');
+ $ao = new ArtifactExtraFieldElement($ac,$id);
+ if (!$ao || !is_object($ao)) {
+ exit_error(_('Unable to create ArtifactExtraFieldElement
Object'),'tracker');
+ } elseif ($ao->isError()) {
+ exit_error($ao->getErrorMessage(),'tracker');
} else {
- $id = getStringFromRequest('id');
- $ao = new ArtifactExtraFieldElement($ac,$id);
- if (!$ao || !is_object($ao)) {
- exit_error(_('Unable to create
ArtifactExtraFieldElement Object'),'tracker');
- } elseif ($ao->isError()) {
- exit_error($ao->getErrorMessage(),'tracker');
- } else {
- $ath->adminHeader(array('title'=>sprintf(_("Delete a
custom field element in: %s"),
- $ath->getName())));
+ $ath->adminHeader(array('title'=>sprintf(_("Delete a custom
field element in: %s"),
+ $ath->getName())));
- ?>
- <table class="centered">
- <tr>
- <td>
- <fieldset>
- <legend><?php echo _('Confirm Delete') ?></legend>
- <?php
- echo $HTML->openForm(array('action' =>
'/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID(), 'method' =>
'post'));
- ?>
- <input type="hidden" name="delete_opt" value="y" />
- <input type="hidden" name="id" value="<?php echo
$ao->getID(); ?>" />
- <input type="hidden" name="boxid" value="<?php echo
$boxid; ?>" />
+ ?>
+ <table class="centered">
+ <tr>
+ <td>
+ <fieldset>
+ <legend><?php echo _('Confirm Delete') ?></legend>
+ <?php
+ echo $HTML->openForm(array('action' =>
'/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID(), 'method' =>
'post'));
+ ?>
+ <input type="hidden" name="delete_opt" value="y" />
+ <input type="hidden" name="id" value="<?php echo $ao->getID();
?>" />
+ <input type="hidden" name="boxid" value="<?php echo $boxid; ?>"
/>
- <p>
- <strong><?php echo _("Element")._(':'); ?></strong>
- <?php echo $ao->getName(); ?>
- </p>
+ <p>
+ <strong><?php echo _("Element")._(':'); ?></strong>
+ <?php echo $ao->getName(); ?>
+ </p>
- <p>
- <input id="sure" type="checkbox" name="sure" value="1"
/>
- <label for="sure">
- <?php echo _("I am Sure") ?>
- </label>
- </p>
+ <p>
+ <input id="sure" type="checkbox" name="sure" value="1" />
+ <label for="sure">
+ <?php echo _("I am Sure") ?>
+ </label>
+ </p>
- <p>
- <input id="really_sure" type="checkbox"
name="really_sure" value="1" />
- <label for="really_sure">
- <?php echo _("I am Really Sure") ?>
- </label>
- </p>
+ <p>
+ <input id="really_sure" type="checkbox" name="really_sure"
value="1" />
+ <label for="really_sure">
+ <?php echo _("I am Really Sure") ?>
+ </label>
+ </p>
- <p>
- <input type="submit" name="post_changes" value="<?php
echo _('Delete') ?>" /></p>
- <?php
- echo $HTML->closeForm();
- ?>
- </fieldset>
- </td>
- </tr>
- </table>
- <?php
- $ath->footer();
- }
+ <p>
+ <input type="submit" name="post_changes" value="<?php echo
_('Delete') ?>" /></p>
+ <?php
+ echo $HTML->closeForm();
+ ?>
+ </fieldset>
+ </td>
+ </tr>
+ </table>
+ <?php
+ $ath->footer();
}
+}
// Local Variables:
// mode: php
diff --git a/src/common/tracker/views/form-deletetracker.php
b/src/common/tracker/views/form-deletetracker.php
index 68c8a29..54ce90f 100644
--- a/src/common/tracker/views/form-deletetracker.php
+++ b/src/common/tracker/views/form-deletetracker.php
@@ -27,35 +27,35 @@ global $HTML;
$ath->adminHeader(array ('title'=>sprintf(_('Permanently Delete Tracker %s'),
$ath->getName())));
?>
- <table class="centered">
- <tr>
- <td>
- <fieldset>
- <legend><?php echo _('Confirm Delete') ?></legend>
+<table class="centered">
+<tr>
+<td>
+<fieldset>
+<legend><?php echo _('Confirm Delete') ?></legend>
<?php
echo $HTML->openForm(array('action' =>
'/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID(), 'method' =>
'post'));
?>
- <input type="hidden" name="delete" value="y" /><br />
- <?php echo _('You are about to permanently and irretrievably
delete this tracker and all its contents!'); ?>
- <p>
- <input id="sure" type="checkbox" name="sure" value="1" />
- <label for="sure">
- <?php echo _("I am Sure") ?><br />
- </label>
- <input id="really_sure" type="checkbox" name="really_sure"
value="1" />
- <label for="really_sure">
- <?php echo _("I am Really Sure") ?>
- </label>
- </p>
- <p>
- <input type="submit" name="post_changes" value="<?php echo
_('Delete') ?>" /></p>
+<input type="hidden" name="delete" value="y" /><br />
+<?php echo _('You are about to permanently and irretrievably delete this
tracker and all its contents!'); ?>
+<p>
+<input id="sure" type="checkbox" name="sure" value="1" />
+<label for="sure">
+<?php echo _("I am Sure") ?><br />
+</label>
+<input id="really_sure" type="checkbox" name="really_sure" value="1" />
+<label for="really_sure">
+<?php echo _("I am Really Sure") ?>
+</label>
+</p>
+<p>
+<input type="submit" name="post_changes" value="<?php echo _('Delete') ?>"
/></p>
<?php
echo $HTML->closeForm();
?>
- </fieldset>
- </td>
- </tr>
- </table>
+</fieldset>
+</td>
+</tr>
+</table>
<?php
diff --git a/src/common/tracker/views/form-workflow_roles.php
b/src/common/tracker/views/form-workflow_roles.php
index b1f4600..6f650be 100644
--- a/src/common/tracker/views/form-workflow_roles.php
+++ b/src/common/tracker/views/form-workflow_roles.php
@@ -27,58 +27,58 @@ require_once 'common/tracker/ArtifactWorkflow.class.php';
global $HTML;
- $from = getIntFromRequest('from');
- $next = getIntFromRequest('next');
+$from = getIntFromRequest('from');
+$next = getIntFromRequest('next');
// FORM TO UPDATE ARTIFACT TYPES
- /*
- List of possible user built Selection Boxes for an
ArtifactType
- */
- $efarr =
$ath->getExtraFields(array(ARTIFACT_EXTRAFIELDTYPE_STATUS));
- if (count($efarr) === 0) {
- // TODO: Normal status is not implemented right now.
- return false;
- } elseif (count($efarr) !== 1) {
- // Internal error.
- return false;
- }
+/*
+ List of possible user built Selection Boxes for an ArtifactType
+*/
+$efarr = $ath->getExtraFields(array(ARTIFACT_EXTRAFIELDTYPE_STATUS));
+if (count($efarr) === 0) {
+ // TODO: Normal status is not implemented right now.
+ return false;
+} elseif (count($efarr) !== 1) {
+ // Internal error.
+ return false;
+}
- $keys=array_keys($efarr);
- $field_id = $keys[0];
+$keys=array_keys($efarr);
+$field_id = $keys[0];
- $atw = new ArtifactWorkflow($ath, $field_id);
- $roles = $atw->getAllowedRoles($from, $next);
+$atw = new ArtifactWorkflow($ath, $field_id);
+$roles = $atw->getAllowedRoles($from, $next);
- $elearray = $ath->getExtraFieldElements($field_id);
- foreach ($elearray as $e) {
- $name[ $e['element_id'] ] = $e['element_name'];
- }
+$elearray = $ath->getExtraFieldElements($field_id);
+foreach ($elearray as $e) {
+ $name[ $e['element_id'] ] = $e['element_name'];
+}
- $title = sprintf(_('Configuring allowed roles for the
transitions from %1$s to %2$s'), $name[$from], $name[$next]);
- $ath->adminHeader(array('title'=>$title,
- 'pagename'=>'tracker_admin_customize_liste',
- 'titlevals'=>array($ath->getName())));
+$title = sprintf(_('Configuring allowed roles for the transitions from %1$s to
%2$s'), $name[$from], $name[$next]);
+$ath->adminHeader(array('title'=>$title,
+ 'pagename'=>'tracker_admin_customize_liste',
+ 'titlevals'=>array($ath->getName())));
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_roles" value="1" />
- <input type="hidden" name="from" value="<?php echo $from ?>" />
- <input type="hidden" name="next" value="<?php echo $next ?>" />
+<input type="hidden" name="field_id" value="<?php echo $field_id ?>" />
+<input type="hidden" name="workflow_roles" value="1" />
+<input type="hidden" name="from" value="<?php echo $from ?>" />
+<input type="hidden" name="next" value="<?php echo $next ?>" />
<?php
- $group_roles = $group->getRoles() ;
- sortRoleList ($group_roles) ;
- foreach ($group_roles as $role) {
- $value = in_array($role->getID(), $roles)? '
checked="checked"' : '';
- $str = '<input type="checkbox"
name="role['.$role->getID().']"'.$value.' />';
- $str .= ' '.$role->getDisplayableName($group);
- echo $str."<br />\n";
- }
+$group_roles = $group->getRoles() ;
+sortRoleList ($group_roles) ;
+foreach ($group_roles as $role) {
+ $value = in_array($role->getID(), $roles)? ' checked="checked"' : '';
+ $str = '<input type="checkbox"
name="role['.$role->getID().']"'.$value.' />';
+ $str .= ' '.$role->getDisplayableName($group);
+ echo $str."<br />\n";
+}
?>
- <p>
- <input type="submit" name="post_changes" value="<?php echo
_('Submit') ?>" /></p>
- <?php
+<p>
+<input type="submit" name="post_changes" value="<?php echo _('Submit') ?>"
/></p>
+<?php
echo $HTML->closeForm();
- $ath->footer();
+$ath->footer();
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/views/listtrashfile.php | 4 +-
src/common/docman/views/pendingfiles.php | 4 +-
src/common/forum/AttachManager.class.php | 10 +-
src/common/forum/ForumAdmin.class.php | 6 +-
src/common/forum/ForumHTML.class.php | 2 +-
src/common/include/Plugin.class.php | 4 +-
src/common/tracker/actions/detail.php | 2 +-
src/common/tracker/actions/ind.php | 2 +-
src/common/tracker/actions/mod-limited.php | 4 +-
src/common/tracker/actions/mod.php | 8 +-
src/common/tracker/include/ArtifactHtml.class.php | 2 +-
.../tracker/include/ArtifactTypeHtml.class.php | 4 +-
.../tracker/views/form-addextrafieldoption.php | 172 ++++++++++-----------
src/common/tracker/views/form-adminroadmap.php | 8 +-
src/common/tracker/views/form-customizelist.php | 4 +-
src/common/tracker/views/form-deleteextrafield.php | 56 +++----
.../tracker/views/form-deleteextrafieldelement.php | 116 +++++++-------
src/common/tracker/views/form-deletetracker.php | 46 +++---
.../views/form-workflow_required_fields.php | 94 +++++------
src/common/tracker/views/form-workflow_roles.php | 82 +++++-----
.../Widget_MyProjectsLastDocuments.class.php | 4 +-
src/docs/README.Themes | 2 +-
src/plugins/globalsearch/www/index.php | 4 +-
.../wiki/common/WikiHtmlSearchRenderer.class.php | 2 +-
src/plugins/wiki/common/WikiPlugin.class.php | 2 +-
src/www/admin/cronman.php | 4 +-
src/www/include/Layout.class.php | 4 +-
src/www/include/note.php | 2 +-
src/www/include/project_summary.php | 16 +-
src/www/include/user_home.php | 2 +-
src/www/include/vote_function.php | 8 +-
src/www/new/index.php | 4 +-
src/www/pm/browse_task.php | 4 +-
src/www/pm/detail_task.php | 2 +-
src/www/pm/index.php | 2 +-
src/www/pm/mod_task.php | 2 +-
.../renderers/DocsAllHtmlSearchRenderer.class.php | 4 +-
.../renderers/ForumHtmlSearchRenderer.class.php | 2 +-
.../renderers/ForumsHtmlSearchRenderer.class.php | 2 +-
.../include/renderers/HtmlSearchRenderer.class.php | 4 +-
.../renderers/NewsHtmlSearchRenderer.class.php | 2 +-
.../renderers/PeopleHtmlSearchRenderer.class.php | 2 +-
.../renderers/ProjectHtmlSearchRenderer.class.php | 2 +-
.../renderers/TasksHtmlSearchRenderer.class.php | 2 +-
src/www/snippet/add_snippet_to_package.php | 2 +-
src/www/snippet/detail.php | 6 +-
src/www/softwaremap/trove_list.php | 2 +-
src/www/trove/index.php | 8 +-
48 files changed, 365 insertions(+), 367 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
