Index: openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml,v diff -u -N -r1.38 -r1.39 --- openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml 31 May 2010 10:03:40 -0000 1.38 +++ openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml 4 Jul 2010 16:47:35 -0000 1.39 @@ -37,6 +37,7 @@ Formular %form_name% Formular ausf�llen Auspr�gungen von %form_name% + Verfasser Zustand Stunde Stunden @@ -68,6 +69,7 @@ Inhalt Titel der Seite Another item with the name '%value%' exists already in this folder + Art Typ der Seite Instanzattribute Seitenvorlage Index: openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml,v diff -u -N -r1.57 -r1.58 --- openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml 30 Jun 2010 12:38:58 -0000 1.57 +++ openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml 4 Jul 2010 16:47:35 -0000 1.58 @@ -61,6 +61,7 @@ Updated form %errorMsg% Invalid Form %errorMsg% + Author HTTP Url of the Image (you might drag an image displayed by a web-browser here) Select the Name of a .zip or .tar.gz File Import Archive @@ -109,6 +110,7 @@ %errorMsg% Another item with the name '%value%' exists already in this folder Page Order invalid; might only contain upper and lower case letters, underscore, digits and dots + Type Page Type Instance Attributes Page Instance 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 -N -r1.179 -r1.180 --- openacs-4/packages/xowiki/tcl/form-field-procs.tcl 30 Jun 2010 18:22:00 -0000 1.179 +++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl 4 Jul 2010 16:47:35 -0000 1.180 @@ -949,6 +949,61 @@ return [::xo::get_user_name $v] } + ########################################################### + # + # ::xowiki::formfield::author + # + ########################################################### + + Class author -superclass user_id -parameter { + {photo_size 54} + {with_photo true} + {with_user_link false} + {label #xowiki.formfield-author#} + } + author instproc pretty_value {v} { + if {$v ne ""} { + my instvar object + acs_user::get -user_id $v -array user + if {[my with_photo]} { + set portrait_id [acs_user::get_portrait_id -user_id $v] + if {$portrait_id == 0} { + package require md5 + set md5 [string tolower [md5::Hex [md5::md5 -- $user(email)]]] + set src http://www.gravatar.com/avatar/$md5?size=[my photo_size]&d=mm + } else { + set src "/shared/portrait-bits.tcl?user_id=$v" + } + set photo "" + set photo_class "photo" + } else { + set photo "" + set photo_class "" + } + set date_field [::xowiki::FormPage get_table_form_fields \ + -base_item $object \ + -field_names _last_modified \ + -form_constraints ""] + set date [$date_field pretty_value [$object property _last_modified]] + + if {[my with_user_link]} { + set user_link_begin "" + set user_link_end "" + } else { + set user_link_begin "" + set user_link_end "" + } + + return [subst { +
$photo +

$user_link_begin$user(first_names) $user(last_name)$user_link_end

+

$date

+
+ }] + } + return "" + } + ########################################################### # # ::xowiki::formfield::party_id Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v diff -u -N -r1.154 -r1.155 --- openacs-4/packages/xowiki/tcl/includelet-procs.tcl 22 Jun 2010 17:18:39 -0000 1.154 +++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl 4 Jul 2010 16:47:35 -0000 1.155 @@ -3279,9 +3279,11 @@ {-form} {-parent_id} {-package_ids ""} - {-orderby "__last_modified,desc"} + {-orderby "_last_modified,desc"} + {-view_field _name} {-publish_status "ready"} {-field_names} + {-hidden_field_names ""} {-extra_form_constraints ""} {-inherit_from_forms ""} {-category_id} @@ -3351,8 +3353,8 @@ switch $attr { orderby {set $attr _[::xowiki::formfield::FormField fc_decode $value]} buttons - publish_status - category_id - unless - - where - with_categories - with_form_link - csv - voting_form - - voting_form_form - voting_form_anon_instances { + where - with_categories - with_form_link - csv - view_field - + voting_form - voting_form_form - voting_form_anon_instances { set $attr $value #my msg " set $attr $value" } @@ -3371,6 +3373,11 @@ set raw_field_names $field_names } + foreach fn $hidden_field_names { + set __hidden($fn) 1 + lappend raw_field_names $fn + } + if {$raw_field_names eq ""} { set raw_field_names {_name _last_modified _creation_user} } @@ -3410,6 +3417,7 @@ -html {style "padding: 2px;"} -no_csv 1 -richtext 1} \n } foreach fn $field_names { + if {[info exists __hidden($fn)]} continue append cols [list AnchorField _$fn \ -label [$__ff($fn) label] \ -richtext 1 \ @@ -3533,9 +3541,9 @@ # # Set always a view link, if we have no view button ... # - if {[info exists __ff(_name)]} { - # .... on _name .... - $__c set __name.href $view_link + if {[info exists __ff($view_field)]} { + # .... on $view_field) (per default: _name) .... + $__c set _$view_field.href $view_link } else { # .... otherwise on the first form_field $__c set _[lindex $field_names 0].href $view_link 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 -N -r1.53 -r1.54 --- openacs-4/packages/xowiki/www/resources/xowiki.css 28 Jun 2010 11:49:11 -0000 1.53 +++ openacs-4/packages/xowiki/www/resources/xowiki.css 4 Jul 2010 16:47:35 -0000 1.54 @@ -475,3 +475,32 @@ } div.xowiki-content .forum .responses { } + +div.xowiki-content .forum .cite.photo { + float: left; + width: 190px; +} +div.xowiki-content .forum .cite { + float: left; + width: 100px; +} +div.xowiki-content .forum .question-text { + margin-left: 200px; +} +div.xowiki-content .forum .question-text.nophoto { + margin-left: 110px; +} +div.xowiki-content .forum .cite .photo { + float: right; + margin-left: 4px; +} +div.xowiki-content .forum .cite p.author { + margin-bottom: 0px; + text-align: right; +} +div.xowiki-content .forum .cite p.date { + text-align: right; + font-size: 85%; + color: #777777; + +} \ No newline at end of file