[Affelio-cvs 1044] CVS update: affelio/apps/diary

Back to archive index

Yoshihisa Fukuhara higef****@users*****
2006年 1月 25日 (水) 11:30:51 JST


Index: affelio/apps/diary/Diary.pm
diff -u affelio/apps/diary/Diary.pm:1.29 affelio/apps/diary/Diary.pm:1.30
--- affelio/apps/diary/Diary.pm:1.29	Mon Jul 18 11:53:06 2005
+++ affelio/apps/diary/Diary.pm	Wed Jan 25 11:30:51 2006
@@ -382,6 +382,37 @@
 	return $header;
 }
 
+######################################################################
+#Get_HTML_header_owner
+######################################################################
+sub get_HTML_header_owner{
+    my $self = shift;
+#    my $af = $self->{af};
+    my $app__page_title = shift;
+
+    #Set template file name
+    my $TMPL_FILE = "$self->{afap}->{af}->{site__fs_root}/templates_dyn/_header.tmpl";
+    #Set data for template
+    my %output_data = ();
+    $output_data{'app__css_path'} = $self->{afap}->{af}->{site__web_root}."/templates/default/owner_side";
+    $output_data{'app__page_title'} = "Affelio Owner's page";
+    $output_data{"site__skin_dir"} = $self->{afap}->{af}->{site__web_root} . "/skins/" . $self->{afap}->{af}->{userpref__skin};
+    $output_data{'site__web_root'} = $self->{afap}->{af}->{site__web_root};
+    $output_data{'site__locale'} = $self->{afap}->{af}->{site__locale};
+
+    $self->{afap}->{af}->get_module_list(\%output_data, $self->{afap}->{af}->{site__web_root},"self");
+    $self->{afap}->{af}->get_guest_owner_list(\%output_data);
+
+    #Initiate Template
+    my $tmpl = new HTML::Template( filename => $TMPL_FILE,
+				   die_on_bad_params => 0);
+    $tmpl->param(%output_data);
+    
+    my $final_out = $self->{afap}->{af}->translate_templateL10N($tmpl->output)
+	. '<div class="afMain">' . "\n";
+
+    return($final_out);
+}
 
 ##############################################
 # get_HTML_footer
Index: affelio/apps/diary/init.pl
diff -u affelio/apps/diary/init.pl:1.8 affelio/apps/diary/init.pl:1.9
--- affelio/apps/diary/init.pl:1.8	Tue Nov  8 13:18:51 2005
+++ affelio/apps/diary/init.pl	Wed Jan 25 11:30:51 2006
@@ -24,6 +24,7 @@
 use lib("../../lib");
 use AffelioApp;
 use Affelio::misc::CGIError;
+#use Affelio::App::Admin;
 #
 use Diary;
 
Index: affelio/apps/diary/owner.cgi
diff -u affelio/apps/diary/owner.cgi:1.6 affelio/apps/diary/owner.cgi:1.7
--- affelio/apps/diary/owner.cgi:1.6	Tue Jul 12 06:05:15 2005
+++ affelio/apps/diary/owner.cgi	Wed Jan 25 11:30:51 2006
@@ -14,7 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
 our $mymode="owner";
 
 require 'init.pl';
@@ -50,7 +49,16 @@
 eval { require XML::Parser; } or $tmpl->param(NO_PARSER => 1);
 
 $tmpl->param(access_control_URL => $afap->get_URL("access_control"));
-		
-print $diary->get_HTML_header;
+
+if ($afap->{cgi}->param('mode') eq "rdf_set") {
+    $tmpl->param(RDF_SET => '1');
+}
+
+# put Content-type
+print "Content-type: text/html; charset=UTF-8\n";
+print "Pragma: no-cache", "\n\n"; 
+# put HTML Header
+#print Affelio::App::Admin::get_HTML_header($afap);
+print $diary->get_HTML_header_owner;
 print $diary->translate_templateL10N($tmpl->output);
 print $diary->get_HTML_footer;
Index: affelio/apps/diary/style.css
diff -u affelio/apps/diary/style.css:1.5 affelio/apps/diary/style.css:1.6
--- affelio/apps/diary/style.css:1.5	Wed Jul  6 07:06:14 2005
+++ affelio/apps/diary/style.css	Wed Jan 25 11:30:51 2006
@@ -1,15 +1,15 @@
 div#diary_2ColLeft {
 	float: left;
-	width: 20%;
+	width: 22%;
 	font-size: small;
 /*	border-right: 1px solid #D7D7D7; */ 
-	padding: 1.0em 1.0em 1.0em 0.5em; 
-	padding: 5px 5px 5px 5px;
+/*	padding: 1.0em 1.0em 1.0em 0.5em; */
+	padding: 5px 5px 5px 10px;
 }
 
 div#diary_2ColRight {
 	float: right;
-	width: 70%;
+	width: 72%;
 	padding: 5px 10px 5px 10px;
 }
 


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