[Fusionforge-commits] FusionForge branch master updated. b641b55e0541011ea8dc7930c5505d6ebbb91205

Franck Villaume nerville at fusionforge.org
Mon Mar 17 17:52:18 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  b641b55e0541011ea8dc7930c5505d6ebbb91205 (commit)
       via  df3ce482d3fa1101442f416ca451fceffad8e986 (commit)
      from  94a3f06d223b5de90195fb999d5eba493c625b65 (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 b641b55e0541011ea8dc7930c5505d6ebbb91205
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Mar 17 17:51:44 2014 +0100

    docman search: use listeTableTop, multiTableRow & listTableBottom which are themable

diff --git a/src/common/docman/views/search.php b/src/common/docman/views/search.php
index 01b540e..eb75881 100644
--- a/src/common/docman/views/search.php
+++ b/src/common/docman/views/search.php
@@ -138,30 +138,32 @@ if ($searchString) {
 		}
 		db_free_result($result);
 		$count = 0;
-		echo html_ao('table',array('class' => 'fullwidth'));
+		$tabletop = array(_('Order'), _('Document'), _('Description'), _('Status'), _('Path'));
+		$classth = array('', '', '', '', '');
+		echo $HTML->listTableTop($tabletop, false, 'sortable_docman_searchfile', 'sortable', $classth);
 		foreach ($resarr as $item) {
-			echo html_ao('tr', array('class' => $HTML->boxGetAltRowStyle($count, true)));
-			echo html_ao('td');
+			$cells = array();
 			$count++;
+			$cells[][] = html_e('strong', array(), $count, false);
 			if ($item['filetype'] == 'URL') {
-				$fileurl = $item["filename"];
+				$cells[][] = util_make_link($item["filename"], $item["title"], array(), true);
 			} else {
-				$fileurl = '/docman/view.php/'.$item["group_id"].'/'.$item["docid"].'/'.urlencode($item["filename"]);
+				$cells[][] = util_make_link('/docman/view.php/'.$item["group_id"].'/'.$item["docid"].'/'.urlencode($item["filename"]), $item["title"]);
 			}
-			echo html_e('p', array(), '<b>'.$count.'. '.$item["title"].'</b> ('.util_make_link($fileurl, $item["filename"]).')', false);
-			echo html_e('p', array(), $item["description"], false);
+			$cells[][] = $item["description"];
 			$localProject = group_get_object($item['group_id']);
 			$docGroupObject = new DocumentGroup($localProject, $item['doc_group']);
-			echo html_e('p', array(), _('Status')._(': ').'<b>'.$item["statename"].'</b>', false);
-			echo '<p>'._('Path')._(': ');
+			$cells[][] = $item["statename"];
+			$nextcell = '';
 			if ($localProject->getUnixName() != $g->getUnixName()) {
 				$browselink = '/docman/?group_id='.$localProject->getID();
-				echo util_make_link($browselink, $localProject->getPublicName(), array('title' => _('Browse document manager for this project.'), 'class' => 'tabtitle-nw')).'::';
+				$nextcell .= util_make_link($browselink, $localProject->getPublicName(), array('title' => _('Browse document manager for this project.'), 'class' => 'tabtitle-nw')).'::';
 			}
-			echo '<i>'.$docGroupObject->getPath(true, true).'</i></p>';
-			echo html_ac(html_ap() - 2);
+			$nextcell .= html_e('i', array(), $docGroupObject->getPath(true, true), false);
+			$cells[][] = $nextcell;
+			echo $HTML->multiTableRow(array(), $cells);
 		}
-		echo html_ac(html_ap() - 1);
+		echo $HTML->listTableBottom();
 	}
 } elseif (getStringFromServer('REQUEST_METHOD') === 'POST') {
 	echo html_e('p', array('class' => 'warning_msg'), _('Your search is empty.'));

commit df3ce482d3fa1101442f416ca451fceffad8e986
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Mar 17 17:50:51 2014 +0100

    themes css: clean up and missing comma

diff --git a/src/www/themes/funky-wOw/css/theme.css b/src/www/themes/funky-wOw/css/theme.css
index 203136b..96d7dc9 100644
--- a/src/www/themes/funky-wOw/css/theme.css
+++ b/src/www/themes/funky-wOw/css/theme.css
@@ -1,4 +1,4 @@
-/* 
+/*
  * Stylesheet for Funky Theme.
  *
  * Copyright 2010, Antoine Mercadal - Capgemini
@@ -76,7 +76,7 @@ li {
 }
 
 a {
-	text-decoration:none; 
+	text-decoration:none;
 	font-weight: bold;
 	color: #A66B00;
 	-webkit-transition-property: background-color, color, height, shadow;
@@ -90,13 +90,13 @@ a {
 }
 
 a:hover {
-	text-decoration: none; 
-	color: #A68B00; 
+	text-decoration: none;
+	color: #A68B00;
 	font-weight: bold;
 }
 
 th, td {
-	text-align:left; 
+	text-align:left;
 	border:none;
 	border-collapse: collapse;
 }
@@ -124,12 +124,12 @@ hr {
 	border-top-left-radius: 6px;
 	border-top-right-radius: 6px;
 	border-collapse: collapse;
-	
+
 }
 
 #header-col1 {
   padding:10px;
-} 
+}
 
 #header-col1 img{
   padding:0;
@@ -176,8 +176,8 @@ hr {
 #searchBox a{
   font-size: 10px;
   margin-right: 10px;
-  text-decoration:none; 
-  font-weight: bold; 
+  text-decoration:none;
+  font-weight: bold;
   color: #A66B00;
   -webkit-transition-property: background-color, color, height, shadow;
   -webkit-transition-duration: 0.3s;
@@ -190,8 +190,8 @@ hr {
 }
 
 #searchBox a:hover {
-	text-decoration: none; 
-	color: #A68B00; 
+	text-decoration: none;
+	color: #A68B00;
 	font-weight: bold;
 }
 
@@ -248,7 +248,7 @@ hr {
 
 .tabGenerator td {
 	padding:0;
-	margin: 0; 
+	margin: 0;
 	vertical-align: middle;
 }
 
@@ -326,13 +326,13 @@ hr {
 
 .innertabs .tabGenerator td {
 	padding:0;
-	margin: 0; 
+	margin: 0;
 	vertical-align: middle;
 }
 
 .innertabs .tabGenerator .tg-middle {
   background-color: #F7F7F7;
-  vertical-align: middle; 
+  vertical-align: middle;
 }
 
 .innertabs .tabGenerator .tg-middle span {
@@ -516,12 +516,12 @@ a.topTabSelected:hover {
 	padding: 4px;
 }
 
-.even
+.even,
 .bgcolor-grey {
 	background-color: #fff3b8;
 }
 
-.odd
+.odd,
 .bgcolor-white {
 	background-color: #ffffff;
 }
diff --git a/src/www/themes/funky/css/theme.css b/src/www/themes/funky/css/theme.css
index 28800d8..707f96a 100644
--- a/src/www/themes/funky/css/theme.css
+++ b/src/www/themes/funky/css/theme.css
@@ -1,4 +1,4 @@
-/* 
+/*
  * Stylesheet for Funky Theme.
  *
  * Copyright 2010, Antoine Mercadal - Capgemini
@@ -77,7 +77,7 @@ li {
 }
 
 a {
-	text-decoration:none; 
+	text-decoration:none;
 	font-weight: bold;
 	color: #7D88CC;
 	-webkit-transition-property: background-color, color, height, shadow;
@@ -91,13 +91,13 @@ a {
 }
 
 a:hover {
-	text-decoration: none; 
-	color: #7eaaee; 
+	text-decoration: none;
+	color: #7eaaee;
 	font-weight: bold;
 }
 
 th, td {
-	text-align:left; 
+	text-align:left;
 	border:none;
 	border-collapse: collapse;
 }
@@ -125,12 +125,12 @@ hr {
 	border-top-left-radius: 6px;
 	border-top-right-radius: 6px;
 	border-collapse: collapse;
-	
+
 }
 
 #header-col1 {
   padding:10px;
-} 
+}
 
 #header-col1 img{
   padding:0;
@@ -220,8 +220,8 @@ hr {
 #searchBox a{
   font-size: 10px;
   margin-right: 10px;
-  text-decoration:none; 
-  font-weight: bold; 
+  text-decoration:none;
+  font-weight: bold;
   color: #7D88CC;
   -webkit-transition-property: background-color, color, height, shadow;
   -webkit-transition-duration: 0.3s;
@@ -234,8 +234,8 @@ hr {
 }
 
 #searchBox a:hover {
-	text-decoration: none; 
-	color: #7eaaee; 
+	text-decoration: none;
+	color: #7eaaee;
 	font-weight: bold;
 }
 
@@ -292,7 +292,7 @@ hr {
 
 .tabGenerator td {
 	padding:0;
-	margin: 0; 
+	margin: 0;
 	vertical-align: middle;
 }
 
@@ -370,13 +370,13 @@ hr {
 
 .innertabs .tabGenerator td {
 	padding:0;
-	margin: 0; 
+	margin: 0;
 	vertical-align: middle;
 }
 
 .innertabs .tabGenerator .tg-middle {
   background-color: #F7F7F7;
-  vertical-align: middle; 
+  vertical-align: middle;
 }
 
 .innertabs .tabGenerator .tg-middle span {
@@ -560,12 +560,12 @@ a.topTabSelected:hover {
 	padding: 4px;
 }
 
-.bgcolor-grey
+.bgcolor-grey,
 .even {
 	background-color: #CDDCF3;
 }
 
-.bgcolor-white
+.bgcolor-white,
 .odd {
 	background-color: #FFFFFF;
 }

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

Summary of changes:
 src/common/docman/views/search.php     |   28 +++++++++++++++-------------
 src/www/themes/funky-wOw/css/theme.css |   32 ++++++++++++++++----------------
 src/www/themes/funky/css/theme.css     |   32 ++++++++++++++++----------------
 3 files changed, 47 insertions(+), 45 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list