Menu
▾
▴
[popfile-commit] engine/UI HTML.pm,1.382,1.383
|
From: naoki i. <am...@us...> - 2008-03-30 10:22:34
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5961/UI Modified Files: HTML.pm Log Message: Change Log 1. When the single user mode is disabled or enabled the UI will be refreshed UI/HTML.pm 2. Logout link now has the login username UI/HTML.pm skins/default/common-middle.thtml 3. Magnetized messages are now not able to be classified UI/HTML.pm skins/default/history-page.thtml 4. Removed old style error handling in the UI UI/HTML.pm skins/default/magnet-page.thtml skins/default/administration-page.thtml skins/default/advanced-page.thtml skins/default/corpus-page.thtml skins/default/style.css 5. Update language file languages/Nihongo.msg Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.382 retrieving revision 1.383 diff -C2 -d -r1.382 -r1.383 *** HTML.pm 30 Mar 2008 05:33:58 -0000 1.382 --- HTML.pm 30 Mar 2008 10:22:37 -0000 1.383 *************** *** 874,877 **** --- 874,883 ---- } + # Show login user name on header in the multi-user mode + if ( !$self->global_config_( 'single_user' ) && defined( $session ) ) { + my $user = $self->classifier_()->get_user_name_from_session( $session ); + $templ->param( 'Header_User_Name' => $user ); + } + # Build an HTTP header for standard HTML *************** *** 1170,1173 **** --- 1176,1181 ---- my $user = $self->{sessions__}{$session}{user}; + my $single_user_mode_changed = 0; + # TODO: add status messages *************** *** 1175,1178 **** --- 1183,1187 ---- # Server / Stealth mode if ( defined $self->{form_}->{apply_stealth} ) { + my $current_single_user = $self->global_config_( 'single_user' ); $self->global_config_( 'single_user', $self->{form_}->{usermode} ? 1 : 0 ); *************** *** 1183,1186 **** --- 1192,1202 ---- $self->config_( 'local', 1 ); } + + # If the single user mode (POPFile classic) is enabled or disabled + # we should reflesh the UI + + if ( $current_single_user ne ( $self->{form_}->{usermode} ? 1 : 0 ) ) { + $single_user_mode_changed = 1; + } } # Privacy options *************** *** 1218,1222 **** } else { ! $self->error_message__( $self->{language__}{Configuration_Error6} ); delete $self->{form_}{timeout}; } --- 1234,1238 ---- } else { ! $self->error_message__( $templ, $self->{language__}{Configuration_Error6} ); delete $self->{form_}{timeout}; } *************** *** 1359,1362 **** --- 1375,1386 ---- } + # If the single user mode (POPFile classic) is enabled or disabled + # we should reflesh the UI + + if ( $single_user_mode_changed ) { + $self->http_redirect_( $client, "/administration", $session ); + return; + } + $self->http_ok( $client,$templ, 3, $session ); } *************** *** 1661,1665 **** $self->{form_}{newword} ); if ( $result == 0 ) { ! $templ->param( 'Advanced_If_Add_Message' => 1 ); } } --- 1685,1691 ---- $self->{form_}{newword} ); if ( $result == 0 ) { ! $self->error_message__( $templ, $self->{language__}{Advanced_Error2} ); ! } else { ! $self->status_message__( $templ, sprintf $self->{language__}{Advanced_Error3}, $self->{form_}{newword} ); } } *************** *** 1669,1673 **** $self->{form_}{word} ); if ( $result == 0 ) { ! $templ->param( 'Advanced_If_Delete_Message' => 1 ); } } --- 1695,1701 ---- $self->{form_}{word} ); if ( $result == 0 ) { ! $self->error_message__( $templ, $self->{language__}{Advanced_Error2} ); ! } else { ! $self->status_message__( $templ, sprintf $self->{language__}{Advanced_Error5}, $self->{form_}{word} ); } } *************** *** 1798,1802 **** $page, $session ); ! my $magnet_message = ''; if ( defined( $self->{form_}{delete} ) ) { --- 1826,1831 ---- $page, $session ); ! my $error_message = ''; ! my $status_message = ''; if ( defined( $self->{form_}{delete} ) ) { *************** *** 1871,1875 **** if ( exists( $magnets{$current_mtext} ) ) { $found = 1; ! $magnet_message .= sprintf( $self->{language__}{Magnet_Error1}, "$mtype: $current_mtext", $bucket ) . '<br>'; last; } --- 1900,1904 ---- if ( exists( $magnets{$current_mtext} ) ) { $found = 1; ! $error_message .= sprintf( $self->{language__}{Magnet_Error1}, "$mtype: $current_mtext", $bucket ) . '<br>'; last; } *************** *** 1884,1888 **** if ( ( $mtext =~ /\Q$from\E/ ) || ( $from =~ /\Q$mtext\E/ ) ) { $found = 1; ! $magnet_message .= sprintf( $self->{language__}{Magnet_Error2}, "$mtype: $current_mtext", "$mtype: $from", $bucket ) . '<br>'; last; } --- 1913,1917 ---- if ( ( $mtext =~ /\Q$from\E/ ) || ( $from =~ /\Q$mtext\E/ ) ) { $found = 1; ! $error_message .= sprintf( $self->{language__}{Magnet_Error2}, "$mtype: $current_mtext", "$mtype: $from", $bucket ) . '<br>'; last; } *************** *** 1916,1920 **** $self->classifier_()->create_magnet( $session, $mbucket, $mtype, $current_mtext ); if ( !defined( $self->{form_}{update} ) ) { ! $magnet_message .= sprintf( $self->{language__}{Magnet_Error3}, "$mtype: $current_mtext", $mbucket ) . '<br>'; } } --- 1945,1949 ---- $self->classifier_()->create_magnet( $session, $mbucket, $mtype, $current_mtext ); if ( !defined( $self->{form_}{update} ) ) { ! $status_message .= sprintf( $self->{language__}{Magnet_Error3}, "$mtype: $current_mtext", $mbucket ) . '<br>'; } } *************** *** 1924,1930 **** } ! if ( $magnet_message ne '' ) { ! $templ->param( 'Magnet_If_Message' => 1 ); ! $templ->param( 'Magnet_Message' => $magnet_message ); } --- 1953,1963 ---- } ! # Show error/status message ! ! if ( $error_message ne '' ) { ! $self->error_message__( $templ, $error_message ); ! } ! if ( $status_message ne '' ) { ! $self->status_message__( $templ, $status_message ); } *************** *** 2283,2296 **** if ( ( defined($self->{form_}{cname}) ) && ( $self->{form_}{cname} ne '' ) ) { if ( $self->{form_}{cname} =~ /$invalid_bucket_chars/ ) { ! $templ->param( 'Corpus_If_Create_Error' => 1 ); } else { if ( $self->classifier_()->is_bucket( $session, $self->{form_}{cname} ) || $self->classifier_()->is_pseudo_bucket( $session, $self->{form_}{cname} ) ) { ! $templ->param( 'Corpus_If_Create_Message' => 1 ); ! $templ->param( 'Corpus_Create_Message' => sprintf( $self->{language__}{Bucket_Error2}, $self->{form_}{cname} ) ); } else { $self->classifier_()->create_bucket( $session, $self->{form_}{cname} ); ! $templ->param( 'Corpus_If_Create_Message' => 1 ); ! $templ->param( 'Corpus_Create_Message' => sprintf( $self->{language__}{Bucket_Error3}, $self->{form_}{cname} ) ); } } --- 2316,2327 ---- if ( ( defined($self->{form_}{cname}) ) && ( $self->{form_}{cname} ne '' ) ) { if ( $self->{form_}{cname} =~ /$invalid_bucket_chars/ ) { ! $self->error_message__( $templ, $self->{language__}{Bucket_Error1} ); } else { if ( $self->classifier_()->is_bucket( $session, $self->{form_}{cname} ) || $self->classifier_()->is_pseudo_bucket( $session, $self->{form_}{cname} ) ) { ! $self->error_message__( $templ, sprintf( $self->{language__}{Bucket_Error2}, $self->{form_}{cname} ) ); } else { $self->classifier_()->create_bucket( $session, $self->{form_}{cname} ); ! $self->status_message__( $templ, sprintf( $self->{language__}{Bucket_Error3}, $self->{form_}{cname} ) ); } } *************** *** 2300,2305 **** $self->{form_}{name} = lc($self->{form_}{name}); $self->classifier_()->delete_bucket( $session, $self->{form_}{name} ); ! $templ->param( 'Corpus_If_Delete_Message' => 1 ); ! $templ->param( 'Corpus_Delete_Message' => sprintf( $self->{language__}{Bucket_Error6}, $self->{form_}{name} ) ); } --- 2331,2335 ---- $self->{form_}{name} = lc($self->{form_}{name}); $self->classifier_()->delete_bucket( $session, $self->{form_}{name} ); ! $self->status_message__( $templ, sprintf( $self->{language__}{Bucket_Error6}, $self->{form_}{name} ) ); } *************** *** 2308,2321 **** if ( ( $self->{form_}{newname} eq '' ) || ( $self->{form_}{newname} =~ /$invalid_bucket_chars/ ) ) { ! $templ->param( 'Corpus_If_Rename_Error' => 1 ); } else { $self->{form_}{oname} = lc($self->{form_}{oname}); $self->{form_}{newname} = lc($self->{form_}{newname}); if ( $self->classifier_()->rename_bucket( $session, $self->{form_}{oname}, $self->{form_}{newname} ) == 1 ) { ! $templ->param( 'Corpus_If_Rename_Message' => 1 ); ! $templ->param( 'Corpus_Rename_Message' => sprintf( $self->{language__}{Bucket_Error5}, $self->{form_}{oname}, $self->{form_}{newname} ) ); } else { ! $templ->param( 'Corpus_If_Rename_Message' => 1 ); ! $templ->param( 'Corpus_Rename_Message' => 'Internal error: rename failed' ); } } --- 2338,2349 ---- if ( ( $self->{form_}{newname} eq '' ) || ( $self->{form_}{newname} =~ /$invalid_bucket_chars/ ) ) { ! $self->error_message__( $templ, $self->{language__}{Bucket_Error1} ); } else { $self->{form_}{oname} = lc($self->{form_}{oname}); $self->{form_}{newname} = lc($self->{form_}{newname}); if ( $self->classifier_()->rename_bucket( $session, $self->{form_}{oname}, $self->{form_}{newname} ) == 1 ) { ! $self->status_message__( $templ, sprintf( $self->{language__}{Bucket_Error5}, $self->{form_}{oname}, $self->{form_}{newname} ) ); } else { ! $self->error_message__( $templ, 'Internal error: rename failed' ); } } *************** *** 3158,3161 **** --- 3186,3190 ---- $row_data{History_Loop_Loop_Cells} = \@column_data; $row_data{History_If_Reclassified} = ( $$row[9] != 0 ); + $row_data{History_If_Magnetized} = ( $$row[11] ne '' ); $row_data{History_I} = $$row[0]; $row_data{History_I1} = $$row[0]; |
