diff --git a/htdocs/collection.php b/htdocs/collection.php
new file mode 100644
index 00000000..3a56da47
--- /dev/null
+++ b/htdocs/collection.php
@@ -0,0 +1,46 @@
+LoginRequired();
+
+require_once("interactive-page.php");
+
+
+ require_once("classBrowser.php");
+ $c->stylesheets[] = "css/browse.css";
+
+ $c->page_title = translate("Collection Contents");
+ $browser = new Browser($c->page_title);
+
+ $browser->AddColumn( 'dav_name', translate('Path'), '', '', 'caldav_data.dav_name' );
+ $browser->AddColumn( 'caldav_type', translate('Type') );
+ $browser->AddColumn( 'dtstart', translate('Start'), '', '', "to_char(dtstart,'YYYY-MM-DD HH24:MI')" );
+ $browser->AddColumn( 'dtend', translate('Finish'), '', '', "to_char(dtstart,'YYYY-MM-DD HH24:MI')" );
+ $browser->AddColumn( 'summary', translate('Summary') );
+ $browser->AddColumn( 'rrule', translate('Repeat Rule') );
+
+ $browser->SetJoins( 'caldav_data JOIN calendar_item USING ( user_no, dav_name ) ' );
+ if ( isset($user_no) ) {
+ $browser->SetWhere( "user_no=" . intval($user_no) );
+ }
+ if ( isset($dav_name) ) {
+ $browser->SetWhere( "dav_name ~ " . qpg("^".$dav_name."[^/]+$") );
+ }
+
+ if ( isset( $_GET['o']) && isset($_GET['d']) ) {
+ $browser->AddOrder( $_GET['o'], $_GET['d'] );
+ }
+ else
+ $browser->AddOrder( 'dav_name', 'A' );
+
+ $browser->RowFormat( "
\n", "
\n", '#even' );
+
+ $browser->DoQuery();
+
+
+include("page-header.php");
+
+echo $browser->Render();
+
+include("page-footer.php");
+?>
\ No newline at end of file
diff --git a/htdocs/relationships.php b/htdocs/relationships.php
deleted file mode 100644
index bad414af..00000000
--- a/htdocs/relationships.php
+++ /dev/null
@@ -1,43 +0,0 @@
-LoginRequired();
-
-require_once("interactive-page.php");
-
-
- require_once("classBrowser.php");
- $c->stylesheets[] = "css/browse.css";
-
- $c->page_title = "User Relationships";
- $browser = new Browser($c->page_title);
-
- $browser->AddColumn( 'from_user', 'From', '', '##from_user_link##' );
- $browser->AddColumn( 'from_name', 'Name', '', '', 'ufrom.fullname' );
- $browser->AddHidden( 'from_user_link', "'' || from_user || ''" );
- $browser->AddColumn( 'to_user', 'From', '', '##to_user_link##' );
- $browser->AddColumn( 'to_name', 'Name', '', '', 'uto.fullname' );
- $browser->AddHidden( 'to_user_link', "'' || to_user || ''" );
-
- $browser->SetJoins( 'relationship JOIN usr ufrom ON (ufrom.user_no = from_user) JOIN usr uto ON (uto.user_no = to_user) ' );
-
- if ( isset( $_GET['o']) && isset($_GET['d']) ) {
- $browser->AddOrder( $_GET['o'], $_GET['d'] );
- }
- else
- $browser->AddOrder( 'from_user', 'A' );
-
- $browser->RowFormat( "\n", "
\n", '#even' );
- $browser->DoQuery();
-
-
- $user_menu->AddOption("Relationships","/relationship.php?user_no=$user_no","Relationships for this user", false, 10);
-
- $active_menu_pattern = "#^/relationship#";
-
-include("page-header.php");
-
-echo $browser->Render();
-
-include("page-footer.php");
-?>
\ No newline at end of file
diff --git a/rscds.webprj b/rscds.webprj
index 517788e4..734b60e4 100644
--- a/rscds.webprj
+++ b/rscds.webprj
@@ -37,7 +37,6 @@
-
@@ -224,5 +223,7 @@
+
+