From 14d7441b73d32614aa0e086c5f69ac087b939a48 Mon Sep 17 00:00:00 2001
From: Julien Heyman <jheyman@portaildulibre.fr>
Date: Tue, 7 Aug 2012 23:59:18 +0200
Subject: Bug 319598: Add support for saved tabular and graphical reports
 r/a=LpSolit

---
 template/en/default/global/messages.html.tmpl     |  9 +++++
 template/en/default/global/useful-links.html.tmpl | 13 ++++++-
 template/en/default/global/user-error.html.tmpl   |  8 +++++
 template/en/default/reports/report.html.tmpl      | 41 ++++++++++++++++-------
 4 files changed, 58 insertions(+), 13 deletions(-)

(limited to 'template/en')

diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index d39890c13..d93ed537e 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -795,6 +795,15 @@
     or you don't have access to it. The following is a list of the
     products you can choose from.
 
+  [% ELSIF message_tag == "report_created" %]
+    OK, you have a new saved report named <em>[% reportname FILTER html %]</em>.
+
+  [% ELSIF message_tag == "report_deleted" %]
+    OK, the <em>[% reportname FILTER html %]</em> report is gone.
+
+  [% ELSIF message_tag == "report_updated" %]
+    The saved report <em>[% reportname FILTER html %]</em> has been updated.
+
   [% ELSIF message_tag == "remaining_time_zeroed" %]
     The [% field_descs.remaining_time FILTER html %] field has been 
     set to zero automatically as part of closing this [% terms.bug %]
diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl
index 1b5ba9a30..5959ab656 100644
--- a/template/en/default/global/useful-links.html.tmpl
+++ b/template/en/default/global/useful-links.html.tmpl
@@ -56,7 +56,18 @@
     </li>
   [% END %]
 
-  [%# Individual bugs addition %]
+  [% IF user.reports.size %]
+    <li id="reports-saved">
+      <ul class="links">
+        [% FOREACH r = user.reports %]
+          <li>[% '<span class="separator">| </span>' IF print_pipe %]
+          <a href="report.cgi?[% r.query FILTER html %]&amp;saved_report_id=
+                  [%~ r.id FILTER uri %]">[% r.name FILTER html %]</a></li>
+          [% print_pipe = 1 %]
+        [% END %]
+      </ul>
+    </li>
+  [% END %]
 
   [%# Sections of links to more things users can do on this installation. %]
   [% Hook.process("end") %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 0d51eaa1b..fbb9ca169 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1480,6 +1480,14 @@
     To reassign [% terms.abug %], you must provide an address for
     the new assignee.
 
+  [% ELSIF error == "report_name_missing" %]
+    [% title = "No Report Name Specified" %]
+    You must enter a name for your report.
+
+  [% ELSIF error == "report_access_denied" %]
+    [% title = "Report Access Denied" %]
+    You cannot access this report.
+
   [% ELSIF error == "require_component" %]
     [% title = "Component Needed" %]
     To file this [% terms.bug %], you must first choose a component.
diff --git a/template/en/default/reports/report.html.tmpl b/template/en/default/reports/report.html.tmpl
index 84cefbded..76049d04e 100644
--- a/template/en/default/reports/report.html.tmpl
+++ b/template/en/default/reports/report.html.tmpl
@@ -150,18 +150,35 @@
     </tr>
   </table>
 
-  <p>
-    [% IF format == "table" %]
-      <a href="query.cgi?[% switchbase %]&amp;format=report-table">Edit 
-      this report</a>
-    [% ELSE %]
-      <a href="query.cgi?[% switchbase %]&amp;chart_format=
-        [% format %]&amp;format=report-graph&amp;cumulate=[% cumulate %]">
-        Edit this report
-      </a>
-    [% END %]
-  </p>
- 
+  <table>
+    <tr>
+      <td>
+        [% IF format == "table" %]
+          <a href="query.cgi?[% switchbase %]&amp;format=report-table">Edit this report</a>
+        [% ELSE %]
+          <a href="query.cgi?[% switchbase %]&amp;chart_format=
+                  [%~ format %]&amp;format=report-graph&amp;cumulate=[% cumulate %]">
+          Edit this report</a>
+        [% END %]
+      </td>
+      <td>&nbsp;</td>
+      <td>
+        [% IF saved_report_id %]
+          <a href="report.cgi?action=del&amp;saved_report_id=[% saved_report_id FILTER uri %]&amp;token=
+                  [%~ issue_hash_token(['delete_report', saved_report_id]) FILTER uri %]">Forget this report</a>
+        [% ELSE %]
+          <form method="get" action="report.cgi">
+            <input type="submit" id="remember" value="Remember report"> as
+            <input type="hidden" name="query" value="[% switchbase %]&amp;format=[% format FILTER html %]&amp;action=wrap">
+            <input type="hidden" name="action" value="add">
+            <input type="hidden" name="token" value="[% issue_hash_token(['save_report']) FILTER html %]">
+            <input type="text" id="name" name="name" size="20" value="" maxlength="64">
+          </form>
+        [% END %]
+      </td>
+    </tr>
+  </table>
+
 </div>
 
 [% PROCESS global/footer.html.tmpl %]
-- 
cgit v1.2.3-24-g4f1b