Merge branch 'master' into sandstorm

Conflicts:
	Makefile
	static/multi.js

Author: audreyt

.gitignore

@@ -1,2 +1,3 @@
 /node_modules/
 /dump.json
+*.swp

Dockerfile

@@ -1,16 +1,16 @@
 #
 # This image requires a linked redis Docker container:
 #
-#    docker run -d redis
+#    docker run --name redis -d -v /docker/host/dir:/data redis redis-server --appendonly yes
 #    docker run -d -p 8000:8000 --link redis:redis audreyt/ethercalc
 #
 
-FROM node:0.10-slim
+FROM node:0.10
 
 RUN useradd ethercalc --create-home
 RUN npm install -g ethercalc pm2
 
 USER ethercalc
 ENV HOME /home/ethercalc
 EXPOSE 8000
-CMD ["sh", "-c", "REDIS_HOST=$REDIS_PORT_6379_TCP_ADDR REDIS_PORT=$REDIS_PORT_6379_TCP_PORT pm2 start -x /usr/local/bin/ethercalc -- --cors && pm2 logs"]
+CMD ["sh", "-c", "REDIS_HOST=$REDIS_PORT_6379_TCP_ADDR REDIS_PORT=$REDIS_PORT_6379_TCP_PORT pm2 start -x `which ethercalc` -- --cors && pm2 logs"]

Makefile

@@ -17,24 +17,22 @@ ETHERCALC_FILES=\
 	static/jquery.js \
 	static/vex.combined.min.js
 
-CLOSURE_COMPILER=closure-compiler
-
 JS_FILES=\
 	app.js dotcloud.js player.js main.js sc.js db.js
 
-all :: SocialCalcModule.js
-	env PATH="$$PATH:./node_modules/LiveScript/bin" lsc -c -o . src
+all :: depends
+	env PATH="$$PATH:./node_modules/livescript/bin" lsc -c -o . src
 	node app.js $(ETHERCALC_ARGS) --cors
 
 manifest ::
 	perl -pi -e 's/# [A-Z].*\n/# @{[`date`]}/m' manifest.appcache
 
 vm :: SocialCalcModule.js
-	env PATH="$$PATH:./node_modules/LiveScript/bin" lsc -c -o . src
+	env PATH="$$PATH:./node_modules/livescript/bin" lsc -c -o . src
 	node app.js --vm $(ETHERCALC_ARGS)
 
 expire :: SocialCalcModule.js
-	env PATH="$$PATH:./node_modules/LiveScript/bin" lsc -c -o . src
+	env PATH="$$PATH:./node_modules/livescript/bin" lsc -c -o . src
 	node app.js --expire 10 $(ETHERCALC_ARGS)
 
 ./node_modules/streamline/bin/_node :
@@ -47,7 +45,7 @@ depends :: app.js static/ethercalc.js static/start.css static/multi.js
 
 SocialCalcModule.js :: $(SOCIALCALC_FILES) exports.js
 
-static/ethercalc.js: $(ETHERCALC_FILES)
+static/ethercalc.js: $(ETHERCALC_FILES) SocialCalcModule.js
 
 .coffee.js:
 	coffee -c $<

README.mkdn

@@ -0,0 +1,53 @@
+<VirtualHost *:80>
+	# The ServerName directive sets the request scheme, hostname and port that
+	# the server uses to identify itself. This is used when creating
+	# redirection URLs. In the context of virtual hosts, the ServerName
+	# specifies what hostname must appear in the request's Host: header to
+	# match this virtual host. For the default virtual host (this file) this
+	# value is not decisive as it is used as a last resort host regardless.
+	# However, you must set it for any further virtual host explicitly.
+	ServerName myethercalc.domain.com
+
+	ServerAdmin webmaster@localhost
+	DocumentRoot /var/www/html
+
+	ErrorLog ${APACHE_LOG_DIR}/ethercalc-error.log
+	CustomLog ${APACHE_LOG_DIR}/ethercalc-access.log combined
+
+	# Proxy pass to the node.js server (port 8000)
+	ProxyPass / http://127.0.0.1:8000/
+	ProxyPassReverse / http://127.0.0.1:8000/
+	
+	# Set up websockets to work through the proxy
+	RewriteEngine On
+	RewriteCond %{REQUEST_URI}  ^/socket.io            [NC]
+	RewriteCond %{QUERY_STRING} transport=websocket    [NC]
+	RewriteRule /(.*)           ws://localhost:8000/$1 [P,L]
+
+
+	# Simple Auth for both viewing and editing sheets
+	<LocationMatch "^/">
+		AuthType Basic
+		AuthName "Ethercalc Viewer"
+		AuthUserFile "/etc/apache2/htpasswd"
+		Require valid-user
+		Order allow,deny
+		Allow from all
+	</LocationMatch>
+	
+        <LocationMatch ^/(.*)/edit$>
+ 		AuthType Basic
+		AuthName "Ethercalc Viewer"
+		AuthUserFile "/etc/apache2/htpasswd"
+		Require user admin
+		Order allow,deny
+		Allow from all
+	</LocationMatch>
+
+	# Set up an alias for static files. Saves having to serve them from node.js
+	Alias /static /path/to/ethercalc/install/static
+	Alias /l10n /path/to/ethercalc/install/l10n
+	Alias /images /path/to/ethercalc/install/images
+
+</VirtualHost>
+

SocialCalcModule.js

@@ -26,92 +26,22 @@
 <script src="./player/graph.js"></script>
 <script src="./player/main.js"></script>
 <script>
-var l10n_zh_TW = {
-  "s_BrowserNotSupported": "瀏覽器不支援",
-  "s_loc_align_center": "置中",
-  "s_loc_align_left": "置左",
-  "s_loc_align_right": "置右",
-  "s_loc_alignment": "對齊方式",
-  "s_loc_audit": "紀錄",
-  "s_loc_auto_sum": "自動加總",
-  "s_loc_automatic": "自動",
-  "s_loc_borders": "邊框",
-  "s_loc_bottom": "底",
-  "s_loc_csv_format": "逗號分隔值(CSV)格式",
-  "s_loc_cancel": "取消",
-  "s_loc_cancel": "取消",
-  "s_loc_category": "分類",
-  "s_loc_center": "中央",
-  "s_loc_clear": "清空",
-  "s_loc_clipboard": "剪貼簿",
-  "s_loc_color": "顏色",
-  "s_loc_column_": "欄 ",
-  "s_loc_comment": "留言",
-  "s_loc_copy": "複製",
-  "s_loc_custom": "自訂",
-  "s_loc_cut": "剪下",
-  "s_loc_default": "預設",
-  "s_loc_delete": "刪除",
-  "s_loc_delete_column": "刪除欄",
-  "s_loc_delete_contents": "刪除內文",
-  "s_loc_delete_row": "刪除列",
-  "s_loc_down": "下",
-  "s_loc_edit": "編輯",
-  "s_loc_font": "字體",
-  "s_loc_format": "格式",
-  "s_loc_formula": "公式",
-  "s_loc_function_list": "函式表",
-  "s_loc_functions": "函式",
-  "s_loc_grid": "格",
-  "s_loc_graph": "圖表",
-  "s_loc_horizontal": "水平",
-  "s_loc_insert_column": "置入一欄",
-  "s_loc_insert_row": "置入一列",
-  "s_loc_italic": "斜體",
-  "s_loc_left": "左",
-  "s_loc_left_border": "左邊框",
-  "s_loc_link": "連結",
-  "s_loc_list": "清單",
-  "s_loc_major_sort": "主要排序",
-  "s_loc_manual": "手冊",
-  "s_loc_merge_cells": "合併儲存格",
-  "s_loc_middle": "置中",
-  "s_loc_name": "名稱",
-  "s_loc_names": "名稱",
-  "s_loc_no_padding": "不留白",
-  "s_loc_normal": "一般",
-  "s_loc_number": "數值",
-  "s_loc_ok": "好",
-  "s_loc_padding": "留白",
-  "s_loc_page_name": "頁名",
-  "s_loc_paste": "貼上",
-  "s_loc_plain_text": "空白文件",
-  "s_loc_recalc": "重算",
-  "s_loc_recalculation": "重新計算",
-  "s_loc_redo": "重做",
-  "s_loc_right": "右",
-  "s_loc_right_border": "右邊框",
-  "s_loc_sheet_settings": "試算表設定",
-  "s_loc_save": "存檔",
-  "s_loc_save_to": "儲存為",
-  "s_loc_set_value_to": "賦值為",
-  "s_loc_sort": "排序",
-  "s_loc_sort_": "排序 ",
-  "s_loc_sort_cells": "排序儲存格",
-  "s_loc_url": "網址",
-  "s_loc_undo": "倒退",
-  "s_loc_unmerge_cells": "取消合併儲存格",
-  "s_loc_up": "上",
-  "s_loc_value": "值",
-  "s_loc_vertical": "垂直",
-  "s_loc_wikitext": "協作文字",
-  "s_loc_workspace": "工作區"
-}
-if (navigator.language === 'zh-TW') {
-    for (var k in l10n_zh_TW) {
-        SocialCalc.Constants[k] = l10n_zh_TW[k]
+var readl10nfile = function(data) {
+  for (var k in data) {
+        SocialCalc.Constants[k] = data[k];
     }
 }
+$.ajax({url: ("/l10n/" + navigator.language + ".json").replace(/de_\w+/, 'de').replace(/zh-Hant/i, 'zh-TW'),
+        async: false,
+        success: function(data){readl10nfile(data)},
+        error: function() {
+          $.ajax({url: "/l10n/en.json",
+                  async: false,
+                  success: function(data){readl10nfile(data)},
+                  error: function(){console.error("Language file not found.")}
+          });
+        }
+  });
 </script>
 
 <link rel="stylesheet" type="text/css" href="./static/socialcalc.css">