[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1672-g5bd6a47

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Thu Apr 20 18:41:05 CEST 2017


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  5bd6a475eafced9d3c2d1fad75d130003d89194c (commit)
      from  e38f238e0cdecadf1e062f13cce0be8c5e1e17a2 (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=5bd6a475eafced9d3c2d1fad75d130003d89194c

commit 5bd6a475eafced9d3c2d1fad75d130003d89194c
Author: Marc-Etienne Vargenau <marc-etienne.vargenau at nokia.com>
Date:   Thu Apr 20 18:40:59 2017 +0200

    Make class Layout abstract and remove dead code

diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index 06ff29d..720182b 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -40,7 +40,7 @@ require_once $gfcommon.'include/constants.php';
 require_once $gfcommon.'include/FusionForge.class.php';
 require_once $gfcommon.'include/Navigation.class.php';
 
-class Layout extends FFError {
+abstract class Layout extends FFError {
 
 	/**
 	 * Which doctype to use. Can be configured in the
@@ -571,22 +571,7 @@ if (isset($params['group']) && $params['group']) {
 	 * @param   string  $id
 	 * @return	string	the html code
 	 */
-	function boxTop($title, $id = '') {
-		return '
-			<!-- Box Top Start -->
-			<table class="fullwidth">
-			<tr class="align-center">
-			<td class="top align-right" width="10"><img src="'.$this->imgbaseurl.'clear.png" width="10" height="20" alt="" /></td>
-			<td class="fullwidth"><span class="titlebar">'.$title.'</span></td>
-			<td class="top" width="10"><img src="'.$this->imgbaseurl.'clear.png" width="10" height="20" alt="" /></td>
-			</tr>
-			<tr>
-			<td colspan="3">
-			<table class="fullwidth">
-			<tr class="align-left">
-			<td colspan="2">
-			<!-- Box Top End -->';
-	}
+	abstract function boxTop($title, $id = '');
 
 	/**
 	 * boxMiddle() - Middle HTML box.
@@ -595,35 +580,14 @@ if (isset($params['group']) && $params['group']) {
 	 * @param   string  $id
 	 * @return	string	The html code
 	 */
-	function boxMiddle($title, $id = '') {
-		return '
-			<!-- Box Middle Start -->
-			</td>
-			</tr>
-			<tr class="align-center">
-			<td colspan="2"><span class="titlebar">'.$title.'</span></td>
-			</tr>
-			<tr class="align-left">
-			<td colspan="2">
-			<!-- Box Middle End -->';
-	}
+	abstract function boxMiddle($title, $id = '');
 
 	/**
 	 * boxBottom() - Bottom HTML box.
 	 *
 	 * @return	string	the html code
 	 */
-	function boxBottom() {
-		return '
-			<!-- Box Bottom Start -->
-			</td>
-			</tr>
-			</table>
-			</td>
-			</tr>
-			</table><br />
-			<!-- Box Bottom End -->';
-	}
+	abstract function boxBottom();
 
 	/**
 	 * listTableTop() - Takes an array of titles and builds the first row of a new table.

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

Summary of changes:
 src/www/include/Layout.class.php | 44 ++++------------------------------------
 1 file changed, 4 insertions(+), 40 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list