[Fusionforge-commits] FusionForge branch 6.1 updated. v6.1rc2-6-g07fb35c
Franck Villaume
nerville at libremir.placard.fr.eu.org
Thu May 10 16:45:11 CEST 2018
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 07fb35ce997ec9894836fbe4579ac2b8917b977a (commit)
via a0f9a581efd2effa28d7414400033d636faf295f (commit)
from a77991ae9c5a69974a231b4844bc6b6f23d042dd (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=07fb35ce997ec9894836fbe4579ac2b8917b977a
commit 07fb35ce997ec9894836fbe4579ac2b8917b977a
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Thu May 10 16:44:56 2018 +0200
snippet: add missing tooltip for markdown support in description
diff --git a/src/www/snippet/submit.php b/src/www/snippet/submit.php
index f05ca7f..184d7f7 100644
--- a/src/www/snippet/submit.php
+++ b/src/www/snippet/submit.php
@@ -108,7 +108,12 @@ if (session_loggedin()) {
</td></tr>
<tr><td colspan="2">
- <?php echo $HTML->html_textarea('description', '', _('Description').utils_requiredField()._(': '), '', array('rows' => '5', 'cols' => '45', 'required' => 'required')); ?>
+ <?php
+ $attrs = array();
+ if (forge_get_config('snippet_parser_type') == 'markdown') {
+ $attrs = array('title' => _('Use Markdown Syntax'));
+ }
+ echo $HTML->html_textarea('description', '', _('Description').utils_requiredField()._(': '), '', array_merge(array('rows' => '5', 'cols' => '45', 'required' => 'required'), $attrs)); ?>
</td></tr>
<tr>
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=a0f9a581efd2effa28d7414400033d636faf295f
commit a0f9a581efd2effa28d7414400033d636faf295f
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Thu May 10 16:27:34 2018 +0200
snippet: remove double feedback message. use error_msg when needed
diff --git a/src/www/snippet/submit.php b/src/www/snippet/submit.php
index d6026f6..f05ca7f 100644
--- a/src/www/snippet/submit.php
+++ b/src/www/snippet/submit.php
@@ -3,7 +3,7 @@
* Code Snippets Repository
*
* Copyright 1999-2001 (c) VA Linux Systems
- * Copyright 2014,2016-2017, Franck Villaume - TrivialDev
+ * Copyright 2014,2016-2018, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -60,7 +60,6 @@ if (session_loggedin()) {
if (!$result) {
$error_msg = _('Error doing snippet insert').' '.db_error();
} else {
- $feedback = _('Snippet Added Successfully.');
$snippet_id=db_insertid($result,'snippet','snippet_id');
/*
create the snippet version
@@ -73,7 +72,7 @@ if (session_loggedin()) {
time(),
htmlspecialchars($code)));
if (!$result) {
- $feedback = _('Error doing snippet version insert').' '.db_error();
+ $error_msg = _('Error doing snippet version insert').' '.db_error();
} else {
$feedback = _('Snippet Added Successfully.');
}
-----------------------------------------------------------------------
Summary of changes:
src/www/snippet/submit.php | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list