[Fusionforge-commits] FusionForge branch master updated. 6dea213246b5a6e6779e1a20992eefee1ffe71d8

Benoît Debaenst tiben at fusionforge.org
Tue Feb 18 10:08:27 CET 2014


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  6dea213246b5a6e6779e1a20992eefee1ffe71d8 (commit)
       via  edec3a69f03467535a369bb646a759e35064da04 (commit)
      from  fb50994516f9b73007910db770cf1fd812316b28 (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 6dea213246b5a6e6779e1a20992eefee1ffe71d8
Author: tiben <benoit.debaenst at trivialdev.com>
Date:   Tue Feb 18 08:42:39 2014 +0000

    improve css of the activity page

diff --git a/src/www/activity/index.php b/src/www/activity/index.php
index 170e43c..ed577c1 100644
--- a/src/www/activity/index.php
+++ b/src/www/activity/index.php
@@ -179,7 +179,6 @@ foreach ($show as $showthis) {
 		exit_error(_('Invalid Data Passed to query'), 'home');
 	}
 }
-$multiselect = html_build_multiple_select_box_from_arrays($ids, $texts, 'show[]', $show, count($texts), false);
 ?>
 
 <div id="activity">
@@ -188,34 +187,25 @@ $multiselect = html_build_multiple_select_box_from_arrays($ids, $texts, 'show[]'
 <form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post">
 <input type="hidden" name="group_id" value="<?php echo $group_id; ?>" />
 
-<strong><?php echo _('Activity')._(':'); ?></strong></br>
-<?php echo $multiselect; ?></br></br>
+<div id="activity_select" >
+<div id="activity_label"><?php echo _('Activity')._(':'); ?></div>
+<?php echo html_build_multiple_select_box_from_arrays($ids, $texts, 'show[]', $show, count($texts), false); ?>
+</div>
 
-<strong><?php echo _('Start Date')._(':'); ?></strong></br>
-<input name="start_date" value="<?php echo $rendered_begin; ?>" size="10" maxlength="10" /></br></br>
+<div id="activity_startdate" >
+<div id="activity_label_startdate"><?php echo _('Start Date')._(':'); ?></div>
+<input name="start_date" value="<?php echo $rendered_begin; ?>" size="10" maxlength="10" />
+</div>
 
-<strong><?php echo _('End Date')._(':'); ?></strong></br>
-<input name="end_date" value="<?php echo $rendered_end; ?>" size="10" maxlength="10" /></br></br>
+<div id="activity_enddate" >
+<div id="activity_label_enddate"><?php echo _('End Date')._(':'); ?></div>
+<input name="end_date" value="<?php echo $rendered_end; ?>" size="10" maxlength="10" />
+</div>
 
+<div id="activity_submit" >
 <input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" />
-<!--
-<table>
-	<tr>
-		<td></td>
-		<td></td>
-		<td></td>
-		<td></td>
-	</tr>
-	<tr>
-		<td></td>
-		<td class="top"></td>
-		<td class="top"></td>
-		<td class="top">
-			
-		</td>
-	</tr>
-</table>
--->
+</div>
+
 </form>
 </div>
 
diff --git a/src/www/themes/css/fusionforge.css b/src/www/themes/css/fusionforge.css
index e85929f..e97da5f 100644
--- a/src/www/themes/css/fusionforge.css
+++ b/src/www/themes/css/fusionforge.css
@@ -902,20 +902,6 @@ fieldset {
 	padding: 5px;
 }
 
-#activity {
-	display: table;
-	width: 100%;
-}
-
-#activity_left {
-	float: left;
-}
-
-#activity_right {
-	float: left;
-	width: 70%;
-	padding-left: 50px;
-}
 
 #ff-mw-wrapper {
 	position: relative;	/* so MW can position absolutely */
diff --git a/src/www/themes/funky/css/theme.css b/src/www/themes/funky/css/theme.css
index d2e0142..3e7c654 100644
--- a/src/www/themes/funky/css/theme.css
+++ b/src/www/themes/funky/css/theme.css
@@ -5,6 +5,7 @@
  * Copyright 2010, Franck Villaume - Capgemini
  * Copyright 2011, Iñigo Martinez
  * Copyright 2013-2014, Franck Villaume - TrivialDev
+ * Copyright 2014, Benoit Debaenst - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -846,3 +847,40 @@ p.information {
 .priority3 { background-color: #fde4aa}
 .priority4 { background-color: #fcd986}
 .priority5 { background-color: #fac955}
+
+/* Activity Page */
+#activity {
+	display: table;
+	width: 100%;
+}
+
+#activity_left {
+	float: left;
+}
+
+#activity_right {
+	overflow : hidden;
+	padding-left: 10px;
+	margin-top:5px;
+}
+
+#activity_select {
+
+}
+
+#activity_label,
+#activity_label_startdate,
+#activity_label_enddate {
+	font-weight:bold;
+	margin-top:10px;
+}
+
+#activity_startdate,
+#activity_enddate {
+
+}
+
+#activity_submit {
+	margin-top:10px;
+}
+

commit edec3a69f03467535a369bb646a759e35064da04
Author: tiben <benoit.debaenst at trivialdev.com>
Date:   Mon Feb 17 01:00:06 2014 +0000

    change in appearance of the activity page

diff --git a/src/www/activity/index.php b/src/www/activity/index.php
index 4cfb794..170e43c 100644
--- a/src/www/activity/index.php
+++ b/src/www/activity/index.php
@@ -182,27 +182,44 @@ foreach ($show as $showthis) {
 $multiselect = html_build_multiple_select_box_from_arrays($ids, $texts, 'show[]', $show, count($texts), false);
 ?>
 
+<div id="activity">
+<div id="activity_left">
+
 <form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post">
 <input type="hidden" name="group_id" value="<?php echo $group_id; ?>" />
+
+<strong><?php echo _('Activity')._(':'); ?></strong></br>
+<?php echo $multiselect; ?></br></br>
+
+<strong><?php echo _('Start Date')._(':'); ?></strong></br>
+<input name="start_date" value="<?php echo $rendered_begin; ?>" size="10" maxlength="10" /></br></br>
+
+<strong><?php echo _('End Date')._(':'); ?></strong></br>
+<input name="end_date" value="<?php echo $rendered_end; ?>" size="10" maxlength="10" /></br></br>
+
+<input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" />
+<!--
 <table>
 	<tr>
-		<td><strong><?php echo _('Activity')._(':'); ?></strong></td>
-		<td><strong><?php echo _('Start Date')._(':'); ?></strong></td>
-		<td><strong><?php echo _('End Date')._(':'); ?></strong></td>
+		<td></td>
+		<td></td>
+		<td></td>
 		<td></td>
 	</tr>
 	<tr>
-		<td><?php echo $multiselect; ?></td>
-		<td class="top"><input name="start_date"
-			value="<?php echo $rendered_begin; ?>" size="10" maxlength="10" /></td>
-		<td class="top"><input name="end_date"
-			value="<?php echo $rendered_end; ?>" size="10" maxlength="10" /></td>
+		<td></td>
+		<td class="top"></td>
+		<td class="top"></td>
 		<td class="top">
-			<input type="submit" name="submit" value="<?php echo _('Refresh'); ?>" />
+			
 		</td>
 	</tr>
 </table>
+-->
 </form>
+</div>
+
+<div id="activity_right">
 <?php
 if (count($results) < 1) {
 	echo '<p class="information">' . _('No Activity Found') . '</p>';
@@ -279,7 +296,6 @@ if (count($results) < 1) {
 			$theader[] = _('Activity');
 			$theader[] = _('By');
 
-			echo '<br/>';
 			echo $HTML->listTableTop($theader);
 			$displayTableTop = 1;
 		}
@@ -321,17 +337,18 @@ if (count($results) < 1) {
 				break;
 			}
 			case 'taskopen': {
-				$icon = html_image('ic/write16w.png','','',array('alt'=>_('Tasks')));
+				$icon = html_image('ic/taskman20w.png','','',array('alt'=>_('Tasks')));
 				$url = util_make_link('/pm/task.php?func=detailtask&project_task_id='.$arr['subref_id'].'&group_id='.$arr['group_id'].'&group_project_id='.$arr['ref_id'],_('Tasks').' '.$arr['description']);
 				break;
 			}
 			case 'taskclose': {
-				$icon = html_image('ic/write16w.png','','',array('alt'=>_('Tasks')));
+				$icon = html_image('ic/taskman20w.png','','',array('alt'=>_('Tasks')));
 				$url = util_make_link('/pm/task.php?func=detailtask&project_task_id='.$arr['subref_id'].'&group_id='.$arr['group_id'].'&group_project_id='.$arr['ref_id'],_('Tasks').' '.$arr['description']);
 				break;
 			}
+
 			case 'taskdelete': {
-				$icon = html_image('ic/write16w.png','','',array('alt'=>_('Tasks')));
+				$icon = html_image('ic/taskman20w.png','','',array('alt'=>_('Tasks')));
 				$url = util_make_link('/pm/task.php?func=detailtask&project_task_id='.$arr['subref_id'].'&group_id='.$arr['group_id'].'&group_project_id='.$arr['ref_id'],_('Tasks').' '.$arr['description']);
 				break;
 			}
@@ -369,4 +386,8 @@ if (count($results) < 1) {
 	}
 }
 
+echo '</div>';
+echo '</div>';
+
+
 site_project_footer();
diff --git a/src/www/themes/css/fusionforge.css b/src/www/themes/css/fusionforge.css
index 448c8e3..e85929f 100644
--- a/src/www/themes/css/fusionforge.css
+++ b/src/www/themes/css/fusionforge.css
@@ -902,6 +902,21 @@ fieldset {
 	padding: 5px;
 }
 
+#activity {
+	display: table;
+	width: 100%;
+}
+
+#activity_left {
+	float: left;
+}
+
+#activity_right {
+	float: left;
+	width: 70%;
+	padding-left: 50px;
+}
+
 #ff-mw-wrapper {
 	position: relative;	/* so MW can position absolutely */
 	top: -1em;	/* undo div#maindiv */

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

Summary of changes:
 src/www/activity/index.php         |   57 +++++++++++++++++++++---------------
 src/www/themes/css/fusionforge.css |    1 +
 src/www/themes/funky/css/theme.css |   38 ++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list