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 4a4c522887e13c1f49830433e9f07522d3f17d9e (commit)
from 087fe930dfdf65f522ec2e87699c2a7bfe7e7d5b (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=4a4c522887e13c1f49830433e9f07522d3f17d9e
commit 4a4c522887e13c1f49830433e9f07522d3f17d9e
Author: Franck Villaume <[email protected]>
Date: Sun Oct 23 17:57:48 2016 +0200
Association: display association in shownotes view
diff --git a/src/common/frs/views/shownotes.php
b/src/common/frs/views/shownotes.php
index bf267f9..7b88af3 100644
--- a/src/common/frs/views/shownotes.php
+++ b/src/common/frs/views/shownotes.php
@@ -50,6 +50,14 @@ if(!$frsr->getFRSPackage()->isPublic()) {
echo html_e('h2', array(), _('File Release Notes and Changelog'));
echo html_e('h3', array(), _('Release Name')._(':
').util_make_link('/frs/?group_id='.$group_id.'&release_id='.$release_id,
$frsr->getName()));
+if (forge_get_config('use_object_associations')) {
+ echo html_ao('div', array('id' => 'tabber'));
+ $elementsLi = array();
+ $elementsLi[] = array('content' => util_make_link('#tabber-changelog',
_('Change Log & Notes'), array('title' => _('View Changelog & Notes.')), true));
+ $elementsLi[] = array('content' =>
util_make_link('#tabber-association', _('Associations'), array('title' =>
_('View Associated Objects.')), true));
+ echo $HTML->html_list($elementsLi);
+ echo html_ao('div', array('id' => 'tabber-changelog', 'class' =>
'tabbertab'));
+}
// Show preformatted or plain notes/changes
if ($frsr->getPreformatted()) {
$htmltag = 'pre';
@@ -61,10 +69,21 @@ if (strlen($frsr->getNotes())) {
echo $HTML->boxTop(_('Release Notes'));
echo html_e($htmltag, array(), $frsr->getNotes());
echo $HTML->boxBottom();
+} else {
+ echo $HTML->information(_('No release notes'));
}
if (strlen($frsr->getChanges())) {
echo $HTML->boxTop(_('Change Log'));
echo html_e($htmltag, array(), $frsr->getChanges());
echo $HTML->boxBottom();
+} else {
+ echo $HTML->information(_('No change log'));
+}
+
+if (forge_get_config('use_object_associations')) {
+ echo html_ac(html_ap() -1);
+ echo html_ao('div', array('id' => 'tabber-association', 'class' =>
'tabbertab'));
+ echo $frsr->showAssociations();
+ echo html_ac(html_ap() -2);
}
-----------------------------------------------------------------------
Summary of changes:
src/common/frs/views/shownotes.php | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
