Merge lp:~edb/quam-plures/sample_posts_done into lp:quam-plures

[EdB]

This replaces the remaining original sample images with new stuff, and edits the sample posts to match.

[Yabs (yabs)]

Glad you resubmitted this, I managed to kill my copy :-S

¥

review: Approve

=== removed directory 'media/shared/global/monument-valley'
=== removed file 'media/shared/global/monument-valley/bus-stop-ahead.jpg'
Binary files media/shared/global/monument-valley/bus-stop-ahead.jpg	2008-09-23 05:56:47 +0000 and media/shared/global/monument-valley/bus-stop-ahead.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/shared/global/monument-valley/index.html'
--- media/shared/global/monument-valley/index.html	2010-01-29 22:09:05 +0000
+++ media/shared/global/monument-valley/index.html	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
- 
\ No newline at end of file

=== removed file 'media/shared/global/monument-valley/john-ford-point.jpg'
Binary files media/shared/global/monument-valley/john-ford-point.jpg	2008-09-23 05:56:47 +0000 and media/shared/global/monument-valley/john-ford-point.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/shared/global/monument-valley/monument-valley-road.jpg'
Binary files media/shared/global/monument-valley/monument-valley-road.jpg	2008-09-23 05:56:47 +0000 and media/shared/global/monument-valley/monument-valley-road.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/shared/global/monument-valley/monument-valley.jpg'
Binary files media/shared/global/monument-valley/monument-valley.jpg	2008-09-23 05:56:47 +0000 and media/shared/global/monument-valley/monument-valley.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/shared/global/monument-valley/monuments.jpg'
Binary files media/shared/global/monument-valley/monuments.jpg	2008-09-23 05:56:47 +0000 and media/shared/global/monument-valley/monuments.jpg	1970-01-01 00:00:00 +0000 differ
=== added directory 'media/users/id_1'
=== added file 'media/users/id_1/index.html'
--- media/users/id_1/index.html	1970-01-01 00:00:00 +0000
+++ media/users/id_1/index.html	2010-10-31 11:56:08 +0000
@@ -0,0 +1,1 @@
+ 
\ No newline at end of file

=== added file 'media/users/id_1/samplephoto1.jpg'
Binary files media/users/id_1/samplephoto1.jpg	1970-01-01 00:00:00 +0000 and media/users/id_1/samplephoto1.jpg	2010-10-31 11:56:08 +0000 differ
=== added file 'media/users/id_1/samplephoto2.jpg'
Binary files media/users/id_1/samplephoto2.jpg	1970-01-01 00:00:00 +0000 and media/users/id_1/samplephoto2.jpg	2010-10-31 11:56:08 +0000 differ
=== added file 'media/users/id_1/samplephoto3.jpg'
Binary files media/users/id_1/samplephoto3.jpg	1970-01-01 00:00:00 +0000 and media/users/id_1/samplephoto3.jpg	2010-10-31 11:56:08 +0000 differ
=== added file 'media/users/id_1/samplephoto4.jpg'
Binary files media/users/id_1/samplephoto4.jpg	1970-01-01 00:00:00 +0000 and media/users/id_1/samplephoto4.jpg	2010-10-31 11:56:08 +0000 differ
=== added file 'media/users/id_1/samplephoto5.jpg'
Binary files media/users/id_1/samplephoto5.jpg	1970-01-01 00:00:00 +0000 and media/users/id_1/samplephoto5.jpg	2010-10-31 11:56:08 +0000 differ
=== modified file 'qp_install/_functions_create.php'
--- qp_install/_functions_create.php	2010-09-25 12:29:17 +0000
+++ qp_install/_functions_create.php	2010-10-31 11:56:08 +0000
@@ -540,7 +540,7 @@
 	$cat_linkblog_contrib = cat_create( 'Contributors', 'NULL', $blog_linkblog_ID );
 
 	// Create categories for photoblog
-	$cat_photo_album = cat_create( 'Monument Valley', 'NULL', $blog_photoblog_ID );
+	$cat_photo_album = cat_create( 'Owen Michael', 'NULL', $blog_photoblog_ID );
 
 	echo "OK.<br />\n";
 
@@ -607,51 +607,73 @@
 	// Insert a post into blog #4:
 	$now = date('Y-m-d H:i:s',installer_timestamp());
 	$edited_Item = new Item();
-	$edited_Item->insert( 1, T_('Bus Stop Ahead'), 'In the middle of nowhere: a school bus stop where you wouldn\'t really expect it!',
-		$now, $cat_photo_album, array(), 'published','en-US', '', 'http://fplanque.com/photo/monument-valley' );
-	// attach an image to the item
-	$edit_File = new File( 'shared', 0, 'monument-valley/bus-stop-ahead.jpg' );
-	$edit_File->link_to_Item( $edited_Item );
-
-
-	// Insert a post into blog #4:
-	$now = date('Y-m-d H:i:s',installer_timestamp());
-	$edited_Item = new Item();
-	$edited_Item->insert( 1, T_('John Ford Point'), 'Does this scene look familiar? You\'ve probably seen it in a couple of John Ford westerns!',
-		$now, $cat_photo_album, array(), 'published','en-US', '', 'http://fplanque.com/photo/monument-valley' );
-	// attach an image to the item
-	$edit_File = new File( 'shared', 0, 'monument-valley/john-ford-point.jpg' );
-	$edit_File->link_to_Item( $edited_Item );
-
-
-	// Insert a post into blog #4:
-	$now = date('Y-m-d H:i:s',installer_timestamp());
-	$edited_Item = new Item();
-	$edited_Item->insert( 1, T_('Monuments'), 'This is one of the most famous views in Monument Valley. I like to frame it with the dirt road in order to give a better idea of the size of those things!',
-		$now, $cat_photo_album, array(), 'published','en-US', '', 'http://fplanque.com/photo/monument-valley' );
-	// attach an image to the item
-	$edit_File = new File( 'shared', 0, 'monument-valley/monuments.jpg' );
-	$edit_File->link_to_Item( $edited_Item );
-
-
-	// Insert a post into blog #4:
-	$now = date('Y-m-d H:i:s',installer_timestamp());
-	$edited_Item = new Item();
-	$edited_Item->insert( 1, T_('Road to Monument Valley'), 'This gives a pretty good idea of the Monuments you\'re about to drive into...',
-		$now, $cat_photo_album, array(), 'published','en-US', '', 'http://fplanque.com/photo/monument-valley' );
-	// attach an image to the item
-	$edit_File = new File( 'shared', 0, 'monument-valley/monument-valley-road.jpg' );
-	$edit_File->link_to_Item( $edited_Item );
-
-
-	// Insert a post into blog #4:
-	$now = date('Y-m-d H:i:s',installer_timestamp());
-	$edited_Item = new Item();
-	$edited_Item->insert( 1, T_('Monument Valley'), T_('This is a short photo album demo. Use the arrows to navigate between photos. Click on "Index" to see a thumbnail index.'),
-		$now, $cat_photo_album, array(), 'published','en-US', '', 'http://fplanque.com/photo/monument-valley' );
-	// attach an image to the item
-	$edit_File = new File( 'shared', 0, 'monument-valley/monument-valley.jpg' );
-	$edit_File->link_to_Item( $edited_Item );
+	$edited_Item->insert( 1, T_('Owen'), '',
+		$now, $cat_photo_album, array(), 'published','en-US' );
+
+	// attach an image to the item
+	$edit_File = new File( 'user', 1, 'samplephoto1.jpg' );
+	$edit_File->link_to_Item( $edited_Item );
+	// add meta data for this image (only once per image!)
+	$query = "UPDATE T_files
+		SET file_title = 'May 30, 2009', file_alt = 'May 30, 2009', file_desc = 'Just learning to sit at almost four months.'
+		WHERE file_ID = {$edit_File->ID}";
+	$DB->query( $query );
+
+
+	// Insert a post into blog #4:
+	$now = date('Y-m-d H:i:s',installer_timestamp());
+	$edited_Item = new Item();
+	$edited_Item->insert( 1, T_('Owen'), 'This photo has some text like a normal blog post might.',
+		$now, $cat_photo_album, array(), 'published','en-US' );
+
+	// attach an image to the item
+	$edit_File = new File( 'user', 1, 'samplephoto2.jpg' );
+	$edit_File->link_to_Item( $edited_Item );
+	// add meta data for this image (only once per image!)
+	$query = "UPDATE T_files
+		SET file_title = 'September 3, 2009', file_alt = 'September 3, 2009', file_desc = 'Seven months old in new jammies.'
+		WHERE file_ID = {$edit_File->ID}";
+	$DB->query( $query );
+
+
+	// Insert a post into blog #4:
+	$now = date('Y-m-d H:i:s',installer_timestamp());
+	$edited_Item = new Item();
+	$edited_Item->insert( 1, T_('October 18, 2010'), 'This post simulates providing a "title" when uploading the image then immediately making a post directly from file manager.  The "title" of the image became the title of the post.  (This text would have been added by editing the post after automatically creating it.)',
+		$now, $cat_photo_album, array(), 'published','en-US' );
+
+	// attach an image to the item
+	$edit_File = new File( 'user', 1, 'samplephoto3.jpg' );
+	$edit_File->link_to_Item( $edited_Item );
+	// add meta data for this image (only once per image!)
+	$query = "UPDATE T_files
+		SET file_title = 'October 18, 2010', file_alt = 'October 18, 2010', file_desc = 'First Halloween costume--our little chicken.'
+		WHERE file_ID = {$edit_File->ID}";
+	$DB->query( $query );
+
+
+	// Insert a post into blog #4:
+	$now = date('Y-m-d H:i:s',installer_timestamp());
+	$edited_Item = new Item();
+	$edited_Item->insert( 1, T_('2 pics in one post'), 'This post shows how you can attach more than one image to a post. By the way all Owen pics courtesy of <a href="http://www.hudson2001.com/blogs/" title="A daily diary of the mostly mundane, sometimes surprising, and often opinionated">his Mom, Jen</a> :)',
+		$now, $cat_photo_album, array(), 'published','en-US' );
+
+	// attach an image to the item
+	$edit_File = new File( 'user', 1, 'samplephoto4.jpg' );
+	$edit_File->link_to_Item( $edited_Item );
+	// add meta data for this image (only once per image!)
+	$query = "UPDATE T_files
+		SET file_title = 'January 14, 2010', file_alt = 'January 14, 2010', file_desc = 'My favorite picture ever (11.5 months).'
+		WHERE file_ID = {$edit_File->ID}";
+	$DB->query( $query );
+	// attach another image to the item
+	$edit_File = new File( 'user', 1, 'samplephoto5.jpg' );
+	$edit_File->link_to_Item( $edited_Item );
+	// add meta data for this image (only once per image!)
+	$query = "UPDATE T_files
+		SET file_title = 'July 10, 2010', file_alt = 'July 10, 2010', file_desc = 'At grandpa\'s house on vacation (15 months).'
+		WHERE file_ID = {$edit_File->ID}";
+	$DB->query( $query );
 
 
 	// Insert a post COMMENT into post #1:
@@ -659,7 +681,7 @@
 	$query = "INSERT INTO T_comments( comment_post_ID, comment_type, comment_status,
 			comment_author, comment_author_email, comment_author_url, comment_author_IP, 
 			comment_date, comment_content, comment_karma)
-		VALUES( 1, 'comment', 'draft', 'EdB', '[e-mail]', 'http://quamplures.net', '127.0.0.1', '$now', '".
+		VALUES( 1, 'comment', 'draft', 'Tblue', '[e-mail]', 'http://quamplures.net', '127.0.0.1', '$now', '".
 			$DB->escape( T_('Hi, this is a comment that is still in moderation, or "draft".<br />You are already logged in because you can see this, so all you have to do is change the visibility to "Published" to let visitors read this comment.') ). "', 0 )";
 	$DB->query( $query );
 
@@ -744,19 +766,11 @@
 	// Insert a post into blog #2:
 	$now = date('Y-m-d H:i:s',installer_timestamp());
 	$edited_Item = new Item();
-	$edited_Item->insert( 1, T_('Sample Intro-Sub post'), T_('This uses post type "Intro-Sub". I have no idea what that means or when it will show up.'),
+	$edited_Item->insert( 1, T_('Sample Intro-Sub post'), T_('This uses post type "Intro-Sub". This post-type shows up on any page except the main page that has more than one post and no other "intro" post to display.'),
 		$now, $cat_appname, array( $cat_ann_b ), 'published', '#', '', '', 'open', array('default'), 1570 );
 
 
-	// Insert a post into blog #2:
-	$now = date('Y-m-d H:i:s',installer_timestamp());
-	$edited_Item = new Item();
-	$edited_Item->insert( 1, T_('Sample Intro-All post'), T_('This uses post type "Intro-All".'),
-		$now, $cat_appname, array( $cat_ann_b ), 'published', '#', '', '', 'open', array('default'), 1600 );
-
-
 /*
-
 leaving room for a sample post about toolbars
 
 	// Insert a post into blog #2:
@@ -764,8 +778,6 @@
 	$edited_Item = new Item();
 	$edited_Item->insert( 1, T_('XXXXXXXXXXXXXXXXXX'), sprintf( T_('foo %s bar'), $app_name ),
 		$now, $cat_appname );
-
-
 */
 
 
@@ -1095,9 +1107,6 @@
 	$DB->query( $query );
 
 
-
-
-
 	// Insert a post into blog #1:
 	$now = date('Y-m-d H:i:s',installer_timestamp());
 	$edited_Item = new Item();
@@ -1196,10 +1205,8 @@
 	echo "OK.<br />\n";
 	*/
 
-
 	install_basic_widgets();
 
 }
 
-
 ?>