# HG changeset patch # User Thilo Cestonaro # Date 1260303866 -3600 # Node ID 0e4e000e3de94fa70823443242db5f4568d675a5 # Parent cef943f0a551408f508e1c6887b5aae28f97315f# Parent f535306535f91625fd28b023fd841f353fe6d37a mod_muc_log_http: merge diff -r cef943f0a551 -r 0e4e000e3de9 mod_muc_log_http/muc_log_http/mod_muc_log_http.lua --- a/mod_muc_log_http/muc_log_http/mod_muc_log_http.lua Tue Dec 08 21:12:40 2009 +0100 +++ b/mod_muc_log_http/muc_log_http/mod_muc_log_http.lua Tue Dec 08 21:24:26 2009 +0100 @@ -38,7 +38,126 @@ * Default templates for the html output. ]]-- local html = {}; +<<<<<<< local local theme = "default"; +======= +html.doc = [[ + + + muc_log + + + + +###BODY_STUFF### + + +]]; + +html.components = {}; +html.components.bit = [[###COMPONENT###
]] +html.components.body = [[

Available Multi-User Chats:

+###COMPONENTS_STUFF### +

]]; + +html.rooms = {}; +html.rooms.bit = [[###ROOM###
]] +html.rooms.body = [[

Available rooms on ###COMPONENT###:

+###ROOMS_STUFF### +

]]; + +html.days = {}; +html.days.bit = [[###DAY###
]]; +html.days.body = [[

Available days for ###JID###:

+###DAYS_STUFF### +
]]; + +html.day = {}; +html.day.title = [[Subject: ###TITLE###]]; +html.day.time = [[[###TIME###] ]]; -- the one ####TIME### need to stay! it will evaluate to e.g. #09:10:56 which is an anker then +html.day.presence = {}; +html.day.presence.join = [[
###TIME_STUFF### *** ###NICK### has joined the room
]]; +html.day.presence.leave = [[
###TIME_STUFF### *** ###NICK### has left the room
]]; +html.day.presence.statusText = [[ and his status message is "###STATUS###"]]; +html.day.presence.statusChange = [[
###TIME_STUFF### *** ###NICK### shows as "###SHOW###"###STATUS_STUFF###
]]; +html.day.message = [[###TIME_STUFF###<###NICK###> ###MSG###
]]; +html.day.message_me = [[###TIME_STUFF###*###NICK### ###MSG###
]]; +html.day.titleChange = [[###TIME_STUFF### *** ###NICK### changed the title to "###TITLE###"
]]; +html.day.reason = [[, the reason was "###REASON###"]] +html.day.kick = [[###TIME_STUFF### *** ###VICTIM### got kicked###REASON_STUFF###
]]; +html.day.bann = [[###TIME_STUFF### *** ###VICTIM### got banned###REASON_STUFF###
]]; +html.day.day_link = [[###TEXT###]] +html.day.body = [[

Logs for ###JID### on 20###YEAR###/###MONTH###/###DAY###

+

###TITLE_STUFF###

+Join room via speeqe.com
+###PREVIOUS_LINK### ###NEXT_LINK###
+show/hide joins and leaves       +show/hide status changes +
+###DAY_STUFF### +
+]]; + +-- Calendar stuff +html.year = {}; +html.year.title = [[
###YEAR###
]]; + +html.month = {}; +html.month.header = [[ + + + +###WEEKDAYS### +]]; +html.month.weekDay = [[ ]]; +html.month.emptyDay = [[ ]]; +html.month.day = [[ ]]; +html.month.footer = [[

###TITLE###

###DAY### ###DAY###
]]; + +>>>>>>> other local function checkDatastorePathExists(node, host, today, create) create = create or false; diff -r cef943f0a551 -r 0e4e000e3de9 mod_muc_log_http/muc_log_http/themes/default/components_body.html --- a/mod_muc_log_http/muc_log_http/themes/default/components_body.html Tue Dec 08 21:12:40 2009 +0100 +++ b/mod_muc_log_http/muc_log_http/themes/default/components_body.html Tue Dec 08 21:24:26 2009 +0100 @@ -1,3 +1,3 @@ -

MUC hosts available on this server:

+

Available Multi-User Chats:

###COMPONENTS_STUFF###

\ No newline at end of file diff -r cef943f0a551 -r 0e4e000e3de9 mod_muc_log_http/muc_log_http/themes/default/day_body.html --- a/mod_muc_log_http/muc_log_http/themes/default/day_body.html Tue Dec 08 21:12:40 2009 +0100 +++ b/mod_muc_log_http/muc_log_http/themes/default/day_body.html Tue Dec 08 21:24:26 2009 +0100 @@ -1,8 +1,8 @@ -

Logs of room ###JID### of 20###YEAR###/###MONTH###/###DAY###

+

Logs for ###JID### on 20###YEAR###/###MONTH###/###DAY###

###TITLE_STUFF###

-Join room now via speeqe.com!
+Join room via speeqe.com
###PREVIOUS_LINK### ###NEXT_LINK###
-show/hide joins and Leaves       +show/hide joins and leaves       show/hide status changes
###DAY_STUFF### diff -r cef943f0a551 -r 0e4e000e3de9 mod_muc_log_http/muc_log_http/themes/default/day_presence_join.html --- a/mod_muc_log_http/muc_log_http/themes/default/day_presence_join.html Tue Dec 08 21:12:40 2009 +0100 +++ b/mod_muc_log_http/muc_log_http/themes/default/day_presence_join.html Tue Dec 08 21:24:26 2009 +0100 @@ -1,1 +1,1 @@ -
###TIME_STUFF### *** ###NICK### joins the room
\ No newline at end of file +
###TIME_STUFF### *** ###NICK### has joined the room
\ No newline at end of file diff -r cef943f0a551 -r 0e4e000e3de9 mod_muc_log_http/muc_log_http/themes/default/day_presence_leave.html --- a/mod_muc_log_http/muc_log_http/themes/default/day_presence_leave.html Tue Dec 08 21:12:40 2009 +0100 +++ b/mod_muc_log_http/muc_log_http/themes/default/day_presence_leave.html Tue Dec 08 21:24:26 2009 +0100 @@ -1,1 +1,1 @@ -
###TIME_STUFF### *** ###NICK### leaves the room
\ No newline at end of file +
###TIME_STUFF### *** ###NICK### has left the room
\ No newline at end of file diff -r cef943f0a551 -r 0e4e000e3de9 mod_muc_log_http/muc_log_http/themes/default/day_presence_statusChange.html --- a/mod_muc_log_http/muc_log_http/themes/default/day_presence_statusChange.html Tue Dec 08 21:12:40 2009 +0100 +++ b/mod_muc_log_http/muc_log_http/themes/default/day_presence_statusChange.html Tue Dec 08 21:24:26 2009 +0100 @@ -1,1 +1,1 @@ -
###TIME_STUFF### *** ###NICK### shows now as "###SHOW###"###STATUS_STUFF###
\ No newline at end of file +
###TIME_STUFF### *** ###NICK### shows as "###SHOW###"###STATUS_STUFF###
\ No newline at end of file diff -r cef943f0a551 -r 0e4e000e3de9 mod_muc_log_http/muc_log_http/themes/default/days_body.html --- a/mod_muc_log_http/muc_log_http/themes/default/days_body.html Tue Dec 08 21:12:40 2009 +0100 +++ b/mod_muc_log_http/muc_log_http/themes/default/days_body.html Tue Dec 08 21:24:26 2009 +0100 @@ -1,3 +1,3 @@ -

available logged days of room: ###JID###

+

Available days for ###JID###:

###DAYS_STUFF###
\ No newline at end of file diff -r cef943f0a551 -r 0e4e000e3de9 mod_muc_log_http/muc_log_http/themes/default/rooms_body.html --- a/mod_muc_log_http/muc_log_http/themes/default/rooms_body.html Tue Dec 08 21:12:40 2009 +0100 +++ b/mod_muc_log_http/muc_log_http/themes/default/rooms_body.html Tue Dec 08 21:24:26 2009 +0100 @@ -1,3 +1,3 @@ -

Rooms hosted on MUC host: ###COMPONENT###

+

Available rooms on ###COMPONENT###:

###ROOMS_STUFF###

\ No newline at end of file