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 98317b9b63b34f6a8e4ba9970c8bfde335fb614e (commit)
from cb8d1d52a55374bb119b8c83cb3df86345b86efb (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 98317b9b63b34f6a8e4ba9970c8bfde335fb614e
Author: Roland Mas <[email protected]>
Date: Thu Jun 11 12:06:45 2015 +0200
Implement a little more header stuff in Twig. Still far from complete, but
it allows logging in.
diff --git a/src/www/themes/funky-twig/Theme.class.php
b/src/www/themes/funky-twig/Theme.class.php
index b3dfff9..ddcad03 100644
--- a/src/www/themes/funky-twig/Theme.class.php
+++ b/src/www/themes/funky-twig/Theme.class.php
@@ -272,6 +272,7 @@ class Theme extends Layout {
print $template->render($vars);
}
function bodyHeader($params){
+ // TODO: tabs, navigation menu
$template = $this->twig->loadTemplate('bodyHeader.html');
$vars = array();
diff --git a/src/www/themes/funky-twig/templates/bodyHeader.html
b/src/www/themes/funky-twig/templates/bodyHeader.html
index 7e264d3..048eee6 100644
--- a/src/www/themes/funky-twig/templates/bodyHeader.html
+++ b/src/www/themes/funky-twig/templates/bodyHeader.html
@@ -3,3 +3,18 @@
{% include 'multiTableRow.html' %}
{% include 'ListTableBottom.html' only %}
+
+ <!-- Add outertabs and innertabs (projecttabs) -->
+
+ <div id="maindiv">
+
+ {% include 'errorMessage.html' %}
+ {% include 'warningMessage.html' %}
+ {% include 'feedback.html' %}
+
+ {% if h1 %}
+ <h1>{{ h1 }}</h1>
+ {% else %}
+ <h1 class="hide">{{ title }}</h1>
+ {% endif %}
+
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
src/www/themes/funky-twig/Theme.class.php | 1 +
src/www/themes/funky-twig/templates/bodyHeader.html | 15 +++++++++++++++
2 files changed, 16 insertions(+)
diff --git a/src/www/themes/funky-twig/Theme.class.php
b/src/www/themes/funky-twig/Theme.class.php
index b3dfff9..ddcad03 100644
--- a/src/www/themes/funky-twig/Theme.class.php
+++ b/src/www/themes/funky-twig/Theme.class.php
@@ -272,6 +272,7 @@ class Theme extends Layout {
print $template->render($vars);
}
function bodyHeader($params){
+ // TODO: tabs, navigation menu
$template = $this->twig->loadTemplate('bodyHeader.html');
$vars = array();
diff --git a/src/www/themes/funky-twig/templates/bodyHeader.html
b/src/www/themes/funky-twig/templates/bodyHeader.html
index 7e264d3..048eee6 100644
--- a/src/www/themes/funky-twig/templates/bodyHeader.html
+++ b/src/www/themes/funky-twig/templates/bodyHeader.html
@@ -3,3 +3,18 @@
{% include 'multiTableRow.html' %}
{% include 'ListTableBottom.html' only %}
+
+ <!-- Add outertabs and innertabs (projecttabs) -->
+
+ <div id="maindiv">
+
+ {% include 'errorMessage.html' %}
+ {% include 'warningMessage.html' %}
+ {% include 'feedback.html' %}
+
+ {% if h1 %}
+ <h1>{{ h1 }}</h1>
+ {% else %}
+ <h1 class="hide">{{ title }}</h1>
+ {% endif %}
+
\ No newline at end of file
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
