dpillot 2005/12/15 21:29:22 CET
Modified files:
core/src/webapp/jsp/jahia/engines/importexport contentpick.jsp
Log:
friendly info in date
Revision Changes Path
1.43 +11 -1
jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp.diff?r1=1.42&r2=1.43&f=h
Index: contentpick.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- contentpick.jsp 2 Dec 2005 17:59:58 -0000 1.42
+++ contentpick.jsp 15 Dec 2005 20:29:22 -0000 1.43
@@ -59,8 +59,14 @@
Calendar c = Calendar.getInstance(l);
c.setTime(new Date(d));
if (c.after(now)) {
+ long diftime=System.currentTimeMillis()-d;
+ long difmin=diftime/60000;
+ if(difmin<60) {
+ return "aujourd'hui il y a "+difmin+" minutes";
+ } else {
//TODO ressource bundle
return "aujourd'hui a " + sd.format(new
Date(d));
+ }
} else if (c.after(hier) && c.before(now)) {
return "hier a " + sd.format(new Date(d));
}
@@ -79,7 +85,7 @@
%>
<%
/**
- * @version $Id: contentpick.jsp,v 1.42 2005/12/02 17:59:58 dpillot Exp $
+ * @version $Id: contentpick.jsp,v 1.43 2005/12/15 20:29:22 dpillot Exp $
*/
HashMap engineMap = (HashMap)
request.getAttribute("org.jahia.engines.EngineHashMap");
@@ -1004,6 +1010,9 @@
<%
/**
* $Log: contentpick.jsp,v $
+ * Revision 1.43 2005/12/15 20:29:22 dpillot
+ * friendly info in date
+ *
* Revision 1.42 2005/12/02 17:59:58 dpillot
* misc bugs:fix pid bug, queries persistence bug, null url of hit in
some circumstances
* added ability to querying number as jahia_pid
