removed some thread and ticket information from request

they are in FunThread and FunTicket classes now
added funtion FunUptime (I forgot about it)



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@631 e52654a7-88a9-db11-a3e9-0013d4bc506e

html/fun_createthread.html

@@ -8,13 +8,29 @@
 	<legend>{form_thread_legend}</legend>
 	
 	<p class="withnext">{title}:</p>
-	<input class="edit" type="text" name="subject" value="[item_subject]">
+	<input class="edit" type="text" name="subject" value="">
 	
-	[include "fun_emacs_post.html"]
+
+	[# !! change names form_emacs_content_thread and form_emacs_content_ticket]
+	
+	<p class="withnext">{form_emacs_content_thread}</p>
+	<textarea class="multitext" rows="10" cols="60" name="itemcontent"></textarea>
+	
+	<p class="withnext">{form_emacs_content_type}</p>
+	
+	<select name="contenttype" class="contenttype">
+		<option value="0">{form_emacs_content_type_text}</option>
+		<option selected value="1">{form_emacs_content_type_formatted_text}</option>
+		[if-one user_can_use_html]<option value="2">{form_emacs_content_type_html}</option>[end]
+		[if-one user_can_use_bbcode]<option value="3">{form_emacs_content_type_bbcode}</option>[end]
+		[if-one user_can_use_raw]<option value="4">{form_emacs_content_type_raw}</option>[end]
+	</select>
+
+
 	
 	[if-no user_logged]
 		<p class="withnext">{nick}:</p>
-		<input class="edit" type="text" name="guestname" value="[item_guest_name]">
+		<input class="edit" type="text" name="guestname" value="">
 		
 		<p class="withnext">{rebus_how_is_it} [rebus_question]?</p>
 		<input class="edit" type="text" name="rebus">

html/fun_createticket.html

@@ -155,7 +155,23 @@
 
 </table>
 
-[include "fun_emacs_post.html"]
+[# !! change names form_emacs_content_thread and form_emacs_content_ticket]
+
+<p class="withnext">{form_emacs_content_ticket}</p>
+<textarea class="multitext" rows="10" cols="60" name="itemcontent">[ticket_item_content]</textarea>
+
+
+<p class="withnext">{form_emacs_content_type}</p>
+
+<select name="contenttype" class="contenttype">
+	<option[if ticket_item_content_type_is "text"] selected[end] value="0">{form_emacs_content_type_text}</option>
+	<option[if ticket_item_content_type_is "formatted text"] selected[end] value="1">{form_emacs_content_type_formatted_text}</option>
+	[if-one user_can_use_html]<option[if ticket_item_content_type_is "html"] selected[end] value="2">{form_emacs_content_type_html}</option>[end]
+	[if-one user_can_use_bbcode]<option[if ticket_item_content_type_is "bbcode"] selected[end] value="3">{form_emacs_content_type_bbcode}</option>[end]
+	[if-one user_can_use_raw]<option[if ticket_item_content_type_is "raw"] selected[end] value="4">{form_emacs_content_type_raw}</option>[end]
+</select>
+
+
 
 
 [if-no user_logged]

html/fun_last.html

@@ -2,7 +2,7 @@
 
 [if-one last_tab]
 	<table>
-	<tr><th>{last_table_login}</th><th>{last_table_ip}</th><th>{last_table_login_date}</th><th>{last_table_logout_date}</th></tr>
+	<tr><th>{last_tab_login}</th><th>{last_tab_ip}</th><th>{last_tab_login_date}</th><th>{last_tab_logout_date}</th></tr>
 	[for last_tab]
 		<tr><td>[last_tab_name]</td><td>[last_tab_ip]</td><td>[last_tab_start]</td><td>[last_tab_end]</td></tr>
 	[end]

html/fun_thread.html

@@ -9,7 +9,7 @@
 
 [if-one thread_tab]
 	<table class="forum">
-	<tr><th>{thread_table_title}</th><th>{thread_table_author}</th><th>{thread_table_replies}</th><th>{thread_table_last_post}</th></tr>
+	<tr><th>{thread_tab_title}</th><th>{thread_tab_author}</th><th>{thread_tab_replies}</th><th>{thread_tab_last_post}</th></tr>
 	[for thread_tab]
 		<tr>
 		<td><a href="[doc_base_url][dir][thread_tab_url]">[thread_tab_subject]</a></td>

html/fun_ticket.html

@@ -12,12 +12,12 @@
 [if-one ticket_tab]
 	<table class="tickettab">
 	<tr>
-	<th>{ticket_table_name}</th>
-	[if-any ticket_type_tab]<th>{ticket_table_type}</th>[end]
-	[if-any ticket_status_tab]<th>{ticket_table_status}</th>[end]
+	<th>{ticket_tab_name}</th>
+	[if-any ticket_type_tab]<th>{ticket_tab_type}</th>[end]
+	[if-any ticket_status_tab]<th>{ticket_tab_status}</th>[end]
 	<th>{ticket_info_progress}</th>
-	[if-any ticket_priority_tab]<th>{ticket_table_priority}</th>[end]
-	[if-any ticket_expected_tab]<th>{ticket_table_expected}</th>[end]
+	[if-any ticket_priority_tab]<th>{ticket_tab_priority}</th>[end]
+	[if-any ticket_expected_tab]<th>{ticket_tab_expected}</th>[end]
 	</tr>
 	[for ticket_tab]
 		<tr>
@@ -44,7 +44,7 @@
 		[if-any ticket_expected_tab]<tr><th>{ticket_info_expected}:</th><td>[ticket_expected]</td></tr>[end]
 		<tr><th>{ticket_info_progress}:</th><td>[ticket_progress]%</td></tr>
 		</table>
-		[item_print_content]
+		[ticket_item_print_content]
 	</div>
 	
 	[if-one dir_can_use_emacs]

html/fun_who.html

@@ -3,7 +3,7 @@
 
 [if-any who_tab]
 	<table class="who">
-	<tr><th>{who_table_index}</th><th>{user}</th><th>{who_table_start}</th><th>{who_table_last_active}</th></tr>
+	<tr><th>{who_tab_index}</th><th>{user}</th><th>{who_tab_start}</th><th>{who_tab_last_active}</th></tr>
 	[for who_tab]
 		<tr><td>[who_tab_lp]</td><td>[who_tab_user]</td><td>[who_tab_time]</td><td>[who_tab_last_time]</td></tr>
 	[end]

html/stats_info.html

@@ -0,0 +1,11 @@
+	<!--
+	Statistics since: [stats_from], 
+	global: all: [stats_all],
+	unique: [stats_unique],
+	Google: [stats_google],
+	Yahoo: [stats_yahoo],
+	this page: 
+	all: [stats_item_all],
+	Google: [stats_item_google],
+	Yahoo: [stats_item_yahoo]
+	-->