From 1a9651149003a53ad269b8fc97d4556b53cebac7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Sep 2016 18:13:13 +0200
Subject: [PATCH] On survey, replace delete image with stanard image in theme.
 Add warning when expired.

---
 htdocs/opensurvey/card.php       |   6 +++++-
 htdocs/opensurvey/img/cancel.png | Bin 587 -> 0 bytes
 htdocs/opensurvey/results.php    |  27 +++++++++++++++++----------
 3 files changed, 22 insertions(+), 11 deletions(-)
 delete mode 100644 htdocs/opensurvey/img/cancel.png

diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 26cf85cb3d6..26ee7fe567c 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -313,7 +313,11 @@ print '</td></tr>';
 // Expire date
 print '<tr><td>'.$langs->trans('ExpireDate').'</td><td colspan="2">';
 if ($action == 'edit') print $form->select_date($expiredate?$expiredate:$object->date_fin,'expire',0,0,0,'',1,0,1);
-else print dol_print_date($object->date_fin,'day');
+else 
+{
+    print dol_print_date($object->date_fin,'day');
+    if ($object->date_fin && $object->date_fin < dol_now()) print img_warning($langs->trans("Expired"));
+}
 print '</td></tr>';
 
 // Author
diff --git a/htdocs/opensurvey/img/cancel.png b/htdocs/opensurvey/img/cancel.png
deleted file mode 100644
index c149c2bc017d5ce5a8ae9330dd7dbd012482e0f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 587
zcmV-R0<`^!P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz-AP12R5;6}
zlWS`lK@^7fYe*m=DW)`pmR@6<ps1n7m=rW+jY^x^OQdNiz0u46%!gbcf1|{ept8=c
zyE{*3RyS3YmeLO|3&Xz8nfIJC24MV;#t#j{3Xca0MrHjOU>FS^-G}e*;M)Q6>s#cP
zI`Y#S<cC-I4{qZbMtd?KGXFRPvxv-Okf{_wGD)zuhM&*kA3mpd?<PY3I|3LsAJpOe
z99gRoBoYLxtN4`)^6U(+TEg4k#l5qPJ%B`j{*_f_ZKl(KW)r_!#V?n^QqkLO<jD!W
z#6x;73Uos25FpH(P800yh2{tnN}Cm=x4n(CxQP4g39Vs(?y&s4|2wa`a%2pp%<k3}
zPArC4Siq^|CjdUa?&poi@k^x<fUfT5a)|kPy0f!5rR+E$cwfU`S;05WtIYbV&9qv`
ziwlIBj6FS#^K_ldVSuLrYDC`S6!P@6U$xP|-Q2|4*a*#1L4u<ry35xQ#q=n^RU4+~
z>($G6W`W@NI5g|L-MKl0Zmu$m^(0~^Lwo5OO~d#(vPfz<EIr@e%N^YK-K)Iz%nbI_
z6!uaqtlSzhkFBy=4$HoE1Gk#T+0EgY*)XptW)Owcn0ex3Qr)$5ha+7M)a<MI_t*H3
Z`UU5exP$$k-M;_;002ovPDHLkV1l3E9Q*(P

diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index 23ccbc6c8a5..995cf659802 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -543,7 +543,7 @@ if (GETPOST('ajoutsujet'))
 		//ajout d'une date avec creneau horaire
 		print $langs->trans("AddADate") .':<br><br>'."\n";
 		print '<select name="nouveaujour"> '."\n";
-		print '<OPTION VALUE="vide"></OPTION>'."\n";
+		print '<OPTION VALUE="vide">&nbsp;</OPTION>'."\n";
 		for ($i=1;$i<32;$i++){
 			print '<OPTION VALUE="'.$i.'">'.$i.'</OPTION>'."\n";
 		}
@@ -557,13 +557,13 @@ if (GETPOST('ajoutsujet'))
 
 		print '<br><br>'. $langs->trans("AddStartHour") .': <br><br>'."\n";
 		print '<select name="nouvelleheuredebut"> '."\n";
-		print '<OPTION VALUE="vide"></OPTION>'."\n";
+		print '<OPTION VALUE="vide">&nbsp;</OPTION>'."\n";
 		for ($i = 0; $i < 24; $i++) {
 			print '<OPTION VALUE="'.$i.'">'.$i.' H</OPTION>'."\n";
 		}
 		print '</SELECT>'."\n";
 		print '<select name="nouvelleminutedebut"> '."\n";
-		print '<OPTION VALUE="vide"></OPTION>'."\n";
+		print '<OPTION VALUE="vide">&nbsp;</OPTION>'."\n";
 		print '<OPTION VALUE="00">00</OPTION>'."\n";
 		print '<OPTION VALUE="15">15</OPTION>'."\n";
 		print '<OPTION VALUE="30">30</OPTION>'."\n";
@@ -571,13 +571,13 @@ if (GETPOST('ajoutsujet'))
 		print '</SELECT>'."\n";
 		print '<br><br>'. $langs->trans("AddEndHour") .': <br><br>'."\n";
 		print '<select name="nouvelleheurefin"> '."\n";
-		print '<OPTION VALUE="vide"></OPTION>'."\n";
+		print '<OPTION VALUE="vide">&nbsp;</OPTION>'."\n";
 		for ($i = 0; $i < 24; $i++) {
 			print '<OPTION VALUE="'.$i.'">'.$i.' H</OPTION>'."\n";
 		}
 		print '</SELECT>'."\n";
 		print '<select name="nouvelleminutefin"> '."\n";
-		print '<OPTION VALUE="vide"></OPTION>'."\n";
+		print '<OPTION VALUE="vide">&nbsp;</OPTION>'."\n";
 		print '<OPTION VALUE="00">00</OPTION>'."\n";
 		print '<OPTION VALUE="15">15</OPTION>'."\n";
 		print '<OPTION VALUE="30">30</OPTION>'."\n";
@@ -598,7 +598,7 @@ if (GETPOST('ajoutsujet'))
 }
 
 if ($user->rights->opensurvey->write) {
-	print '<br />'.$langs->trans("PollAdminDesc",img_picto('','cancel.png@opensurvey'),img_picto('','add-16.png@opensurvey')).'<br>';
+	print '<br />'.$langs->trans("PollAdminDesc",img_picto('','delete'),img_picto('','edit_add')).'<br>';
 }
 
 $nbcolonnes=substr_count($object->sujet,',')+1;
@@ -622,7 +622,7 @@ print '<td></td>'."\n";
 if ($user->rights->opensurvey->write) {
 	for ($i = 0; isset($toutsujet[$i]); $i++) {
 
-		print '<td class=somme><input type="image" name="effacecolonne'.$i.'" src="'.dol_buildpath('/opensurvey/img/cancel.png',1).'"></td>'."\n";
+		print '<td class=somme><input type="image" name="effacecolonne'.$i.'" src="'.img_picto('','delete.png', '', false, 1).'"></td>'."\n";
 	}
 }
 
@@ -654,10 +654,17 @@ if ($object->format=="D")
 			$next = $toutsujet[$i+1];
 		}
 
-		if (isset($toutsujet[$i+1]) && strftime("%Y",$current) == strftime("%Y",$next)){
+		$currenty = 0;
+		if ($current) $currenty=strftime("%Y",$current);
+		$next = 0;
+		if ($next) $nexty=strftime("%Y",$next);
+		if (isset($toutsujet[$i+1]) && ($currenty == $nexty))
+		{
 			$colspan++;
 		} else {
-			print '<td colspan='.$colspan.' class="annee">'.strftime("%Y", $current).'</td>'."\n";
+			print '<td colspan='.$colspan.' class="annee">';
+			if ($current) print strftime("%Y", $current);
+			print '</td>'."\n";
 			$colspan=1;
 		}
 	}
@@ -788,7 +795,7 @@ while ($compteur < $num)
 	print '<tr><td>'."\n";
 
 	if ($user->rights->opensurvey->write) {
-		print '<input type="image" name="effaceligne'.$compteur.'" src="'.dol_buildpath('/opensurvey/img/cancel.png',1).'">'."\n";
+		print '<input type="image" name="effaceligne'.$compteur.'" src="'.img_picto('','delete.png', '', false, 1).'">'."\n";
 	}
 
 	// Name