From dd3adc7604bf7b112d344845592f5a3e131e77d0 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 2 Feb 2012 16:39:34 +0530
Subject: [PATCH] datefix

---
 conf/_conf.py               | 12 ------------
 conf/apache.conf            | 14 +++-----------
 conf/conf.py                | 11 -----------
 js/legacy/utils/datetime.js |  1 +
 js/legacy/wnf.compressed.js |  2 +-
 5 files changed, 5 insertions(+), 35 deletions(-)
 delete mode 100644 conf/_conf.py
 delete mode 100644 conf/conf.py

diff --git a/conf/_conf.py b/conf/_conf.py
deleted file mode 100644
index 5343a27d96..0000000000
--- a/conf/_conf.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Main Configuration File
-
-# Copy this into conf.py
-# ----------------------
-
-# Index URL
-# ---------
-
-# URL path to index.html
-# if you are installing within a folder, add the folderpath
-index_path = '/'
-
diff --git a/conf/apache.conf b/conf/apache.conf
index a5bcd4bd05..bc30282a24 100644
--- a/conf/apache.conf
+++ b/conf/apache.conf
@@ -13,21 +13,13 @@ Listen 8080
 		Order allow,deny
 		Allow from all
 
-		# enable direct execution of .py files
-		Options +ExecCGI
-		#AddHandler cgi-script .cgi 
-		AddHandler cgi-script .py
+		Options -Indexes +ExecCGI
+		AddHandler cgi-script
 
-		DirectoryIndex index.html
+		DirectoryIndex index.cgi index.html
 
 		RewriteEngine On
-		
-		# all model calls will be redirected to model.py
-		# to call a model - mysite/models/type/name eg. mysite.com/models/Organization/WebNotes
 		RewriteRule /models/(.*)$ /lib/model.py/$1 [L,QSA]
-		
-		# all page calls will be redircted to page.py
-		# page/home
 		RewriteRule /pages/(.*)$ /lib/page.py/$1 [L,QSA]
 		
 	</Directory>
diff --git a/conf/conf.py b/conf/conf.py
deleted file mode 100644
index 777006a3aa..0000000000
--- a/conf/conf.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# Main Configuration File
-
-# Copy this into conf.py
-# ----------------------
-
-# Index URL
-# ---------
-
-# URL path to index.html
-# if you are installing within a folder, add the folderpath
-index_path = '/'
\ No newline at end of file
diff --git a/js/legacy/utils/datetime.js b/js/legacy/utils/datetime.js
index ecea72c147..4020be9bfa 100644
--- a/js/legacy/utils/datetime.js
+++ b/js/legacy/utils/datetime.js
@@ -261,6 +261,7 @@ if ( typeof jQuery != "undefined" )
 	};
 
 var comment_when = prettyDate;
+wn.datetme.comment_when = prettyDate;
 
 // globals (deprecate)
 var date = dateutil = wn.datetime;
diff --git a/js/legacy/wnf.compressed.js b/js/legacy/wnf.compressed.js
index 534a0b59b2..da9c945e92 100644
--- a/js/legacy/wnf.compressed.js
+++ b/js/legacy/wnf.compressed.js
@@ -119,7 +119,7 @@ var date=new Date((time||"").replace(/-/g,"/").replace(/[TZ]/g," ").replace(/\.[
 return'';return day_diff==0&&(diff<60&&"just now"||diff<120&&"1 minute ago"||diff<3600&&Math.floor(diff/60)+" minutes ago"||diff<7200&&"1 hour ago"||diff<86400&&Math.floor(diff/3600)+" hours ago")||day_diff==1&&"Yesterday"||day_diff<7&&day_diff+" days ago"||day_diff<31&&Math.ceil(day_diff/7)+" weeks ago"||day_diff<365&&Math.ceil(day_diff/30)+" months ago"||"more than "+Math.floor(day_diff/365)+" year(s) ago";}
 if(typeof jQuery!="undefined")
 jQuery.fn.prettyDate=function(){return this.each(function(){var date=prettyDate(this.title);if(date)
-jQuery(this).text(date);});};var comment_when=prettyDate;var date=dateutil=wn.datetime;var get_today=wn.datetime.get_today
+jQuery(this).text(date);});};var comment_when=prettyDate;wn.datetme.comment_when=prettyDate;var date=dateutil=wn.datetime;var get_today=wn.datetime.get_today
 var time_to_ampm=wn.datetime.time_to_ampm;var time_to_hhmm=wn.datetime.time_to_hhmm;var only_date=wn.datetime.only_date;
 /*
  *	lib/js/legacy/utils/dom.js