@title@

Index: openacs.org-dev/www/templates/box-master-full.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/box-master-full.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/box-master-full.adp 8 Aug 2002 16:37:25 -0000 1.1 @@ -0,0 +1,19 @@ +

+ + + + + + + + + + + + + + + + +

\ No newline at end of file Index: openacs.org-dev/www/templates/box-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/box-master.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/box-master.adp 8 Aug 2002 16:37:25 -0000 1.1 @@ -0,0 +1,36 @@ +

+ + + + + + + + + + + +


	@title@

+ + + + + + + + + + + +

+ + + + + + + + + +

\ No newline at end of file Index: openacs.org-dev/www/templates/community-new-index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/community-new-index.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/community-new-index.adp 8 Aug 2002 16:37:25 -0000 1.1 @@ -0,0 +1,43 @@ + + + +

+ + +

+ +

+ + + + + +

+ +

+ + +

+ + + + + + +

+ + +

+ +

+ + + + + +

+ +

+ + +

\ No newline at end of file Index: openacs.org-dev/www/templates/general-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/general-master.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/general-master.adp 8 Aug 2002 16:37:25 -0000 1.1 @@ -0,0 +1,40 @@ + + + @title@ + @header_stuff@ + + + + + + + + + + + + + + + +

+ +

+ + + + + + + + + + + + + + \ No newline at end of file Index: openacs.org-dev/www/templates/general-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/general-master.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/general-master.tcl 8 Aug 2002 16:37:25 -0000 1.1 @@ -0,0 +1,38 @@ +ad_page_contract { + + OpenACS.org general master + + @author modified by Patrick Colgan pat pat@museatech.net + @author modified by Ola Hansson ola@polyxena.net + @creation-date 9/6/2001 + + +} { + { email "" } +} -properties { + form_vars:onevalue + allow_persistent_login_p:onevalue + remember_password:onevalue + name:onevalue + first_names:onevalue + email:onevalue + home_url:onevalue + home_url_name:onevalue + oacs_admin_p:onevalue + pkid:onevalue +} + +oacs_set_login_vars + +set pkid [ad_conn package_id] + +if [template::util::is_nil title] { set title [ad_system_name] } +if [template::util::is_nil signatory] { set signatory [ad_system_owner] } +if ![info exists header_stuff] { set header_stuff {} } + +if [template::util::is_nil context_bar] { set context_bar "" } + + +# Edit This Page - format the etp link for style sheet +#set etp_link [etp::get_etp_link] +#regsub "^ + + + +

+ + + + + + +

+ +

+ + + +

+ +

+ + +

+ + + + + + +

+ + +

+ +

+ + + +

+ +

+ + +

+ + + + + + +

+ +

+ + \ No newline at end of file Index: openacs.org-dev/www/templates/css/main.css =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/css/main.css,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/css/main.css 8 Aug 2002 16:38:24 -0000 1.1 @@ -0,0 +1,149 @@ +body { + background-color: white; + font-family: sans-serif; +} + +a { + color: #006699; +} + +a:visited { + color: purple; +} + +div.header { + margin-bottom: 15px; +} + +span.navigation td { + font-weight: bold; + color: white; +} + +span.navigation a { + font-weight: bold; + color: white; +} + +span.navigation a:visited { + color: white; +} + +span.statistics { + font-size: 70%; +} + +span.search input { + font-size: 30%; +} + +span.user-status { + font-size: 70%; +} + +div.box { + margin-bottom: 15px; +} + +span.box-title a { + color: white; + font-weight: bold; + padding-left: 2px; + padding-right: 2px; + padding-bottom: 5px; +} + +span.box-title a:visited { + color: white; +} + +div.box-content { + font-size: 85%; + padding-left: 8px; + padding-right: 8px; + padding-top: 5px; +} +div.box-full-content td { + color: white; + font-size: 85%; + padding-left: 2px; + padding-right: 2px; +} + +div.box-full-content a { + color:white; + font-size: 75%; +} + +div.box-full-content a:visited { + color:white; + font-size: 75%; +} + +div.left-panel { + float: left; + width: 20%; +} + +div.login td { + +} + +div.news { + +} + +div.postings { + +} + +div.download { + margin-bottom: 15px; +} + +div.right-panel { + float: right; + width: 20%; +} + +div.features { + +} + +div.main-content { + +} + +div.footer table { + clear: both; + font-size: 70%; + margin-top: 5px; +} + + +/* + Community Page +*/ + +div.row { +} + +div.forums { + float: left; + width: 39%; +} + +div.jobs { + float: right; + width: 59%; +} + +div.sites { + float: left; + width: 59%; +} + +div.companies { + float: right; + width: 39%; +} \ No newline at end of file Index: openacs.org-dev/www/templates/slices/alex.jpg =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/slices/alex.jpg,v diff -u Binary files differ Index: openacs.org-dev/www/templates/slices/head_lowright.gif =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/slices/head_lowright.gif,v diff -u Binary files differ Index: openacs.org-dev/www/templates/slices/head_upright.gif =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/slices/head_upright.gif,v diff -u Binary files differ Index: openacs.org-dev/www/templates/slices/horzline.gif =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/slices/horzline.gif,v diff -u Binary files differ Index: openacs.org-dev/www/templates/slices/lowleft.gif =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/slices/lowleft.gif,v diff -u Binary files differ Index: openacs.org-dev/www/templates/slices/lowleft2.gif =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/slices/lowleft2.gif,v diff -u Binary files differ Index: openacs.org-dev/www/templates/slices/lowright.gif =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/slices/lowright.gif,v diff -u Binary files differ Index: openacs.org-dev/www/templates/slices/lowright2.gif =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/slices/lowright2.gif,v diff -u Binary files differ Index: openacs.org-dev/www/templates/slices/openacs.gif =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/slices/openacs.gif,v diff -u Binary files differ Index: openacs.org-dev/www/templates/slices/slices.tgz =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/slices/slices.tgz,v diff -u Binary files differ Index: openacs.org-dev/www/templates/slices/spacer.gif =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/slices/spacer.gif,v diff -u Binary files differ Index: openacs.org-dev/www/templates/slices/unleash.gif =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/slices/unleash.gif,v diff -u Binary files differ Index: openacs.org-dev/www/templates/slices/upleft.gif =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/slices/upleft.gif,v diff -u Binary files differ Index: openacs.org-dev/www/templates/slices/upright.gif =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/slices/upright.gif,v diff -u Binary files differ Index: openacs.org-dev/www/templates/slices/vertline.gif =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/slices/vertline.gif,v diff -u Binary files differ Index: openacs.org-dev/www/templates/widgets/companies.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/companies.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/companies.adp 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,15 @@ + +@title@ + +

+ +

@companies.title@ + - @companies.description@

+ +

+ + + more companies... + \ No newline at end of file Index: openacs.org-dev/www/templates/widgets/companies.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/companies.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/companies.tcl 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,9 @@ +set n_companies 6 +set companies_limit [expr $n_companies + 1] + + +etp::get_page_attributes +etp::get_content_items + +#etp::get_content_items -package_id 3906 -result_name companies -limit $companies_limit +etp::get_content_items -package_id 3188 -result_name companies -limit $companies_limit Index: openacs.org-dev/www/templates/widgets/features.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/features.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/features.adp 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,17 @@ + +@title@ + + + + @feature_items.title@
+ @feature_items.description@

+ + + + + There are no articles. + + + + more articles... + Index: openacs.org-dev/www/templates/widgets/features.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/features.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/features.tcl 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,20 @@ +ad_page_contract { + @author Ola Hansson ola@polyxena.net + @creation-date 2002-08-06 +} { +} -properties { + title:onevalue + n_feature_items:onevalue + feature_limit:onevalue + feature_items:multirow +} + +set title "Featured Articles" +set n_feature_items 3 +set feature_limit [expr $n_feature_items + 1] + + +#etp::get_content_items -package_id 4053 -limit $feature_limit \ + -result_name feature_items +etp::get_content_items -package_id 3138 -limit $feature_limit \ + -result_name feature_items \ No newline at end of file Index: openacs.org-dev/www/templates/widgets/footer.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/footer.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/footer.adp 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,5 @@ + + + + +

This website is maintained by the OpenACS Community. Any problems, email webmaster.

\ No newline at end of file Index: openacs.org-dev/www/templates/widgets/forums.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/forums.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/forums.adp 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,8 @@ + +@title@ + +

@forums.short_name@

Index: openacs.org-dev/www/templates/widgets/forums.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/forums.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/forums.tcl 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,13 @@ + +set user_id [ad_conn user_id] + +db_multirow forums forums_select { + select forum_id, name as short_name, posting_policy, charter + from forums_forums f + where + acs_permission__permission_p(forum_id,:user_id,'forum_read') = 't' + and enabled_p = 't' +-- and package_id = 3061 + and package_id = 3183 + order by upper(name) +} \ No newline at end of file Index: openacs.org-dev/www/templates/widgets/header.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/header.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/header.adp 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,39 @@ + + + + + + +

+ + + + + + + + + + + + + + + + + + + +


			+ + +

+ +

\ No newline at end of file Index: openacs.org-dev/www/templates/widgets/jobs.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/jobs.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/jobs.adp 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,14 @@ + +@title@ + +

+ +

@jobs.title@ - @jobs.description@

+ +

+ + + more jobs... + Index: openacs.org-dev/www/templates/widgets/jobs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/jobs.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/jobs.tcl 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,9 @@ +set n_jobs 4 +set jobs_limit [expr $n_jobs + 1] + + +etp::get_page_attributes +etp::get_content_items + +#etp::get_content_items -package_id 3889 -result_name jobs -limit $jobs_limit +etp::get_content_items -package_id 3197 -result_name jobs -limit $jobs_limit Index: openacs.org-dev/www/templates/widgets/login.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/login.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/login.adp 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,19 @@ + +Login / Register + + + + + + + +

+ @export_vars@ + email
+
+ password
+
+ + Save password? + +

\ No newline at end of file Index: openacs.org-dev/www/templates/widgets/login.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/login.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/login.tcl 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,6 @@ +set time [ns_time] +set token_id [sec_get_random_cached_token_id] +set token [sec_get_token $token_id] +set hash [ns_sha1 "$time$token_id$token"] + +set export_vars [export_form_vars return_url time token_id hash] \ No newline at end of file Index: openacs.org-dev/www/templates/widgets/navigation.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/navigation.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/navigation.adp 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,21 @@ + + + + + • + + @navigation.item@ + + + + • + + @navigation.item@ + + + + + SYNTAX ERROR IN NAVIGATION CODE + + + \ No newline at end of file Index: openacs.org-dev/www/templates/widgets/navigation.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/navigation.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/navigation.tcl 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,21 @@ +ad_page_contract { + +} -properties { + navigation:multirow +} + + +# px_multirow_nav takes a list of lists, each containing +# href_url, href_content and sublink_p. +px_multirow_nav { + + {/ "Home" 0} + {/news/ "News & Events" 0} + {/community/ "Forums & Community" 0} + {/projects/ "Projects" 0} + {/doc/ "Documentation" 0} + +} + + +ad_return_template \ No newline at end of file Index: openacs.org-dev/www/templates/widgets/news.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/news.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/news.adp 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,17 @@ + +@title@ + + + + @news_items.pretty_publish_date@
+ @news_items.publish_title@

+ + + + + There are no news. + + + + more news... + \ No newline at end of file Index: openacs.org-dev/www/templates/widgets/news.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/news.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/news.tcl 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,34 @@ +ad_page_contract { + @author Ola Hansson ola@polyxena.net + @creation-date 2002-08-06 +} { +} -properties { + title:onevalue + n_news_items:onevalue + news_items:multirow +} + +set title News +set n_news_items 2 +set news_limit [expr $n_news_items + 1] + +set max_post_age_days 14 + +db_multirow news_items news_items_select " +select item_id, + publish_title, + pretty_publish_date +from news_items_approved +--where package_id = 43787 +where package_id = 3147 + and publish_date < current_timestamp + and (archive_date is null or archive_date > current_timestamp) +order by publish_date desc, item_id desc +limit $news_limit +" + +#etp::get_page_attributes +#etp::get_content_items -where $where -orderby $orderby \ + -limit $news_limit \ + -package_id ???? -result_name news_items \ + release_date archive_date \ No newline at end of file Index: openacs.org-dev/www/templates/widgets/postings.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/postings.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/postings.adp 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,22 @@ + +@title@ + + + + @forum_posts.forum_name@
+ + +

@forum_posts.title@

+ + +
+ + + + + There are no posts. + + + +more posts... + Index: openacs.org-dev/www/templates/widgets/postings.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/postings.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/postings.tcl 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,36 @@ +ad_page_contract { + @author Ola Hansson ola@polyxena.net + @creation-date 2002-08-06 +} { +} -properties { + title:onevalue + forum_limit:onevalue + forum_posts:multirow +} + +set title "Recent Posts" +set n_posts 6 +set forum_limit [expr $n_posts + 1] +set max_post_age_days 7 + +db_multirow forum_posts messages_select " + +select fm.message_id, + fm.forum_id, + forums_forum__name(fm.forum_id) as forum_name, + fm.subject as title + +from (select message_id, + forum_id, + subject, + parent_id + from forums_messages_approved + order by posting_date desc + limit $forum_limit) fm, forums_forums ff + +where fm.forum_id = ff.forum_id +and fm.parent_id is null +--and ff.package_id = 3061 +and ff.package_id = 3928 +order by forum_name +" \ No newline at end of file Index: openacs.org-dev/www/templates/widgets/sites.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/sites.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/sites.adp 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,15 @@ + +@title@ + +

@sites.title@: @sites.description@

+ + + more sites... + Index: openacs.org-dev/www/templates/widgets/sites.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/sites.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/sites.tcl 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,10 @@ + +set n_sites 6 +set sites_limit [expr $n_sites + 1] + + +etp::get_page_attributes +etp::get_content_items + +#etp::get_content_items -package_id 3894 -result_name sites -limit $sites_limit +etp::get_content_items -package_id 3173 -result_name sites -limit $sites_limit Index: openacs.org-dev/www/templates/widgets/statistics.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/statistics.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/statistics.adp 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,2 @@ +@n_users@ registered users
+@n_downloads@ downloads of OpenACS \ No newline at end of file Index: openacs.org-dev/www/templates/widgets/statistics.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/statistics.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/statistics.tcl 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,2 @@ +set n_users [util_memoize {db_string select_n_users "select count(user_id) from users" -default "unknown"} 120] +set n_downloads NNNN \ No newline at end of file Index: openacs.org-dev/www/templates/widgets/user-status.adp =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/user-status.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/user-status.adp 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,6 @@ + + logged in as @name@ • log out + + + my workspace • log in + \ No newline at end of file Index: openacs.org-dev/www/templates/widgets/user-status.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/user-status.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs.org-dev/www/templates/widgets/user-status.tcl 8 Aug 2002 16:40:52 -0000 1.1 @@ -0,0 +1,9 @@ + +set user_id [ad_conn user_id] + +if !$user_id { + set login_p 0 +} else { + set login_p 1 + set name [db_string get_user_name "select first_names || ' ' || last_name from persons where person_id = $user_id" -default "unknown user"] +} \ No newline at end of file