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

[EdB]

http://forums.quamplures.net/viewtopic.php?f=11&t=1168

New public domain photos for the sample photoblog

[lp:~edb/quam-plures/new_sample_photos]

7646. By EdB on 2012-07-30

smushit reduced these images by 4.93 percent :)

7647. By EdB on 2012-08-02

adding core updates

=== added directory 'media/blogs/id_2'
=== added file 'media/blogs/id_2/index.html'
=== added directory 'media/blogs/id_3'
=== added file 'media/blogs/id_3/index.html'
=== added directory 'media/blogs/id_4'
=== added file 'media/blogs/id_4/artists-paint-pots-2.jpg'
Binary files media/blogs/id_4/artists-paint-pots-2.jpg	1970-01-01 00:00:00 +0000 and media/blogs/id_4/artists-paint-pots-2.jpg	2012-08-02 15:49:21 +0000 differ
=== added file 'media/blogs/id_4/biscuit-basin.jpg'
Binary files media/blogs/id_4/biscuit-basin.jpg	1970-01-01 00:00:00 +0000 and media/blogs/id_4/biscuit-basin.jpg	2012-08-02 15:49:21 +0000 differ
=== added file 'media/blogs/id_4/emerald-pool-in-yellowstone.jpg'
Binary files media/blogs/id_4/emerald-pool-in-yellowstone.jpg	1970-01-01 00:00:00 +0000 and media/blogs/id_4/emerald-pool-in-yellowstone.jpg	2012-08-02 15:49:21 +0000 differ
=== added file 'media/blogs/id_4/index.html'
=== added file 'media/blogs/id_4/mammoth-hot-springs.jpg'
Binary files media/blogs/id_4/mammoth-hot-springs.jpg	1970-01-01 00:00:00 +0000 and media/blogs/id_4/mammoth-hot-springs.jpg	2012-08-02 15:49:21 +0000 differ
=== added file 'media/blogs/id_4/morning-glory-pool.jpg'
Binary files media/blogs/id_4/morning-glory-pool.jpg	1970-01-01 00:00:00 +0000 and media/blogs/id_4/morning-glory-pool.jpg	2012-08-02 15:49:21 +0000 differ
=== removed file 'media/users/id_1/samplephoto1.jpg'
Binary files media/users/id_1/samplephoto1.jpg	2010-10-31 11:47:52 +0000 and media/users/id_1/samplephoto1.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/users/id_1/samplephoto2.jpg'
Binary files media/users/id_1/samplephoto2.jpg	2010-10-31 11:47:52 +0000 and media/users/id_1/samplephoto2.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/users/id_1/samplephoto3.jpg'
Binary files media/users/id_1/samplephoto3.jpg	2010-10-31 11:47:52 +0000 and media/users/id_1/samplephoto3.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/users/id_1/samplephoto4.jpg'
Binary files media/users/id_1/samplephoto4.jpg	2010-10-31 11:47:52 +0000 and media/users/id_1/samplephoto4.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'media/users/id_1/samplephoto5.jpg'
Binary files media/users/id_1/samplephoto5.jpg	2010-10-31 11:47:52 +0000 and media/users/id_1/samplephoto5.jpg	1970-01-01 00:00:00 +0000 differ
=== modified file 'qp_install/_functions_create.php'
--- qp_install/_functions_create.php	2012-07-24 09:39:41 +0000
+++ qp_install/_functions_create.php	2012-08-02 15:49:21 +0000
@@ -528,7 +528,7 @@
 	$cat_linkblog_b2evo = cat_create( $app_name, 'NULL', $blog_linkblog_ID );
 	$cat_linkblog_contrib = cat_create( 'Contributors', 'NULL', $blog_linkblog_ID );
 	// Create categories for photoblog
-	$cat_photo_album = cat_create( 'Owen Michael', 'NULL', $blog_photoblog_ID );
+	$cat_yellowstone = cat_create( 'Yellowstone', 'NULL', $blog_photoblog_ID );
 	task_end();
 
 	echo T_('Creating sample posts and comments').' ... ';
@@ -591,71 +591,91 @@
 	// 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'), '',
-		$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).'
+	$edited_Item->insert( 1, T_('artists-paint-pots-2'), 'This shows the simplest attachment possible: the file name became the file\'s title, alt text, description, and post title.', 
+		$now, $cat_yellowstone, array(), 'published','en-US' );
+	// attach an image to the item
+	$edit_File = new File( 'collection', 4, 'artists-paint-pots-2.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 = 'artists-paint-pots-2', file_alt = 'artists-paint-pots-2', file_desc = 'artists-paint-pots-2' 
+		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_('Photo of Biscuit Basin'), 'This shows a customized "file title" field, which became the alt text and description and item title.', 
+		$now, $cat_yellowstone, array(), 'published','en-US' );
+	// attach an image to the item
+	$edit_File = new File( 'collection', 4, 'biscuit-basin.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 = 'Photo of Biscuit Basin', file_alt = 'Photo of Biscuit Basin', file_desc = 'Photo of Biscuit Basin' 
+		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_('Emerald Pool, Yellowstone NP'), 'This image has all three attributes set to unique values, then this post was created with a unique title and content, then the image was attached to the post.', 
+		$now, $cat_yellowstone, array(), 'published','en-US' );
+	// attach an image to the item
+	$edit_File = new File( 'collection', 4, 'emerald-pool-in-yellowstone.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 = 'Emerald Pool, Yellowstone', file_alt = 'Photo of Emerald Pool in Yellowstone', file_desc = 'This is the \"description/caption\" field for the file name \"emerald-pool-in-yellowstone.jpg\"' 
+		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_('Mammoth Hot Springs'), '', 
+		$now, $cat_yellowstone, array(), 'published','en-US' );
+	// attach an image to the item
+	$edit_File = new File( 'collection', 4, 'mammoth-hot-springs.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 = 'Mammoth Hot Springs', file_alt = 'Mammoth Hot Springs', file_desc = 'Free Stock Photo of Mammoth Hot Springs - Yellowstone - Travel, from public-domain-photos.com' 
+		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_('Morning Glory Pool'), 'This photo has some text like a normal blog post might.', 
+		$now, $cat_yellowstone, array(), 'published','en-US' );
+	// attach an image to the item
+	$edit_File = new File( 'collection', 4, 'morning-glory-pool.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 = 'Morning Glory Pool', file_alt = 'Morning Glory Pool', file_desc = 'Free Stock Photo of Morning Glory Pool - Yellowstone - Travel, from public-domain-photos.com' 
+		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. All of the Yellowstone photos came from <a href="http://www.public-domain-photos.com/travel/yellowstone">Public-Domain-Photos</a>.', $now, $cat_yellowstone, array(), 'published','en-US' );
+	// attach an image to the item
+	$edit_File = new File( 'collection', 4, 'mammoth-hot-springs.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 = 'Mammoth Hot Springs', file_alt = 'Mammoth Hot Springs', file_desc = 'Mammoth Hot Springs.' 
 		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 = new File( 'collection', 4, 'morning-glory-pool.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).'
+	$query = "UPDATE T_files 
+		SET file_title = 'Morning Glory Pool', file_alt = 'Morning Glory Pool', file_desc = 'Morning Glory Pool.' 
 		WHERE file_ID = {$edit_File->ID}";
 	$DB->query( $query );
 

=== modified file 'qp_install/_functions_install.php'
--- qp_install/_functions_install.php	2012-07-24 09:39:41 +0000
+++ qp_install/_functions_install.php	2012-08-02 15:49:21 +0000
@@ -622,7 +622,7 @@
 							  WHERE blog_ID < 4' );
 
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
-							 SELECT blog_ID, "Sidebar 2", 4, "widget", "free_html", \'a:5:{s:5:"title";s:9:"Sidebar 2";s:7:"content";s:162:"This is the "Sidebar 2" container. You can place any widget you like in here. In the evo toolbar at the top of this page, select "Customize", then "Blog Widgets".";s:11:"widget_name";s:9:"Free HTML";s:16:"widget_css_class";s:0:"";s:9:"widget_ID";s:0:"";}\'
+							 SELECT blog_ID, "Sidebar 2", 4, "widget", "free_html", \'a:5:{s:5:"title";s:9:"Sidebar 2";s:7:"content";s:162:"This is the "Sidebar 2" container. You can place any widget you like in here. In the gray navbar at the top of this page, select "Customize", then "Blog Widgets".";s:11:"widget_name";s:9:"Free HTML";s:16:"widget_css_class";s:0:"";s:9:"widget_ID";s:0:"";}\'
 							   FROM T_blogs
 							  WHERE blog_ID < 4' );