Index: openacs-4/packages/simulation/www/normal-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/normal-master.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/simulation/www/normal-master.tcl 30 Nov 2004 21:09:03 -0000 1.1
+++ openacs-4/packages/simulation/www/normal-master.tcl 31 Oct 2006 09:00:05 -0000 1.2
@@ -1 +1,7 @@
+if { [template::util::is_nil header_stuff] } {
+ set header_stuff ""
+}
+if { [template::util::is_nil extra_css] } {
+ set extra_css ""
+}
+
Index: openacs-4/packages/simulation/www/simulation-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simulation-master.adp,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/simulation/www/simulation-master.adp 30 Nov 2004 21:09:03 -0000 1.11
+++ openacs-4/packages/simulation/www/simulation-master.adp 31 Oct 2006 09:00:05 -0000 1.12
@@ -9,5 +9,4 @@
@header_stuff;noquote@
-
-
\ No newline at end of file
+
Index: openacs-4/packages/simulation/www/static-map.swf
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/static-map.swf,v
diff -u -N -r1.1 -r1.2
Binary files differ
Index: openacs-4/packages/simulation/www/citybuild/map.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/citybuild/map.xml,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/simulation/www/citybuild/map.xml 30 Nov 2004 21:09:03 -0000 1.1
+++ openacs-4/packages/simulation/www/citybuild/map.xml 31 Oct 2006 09:00:05 -0000 1.2
@@ -3,610 +3,729 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: openacs-4/packages/simulation/www/citybuild/object-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/citybuild/object-delete.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/simulation/www/citybuild/object-delete.tcl 30 Nov 2004 21:30:40 -0000 1.7
+++ openacs-4/packages/simulation/www/citybuild/object-delete.tcl 31 Oct 2006 09:00:05 -0000 1.8
@@ -10,6 +10,14 @@
if { [template::util::is_true $confirm_p] } {
permission::require_write_permission -object_id $item_id
+ content::item::unset_live_revision -item_id $item_id
+
+ # we need to unset the latest revision too, otherwise
+ # content_item__del will bomb
+ db_dml unset_latest_rev {
+ update cr_items set latest_revision = NULL
+ where item_id = :item_id
+ }
bcms::item::delete_item -item_id $item_id
ad_returnredirect -message "\"$item(title)\" has been deleted." $return_url
Index: openacs-4/packages/simulation/www/object-content/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/object-content/index.vuh,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/simulation/www/object-content/index.vuh 30 Nov 2004 21:30:40 -0000 1.3
+++ openacs-4/packages/simulation/www/object-content/index.vuh 31 Oct 2006 09:00:06 -0000 1.4
@@ -23,4 +23,8 @@
array set item [bcms::revision::get_revision -revision_id $revision_id]
}
-cr_write_content -item_id $item(item_id)
+with_catch errmsg {
+ cr_write_content -item_id $item(item_id)
+} {
+ ad_return_exception_template -status 404 "/packages/simulation/www/404"
+}
Index: openacs-4/packages/simulation/www/resources/simplay.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/resources/simplay.css,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/www/resources/simplay.css 31 Oct 2006 09:00:06 -0000 1.2
@@ -0,0 +1,215 @@
+body {
+ background-color: #E7EFEF;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ color: #000000;
+ font-size: small;
+ padding-right: 10px;
+}
+td {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ color: #000000;
+}
+h1 {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 16px;
+}
+h2 {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 14px;
+}
+h3 {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+}
+th {
+ font-weight: bold;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+}
+#site-header {
+ padding: 5px;
+ background-color: #000000;
+ color: #FFFFFF;
+ border-bottom-width: 1px;
+ border-bottom-style: solid;
+ border-top-color: #FFFFFF;
+ border-right-color: #FFFFFF;
+ border-bottom-color: #FFFFFF;
+ border-left-color: #FFFFFF;
+}
+
+.systemname {
+ background-color: #296B94;
+ color: #FFFFFF;
+ padding: 10px 10px 10px 5px;
+ font-size: 16px;
+ font-weight: bold;
+}
+.contextbar {
+ padding: 5px;
+ background-color: #FFFFFF;
+ color: #002C64;
+ border-bottom-width: 1px;
+ border-bottom-style: solid;
+ border-top-color: #002C64;
+ border-right-color: #002C64;
+ border-bottom-color: #002C64;
+ border-left-color: #002C64;
+ border-top-width: 1px;
+ border-top-style: solid;
+}
+a:link {
+ color: #002C64;
+}
+a:hover {
+ color: #336699;
+}
+a:active {
+ color: #002C64;
+}
+a:visited {
+ color: #002C64;
+}
+.simplay_control-bar_block {
+ border: 1px solid #336699;
+ left: 10px;
+ padding: 0 5px;
+ background-color: #FFFFFF;
+ margin: 0;
+ margin-bottom: 10px;
+}
+
+.simplay_control-bar_block li {
+ font-size: 0.9em;
+}
+
+.simplay_control-bar_block li a,
+.simplay_control-bar_block li strong {
+ font-size: 1.11em;
+}
+
+.simplay_control-bar_block h4 {
+ margin: 10px;
+ margin-left: 6px;
+}
+
+.simplay_case_block {
+ width: 100%;
+ display: block;
+ border: 1px solid #336699;
+ padding: 10px 0 10px 10px;
+ background-color: white;
+ margin: 0;
+ margin-bottom: 10px;
+}
+
+.simplay_case_block table {
+ width: 95%;
+}
+
+#clearer {
+ clear: both;
+ visibility: hidden;
+}
+
+#play-container {
+ position: relative;
+ width: 100%;
+ margin: 0;
+ padding: 0 3px 0 0;
+}
+
+#control-bar {
+ width: 200px;
+ float: left;
+ display: inline;
+ clear: none;
+}
+
+#play-content {
+ margin-left: -230px;
+ top: 0;
+ width: 100%;
+ float: right;
+ display: inline;
+ padding: 0 0 0 10px;
+}
+
+#play-content .list-header {
+ background-color: #88ADC1;
+ height: 16px;
+ list-style-type: none;
+ text-indent: 10pt;
+}
+#play-content .list-header A {
+ font-weight: bold;
+ text-decoration: none;
+}
+
+#play-content .button {
+ letter-spacing: +1px;
+ background-color: #E7EFEF;
+ border-top: 1px solid #B2D4E8;
+ border-right: 1px solid #336699;
+ border-bottom: 1px solid #336699;
+ border-left: 1px solid #B2D4E8;
+ padding: 2px 10px;
+}
+
+#inner-content {
+ margin: 0 0 0 230px;
+ padding: 0;
+}
+
+
+#page-body {
+ padding-top: 5px;
+}
+
+#session_header {
+ width: 200px;
+ margin-top: -30px;
+ margin-right: 10px;
+ color: #333;
+ font-size: 95%;
+}
+
+h1.page-title {
+ margin-left: 210px;
+ padding-left: 10px;
+ letter-spacing: 0.5em;
+ font-weight: bold;
+ font-size: 18px;
+}
+
+html>body h1.page-title {
+ font-size: 16px;
+ margin-left: 220px;
+}
+
+#site-footer .action-list {
+ margin-bottom: 20px;
+}
+
+.simplay_control-bar_block ul.action-links,
+.simplay_case_block ul.action-links {
+ list-style: circle url(/resources/acs-subsite/action-link-marker.png);
+ padding: 0 0 0 0;
+ margin: 0;
+}
+
+.simplay_control-bar_block ul.action-links li,
+.simplay_case_block ul.action-links li {
+ margin-left: 25px;
+}
+
+.list td {
+ text-align: left;
+}
+
+th.list {
+ margin: 0;
+ padding: 2px 4px;
+ text-align: left;
+}
\ No newline at end of file
Index: openacs-4/packages/simulation/www/siminst/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/index.adp,v
diff -u -N -r1.21 -r1.22
--- openacs-4/packages/simulation/www/siminst/index.adp 30 Nov 2004 21:09:16 -0000 1.21
+++ openacs-4/packages/simulation/www/siminst/index.adp 31 Oct 2006 09:00:06 -0000 1.22
@@ -17,6 +17,5 @@
\ No newline at end of file
+ #simulation.lt_Return_to_Simulation__1#
+
Index: openacs-4/packages/simulation/www/siminst/simulation-participants.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/simulation-participants.adp,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/simulation/www/siminst/simulation-participants.adp 20 Apr 2004 21:12:26 -0000 1.12
+++ openacs-4/packages/simulation/www/siminst/simulation-participants.adp 31 Oct 2006 09:00:06 -0000 1.13
@@ -2,10 +2,6 @@
-
-
#simulation.Invitations_are_sent#
Index: openacs-4/packages/simulation/www/simplay/case.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/case.adp,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/simulation/www/simplay/case.adp 30 Nov 2004 21:09:17 -0000 1.16
+++ openacs-4/packages/simulation/www/simplay/case.adp 31 Oct 2006 09:00:06 -0000 1.17
@@ -3,24 +3,25 @@
@context;noquote@
@workflow_id;noquote@
-
- #simulation.Recent_Messages#
-
-
+
-
-
+ #simulation.Recent_Messages#
+
+
+
+
-
+
#simulation.Tasks#
-
-
+
#simulation.Document_Portfolio#
Index: openacs-4/packages/simulation/www/simplay/control-bar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/control-bar.adp,v
diff -u -N -r1.21 -r1.22
--- openacs-4/packages/simulation/www/simplay/control-bar.adp 30 Nov 2004 21:30:41 -0000 1.21
+++ openacs-4/packages/simulation/www/simplay/control-bar.adp 31 Oct 2006 09:00:06 -0000 1.22
@@ -1,28 +1,34 @@
-
+
+
+
+
+
@curr_state@: @state_name@
-
- #simulation.Your_Options#
+
+
+
+ #simulation.Your_Options#
-
+
+
+
+
+
+
+
Index: openacs-4/packages/simulation/www/simplay/play-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/play-master.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/simulation/www/simplay/play-master.tcl 30 Nov 2004 21:09:17 -0000 1.6
+++ openacs-4/packages/simulation/www/simplay/play-master.tcl 31 Oct 2006 09:00:06 -0000 1.7
@@ -41,4 +41,8 @@
set header_stuff ""
}
-append header_stuff "\n$stylesheet_link"
\ No newline at end of file
+append header_stuff "\n$stylesheet_link"
+
+if { [template::util::is_nil extra_css] } {
+ set extra_css ""
+}
Index: openacs-4/packages/simulation/www/simplay/portfolio.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/portfolio.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/simulation/www/simplay/portfolio.adp 30 Nov 2004 21:09:17 -0000 1.6
+++ openacs-4/packages/simulation/www/simplay/portfolio.adp 31 Oct 2006 09:00:06 -0000 1.7
@@ -2,11 +2,11 @@
@title;noquote@
@context;noquote@
+
-
-
+
Index: openacs-4/packages/simulation/www/simplay/task-detail.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/task-detail.adp,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/simulation/www/simplay/task-detail.adp 30 Nov 2004 21:09:17 -0000 1.13
+++ openacs-4/packages/simulation/www/simplay/task-detail.adp 31 Oct 2006 09:00:06 -0000 1.14
@@ -21,10 +21,6 @@
-
-@action.description@
-
-
Index: openacs-4/packages/simulation/www/simplay/task-detail.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/task-detail.tcl,v
diff -u -N -r1.27 -r1.28
--- openacs-4/packages/simulation/www/simplay/task-detail.tcl 30 Nov 2004 21:30:41 -0000 1.27
+++ openacs-4/packages/simulation/www/simplay/task-detail.tcl 31 Oct 2006 09:00:06 -0000 1.28
@@ -8,10 +8,13 @@
{bulk_p 0}
{return_url ""}
subject:optional
- body:optional
+ body:optional
received_message_item_id:optional
+ case_id
+ role_id
}
+
# FIXME: I am exporting the enabled_action_id list as the string variable enabled_action_ids in
# the forms as I can't export multiples. Here I'm recreating the list again. This is convoluted.
if { ![empty_string_p $enabled_action_ids] } {
@@ -22,9 +25,21 @@
set bulk_p 1
}
-if { [llength $enabled_action_id] == 1 } {
- workflow::case::enabled_action_get -enabled_action_id $enabled_action_id -array enabled_action
+if { [empty_string_p $return_url] } {
+ set return_url [export_vars -base case { case_id role_id }]
+}
+if { [llength $enabled_action_id] == 1 } {
+
+ # Check that no other player has changed the state while
+ # we have been filling in the form.
+ if { [catch {
+ workflow::case::enabled_action_get -enabled_action_id $enabled_action_id -array enabled_action
+ }] } {
+ ad_returnredirect -message " [_ simulation.Sorry] [_ simulation.lt_The_task_you_were_try] [_ simulation.lt_Someone_was_probably_] " \
+ -html $return_url
+ ad_script_abort
+ }
set action_id $enabled_action(action_id)
set case_id $enabled_action(case_id)
simulation::action::get -action_id $action_id -array action
@@ -34,10 +49,6 @@
set common_enabled_action_ids [list [list $enabled_action_id $case_id]]
- if { [empty_string_p $return_url] } {
- set return_url [export_vars -base case { case_id role_id }]
- }
-
set common_actions_count 1
set ignored_actions_count 0
@@ -236,6 +247,7 @@
[simulation::ui::forms::document_upload::form_block]] \
-on_request {
set pretty_name $action(pretty_name)
+ set description [template::util::richtext::create $action(description) $action(description_mime_type)]
} -validate {
{document_file
{[simulation::ui::forms::document_upload::check_mime -document_file $document_file]}
@@ -244,7 +256,6 @@
[_ simulation.lt_if_you_think_youre_up]"
}
} -on_submit {
-
db_transaction {
foreach one_action $common_enabled_action_ids {
set case_id [lindex $one_action 1]
Index: openacs-4/packages/simulation/www/simplay/tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/tasks.adp,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/simulation/www/simplay/tasks.adp 27 Jan 2004 12:48:39 -0000 1.11
+++ openacs-4/packages/simulation/www/simplay/tasks.adp 31 Oct 2006 09:00:06 -0000 1.12
@@ -2,4 +2,6 @@
@title;noquote@
@context;noquote@
+
+
\ No newline at end of file
Index: openacs-4/packages/simulation/www/simplay/yellow-pages.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/yellow-pages.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/simulation/www/simplay/yellow-pages.adp 30 Nov 2004 21:09:17 -0000 1.1
+++ openacs-4/packages/simulation/www/simplay/yellow-pages.adp 31 Oct 2006 09:00:06 -0000 1.2
@@ -2,7 +2,7 @@
@page_title;noquote@
@context;noquote@
-
+
@@ -11,4 +11,4 @@
-
+
|