[Bps-public-commit] rtx-calendar branch, master, updated. 0.20-4-gb83c0ee

[? sunnavy]

The branch, master has been updated
       via  b83c0eeb03af9257adeefd0ff5ce19cfb10f9875 (commit)
       via  4f30fa58d38a9a1c5332e11c3398c71c305aa3d2 (commit)
      from  d5e94f4e8077cabf5fc4f7224fad259608552841 (commit)

Summary of changes:
 html/Search/Calendar.html | 46 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 8 deletions(-)

- Log -----------------------------------------------------------------
commit 4f30fa58d38a9a1c5332e11c3398c71c305aa3d2
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue Oct 28 23:13:31 2014 +0800

    let's show help in Calendar.html

diff --git a/html/Search/Calendar.html b/html/Search/Calendar.html
index 88b125b..98f8e15 100644
--- a/html/Search/Calendar.html
+++ b/html/Search/Calendar.html
@@ -117,13 +117,6 @@ $NewQuery => 0
 </table>
 
 <table width="100%">
-<tr>
-
-<td valign="top" rowspan=9>
-  <BR>
-  <a href="<%$RT::WebPath%>/Prefs/Calendar.html">Calendar Preferences and Help</a>
-</td>
-
 % foreach my $legend (keys %legend) {
     <tr>
       <td align="right">
@@ -143,6 +136,43 @@ $NewQuery => 0
 
 </&>
 
+<&| /Widgets/TitleBox, title => loc('Help') &>
+
+<h3><&|/l&>displaying reminders</&>:</h3>
+<p>
+<&|/l_unsafe, qq{<a href="$RT::WebPath/Search/Edit.html">} . loc("Advanced") . '</a>' &>
+If you want to have reminders in a search you need to go to [_1] tab
+and add something to the Query like that:
+</&>
+ <pre>
+   AND ( Type = 'ticket' OR Type = 'reminder' )
+</pre>
+</p>
+
+<h3><&|/l&>displaying other kind of dates</&>:</h3>
+<p>
+<&|/l_unsafe, qq{<a href="$RT::WebPath/Search/Build.html">} . loc("Query Builder") . '</a>'&>
+By default RTx::Calendar display Due and Starts dates. You can select other
+kind of events you want with the Display Columns section in the [_1].
+The following one will display the two latter and LastUpdated dates:
+</&>
+<pre>
+  '<small>__Due__</small>',
+  '<small>__Starts__</small>',
+  '<small>__LastUpdated__</small>'
+</pre>
+</p>
+
+<h3><&|/l&>changing the default query</&>:</h3>
+<p>
+<&|/l_unsafe, qq{<a href="$RT::WebPath/Search/Build.html">} . loc("Query Builder") . '</a>'&>
+You can change the default Query of Calendar.html and MyCalendar
+portlet by saving a query with the name <code>calendar</code> in the [_1].
+</&>
+</p>
+
+</&>
+
 <%ONCE>
 
 my %legend = (

commit b83c0eeb03af9257adeefd0ff5ce19cfb10f9875
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue Oct 28 23:15:31 2014 +0800

    order the legends
    
    especially because of "hash order randomization" in recent perl versions

diff --git a/html/Search/Calendar.html b/html/Search/Calendar.html
index 98f8e15..722b399 100644
--- a/html/Search/Calendar.html
+++ b/html/Search/Calendar.html
@@ -117,7 +117,7 @@ $NewQuery => 0
 </table>
 
 <table width="100%">
-% foreach my $legend (keys %legend) {
+% foreach my $legend (sort keys %legend) {
     <tr>
       <td align="right">
         <img src="<%$RT::WebImagesURL%>/<%$legend%>.png" />

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