Index: openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml,v diff -u -r1.53 -r1.54 --- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml 3 Apr 2009 12:25:08 -0000 1.53 +++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml 3 Apr 2009 15:07:13 -0000 1.54 @@ -124,6 +124,7 @@ Community %clubs_pretty_name% Name Community ID + Community Information Community member %clubs_pretty_name% Memberships The name <strong>%community_key%</strong> is already in use either by an active or archived group. Please go back and select a different name. @@ -281,6 +282,7 @@ Header Icon Alt text Header Logo Header Logo Alt Text + Header logo file Header Logo Item ID Help Hide .LRN toolbar @@ -601,6 +603,7 @@ revoke Revoke site-wide administrative privileges. Role + Roles rrggbb Screen name: Search Index: openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml,v diff -u -r1.23 -r1.24 --- openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml 3 Apr 2009 12:25:08 -0000 1.23 +++ openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml 3 Apr 2009 15:07:13 -0000 1.24 @@ -117,6 +117,7 @@ Comunidad T�tulo de %clubs_pretty_name% Identificador de la comunidad + Information del grupo Miembro de la comunidad Miembro de %clubs_pretty_name% El t�tulo <strong>%community_key%</strong> est� siendo utilizado por otro grupo. \n Por favor, vuelva a la p�gina anterior e introduzca otro t�tulo. @@ -268,6 +269,7 @@ Texto alternativo del �cono del encabezado Logo del encabezado Texto alternativo para el �cono del encabezado + Imagen del logo Identificador para el logo del encabezado Ayuda Esconder la barra de .LRN @@ -540,6 +542,7 @@ revocar Revocar privilegios de administraci�n a lo largo del sitio. Rol + Roles rrggbb Nick: Buscar Index: openacs-4/packages/dotlrn/www/community-edit-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-edit-2.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/dotlrn/www/community-edit-2.adp 15 Jun 2003 01:23:59 -0000 1.6 +++ openacs-4/packages/dotlrn/www/community-edit-2.adp 3 Apr 2009 15:07:13 -0000 1.7 @@ -19,60 +19,17 @@ %> -@page_title@ +doc +@context;noquote@ -#dotlrn.lt_this_is_what_the_header#: -
- - - - - -
-
- @header_text@ -
-
-
-

- + #dotlrn.lt_this_is_what_the_header# + @header_alt_text@

-
-

-#dotlrn.lt_having_trouble#: - -

- + Index: openacs-4/packages/dotlrn/www/community-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-edit-2.tcl,v diff -u -r1.17 -r1.18 --- openacs-4/packages/dotlrn/www/community-edit-2.tcl 9 Nov 2008 23:29:23 -0000 1.17 +++ openacs-4/packages/dotlrn/www/community-edit-2.tcl 3 Apr 2009 15:07:13 -0000 1.18 @@ -35,7 +35,13 @@ set creation_ip [ad_conn peeraddr] set community_id [dotlrn_community::get_community_id] dotlrn::require_user_admin_community -user_id $user_id -community_id $community_id -set page_title [_ dotlrn.Preview] + +set doc(title) [_ dotlrn.Preview] +set context [list \ + [list one-community-admin [_ dotlrn.Admin]] \ + [list community-edit [_ dotlrn.Edit_Properties]] \ + $doc(title)] + set header_text [dotlrn_community::get_community_header_name $community_id] # Image stuff @@ -89,6 +95,12 @@ # if it's a new upload, create the item if { [empty_string_p $item_id]} { set item_id [content::item::new -name $logo_name -parent_id $parent_id -content_type image] + + # since it's just the header logo, which can't be accessed outside of + # the community anyway, let everyone have access to see it. That way + # it won't cause any trouble later on when we try to implement + # try-before-you-buy for non-members. + permission::grant -party_id [acs_magic_object registered_users] -object_id $item_id -privilege read } # the last param is the title of the new file in the CR. @@ -105,15 +117,7 @@ ] content::item::set_live_revision -revision_id $revision_id - # since it's just the header logo, which can't be accessed outside of - # the community anyway, let everyone have access to see it. That way - # it won't cause any trouble later on when we try to implement - # try-before-you-buy for non-members. - permission::grant -party_id [acs_magic_object registered_users] -object_id $revision_id -privilege read - - ns_log notice "aks1: new revision_id $revision_id" - } on_error { # most likely a duplicate name, double click, etc. ad_return_complaint 1 " @@ -190,7 +194,8 @@ set header_url "/resources/dotlrn/logo-$scope_name.gif" } else { - set header_url "[dotlrn_community::get_community_url $community_id]/file-storage/download/?version_id=$revision_id" + set item_id [content::revision::item_id -revision_id $revision_id] + set header_url "[subsite::get_url]image/$item_id" } @@ -268,4 +273,3 @@ } ad_return_template - Index: openacs-4/packages/dotlrn/www/community-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-edit.adp,v diff -u -r1.15 -r1.16 --- openacs-4/packages/dotlrn/www/community-edit.adp 9 Nov 2008 23:29:23 -0000 1.15 +++ openacs-4/packages/dotlrn/www/community-edit.adp 3 Apr 2009 15:07:13 -0000 1.16 @@ -17,82 +17,49 @@ %> -@title@ +doc @context;noquote@ -

+

#dotlrn.Community_info#

-

-

+

#dotlrn.Roles#

-

-

- -

- - -
- - -
- - - - - - - - - - - - - - - +

#dotlrn.header_logo#

- - - - + - - - - +
+ +
- - - - +
+ +
- - +
+ + + +
+ -
#dotlrn.Header_Font#  
#dotlrn.Header_Font_Size#   - -
#dotlrn.Header_Font_Color#   -
#dotlrn.header_logo#  
  
#dotlrn.Header_Alternate_Text#   -
-
- -
- -
- - -

- -[#dotlrn.lt_Revert_ONLY_the_Heade#] -
-[#dotlrn.lt_Revert_all_properties#] - - - +

+ + #dotlrn.lt_Revert_ONLY_the_Heade# + +

Index: openacs-4/packages/dotlrn/www/community-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-edit.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/packages/dotlrn/www/community-edit.tcl 7 Oct 2007 22:36:56 -0000 1.15 +++ openacs-4/packages/dotlrn/www/community-edit.tcl 3 Apr 2009 15:07:13 -0000 1.16 @@ -170,14 +170,15 @@ set scope_name "course" } - set header_url "/resources/dotlrn/logo-$scope_name.gif" + set header_url "" } else { - set header_url "[dotlrn_community::get_community_url $community_id]/file-storage/download/?version_id=$revision_id" + set item_id [content::revision::item_id -revision_id $revision_id] + set header_url "[subsite::get_url]image/$item_id" } -set title [_ dotlrn.Edit_Properties] -set context [list [list one-community-admin [_ dotlrn.Administer]] [_ dotlrn.Edit_Properties]] +set doc(title) [_ dotlrn.Edit_Properties] +set context [list [list one-community-admin [_ dotlrn.Admin]] $doc(title)] ad_return_template Index: openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl 19 Dec 2007 12:28:52 -0000 1.4 +++ openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl 3 Apr 2009 15:07:13 -0000 1.5 @@ -245,9 +245,9 @@ ] if {![empty_string_p $header_logo_item_id]} { - - # Need filename - set header_img_url "[dotlrn_community::get_community_url $community_id]/file-storage/download/?version_id=$header_logo_item_id" + # Need filename + set item_id [content::revision::item_id -revision_id $header_logo_item_id] + set header_img_url "[subsite::get_url]image/$item_id" } Index: openacs-4/packages/dotlrn/www/dotlrn-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.tcl,v diff -u -r1.39 -r1.40 --- openacs-4/packages/dotlrn/www/dotlrn-master.tcl 19 Dec 2007 12:28:52 -0000 1.39 +++ openacs-4/packages/dotlrn/www/dotlrn-master.tcl 3 Apr 2009 15:07:13 -0000 1.40 @@ -256,9 +256,9 @@ ] if {![empty_string_p $header_logo_item_id]} { - - # Need filename - set header_img_url "[dotlrn_community::get_community_url $community_id]/file-storage/download/?version_id=$header_logo_item_id" + # Need filename + set item_id [content::revision::item_id -revision_id $header_logo_item_id] + set header_img_url "[subsite::get_url]image/$item_id" }