[geeklog-cvs] geeklog: bug 1096
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Fri Mar 26 16:18:22 EDT 2010
changeset 7834:ffd1a2e42531
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/ffd1a2e42531
user: vladv
date: Thu Mar 25 21:56:43 2010 +0200
description:
bug 1096
diffstat:
language/english.php | 1 +
public_html/admin/story.php | 3 +
public_html/article.php | 8 ++-
public_html/layout/professional/admin/story/storyeditor.thtml | 5 ++
public_html/layout/professional/admin/story/storyeditor_advanced.thtml | 5 ++
sql/mysql_tableanddata.php | 1 +
system/classes/story.class.php | 17 ++++++++
7 files changed, 37 insertions(+), 3 deletions(-)
diffs (152 lines):
diff -r e4b0894b8d00 -r ffd1a2e42531 language/english.php
--- a/language/english.php Thu Mar 25 20:00:06 2010 +0100
+++ b/language/english.php Thu Mar 25 21:56:43 2010 +0200
@@ -1592,6 +1592,7 @@
'create_new_adv'=> 'Create New (Adv.)',
'enabled' => 'Enabled',
'title' => 'Title',
+ 'page_title' => 'Page Title',
'type' => 'Type',
'topic' => 'Topic',
'help_url' => 'Help File URL',
diff -r e4b0894b8d00 -r ffd1a2e42531 public_html/admin/story.php
--- a/public_html/admin/story.php Thu Mar 25 20:00:06 2010 +0100
+++ b/public_html/admin/story.php Thu Mar 25 21:56:43 2010 +0200
@@ -548,6 +548,8 @@
$story_templates->set_var('lang_optiondelete', $LANG24[62]);
$story_templates->set_var('lang_title', $LANG_ADMIN['title']);
$story_templates->set_var('story_title', $story->EditElements('title'));
+ $story_templates->set_var('lang_page_title', $LANG_ADMIN['page_title']);
+ $story_templates->set_var('page_title' , $story->EditElements('page_title'));
$story_templates->set_var('lang_metadescription', $LANG_ADMIN['meta_description']);
$story_templates->set_var('meta_description', $story->EditElements('meta_description'));
$story_templates->set_var('lang_metakeywords', $LANG_ADMIN['meta_keywords']);
@@ -764,6 +766,7 @@
* @param int $uid ID of user that wrote the story
* @param string $tid Topic ID story belongs to
* @param string $title Title of story
+* @param string $page_title Title of the page
* @param string $introtext Introduction text
* @param string $bodytext Text of body
* @param int $hits Number of times story has been viewed
diff -r e4b0894b8d00 -r ffd1a2e42531 public_html/article.php
--- a/public_html/article.php Thu Mar 25 20:00:06 2010 +0100
+++ b/public_html/article.php Thu Mar 25 21:56:43 2010 +0200
@@ -156,8 +156,7 @@
' xmlns="http://www.w3.org/1999/xhtml"');
}
$story_template->set_var('direction', $LANG_DIRECTION);
- $story_template->set_var('page_title',
- $_CONF['site_name'] . ': ' . $story->displayElements('title'));
+ $story_template->set_var('page_title', $story->DisplayElements('page_title'));
$story_template->set_var('story_title',
$story->DisplayElements('title'));
header('Content-Type: text/html; charset=' . COM_getCharset());
@@ -233,7 +232,10 @@
$display = $story_template->finish($story_template->get_var('output'));
} else {
// Set page title
- $pagetitle = $story->DisplayElements('title');
+ $pagetitle = $story->DisplayElements('page_title');
+ if(empty($pagetitle)) {
+ $pagetitle = $story->DisplayElements('title');
+ }
$headercode = '';
$permalink = COM_buildUrl($_CONF['site_url'] . '/article.php?story='
diff -r e4b0894b8d00 -r ffd1a2e42531 public_html/layout/professional/admin/story/storyeditor.thtml
--- a/public_html/layout/professional/admin/story/storyeditor.thtml Thu Mar 25 20:00:06 2010 +0100
+++ b/public_html/layout/professional/admin/story/storyeditor.thtml Thu Mar 25 21:56:43 2010 +0200
@@ -69,6 +69,11 @@
<td><input type="text" size="48" maxlength="128" name="title" value="{story_title}"{xhtml}></td>
</tr>
<tr>
+ <td class="alignright">{lang_page_title}:</td>
+ <td><input type="text" size="48" maxlength="128" name="page_title" value="{page_title}"{xhtml}></td>
+ </tr>
+
+ <tr>
<td class="alignright">{lang_topic}:</td>
<td>
<select name="tid">
diff -r e4b0894b8d00 -r ffd1a2e42531 public_html/layout/professional/admin/story/storyeditor_advanced.thtml
--- a/public_html/layout/professional/admin/story/storyeditor_advanced.thtml Thu Mar 25 20:00:06 2010 +0100
+++ b/public_html/layout/professional/admin/story/storyeditor_advanced.thtml Thu Mar 25 21:56:43 2010 +0200
@@ -28,6 +28,11 @@
<td><input type="text" size="48" maxlength="128" name="title" value="{story_title}"{xhtml}></td>
</tr>
<tr>
+ <td class="alignright">{lang_page_title}:</td>
+ <td><input type="text" size="48" maxlength="128" name="page_title" value="{page_title}"{xhtml}></td>
+ </tr>
+
+ <tr>
<td class="alignright" style="vertical-align:top;">{lang_sid}:</td>
<td><input type="text" dir="ltr" size="48" maxlength="40" name="sid" value="{story_id}"{xhtml}></td>
</tr>
diff -r e4b0894b8d00 -r ffd1a2e42531 sql/mysql_tableanddata.php
--- a/sql/mysql_tableanddata.php Thu Mar 25 20:00:06 2010 +0100
+++ b/sql/mysql_tableanddata.php Thu Mar 25 21:56:43 2010 +0200
@@ -301,6 +301,7 @@
tid varchar(20) NOT NULL default 'General',
date datetime default NULL,
title varchar(128) default NULL,
+ page_title varchar(128),
introtext text,
bodytext text,
hits mediumint(8) unsigned NOT NULL default '0',
diff -r e4b0894b8d00 -r ffd1a2e42531 system/classes/story.class.php
--- a/system/classes/story.class.php Thu Mar 25 20:00:06 2010 +0100
+++ b/system/classes/story.class.php Thu Mar 25 21:56:43 2010 +0200
@@ -107,6 +107,7 @@
*/
var $_sid;
var $_title;
+ var $_page_title;
var $_meta_description;
var $_meta_keywords;
var $_introtext;
@@ -180,6 +181,7 @@
'tid' => 1,
'date' => 1,
'title' => 1,
+ 'page_title' => 1,
'meta_description' => 1,
'meta_keywords' => 1,
'introtext' => 1,
@@ -228,6 +230,11 @@
STORY_AL_ALPHANUM,
'_tid'
),
+ 'page_title' => array
+ (
+ STORY_AL_ANYTHING,
+ '_page_title'
+ ),
'meta_description' => array
(
STORY_AL_ANYTHING,
@@ -1531,6 +1538,11 @@
$return = $this->_title; //htmlspecialchars($this->_title);
break;
+
+ case 'page_title':
+ $return = $this->_page_title;
+
+ break;
case 'meta_description':
$return = $this->_meta_description;
@@ -1627,6 +1639,11 @@
break;
+ case 'page_title':
+ $return = $this->_displayEscape($this->_page_title);
+
+ break;
+
case 'meta_description':
$return = $this->_meta_description;
More information about the geeklog-cvs
mailing list