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 b5e93f17d010d97ca71da5ddbdcdae025e9635ae (commit)
via 008078549d4485e4182d86416b4850b94434950e (commit)
via 0d9341bf7637b2a5df8fcba140b474f00ac6ea2c (commit)
from 33922896caaa7c631a8b6c1d4a62a2b5491ee6dc (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=b5e93f17d010d97ca71da5ddbdcdae025e9635ae
commit b5e93f17d010d97ca71da5ddbdcdae025e9635ae
Author: Franck Villaume <[email protected]>
Date: Sun Sep 10 18:52:14 2017 +0200
better display
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php
b/src/plugins/scmgit/common/GitPlugin.class.php
index 668a506..db31cd4 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -1178,15 +1178,15 @@ control over it to the project's administrator.");
echo $HTML->openForm(array('name' => 'form_create_repo',
'action' => getStringFromServer('PHP_SELF'), 'method' => 'post'));
echo $HTML->html_input('group_id', '', '', 'hidden',
$params['group_id']);
echo $HTML->html_input('create_repository', '', '', 'hidden',
1);
- echo html_e('p', array(), html_e('strong', array(),
_('Repository name')._(':')).utils_requiredField().html_e('br').
- $HTML->html_input('repo_name', '', '', 'text',
'', array('required' => 'required', 'size' => 20)));
- echo html_e('p', array(), html_e('strong', array(),
_('Description')._(':')).html_e('br').
- $HTML->html_input('description', '', '',
'text', '', array('size' => 60)));
+ echo $HTML->html_input('repo_name', '', html_e('strong',
array(), _('Repository name')._(':')).utils_requiredField(), 'text', '',
array('required' => 'required', 'size' => 20));
+ echo html_e('br');
+ echo $HTML->html_input('description', '', html_e('strong',
array(), _('Description')._(':')), 'text', '', array('size' => 60));
echo html_e('p', array(), html_e('strong', array(), _('Initial
clone URL (or name of an existing repository in this project; leave empty to
start with an empty repository)')._(':')).html_e('br').
$HTML->html_input('clone', '', '', 'text',
$project_name, array('size' => 60)));
echo $HTML->html_input('scm_enable_anonymous', '', '',
'hidden', ($project->enableAnonSCM()? 1 : 0));
- echo $HTML->html_input('cancel', '', '', 'submit', _('Cancel'));
- echo $HTML->html_input('submit', '', '', 'submit', _('Submit'));
+ echo html_e('br');
+ echo $HTML->html_input('cancel', '', '', 'submit', _('Cancel'),
array(), array('style' => 'display: inline-block!important'));
+ echo $HTML->html_input('submit', '', '', 'submit', _('Submit'),
array(), array('style' => 'display: inline-block!important'));
echo $HTML->closeForm();
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=008078549d4485e4182d86416b4850b94434950e
commit 008078549d4485e4182d86416b4850b94434950e
Author: Franck Villaume <[email protected]>
Date: Sun Sep 10 18:51:47 2017 +0200
enhance html_input to support more customization
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index 18a93e9..6bb7994 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -776,7 +776,7 @@ abstract class Layout extends FFError {
html_e('p', array(), html_e('span',
array('class' => 'ui-icon ui-icon-alert', 'style' => 'float:left; margin:0 7px
20px 0;'), '', false).$message));
}
- function html_input($name, $id = '', $label = '', $type = 'text',
$value = '', $extra_params = '') {
+ function html_input($name, $id = '', $label = '', $type = 'text',
$value = '', $extra_params_input = '', $extra_params_div = '') {
if (!$id) {
$id = $name;
}
@@ -792,12 +792,14 @@ abstract class Layout extends FFError {
if ($value) {
$attrs['value'] = $value;
}
- if (is_array($extra_params)) {
- foreach ($extra_params as $key => $extra_params_value) {
+ if (is_array($extra_params_input)) {
+ foreach ($extra_params_input as $key =>
$extra_params_value) {
$attrs[$key] = $extra_params_value;
}
}
- return html_e('div', array('class' => 'field-holder'),
$htmllabel.html_e('input', $attrs));
+ $attrs_div = array('class' => 'field-holder');
+ $attrs_div = array_merge($attrs_div, $extra_params_div);
+ return html_e('div', $attrs_div, $htmllabel.html_e('input',
$attrs));
}
function html_checkbox($name, $value, $id = '', $label = '', $checked =
'', $extra_params = array()) {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=0d9341bf7637b2a5df8fcba140b474f00ac6ea2c
commit 0d9341bf7637b2a5df8fcba140b474f00ac6ea2c
Author: Franck Villaume <[email protected]>
Date: Sun Sep 10 18:51:12 2017 +0200
fix path of input in dom
diff --git a/tests/func/50_PluginsScmGit/gitWUITest.php
b/tests/func/50_PluginsScmGit/gitWUITest.php
index 18416f4..4fb0c7b 100644
--- a/tests/func/50_PluginsScmGit/gitWUITest.php
+++ b/tests/func/50_PluginsScmGit/gitWUITest.php
@@ -77,7 +77,7 @@ class ScmGitWUITest extends FForge_SeleniumTestCase
$this->clickAndWait("link=Admin");
$this->clickAndWait("link=Tools");
$this->clickAndWait("link=Source Code Admin");
-
$this->clickAndWait("//form[@name='form_delete_repo_other-repo']/input[@value='Delete']");
+
$this->clickAndWait("//form[@name='form_delete_repo_other-repo']/div/input[@value='Delete']");
$this->assertTextPresent("Repository other-repo is marked for
deletion");
// Run the cronjob to create repositories
-----------------------------------------------------------------------
Summary of changes:
src/plugins/scmgit/common/GitPlugin.class.php | 12 ++++++------
src/www/include/Layout.class.php | 10 ++++++----
tests/func/50_PluginsScmGit/gitWUITest.php | 2 +-
3 files changed, 13 insertions(+), 11 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
