From ff6d3be7970a87e216e31dd138504d5e05ec66ed Mon Sep 17 00:00:00 2001
From: Jan <jan@horde.org>
Date: Thu, 4 Nov 2010 13:43:07 +0000
Subject: [PATCH] Revert "Revert "Add custom help links.""

This reverts commit fbdb1bf567665c117042bc67976b4f079a07cd3b.
---
 kronolith/templates/chunks/calendar.php | 11 ++++++++---
 kronolith/templates/index/edit.inc      |  5 +++--
 kronolith/templates/index/task.inc      |  1 +
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/kronolith/templates/chunks/calendar.php b/kronolith/templates/chunks/calendar.php
index e3e4b646e..9c993336a 100644
--- a/kronolith/templates/chunks/calendar.php
+++ b/kronolith/templates/chunks/calendar.php
@@ -100,7 +100,7 @@ $file_upload = $GLOBALS['browser']->allowFileUploads();
 </div>
 
 <div id="kronolithCalendarinternalTabImport" class="kronolithTabsOption" style="display:none">
-  <div class="kronolithDialogInfo"><?php echo _("iCalendar is a computer file format which allows internet users to send meeting requests and tasks to other internet users, via email, or sharing files with an extension of .ics.") ?></div>
+  <div class="kronolithDialogInfo"><?php echo _("iCalendar is a computer file format which allows internet users to send meeting requests and tasks to other internet users, via email, or sharing files with an extension of .ics.") ?><br /><?php echo _("More information at") ?> <a href="http://ajuda.sapo.pt/">ajuda.sapo.pt</a></div>
   <div>
     <label for="kronolithCalendarinternalImport"><?php echo _("Import ICS file") ?>:</label>
     <input type="file" id="kronolithCalendarinternalImport" name="import_file" /><br />
@@ -114,7 +114,7 @@ $file_upload = $GLOBALS['browser']->allowFileUploads();
 </div>
 
 <div id="kronolithCalendarinternalTabExport" class="kronolithTabsOption" style="display:none">
-  <div class="kronolithDialogInfo"><?php echo _("iCalendar is a computer file format which allows internet users to send meeting requests and tasks to other internet users, via email, or sharing files with an extension of .ics.") ?></div>
+  <div class="kronolithDialogInfo"><?php echo _("iCalendar is a computer file format which allows internet users to send meeting requests and tasks to other internet users, via email, or sharing files with an extension of .ics.") ?><br /><?php echo _("More information at") ?> <a href="http://ajuda.sapo.pt/">ajuda.sapo.pt</a></div>
   <div>
     <label><?php echo _("Export ICS file") ?>:</label>
     <a id="kronolithCalendarinternalExport"><?php echo _("Calendar ICS file") ?></a>
@@ -127,6 +127,7 @@ $file_upload = $GLOBALS['browser']->allowFileUploads();
   <input type="button" value="<?php echo _("Subscribe") ?>" class="kronolithCalendarSubscribe button ok" style="display:none" />
   <input type="button" value="<?php echo _("Unsubscribe") ?>" class="kronolithCalendarUnsubscribe button ko" style="display:none" />
   <span class="kronolithSeparator"><?php echo _("or") ?></span> <a class="kronolithFormCancel"><?php echo _("Cancel") ?></a>
+  <span class="kronolithDialogHelp"><a href="http://ajuda.sapo.pt/" target="help"><?php echo _("Need help? See ajuda.sapo.pt") ?></a></span>
 </div>
 </div>
 
@@ -189,7 +190,7 @@ $file_upload = $GLOBALS['browser']->allowFileUploads();
 </div>
 
 <div id="kronolithCalendartasklistsTabExport" class="kronolithTabsOption" style="display:none">
-  <div class="kronolithDialogInfo"><?php echo _("iCalendar is a computer file format which allows internet users to send meeting requests and tasks to other internet users, via email, or sharing files with an extension of .ics.") ?></div>
+  <div class="kronolithDialogInfo"><?php echo _("iCalendar is a computer file format which allows internet users to send meeting requests and tasks to other internet users, via email, or sharing files with an extension of .ics.") ?><br /><?php echo _("More information at") ?> <a href="http://ajuda.sapo.pt/">ajuda.sapo.pt</a></div>
   <div>
     <label><?php echo _("Export ICS file") ?>:</label>
     <a id="kronolithCalendartasklistsExport"><?php echo _("Task list ICS file") ?></a>
@@ -202,6 +203,7 @@ $file_upload = $GLOBALS['browser']->allowFileUploads();
   <input type="button" value="<?php echo _("Subscribe") ?>" class="kronolithCalendarSubscribe button ok" style="display:none" />
   <input type="button" value="<?php echo _("Unsubscribe") ?>" class="kronolithCalendarUnsubscribe button ko" style="display:none" />
   <span class="kronolithSeparator"><?php echo _("or") ?></span> <a class="kronolithFormCancel"><?php echo _("Cancel") ?></a>
+  <span class="kronolithDialogHelp"><a href="http://ajuda.sapo.pt/" target="help"><?php echo _("Need help? See ajuda.sapo.pt") ?></a></span>
 </div>
 </div>
 
@@ -229,6 +231,7 @@ $file_upload = $GLOBALS['browser']->allowFileUploads();
   <input type="button" value="<?php echo _("Continue") ?>" class="kronolithCalendarContinue button ok" />
   <input type="button" value="<?php echo _("Delete") ?>" class="kronolithCalendarDelete button ko" />
   <span class="kronolithSeparator"><?php echo _("or") ?></span> <a class="kronolithFormCancel"><?php echo _("Cancel") ?></a>
+  <span class="kronolithDialogHelp"><a href="http://ajuda.sapo.pt/" target="help"><?php echo _("Need help? See ajuda.sapo.pt") ?></a></span>
 </div>
 </div>
 
@@ -250,6 +253,7 @@ $file_upload = $GLOBALS['browser']->allowFileUploads();
 <div class="kronolithFormActions">
   <input type="button" value="<?php echo _("Continue") ?>" class="kronolithCalendarContinue button ok" />
   <span class="kronolithSeparator"><?php echo _("or") ?></span> <a class="kronolithFormCancel"><?php echo _("Cancel") ?></a>
+  <span class="kronolithDialogHelp"><a href="http://ajuda.sapo.pt/" target="help"><?php echo _("Need help? See ajuda.sapo.pt") ?></a></span>
 </div>
 </div>
 
@@ -270,6 +274,7 @@ $file_upload = $GLOBALS['browser']->allowFileUploads();
   <input type="button" value="<?php echo _("Save") ?>" class="kronolithCalendarSave button ok" />
   <input type="button" value="<?php echo _("Delete") ?>" class="kronolithCalendarDelete button ko" />
   <span class="kronolithSeparator"><?php echo _("or") ?></span> <a class="kronolithFormCancel"><?php echo _("Cancel") ?></a>
+  <span class="kronolithDialogHelp"><a href="http://ajuda.sapo.pt/" target="help"><?php echo _("Need help? See ajuda.sapo.pt") ?></a></span>
 </div>
 </div>
 
diff --git a/kronolith/templates/index/edit.inc b/kronolith/templates/index/edit.inc
index b95953002..033b8673e 100644
--- a/kronolith/templates/index/edit.inc
+++ b/kronolith/templates/index/edit.inc
@@ -206,7 +206,7 @@
 </div>
 
 <div id="kronolithEventTabTags" class="kronolithTabsOption" style="display:none">
-  <div class="kronolithDialogInfo"><?php echo _("To make it easier to find, you can enter comma separated tags related to the event subject.") ?></div>
+  <div class="kronolithDialogInfo"><?php echo _("To make it easier to find, you can enter comma separated tags related to the event subject.") ?><br /><?php echo _("More information at") ?> <a href="http://ajuda.sapo.pt/">ajuda.sapo.pt</a></div>
   <input id="kronolithEventTags" name="tags" />
   <label for="kronolithEventTopTags"><?php echo _("Previously used tags") ?>:</label><br />
   <span id="kronolithEventTags_loading_img" style="display:none;"><?php echo Horde::img('loading.gif', _("Loading...")) ?></span>
@@ -218,7 +218,7 @@
 </div>
 
 <div id="kronolithEventTabExport" class="kronolithTabsOption" style="display:none">
-  <div class="kronolithDialogInfo"><?php echo _("iCalendar is a computer file format which allows internet users to send meeting requests and tasks to other internet users, via email, or sharing files with an extension of .ics.") ?></div>
+  <div class="kronolithDialogInfo"><?php echo _("iCalendar is a computer file format which allows internet users to send meeting requests and tasks to other internet users, via email, or sharing files with an extension of .ics.") ?> <?php echo _("More information at") ?> <a href="http://ajuda.sapo.pt/">ajuda.sapo.pt</a></div>
   <label><?php echo _("Export ICS file") ?>:</label>
   <a id="kronolithEventExport"><?php echo _("Event ICS file") ?></a>
 </div>
@@ -228,6 +228,7 @@
   <input id="kronolithEventSaveAsNew" type="button" value="<?php echo _("Save As New") ?>" class="button ok" />
   <input id="kronolithEventDelete" type="button" value="<?php echo _("Delete") ?>" class="button ko" />
   <span class="kronolithSeparator"><?php echo _("or") ?></span> <a class="kronolithFormCancel"><?php echo _("Cancel") ?></a>
+  <span class="kronolithDialogHelp"><a href="http://ajuda.sapo.pt/" target="help"><?php echo _("Need help? See ajuda.sapo.pt") ?></a></span>
 </div>
 
 </form>
diff --git a/kronolith/templates/index/task.inc b/kronolith/templates/index/task.inc
index e3eaf2375..9250b85dc 100644
--- a/kronolith/templates/index/task.inc
+++ b/kronolith/templates/index/task.inc
@@ -84,6 +84,7 @@
   <input id="kronolithTaskSave" type="button" value="<?php echo _("Save") ?>" class="button ok" />
   <input id="kronolithTaskDelete" type="button" value="<?php echo _("Delete") ?>" class="button ko" />
   <span class="kronolithSeparator"><?php echo _("or") ?></span> <a class="kronolithFormCancel"><?php echo _("Cancel") ?></a>
+  <span class="kronolithDialogHelp"><a href="http://ajuda.sapo.pt/" target="help"><?php echo _("Need help? See ajuda.sapo.pt") ?></a></span>
 </div>
 
 </form>
-- 
2.11.0