Skip to content

Commit

Permalink
Merge branch 'xhtml2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mantis
mantis committed Sep 5, 2014
2 parents b7e258c + 0552366 commit 6be85f0
Show file tree
Hide file tree
Showing 15 changed files with 136 additions and 80 deletions.
60 changes: 40 additions & 20 deletions account_sponsor_page.php
View file
Expand Up @@ -137,22 +137,33 @@
<br />
<div>
<table class="width100" cellspacing="1">
<colgroup>
<col style="width:10%" />
<col style="width:8%" />
<col style="width:7%" />
<col style="width:10%" />
<col style="width:10%" />
<col style="width:30%" />
<col style="width:8%" />
<col style="width:7%" />
<col style="width:10%" />
</colgroup>
<!-- Headings -->
<tr>
<td class="form-title" colspan="9">
<?php echo lang_get( 'own_sponsored' ) ?>
</td>
</tr>
<tr>
<td class="form-title" width="10%"><?php echo lang_get( 'email_bug' ) ?></td>
<td class="form-title" width="8%"><?php echo lang_get( 'email_project' ) ?></td>
<td class="form-title" width="7%"><?php echo lang_get( 'fixed_in_version' ) ?></td>
<td class="form-title" width="10%"><?php echo lang_get( 'email_status' ) ?></td>
<td class="form-title" width="10%"><?php echo lang_get( 'email_handler' ) ?></td>
<td class="form-title" width="30%"><?php echo lang_get( 'email_summary' ) ?></td>
<td class="form-title" width="8%"><?php echo lang_get( 'amount' ) ?></td>
<td class="form-title" width="7%"><?php echo lang_get( 'status' ) ?></td>
<td class="form-title" width="10%">&#160;</td>
<td class="form-title"><?php echo lang_get( 'email_bug' ) ?></td>
<td class="form-title"><?php echo lang_get( 'email_project' ) ?></td>
<td class="form-title"><?php echo lang_get( 'fixed_in_version' ) ?></td>
<td class="form-title"><?php echo lang_get( 'email_status' ) ?></td>
<td class="form-title"><?php echo lang_get( 'email_handler' ) ?></td>
<td class="form-title"><?php echo lang_get( 'email_summary' ) ?></td>
<td class="form-title"><?php echo lang_get( 'amount' ) ?></td>
<td class="form-title"><?php echo lang_get( 'status' ) ?></td>
<td class="form-title">&#160;</td>
</tr>
<?php
$t_total_owing = 0;
Expand Down Expand Up @@ -254,22 +265,31 @@
<form method="post" action="account_sponsor_update.php">
<?php echo form_security_field( 'account_sponsor_update' ) ?>
<table class="width100" cellspacing="1">

<colgroup>
<col style="width:10%" />
<col style="width:8%" />
<col style="width:7%" />
<col style="width:10%" />
<col style="width:35%" />
<col style="width:10%" />
<col style="width:10%" />
<col style="width:10%" />
</colgroup>
<!-- Headings -->
<tr>
<td class="form-title" colspan="8">
<?php echo lang_get( 'issues_handled' ) ?>
</td>
</tr>
<tr>
<td class="form-title" width="10%"><?php echo lang_get( 'email_bug' ) ?></td>
<td class="form-title" width="8%"><?php echo lang_get( 'email_project' ) ?></td>
<td class="form-title" width="7%"><?php echo lang_get( 'fixed_in_version' ) ?></td>
<td class="form-title" width="10%"><?php echo lang_get( 'email_status' ) ?></td>
<td class="form-title" width="35%"><?php echo lang_get( 'email_summary' ) ?></td>
<td class="form-title" width="10%"><?php echo lang_get( 'sponsor' ) ?></td>
<td class="form-title" width="10%"><?php echo lang_get( 'amount' ) ?></td>
<td class="form-title" width="10%"><?php echo lang_get( 'status' ) ?></td>
<td class="form-title"><?php echo lang_get( 'email_bug' ) ?></td>
<td class="form-title"><?php echo lang_get( 'email_project' ) ?></td>
<td class="form-title"><?php echo lang_get( 'fixed_in_version' ) ?></td>
<td class="form-title"><?php echo lang_get( 'email_status' ) ?></td>
<td class="form-title"><?php echo lang_get( 'email_summary' ) ?></td>
<td class="form-title"><?php echo lang_get( 'sponsor' ) ?></td>
<td class="form-title"><?php echo lang_get( 'amount' ) ?></td>
<td class="form-title"><?php echo lang_get( 'status' ) ?></td>
</tr>
<?php
$t_bug_list = array();
Expand Down Expand Up @@ -339,12 +359,12 @@
<td class="right"><?php echo sponsorship_format_amount( $t_total_paid ) ?></td>
<td></td>
</tr>
<input type="hidden" name="buglist" value="<?php echo $t_hidden_bug_list ?>" />
<!-- BUTTONS -->
<tr>
<td colspan="5">&#160;</td>
<!-- Update Button -->
<td colspan="2">
<td colspan="3">
<input type="hidden" name="buglist" value="<?php echo $t_hidden_bug_list ?>" />
<input type="submit" class="button" value="<?php echo lang_get( 'update_sponsorship_button' ) ?>" />
</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions bug_sponsorship_list_view_inc.php
View file
Expand Up @@ -95,7 +95,7 @@

$t_details_url = lang_get( 'sponsorship_process_url' );
if( !is_blank( $t_details_url ) ) {
echo '&#160;[<a href="' . $t_details_url . '" target="_blank">'
echo '&#160;[<a href="' . $t_details_url . '">'
. lang_get( 'sponsorship_more_info' ) . '</a>]';
}
?>
Expand Down Expand Up @@ -169,7 +169,7 @@

$t_details_url = lang_get( 'sponsorship_process_url' );
if( !is_blank( $t_details_url ) ) {
echo '&#160;[<a href="' . $t_details_url . '" target="_blank">'
echo '&#160;[<a href="' . $t_details_url . '">'
. lang_get( 'sponsorship_more_info' ) . '</a>]';
}

Expand Down
16 changes: 9 additions & 7 deletions core/html_api.php
View file
Expand Up @@ -1008,14 +1008,16 @@ function print_summary_submenu() {
}
}

echo '<div id="summary-submenu">';
echo '<ul class="menu">';
# Plugins menu items - these are cooked links
foreach ( $t_menu_options as $t_menu_item ) {
echo '<li>', $t_menu_item, '</li>';
if( sizeof( $t_menu_options ) > 0 ) {
echo "\t" . '<div id="summary-submenu">' . "\n";
echo "\t\t" . '<ul class="menu">' . "\n";
# Plugins menu items - these are cooked links
foreach ( $t_menu_options as $t_menu_item ) {
echo "\t\t\t" . '<li>', $t_menu_item, '</li> . "\n"';
}
echo "\t\t" . '</ul>' . "\n";
echo "\t" . '</div>' . "\n";
}
echo '</ul>';
echo '</div>';
}

/**
Expand Down
14 changes: 7 additions & 7 deletions core/summary_api.php
View file
Expand Up @@ -63,12 +63,12 @@
* @return void
*/
function summary_helper_print_row( $p_label, $p_open, $p_resolved, $p_closed, $p_total ) {
printf( '<tr>' );
printf( '<td width="50%%">%s</td>', $p_label );
printf( '<td width="12%%" class="right">%s</td>', $p_open );
printf( '<td width="12%%" class="right">%s</td>', $p_resolved );
printf( '<td width="12%%" class="right">%s</td>', $p_closed );
printf( '<td width="12%%" class="right">%s</td>', $p_total );
echo '<tr>';
printf( '<td class="width50">%s</td>', $p_label );
printf( '<td class="width12 right">%s</td>', $p_open );
printf( '<td class="width12 right">%s</td>', $p_resolved );
printf( '<td class="width12 right">%s</td>', $p_closed );
printf( '<td class="width12 right">%s</td>', $p_total );
echo '</tr>';
}

Expand Down Expand Up @@ -308,7 +308,7 @@ function summary_print_by_date( array $p_date_array ) {
$t_new_bugs_link = '<a class="subtle" href="' . config_get( 'bug_count_hyperlink_prefix' ) . '&amp;' . FILTER_PROPERTY_FILTER_BY_DATE . '=on&amp;' . FILTER_PROPERTY_START_YEAR . '=' . date( 'Y', $t_start_date ) . '&amp;' . FILTER_PROPERTY_START_MONTH . '=' . date( 'm', $t_start_date ) . '&amp;' . FILTER_PROPERTY_START_DAY . '=' . date( 'd', $t_start_date ) . '&amp;' . FILTER_PROPERTY_HIDE_STATUS . '=">';

echo '<tr>' . "\n";
echo ' <td width="50%">' . $t_days . '</td>' . "\n";
echo ' <td class="width50">' . $t_days . '</td>' . "\n";

if( $t_new_count > 0 ) {
echo ' <td class="right">' . $t_new_bugs_link . $t_new_count . '</a></td>' . "\n";
Expand Down
1 change: 1 addition & 0 deletions css/default.css
View file
Expand Up @@ -50,6 +50,7 @@ td.right { text-align: right; }
td.category, th.category { background-color: #c8c8e8; color: #000000; font-weight: bold; vertical-align : top; }
td.category2, th.category2 { background-color: #c8c8e8; color: #000000; vertical-align : top; }
td.overdue { background-color: #ff0000; color: #000000; font-weight: bold; }
td.sticky-header { background-color: #999999; }
td.width30 { width: 30%; }
td.col-1 { background-color: #d8d8d8; color: #000000; }
td.col-2 { background-color: #e8e8e8; color: #000000; }
Expand Down
12 changes: 8 additions & 4 deletions manage_config_workflow_page.php
View file
Expand Up @@ -420,8 +420,10 @@ function access_end() {
}
}

echo "<form name=\"workflow_config_action\" method=\"post\" action=\"manage_config_workflow_set.php\">\n";
echo '<form name="workflow_config_action" method="post" action="manage_config_workflow_set.php">' . "\n";
echo '<fieldset>';
echo form_security_field( 'manage_config_workflow_set' );
echo '</fieldset>';

if( ALL_PROJECTS == $t_project ) {
$t_project_title = lang_get( 'config_all_projects' );
Expand Down Expand Up @@ -492,17 +494,19 @@ function access_end() {

if( 0 < count( $g_overrides ) ) {
echo '<div class="right"><form name="mail_config_action" method="post" action="manage_config_revert.php">' ."\n";
echo '<fieldset>' . "\n";
echo form_security_field( 'manage_config_revert' );
echo '<input name="revert" type="hidden" value="' . implode( ',', $g_overrides ) . '"></input>';
echo '<input name="project" type="hidden" value="' . $t_project . '"></input>';
echo '<input name="return" type="hidden" value="' . string_attribute( form_action_self() ) .'"></input>';
echo '<input name="revert" type="hidden" value="' . implode( ',', $g_overrides ) . '" />';
echo '<input name="project" type="hidden" value="' . $t_project . '" />';
echo '<input name="return" type="hidden" value="' . string_attribute( form_action_self() ) .'" />';
echo '<input type="submit" class="button" value=';
if( ALL_PROJECTS == $t_project ) {
echo lang_get( 'revert_to_system' );
} else {
echo lang_get( 'revert_to_all_project' );
}
echo '" />' . "\n";
echo '</fieldset>' . "\n";
echo '</form></div>' . "\n";
}

Expand Down
39 changes: 26 additions & 13 deletions manage_plugin_page.php
View file
Expand Up @@ -79,10 +79,18 @@ function ( $p_p1, $p_p2 ) {
<div class="form-container">

<form action="manage_plugin_update.php" method="post">

<fieldset>
<?php echo form_security_field( 'manage_plugin_update' ) ?>
</fieldset>
<table>

<colgroup>
<col style="width:20%" />
<col style="width:35%" />
<col style="width:20%" />
<col style="width:7%" />
<col style="width:8%" />
<col style="width:10%" />
</colgroup>
<thead>
<!-- Title -->
<tr>
Expand All @@ -93,12 +101,12 @@ function ( $p_p1, $p_p2 ) {

<!-- Info -->
<tr class="row-category">
<th width="20%"><?php echo lang_get( 'plugin' ) ?></th>
<th width="35%"><?php echo lang_get( 'plugin_description' ) ?></th>
<th width="20%"><?php echo lang_get( 'plugin_depends' ) ?></th>
<th width="7%"><?php echo lang_get( 'plugin_priority' ) ?></th>
<th width="8%"><?php echo lang_get( 'plugin_protected' ) ?></th>
<th width="10%"><?php echo lang_get( 'plugin_actions' ) ?></th>
<th><?php echo lang_get( 'plugin' ) ?></th>
<th><?php echo lang_get( 'plugin_description' ) ?></th>
<th><?php echo lang_get( 'plugin_depends' ) ?></th>
<th><?php echo lang_get( 'plugin_priority' ) ?></th>
<th><?php echo lang_get( 'plugin_protected' ) ?></th>
<th><?php echo lang_get( 'plugin_actions' ) ?></th>
</tr>
</thead>

Expand Down Expand Up @@ -214,7 +222,12 @@ function ( $p_p1, $p_p2 ) {
<br/>
<div class="table-container">
<table>

<colgroup>
<col style="width:25%" />
<col style="width:45%" />
<col style="width:20%" />
<col style="width:10%" />
</colgroup>
<thead>
<!-- Title -->
<tr>
Expand All @@ -225,10 +238,10 @@ function ( $p_p1, $p_p2 ) {

<!-- Info -->
<tr class="row-category">
<td width="25%"><?php echo lang_get( 'plugin' ) ?></td>
<td width="45%"><?php echo lang_get( 'plugin_description' ) ?></td>
<td width="20%"><?php echo lang_get( 'plugin_depends' ) ?></td>
<td width="10%"><?php echo lang_get( 'plugin_actions' ) ?></td>
<td><?php echo lang_get( 'plugin' ) ?></td>
<td><?php echo lang_get( 'plugin_description' ) ?></td>
<td><?php echo lang_get( 'plugin_depends' ) ?></td>
<td><?php echo lang_get( 'plugin_actions' ) ?></td>
</tr>
</thead>

Expand Down
14 changes: 10 additions & 4 deletions plugins/MantisCoreFormatting/pages/config.php
View file
Expand Up @@ -35,26 +35,32 @@
<div class="form-container" style="width: 60%">

<form action="<?php echo plugin_page( 'config_edit' )?>" method="post">
<fieldset>
<?php echo form_security_field( 'plugin_format_config_edit' ) ?>
</fieldset>

<table>

+<colgroup>
<col style="width:60%;" />
<col style="width:20%;" />
<col style="width:20%;" />
</colgroup>
<tr>
<td class="form-title" colspan="3">
<?php echo lang_get( 'plugin_format_title' ) . ': ' . lang_get( 'plugin_format_config' )?>
</td>
</tr>

<tr>
<th class="category" width="60%">
<th class="category">
<?php echo lang_get( 'plugin_format_process_text' )?>
<br /><span class="small"><?php echo lang_get( 'plugin_format_process_text_warning_notice' )?></span>
</th>
<td class="center" width="20%">
<td class="center">
<label><input type="radio" name="process_text" value="1" <?php echo( ON == plugin_config_get( 'process_text' ) ) ? 'checked="checked" ' : ''?>/>
<?php echo lang_get( 'plugin_format_enabled' )?></label>
</td>
<td class="center" width="20%">
<td class="center">
<label><input type="radio" name="process_text" value="0" <?php echo( OFF == plugin_config_get( 'process_text' ) ) ? 'checked="checked" ' : ''?>/>
<?php echo lang_get( 'plugin_format_disabled' )?></label>
</td>
Expand Down
2 changes: 2 additions & 0 deletions plugins/MantisGraph/pages/config.php
View file
Expand Up @@ -70,7 +70,9 @@ function print_font_checked( $p_font_name ) {

<br/>
<form action="<?php echo plugin_page( 'config_edit' )?>" method="post">
<fieldset>
<?php echo form_security_field( 'plugin_graph_config_edit' ) ?>
</fieldset>
<table class="width75" cellspacing="1">

<tr>
Expand Down
2 changes: 1 addition & 1 deletion plugins/MantisGraph/pages/summary_graph_imp_category.php
View file
Expand Up @@ -51,7 +51,7 @@
</td>
</tr>
<tr>
<td width="100%" class="center">
<td class="center">
<img src="<?php echo plugin_page( 'summary_graph_bycategory.php' )?>&amp;width=<?php echo $t_graph_width?>" alt="" />
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion plugins/MantisGraph/pages/summary_jpgraph_page.php
View file
Expand Up @@ -57,7 +57,7 @@
if( 0 == ( $t_pos % $t_wide ) ) {
print( "<tr>\n" );
}
echo '<td width="50%">';
echo '<td>';
printf( '<img src="%s.php&amp;width=%d" alt="" />', plugin_page( $t_graphs[$t_pos] ), $t_graph_width );
echo '</td>';
if( ( $t_wide - 1 ) == ( $t_pos % $t_wide ) ) {
Expand Down
15 changes: 10 additions & 5 deletions plugins/XmlImportExport/pages/import.php
View file
Expand Up @@ -45,11 +45,16 @@

<div class="form-container">
<form name="file_upload" method="post" enctype="multipart/form-data" action="<?php echo plugin_page( 'import_action' )?>">
<fieldset>
<?php echo form_security_field( 'plugin_xml_import_action' ) ?>

<input type="hidden" name="project_id" value="<?php echo $t_project_id;?>" />
</fieldset>

<table>
<colgroup>
<col style="width:25%;" />
<col style="width:75%;" />
</colgroup>
<tr>
<td class="form-title" colspan="2">
<?php
Expand All @@ -61,11 +66,11 @@
</td>
</tr>
<tr>
<th class="category" width="25%">
<th class="category">
<?php echo lang_get( 'select_file' )?><br />
<?php echo '<span class="small">(' . lang_get( 'max_file_size_label' ) . ' ' . number_format( $t_max_file_size / 1000 ) . 'k)</span>'?>
</th>
<td width="85%">
<td>
<input type="hidden" name="max_file_size" value="<?php echo $t_max_file_size?>" />
<input type="hidden" name="step" value="1" />
<input name="file" type="file" size="40" />
Expand All @@ -80,7 +85,7 @@
</tr>

<tr>
<th class="category" width="25%">
<th class="category">
<?php echo plugin_lang_get( 'cross_references' );?>
</th>
<td>
Expand All @@ -106,7 +111,7 @@
</tr>

<tr>
<th class="category" width="25%">
<th class="category">
<?php echo lang_get( 'categories' );?>
</th>
<td>
Expand Down

0 comments on commit 6be85f0

Please sign in to comment.