[Fusionforge-commits] FusionForge branch master updated. bd184bf9e7d5e5dff5139b3618a0951f4995a326

Alain Peyrat aljeux at fusionforge.org
Mon Sep 16 14:10:01 CEST 2013


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  bd184bf9e7d5e5dff5139b3618a0951f4995a326 (commit)
       via  c2dffde0d3aaa9504a9d1743ec8510ef64358217 (commit)
      from  36c7d795e563d73058bfcc60ca8c6d2d79882d0c (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 bd184bf9e7d5e5dff5139b3618a0951f4995a326
Author: Alain Peyrat <alain.peyrat at alcatel-lucent.com>
Date:   Mon Sep 16 14:09:51 2013 +0200

    css mostly

diff --git a/src/www/themes/css/fusionforge.css b/src/www/themes/css/fusionforge.css
index 52430d1..de9c5de 100644
--- a/src/www/themes/css/fusionforge.css
+++ b/src/www/themes/css/fusionforge.css
@@ -1,4 +1,4 @@
-/* 
+/*
  * Common stylesheet for *all* FusionForge themes
  *
  * Copyright 2009 Matthieu Faure // Open-s.com
@@ -18,19 +18,19 @@
  * You should have received a copy of the GNU General Public License along
  * with FusionForge; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- * 
+ *
  * Note to Forge developpers:
  * 		- put as less code here as possible
- * 
+ *
  * Note to Themes developpers:
  * 		- don't add CSS to this file;
  * 		- use your own's theme CSS file(s) instead
- * 
+ *
  * Final note: this CSS file should be ideally called:
  * 		- after YUI's reset,fonts and base
  * 		- before the theme's own CSS file
  * 		- Warning: font-size must be expressed in % according to YUI's font table http://developer.yahoo.com/yui/fonts/#chart
- * 
+ *
 */
 
 /* From old gforge-compat */
@@ -258,6 +258,8 @@ ul.tabbernav li.tabberactive a:hover {
 
 .top {vertical-align: top;}
 .bottom {vertical-align: bottom;}
+.middle {vertical-align: middle;}
+.baseline {vertical-align: baseline;}
 
 .nowrap {white-space: nowrap;}
 
@@ -277,7 +279,12 @@ ul.tabbernav li.tabberactive a:hover {
 
 /* A table with two columns, first one right-aligned and bold */
 table.infotable tr { vertical-align: top; }
-table.infotable td:first-child { font-weight: bold; text-align: right; padding-right: 4px;}
+table.infotable td:first-child {
+    font-weight: bold;
+    padding-right: 4px;
+    text-align: right;
+    white-space: nowrap;
+}
 
 table.full {
 	width: 100%;
@@ -299,8 +306,8 @@ table.centered {
 }
 
 .active {
-	background-color: #99ff99; 
-	text-decoration: none; 
+	background-color: #99ff99;
+	text-decoration: none;
 	font-weight: normal;
 }
 
@@ -365,12 +372,12 @@ table.progress {
 	margin-top: 1em;
 	empty-cells: show;
 	width: 50%;
-	margin-left: 25%; 
+	margin-left: 25%;
 	margin-right: 25%;
 }
 table.progress_legend {
 	width: 50%;
-	margin-left: 25%; 
+	margin-left: 25%;
 	margin-right: 25%;
 }
 table.progress a, table.progress :link, table.progress :visited,
diff --git a/src/www/themes/funky/Theme.class.php b/src/www/themes/funky/Theme.class.php
index 4e95b46..5239cd0 100644
--- a/src/www/themes/funky/Theme.class.php
+++ b/src/www/themes/funky/Theme.class.php
@@ -59,7 +59,6 @@ class Theme extends Layout {
 	}
 
 	function bodyHeader($params) {
-		global $user_guide;
 
 		if (!isset($params['h1']) && isset($params['title'])) {
 			$params['h1'] = $params['title'];
@@ -71,7 +70,7 @@ class Theme extends Layout {
 			$params['title'] = $params['title'] . " - ".forge_get_config('forge_name');
 		}
 
-		echo '<table id="header" class="width-100p100">' . "\n";
+		echo '<table id="header" class="fullwidth">' . "\n";
 		echo '<tr>' . "\n";
 		echo '<td id="header-col1">' . "\n";
 		echo util_make_link('/', html_image('/header/top-logo.png', null, null, array('alt'=>'FusionForge Home'))) . "\n";
@@ -98,7 +97,7 @@ class Theme extends Layout {
 		echo '<tr><td colspan="2" id="header-news">' . "\n";
 		//echo $this->quicknews();
 		echo'</td></tr></table><!-- outer tabs -->' . "\n";
-		echo $this->outerTabs($params);
+		$this->outerTabs($params);
 		echo '<!-- inner tabs -->' . "\n";
 		echo '<div class="innertabs">' . "\n";
 		if (isset($params['group']) && $params['group']) {
@@ -232,8 +231,9 @@ class Theme extends Layout {
 	function tabGenerator($TABS_DIRS, $TABS_TITLES, $TABS_TOOLTIPS, $nested=false,  $selected=false, $sel_tab_bgcolor='WHITE',  $total_width='100%') {
 		$count = count($TABS_DIRS);
 
-		if ($count < 1)
-			return;
+		if ($count < 1) {
+			return '';
+		}
 
 		global $use_tooltips;
 
@@ -258,7 +258,7 @@ class Theme extends Layout {
 		}
 
 		$return = '<!-- start tabs -->';
-		$return .= '<table class="tabGenerator width-100p100" ';
+		$return .= '<table class="tabGenerator fullwidth" ';
 
 		if ($total_width != '100%')
 			$return .= 'style="width:' . $total_width . ';"';
@@ -369,6 +369,7 @@ class Theme extends Layout {
 	 *					handled by $istitle
 	 * @param	boolean	is this row part of the title ?
 	 *
+	 * @return string
 	 */
 	function multiTableRow($row_attr, $cell_data, $istitle)
 	{
diff --git a/src/www/themes/gforge/css/theme-pages.css b/src/www/themes/gforge/css/theme-pages.css
index 7c9276f..6189caf 100644
--- a/src/www/themes/gforge/css/theme-pages.css
+++ b/src/www/themes/gforge/css/theme-pages.css
@@ -49,8 +49,8 @@
 }
 
 #Latest_News h3 {
-    margin-top: 0px;
-    margin-bottom: 0px;
+    margin-top: 0;
+    margin-bottom: 0;
     font-weight: bold;
 }
 
@@ -181,7 +181,7 @@
 }
 
 .docman_h4 {
-    padding: 0px;
+    padding: 0;
     margin: 2px;
     font-style: italic;
 }

commit c2dffde0d3aaa9504a9d1743ec8510ef64358217
Author: Alain Peyrat <alain.peyrat at alcatel-lucent.com>
Date:   Mon Sep 16 13:57:35 2013 +0200

    Use member instead of developer: more generic

diff --git a/src/www/project/report/index.php b/src/www/project/report/index.php
index 403f39a..74c7b60 100644
--- a/src/www/project/report/index.php
+++ b/src/www/project/report/index.php
@@ -128,7 +128,7 @@ $title = _('Project Member List');
 site_project_header(array('title'=>$title,'group'=>$group_id,'toptab'=>'memberlist'));
 
 echo '<p>';
-echo _('If you would like to contribute to this project by becoming a developer, contact one of the project admins, designated in bold text below.');
+echo _('If you would like to contribute to this project by becoming a member, contact one of the project admins, designated in bold text below.');
 echo '</p>';
 
         $title_arr=array();

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

Summary of changes:
 src/www/project/report/index.php          |    2 +-
 src/www/themes/css/fusionforge.css        |   27 +++++++++++++++++----------
 src/www/themes/funky/Theme.class.php      |   13 +++++++------
 src/www/themes/gforge/css/theme-pages.css |    6 +++---
 4 files changed, 28 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list