[Fusionforge-commits] FusionForge branch feature/ twig-template-engine updated. 6026957 Header stuff in Twig

Roland Mas lolando at libremir.placard.fr.eu.org
Thu Jun 11 12:16:25 CEST 2015


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  6026957a8b9a0b5352a3d8497b77c7c29aeb9835 (commit)
      from  98317b9b63b34f6a8e4ba9970c8bfde335fb614e (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 6026957a8b9a0b5352a3d8497b77c7c29aeb9835
Author: Roland Mas <lolando at debian.org>
Date:   Thu Jun 11 12:16:10 2015 +0200

    Header stuff in Twig

diff --git a/src/www/themes/funky-twig/Theme.class.php b/src/www/themes/funky-twig/Theme.class.php
index ddcad03..fc2598b 100644
--- a/src/www/themes/funky-twig/Theme.class.php
+++ b/src/www/themes/funky-twig/Theme.class.php
@@ -308,6 +308,10 @@ class Theme extends Layout {
 		$vars['rowattrs'] = array();
 		$vars['cell_data'] = $cells;
 
+		$vars['error_msg'] = $GLOBALS['error_msg'];
+		$vars['warning_msg'] = $GLOBALS['warning_msg'];
+		$vars['feedback'] = $GLOBALS['feedback'];
+
 		print $template->render($vars);
 		}
 	function footer($params = array()) {
diff --git a/src/www/themes/funky-twig/templates/bodyHeader.html b/src/www/themes/funky-twig/templates/bodyHeader.html
index 048eee6..b1e90b7 100644
--- a/src/www/themes/funky-twig/templates/bodyHeader.html
+++ b/src/www/themes/funky-twig/templates/bodyHeader.html
@@ -4,7 +4,7 @@
 
 {% include 'ListTableBottom.html' only %}
 
-      <!-- Add outertabs and innertabs (projecttabs) -->
+      <!-- TODO: Add outertabs and innertabs (projecttabs) -->
 
     <div id="maindiv">
 
diff --git a/src/www/themes/funky-twig/templates/errorMessage.html b/src/www/themes/funky-twig/templates/errorMessage.html
index 0c7e2c7..407d552 100644
--- a/src/www/themes/funky-twig/templates/errorMessage.html
+++ b/src/www/themes/funky-twig/templates/errorMessage.html
@@ -1,3 +1,3 @@
-{% if message %}
-<p class="error">{{ message }}</p>
+{% if error_msg %}
+<p class="error">{{ error_msg }}</p>
 {% endif %}
diff --git a/src/www/themes/funky-twig/templates/feedback.html b/src/www/themes/funky-twig/templates/feedback.html
index 1aa9652..23c7bab 100644
--- a/src/www/themes/funky-twig/templates/feedback.html
+++ b/src/www/themes/funky-twig/templates/feedback.html
@@ -1,3 +1,3 @@
-{% if message %}
-<p class="feedback">{{ message }}</p>
+{% if feedback %}
+<p class="feedback">{{ feedback }}</p>
 {% endif %}
diff --git a/src/www/themes/funky-twig/templates/information.html b/src/www/themes/funky-twig/templates/information.html
index c5832b7..e7fe256 100644
--- a/src/www/themes/funky-twig/templates/information.html
+++ b/src/www/themes/funky-twig/templates/information.html
@@ -1,3 +1,3 @@
-{% if message %}
-<p class="information">{{ message }}</p>
+{% if info_msg %}
+<p class="information">{{ info_msg }}</p>
 {% endif %}
diff --git a/src/www/themes/funky-twig/templates/warningMessage.html b/src/www/themes/funky-twig/templates/warningMessage.html
index 03fbd03..37b83a6 100644
--- a/src/www/themes/funky-twig/templates/warningMessage.html
+++ b/src/www/themes/funky-twig/templates/warningMessage.html
@@ -1,3 +1,3 @@
-{% if message %}
-<p class="warning_msg">{{ message }}</p>
+{% if warning_msg %}
+<p class="warning_msg">{{ warning_msg }}</p>
 {% endif %}

-----------------------------------------------------------------------

Summary of changes:
 src/www/themes/funky-twig/Theme.class.php               | 4 ++++
 src/www/themes/funky-twig/templates/bodyHeader.html     | 2 +-
 src/www/themes/funky-twig/templates/errorMessage.html   | 4 ++--
 src/www/themes/funky-twig/templates/feedback.html       | 4 ++--
 src/www/themes/funky-twig/templates/information.html    | 4 ++--
 src/www/themes/funky-twig/templates/warningMessage.html | 4 ++--
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/www/themes/funky-twig/Theme.class.php b/src/www/themes/funky-twig/Theme.class.php
index ddcad03..fc2598b 100644
--- a/src/www/themes/funky-twig/Theme.class.php
+++ b/src/www/themes/funky-twig/Theme.class.php
@@ -308,6 +308,10 @@ class Theme extends Layout {
 		$vars['rowattrs'] = array();
 		$vars['cell_data'] = $cells;
 
+		$vars['error_msg'] = $GLOBALS['error_msg'];
+		$vars['warning_msg'] = $GLOBALS['warning_msg'];
+		$vars['feedback'] = $GLOBALS['feedback'];
+
 		print $template->render($vars);
 		}
 	function footer($params = array()) {
diff --git a/src/www/themes/funky-twig/templates/bodyHeader.html b/src/www/themes/funky-twig/templates/bodyHeader.html
index 048eee6..b1e90b7 100644
--- a/src/www/themes/funky-twig/templates/bodyHeader.html
+++ b/src/www/themes/funky-twig/templates/bodyHeader.html
@@ -4,7 +4,7 @@
 
 {% include 'ListTableBottom.html' only %}
 
-      <!-- Add outertabs and innertabs (projecttabs) -->
+      <!-- TODO: Add outertabs and innertabs (projecttabs) -->
 
     <div id="maindiv">
 
diff --git a/src/www/themes/funky-twig/templates/errorMessage.html b/src/www/themes/funky-twig/templates/errorMessage.html
index 0c7e2c7..407d552 100644
--- a/src/www/themes/funky-twig/templates/errorMessage.html
+++ b/src/www/themes/funky-twig/templates/errorMessage.html
@@ -1,3 +1,3 @@
-{% if message %}
-<p class="error">{{ message }}</p>
+{% if error_msg %}
+<p class="error">{{ error_msg }}</p>
 {% endif %}
diff --git a/src/www/themes/funky-twig/templates/feedback.html b/src/www/themes/funky-twig/templates/feedback.html
index 1aa9652..23c7bab 100644
--- a/src/www/themes/funky-twig/templates/feedback.html
+++ b/src/www/themes/funky-twig/templates/feedback.html
@@ -1,3 +1,3 @@
-{% if message %}
-<p class="feedback">{{ message }}</p>
+{% if feedback %}
+<p class="feedback">{{ feedback }}</p>
 {% endif %}
diff --git a/src/www/themes/funky-twig/templates/information.html b/src/www/themes/funky-twig/templates/information.html
index c5832b7..e7fe256 100644
--- a/src/www/themes/funky-twig/templates/information.html
+++ b/src/www/themes/funky-twig/templates/information.html
@@ -1,3 +1,3 @@
-{% if message %}
-<p class="information">{{ message }}</p>
+{% if info_msg %}
+<p class="information">{{ info_msg }}</p>
 {% endif %}
diff --git a/src/www/themes/funky-twig/templates/warningMessage.html b/src/www/themes/funky-twig/templates/warningMessage.html
index 03fbd03..37b83a6 100644
--- a/src/www/themes/funky-twig/templates/warningMessage.html
+++ b/src/www/themes/funky-twig/templates/warningMessage.html
@@ -1,3 +1,3 @@
-{% if message %}
-<p class="warning_msg">{{ message }}</p>
+{% if warning_msg %}
+<p class="warning_msg">{{ warning_msg }}</p>
 {% endif %}


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list