From 210f0dcc276e88518986846b6c074585951fbf1d Mon Sep 17 00:00:00 2001 From: jendib Date: Fri, 2 Aug 2013 23:03:31 +0200 Subject: [PATCH] File data cache header, alert with file count on document added --- docs-parent/TODO | 7 +++---- .../sismics/docs/rest/resource/FileResource.java | 3 +++ docs-web/src/main/webapp/favicon.png | Bin 0 -> 1058 bytes docs-web/src/main/webapp/index.html | 3 ++- .../main/webapp/js/controller/DocumentEdit.js | 6 +++++- 5 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 docs-web/src/main/webapp/favicon.png diff --git a/docs-parent/TODO b/docs-parent/TODO index 34dea5b7..f8c0fc2f 100644 --- a/docs-parent/TODO +++ b/docs-parent/TODO @@ -1,7 +1,6 @@ -- Reordering files (server) - Autocomplete on document title (client/server) -- Cache headers on /file/:id/data (server) +- List opened sessions and ability to close them (client/server) - Display logs (client) -- Users administration (client) +- Reordering files and add new files to the end (server) - Tag stats (client/server) -- List opened sessions and ability to close them (client/server) \ No newline at end of file +- Users administration (client) \ No newline at end of file diff --git a/docs-web/src/main/java/com/sismics/docs/rest/resource/FileResource.java b/docs-web/src/main/java/com/sismics/docs/rest/resource/FileResource.java index 805cc57f..e5ea0f5b 100644 --- a/docs-web/src/main/java/com/sismics/docs/rest/resource/FileResource.java +++ b/docs-web/src/main/java/com/sismics/docs/rest/resource/FileResource.java @@ -4,7 +4,9 @@ import java.io.BufferedInputStream; import java.io.InputStream; import java.nio.file.Paths; import java.text.MessageFormat; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; import javax.persistence.NoResultException; @@ -252,6 +254,7 @@ public class FileResource extends BaseResource { return Response.ok(storedfile) .header("Content-Type", file.getMimeType()) + .header("Expires", new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss Z").format(new Date().getTime() + 3600000 * 24 * 7)) .build(); } } diff --git a/docs-web/src/main/webapp/favicon.png b/docs-web/src/main/webapp/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..9a6e5ee2ef5b608d64b75ee2d309b32807a582cb GIT binary patch literal 1058 zcmaJ=OK1~O6dfCAOKH)C3qK3TDJ@vceA0Z(&=@nB#0E?WX=t-_GV_`Y?aUizUYoQC z_9N0t7Fr6r5D`QW7j9itXmJq{S}JtWQbkY%sURXp{aB{L586T zNDs|AW!B4*UXJE^-9Df1BI#l|mSJ5C=W=pBzSqUGELr_19L-cl_@o%E#=^S*l|#tj z87804)A?Q+npuYP`~9|t%jLufr!}b~so>PD&YFSax03EfX#nQ;-aXqggwp8ZaLJKUCA|XbUC5k>7s`Td7F{FiBv+aZ|<@H_~Z`GWf6w zBm~VAgk!ZTCUOu#D+diSJm?{ZRb7F3tAdWl`Iv4YNtZ!P3{aR)tE$5L-Iv&?D2P!( zaC2P56%r#M!S4-u{em|f343c?5z6Bl&{2)69C0HJxppIH297KOQ=I@x)Px#YNtjm~ zdl4GyRk=!IFX4t<2Ag5*YyIn*Ye%?u>}9=a@uuGPK*zmq;-*dnAAG_O;$ch-r3yQl z-{o@9(KWp=BdpG@-Ctb%(vobM-k!c!%5FU7GN)G8)@~+5QM|w~Oc%%fqUrVS?(PF= zEc%swzqM69?!Nu`$A?$#E4Rv}7yJ8r--@MDsl4&XKeyX7G&ICIdwT9}?p|>`KRf@l zxqa!_>dECf%Hh>^QuCg!rWwci^ Sismics Docs - + +