Index: openacs-4/packages/dotlrn-portlet/tcl/dotlrn-members-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/tcl/dotlrn-members-portlet-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-portlet/tcl/dotlrn-members-portlet-procs.tcl 11 Mar 2002 23:06:26 -0000 1.3
+++ openacs-4/packages/dotlrn-portlet/tcl/dotlrn-members-portlet-procs.tcl 12 Mar 2002 05:16:34 -0000 1.4
@@ -41,6 +41,7 @@
} {
return [portal::add_element_or_append_id \
+ -pretty_name [get_pretty_name] \
-portal_id $portal_id \
-page_id $page_id \
-portlet_name [my_name] \
Index: openacs-4/packages/dotlrn-portlet/tcl/dotlrn-members-staff-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/tcl/dotlrn-members-staff-portlet-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-portlet/tcl/dotlrn-members-staff-portlet-procs.tcl 6 Mar 2002 23:21:16 -0000 1.1
+++ openacs-4/packages/dotlrn-portlet/tcl/dotlrn-members-staff-portlet-procs.tcl 12 Mar 2002 05:16:34 -0000 1.2
@@ -41,7 +41,9 @@
} {
} {
- return [portal::add_element_or_append_id -portal_id $portal_id \
+ return [portal::add_element_or_append_id \
+ -pretty_name [get_pretty_name] \
+ -portal_id $portal_id \
-portlet_name [my_name] \
-value_id $community_id \
-key community_id]
Index: openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl 7 Mar 2002 22:48:38 -0000 1.24
+++ openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl 12 Mar 2002 05:16:34 -0000 1.25
@@ -51,7 +51,10 @@
@creation-date Sept 2001
} {
# Tell portal to add this element to the page
- set element_id [portal::add_element $portal_id [my_name]]
+ set element_id [portal::add_element \
+ -pretty_name [get_pretty_name] \
+ $portal_id \
+ [my_name]]
# The default param must be configured
set key "community_id"
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp 11 Mar 2002 23:06:26 -0000 1.2
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp 12 Mar 2002 05:16:34 -0000 1.3
@@ -5,7 +5,10 @@
<ul>
<if @dotlrn_instructor_rel:rowcount@ gt 0>
<multiple name="dotlrn_instructor_rel">
- <li>
+
+ <%= ad_return_complaint 1 "[array get dotlrn_instructor_rel]" %>
+
+ <li>
@dotlrn_instructor_rel.member_link@
<if @read_private_data_p@ eq 1 or @user_id@ eq @dotlrn_instructor_rel.user_id@>
(<a href="mailto:@dotlrn_instructor_rel.email@">@dotlrn_instructor_rel.email@</a>)
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.tcl 11 Mar 2002 23:06:26 -0000 1.2
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.tcl 12 Mar 2002 05:16:34 -0000 1.3
@@ -22,16 +22,16 @@
set rel_types_list [dotlrn_community::get_allowed_rel_types -community_id $community_id]
foreach rel_type $rel_types_list {
-
+
set rel_pn [dotlrn_community::get_role_pretty_name_from_rel_type \
- -rel_type $rel_type]
-
+ -rel_type $rel_type]
+
template::multirow create $rel_type rel_id rel_type user_id first_names last_name email member_link
-
+
set list_of_users \
[dotlrn_community::list_users_in_role \
- -rel_type $rel_type $community_id]
-
+ -rel_type $rel_type $community_id]
+
foreach user $list_of_users {
template::multirow append $rel_type \
[lindex $user 0] \
@@ -43,4 +43,3 @@
[acs_community_member_link -user_id [lindex $user 2] -label "[lindex $user 3] [lindex $user 4]"]
}
}
-
Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -r1.120 -r1.121
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl 11 Mar 2002 23:06:41 -0000 1.120
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl 12 Mar 2002 05:18:21 -0000 1.121
@@ -391,26 +391,16 @@
set template "
<master src=\"@master_template@\">
- <b>Configuring @portal_name@</b>
<p>
- <a href=@return_url@>Go back</a>
+ <big><a href=@return_url@>Go back</a></big>
<P>
<form method=post action=@action_string@>
<input type=hidden name=portal_id value=@portal_id@>
<input type=hidden name=return_url value=@return_url@>
- <b>Change Theme:</b>
+ <big>Change Theme:</big>
@theme_data@
</form>
- <form method=post action=@action_string@>
- <input type=hidden name=portal_id value=@portal_id@>
- <input type=hidden name=return_url value=@return_url@>
- <b>Add a new page:</b>
- @page_data@
- </form>
- <P>
- <BR>
- <BR>
- <b>Configure Page Elements:</b>"
+ <P>"
set list_of_page_ids [list $page_id]
@@ -441,10 +431,10 @@
if {$element_count == 0} {
append template "
- <P>Page <b>$portal(page_name)</b> has no Elements"
+ <P> <b>$portal(page_name)</b> has no Elements"
} else {
append template "
- <P>Page <b>$portal(page_name)</b>
+ <P> <b>$portal(page_name)</b> Page
<include src=\"$portal(template)\" element_list=\"$element_list\"
action_string=@action_string@ portal_id=@portal_id@
return_url=\"@return_url@\" element_src=\"@element_src@\"
@@ -457,6 +447,16 @@
}
+ append template "
+ <form method=post action=@action_string@>
+ <input type=hidden name=portal_id value=@portal_id@>
+ <input type=hidden name=return_url value=@return_url@>
+ <b>Add a new page:</b>
+ @page_data@
+ </form>
+ <P>"
+
+
# This hack is to work around the acs-templating system
set __adp_stub "[get_server_root][www_path]/."
set {master_template} \"master\"
@@ -526,6 +526,21 @@
db_dml move_to_page_update {}
}
+ "Move to page" {
+ set page_id [ns_set get $form page_id]
+ set element_id [ns_set get $form element_id]
+ set curr_reg [db_string move_to_page_curr_select {}]
+ set target_reg_num [db_string move_to_page_target_select {}]
+
+ if {$curr_reg > $target_reg_num} {
+ # the new page dosent have this region, set to max region
+ set region $target_reg_num
+ } else {
+ set region $curr_reg
+ }
+
+ db_dml move_to_page_update {}
+ }
"hide" {
set element_id_list [list]
@@ -1437,6 +1452,7 @@
ad_proc -public add_element_or_append_id {
{-portal_id:required}
{-page_id ""}
+ {-pretty_name ""}
{-portlet_name:required}
{-value_id:required}
{-key "instance_id"}
@@ -1463,7 +1479,8 @@
db_transaction {
# Tell portal to add this element to the page
- set element_id [add_element -page_id $page_id $portal_id $portlet_name]
+ set element_id [add_element -pretty_name $pretty_name \
+ -page_id $page_id $portal_id $portlet_name]
# There is already a value for the param which is overwritten
set_element_param $element_id $key $value_id
Index: openacs-4/packages/new-portal/www/place-element-other-page.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element-other-page.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/new-portal/www/place-element-other-page.adp 23 Jan 2002 01:19:05 -0000 1.1
+++ openacs-4/packages/new-portal/www/place-element-other-page.adp 12 Mar 2002 05:18:21 -0000 1.2
@@ -1,5 +1,19 @@
+<form method=post action=@action_string@>
+<input type=hidden name=portal_id value=@portal_id@>
+
<if @other_page_avail_p@ ne 0>
+ <input type=hidden name=element_id value=@element_id@>
+ <input type=submit name="op" value="Move to page">
+ <select name=page_id>
<multiple name=pages>
- <small>[<a href="@target_stub@-2?portal_id=@portal_id@&op=move_to_page&element_id=@element_multi.element_id@&page_id=@pages.page_id@">move to @pages.pretty_name@</a>]</small>
+ <option value=@pages.page_id@>@pages.pretty_name@</option>
</multiple>
+ </select>
+
+<!--
+<a href="@target_stub@-2?portal_id=@portal_id@&op=move_to_page&element_id=@element_multi.element_id@&page_id=@pages.page_id@">move to @pages.pretty_name@</a>]</small>
+-->
+
</if>
+
+</form>
Index: openacs-4/packages/new-portal/www/place-element-other-page.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element-other-page.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/new-portal/www/place-element-other-page.tcl 23 Jan 2002 01:19:05 -0000 1.1
+++ openacs-4/packages/new-portal/www/place-element-other-page.tcl 12 Mar 2002 05:18:21 -0000 1.2
@@ -1,5 +1,7 @@
# moving to other pages
-template::multirow create pages page_id pretty_name
+set element_id $element_multi(element_id)
+
+template::multirow create pages page_id pretty_name element_id
set other_page_avail_p 0
db_foreach other_pages_select {
Index: openacs-4/packages/new-portal/www/place-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element.adp,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/new-portal/www/place-element.adp 18 Feb 2002 19:54:52 -0000 1.28
+++ openacs-4/packages/new-portal/www/place-element.adp 12 Mar 2002 05:18:21 -0000 1.29
@@ -8,9 +8,15 @@
<td align=center>
<multiple name=element_multi>
- @element_multi.name@
+
+<hr>
+
+ @element_multi.name@
+
<if @element_multi.state@ ne "pinned">
+ <small>[<a href="@target_stub@-2?portal_id=@portal_id@&op=hide&element_id=@element_multi.element_id@">hide</a>]</small>
+
<if @element_multi:rowcount gt 1>
<if @element_multi.rownum@ gt 1>
<a href="@target_stub@-2?portal_id=@portal_id@®ion=@region@&op=swap&element_id=@element_multi.element_id@&direction=up&page_id=@element_multi.page_id@"><img border=0 src="@dir@/arrow-up.gif" alt="move up"></a>
@@ -32,25 +38,27 @@
</if>
</if>
- <if @element_multi.hideable_p@ eq "t">
- [<a href="@target_stub@-2?portal_id=@portal_id@&op=hide&element_id=@element_multi.element_id@">hide</a>]
- </if>
+ </if>
+
</if>
- <br>
+</form>
<include src=place-element-other-page &="element_multi"
target_stub=@target_stub@
portal_id=@portal_id@
- page_id=@element_multi.page_id@>
- <br>
-
+ page_id=@element_multi.page_id@
+ action_string=@action_string@>
</multiple>
</if>
<if @show_avail_p@ ne 0>
-<br>
+<form method=post action=@action_string@>
+<input type=hidden name=portal_id value=@portal_id@>
+<input type=hidden name=region value=@region@>
+<input type=hidden name=page_id value=@page_id@>
+
@show_html@
</select>
<input type=submit name="op" value="Show Here">
Index: openacs-4/packages/new-portal/www/template-place-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/template-place-element.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/new-portal/www/template-place-element.adp 19 Feb 2002 17:05:48 -0000 1.10
+++ openacs-4/packages/new-portal/www/template-place-element.adp 12 Mar 2002 05:18:21 -0000 1.11
@@ -7,6 +7,9 @@
<td align=left>
<multiple name=element_multi>
+<hr>
+
+
@element_multi.name@ - @element_multi.description@
<br>
@@ -61,34 +64,34 @@
<else>User Shadeable? No [<a href="@target_stub@-2?portal_id=@portal_id@&op=toggle_shadeable&element_id=@element_multi.element_id@&return_url=@return_url@">allow shading</a>]
</else>
-<br>
+</form>
<include src=place-element-other-page &="element_multi"
target_stub=@target_stub@
portal_id=@portal_id@
- page_id=@element_multi.page_id@>
- <br>
-<P>
+ page_id=@element_multi.page_id@
+ action_string=@action_string@>
+
</multiple>
-
-
<if @show_avail_p@ ne 0>
-<br>
+<form method=post action=@action_string@>
+
@show_html@
</select><input type=submit name="op" value="Show Here">
<input type=hidden name=portal_id value=@portal_id@>
<input type=hidden name=page_id value=@page_id@>
<input type=hidden name=region value=@region@>
<input type=hidden name=return_url value=@return_url@>
+</form>
</if>
</td>
</tr>
</table>
-</form>
+
<!-- place-element.adp end -->