Index: openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl,v diff -u -r1.22 -r1.23 --- openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl 10 Aug 2007 19:59:48 -0000 1.22 +++ openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl 14 Sep 2007 09:33:10 -0000 1.23 @@ -593,12 +593,13 @@ Class TABLE2 \ -superclass TABLE \ -instproc render-actions {} { - html::div -id "actions" -style "float: left" { - html::ul -style "list-style:none; padding: 10px;" { - foreach o [[self]::__actions children] { - html::li -class "button" {$o render} - } - } + set actions [[self]::__actions children] + if {[llength $actions] > 0} { + html::div -class "actions" -style "float: left;" { + html::ul -style "list-style:none; padding: 10px;" { + foreach o $actions { html::li -class "button" {$o render} } + } + } } } \ -instproc render {} { Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v diff -u -r1.33 -r1.34 --- openacs-4/packages/xowiki/tcl/form-field-procs.tcl 1 Aug 2007 23:01:51 -0000 1.33 +++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl 14 Sep 2007 09:32:24 -0000 1.34 @@ -568,6 +568,8 @@ FormField::richtext::wym instproc initialize {} { next my set widget_type richtext + } + FormField::richtext::wym instproc render_content {} { ::xowiki::Page requireCSS "/resources/xowiki/wymeditor/skins/default/screen.css" ::xowiki::Page requireJS "/resources/xowiki/wymeditor/jquery.js" ::xowiki::Page requireJS "/resources/xowiki/wymeditor/jquery.wymeditor.js" @@ -577,8 +579,8 @@ $j(".wymeditor").wymeditor(); }); } + next } - ########################################################### # # ::xowiki::FormField::richtext::xinha Index: openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/Attic/xowiki-portlet-procs.tcl,v diff -u -r1.96 -r1.97 --- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl 13 Sep 2007 10:42:51 -0000 1.96 +++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl 14 Sep 2007 09:32:25 -0000 1.97 @@ -979,8 +979,11 @@ -object_name [$__including_page title] \ $item_id $gc_return_url] set gc_comments [general_comments_get_comments $item_id $gc_return_url] - - return "

#general-comments.Comments#

$gc_link

" + if {$gc_comments ne ""} { + return "

#general-comments.Comments#

$gc_link

" + } else { + return "

#general-comments.lt_No_comments_available#

$gc_link

" + } } Class create digg \ @@ -1683,7 +1686,7 @@ foreach o [$pages children] { $o instvar page_order title page_id name title - set level [expr {[regsub {[.]} $page_order . page_order] + 1}] + set level [expr {[regsub -all {[.]} $page_order . page_order] + 1}] set p [::xo::db::CrClass get_instance_from_db -item_id 0 -revision_id $page_id] $p destroy_on_cleanup Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v diff -u -r1.171 -r1.172 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 13 Sep 2007 20:48:20 -0000 1.171 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 14 Sep 2007 09:32:25 -0000 1.172 @@ -1032,7 +1032,7 @@ } else { set image "" } - return "$image

[$t asHTML]

\n

$description

" + return "$image[$t asHTML]\n

$description

" } PodcastItem instproc get_content {} { Index: openacs-4/packages/xowiki/www/oacs-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view.adp,v diff -u -r1.41 -r1.42 --- openacs-4/packages/xowiki/www/oacs-view.adp 13 Sep 2007 21:33:37 -0000 1.41 +++ openacs-4/packages/xowiki/www/oacs-view.adp 14 Sep 2007 09:32:25 -0000 1.42 @@ -1,4 +1,4 @@ - + @title;noquote@ @context;noquote@ Index: openacs-4/packages/xowiki/www/oacs-view2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view2.adp,v diff -u -r1.20 -r1.21 --- openacs-4/packages/xowiki/www/oacs-view2.adp 13 Sep 2007 21:33:37 -0000 1.20 +++ openacs-4/packages/xowiki/www/oacs-view2.adp 14 Sep 2007 09:32:25 -0000 1.21 @@ -1,4 +1,4 @@ - + @title;noquote@ @context;noquote@ Index: openacs-4/packages/xowiki/www/oacs-view3.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view3.adp,v diff -u -r1.15 -r1.16 --- openacs-4/packages/xowiki/www/oacs-view3.adp 13 Sep 2007 21:33:37 -0000 1.15 +++ openacs-4/packages/xowiki/www/oacs-view3.adp 14 Sep 2007 09:32:25 -0000 1.16 @@ -1,4 +1,4 @@ - + @title;noquote@ @context;noquote@ Index: openacs-4/packages/xowiki/www/view-default.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-default.adp,v diff -u -r1.37 -r1.38 --- openacs-4/packages/xowiki/www/view-default.adp 13 Sep 2007 21:33:37 -0000 1.37 +++ openacs-4/packages/xowiki/www/view-default.adp 14 Sep 2007 09:32:25 -0000 1.38 @@ -1,4 +1,4 @@ - + @title;noquote@ @context;noquote@ Index: openacs-4/packages/xowiki/www/view-links.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-links.adp,v diff -u -r1.27 -r1.28 --- openacs-4/packages/xowiki/www/view-links.adp 13 Sep 2007 21:33:37 -0000 1.27 +++ openacs-4/packages/xowiki/www/view-links.adp 14 Sep 2007 09:32:25 -0000 1.28 @@ -1,4 +1,4 @@ - +
Index: openacs-4/packages/xowiki/www/view-plain.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-plain.adp,v diff -u -r1.23 -r1.24 --- openacs-4/packages/xowiki/www/view-plain.adp 13 Sep 2007 21:33:37 -0000 1.23 +++ openacs-4/packages/xowiki/www/view-plain.adp 14 Sep 2007 09:32:25 -0000 1.24 @@ -1,4 +1,4 @@ - +
Index: openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl 25 May 2007 12:58:20 -0000 1.8 +++ openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl 14 Sep 2007 09:32:25 -0000 1.9 @@ -106,7 +106,7 @@ set today_p t } - if { $day_of_week == 0} { + if { $day_of_week == 1} { set beginning_of_week_p t } else { set beginning_of_week_p f @@ -130,6 +130,7 @@ } else { set class inactive } + multirow append days $day_number $beginning_of_week_p $end_of_week_p $today_p $active_p \ "[export_vars -base $base_url {{date $ansi_date} summary}]" $count $class incr day_number Index: openacs-4/packages/xowiki/www/prototypes/book.page =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/prototypes/book.page,v diff -u -r1.4 -r1.5 --- openacs-4/packages/xowiki/www/prototypes/book.page 13 Aug 2007 13:52:11 -0000 1.4 +++ openacs-4/packages/xowiki/www/prototypes/book.page 14 Sep 2007 09:32:25 -0000 1.5 @@ -8,7 +8,7 @@ >>right-col75<<

@title@

Creator: @creator@

-

{{book -menu_buttons "edit copy create delete"}}

+{{book -menu_buttons "edit copy create delete"}} >><< } Index: openacs-4/packages/xowiki/www/resources/xowiki.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/xowiki.css,v diff -u -r1.19 -r1.20 --- openacs-4/packages/xowiki/www/resources/xowiki.css 18 Jul 2007 12:29:04 -0000 1.19 +++ openacs-4/packages/xowiki/www/resources/xowiki.css 14 Sep 2007 09:32:25 -0000 1.20 @@ -1,12 +1,13 @@ -#at-a-glance :active {background: #999999;} +/* for mini-calendar in weblog */ #at-a-glance td.inactive {color: #999999;} -#at-a-glance td.active {color: #003b53;} -#at-a-glance td.today {color: #FFFFFF;} +/*#at-a-glance :active {background: #999999;}*/ +/*#at-a-glance td.active {color: #003b53;}*/ +/*#at-a-glance td.today {color: #003b53;}*/ div.wiki-menu { position: relative; right: 0px; - text-align: right; font-family: sans-serif; font-size: 85%;color: #7A7A78 + text-align: right; font-family: sans-serif; font-size: 85%;color: #7A7A78; } #wikicmds {position: relative; top: -24px; right: 0px; height: 0px; @@ -36,7 +37,7 @@ div.xowiki-content {background: #fff; font: 10pt Verdana, Arial, Helvetica, sans-serif;} /* table, td {font: 10px 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; color: #000;}*/ #main div.column {text-align: left; margin-bottom: 1em;} -#content {float: left; width: 70%} +#content {float: left; width: 70%;} div.xowiki-content h1 { font-size: 24px; clear: both; border-bottom: solid silver 1px; color: #222222; @@ -51,7 +52,7 @@ text-align: left; font-weight: normal; } div.xowiki-content h3 { - font-size: 14px + font-size: 14px; text-indent: 0em; margin-top: 0.75em; margin-bottom: 0.1em; letter-spacing: 0px; color: #222222; @@ -61,20 +62,20 @@ div.xowiki-content .box {border: 1px solid #a1a5a9; padding: 0 5px 5px 5px; margin: 0 0 1.25em 0;} div.xowiki-content .errorMsg {color: red; font-weight: bold;} div.xowiki-content .hr { - height: 1px; border: none; - color: silver; background-color: silver; + height: 1px; border: none; + background-color: silver; } -#bookNavBar { top: 0px; height: 2px; background-color: #859db8; } +#bookNavBar { top: 0px; height: 2px; background-color: #859db8;} #content .box h2 {border-bottom: 1px solid #a1a5a9; padding: 5px; background: #f2f2f2; margin: 0 -5px 5px -5px; font-size: 12px;} #sidebar {float: right; top: 0px; width: 29%; font: 10px 'Lucida Grande', Geneva, Verdana, Arial, sans-serif;} #sidebar h2 {font-size: 12px; margin: 0;} #sidebar h3 {font-size: 11px; margin: 0;} #sidebar h4 {font-size: 10px; margin: 0;} #sidebar .sidebox li {font-size: 10px; margin: 0;} -img.found {border-width: 0px; height: 12px} -img.undefined {border-width: 2px; border-color: #859db8; height: 8px} +img.found {border-width: 0px; height: 12px;} +img.undefined {border-width: 2px; border-color: #859db8; height: 8px;} #left-col {float: left; width: 50%; top: 0px;} #right-col {float: right; width: 49%; top: 0px;} @@ -93,9 +94,9 @@ #right-col75 {float: right; width: 74%; top: 0px;} #right-col80 {float: right; width: 79%; top: 0px;} -#messages .timestamp {font-size: 80%; color: grey} -#messages .user {font-size: 80%; font-weight: bold; color: grey} -#messages .message {vertical-align: top} +#messages .timestamp {font-size: 80%; color: #E1E1E1;} +#messages .user {font-size: 80%; font-weight: bold; color: #E1E1E1;} +#messages .message {vertical-align: top;} .rss {border:1px solid; border-color:#FC9 #630 #330 #F96; @@ -107,13 +108,13 @@ margin:0; margin-right:10px;} a:hover.rss {color:#dddddd;} -a:visited.rss {color: #FFF} -a:link.rss {color: #FFF} +a:visited.rss {color: #FFF;} +a:link.rss {color: #FFF;} div.rightbox {float:right; right: 1em; clear: right; font-size: 75%; padding: 5px; - border:dotted; border-width:1px;background: #f8f8f8 + border:dotted; border-width:1px;background: #f8f8f8; } -div.presence h1 {font-size: 90%; margin-bottom: 0px} +div.presence h1 {font-size: 90%; margin-bottom: 0px;} div.xowiki-content pre, .code { font-family: "Courier", monospace;