# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dme@dme.org-20090130092801-5qnvrif5vqai714j # target_branch: file:///home/dme/s/venus/ # testament_sha1: 8817c7e176975af97de2db372b9bca978587395c # timestamp: 2009-01-30 09:31:54 +0000 # base_revision_id: rubys@intertwingly.net-20090109144648-\ # 7ktsoest6e3kq0wk # # Begin patch === added directory 'mingle' === added file 'mingle/mingle.ini' --- mingle/mingle.ini 1970-01-01 00:00:00 +0000 +++ mingle/mingle.ini 2009-01-30 09:28:01 +0000 @@ -0,0 +1,38 @@ +[Planet] +name = dme +link = http://dme.org +owner_name = David Edmondson +owner_email = dme@dme.org + +cache_directory = /home/dme/v/mingle/cache +log_level = DEBUG +feed_timeout = 20 + +output_theme = mingle +output_dir = /home/dme/v/mingle/output +items_per_page = 100 + +[http://feeds.delicious.com/v2/rss/dme?count=15] +name = delicious +message = http://delicious.com/dme +face = http://delicious.com/favicon.ico + +[http://weblog.dme.org/index.atom] +name = weblog +message = http://weblog.dme.org +face = http://dme.org/favicon.ico + +[http://api.flickr.com/services/feeds/photos_public.gne?id=35034348955@N01&lang=en-us&format=rss_200] +name = flickr +message = http://flickr.com/photos/dme +face = http://flickr.com/favicon.ico + +[http://twitter.com/statuses/user_timeline/51253.rss] +name = twitter +message = http://twitter.com/dme +face = http://twitter.com/favicon.ico + +[http://ws.audioscrobbler.com/1.0/user/dme/recenttracks.rss] +name = last.fm +message = http://last.fm/user/dme +face = http://last.fm/favicon.ico === added directory 'themes/mingle' === added file 'themes/mingle/config.ini' --- themes/mingle/config.ini 1970-01-01 00:00:00 +0000 +++ themes/mingle/config.ini 2009-01-30 09:28:01 +0000 @@ -0,0 +1,10 @@ +[Planet] +template_files: + atom.xml.xslt + index.html.tmpl + +template_directories: + ../common + +bill_of_materials: + mingle.css === added file 'themes/mingle/index.html.tmpl' --- themes/mingle/index.html.tmpl 1970-01-01 00:00:00 +0000 +++ themes/mingle/index.html.tmpl 2009-01-30 09:28:01 +0000 @@ -0,0 +1,61 @@ + + + + +<TMPL_VAR name> + +"> + + +" title="" type="application/+xml"> + + + + + + + + + + + + +
+" + width="" + height="" alt=""> + + + +
+ +
+ + + + + + + + + + + + +
+ + + +" width="" height="" alt="">">
+ + + + + + === added file 'themes/mingle/mingle.css' --- themes/mingle/mingle.css 1970-01-01 00:00:00 +0000 +++ themes/mingle/mingle.css 2009-01-30 09:28:01 +0000 @@ -0,0 +1,20 @@ +a { + text-decoration: none; + color: #000; +} +body { + font-size: 80%; +} +td { + vertical-align: top; +} +.title { + font-size: 400%; + font-weight: bold; +} +.title-channel { + vertical-align: middle; +} +.footer { + font-size: 70%; +} \ No newline at end of file # Begin bundle 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