From 2ae318017bde8d74669291de645eccc5fff74143 Mon Sep 17 00:00:00 2001 From: Alain Peyrat Date: Tue, 8 Nov 2011 20:59:20 +0000 Subject: [PATCH] cleaner HTML --- src/www/admin/database.php | 2 +- src/www/admin/search.php | 2 +- src/www/register/index.php | 2 +- .../renderers/HtmlSearchRenderer.class.php | 2 +- src/www/snippet/add_snippet_to_package.php | 6 +++--- src/www/snippet/addversion.php | 4 ++-- src/www/snippet/detail.php | 4 ++-- src/www/snippet/package.php | 2 +- src/www/survey/admin/show_results_individual.php | 4 ++-- src/www/survey/include/SurveyHTML.class.php | 16 ++++++++-------- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/www/admin/database.php b/src/www/admin/database.php index 2f79cba8fe..6aec5ae99f 100644 --- a/src/www/admin/database.php +++ b/src/www/admin/database.php @@ -105,7 +105,7 @@ if (db_numrows($res_db) > 0) { while ($row_db = db_fetch_array($res_db)) { - print ''.$row_db['statename'].''.$row_db['count'].''; + print ''.$row_db['statename'].''.$row_db['count'].''; } diff --git a/src/www/admin/search.php b/src/www/admin/search.php index d5d43e380b..0fd6417fc2 100644 --- a/src/www/admin/search.php +++ b/src/www/admin/search.php @@ -185,7 +185,7 @@ WHERE (group_id=$1 OR lower (unix_group_name) LIKE $2 OR lower (group_name) LIKE '.format_name($row['unix_group_name'], $row['status']).' '.$row['group_name'].' '.date(_('Y-m-d H:i'), $row['register_time']).' - '.format_name($row['status'].$extra_status, $row['status']).' + '.format_name($row['status'].$extra_status, $row['status']).' '; diff --git a/src/www/register/index.php b/src/www/register/index.php index 80c1acb445..7de227aede 100644 --- a/src/www/register/index.php +++ b/src/www/register/index.php @@ -291,7 +291,7 @@ if (count ($template_projects) >= 1) { } ?> -

+

diff --git a/src/www/search/include/renderers/HtmlSearchRenderer.class.php b/src/www/search/include/renderers/HtmlSearchRenderer.class.php index 062b7aeccb..553d9015d0 100644 --- a/src/www/search/include/renderers/HtmlSearchRenderer.class.php +++ b/src/www/search/include/renderers/HtmlSearchRenderer.class.php @@ -54,7 +54,7 @@ class HtmlSearchRenderer extends SearchRenderer { $searchQuery =& $this->searchQuery; if($searchQuery->isError()) { $this->writeHeader(); - echo '
'.$searchQuery->getErrorMessage().'
'; + echo '

'.$searchQuery->getErrorMessage().'

'; $this->writeFooter(); } else { $searchQuery->executeQuery(); diff --git a/src/www/snippet/add_snippet_to_package.php b/src/www/snippet/add_snippet_to_package.php index e57a36fde0..14fd2a4ac8 100644 --- a/src/www/snippet/add_snippet_to_package.php +++ b/src/www/snippet/add_snippet_to_package.php @@ -137,7 +137,7 @@ AND snippet_package_version.snippet_package_version_id=$1', - - boxGetAltRowStyle($i) .'>boxGetAltRowStyle($i) .'>"; diff --git a/src/www/snippet/addversion.php b/src/www/snippet/addversion.php index 02134fcde2..300ff19456 100644 --- a/src/www/snippet/addversion.php +++ b/src/www/snippet/addversion.php @@ -103,7 +103,7 @@ if (session_loggedin()) { - - '. - ''; + ''; if ($i != ($rows - 1)) { echo ' @@ -168,7 +168,7 @@ ORDER BY snippet_package_version.snippet_package_version_id DESC', util_make_link ('/snippet/detail.php?type=packagever&id='.db_result($result,$i,'snippet_package_version_id'),''.db_result($result,$i,'version').'').''. - ' - \n\n
+

+

@@ -187,7 +187,7 @@ AND snippet_package_item.snippet_package_version_id=$1', echo $HTML->boxTop(_('Snippets In This Package')); for ($i=0; $i<$rows; $i++) { echo ' -
+
' . html_image("ic/trash.png","16","16") . ''. db_result($result,$i,'name').' '.db_result($result,$i,'version')."
+

@@ -222,7 +222,7 @@ function show_add_snippet_box() {
+

diff --git a/src/www/snippet/detail.php b/src/www/snippet/detail.php index c2c03db0e0..d99e7e1c2d 100644 --- a/src/www/snippet/detail.php +++ b/src/www/snippet/detail.php @@ -79,7 +79,7 @@ ORDER BY snippet_version.snippet_version_id DESC", array($id)); util_make_link ('/snippet/download.php?type=snippet&id='.db_result($result,$i,'snippet_version_id'),''. db_result($result,$i,'version').'').'		'. date(_('Y-m-d H:i'),db_result($result,$i,'post_date')).''. util_make_link_u (db_result($result, $i, 'user_name'), db_result($result, $i, 'user_id'),db_result($result, $i, 'realname')).'' . html_image("ic/trash.png","16","16",array("border"=>"0")) . '
' . html_image("ic/trash.png","16","16",array("border"=>"0")) . '
'. date(_('Y-m-d H:i'),db_result($result,$i,'post_date')).''. util_make_link_u (db_result($result, $i, 'user_name'), db_result($result, $i, 'user_id'),db_result($result, $i, 'realname')).'' . html_image("ic/pencil.png","20","25") . '      
+

diff --git a/src/www/survey/admin/show_results_individual.php b/src/www/survey/admin/show_results_individual.php index d5a0553b81..3945df57ac 100644 --- a/src/www/survey/admin/show_results_individual.php +++ b/src/www/survey/admin/show_results_individual.php @@ -94,11 +94,11 @@ for ($i=0; $i<$count; $i++) { Don't show question number if it's just a comment */ - echo "\n
 "; + echo "\n
 "; } else { - echo "\n
"; + echo "\n
"; /* If it's a 1-5 question box and first in series, move Quest diff --git a/src/www/survey/include/SurveyHTML.class.php b/src/www/survey/include/SurveyHTML.class.php index 9e3c18b5fe..4fbda246a8 100644 --- a/src/www/survey/include/SurveyHTML.class.php +++ b/src/www/survey/include/SurveyHTML.class.php @@ -536,7 +536,7 @@ class SurveyHTML extends Error { $last_question_type=$question_type; } - $ret.='
'. + $ret.='
'. ''. '
'.util_make_link ('/survey/privacy.php',_('Survey Privacy')). '
'; @@ -590,15 +590,15 @@ class SurveyHTML extends Error { $url.='&legend[]='.urlencode($arr_name[$j].' ('. $percent.')'); $url.='&value[]='.urlencode($results[$j]); } - $ret.= 'Graph of '.$Question->getQuestion().''; + $ret.= 'Graph of '.$Question->getQuestion().''; } else { - $ret.= '
'; + $ret.= '
'; for ($j=5; $j>=0; $j--) { $percent = (float)$results[$j]*100/$votes; $ret.= $this->_makeBar($arr_name[$j].' ('.$results[$j].')', $percent, $arr_color[$j]); } - $ret.= '
'; + $ret.= ''; } $ret.='

'; break; @@ -618,14 +618,14 @@ class SurveyHTML extends Error { $url.='&legend[]='.urlencode($arr_name[$j].'('.$res[$j].')'); $url.='&value[]='.urlencode($res[$j]); } - $ret.= 'Graph of '.$Question->getQuestion().''; + $ret.= 'Graph of '.$Question->getQuestion().''; } else { - $ret.= '

'; + $ret.= '
'; for ($j=1; $j<=3; $j++) { $result_per[$j] = (float)$res[$j]*100/$votes; $ret.= $this->_makeBar($arr_name[$j].' ('.$res[$j].')', $result_per[$j], $arr_color[$j]); } - $ret.= '
'; + $ret.= ''; } $ret.='

'; break; @@ -705,7 +705,7 @@ class SurveyHTML extends Error { */ function _makeBar($name, $percent, $color) { $ret = ''.$name.''; - $ret.= ''; + $ret.= '
'; if ($percent) { $ret.=''; } -- 2.30.2