[Affelio-cvs 1286] CVS update: affelio/lib/Affelio/App/Standalone

Back to archive index

Tadashi Okoshi slash****@users*****
2006年 5月 26日 (金) 09:12:13 JST


Index: affelio/lib/Affelio/App/Standalone/Admin.pm
diff -u affelio/lib/Affelio/App/Standalone/Admin.pm:1.1 affelio/lib/Affelio/App/Standalone/Admin.pm:1.2
--- affelio/lib/Affelio/App/Standalone/Admin.pm:1.1	Tue Mar  7 23:39:09 2006
+++ affelio/lib/Affelio/App/Standalone/Admin.pm	Fri May 26 09:12:13 2006
@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
-# $Id: Admin.pm,v 1.1 2006/03/07 14:39:09 slash5234 Exp $
+# $Id: Admin.pm,v 1.2 2006/05/26 00:12:13 slash5234 Exp $
 
 package Affelio::App::Standalone::Admin;
 {
@@ -120,7 +120,12 @@
 			   "style_path", $af->{site__web_root} . "/skins/" . $af->{userpref__skin},
 			   "site__web_root", "$af->{site__user_afid}",
 			   "site__locale", $af->{site__locale},
-			   "my_nickname", $af->{user__nickname});
+			   "my_nickname", $af->{user__nickname},
+			   "site__skin_dir", $af->{site__web_root} . "/skins/" . $af->{userpref__skin},
+			   "site__locale", $af->{site__locale});
+
+        $af->get_module_list(\%output_data, $af->{site__user_afid},"self");
+        $af->get_guest_owner_list(\%output_data);
 
 	use Affelio::App::Standalone::Admin::Messaging;
 	$output_data{new_messages}
@@ -165,9 +170,9 @@
 	    
 	    print "Content-type: text/html; charset=UTF-8\n";
 	    print "Pragma: no-cache", "\n\n";
-	    print get_HTML_header($self);
+	    #print get_HTML_header($self);
 	    print $af->translate_templateL10N($tmpl->output);
-	    print get_HTML_footer($self);
+	    #print get_HTML_footer($self);
 	}
 	
     }
@@ -192,18 +197,20 @@
 	    
 	    print "Content-type: text/html; charset=UTF-8\n";
 	    print "Pragma: no-cache", "\n\n";
-	    print get_HTML_header($self);
+
+	    #print get_HTML_header($self);
 	    
 	    $TMPL_FILE = "$af->{site__tmpl_dir}/owner_side/login.tmpl";
 	    my $tmpl = new HTML::Template(filename => $TMPL_FILE,
 					  die_on_bad_params => 0);
+
 	    $tmpl->param(reason_msg => "You haven't been authenticated.");
 	    $tmpl->param("tmpl_path" => "$af->{site__tmpl_web_path}/owner_side/");
 	    $tmpl->param("style_path" => $af->{site__web_root} . "/skins/" . $af->{userpref__skin});
 	    $tmpl->param("forward_URL" => $cgi->self_url);
-	    
 	    print $af->translate_templateL10N($tmpl->output);
-	    print get_HTML_footer($self);
+
+	    #print get_HTML_footer($self);
 	    exit(1);
 	}
 	
@@ -219,11 +226,9 @@
         my $app__page_title = shift;
 
         #Set template file name
-        my $TMPL_FILE = "$af->{site__tmpldyn_dir}/_header.tmpl";
+	my $TMPL_FILE = "$af->{site__tmpl_dir}/owner_side/header.tmpl";
         #Set data for template
         my %output_data = ();
-        $output_data{'app__css_path'} = "$af->{site__tmpl_web_path}/owner_side";
-        $output_data{'app__page_title'} = "Affelio Owner's page";
         $output_data{"site__skin_dir"} = $af->{site__web_root} . "/skins/" . $af->{userpref__skin};
         $output_data{'site__web_root'} = $af->{site__web_root};
         $output_data{'site__locale'} = $af->{site__locale};
@@ -236,11 +241,9 @@
                                        die_on_bad_params => 0);
         $tmpl->param(%output_data);
 
-        my $final_out = $af->translate_templateL10N($tmpl->output)
-            . '<div class="afMain">' . "\n";
+        my $final_out = $af->translate_templateL10N($tmpl->output);
 
         return($final_out);
-
     }
     
     ######################################################################
@@ -249,12 +252,13 @@
     sub get_HTML_footer{
         my $self = shift;
 	my $af = $self->{af};
+
         #Set template file name
-        my $TMPL_FILE = "$af->{site__tmpldyn_dir}/_footer.tmpl";
+	my $TMPL_FILE = "$af->{site__tmpl_dir}/owner_side/footer.tmpl";
         my $tmpl = new HTML::Template(filename => $TMPL_FILE,
 				      die_on_bad_params => 0);
-        my $final_out = "</div><!--afPubMain-->"
-            . $af->translate_templateL10N($tmpl->output);
+
+        my $final_out = $af->translate_templateL10N($tmpl->output);
 
         return($final_out);
     }


Affelio-cvs メーリングリストの案内
Back to archive index