[Fusionforge-commits] FusionForge branch feature/ twig-template-engine updated. 7efdcac Misc HTML fixes

Roland Mas lolando at libremir.placard.fr.eu.org
Thu Jun 11 18:32:49 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  7efdcac428aacf1aa998819794fa0464b233a925 (commit)
      from  cbb56b839854aac81f3a4578aaaa38592da88863 (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 7efdcac428aacf1aa998819794fa0464b233a925
Author: Roland Mas <lolando at debian.org>
Date:   Thu Jun 11 18:31:49 2015 +0200

    Misc HTML fixes

diff --git a/src/www/themes/funky-twig/Theme.class.php b/src/www/themes/funky-twig/Theme.class.php
index f726852..7946156 100644
--- a/src/www/themes/funky-twig/Theme.class.php
+++ b/src/www/themes/funky-twig/Theme.class.php
@@ -383,15 +383,18 @@ class Theme extends Layout {
 		$vars['feedback'] = $GLOBALS['feedback'];
 
 		print $template->render($vars);
-		}
+	}
 	function footer($params = array()) {
-			// TODO
-			return parent::footer($params);
-		}
+		$template = $this->twig->loadTemplate('footer.html');
+
+		$vars = array('imgurl' => util_make_uri('/images/pow-fusionforge.png'));
+
+		print $template->render($vars);
+	}
 	function footerEnd() {
 		// TODO
 		return parent::footerEnd();
-		}
+	}
 	function getRootIndex() {
 		// TODO
 		return parent::getRootIndex();
@@ -434,18 +437,18 @@ class Theme extends Layout {
 		if (count($titleArray)) {
 			$count = count($titleArray);
 			for ($i = 0; $i < $count; $i++) {
-				$item = array();
+				$item = array('text' => $titleArray[$i]);
 				if ($thOtherAttrsArray && isset($thOtherAttrsArray[$i])) {
-					$item = $thOtherAttrsArray[$i];
+					$item['attrs'] = $thOtherAttrsArray[$i];
 				}
 				if ($thClassArray && isset($thClassArray[$i])) {
-					$item['class'] = $thClassArray[$i];
+					$item['attrs']['class'] = $thClassArray[$i];
 				}
 				if ($thTitleArray && isset($thTitleArray[$i])) {
-					$item['title'] = $thTitleArray[$i];
+					$item['attrs']['title'] = $thTitleArray[$i];
 				}
 				if ($linksArray && isset($linksArray[$i])) {
-					$item['url'] = util_make_uri($linksArray[$i]);
+					$item['attrs']['url'] = util_make_uri($linksArray[$i]);
 				}
 				$data[] = $item;
 			}
diff --git a/src/www/themes/funky-twig/templates/ListTableTop.html b/src/www/themes/funky-twig/templates/ListTableTop.html
index f22b875..b6da84b 100644
--- a/src/www/themes/funky-twig/templates/ListTableTop.html
+++ b/src/www/themes/funky-twig/templates/ListTableTop.html
@@ -2,8 +2,8 @@
   {% if data|length %}
   <thead>
 	<tr>
-	  {% for item in data %}
-	  <th {% for k,v in i.attrs if k != 'title' and k != 'url' %}{{ k }}="{{ v }}"{% endfor %}><a href="{{ i.url }}">{{ i.title }}</a>
+	  {% for i in data %}
+	  <th {% for k,v in i.attrs if k != 'title' and k != 'url' %}{{ k }}="{{ v }}"{% endfor %}>{% if i.url %}<a href="{{ i.url }}">{% endif %}{{ i.text }}{% if i.url %}</a>{% endif %}
 	  </th>
 	  {% endfor %}
 	</tr>
diff --git a/src/www/themes/funky-twig/templates/footer.html b/src/www/themes/funky-twig/templates/footer.html
new file mode 100644
index 0000000..1ad0105
--- /dev/null
+++ b/src/www/themes/funky-twig/templates/footer.html
@@ -0,0 +1,7 @@
+</div><!-- maindiv -->
+    <div class="footer">
+      {% include 'Link.html' with { 'href': 'https://fusionforge.org', 'text': "<img src=\"#{imgurl}\" alt=\"Powered by FusionForge\" />" } only %}
+      <div style="clear:both"></div>
+    </div>
+  </body>
+  </html>

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

Summary of changes:
 src/www/themes/funky-twig/Theme.class.php          | 23 ++++++++++++----------
 .../themes/funky-twig/templates/ListTableTop.html  |  4 ++--
 src/www/themes/funky-twig/templates/footer.html    |  7 +++++++
 3 files changed, 22 insertions(+), 12 deletions(-)
 create mode 100644 src/www/themes/funky-twig/templates/footer.html

diff --git a/src/www/themes/funky-twig/Theme.class.php b/src/www/themes/funky-twig/Theme.class.php
index f726852..7946156 100644
--- a/src/www/themes/funky-twig/Theme.class.php
+++ b/src/www/themes/funky-twig/Theme.class.php
@@ -383,15 +383,18 @@ class Theme extends Layout {
 		$vars['feedback'] = $GLOBALS['feedback'];
 
 		print $template->render($vars);
-		}
+	}
 	function footer($params = array()) {
-			// TODO
-			return parent::footer($params);
-		}
+		$template = $this->twig->loadTemplate('footer.html');
+
+		$vars = array('imgurl' => util_make_uri('/images/pow-fusionforge.png'));
+
+		print $template->render($vars);
+	}
 	function footerEnd() {
 		// TODO
 		return parent::footerEnd();
-		}
+	}
 	function getRootIndex() {
 		// TODO
 		return parent::getRootIndex();
@@ -434,18 +437,18 @@ class Theme extends Layout {
 		if (count($titleArray)) {
 			$count = count($titleArray);
 			for ($i = 0; $i < $count; $i++) {
-				$item = array();
+				$item = array('text' => $titleArray[$i]);
 				if ($thOtherAttrsArray && isset($thOtherAttrsArray[$i])) {
-					$item = $thOtherAttrsArray[$i];
+					$item['attrs'] = $thOtherAttrsArray[$i];
 				}
 				if ($thClassArray && isset($thClassArray[$i])) {
-					$item['class'] = $thClassArray[$i];
+					$item['attrs']['class'] = $thClassArray[$i];
 				}
 				if ($thTitleArray && isset($thTitleArray[$i])) {
-					$item['title'] = $thTitleArray[$i];
+					$item['attrs']['title'] = $thTitleArray[$i];
 				}
 				if ($linksArray && isset($linksArray[$i])) {
-					$item['url'] = util_make_uri($linksArray[$i]);
+					$item['attrs']['url'] = util_make_uri($linksArray[$i]);
 				}
 				$data[] = $item;
 			}
diff --git a/src/www/themes/funky-twig/templates/ListTableTop.html b/src/www/themes/funky-twig/templates/ListTableTop.html
index f22b875..b6da84b 100644
--- a/src/www/themes/funky-twig/templates/ListTableTop.html
+++ b/src/www/themes/funky-twig/templates/ListTableTop.html
@@ -2,8 +2,8 @@
   {% if data|length %}
   <thead>
 	<tr>
-	  {% for item in data %}
-	  <th {% for k,v in i.attrs if k != 'title' and k != 'url' %}{{ k }}="{{ v }}"{% endfor %}><a href="{{ i.url }}">{{ i.title }}</a>
+	  {% for i in data %}
+	  <th {% for k,v in i.attrs if k != 'title' and k != 'url' %}{{ k }}="{{ v }}"{% endfor %}>{% if i.url %}<a href="{{ i.url }}">{% endif %}{{ i.text }}{% if i.url %}</a>{% endif %}
 	  </th>
 	  {% endfor %}
 	</tr>
diff --git a/src/www/themes/funky-twig/templates/footer.html b/src/www/themes/funky-twig/templates/footer.html
new file mode 100644
index 0000000..1ad0105
--- /dev/null
+++ b/src/www/themes/funky-twig/templates/footer.html
@@ -0,0 +1,7 @@
+</div><!-- maindiv -->
+    <div class="footer">
+      {% include 'Link.html' with { 'href': 'https://fusionforge.org', 'text': "<img src=\"#{imgurl}\" alt=\"Powered by FusionForge\" />" } only %}
+      <div style="clear:both"></div>
+    </div>
+  </body>
+  </html>


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list