diff --git a/Repositories/Misc/cgi/users/home_local b/Repositories/Misc/cgi/users/home_local index 9c0ca36..b795a81 100755 --- a/Repositories/Misc/cgi/users/home_local +++ b/Repositories/Misc/cgi/users/home_local @@ -205,16 +205,16 @@ } if( !defined $dls->{$tool->{location}} ) { - $dls->{$tool->{location}} = $session->make_element( "dl" ); + $dls->{$tool->{location}} = $session->make_element( "div" ); } my $dl = $dls->{$tool->{location}}; - $dt = $session->make_element( "dt" ); + $dt = $session->make_element( "p", style=>"font-weight: bold;" ); $a = $session->render_link( $tool->{page} ); $a->appendChild( $session->html_phrase( "cgi/users/home:".$tool->{code}."_link" ) ); $dt->appendChild( $a ); $dl->appendChild( $dt ); - $dd = $session->make_element( "dd" ); + $dd = $session->make_element( "div", style=>"padding: 0em 2em 0em 2em;" ); $dd->appendChild( $session->html_phrase( "cgi/users/home:".$tool->{code}."_info" ) ); $dl->appendChild( $dd ); } @@ -231,70 +231,91 @@ ### Welcome author blurb $page->appendChild( $session->html_phrase( "cgi/users/home:intro" ) ); -$page->appendChild( $session->html_phrase( "cgi/users/home:basic_options" ) ); -$table = $session->make_element("table"); -$tr = $session->make_element("tr"); -$table->appendChild( $tr ); -$page->appendChild( $table ); - +### User workspace if( $user->has_priv( "deposit" ) ) { - $td = $session->make_element("td",valign=>"top",width=>"50%"); + $page->appendChild( $session->html_phrase( "cgi/users/home:workspace" ) ); + + $table = $session->make_element("table",style=>"padding-bottom:2em; margin-top:-0.5em;",width=>"100%"); + $tr = $session->make_element("tr"); + $table->appendChild( $tr ); + $page->appendChild( $table ); + + $td = $session->make_element("td",valign=>"top",width=>"50%", style=>"padding-right: 1.5em;"); $tr->appendChild( $td ); - my $div; ### Begin new item - $div = $session->make_element("div"); - $div->appendChild( $dls->{create} ); - $td->appendChild( $div ); + $td->appendChild( $dls->{create} ); + + $td = $session->make_element("td",valign=>"top",width=>"50%", style=>"padding-left: 1.5em;"); + $tr->appendChild( $td ); + ### Review items in repository - $div = $session->make_element("div"); - $div->appendChild( $dls->{review} ); - $td->appendChild( $div ); -} + $td->appendChild( $dls->{review} ); -if( defined $dls->{user} ) -{ - $td = $session->make_element("td",valign=>"top", style=>"padding-left: 3em;"); - $tr->appendChild( $td ); - $td->appendChild( $dls->{user} ); -} + $tr = $session->make_element("tr"); + $table->appendChild( $tr ); -$page->appendChild( $session->html_phrase( "cgi/users/home:workspace" ) ); - -$table = $session->make_element("table",style=>"padding-bottom:1.5em;",width=>"100%"); -$tr = $session->make_element("tr"); -$table->appendChild( $tr ); -$page->appendChild( $table ); - -if( $user->has_priv( "deposit" ) ) -{ $td = $session->make_element("td",valign=>"top",width=>"50%",style=>"padding-right:1em;"); $tr->appendChild( $td ); - my $div; ### Workspace $td->appendChild( &render_workspace( $session, $user ) ); + ### Pending $td->appendChild( &render_pending( $session, $user ) ); $td = $session->make_element("td",valign=>"top",width=>"50%",style=>"padding-left:1em;"); $tr->appendChild( $td ); + ### Recent Additions $td->appendChild( &render_recent( $session, $user, 10 ) ); } +### User options +$page->appendChild( $session->html_phrase( "cgi/users/home:options" ) ); + +$table = $session->make_element("table", style=>"margin-top:-1.5em;"); +$tr = $session->make_element("tr"); +$table->appendChild( $tr ); +$page->appendChild( $table ); + +if( defined $dls->{user} ) +{ + if ( defined $dls->{staff} ) + { + $td = $session->make_element("td",valign=>"top", width=>"50%", style=>"padding-right: 1.5em;"); + $td->appendChild( $session->html_phrase( "cgi/users/home:basic_options" ) ); + } + else + { + $td = $session->make_element("td",valign=>"top"); + } + $tr->appendChild( $td ); + $td->appendChild( $dls->{user} ); +} + + if( defined $dls->{staff} ) { - $page->appendChild( $session->html_phrase( "cgi/users/home:staff_options" ) ); - $page->appendChild( $dls->{staff} ); + if ( defined $dls->{user} ) + { + $td = $session->make_element("td",valign=>"top", style=>"padding-left: 1.5em;"); + $td->appendChild( $session->html_phrase( "cgi/users/home:staff_options" ) ); + } + else + { + $td = $session->make_element("td",valign=>"top"); + } + $tr->appendChild( $td ); + $td->appendChild( $dls->{staff} ); } @@ -359,7 +380,9 @@ $table = $session->make_element( "table", cellpadding=>3, cellspacing=>0, - border=>0 ); + border=>0, + width=>"100%", + style=>"border-collapse:collapse;" ); my $e; my $cnt = 0; my $row = 0; @@ -440,7 +463,9 @@ $table = $session->make_element( "table", cellpadding=>3, cellspacing=>0, - border=>0 ); + border=>0, + width=>"100%", + style=>"border-collapse:collapse;" ); $html->appendChild( $table ); my $row = 0; foreach my $e (@eprints) @@ -494,7 +519,9 @@ $table = $session->make_element( "table", cellpadding=>3, cellspacing=>0, - border=>0 ); + border=>0, + width=>"100%", + style=>"border-collapse:collapse;" ); $html->appendChild( $table ); my $e; my $cnt = 0;