Index: openacs-4/packages/download/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/index.adp,v diff -u -N -r1.12 -r1.13 --- openacs-4/packages/download/www/index.adp 23 Jun 2015 16:26:04 -0000 1.12 +++ openacs-4/packages/download/www/index.adp 1 Jul 2015 17:57:49 -0000 1.13 @@ -11,21 +11,21 @@ @description@ -

#download.You_must# register +

#download.You_must# register #download.lt_before_you_can_downlo#

@dimensional_html;noquote@ -

+

#download.lt_Upload_a_New_Version_#

 Index: openacs-4/packages/download/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/index.tcl,v diff -u -N -r1.17 -r1.18 --- openacs-4/packages/download/www/index.tcl 27 Jun 2015 19:43:38 -0000 1.17 +++ openacs-4/packages/download/www/index.tcl 1 Jul 2015 17:57:49 -0000 1.18 @@ -8,7 +8,9 @@ {archive_type_id:naturalnum,optional ""} {orderby:token "archive_name,desc"} {query_string ""} - {updated ""} + {updated:word ""} + {approved:word ""} + {versions:word "current"} } -properties { title:onevalue description:onevalue @@ -28,6 +30,7 @@ set return_url "[ad_conn url]?[ad_conn query]" +set register_url [export_vars -base /register/index {return_url}] set user_id [ad_conn user_id] array set repository [download_repository_info] @@ -51,25 +54,25 @@ lappend type_dimlist {"" "#download.all#" {}} set dimensional [list [list versions "#download.Versions#" current [list \ - [list current "[_ download.current]" {where "[db_map archive_where_clause]"} ] \ - [list all "[_ download.all]" {where "da.archive_id = dar.archive_id"} ] + [list current [_ download.current] {where "[db_map archive_where_clause]"} ] \ + [list all [_ download.all] {where "da.archive_id = dar.archive_id"} ] ]]\ - [list archive_type_id "[_ download.Type]" "" $type_dimlist] \ - [list updated "[_ download.Updated]" all [list \ - [list 1d "[_ download.last_24hrs]" {where "[db_map date_clause_1]"}] \ - [list 1w "[_ download.last_week]" {where "[db_map date_clause_7]"}] \ - [list 1m "[_ download.last_month]" {where "[db_map date_clause_30]"}] \ - [list all "[_ download.all]" {}]] + [list archive_type_id [_ download.Type] "" $type_dimlist] \ + [list updated [_ download.Updated] all [list \ + [list 1d [_ download.last_24hrs] {where "[db_map date_clause_1]"}] \ + [list 1w [_ download.last_week] {where "[db_map date_clause_7]"}] \ + [list 1m [_ download.last_month] {where "[db_map date_clause_30]"}] \ + [list all [_ download.all] {}]] ]] if { $admin_p } { set approval "" - lappend dimensional [list approved "[_ download.Approval]" approved \ + lappend dimensional [list approved [_ download.Approval] approved \ [list \ - [list pending "[_ download.pending]" {where "dar.approved_p is null"}] \ - [list approved "[_ download.approved]" {where "dar.approved_p = 't'"}] \ - [list rejected "[_ download.rejected]" {where "dar.approved_p = 'f'"}] \ - [list all "[_ download.all]" {}] \ + [list pending [_ download.pending] {where "dar.approved_p is null"}] \ + [list approved [_ download.approved] {where "dar.approved_p = 't'"}] \ + [list rejected [_ download.rejected] {where "dar.approved_p = 'f'"}] \ + [list all [_ download.all] {}] \ ] ] } else { @@ -86,8 +89,8 @@ label "Software Name" display_template {
-
-
@downloads_multirow.archive_name@ @downloads_multirow.version_name@ +
+
@downloads_multirow.archive_name@ @downloads_multirow.version_name@  (@downloads_multirow.file_size@k)
@downloads_multirow.summary@
} orderby "archive_name" @@ -118,7 +121,7 @@ } { set answer_column [download_metadata_column $data_type] set metadata_select "metadata$metadata_id" - append metadata_selects ", (select $answer_column from download_revision_data where revision_id = dar.revision_id and metadata_id = $metadata_id) as $metadata_select + append metadata_selects ", (select $answer_column from download_revision_data where revision_id = dar.revision_id and metadata_id = :metadata_id) as $metadata_select " if { $linked_p == "t" } { set href [export_vars -base one-metadata {metadata_id}] @@ -133,10 +136,10 @@ if { $admin_p } { lappend element_list approved_p { - label "[_ download.Approval]" + label [_ download.Approval] display_template { - @downloads_multirow.approved_text@ - \[@downloads_multirow.approved_action@\] + @downloads_multirow.approved_text@ + \[@downloads_multirow.approved_action@\] } } } @@ -147,7 +150,9 @@ -filters {archive_type_id {} query_string {} updated {}} set img_url "[ad_conn package_url]/graphics/download-button.png" -db_multirow -extend {metadata_url download_img revision_url download_url approved_color approved_text approved_url approved_action reject_url} downloads_multirow download_index_query {*} { +db_multirow -extend {metadata_url download_img revision_url download_url approved_color \ + approved_text approved_url approved_action reject_url +} downloads_multirow download_index_query {*} { set download_img $img_url if {$approved_p} { set approved_url [export_vars -base admin/approve-or-reject {{action reject} revision_id return_url}] @@ -161,8 +166,8 @@ set approved_color red } - set download_url "download/$file_name?revision_id=$revision_id" - set revision_url "one-revision?revision_id=$revision_id" + set download_url [export_vars -base download/$file_name {revision_id}] + set revision_url [export_vars -base one-revision {revision_id}] set metadata_url [export_vars -base one-metadata {metadata_id}] } @@ -189,6 +194,6 @@ order by creation_date } +set archive_add_url [export_vars -base archive-add {repository_id archive_type_id}] - ad_return_template