Index: openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl,v diff -u -N -r1.41.2.2 -r1.41.2.3 --- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl 11 Sep 2013 19:30:13 -0000 1.41.2.2 +++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl 13 Mar 2014 13:00:00 -0000 1.41.2.3 @@ -1,9 +1,9 @@ ::xo::library doc { - XoWiki - adp generator procs: remove redundancy in adp files by generating it + XoWiki - adp generator procs: remove redundancy in adp files by generating it - @creation-date 2007-03-13 - @author Gustaf Neumann - @cvs-id $Id$ + @creation-date 2007-03-13 + @author Gustaf Neumann + @cvs-id $Id$ } @@ -26,64 +26,64 @@ if {![my footer]} {return ""} return {} + } } ADP_Generator instproc master_part {} { return [subst -novariables -nobackslashes \ -{ - @title;noquote@ - @context;noquote@ - @item_id@ - property_body - property_doc - - - [my extra_header_stuff]@header_stuff;noquote@ - [my ajax_tag_definition] - - - - [my extra_header_stuff]@header_stuff;noquote@ - [my ajax_tag_definition] - }]\n + { + @title;noquote@ + @context;noquote@ + @item_id@ + property_body + property_doc + + + [my extra_header_stuff]@header_stuff;noquote@ + [my ajax_tag_definition] + + + + [my extra_header_stuff]@header_stuff;noquote@ + [my ajax_tag_definition] + }]\n } ADP_Generator instproc wikicmds_part {} { if {![my wikicmds]} {return ""} return {} + #xowiki.search# · + #xowiki.index# + + } } ADP_Generator instproc footer_part {} { @@ -112,9 +112,9 @@ } append _ \ -{ - -
} \n + { + +
} \n append _ [my wikicmds_part] \n append _ [my content_part] \n @@ -133,273 +133,280 @@ close $f } } -#################################################################################### -# Definition of Templates -#################################################################################### -# -# view-plain -# + #################################################################################### + # Definition of Templates + #################################################################################### + # + # view-plain + # ADP_Generator create view-plain -master 0 -wikicmds 0 -footer 0 -#################################################################################### -# -# view-links -# + #################################################################################### + # + # view-links + # ADP_Generator create view-links -master 0 -footer 0 -##################################################################################### -# -# view-default -# + ##################################################################################### + # + # view-default + # ADP_Generator create view-default -master 1 -footer 1 -#################################################################################### -# -# oacs-view -# + #################################################################################### + # + # oacs-view + # ADP_Generator create oacs-view -master 1 -footer 1 \ - -extra_header_stuff { - - - } \ - -proc content_part {} { - return [subst -novariables -nobackslashes \ -{
-
- -
-
-[next] -
-}] - } +
+ +
+
+ [next] +
+ }] + } -#################################################################################### -# -# oacs-view2 -# -# similar to oacs view (categories left), but having as well a right bar -# + #################################################################################### + # + # oacs-view2 + # + # similar to oacs view (categories left), but having as well a right bar + # ADP_Generator create oacs-view2 -master 1 -footer 1 \ - -extra_header_stuff { - - - - } \ - -proc before_render {page} { - ::xo::cc set_parameter weblog_page weblog-portlet - } \ - -proc content_part {} { - return [subst -novariables -nobackslashes \ -{
-
- -
-
- -
-[next] -
- +
+ +
+ [next] +
+ +
+ + + +
+ +
+ Contributors +
+
+
-
-}] - } + + }] + } -#################################################################################### -# -# oacs-view3 -# -# similar to oacs view2 (categories left), but everything left -# + #################################################################################### + # + # oacs-view3 + # + # similar to oacs view2 (categories left), but everything left + # ADP_Generator create oacs-view3 -master 1 -footer 1 \ - -extra_header_stuff { - - - - - } \ - -proc before_render {page} { - ::xo::cc set_parameter weblog_page weblog-portlet - } \ - -proc content_part {} { - return [subst -novariables -nobackslashes {\ + -extra_header_stuff { + + + + + } \ + -proc before_render {page} { + ::xo::cc set_parameter weblog_page weblog-portlet + } \ + -proc content_part {} { + return [subst -novariables -nobackslashes {\ -
+
-
-
+
-
- - - -
- -
-Contributors -
-
+
+ + + +
+ +
+ Contributors +
+
-
-
- -
-
+
+ +
+
-
-[next] -
- +
+ [next] +
+ -}] - } + }] + } -#################################################################################### -# -# view-book -# -# wiki cmds in rhs -# + #################################################################################### + # + # view-book + # + # wiki cmds in rhs + # ADP_Generator create view-book -master 1 -footer 1 -wikicmds 0 \ - -extra_header_stuff { - } \ - -proc before_render {page} { - #::xo::cc set_parameter weblog_page weblog-portlet - } \ - -proc content_part {} { - return [subst -novariables -nobackslashes \ -{
-
-@toc;noquote@ -
-
- -
- - - - - +
+ @toc;noquote@ +
+
+ +
+
- - - Previous - - - - No Previous - -
+ + + + - + - - -
+ + + Previous + + + + No Previous + + - - - - - -
@book_relpos@
- - 		+ + + + + +
@book_relpos@
+ + 		- - - Next - - - - No Next - -
-
- + + + + Next + + + + No Next + + + + +
+ -
- -
- -}]} +
+ +
+ + }]} -#################################################################################### -# -# view-book-no-ajax -# -# adp identical to view-book. -# + #################################################################################### + # + # view-book-no-ajax + # + # adp identical to view-book. + # ADP_Generator create view-book-no-ajax -master 1 -footer 1 -wikicmds 0 \ - -extra_header_stuff { - } \ - -proc before_render {page} { - #::xo::cc set_parameter weblog_page weblog-portlet - } \ - -proc content_part {} { - return [view-book content_part] - } + -extra_header_stuff { + } \ + -proc before_render {page} { + #::xo::cc set_parameter weblog_page weblog-portlet + } \ + -proc content_part {} { + return [view-book content_part] + } } + +# +# Local variables: +# mode: tcl +# tcl-indent-level: 2 +# indent-tabs-mode: nil +# End: Index: openacs-4/packages/xowiki/tcl/chat-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/chat-procs.tcl,v diff -u -N -r1.17.2.1 -r1.17.2.2 --- openacs-4/packages/xowiki/tcl/chat-procs.tcl 30 Sep 2013 11:37:17 -0000 1.17.2.1 +++ openacs-4/packages/xowiki/tcl/chat-procs.tcl 13 Mar 2014 13:00:00 -0000 1.17.2.2 @@ -1,9 +1,9 @@ ::xo::library doc { - XoWiki - chat procs + XoWiki - chat procs - @creation-date 2006-02-02 - @author Gustaf Neumann - @cvs-id $Id$ + @creation-date 2006-02-02 + @author Gustaf Neumann + @cvs-id $Id$ } namespace eval ::xowiki { ::xo::ChatClass create Chat -superclass ::xo::Chat @@ -25,8 +25,8 @@ # set creator "Nobody" # } # append result "$timeshort\ - # [my encode $creator]\ - # [my encode $msg]\n" + # [my encode $creator]\ + # [my encode $msg]\n" # } # return $result # } @@ -81,17 +81,17 @@ # if {[info commands ::thread::mutex] ne "" && ![catch {ns_conn contentsentlength}]} { - # + # # scripted streaming should work everywhere - # + # set mode scripted-streaming if {![regexp msie|opera [string tolower [ns_set get [ns_conn headers] User-Agent]]]} { - # Explorer doesn't expose partial response until request state != 4, while Opera fires - # onreadystateevent only once. For this reason, for every broser except them, we could - # use the nice mode without the spinning load indicator. - # - set mode streaming - } + # Explorer doesn't expose partial response until request state != 4, while Opera fires + # onreadystateevent only once. For this reason, for every broser except them, we could + # use the nice mode without the spinning load indicator. + # + set mode streaming + } } my log "--chat mode $mode" } @@ -116,7 +116,7 @@ set subscribe_url ${path}ajax/chat?m=subscribe&$context } default { - error "mode $mode unknown, valid are: polling, streaming and scripted-streaming" + error "mode $mode unknown, valid are: polling, streaming and scripted-streaming" } } set send_url ${path}ajax/chat?m=add_msg&$context&msg= @@ -156,10 +156,10 @@ streaming { - ::xowiki::Chat create c1 -destroy_on_cleanup -chat_id $chat_id -session_id $session_id -mode $mode - set r [ns_urldecode [c1 get_all]] - regsub -all {<[/]?div[^>]*>} $r "" r - return "\ + ::xowiki::Chat create c1 -destroy_on_cleanup -chat_id $chat_id -session_id $session_id -mode $mode + set r [ns_urldecode [c1 get_all]] + regsub -all {<[/]?div[^>]*>} $r "" r + return "\