Author: miguel
Date: 2005-05-24 23:29:04 -0400 (Tue, 24 May 2005)
New Revision: 44961
Modified:
trunk/lb/config.cs
trunk/lb/config.xml
trunk/lb/lb.cs
trunk/lb/makefile
Log:
Flush
Modified: trunk/lb/config.cs
===================================================================
--- trunk/lb/config.cs 2005-05-25 03:21:54 UTC (rev 44960)
+++ trunk/lb/config.cs 2005-05-25 03:29:04 UTC (rev 44961)
@@ -6,6 +6,7 @@
[XmlAttribute] public string BlogDirectory;
[XmlAttribute] public string BlogFileName;
[XmlAttribute] public string BlogWebDirectory;
+ [XmlAttribute] public string BlogImageBasedir;
[XmlAttribute] public string Copyright;
[XmlAttribute] public string Description;
[XmlAttribute] public string ManagingEditor;
Modified: trunk/lb/config.xml
===================================================================
--- trunk/lb/config.xml 2005-05-25 03:21:54 UTC (rev 44960)
+++ trunk/lb/config.xml 2005-05-25 03:29:04 UTC (rev 44961)
@@ -1,12 +1,13 @@
<?xml version="1.0"?>
<config
-Author="Miguel de Icaza ([EMAIL PROTECTED])"
+Author="Miguel de Icaza ([EMAIL PROTECTED])"
BlogDirectory="/home/miguel/activity"
-BlogFileName="activity-log.php"
-BlogWebDirectory="http://primates.ximian.com/~miguel/";
+BlogFileName="index.html"
+BlogWebDirectory="http://tirania.org/blog/";
+BlogImageBasedir="http://primates.ximian.com/~miguel";
Copyright="Miguel de Icaza"
Description="Miguel de Icaza's web log"
-ManagingEditor="[EMAIL PROTECTED]"
+ManagingEditor="[EMAIL PROTECTED]"
Title="Miguel de Icaza"
RSSFileName="miguel"
/>
Modified: trunk/lb/lb.cs
===================================================================
--- trunk/lb/lb.cs 2005-05-25 03:21:54 UTC (rev 44960)
+++ trunk/lb/lb.cs 2005-05-25 03:29:04 UTC (rev 44961)
@@ -169,7 +169,7 @@
string filename = s.Substring (5,
idx-5);
string caption = s.Substring (idx + 1);
- sb.Append (String.Format
("<p><center><a href=\"{0}pic.php?name={1}&caption={2}\"><img border=0
src=\"{0}/pictures/small-{1}\"></a><p>{2}</center></p>", blog_base, filename,
caption));
+ sb.Append (String.Format
("<p><center><a href=\"{0}pic.php?name={1}&caption={2}\"><img border=0
src=\"{3}/pictures/small-{1}\"></a><p>{2}</center></p>", blog_base, filename,
caption, blog.config.BlogImageBasedir));
continue;
}
@@ -477,6 +477,9 @@
{
Config config = (Config)
new XmlSerializer (typeof (Config)).Deserialize (new
XmlTextReader ("config.xml"));
+ if (config.BlogImageBasedir == null || config.BlogImageBasedir
== "")
+ config.BlogImageBasedir = config.BlogWebDirectory;
+
Blog b = new Blog (config);
b.RenderHtml ("template", config.BlogFileName, 0, 30, "");
Modified: trunk/lb/makefile
===================================================================
--- trunk/lb/makefile 2005-05-25 03:21:54 UTC (rev 44960)
+++ trunk/lb/makefile 2005-05-25 03:29:04 UTC (rev 44961)
@@ -15,5 +15,12 @@
chmod 644 archive/*/*.html
chmod 644 *html *rss2 *php *atom
rsync -pr -v --rsh=ssh texts archive prettyprint.js \
+ log-style.css *.rss2 *.atom *.php index.html all.html \
+ [EMAIL PROTECTED]:tirania/blog
+
+pp: b
+ chmod 644 archive/*/*.html
+ chmod 644 *html *rss2 *php *atom
+ rsync -pr -v --rsh=ssh texts archive prettyprint.js \
log-style.css *.rss2 *.atom *.php all.html \
primates.ximian.com:public_html
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
