This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.1 has been updated
via 3c6853cc679aa5e5cc4e91bfcb66a27926e67430 (commit)
via 185b3f7b696bc6ef8501e58923ac93c08dc1dbdd (commit)
from 07fb35ce997ec9894836fbe4579ac2b8917b977a (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=3c6853cc679aa5e5cc4e91bfcb66a27926e67430
commit 3c6853cc679aa5e5cc4e91bfcb66a27926e67430
Author: Franck Villaume <[email protected]>
Date: Thu May 10 18:16:09 2018 +0200
fix HTML syntax.
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index 5330b25..efc02f2 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -1131,7 +1131,7 @@ abstract class Layout extends FFError {
}
echo html_ac(html_ap() -1);
if ($widget->isAjax()) {
- $spinner = '<div
style="text-align:center">'.trim($this->getPicto('ic/spinner.gif',_('Spinner'),
_('Spinner'), 10, 10)).'</div>';
+ $spinner = '<div
style="text-align:center">'.trim($this->getPicto('ic/spinner.gif',_('Spinner'),
_('Spinner'), 10, 10));
echo '<script type="text/javascript">/* <![CDATA[ */'."
jQuery(document).ready(function() {
jQuery('#$element_id-ajax').html('".$spinner."');
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=185b3f7b696bc6ef8501e58923ac93c08dc1dbdd
commit 185b3f7b696bc6ef8501e58923ac93c08dc1dbdd
Author: Franck Villaume <[email protected]>
Date: Thu May 10 17:50:29 2018 +0200
fix HTML warning with empty span
diff --git a/src/common/frs/views/listpackages.php
b/src/common/frs/views/listpackages.php
index 1d888e4..c1498b0 100644
--- a/src/common/frs/views/listpackages.php
+++ b/src/common/frs/views/listpackages.php
@@ -132,22 +132,21 @@ EOS;
$ziplink = '';
if (class_exists('ZipArchive')) {
if
(file_exists($FRSPackage->getReleaseZipPath($package_release_id))) {
- $ziplink .=
util_make_link('/frs/download.php/zip/'.$FRSPackageRelease->getID().'/'.$FRSPackage->getReleaseZipName($FRSPackageRelease->getID()),
- $HTML->getZipPic(_('Download
this release as ZIP.')
- .' '._('This link always
points to this release as a ZIP file.')));
+ $ziplink .= html_e('span',
array('class' => 'frs-zip-release'),
util_make_link('/frs/download.php/zip/'.$FRSPackageRelease->getID().'/'.$FRSPackage->getReleaseZipName($FRSPackageRelease->getID()),
+ $HTML->getZipPic(_('Download
this release as ZIP.').' '._('This link always points to this release as a ZIP
file.'))), false);
}
}
// Switch whether release_id exists and/or
release_id is current one
if ( ! $release_id || $release_id ==
$package_release_id ) {
// no release_id OR release_id is
current one
$release_title =
util_make_link('/frs/?view=shownotes&group_id='.$group_id.'&release_id='.$package_release_id,
$package_name.' '.$FRSPackageRelease->getName().' ('.date(_('Y-m-d H:i'),
$FRSPackageRelease->getReleaseDate()).')');
- echo
$HTML->boxTop($release_title.html_e('span', array('class' =>
'frs-zip-release'), $ziplink, false), $package_name.'
'.$FRSPackageRelease->getName());
+ echo
$HTML->boxTop($release_title.$ziplink, $package_name.'
'.$FRSPackageRelease->getName());
} elseif ( $release_id != $package_release_id )
{
// release_id but not current one
$t_url_anchor =
$HTML->toSlug($package_name).'-'.$HTML->toSlug($FRSPackageRelease->getName()).'-title-content';
$t_url =
'/frs/?group_id='.$group_id.'&release_id='.$package_release_id.'#'.$t_url_anchor;
$release_title = util_make_link($t_url,
$package_name.' '.$FRSPackageRelease->getName());
- echo html_e('div', array('class' =>
'frs_release_name_version'), $release_title.html_e('span', array('class' =>
'frs-zip-release'), $ziplink, false));
+ echo html_e('div', array('class' =>
'frs_release_name_version'), $release_title.$ziplink);
}
// display linked roadmaps if any
-----------------------------------------------------------------------
Summary of changes:
src/common/frs/views/listpackages.php | 9 ++++-----
src/www/include/Layout.class.php | 2 +-
2 files changed, 5 insertions(+), 6 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
