[Fusionforge-commits] r8260 - in trunk/gforge/www: admin docman docman/include export forum forum/admin frs/admin
Alain Peyrat
aljeux at libremir.placard.fr.eu.org
Tue Oct 13 19:01:30 CEST 2009
Author: aljeux
Date: 2009-10-13 19:01:30 +0200 (Tue, 13 Oct 2009)
New Revision: 8260
Modified:
trunk/gforge/www/admin/admin_table.php
trunk/gforge/www/docman/doceditor.php
trunk/gforge/www/docman/include/doc_utils.php
trunk/gforge/www/docman/new.php
trunk/gforge/www/export/rss20_activity.php
trunk/gforge/www/forum/admin/index.php
trunk/gforge/www/forum/forum.php
trunk/gforge/www/frs/admin/deleterelease.php
trunk/gforge/www/frs/admin/index.php
Log:
Misc xhtml fixes
Modified: trunk/gforge/www/admin/admin_table.php
===================================================================
--- trunk/gforge/www/admin/admin_table.php 2009-10-12 18:57:20 UTC (rev 8259)
+++ trunk/gforge/www/admin/admin_table.php 2009-10-13 17:01:30 UTC (rev 8260)
@@ -52,7 +52,7 @@
echo '<td><input type="text" name="'.$fieldname.'" value="" /></td></tr>';
}
echo '</table><input type="submit" value="'._('Add').'" />
- <input type="hidden" name="__fields__" value="'.implode(',',$fields).'">
+ <input type="hidden" name="__fields__" value="'.implode(',',$fields).'" />
</form>
<form name="cancel" action="'.getStringFromServer('PHP_SELF').'" method="post">
<input type="submit" value="'._('Cancel').'" />
Modified: trunk/gforge/www/docman/doceditor.php
===================================================================
--- trunk/gforge/www/docman/doceditor.php 2009-10-12 18:57:20 UTC (rev 8259)
+++ trunk/gforge/www/docman/doceditor.php 2009-10-13 17:01:30 UTC (rev 8260)
@@ -65,7 +65,7 @@
if (!$GLOBALS['editor_was_set_up']) {
//if we don't have any plugin for text editor, display a simple textarea edit box
$editor = false;
- echo '<textarea name="data" rows="15" cols="100" wrap="soft"></textarea><br />';
+ echo '<textarea name="data" rows="15" cols="100"></textarea><br />';
echo '<script>
window.document.theform.data.value = window.opener.document.adddata.data.value;
</script>';
@@ -80,9 +80,9 @@
unset($GLOBALS['editor_was_set_up']);
if ($editor) {
- echo '<br><div align="right"><input type="submit" value="update" onclick="window.opener.document.adddata.data.value=getEditorValue(\'data\');window.close();"/></div>';
+ echo '<br /><div align="right"><input type="submit" value="update" onclick="window.opener.document.adddata.data.value=getEditorValue(\'data\');window.close();"/></div>';
} else {
- echo '<br><div align="right"><input type="submit" value="update" onclick="window.opener.document.adddata.data.value=window.document.theform.data.value;window.close();"/></div>';
+ echo '<br /><div align="right"><input type="submit" value="update" onclick="window.opener.document.adddata.data.value=window.document.theform.data.value;window.close();"/></div>';
}
echo '</form>';
Modified: trunk/gforge/www/docman/include/doc_utils.php
===================================================================
--- trunk/gforge/www/docman/include/doc_utils.php 2009-10-12 18:57:20 UTC (rev 8259)
+++ trunk/gforge/www/docman/include/doc_utils.php 2009-10-13 17:01:30 UTC (rev 8260)
@@ -159,7 +159,7 @@
return;
}
- echo "<ul style='list-style-type: none'>";
+ echo "<ul style='list-style-type: none'>\n";
$child_count = count($nested_groups["$parent_group"]);
for ($i=0; $i < $child_count; $i++) {
@@ -181,9 +181,10 @@
// display link to add a document to the current group
echo " <a href='".($from_admin ? "../" : "")."new.php?group_id=".$doc_group->Group->getID()."&selected_doc_group=".$doc_group->getID()."'>";
- echo html_image('ic/adddoc12.png',"12","14",array("border"=>"0"))." ";
+ echo html_image('ic/adddoc12.png',"12","14",array("border"=>"0", 'align'=>'bottom'))." ";
echo _('[Add document here]');
- echo "</a>";
+ echo "</a></li>\n";
+
if (($doc_group->getID() == $selected_doc_group_id || $doc_group->hasSubgroup($nested_groups, $selected_doc_group_id)) && (!$stateid || $stateid == @$selected_stateid)) {
docman_display_documents($nested_groups, $document_factory, $is_editor, $stateid, $from_admin, $doc_group->getID());
}
Modified: trunk/gforge/www/docman/new.php
===================================================================
--- trunk/gforge/www/docman/new.php 2009-10-12 18:57:20 UTC (rev 8259)
+++ trunk/gforge/www/docman/new.php 2009-10-13 17:01:30 UTC (rev 8260)
@@ -55,7 +55,6 @@
exit_error(_('Error'),_('No valid Document Group was selected.'));
}
- //if (!$title || !$description || (!$uploaded_data && !$file_url && !$ftp_filename && (!$editor && !$name ) )) {
if (!$title || !$description || (!$uploaded_data && !$file_url && (!$editor && !$name ) )) {
exit_missing_param();
}
@@ -166,7 +165,7 @@
echo _('Choose an FTP file instead of uploading:').'</strong>'. utils_requiredField() .'<br />';
$ftp_files_arr=array_merge($arr,ls($upload_dir,true));
echo html_build_select_box_from_arrays($ftp_files_arr,$ftp_files_arr,'ftp_filename','');
- echo '</td></tr><input type="hidden" name="type" value="ftpupload">';
+ echo '</td></tr><input type="hidden" name="type" value="ftpupload" />';
break;
} else {
exit_error(_('You must enable ftp uploads first'));
Modified: trunk/gforge/www/export/rss20_activity.php
===================================================================
--- trunk/gforge/www/export/rss20_activity.php 2009-10-12 18:57:20 UTC (rev 8259)
+++ trunk/gforge/www/export/rss20_activity.php 2009-10-13 17:01:30 UTC (rev 8260)
@@ -131,7 +131,7 @@
} else {
// Print error showing no group was selected
- echo "<br><span class=\"error\"> Error: No group selected</span>";
+ echo "<br /><span class=\"error\"> Error: No group selected</span>";
}
Modified: trunk/gforge/www/forum/admin/index.php
===================================================================
--- trunk/gforge/www/forum/admin/index.php 2009-10-12 18:57:20 UTC (rev 8259)
+++ trunk/gforge/www/forum/admin/index.php 2009-10-13 17:01:30 UTC (rev 8260)
@@ -101,11 +101,11 @@
<input type="radio" name="allow_anonymous" value="0" checked="checked" />'._('No').'
<br /><br />' .
html_build_select_box_from_assoc(array("0" => _('No Moderation') ,"1" => _('Moderated Level 1'),"2" => _('Moderated Level 2') ),"moderation_level",0) . '
- <br>' . _('Moderated Level 1') . ': ' . _('To moderate anonymous posts (if allowed in public forum) and posts from non-member users.') . '<br>' . _('Moderated Level 2') . ': ' . _('To moderate ALL posts.') . '<p>
+ <br />' . _('Moderated Level 1') . ': ' . _('To moderate anonymous posts (if allowed in public forum) and posts from non-member users.') . '<br />' . _('Moderated Level 2') . ': ' . _('To moderate ALL posts.') . '<p>
<strong>'._('Email All Posts To:').'</strong><br />
<input type="text" name="send_all_posts_to" value="" size="30" maxlength="50" />
- <p>
+ <br />
<input type="submit" name="submit" value="'._('Add This Forum').'" />
</p>
</form>';
@@ -147,13 +147,14 @@
<input type="radio" name="allow_anonymous" value="0"'.(($f->AllowAnonymous() == 0)?' checked="checked"':'').'/> '._('No').'<br />
+ <p />
<strong>'._('Is Public?').'</strong><br />
<input type="radio" name="is_public" value="1"'.(($f->isPublic() == 1)?' checked="checked"':'').' /> '._('Yes').'<br />
<input type="radio" name="is_public" value="0"'.(($f->isPublic() == 0)?' checked="checked"':'').' /> '._('No').'<br />
<input type="radio" name="is_public" value="9"'.(($f->isPublic() == 9)?' checked="checked"':'').' />'._('Deleted').'<br />
<p>' .
html_build_select_box_from_assoc(array("0" => _('No Moderation') ,"1" => _('Moderated Level 1'),"2" => _('Moderated Level 2') ),"moderation_level",$f->getModerationLevel()) . '
- <br>' . _('Moderated Level 1') . ': ' . _('To moderate anonymous posts (if allowed in public forum) and posts from non-member users.') . '<br>' . _('Moderated Level 2') . ': ' . _('To moderate ALL posts.') . '<p>
+ <br />' . _('Moderated Level 1') . ': ' . _('To moderate anonymous posts (if allowed in public forum) and posts from non-member users.') . '<br />' . _('Moderated Level 2') . ': ' . _('To moderate ALL posts.') . '<p>
<strong>'._('Forum Name').':</strong><br />
@@ -184,6 +185,7 @@
forum_header(array('title'=>_('Delete')));
echo '<p>
<strong>'._('You are about to permanently and irretrievably delete this entire forum and all its contents!').'</strong><br />
+ </p>
<form method="post" action="'.getStringFromServer('PHP_SELF').'">
<input type="hidden" name="post_changes" value="y" />
<input type="hidden" name="deleteforum" value="y" />
@@ -217,23 +219,25 @@
if (!$thread_id) {
echo "window.location='/forum/message.php?msg_id=$msg_id';";
} else {
- echo "window.location='/forum/forum.php?thread_id=$thread_id&forum_id=$forum_id';";
+ echo "window.location='/forum/forum.php?thread_id=$thread_id&forum_id=$forum_id';";
}
echo "</script>";
} else {
//print the delete message confirmation
forum_header(array('title'=>_('Delete a Message')));
- echo '<p><center>
+ echo '<center>
<form action="'.getStringFromServer('PHP_SELF').'" method="post">
<h3>' . _('WARNING! You are about to permanently delete a message and all of its followups!!') . '</h3><p>
- <input type="submit" name="ok" value="' . _('Yes') . '">
- <input type="submit" name="cancel" value="' . _('No') . '">
- <input type="hidden" name="deletemsg" value="'.$msg_id.'">
- <input type="hidden" name="group_id" value="'.$group_id.'">
- <input type="hidden" name="forum_id" value="'.$forum_id.'">
- <input type="hidden" name="thread_id" value="'.$thread_id.'">
- </center>
- </form>';
+ <p>
+ <input type="submit" name="ok" value="' . _('Yes') . '" />
+ <input type="submit" name="cancel" value="' . _('No') . '" />
+ <input type="hidden" name="deletemsg" value="'.$msg_id.'" />
+ <input type="hidden" name="group_id" value="'.$group_id.'" />
+ <input type="hidden" name="forum_id" value="'.$forum_id.'" />
+ <input type="hidden" name="thread_id" value="'.$thread_id.'" />
+ </p>
+ </form>
+ </center>';
forum_footer(array());
}
} else {
@@ -375,9 +379,9 @@
} elseif ($farr[$j]->isError()) {
echo $farr[$j]->getErrorMessage();
} else {
- echo '<a href="'.getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&change_status=1&group_forum_id='. $farr[$j]->getID() .'">'.
+ echo '<p><a href="'.getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&change_status=1&group_forum_id='. $farr[$j]->getID() .'">'.
$farr[$j]->getName() .'</a><br />'.$farr[$j]->getDescription().'<br /><a href="monitor.php?group_id='.$group_id.'&group_forum_id='. $farr[$j]->getID() .'">'.
- _('Monitoring Users').'</a><p>';
+ _('Monitoring Users').'</a></p>';
}
}
Modified: trunk/gforge/www/forum/forum.php
===================================================================
--- trunk/gforge/www/forum/forum.php 2009-10-12 18:57:20 UTC (rev 8259)
+++ trunk/gforge/www/forum/forum.php 2009-10-13 17:01:30 UTC (rev 8260)
@@ -358,7 +358,7 @@
if ($offset != 0) {
$ret_val .= '<span class="prev">
<a href="javascript:history.back()"><strong>' .
- html_image('t2.png',"15","15",array("border"=>"0","ALIGN"=>"MIDDLE")) ._('Previous Messages').'</a></strong></span>';
+ html_image('t2.png',"15","15",array("border"=>"0","align"=>"middle")) ._('Previous Messages').'</strong></a></span>';
} else {
$ret_val .= ' ';
}
@@ -370,7 +370,7 @@
<a href="'.util_make_url ('/forum/forum.php?max_rows='.$max_rows.'&style='.$style.'&offset='.($offset+$i).
'&forum_id='.$forum_id.'&group_id='.$group_id).'">
<strong> '._('Next Messages') .
- html_image('t.png',"15","15",array("border"=>"0","ALIGN"=>"MIDDLE")) . '</strong></a>';
+ html_image('t.png',"15","15",array("border"=>"0","align"=>"middle")) . '</strong></a></span>';
} else {
$ret_val .= ' ';
}
Modified: trunk/gforge/www/frs/admin/deleterelease.php
===================================================================
--- trunk/gforge/www/frs/admin/deleterelease.php 2009-10-12 18:57:20 UTC (rev 8259)
+++ trunk/gforge/www/frs/admin/deleterelease.php 2009-10-13 17:01:30 UTC (rev 8260)
@@ -79,6 +79,7 @@
<input type="checkbox" name="sure" value="1" />'._('I\'m Sure').'<br />
<input type="checkbox" name="really_sure" value="1" />'._('I\'m Really Sure').'<br />
<input type="submit" name="submit" value="'._('Delete').'" />
+ </p>
</form>';
frs_admin_footer();
Modified: trunk/gforge/www/frs/admin/index.php
===================================================================
--- trunk/gforge/www/frs/admin/index.php 2009-10-12 18:57:20 UTC (rev 8259)
+++ trunk/gforge/www/frs/admin/index.php 2009-10-13 17:01:30 UTC (rev 8260)
@@ -123,11 +123,11 @@
$rows=db_numrows($res);
if ($res && $rows > 0) {
echo '<h3>'._('QRS').'</h3>';
- printf(_('Click here to %1$s quick-release a file %2$s'), '<a href="qrs.php?package_id=' . $package_id . '&group_id=' . $group_id . '">', '</a>').'<br />';
+ printf(_('Click here to %1$s quick-release a file %2$s'), '<a href="qrs.php?package_id=' . $package_id . '&group_id=' . $group_id . '">', '</a>').'<br />';
}
?>
<?php echo _('<h3>Packages</h3><p>You can use packages to group different file releases together, or use them however you like. <p><h4>An example of packages:</h4><p><strong>Mysql-win</strong><br /><strong>Mysql-unix</strong><br /><strong>Mysql-odbc</strong><p><h4>Your Packages:</h4><p><ol><li>Define your packages</li><li>Create new releases of packages</li></ol><p><h3>Releases of Packages</h3><p>A release of a package can contain multiple files.<p><h4>Examples of Releases</h4><p><strong>3.22.1</strong><br /><strong>3.22.2</strong><br /><strong>3.22.3</strong><br /><p>You can create new releases of packages by clicking on <strong>Add/Edit Releases</strong> next to your package name.<p>') ?>
-<p>
+
<?php
/*
@@ -187,17 +187,17 @@
*/
?>
-</p>
+
<h3><?php echo _('New Package Name') ?>:</h3>
-<p>
+
<form action="<?php echo getStringFromServer('PHP_SELF'); ?>" method="post">
<input type="hidden" name="group_id" value="<?php echo $group_id; ?>" />
<input type="hidden" name="func" value="add_package" />
<input type="text" name="package_name" value="" size="20" maxlength="30" />
<p>
<strong><?php echo _('Publicly Viewable'); ?>:</strong><br />
-<input type="radio" name="is_public" value="1" checked> <?php echo _('Public'); ?><br />
-<input type="radio" name="is_public" value="0"> <?php echo _('Private'); ?><br />
+<input type="radio" name="is_public" value="1" checked="checked" /> <?php echo _('Public'); ?><br />
+<input type="radio" name="is_public" value="0" /> <?php echo _('Private'); ?><br />
<p><input type="submit" name="submit" value="<?php echo _('Create This Package') ?>" /></p>
</form></p>
More information about the Fusionforge-commits
mailing list