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, feature/twig-template-engine has been updated
via cb8d1d52a55374bb119b8c83cb3df86345b86efb (commit)
via ef3aeb49a0e3291d41867215a2b248f1f232bc54 (commit)
via 0db6895337932e37e1e77a4dd117d12144f2ade5 (commit)
via 33726e533223c35803230d95da85315931fcad9f (commit)
via e0e508c68bfa929c39a0355575a2c83c51cd5cb1 (commit)
via 855c7ee0b6b9df429b36ad91225aa0fa3f0e69d1 (commit)
via 3d61c0b337476d6dd04c577de781de29e410a3ae (commit)
via ee2aa468f8593082f193fd3228375853e7328643 (commit)
via f43cb5ea9501a1bdc051ed6ca955d54e430620d7 (commit)
via e045f4b4274a89025434ffeb9db988028f414bc1 (commit)
via 2189b2876d1d46c86f62985138ebebc472aa7456 (commit)
via b32e44abdce8e4225a96f92ea9070256e013ab18 (commit)
via 1eed8feb9989bef3fbba3bfd04a1afabf1421c74 (commit)
from cb8e93521f8cb9202a76c9a72c64a6cfcb760ca8 (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 -----------------------------------------------------------------
commit cb8d1d52a55374bb119b8c83cb3df86345b86efb
Author: Roland Mas <[email protected]>
Date: Thu Jun 11 11:56:57 2015 +0200
Start implementing header stuff in Twig (work in progress)
diff --git a/src/www/themes/funky-twig/Theme.class.php
b/src/www/themes/funky-twig/Theme.class.php
index 6569582..b3dfff9 100644
--- a/src/www/themes/funky-twig/Theme.class.php
+++ b/src/www/themes/funky-twig/Theme.class.php
@@ -272,8 +272,42 @@ class Theme extends Layout {
print $template->render($vars);
}
function bodyHeader($params){
- // TODO
- return parent::bodyHeader($params);
+ $template = $this->twig->loadTemplate('bodyHeader.html');
+
+ $vars = array();
+
+ if (isset($params['h1'])) {
+ $vars['h1'] = $params['h1'];
+ } elseif (isset($params['title'])) {
+ $vars['h1'] = $params['title'];
+ } else {
+ $vars['h1'] = '';
+ }
+
+ if (isset($params['title'])) {
+ $vars['title'] = $params['title'] . " -
".forge_get_config('forge_name');
+ } else {
+ $vars['title'] = forge_get_config('forge_name');
+ }
+
+ $cells = array();
+ $cells[] = array(util_make_link('/',
html_image('/header/top-logo.png', null, null, array('alt'=>'FusionForge
Home'))), 'id' => 'header-col1');
+ $items = $this->navigation->getUserLinks();
+ for ($j = 0; $j < count($items['titles']); $j++) {
+ $links[] = util_make_link($items['urls'][$j],
$items['titles'][$j], array('class' => 'userlink'), true);
+ }
+
+ $params['links'] = &$links;
+ plugin_hook('headermenu', $params);
+
+ $sep = isset($params['template']) ? $params['template'] : ' |
';
+ $cells[] = array('text' => implode($sep, $links),
+ 'attrs' => array('id' =>
'header-col2'));
+
+ $vars['rowattrs'] = array();
+ $vars['cell_data'] = $cells;
+
+ print $template->render($vars);
}
function footer($params = array()) {
// TODO
diff --git a/src/www/themes/funky-twig/templates/bodyHeader.html
b/src/www/themes/funky-twig/templates/bodyHeader.html
new file mode 100644
index 0000000..7e264d3
--- /dev/null
+++ b/src/www/themes/funky-twig/templates/bodyHeader.html
@@ -0,0 +1,5 @@
+{% include 'ListTableTop.html' with { 'class': 'fullwidth', 'id': 'header' }
only %}
+
+{% include 'multiTableRow.html' %}
+
+{% include 'ListTableBottom.html' only %}
diff --git a/src/www/themes/funky-twig/templates/multiTableRow.html
b/src/www/themes/funky-twig/templates/multiTableRow.html
new file mode 100644
index 0000000..86c582e
--- /dev/null
+++ b/src/www/themes/funky-twig/templates/multiTableRow.html
@@ -0,0 +1,5 @@
+<tr {% for k,v in rowattrs %}{{ k }}="{{ v }}"{% endfor %}>
+{% for cell in cell_data %}
+<td {% for k,v in cell['attrs'] %}{{ k }}="{{ v }}"{% endfor %}>{{
cell['text']|raw }}</td>
+{% endfor %}
+</tr>
commit ef3aeb49a0e3291d41867215a2b248f1f232bc54
Merge: cb8e935 0db6895
Author: Roland Mas <[email protected]>
Date: Thu Jun 11 10:59:14 2015 +0200
Merge branch 'master' into feature/twig-template-engine
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 2 ++
src/GNUmakefile | 4 +++
src/common/tracker/actions/detail.php | 10 +++++-
src/common/tracker/actions/mod-limited.php | 10 +++++-
src/common/tracker/actions/mod.php | 10 +++++-
.../20140710-forum-migrate-attachments-to-fs.php | 14 ++++----
src/db/20141106-frs-zip-per-release.php | 2 +-
src/db/20150404-scmperms.php | 4 +--
src/etc/cron.d/fusionforge-scm | 1 -
src/etc/cron.d/fusionforge-web | 8 +++++
.../scmsvn/hooks/commitemail/commit-email.pl | 6 ++--
.../etc/httpd.conf.d/vhost-scm-plugin-scmsvn.inc | 2 +-
src/www/themes/funky-twig/Theme.class.php | 38 ++++++++++++++++++++--
.../themes/funky-twig/templates/bodyHeader.html | 5 +++
.../themes/funky-twig/templates/multiTableRow.html | 5 +++
15 files changed, 101 insertions(+), 20 deletions(-)
create mode 100644 src/etc/cron.d/fusionforge-web
create mode 100644 src/www/themes/funky-twig/templates/bodyHeader.html
create mode 100644 src/www/themes/funky-twig/templates/multiTableRow.html
diff --git a/src/CHANGES b/src/CHANGES
index 2cc274b..ab2add4 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -2,12 +2,14 @@ FusionForge 6.0.1:
* Accounts: accept elliptic curve ssh keys (Unit 193)
* Accounts: fix project join request form (Inria)
* SCM: fix commit privileges (*_scmro group membership) (Inria)
+* SCM: kill stalled Apache processes (Inria)
* FRS: display new releases first (Roland Mas, for Inria)
* Tracker: fix description re-html-ization when editing item (Inria)
* Tracker: fix HTML entities in mail notifications (Inria)
* Widgets: MyProjects: only display active projects (Inria)
* SCM SVN: fix double-compression in ViewVC (Inria)
* SCM SVN: support files with spaces in ViewVC (Inria)
+* SCM SVN: fix permissions in migration script (Inria)
* Plugin scmhook: git commitemail: fix subject, handle special chars (Roland
Mas, for Inria)
* Plugin scmhook: fix hook deactivation (Inria)
* Doc clean-up (Inria)
diff --git a/src/GNUmakefile b/src/GNUmakefile
index 6fa991d..5845f07 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -107,6 +107,10 @@ install-web: install-base-dirs
sed 's,@log_path@,$(log_path),g'
etc/logrotate.d/fusionforge-web \
> $(DESTDIR)$(sysconfdir)/logrotate.d/fusionforge-web; \
fi
+ if [ ! -e $(DESTDIR)$(sysconfdir)/cron.d/fusionforge-web ]; then \
+ sed 's,@bindir@,$(bindir),' etc/cron.d/fusionforge-web \
+ > $(DESTDIR)$(sysconfdir)/cron.d/fusionforge-web; \
+ fi
# TODO: multiple servers support?
# (e.g. install scm, lists, vhosts and vhosts-extra separately)
diff --git a/src/common/tracker/actions/detail.php
b/src/common/tracker/actions/detail.php
index ec7510f..a80c9c0 100644
--- a/src/common/tracker/actions/detail.php
+++ b/src/common/tracker/actions/detail.php
@@ -227,7 +227,15 @@ $nb = $count? ' ('.$count.')' : '';
</div>
<?php $ah->showRelations(); ?>
</div>
-<?php
+<?php if (session_loggedin()) { ?>
+ <table class="fullwidth">
+ <tr>
+ <td>
+ <input type="submit" name="submit" value="<?php
echo _('Save Changes') ?>" />
+ </td>
+ </tr>
+ </table>
+<?php }
echo $HTML->closeForm();
$ath->footer();
diff --git a/src/common/tracker/actions/mod-limited.php
b/src/common/tracker/actions/mod-limited.php
index 200d587..c61d736 100644
--- a/src/common/tracker/actions/mod-limited.php
+++ b/src/common/tracker/actions/mod-limited.php
@@ -251,7 +251,15 @@ $nb = $count? ' ('.$count.')' : '';
</div>
<?php $ah->showRelations(); ?>
</div>
-<?php
+<?php if (session_loggedin()) { ?>
+ <table class="fullwidth">
+ <tr>
+ <td>
+ <input type="submit" name="submit" value="<?php
echo _('Save Changes') ?>" />
+ </td>
+ </tr>
+ </table>
+<?php }
echo $HTML->closeForm();
$ath->footer();
diff --git a/src/common/tracker/actions/mod.php
b/src/common/tracker/actions/mod.php
index b367e3d..64cdb1e 100644
--- a/src/common/tracker/actions/mod.php
+++ b/src/common/tracker/actions/mod.php
@@ -319,7 +319,15 @@ $nb = $count? ' ('.$count.')' : '';
</div>
<?php $ah->showRelations(); ?>
</div>
-<?php
+<?php if (session_loggedin()) { ?>
+ <table class="fullwidth">
+ <tr>
+ <td>
+ <input type="submit" name="submit" value="<?php
echo _('Save Changes') ?>" />
+ </td>
+ </tr>
+ </table>
+<?php }
echo $HTML->closeForm();
$ath->footer();
diff --git a/src/db/20140710-forum-migrate-attachments-to-fs.php
b/src/db/20140710-forum-migrate-attachments-to-fs.php
index 89d7593..b90e478 100644
--- a/src/db/20140710-forum-migrate-attachments-to-fs.php
+++ b/src/db/20140710-forum-migrate-attachments-to-fs.php
@@ -29,14 +29,14 @@ require_once $gfcommon.'forum/ForumStorage.class.php';
ini_set('memory_limit', -1);
ini_set('max_execution_time', 0);
-$data = forge_get_config('data_path');
-if (!is_dir($data)) {
- system("mkdir -p $data");
- system("chmod 0755 $data");
+$data_path = forge_get_config('data_path');
+if (!is_dir($data_path)) {
+ system("mkdir -p $data_path");
+ system("chmod 0755 $data_path");
}
if (!is_dir("$data/forum")) {
- system("mkdir $data/forum");
- system("chmod 0700 $data/forum");
+ system("mkdir $data_path/forum");
+ system("chmod 0700 $data_path/forum");
}
$fs = new ForumStorage();
@@ -110,6 +110,6 @@ while($row = db_fetch_array($res)) {
db_query_params('UPDATE forum_pending_attachment set filedata = $1
where attachmentid = $2', array(0, $row['attachmentid']));
}
-system("chown -R
".forge_get_config('apache_user').':'.forge_get_config('apache_group')."
$data/forum");
+system("chown -R
".forge_get_config('apache_user').':'.forge_get_config('apache_group')."
$data_path/forum");
echo "SUCCESS\n";
diff --git a/src/db/20141106-frs-zip-per-release.php
b/src/db/20141106-frs-zip-per-release.php
index fe3a996..3680842 100644
--- a/src/db/20141106-frs-zip-per-release.php
+++ b/src/db/20141106-frs-zip-per-release.php
@@ -39,8 +39,8 @@ if (class_exists('ZipArchive')) {
$releasesRes = db_query_params('select distinct
frs_release.release_id as rid, frs_release.name as rname from
frs_release,frs_file where frs_release.package_id = $1 and frs_file.release_id
= frs_release.release_id',
array($packageArr['pid']));
$packageArr['pname'] =
util_secure_filename($packageArr['pname']);
- $releaseArr['rname'] =
util_secure_filename($releaseArr['rname']);
while ($releaseArr = db_fetch_array($releasesRes)) {
+ $releaseArr['rname'] =
util_secure_filename($releaseArr['rname']);
$filesRes = db_query_params('select filename from
frs_file where release_id = $1', array($releaseArr['rid']));
if (db_numrows($filesRes)) {
$zip = new ZipArchive();
diff --git a/src/db/20150404-scmperms.php b/src/db/20150404-scmperms.php
index 868ddfd..34e3d1a 100644
--- a/src/db/20150404-scmperms.php
+++ b/src/db/20150404-scmperms.php
@@ -50,10 +50,10 @@ foreach ($groups as $group) {
$repo = "$svnroot/$gname";
if (is_dir($repo)) {
- chmod($repo, $group['anon'] ? 02775 : 02770);
+ chmod($repo, $group['anon'] ? 02755 : 02750);
system("chown -Rh root:{$gid_rw} $repo");
system("chown -h root:{$gid_ro} $repo");
- system("find $repo -type d -print0 | xargs -r -0 chmod 2775");
+ system("find $repo/* -type d -print0 | xargs -r -0 chmod 2775");
system("chmod -R g+rwX,o+rX-w $repo/*");
}
$repo = '/nonexistent'; // for safety
diff --git a/src/etc/cron.d/fusionforge-scm b/src/etc/cron.d/fusionforge-scm
index 5a29832..332aa46 100644
--- a/src/etc/cron.d/fusionforge-scm
+++ b/src/etc/cron.d/fusionforge-scm
@@ -8,4 +8,3 @@
PATH=@bindir@:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
# Generate snapshots and tarballs from SCM repositories
0 3 * * * root forge_run_job scm/generate_scm_snapshots.php
-
diff --git a/src/etc/cron.d/fusionforge-web b/src/etc/cron.d/fusionforge-web
new file mode 100644
index 0000000..c02061b
--- /dev/null
+++ b/src/etc/cron.d/fusionforge-web
@@ -0,0 +1,8 @@
+#
+# Regular cron jobs for the fusionforge-web package
+#
+PATH=@bindir@:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+# Kill stalled Apache2 processes (excluding the main apache parent)
+# (stuck in _nss_pgsql_getpwuid_r ?)
+1 * * * * root d=$(forge_get_config apache_service); for pid in
$(pidof $d -o $(cat /var/run/$d/$d.pid)); do etimes=$(ps -oetimes -p$pid | tail
-n+2); if [ ${etimes:-0} -gt 86400 ]; then kill -9 $pid; fi; done
diff --git
a/src/plugins/scmhook/library/scmsvn/hooks/commitemail/commit-email.pl
b/src/plugins/scmhook/library/scmsvn/hooks/commitemail/commit-email.pl
index d0bde7f..672cae8 100755
--- a/src/plugins/scmhook/library/scmsvn/hooks/commitemail/commit-email.pl
+++ b/src/plugins/scmhook/library/scmsvn/hooks/commitemail/commit-email.pl
@@ -474,6 +474,9 @@ if ($mode eq 'commit')
push(@body, "Date: $date\n");
push(@body, "New Revision: $rev\n");
push(@body, "\n");
+ push(@body, "Log:\n");
+ push(@body, @log);
+ push(@body, "\n");
if (@adds)
{
@adds = sort @adds;
@@ -492,9 +495,6 @@ if ($mode eq 'commit')
push(@body, "Modified:\n");
push(@body, map { " $_\n" } @mods);
}
- push(@body, "Log:\n");
- push(@body, @log);
- push(@body, "\n");
}
elsif ($mode eq 'revprop-change')
{
diff --git a/src/plugins/scmsvn/etc/httpd.conf.d/vhost-scm-plugin-scmsvn.inc
b/src/plugins/scmsvn/etc/httpd.conf.d/vhost-scm-plugin-scmsvn.inc
index 4001d83..21b8686 100644
--- a/src/plugins/scmsvn/etc/httpd.conf.d/vhost-scm-plugin-scmsvn.inc
+++ b/src/plugins/scmsvn/etc/httpd.conf.d/vhost-scm-plugin-scmsvn.inc
@@ -26,7 +26,7 @@ ScriptAlias /anonscm/viewvc
${FF__core__plugins_path}/scmsvn/libexec/viewvc.cgi
# Redirect URLs from FF < 6.0 (scm_host -> scm_host)
# Note: ViewVC URLs are backward-compatible through proxying in viewvc.php
<IfModule mod_authz_svn.c>
- Alias /svn ${FF__core__source_path}/www/plugins/scmsvn/redirect-to-itk.php
+ Alias /svn ${FF__core__plugins_path}/scmsvn/www/redirect-to-itk.php
</IfModule>
<IfModule !mod_authz_svn.c>
Redirect permanent /svn /anonscm/svn/
diff --git a/src/www/themes/funky-twig/Theme.class.php
b/src/www/themes/funky-twig/Theme.class.php
index 6569582..b3dfff9 100644
--- a/src/www/themes/funky-twig/Theme.class.php
+++ b/src/www/themes/funky-twig/Theme.class.php
@@ -272,8 +272,42 @@ class Theme extends Layout {
print $template->render($vars);
}
function bodyHeader($params){
- // TODO
- return parent::bodyHeader($params);
+ $template = $this->twig->loadTemplate('bodyHeader.html');
+
+ $vars = array();
+
+ if (isset($params['h1'])) {
+ $vars['h1'] = $params['h1'];
+ } elseif (isset($params['title'])) {
+ $vars['h1'] = $params['title'];
+ } else {
+ $vars['h1'] = '';
+ }
+
+ if (isset($params['title'])) {
+ $vars['title'] = $params['title'] . " -
".forge_get_config('forge_name');
+ } else {
+ $vars['title'] = forge_get_config('forge_name');
+ }
+
+ $cells = array();
+ $cells[] = array(util_make_link('/',
html_image('/header/top-logo.png', null, null, array('alt'=>'FusionForge
Home'))), 'id' => 'header-col1');
+ $items = $this->navigation->getUserLinks();
+ for ($j = 0; $j < count($items['titles']); $j++) {
+ $links[] = util_make_link($items['urls'][$j],
$items['titles'][$j], array('class' => 'userlink'), true);
+ }
+
+ $params['links'] = &$links;
+ plugin_hook('headermenu', $params);
+
+ $sep = isset($params['template']) ? $params['template'] : ' |
';
+ $cells[] = array('text' => implode($sep, $links),
+ 'attrs' => array('id' =>
'header-col2'));
+
+ $vars['rowattrs'] = array();
+ $vars['cell_data'] = $cells;
+
+ print $template->render($vars);
}
function footer($params = array()) {
// TODO
diff --git a/src/www/themes/funky-twig/templates/bodyHeader.html
b/src/www/themes/funky-twig/templates/bodyHeader.html
new file mode 100644
index 0000000..7e264d3
--- /dev/null
+++ b/src/www/themes/funky-twig/templates/bodyHeader.html
@@ -0,0 +1,5 @@
+{% include 'ListTableTop.html' with { 'class': 'fullwidth', 'id': 'header' }
only %}
+
+{% include 'multiTableRow.html' %}
+
+{% include 'ListTableBottom.html' only %}
diff --git a/src/www/themes/funky-twig/templates/multiTableRow.html
b/src/www/themes/funky-twig/templates/multiTableRow.html
new file mode 100644
index 0000000..86c582e
--- /dev/null
+++ b/src/www/themes/funky-twig/templates/multiTableRow.html
@@ -0,0 +1,5 @@
+<tr {% for k,v in rowattrs %}{{ k }}="{{ v }}"{% endfor %}>
+{% for cell in cell_data %}
+<td {% for k,v in cell['attrs'] %}{{ k }}="{{ v }}"{% endfor %}>{{
cell['text']|raw }}</td>
+{% endfor %}
+</tr>
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
