From 246bd8cc08f74ec230dd8dfe42de59b46170d467 Mon Sep 17 00:00:00 2001
From: GDrupal <GDrupal@1161294.no-reply.drupal.org>
Date: Fri, 1 Mar 2013 16:37:07 -0300
Subject: [PATCH 1/6] hook_ctools_plugin_pre_alter() implementation and timeago.js file

---
 hap.module    |   10 ++++++++++
 js/timeago.js |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 0 deletions(-)
 create mode 100644 js/timeago.js

diff --git a/hap.module b/hap.module
index c457ccc..8e5b31d 100644
--- a/hap.module
+++ b/hap.module
@@ -19,6 +19,16 @@ function hap_ctools_plugin_directory($owner, $api) {
 }
 
 /**
+ * Implements hook_ctools_plugin_pre_alter().
+ */
+function hap_ctools_plugin_pre_alter(&$plugin, &$info) {
+  // Add some general js funstion to process all rendered timeago elements.
+  if ($plugin['module'] == 'hap' && $plugin['name'] == 'timeago') {
+    drupal_add_js(drupal_get_path('module', 'hap') . '/js/timeago.js');
+  }
+}
+
+/**
  * Implements hook_views_api().
  */
 function hap_views_api() {
diff --git a/js/timeago.js b/js/timeago.js
new file mode 100644
index 0000000..666805d
--- /dev/null
+++ b/js/timeago.js
@@ -0,0 +1,47 @@
+/* 
+ * Proccess all timeago span tags.
+ */
+
+(function ($) {
+    var current = new Date();
+    for(var nodeId in Drupal.settings.hap_timeago){
+        date = new Date(Drupal.settings.hap_timeago[nodeId]*1000);
+        $("span.time-ago-" + nodeId).html(timeAgo(current,date).toString());
+    }
+})(jQuery);
+
+
+function timeAgo(current, previous) {
+
+    var msPerMinute = 60 * 1000;
+    var msPerHour = msPerMinute * 60;
+    var msPerDay = msPerHour * 24;
+    var msPerMonth = msPerDay * 30;
+    var msPerYear = msPerDay * 365;
+
+    var elapsed = current - previous;
+
+    if (elapsed < msPerMinute) {
+         return Math.round(elapsed/1000) + ' seconds ago';
+    }
+
+    else if (elapsed < msPerHour) {
+         return Math.round(elapsed/msPerMinute) + ' minutes ago';
+    }
+
+    else if (elapsed < msPerDay ) {
+         return Math.round(elapsed/msPerHour ) + ' hours ago';
+    }
+
+    else if (elapsed < msPerMonth) {
+         return Math.round(elapsed/msPerDay) + ' days ago';
+    }
+
+    else if (elapsed < msPerYear) {
+         return Math.round(elapsed/msPerMonth) + ' months ago';
+    }
+
+    else {
+         return Math.round(elapsed/msPerYear ) + ' years ago';
+    }
+}
\ No newline at end of file
-- 
1.7.0.4


From b7fd1bf8429dd841931ad45acecc3c510760535d Mon Sep 17 00:00:00 2001
From: GDrupal <GDrupal@1161294.no-reply.drupal.org>
Date: Fri, 1 Mar 2013 16:37:38 -0300
Subject: [PATCH 2/6] Add js settings for each node including timestamp.

---
 plugins/ctools/content_types/timeago.inc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/plugins/ctools/content_types/timeago.inc b/plugins/ctools/content_types/timeago.inc
index 54d7215..38c7db8 100644
--- a/plugins/ctools/content_types/timeago.inc
+++ b/plugins/ctools/content_types/timeago.inc
@@ -65,10 +65,12 @@ function hap_timeago_content_type_render($subtype, $conf, $panel_args, $context)
 
   $node = $context->data;
   $time = $node->{$conf['field']};
+  $nid = $node->nid;
+  drupal_add_js(array('hap_timeago' => array('node-'.$nid => $time)), 'setting');
   $format_interval = format_interval(REQUEST_TIME - $time, $conf['granularity']);
   $element = new stdClass();
   $element->module = 'hap';
-  $element->content = '<span class="time-ago">' . t('!time ago', array('!time' => $format_interval)) . '</span>';
+  $element->content = '<span class="time-ago time-ago-node-' . $nid .'">' . t('!time ago', array('!time' => $format_interval)) . '</span>';
 
   return $element;
 }
-- 
1.7.0.4


From 765d7bb6f665c7bc58457dcc7ad53b1aef7fe20b Mon Sep 17 00:00:00 2001
From: GDrupal <GDrupal@1161294.no-reply.drupal.org>
Date: Fri, 1 Mar 2013 19:19:48 -0300
Subject: [PATCH 3/6] Add form setting for timeago js render

---
 js/timeago.js                            |   22 ++++++++++++----------
 plugins/ctools/content_types/timeago.inc |   19 ++++++++++++++++---
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/js/timeago.js b/js/timeago.js
index 666805d..050088c 100644
--- a/js/timeago.js
+++ b/js/timeago.js
@@ -3,10 +3,12 @@
  */
 
 (function ($) {
-    var current = new Date();
-    for(var nodeId in Drupal.settings.hap_timeago){
-        date = new Date(Drupal.settings.hap_timeago[nodeId]*1000);
-        $("span.time-ago-" + nodeId).html(timeAgo(current,date).toString());
+    if (typeof Drupal.settings.hap_timeago == "object") {
+        var current = new Date();
+        for(var nodeId in Drupal.settings.hap_timeago) {
+            date = new Date(Drupal.settings.hap_timeago[nodeId]*1000);
+            $("span.time-ago-" + nodeId).html(timeAgo(current,date).toString());
+        }
     }
 })(jQuery);
 
@@ -22,26 +24,26 @@ function timeAgo(current, previous) {
     var elapsed = current - previous;
 
     if (elapsed < msPerMinute) {
-         return Math.round(elapsed/1000) + ' seconds ago';
+         return Math.round(elapsed/1000) + ' seconds agoX';
     }
 
     else if (elapsed < msPerHour) {
-         return Math.round(elapsed/msPerMinute) + ' minutes ago';
+         return Math.round(elapsed/msPerMinute) + ' minutes agoX';
     }
 
     else if (elapsed < msPerDay ) {
-         return Math.round(elapsed/msPerHour ) + ' hours ago';
+         return Math.round(elapsed/msPerHour ) + ' hours agoX';
     }
 
     else if (elapsed < msPerMonth) {
-         return Math.round(elapsed/msPerDay) + ' days ago';
+         return Math.round(elapsed/msPerDay) + ' days agoX';
     }
 
     else if (elapsed < msPerYear) {
-         return Math.round(elapsed/msPerMonth) + ' months ago';
+         return Math.round(elapsed/msPerMonth) + ' months agoX';
     }
 
     else {
-         return Math.round(elapsed/msPerYear ) + ' years ago';
+         return Math.round(elapsed/msPerYear ) + ' years agoX';
     }
 }
\ No newline at end of file
diff --git a/plugins/ctools/content_types/timeago.inc b/plugins/ctools/content_types/timeago.inc
index 38c7db8..7dec38e 100644
--- a/plugins/ctools/content_types/timeago.inc
+++ b/plugins/ctools/content_types/timeago.inc
@@ -13,6 +13,7 @@ $plugin = array(
   'defaults' => array(
     'granularity' => 2,
     'field' => 'created',
+    'js_render' => 0,
   ),
 );
 
@@ -43,6 +44,13 @@ function hap_timeago_content_type_edit_form($form, &$form_state) {
     '#default_value' => $conf['field'],
   );
 
+  $form['js_render'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Render using javascript'),
+    '#description' => t('If checked, will render the from js. Using this to compensate heavy caching like a reverse proxy.'),
+    '#default_value' => $conf['js_render'],
+  );
+
   return $form;
 }
 
@@ -65,12 +73,17 @@ function hap_timeago_content_type_render($subtype, $conf, $panel_args, $context)
 
   $node = $context->data;
   $time = $node->{$conf['field']};
-  $nid = $node->nid;
-  drupal_add_js(array('hap_timeago' => array('node-'.$nid => $time)), 'setting');
+  $class = '';
+  if ($conf['js_render']) {
+    $nid = $node->nid;
+    drupal_add_js(array('hap_timeago' => array('node-'.$nid => $time)), 'setting');
+    $class = 'time-ago-node-' . $nid;
+  }
+
   $format_interval = format_interval(REQUEST_TIME - $time, $conf['granularity']);
   $element = new stdClass();
   $element->module = 'hap';
-  $element->content = '<span class="time-ago time-ago-node-' . $nid .'">' . t('!time ago', array('!time' => $format_interval)) . '</span>';
+  $element->content = '<span class="time-ago ' . $class .'">' . t('!time ago', array('!time' => $format_interval)) . '</span>';
 
   return $element;
 }
-- 
1.7.0.4


From a1b549aacbb5e0244734374e83d11613721d8d5d Mon Sep 17 00:00:00 2001
From: GDrupal <GDrupal@1161294.no-reply.drupal.org>
Date: Fri, 1 Mar 2013 19:35:41 -0300
Subject: [PATCH 4/6] Add Drupal behaviors to fix settings undefined bug.

---
 js/timeago.js |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/js/timeago.js b/js/timeago.js
index 050088c..944f239 100644
--- a/js/timeago.js
+++ b/js/timeago.js
@@ -3,11 +3,15 @@
  */
 
 (function ($) {
-    if (typeof Drupal.settings.hap_timeago == "object") {
-        var current = new Date();
-        for(var nodeId in Drupal.settings.hap_timeago) {
-            date = new Date(Drupal.settings.hap_timeago[nodeId]*1000);
-            $("span.time-ago-" + nodeId).html(timeAgo(current,date).toString());
+    Drupal.behaviors.hap_timeago_render = {
+        attach: function (context, settings) {
+            if (typeof Drupal.settings.hap_timeago == "object") {
+                var current = new Date();
+                for(var nodeId in Drupal.settings.hap_timeago) {
+                    date = new Date(Drupal.settings.hap_timeago[nodeId]*1000);
+                    $("span.time-ago-" + nodeId).html(timeAgo(current,date).toString());
+                }
+            }
         }
     }
 })(jQuery);
@@ -24,26 +28,26 @@ function timeAgo(current, previous) {
     var elapsed = current - previous;
 
     if (elapsed < msPerMinute) {
-         return Math.round(elapsed/1000) + ' seconds agoX';
+         return Math.round(elapsed/1000) + ' seconds ago';
     }
 
     else if (elapsed < msPerHour) {
-         return Math.round(elapsed/msPerMinute) + ' minutes agoX';
+         return Math.round(elapsed/msPerMinute) + ' minutes ago';
     }
 
     else if (elapsed < msPerDay ) {
-         return Math.round(elapsed/msPerHour ) + ' hours agoX';
+         return Math.round(elapsed/msPerHour ) + ' hours ago';
     }
 
     else if (elapsed < msPerMonth) {
-         return Math.round(elapsed/msPerDay) + ' days agoX';
+         return Math.round(elapsed/msPerDay) + ' days ago';
     }
 
     else if (elapsed < msPerYear) {
-         return Math.round(elapsed/msPerMonth) + ' months agoX';
+         return Math.round(elapsed/msPerMonth) + ' months ago';
     }
 
     else {
-         return Math.round(elapsed/msPerYear ) + ' years agoX';
+         return Math.round(elapsed/msPerYear ) + ' years ago';
     }
 }
\ No newline at end of file
-- 
1.7.0.4


From 7c688cdf82665e9150bb7ab960c4c12178666ea0 Mon Sep 17 00:00:00 2001
From: GDrupal <GDrupal@1161294.no-reply.drupal.org>
Date: Fri, 1 Mar 2013 19:49:04 -0300
Subject: [PATCH 5/6] General format fixes.

---
 js/timeago.js                            |   12 ++++++------
 plugins/ctools/content_types/timeago.inc |    4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/js/timeago.js b/js/timeago.js
index 944f239..a618d6e 100644
--- a/js/timeago.js
+++ b/js/timeago.js
@@ -28,26 +28,26 @@ function timeAgo(current, previous) {
     var elapsed = current - previous;
 
     if (elapsed < msPerMinute) {
-         return Math.round(elapsed/1000) + ' seconds ago';
+        return Math.round(elapsed/1000) + ' seconds ago';
     }
 
     else if (elapsed < msPerHour) {
-         return Math.round(elapsed/msPerMinute) + ' minutes ago';
+        return Math.round(elapsed/msPerMinute) + ' minutes ago';
     }
 
     else if (elapsed < msPerDay ) {
-         return Math.round(elapsed/msPerHour ) + ' hours ago';
+        return Math.round(elapsed/msPerHour ) + ' hours ago';
     }
 
     else if (elapsed < msPerMonth) {
-         return Math.round(elapsed/msPerDay) + ' days ago';
+        return Math.round(elapsed/msPerDay) + ' days ago';
     }
 
     else if (elapsed < msPerYear) {
-         return Math.round(elapsed/msPerMonth) + ' months ago';
+        return Math.round(elapsed/msPerMonth) + ' months ago';
     }
 
     else {
-         return Math.round(elapsed/msPerYear ) + ' years ago';
+        return Math.round(elapsed/msPerYear ) + ' years ago';
     }
 }
\ No newline at end of file
diff --git a/plugins/ctools/content_types/timeago.inc b/plugins/ctools/content_types/timeago.inc
index 7dec38e..7d7b986 100644
--- a/plugins/ctools/content_types/timeago.inc
+++ b/plugins/ctools/content_types/timeago.inc
@@ -76,14 +76,14 @@ function hap_timeago_content_type_render($subtype, $conf, $panel_args, $context)
   $class = '';
   if ($conf['js_render']) {
     $nid = $node->nid;
-    drupal_add_js(array('hap_timeago' => array('node-'.$nid => $time)), 'setting');
+    drupal_add_js(array('hap_timeago' => array('node-' . $nid => $time)), 'setting');
     $class = 'time-ago-node-' . $nid;
   }
 
   $format_interval = format_interval(REQUEST_TIME - $time, $conf['granularity']);
   $element = new stdClass();
   $element->module = 'hap';
-  $element->content = '<span class="time-ago ' . $class .'">' . t('!time ago', array('!time' => $format_interval)) . '</span>';
+  $element->content = '<span class="time-ago ' . $class . '">' . t('!time ago', array('!time' => $format_interval)) . '</span>';
 
   return $element;
 }
-- 
1.7.0.4


From 8a70f5e40c90d5325ffff644359082a679c67900 Mon Sep 17 00:00:00 2001
From: GDrupal <GDrupal@1161294.no-reply.drupal.org>
Date: Fri, 1 Mar 2013 19:59:50 -0300
Subject: [PATCH 6/6] Use Drupal.t() and 'js' plugin element.

---
 hap.module                               |   10 ----------
 js/timeago.js                            |   12 ++++++------
 plugins/ctools/content_types/timeago.inc |    1 +
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/hap.module b/hap.module
index 8e5b31d..c457ccc 100644
--- a/hap.module
+++ b/hap.module
@@ -19,16 +19,6 @@ function hap_ctools_plugin_directory($owner, $api) {
 }
 
 /**
- * Implements hook_ctools_plugin_pre_alter().
- */
-function hap_ctools_plugin_pre_alter(&$plugin, &$info) {
-  // Add some general js funstion to process all rendered timeago elements.
-  if ($plugin['module'] == 'hap' && $plugin['name'] == 'timeago') {
-    drupal_add_js(drupal_get_path('module', 'hap') . '/js/timeago.js');
-  }
-}
-
-/**
  * Implements hook_views_api().
  */
 function hap_views_api() {
diff --git a/js/timeago.js b/js/timeago.js
index a618d6e..aebbadc 100644
--- a/js/timeago.js
+++ b/js/timeago.js
@@ -28,26 +28,26 @@ function timeAgo(current, previous) {
     var elapsed = current - previous;
 
     if (elapsed < msPerMinute) {
-        return Math.round(elapsed/1000) + ' seconds ago';
+        return Math.round(elapsed/1000) + '' + Drupal.t('seconds ago');
     }
 
     else if (elapsed < msPerHour) {
-        return Math.round(elapsed/msPerMinute) + ' minutes ago';
+        return Math.round(elapsed/msPerMinute) + ' ' + Drupal.t('minutes ago');
     }
 
     else if (elapsed < msPerDay ) {
-        return Math.round(elapsed/msPerHour ) + ' hours ago';
+        return Math.round(elapsed/msPerHour ) + ' ' + Drupal.t('hours ago');
     }
 
     else if (elapsed < msPerMonth) {
-        return Math.round(elapsed/msPerDay) + ' days ago';
+        return Math.round(elapsed/msPerDay) + ' ' + Drupal.t('days ago');
     }
 
     else if (elapsed < msPerYear) {
-        return Math.round(elapsed/msPerMonth) + ' months ago';
+        return Math.round(elapsed/msPerMonth) + ' ' + Drupal.t('months ago');
     }
 
     else {
-        return Math.round(elapsed/msPerYear ) + ' years ago';
+        return Math.round(elapsed/msPerYear ) + ' ' + Drupal.t('years ago');
     }
 }
\ No newline at end of file
diff --git a/plugins/ctools/content_types/timeago.inc b/plugins/ctools/content_types/timeago.inc
index 7d7b986..06a6d5d 100644
--- a/plugins/ctools/content_types/timeago.inc
+++ b/plugins/ctools/content_types/timeago.inc
@@ -15,6 +15,7 @@ $plugin = array(
     'field' => 'created',
     'js_render' => 0,
   ),
+  'js' => ctools_add_js('timeago', 'hap'),
 );
 
 /**
-- 
1.7.0.4

