Add optional fields to blog posting pages [#38 state:resolved]

olafgleba · Jun 16, 2012 · f48ab1f · f48ab1f
1 parent 208b42b
commit f48ab1f
Show file tree

Hide file tree

Showing 9 changed files with 131 additions and 21 deletions.
diff --git a/database/wcom.sql b/database/wcom.sql
@@ -1012,6 +1012,9 @@ CREATE TABLE `content_blog_postings` (
   `meta_title` varchar(255),
   `meta_keywords` text,
   `meta_description` text,
+  `optional_content_1` text,
+  `optional_content_2` text,
+  `optional_content_3` text,
   `draft` enum('0','1') DEFAULT '0',
   `ping` enum('0','1') DEFAULT '1',
   `comments_enable` enum('0','1') DEFAULT '1',

diff --git a/welcompose/admin/content/pages_blogs_postings_add.php b/welcompose/admin/content/pages_blogs_postings_add.php
@@ -366,6 +366,26 @@
 		array('id' => 'blog_posting_feed_summary', 'cols' => 3, 'rows' => '2', 'class' => 'w540h150'),
 		array('label' => gettext('Feed Summary'))
 		);
+
+	// optional inputs
+
+	// textarea for optional content 1
+	$optional_content_1 = $FORM->addElement('textarea', 'optional_content_1', 
+		array('id' => 'blog_posting_optional_content_1', 'cols' => 3, 'rows' => '2', 'class' => 'w540h50'),
+		array('label' => gettext('Optional Content 1'))
+		);
+
+	// textarea for optional content 2
+	$optional_content_2 = $FORM->addElement('textarea', 'optional_content_2', 
+		array('id' => 'blog_posting_optional_content_2', 'cols' => 3, 'rows' => '2', 'class' => 'w540h50'),
+		array('label' => gettext('Optional Content 2'))
+		);
+
+	// textarea for optional content 3
+	$optional_content_3 = $FORM->addElement('textarea', 'optional_content_3', 
+		array('id' => 'blog_posting_optional_content_3', 'cols' => 3, 'rows' => '2', 'class' => 'w540h50'),
+		array('label' => gettext('Optional Content 3'))
+		);
 
 	// checkbox for draft
 	$draft = $FORM->addElement('checkbox', 'draft',
@@ -422,7 +442,9 @@
 		// render it
 		$renderer = $BASE->utility->loadQuickFormSmartyRenderer();
 
-		// print_r($FORM->render($renderer)->toArray());
+		// fetch {function} template to set
+		// required/error markup on each form fields
+		$BASE->utility->smarty->fetch(dirname(__FILE__).'/../quickform.tpl');
 
 		// assign the form to smarty
 		$BASE->utility->smarty->assign('form', $FORM->render($renderer)->toArray());
@@ -494,6 +516,9 @@
 		$sqlData['meta_title'] = null;
 		$sqlData['meta_keywords'] = null;
 		$sqlData['meta_description'] = null;
+		$sqlData['optional_content_1'] = $optional_content_1->getValue();
+		$sqlData['optional_content_2'] = $optional_content_2->getValue();
+		$sqlData['optional_content_3'] = $optional_content_3->getValue();
 		$sqlData['draft'] = (string)intval($draft->getValue());
 		$sqlData['ping'] = (string)intval($ping->getValue());
 		$sqlData['comments_enable'] = (string)intval($comments_enable->getValue());

diff --git a/welcompose/admin/content/pages_blogs_postings_copy.php b/welcompose/admin/content/pages_blogs_postings_copy.php
@@ -400,6 +400,26 @@
 		array('id' => 'blog_posting_feed_summary', 'cols' => 3, 'rows' => '2', 'class' => 'w540h150'),
 		array('label' => gettext('Feed Summary'))
 		);
+
+	// optional inputs
+
+	// textarea for optional content 1
+	$optional_content_1 = $FORM->addElement('textarea', 'optional_content_1', 
+		array('id' => 'blog_posting_optional_content_1', 'cols' => 3, 'rows' => '2', 'class' => 'w540h50'),
+		array('label' => gettext('Optional Content 1'))
+		);
+
+	// textarea for optional content 2
+	$optional_content_2 = $FORM->addElement('textarea', 'optional_content_2', 
+		array('id' => 'blog_posting_optional_content_2', 'cols' => 3, 'rows' => '2', 'class' => 'w540h50'),
+		array('label' => gettext('Optional Content 2'))
+		);
+
+	// textarea for optional content 3
+	$optional_content_3 = $FORM->addElement('textarea', 'optional_content_3', 
+		array('id' => 'blog_posting_optional_content_3', 'cols' => 3, 'rows' => '2', 'class' => 'w540h50'),
+		array('label' => gettext('Optional Content 3'))
+		);
 
 	// checkbox for draft
 	$draft = $FORM->addElement('checkbox', 'draft',
@@ -460,6 +480,9 @@
 		'meta_title' => Base_Cnc::ifsetor($blog_posting['meta_title_raw'], null),
 		'meta_keywords' => Base_Cnc::ifsetor($blog_posting['meta_keywords'], null),
 		'meta_description' => Base_Cnc::ifsetor($blog_posting['meta_description'], null),
+		'optional_content_1' => Base_Cnc::ifsetor($blog_posting['optional_content_1'], null),
+		'optional_content_2' => Base_Cnc::ifsetor($blog_posting['optional_content_2'], null),
+		'optional_content_3' => Base_Cnc::ifsetor($blog_posting['optional_content_3'], null),
 		'tags' => $BLOGTAG->getTagStringFromSerializedArray(Base_Cnc::ifsetor($blog_posting['tag_array'], null)),
 		'draft' => Base_Cnc::ifsetor($blog_posting['draft'], null),
 		'ping' => 0,
@@ -545,6 +568,9 @@
 		$sqlData['meta_title'] = null;
 		$sqlData['meta_keywords'] = null;
 		$sqlData['meta_description'] = null;
+		$sqlData['optional_content_1'] = $optional_content_1->getValue();
+		$sqlData['optional_content_2'] = $optional_content_2->getValue();
+		$sqlData['optional_content_3'] = $optional_content_3->getValue();
 		$sqlData['draft'] = (string)intval($draft->getValue());
 		$sqlData['ping'] = (string)intval($ping->getValue());
 		$sqlData['comments_enable'] = (string)intval($comments_enable->getValue());

diff --git a/welcompose/admin/content/pages_blogs_postings_edit.php b/welcompose/admin/content/pages_blogs_postings_edit.php
@@ -400,6 +400,26 @@
 		array('id' => 'blog_posting_feed_summary', 'cols' => 3, 'rows' => '2', 'class' => 'w540h150'),
 		array('label' => gettext('Feed Summary'))
 		);
+
+	// optional inputs
+
+	// textarea for optional content 1
+	$optional_content_1 = $FORM->addElement('textarea', 'optional_content_1', 
+		array('id' => 'blog_posting_optional_content_1', 'cols' => 3, 'rows' => '2', 'class' => 'w540h50'),
+		array('label' => gettext('Optional Content 1'))
+		);
+
+	// textarea for optional content 2
+	$optional_content_2 = $FORM->addElement('textarea', 'optional_content_2', 
+		array('id' => 'blog_posting_optional_content_2', 'cols' => 3, 'rows' => '2', 'class' => 'w540h50'),
+		array('label' => gettext('Optional Content 2'))
+		);
+
+	// textarea for optional content 3
+	$optional_content_3 = $FORM->addElement('textarea', 'optional_content_3', 
+		array('id' => 'blog_posting_optional_content_3', 'cols' => 3, 'rows' => '2', 'class' => 'w540h50'),
+		array('label' => gettext('Optional Content 3'))
+		);
 
 	// checkbox for draft
 	$draft = $FORM->addElement('checkbox', 'draft',
@@ -465,6 +485,9 @@
 		'meta_title' => Base_Cnc::ifsetor($blog_posting['meta_title_raw'], null),
 		'meta_keywords' => Base_Cnc::ifsetor($blog_posting['meta_keywords'], null),
 		'meta_description' => Base_Cnc::ifsetor($blog_posting['meta_description'], null),
+		'optional_content_1' => Base_Cnc::ifsetor($blog_posting['optional_content_1'], null),
+		'optional_content_2' => Base_Cnc::ifsetor($blog_posting['optional_content_2'], null),
+		'optional_content_3' => Base_Cnc::ifsetor($blog_posting['optional_content_3'], null),
 		'tags' => $BLOGTAG->getTagStringFromSerializedArray(Base_Cnc::ifsetor($blog_posting['tag_array'], null)),
 		'draft' => Base_Cnc::ifsetor($blog_posting['draft'], null),
 		'ping' => 0,
@@ -567,6 +590,9 @@
 		$sqlData['meta_title'] = null;
 		$sqlData['meta_keywords'] = null;
 		$sqlData['meta_description'] = null;
+		$sqlData['optional_content_1'] = $optional_content_1->getValue();
+		$sqlData['optional_content_2'] = $optional_content_2->getValue();
+		$sqlData['optional_content_3'] = $optional_content_3->getValue();
 		$sqlData['draft'] = (string)intval($draft->getValue());
 		$sqlData['ping'] = (string)intval($ping->getValue());
 		$sqlData['comments_enable'] = (string)intval($comments_enable->getValue());

diff --git a/welcompose/admin/smarty/templates/content/pages_blogs_postings_add.html b/welcompose/admin/smarty/templates/content/pages_blogs_postings_add.html
@@ -1,9 +1,6 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" lang="de">
+<!DOCTYPE html>
 <head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta charset="utf-8">
 <title>{i18n 'Welcompose Admin &ndash; Pages &#62; Add Blog Posting'}</title>
 <link rel="stylesheet" href="../static/styles/wcom.basic.css" media="screen, projection" />
 <link rel="stylesheet" href="../static/styles/wcom.navigation.css" media="screen, projection" />
@@ -212,6 +209,18 @@ <h2>Podcast</h2>
 <label class="cont h13" for="blog_posting_feed_summary"><span class="bez">{$form.feed_summary.label}{qt el=$form.feed_summary}<span class="iHelp"><a href="#" title="{i18n 'Show help on this topic'}"><img src="../static/img/icons/help.gif" alt="" /></a></span></span>
 {$form.feed_summary.html}</label>
 
+<fieldset class="withinaction" style="padding-bottom: 10px; margin-bottom: 10px;">
+<h2>{i18n 'Optional Content'}</h2>
+<label class="cont h04" for="blog_posting_optional_content_1"><span class="bez">{$form.optional_content_1.label}{qt el=$form.optional_content_1}<span class="iHelp"><a href="#" title="{i18n 'Show help on this topic'}"><img src="../static/img/icons/help.gif" alt="" /></a></span></span>
+{$form.optional_content_1.html}</label>
+
+<label class="cont h04" for="blog_posting_optional_content_2"><span class="bez">{$form.optional_content_2.label}{qt el=$form.optional_content_2}<span class="iHelp"><a href="#" title="{i18n 'Show help on this topic'}"><img src="../static/img/icons/help.gif" alt="" /></a></span></span>
+{$form.optional_content_2.html}</label>
+
+<label class="cont h04" for="blog_posting_optional_content_3"><span class="bez">{$form.optional_content_3.label}{qt el=$form.optional_3}<span class="iHelp"><a href="#" title="{i18n 'Show help on this topic'}"><img src="../static/img/icons/help.gif" alt="" /></a></span></span>
+{$form.optional_content_3.html}</label>
+</fieldset>
+
 <label class="cont chbx" for="blog_posting_draft"><span class="bez">{$form.draft.label}{qt el=$form.draft}<span class="iHelp"><a href="#" title="{i18n 'Show help on this topic'}"><img src="../static/img/icons/help.gif" alt="" /></a></span></span>
 {$form.draft.html}</label>
 

diff --git a/welcompose/admin/smarty/templates/content/pages_blogs_postings_copy.html b/welcompose/admin/smarty/templates/content/pages_blogs_postings_copy.html
@@ -1,9 +1,6 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" lang="de">
+<!DOCTYPE html>
 <head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta charset="utf-8">
 <title>{i18n 'Welcompose Admin &ndash; Pages &#62; Duplicate Blog Posting'}</title>
 <link rel="stylesheet" href="../static/styles/wcom.basic.css" media="screen, projection" />
 <link rel="stylesheet" href="../static/styles/wcom.navigation.css" media="screen, projection" />
@@ -212,6 +209,18 @@ <h2>Podcast</h2>
 <label class="cont h13" for="blog_posting_feed_summary"><span class="bez">{$form.feed_summary.label}{qt el=$form.feed_summary}<span class="iHelp"><a href="#" title="{i18n 'Show help on this topic'}"><img src="../static/img/icons/help.gif" alt="" /></a></span></span>
 {$form.feed_summary.html}</label>
 
+<fieldset class="withinaction" style="padding-bottom: 10px; margin-bottom: 10px;">
+<h2>{i18n 'Optional Content'}</h2>
+<label class="cont h04" for="blog_posting_optional_content_1"><span class="bez">{$form.optional_content_1.label}{qt el=$form.optional_content_1}<span class="iHelp"><a href="#" title="{i18n 'Show help on this topic'}"><img src="../static/img/icons/help.gif" alt="" /></a></span></span>
+{$form.optional_content_1.html}</label>
+
+<label class="cont h04" for="blog_posting_optional_content_2"><span class="bez">{$form.optional_content_2.label}{qt el=$form.optional_content_2}<span class="iHelp"><a href="#" title="{i18n 'Show help on this topic'}"><img src="../static/img/icons/help.gif" alt="" /></a></span></span>
+{$form.optional_content_2.html}</label>
+
+<label class="cont h04" for="blog_posting_optional_content_3"><span class="bez">{$form.optional_content_3.label}{qt el=$form.optional_3}<span class="iHelp"><a href="#" title="{i18n 'Show help on this topic'}"><img src="../static/img/icons/help.gif" alt="" /></a></span></span>
+{$form.optional_content_3.html}</label>
+</fieldset>
+
 <label class="cont chbx" for="blog_posting_draft"><span class="bez">{$form.draft.label}{qt el=$form.draft}<span class="iHelp"><a href="#" title="{i18n 'Show help on this topic'}"><img src="../static/img/icons/help.gif" alt="" /></a></span></span>
 {$form.draft.html}</label>
 

diff --git a/welcompose/admin/smarty/templates/content/pages_blogs_postings_edit.html b/welcompose/admin/smarty/templates/content/pages_blogs_postings_edit.html
@@ -1,9 +1,6 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" lang="de">
+<!DOCTYPE html>
 <head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta charset="utf-8">
 <title>{i18n 'Welcompose Admin &ndash; Pages &#62; Edit Blog Posting'}</title>
 <link rel="stylesheet" href="../static/styles/wcom.basic.css" media="screen, projection" />
 <link rel="stylesheet" href="../static/styles/wcom.navigation.css" media="screen, projection" />
@@ -212,6 +209,18 @@ <h2>Podcast</h2>
 <label class="cont h13" for="blog_posting_feed_summary"><span class="bez">{$form.feed_summary.label}{qt el=$form.feed_summary}<span class="iHelp"><a href="#" title="{i18n 'Show help on this topic'}"><img src="../static/img/icons/help.gif" alt="" /></a></span></span>
 {$form.feed_summary.html}</label>
 
+<fieldset class="withinaction" style="padding-bottom: 10px; margin-bottom: 10px;">
+<h2>{i18n 'Optional Content'}</h2>
+<label class="cont h04" for="blog_posting_optional_content_1"><span class="bez">{$form.optional_content_1.label}{qt el=$form.optional_content_1}<span class="iHelp"><a href="#" title="{i18n 'Show help on this topic'}"><img src="../static/img/icons/help.gif" alt="" /></a></span></span>
+{$form.optional_content_1.html}</label>
+
+<label class="cont h04" for="blog_posting_optional_content_2"><span class="bez">{$form.optional_content_2.label}{qt el=$form.optional_content_2}<span class="iHelp"><a href="#" title="{i18n 'Show help on this topic'}"><img src="../static/img/icons/help.gif" alt="" /></a></span></span>
+{$form.optional_content_2.html}</label>
+
+<label class="cont h04" for="blog_posting_optional_content_3"><span class="bez">{$form.optional_content_3.label}{qt el=$form.optional_3}<span class="iHelp"><a href="#" title="{i18n 'Show help on this topic'}"><img src="../static/img/icons/help.gif" alt="" /></a></span></span>
+{$form.optional_content_3.html}</label>
+</fieldset>
+
 <label class="cont chbx" for="blog_posting_draft"><span class="bez">{$form.draft.label}{qt el=$form.draft}<span class="iHelp"><a href="#" title="{i18n 'Show help on this topic'}"><img src="../static/img/icons/help.gif" alt="" /></a></span></span>
 {$form.draft.html}</label>
 

diff --git a/welcompose/admin/smarty/templates/content/pages_blogs_postings_select.html b/welcompose/admin/smarty/templates/content/pages_blogs_postings_select.html
@@ -1,9 +1,6 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" lang="de">
+<!DOCTYPE html>
 <head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta charset="utf-8">
 <title>{i18n 'Welcompose Admin &ndash; Pages &#62; Blog Postings'}</title>
 <link rel="stylesheet" href="../static/styles/wcom.basic.css" media="screen, projection" />
 <link rel="stylesheet" href="../static/styles/wcom.navigation.css" media="screen, projection" />

diff --git a/welcompose/core/content_classes/blogposting.class.php b/welcompose/core/content_classes/blogposting.class.php
@@ -228,6 +228,9 @@ public function selectBlogPosting ($id)
 			`content_blog_postings`.`meta_title` AS `meta_title`,
 			`content_blog_postings`.`meta_keywords` AS `meta_keywords`,
 			`content_blog_postings`.`meta_description` AS `meta_description`,
+			`content_blog_postings`.`optional_content_1` AS `optional_content_1`,
+			`content_blog_postings`.`optional_content_2` AS `optional_content_2`,
+			`content_blog_postings`.`optional_content_3` AS `optional_content_3`,
 			`content_blog_postings`.`draft` AS `draft`,
 			`content_blog_postings`.`ping` AS `ping`,
 			`content_blog_postings`.`comments_enable` AS `comments_enable`,
@@ -455,6 +458,9 @@ public function selectBlogPostings ($params = array())
 			`content_blog_postings`.`meta_title` AS `meta_title`,
 			`content_blog_postings`.`meta_keywords` AS `meta_keywords`,
 			`content_blog_postings`.`meta_description` AS `meta_description`,
+			`content_blog_postings`.`optional_content_1` AS `optional_content_1`,
+			`content_blog_postings`.`optional_content_2` AS `optional_content_2`,
+			`content_blog_postings`.`optional_content_3` AS `optional_content_3`,
 			`content_blog_postings`.`draft` AS `draft`,
 			`content_blog_postings`.`ping` AS `ping`,
 			`content_blog_postings`.`comments_enable` AS `comments_enable`,