[pLog-svn] r2757 - in plog/trunk: . bin-devel class/action
class/action/admin class/dao class/data class/net
class/plugin class/view locale templates/LifeType
templates/LifeType/en_UK templates/admin templates/blueish
templates/grey templates/misc templates/standard
templates/standard-with-plugins templates/summary
templates/summary/rss templates/wizard
jondaley at devel.lifetype.net
jondaley at devel.lifetype.net
Fri Jan 6 03:36:20 GMT 2006
Author: jondaley
Date: 2006-01-06 03:36:17 +0000 (Fri, 06 Jan 2006)
New Revision: 2757
Added:
plog/trunk/class/view/redirectview.class.php
Removed:
plog/trunk/templates/LifeType/README.txt
Modified:
plog/trunk/COPYRIGHT.txt
plog/trunk/bin-devel/build-diff.sh
plog/trunk/class/action/addcommentaction.class.php
plog/trunk/class/action/admin/adminaddbloguseraction.class.php
plog/trunk/class/action/admin/adminadduseraction.class.php
plog/trunk/class/dao/articlenotifications.class.php
plog/trunk/class/dao/trackbackclient.class.php
plog/trunk/class/data/kses.class.php
plog/trunk/class/net/baserequestgenerator.class.php
plog/trunk/class/plugin/pluginmanager.class.php
plog/trunk/error.php
plog/trunk/locale/locale_it_IT.php
plog/trunk/templates/LifeType/about.template
plog/trunk/templates/LifeType/en_UK/strings.txt
plog/trunk/templates/LifeType/frontpage.template
plog/trunk/templates/admin/default.template
plog/trunk/templates/admin/editpost.template
plog/trunk/templates/admin/header.template
plog/trunk/templates/admin/resourcelist.template
plog/trunk/templates/blueish/about.template
plog/trunk/templates/grey/footer.template
plog/trunk/templates/misc/email_notifier.template
plog/trunk/templates/standard-with-plugins/footer.template
plog/trunk/templates/standard-with-plugins/resource.template
plog/trunk/templates/standard/footer.template
plog/trunk/templates/standard/resource.template
plog/trunk/templates/summary/blogprofile.template
plog/trunk/templates/summary/blogslist.template
plog/trunk/templates/summary/rss/blogs_rss20.template
plog/trunk/templates/summary/rss/rss20.template
plog/trunk/templates/wizard/header.template
plog/trunk/templates/wizard/intro.template
plog/trunk/templates/wizard/step3.template
plog/trunk/templates/wizard/update4.template
Log:
merged the last of the 1.0.2 branch. revs: 2667 through 2756. first 1.0.3 merge coming shortly
Modified: plog/trunk/COPYRIGHT.txt
===================================================================
--- plog/trunk/COPYRIGHT.txt 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/COPYRIGHT.txt 2006-01-06 03:36:17 UTC (rev 2757)
@@ -1,2 +1,4 @@
-This code is copyrighted by Oscar Renalias and the pLog project, and licensed for use under the GNU General Public
-License. Please see the file LICENSE.txt for the legal terms of the license.
\ No newline at end of file
+This code is copyrighted by Oscar Renalias and the LifeType project,
+and licensed for use under the GNU General Public License.
+
+Please see the file LICENSE.txt for the legal terms of the license.
Modified: plog/trunk/bin-devel/build-diff.sh
===================================================================
--- plog/trunk/bin-devel/build-diff.sh 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/bin-devel/build-diff.sh 2006-01-06 03:36:17 UTC (rev 2757)
@@ -1,7 +1,7 @@
#!/bin/sh
# where to find the svn repository
-SVNSERVER="http://devel.plogworld.net"
+SVNSERVER="http://devel.lifetype.net"
SVNREPO="/svn/plog/plog"
# check paramters
@@ -39,6 +39,10 @@
cd ..
echo "Copying new or updated files..."
+# need to change this. We should parse deleted files, and parse
+# this list in order because the same file could have been added
+# and deleted within the time range we are interested in, and
+# the current method will cause errors.
for i in `cat $WORKFOLDER/files|grep [^UA]|grep -v revision|awk '{print $2}'`
do
echo Keeping: $i
@@ -50,4 +54,19 @@
# remove temporary folders
rm -rf $WORKFOLDER
+# remove files that shouldn't be included in upgrades
+rm $DESTFOLDER/wizard.php
+rm -r $DESTFOLDER/config/
+
+# remove files that shouldn't be included in any release
+rm -r $DESTFOLDER/bin-devel/
+rm -r $DESTFOLDER/docs-devel/
+rm -r $DESTFOLDER/plog.xcode/
+rm -r $DESTFOLDER/install/
+rm -r $DESTFOLDER/release/
+rm -r $DESTFOLDER/templates/LifeType
+rm -r $DESTFOLDER/templates/grey-sf
+rm -r $DESTFOLDER/templates/plogworld
+
+
echo "Done! Output available under the $DESTFOLDER/ folder"
Modified: plog/trunk/class/action/addcommentaction.class.php
===================================================================
--- plog/trunk/class/action/addcommentaction.class.php 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/class/action/addcommentaction.class.php 2006-01-06 03:36:17 UTC (rev 2757)
@@ -12,6 +12,7 @@
include_once( PLOG_CLASS_PATH."class/net/client.class.php" );
include_once( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
include_once( PLOG_CLASS_PATH."class/view/errorview.class.php" );
+ include_once( PLOG_CLASS_PATH."class/view/redirectview.class.php" );
include_once( PLOG_CLASS_PATH."class/bayesian/bayesianfiltercore.class.php" );
include_once( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
@@ -211,9 +212,15 @@
$request["commentUserName"] = $request["userName"];
$request["userName"] = "";
HttpVars::setRequest( $request );
+
+ // calculate the final URL
+ $rg = $this->_blogInfo->getBlogRequestGenerator();
+ $postPermalink = $rg->postPermalink( $article );
- // forward the action to ViewArticleAction
- return BlogController::setForwardAction( "ViewArticle" );
+ // and pass it to the redirect view to perform the redirection
+ $this->_view = new RedirectView( $postPermalink );
+
+ return( true );
}
}
?>
Modified: plog/trunk/class/action/admin/adminaddbloguseraction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddbloguseraction.class.php 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/class/action/admin/adminaddbloguseraction.class.php 2006-01-06 03:36:17 UTC (rev 2757)
@@ -45,7 +45,7 @@
// build an email message
$message = new EmailMessage();
$message->setBody( $this->_notificationText );
- $message->setSubject( "pLog Notification" );
+ $message->setSubject( "LifeType Notification" );
$message->addTo( $userInfo->getEmail());
$message->setFrom( $this->_userInfo->getEmail());
// and finally send it
Modified: plog/trunk/class/action/admin/adminadduseraction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminadduseraction.class.php 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/class/action/admin/adminadduseraction.class.php 2006-01-06 03:36:17 UTC (rev 2757)
@@ -5,6 +5,7 @@
include_once( PLOG_CLASS_PATH."class/data/validator/passwordvalidator.class.php" );
include_once( PLOG_CLASS_PATH."class/data/validator/emailvalidator.class.php" );
include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+ include_once( PLOG_CLASS_PATH."class/data/validator/usernamevalidator.class.php" );
include_once( PLOG_CLASS_PATH."class/dao/users.class.php" );
include_once( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
include_once( PLOG_CLASS_PATH."class/view/admin/adminadduserview.class.php" );
@@ -32,7 +33,7 @@
$this->SiteAdminAction( $actionInfo, $request );
// for data validation purposes
- $this->registerFieldValidator( "userName", new StringValidator());
+ $this->registerFieldValidator( "userName", new UsernameValidator());
$this->registerFieldValidator( "newUserPassword", new PasswordValidator());
$this->registerFieldValidator( "userEmail", new EmailValidator());
$this->registerFieldValidator( "userStatus", new IntegerValidator());
Modified: plog/trunk/class/dao/articlenotifications.class.php
===================================================================
--- plog/trunk/class/dao/articlenotifications.class.php 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/class/dao/articlenotifications.class.php 2006-01-06 03:36:17 UTC (rev 2757)
@@ -85,7 +85,7 @@
$message = new EmailMessage();
$message->setFrom( $this->_config->getValue( "post_notification_source_address" ));
$message->addTo( $userInfo->getEmail());
- $message->setSubject( "pLog Notification system" );
+ $message->setSubject( "LifeType Notification system" );
$message->setBody( $body );
$message->setCharset( $charset );
@@ -125,7 +125,7 @@
foreach( $artNotifs as $notif ) {
$userInfo = $users->getUserInfoFromId( $notif->getUserId());
$message = $this->renderMessageTemplate( $article, $blogInfo );
- $this->notifyUser( $notif, $userInfo, "pLog Notification", $message, $charset );
+ $this->notifyUser( $notif, $userInfo, "LifeType Notification", $message, $charset );
}
}
Modified: plog/trunk/class/dao/trackbackclient.class.php
===================================================================
--- plog/trunk/class/dao/trackbackclient.class.php 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/class/dao/trackbackclient.class.php 2006-01-06 03:36:17 UTC (rev 2757)
@@ -128,7 +128,7 @@
$t =& RequestGenerator::getRequestGenerator( $blogInfo );
$formvars["title"] = $article->getTopic();
// according to MT's implementation, the excerpt should not be longer than 255 characters.
- $formvars["excerpt"] = substr( $article->getText(), 0, 255 );
+ $formvars["excerpt"] = substr( $article->getText(), 0, 252 )."...";
$formvars["url"] = $t->postPermalink( $article );
$formvars["blog_name"] = $blogInfo->getBlog();
@@ -246,6 +246,12 @@
{
$results = Array();
+
+ // to avoid annoying errors with the foreach() loop in case somebody's passing
+ // something which is not an array
+ if( !is_array( $trackbacks ))
+ $trackbacks = Array();
+
foreach( $trackbacks as $trackback )
{
// try and send a trackback
Modified: plog/trunk/class/data/kses.class.php
===================================================================
--- plog/trunk/class/data/kses.class.php 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/class/data/kses.class.php 2006-01-06 03:36:17 UTC (rev 2757)
@@ -601,7 +601,7 @@
{
return preg_replace(
'/^((&[^;]*;|[\sA-Za-z0-9])*)'.
- '(:|:|&#[Xx]3[Aa];)\s*/e',
+ '(:|:|&#[Xx]3[Aa];)(\/|/|&#[Xx]2[Ff];)(\/|/|&#[Xx]2[Ff];)\s*/e',
'\$this->_bad_protocol_once2("\\1")',
$string
);
@@ -615,17 +615,11 @@
###############################################################################
function _bad_protocol_once2($string)
{
- $string2 = $this->_decode_entities($string2);
- $string2 = preg_replace('/\s/', '', $string);
+ $string2 = $this->_decode_entities($string);
+ $string2 = preg_replace('/\s/', '', $string2);
$string2 = $this->_no_null($string2);
$string2 = strtolower($string2);
- //
- // bug http://bugs.plogworld.net/view.php?id=658
- // somehow every other CSS attribute is allowed except "margin"... go figure!
- //
- $this->allowed_protocols[] = "margin";
-
$allowed = false;
foreach ($this->allowed_protocols as $one_protocol)
{
@@ -638,7 +632,7 @@
if ($allowed)
{
- return "$string2:";
+ return "$string2://";
}
else
{
Modified: plog/trunk/class/net/baserequestgenerator.class.php
===================================================================
--- plog/trunk/class/net/baserequestgenerator.class.php 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/class/net/baserequestgenerator.class.php 2006-01-06 03:36:17 UTC (rev 2757)
@@ -528,7 +528,12 @@
$config =& Config::getConfig();
$url = new Url($config->getValue( "base_url" ));
$articleDate = $article->getDateObject();
- $date = $articleDate->getYear()."-".$articleDate->getMonth()."-".$articleDate->getDay();
+
+ // Timestamp::getDay() doesn't do two digits, so we'll do it here
+ $day = $articleDate->getDay();
+ if( $day < 10 ) $day = "0".$day;
+
+ $date = $articleDate->getYear()."-".$articleDate->getMonth()."-".$day;
$tag = "tag:post:".$url->getHost().",".$date.":".$article->getId();
return $tag;
Modified: plog/trunk/class/plugin/pluginmanager.class.php
===================================================================
--- plog/trunk/class/plugin/pluginmanager.class.php 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/class/plugin/pluginmanager.class.php 2006-01-06 03:36:17 UTC (rev 2757)
@@ -182,7 +182,8 @@
foreach( $pluginFiles as $pluginFile ) {
if( File::isDir($pluginFile)) {
// build up the name of the file
- $pluginId = array_pop(explode("/", $pluginFile));
+ $pluginIdElements = explode("/", $pluginFile);
+ $pluginId = array_pop($pluginIdElements);
$pluginFileName = "plugin".$pluginId.".class.php";
$pluginFullPath = PLOG_CLASS_PATH."$pluginFile/$pluginFileName";
// and try to include it
Copied: plog/trunk/class/view/redirectview.class.php (from rev 2756, plog/branches/plog-1.0.2/class/view/redirectview.class.php)
Modified: plog/trunk/error.php
===================================================================
--- plog/trunk/error.php 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/error.php 2006-01-06 03:36:17 UTC (rev 2757)
@@ -25,7 +25,7 @@
* ErrorDocument 403 /plog/error.php
* ErrorDocument 404 /plog/error.php
*
- * If pLog is running somewhere else other than /plog/, then that
+ * If LifeType is running somewhere else other than /plog/, then that
* should be changed since an absolute URL is required.
*/
$config =& Config::getConfig();
Modified: plog/trunk/locale/locale_it_IT.php
===================================================================
--- plog/trunk/locale/locale_it_IT.php 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/locale/locale_it_IT.php 2006-01-06 03:36:17 UTC (rev 2757)
@@ -363,7 +363,7 @@
$messages['error_adding_link'] = 'Si e verificato un errore durante l\'aggiunta del nuovo link. Verifica le informazioni inserite e quindi riprova';
$messages['error_invalid_url'] = 'L\'indirizzo non è corretto';
$messages['link_added_ok'] = 'Link "%s" aggiunto';
-$messages['bookmarkit_to_plog'] = "Annotalo su pLog!";
+$messages['bookmarkit_to_plog'] = "Annotalo su LifeType!";
// update link
$messages['error_updating_link'] = 'Si e verificato un errore durante la modifica del link. Verifica le informazioni inserite e quindi riprova';
Deleted: plog/trunk/templates/LifeType/README.txt
===================================================================
--- plog/trunk/templates/LifeType/README.txt 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/LifeType/README.txt 2006-01-06 03:36:17 UTC (rev 2757)
@@ -1,33 +0,0 @@
-This is the readme file and change log file for "kubrick" template for Plog
-Kubrick template is original by Michael Heilemann from http://binarybonsai.com/kubrick/
-
-Modified By Knight from http://www.ahknight.net
-Email me at me at ahknight.net if you found any error doe this template
-
-====================================================================
-
-
-# if you using this template for other language then english, you can edit the postmetadata.inc to suit your own language
-# to add your personal header image, you can simply drop in an image called 'personalheader.jpg' into your /images/
- directory. Dimensions should be at least 760px x 200px. Anything above that will
- get cropped off of the image.
- after that uncomment for #headerimg in style.css
-# remove the <!-- and --> in panel.template if you wan to add a small box for self intro
- <!--
- <li><h2>{$locale->tr("about")}</h2>
- Here is a section you can use to briefly talk about yourself or your site. Uncomment and delete this line to use.
- <p>Your description here.</p>
- </li>
- -->
-
-9 april 2005
-added "about me" section
-fix a bug where using theme editor copy this template
-fix the comment page for valid xhtml
-fix the total comment display even the post is close for comment
-
-4 april 2005
-fixed some locale issue
-fixed the link category won't show issue
-postmetadata now include as a inc file
-empty link category will hide
\ No newline at end of file
Modified: plog/trunk/templates/LifeType/about.template
===================================================================
--- plog/trunk/templates/LifeType/about.template 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/LifeType/about.template 2006-01-06 03:36:17 UTC (rev 2757)
@@ -4,7 +4,7 @@
<div>
<h2 class="title">{$locale->tr("about")}</h2>
<div class="posted"><a href="{$url->templatePage("about")}">{$locale->tr("permalink")}</a></div>
- This template is a clone of the 'georgia blue' style found on <a href='http://www.movabletype.org'>MovableType.org</a>. Also check out <a href='http://www.bookofstyles.com'>The Book of Styles</a> for some very cool styles and templates for websites. It was ported to the <a href='http://www.plogworld.net'>plog</a> blogging system by Nick Gerakines, me :), for the blog that i setup for my mom. Its a very simple layout that allows comments, trackback requests and so on. If you like it or find an error somewhere make a post in the <a href='http://forum.socklabs.com'>forum</a> or email me at <a href='mailto:nick at socklabs.com'>nick at socklabs.com</a>.
+ This template is a clone of the 'georgia blue' style found on <a href='http://www.movabletype.org'>MovableType.org</a>. Also check out <a href='http://www.bookofstyles.com'>The Book of Styles</a> for some very cool styles and templates for websites. It was ported to the <a href='http://www.lifetype.net'>LifeType</a> blogging system by Nick Gerakines, me :), for the blog that i setup for my mom. Its a very simple layout that allows comments, trackback requests and so on. If you like it or find an error somewhere make a post in the <a href='http://forum.socklabs.com'>forum</a> or email me at <a href='mailto:nick at socklabs.com'>nick at socklabs.com</a>.
<hr/>
You can change the contents of this page by editing the about.template file.
</div>
Modified: plog/trunk/templates/LifeType/en_UK/strings.txt
===================================================================
--- plog/trunk/templates/LifeType/en_UK/strings.txt 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/LifeType/en_UK/strings.txt 2006-01-06 03:36:17 UTC (rev 2757)
@@ -37,12 +37,12 @@
<h4>Choose your Style</h4>
<p>Looking for a nice design for your weblog? Go check out the over 60 freely available
-<a href="http://devel.plogworld.net/plog-1.0.2/index.php?op=Template&amp;blogId=1&amp;show=downloads#templates">templates</a>.
+<a href="http://devel.lifetype.net/plog-1.0.2/index.php?op=Template&amp;blogId=1&amp;show=downloads#templates">templates</a>.
Installation is as easy as uploading a file through your administration interface!</p>
<h4>Add a Feature</h4>
<p>If you're looking for a feature not available with the standard installation,
-you will probably find it in the <a href="http://devel.plogworld.net/plog-1.0.2/index.php?op=Template&amp;blogId=1&amp;show=downloads#plugins">plugins section</a>,
+you will probably find it in the <a href="http://devel.lifetype.net/plog-1.0.2/index.php?op=Template&amp;blogId=1&amp;show=downloads#plugins">plugins section</a>,
providing you with over 60 features for you to add in no time.</p>
<h4>Anti-spam Filter</h4>
@@ -76,7 +76,7 @@
user and blog index, everything ready to go with your intallation of LifeType.</p>
<h4>Subdomains</h4>
-<p>Provide your users with nice <a href="http://wiki.plogworld.net/index.php/PLog_1.0/Admin/Support_for_Subdomains">subdomains</a>
+<p>Provide your users with nice <a href="http://wiki.lifetype.net/index.php/PLog_1.0/Admin/Support_for_Subdomains">subdomains</a>
like username.yourdomain.com or blogname.yourdomain.com. (you need to be able to set up wildcards
on your domain to use this feature)</p>
@@ -95,21 +95,21 @@
<a name="geeks_need_it"></a>
<h4>Nice Looking URLs</h4>
-<p>Creat your own <a href="http://wiki.plogworld.net/index.php/PLog_1.0/Admin/Customizing_URLs">customized URLs</a>
+<p>Creat your own <a href="http://wiki.lifetype.net/index.php/PLog_1.0/Admin/Customizing_URLs">customized URLs</a>
for <a href="http://en.wikipedia.org/wiki/SEO">SEO</a> or to adapt your them to your language. Toggle a setting in the configuration of the site and LifeType
will automatically use cruft-free URLs instead of the old style, raw ones.</p>
<h4>Nice and Clean Code</h4>
-<p>LifeType is based on a <a href="http://wiki.plogworld.net/index.php/Model-View-Controller_in_pLog">Model-View-Controller</a>
+<p>LifeType is based on a <a href="http://wiki.lifetype.net/index.php/Model-View-Controller_in_pLog">Model-View-Controller</a>
framework providing flexibility and scalability. Documentation is generated with Doxigen and the
-<a href="http://plogworld.net/api/">most recent API</a> is always available.</p>
+<a href="http://lifetype.net/api/">most recent API</a> is always available.</p>
<h4>Clean Content</h4>
<p>The default templates included in LifeType are <a href="http://www.w3.org/TR/xhtml1/">XHTML 1.0</a> Strict, and so is the content generated by
LifeType. Worried about generating correct and standard mark-up? Worry no longer!</p>
<h4>Powerful Plugin Framework</h4>
-<p>The <a href="http://wiki.plogworld.net/index.php/PLog_1.0/Plugins">impressive plugin capabilities</a>
+<p>The <a href="http://wiki.lifetype.net/index.php/PLog_1.0/Plugins">impressive plugin capabilities</a>
let's you add about any feature you like. With filters, events, registration of new actions, localization,
MVC support (self-contained), perfect integration into the administration interface and template support
you can add about any functionality you can think off.</p>
@@ -246,12 +246,12 @@
The following command will checkout the code from the trunk/ folder:
</p>
<pre>
- svn checkout http://devel.plogworld.net/svn/plog/plog/trunk
+ svn checkout http://devel.lifetype.net/svn/plog/plog/trunk
</pre>
<p>If you wish to check out a certain branch or tag, replace /trunk with /branch/branch-name or /tags/tag-name:</p>
<pre>
- svn checkout http://devel.plogworld.net/svn/plog/plog/tags/plog-1.0.1
+ svn checkout http://devel.lifetype.net/svn/plog/plog/tags/plog-1.0.1
</pre>
@@ -262,7 +262,7 @@
</pre>
<p>
-Please see <a href="http://wiki.plogworld.net/index.php/Subversion_Repository">the wiki page on Subversion</a> for more
+Please see <a href="http://wiki.lifetype.net/index.php/Subversion_Repository">the wiki page on Subversion</a> for more
details and information.
</p>
@@ -545,4 +545,4 @@
<li>German enquiries: <a href="mailto:de at lifetype.net">de at lifetype.net</a></li>
<li>Taiwan enquiries: <a href="mailto:tw at lifetype.net">tw at lifetype.net</a></li>
</ul>
-"""
\ No newline at end of file
+"""
Modified: plog/trunk/templates/LifeType/frontpage.template
===================================================================
--- plog/trunk/templates/LifeType/frontpage.template 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/LifeType/frontpage.template 2006-01-06 03:36:17 UTC (rev 2757)
@@ -10,7 +10,7 @@
<p style="text-align:justify">
{#frontPageLeft#}
<br/><br/>
- <a href="http://plog.sourceforge.net">Download LifeType 1.0.2
+ <a href="http://sourceforge.net/projects/lifetype/">Download LifeType 1.0.2
<img src="{$url->getTemplateFile("images/small.jpg")}" style="border:0px;width:11px;height:10px" alt="" /></a></p></td>
<td background="{$url->getTemplateFile("images/back_center.jpg")}" style="width:245px;padding-left:40px;padding-right:20px">
@@ -29,4 +29,4 @@
<img src="{$url->getTemplateFile("images/small.jpg")}" style="border:0px;width:11px;height:10px" alt="" /></a></p></td>
</tr>
- {include file="$blogtemplate/footermain.template"}
\ No newline at end of file
+ {include file="$blogtemplate/footermain.template"}
Modified: plog/trunk/templates/admin/default.template
===================================================================
--- plog/trunk/templates/admin/default.template 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/admin/default.template 2006-01-06 03:36:17 UTC (rev 2757)
@@ -1,5 +1,5 @@
{include file="$blogtemplate/simpleheader.template"}
- <div class="loginBox" style="padding-top: 160px;">
+ <div class="loginBox" style="padding-top: 180px;">
<form name="loginForm" method="post" action="admin.php">
<fieldset class="inputField">
<h4>{$locale->tr("login")}</h4>
Modified: plog/trunk/templates/admin/editpost.template
===================================================================
--- plog/trunk/templates/admin/editpost.template 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/admin/editpost.template 2006-01-06 03:36:17 UTC (rev 2757)
@@ -138,12 +138,12 @@
<label for="sendTrackbacks">{$locale->tr("send_trackback_pings_help")}</label>
</div>
- <div class="field_checkbox">
- {if $xmlRpcPingEnabled}
+ {if $xmlRpcPingEnabled}
+ <div class="field_checkbox">
<input class="checkbox" type="checkbox" name="sendPings" id="sendPings" value="1" {if $sendPings} checked="checked" {/if}/>
<label for="sendPings">{$locale->tr("send_xmlrpc_pings_help")}</label>
- {/if}
- </div>
+ </div>
+ {/if}
<!-- checkbox custom fields -->
{include file="$admintemplatepath/newpost_customfields.template" type=3 fields=$customfields}
@@ -157,4 +157,4 @@
<input type="hidden" name="postId" value="{$postId}"/>
</div>
</form>
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footer.template"}
Modified: plog/trunk/templates/admin/header.template
===================================================================
--- plog/trunk/templates/admin/header.template 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/admin/header.template 2006-01-06 03:36:17 UTC (rev 2757)
@@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html;charset={$locale->getCharset()}" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta name="generator" content="{$version}" />
-<title>pLog Admin</title>
+<title>LifeType Admin</title>
{if $locale->getDirection()=="rtl"}
<link rel="stylesheet" href="styles/admin-rtl.css" type="text/css" media="screen" />
{else}
@@ -34,7 +34,7 @@
<div id="container" >
<div id="header" >
- <h1><span>pLog Admin</span></h1>
+ <h1><span>LifeType Admin</span></h1>
<!-- link to the blog, opens in new window -->
<a href="{$url->blogLink()}" id="blogLink" target="_blank" title="{$blog->getBlog()}"></a>
</div>
@@ -65,4 +65,4 @@
</select>
</div>
- <div id="content" >
\ No newline at end of file
+ <div id="content" >
Modified: plog/trunk/templates/admin/resourcelist.template
===================================================================
--- plog/trunk/templates/admin/resourcelist.template 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/admin/resourcelist.template 2006-01-06 03:36:17 UTC (rev 2757)
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}"/>
<link rel="stylesheet" href="styles/admin.css" type="text/css" />
- <title>pLog Admin</title>
+ <title>LifeType Admin</title>
{if $htmlarea}
<script type="text/javascript" src="js/tinymce/tiny_mce_popup.js"></script>
<script type="text/javascript">
Modified: plog/trunk/templates/blueish/about.template
===================================================================
--- plog/trunk/templates/blueish/about.template 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/blueish/about.template 2006-01-06 03:36:17 UTC (rev 2757)
@@ -4,7 +4,7 @@
<div class="blogbody">
<h2 class="title">{$locale->tr("about")}</h2>
<div class="posted"><a href="{$url->templatePage("about")}">{$locale->tr("permalink")}</a></div>
- This template is a clone of the 'georgia blue' style found on <a href='http://www.movabletype.org'>MovableType.org</a>. Also check out <a href='http://www.bookofstyles.com'>The Book of Styles</a> for some very cool styles and templates for websites. It was ported to the <a href='http://www.plogworld.net'>plog</a> blogging system by Nick Gerakines, me :), for the blog that i setup for my mom. Its a very simple layout that allows comments, trackback requests and so on. If you like it or find an error somewhere make a post in the <a href='http://forum.socklabs.com'>forum</a> or email me at <a href='mailto:nick at socklabs.com'>nick at socklabs.com</a>.
+ This template is a clone of the 'georgia blue' style found on <a href='http://www.movabletype.org'>MovableType.org</a>. Also check out <a href='http://www.bookofstyles.com'>The Book of Styles</a> for some very cool styles and templates for websites. It was ported to the <a href='http://www.lifetype.net'>LifeType</a> blogging system by Nick Gerakines, me :), for the blog that i setup for my mom. Its a very simple layout that allows comments, trackback requests and so on. If you like it or find an error somewhere make a post in the <a href='http://forum.socklabs.com'>forum</a> or email me at <a href='mailto:nick at socklabs.com'>nick at socklabs.com</a>.
<hr/>
You can change the contents of this page by editing the templates/blueish/about.template file.
</div>
Modified: plog/trunk/templates/grey/footer.template
===================================================================
--- plog/trunk/templates/grey/footer.template 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/grey/footer.template 2006-01-06 03:36:17 UTC (rev 2757)
@@ -58,7 +58,7 @@
</div>
<!-- Please leave the credit intact. Thank you. -->
<div id="Bottom">
-Powered by <a href="http://www.plogworld.net">pLog</a><br/>
+Powered by <a href="http://www.lifetype.net">LifeType</a><br/>
Design by <a href="http://www.bookofstyles.org/">Book of Styles</a><br/>
</div>
</div>
Modified: plog/trunk/templates/misc/email_notifier.template
===================================================================
--- plog/trunk/templates/misc/email_notifier.template 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/misc/email_notifier.template 2006-01-06 03:36:17 UTC (rev 2757)
@@ -1,4 +1,4 @@
-This is pLog's automatic notification system.
+This is LifeType's automatic notification system.
There is a new comment/trackback for post "{$post->getTopic()}". You can see
the new comment/trackback by following this url:
Modified: plog/trunk/templates/standard/footer.template
===================================================================
--- plog/trunk/templates/standard/footer.template 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/standard/footer.template 2006-01-06 03:36:17 UTC (rev 2757)
@@ -78,7 +78,7 @@
<!-- Please leave the credit intact. Thank you. -->
-<div id="Bottom">Powered by <a href="http://www.plogworld.net">pLog</a> - Design by <a href="http://www.balearweb.com/">BalearWeb</a></div>
+<div id="Bottom">Powered by <a href="http://www.lifetype.net">LifeType</a> - Design by <a href="http://www.balearweb.com/">BalearWeb</a></div>
</div>
Modified: plog/trunk/templates/standard/resource.template
===================================================================
--- plog/trunk/templates/standard/resource.template 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/standard/resource.template 2006-01-06 03:36:17 UTC (rev 2757)
@@ -67,7 +67,7 @@
<!-- Please leave the credit intact. Thank you. -->
-<div id="Bottom">Powered by <a href="http://www.plogworld.net">pLog</a> - Design by <a href="http://www.balearweb.com/">BalearWeb</a></div>
+<div id="Bottom">Powered by <a href="http://www.lifetype.net">LifeType</a> - Design by <a href="http://www.balearweb.com/">BalearWeb</a></div>
</div>
</body>
Modified: plog/trunk/templates/standard-with-plugins/footer.template
===================================================================
--- plog/trunk/templates/standard-with-plugins/footer.template 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/standard-with-plugins/footer.template 2006-01-06 03:36:17 UTC (rev 2757)
@@ -176,7 +176,7 @@
<!-- Please leave the credit intact. Thank you. -->
-<div id="Bottom">Powered by <a href="http://www.plogworld.net">pLog</a> - Design by <a href="http://www.balearweb.com/">BalearWeb</a></div>
+<div id="Bottom">Powered by <a href="http://www.lifetype.net">LifeType</a> - Design by <a href="http://www.balearweb.com/">BalearWeb</a></div>
</div>
Modified: plog/trunk/templates/standard-with-plugins/resource.template
===================================================================
--- plog/trunk/templates/standard-with-plugins/resource.template 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/standard-with-plugins/resource.template 2006-01-06 03:36:17 UTC (rev 2757)
@@ -67,7 +67,7 @@
<!-- Please leave the credit intact. Thank you. -->
-<div id="Bottom">Powered by <a href="http://www.plogworld.net">pLog</a> - Design by <a href="http://www.balearweb.com/">BalearWeb</a></div>
+<div id="Bottom">Powered by <a href="http://www.lifetype.net">LifeType</a> - Design by <a href="http://www.balearweb.com/">BalearWeb</a></div>
</div>
</body>
Modified: plog/trunk/templates/summary/blogprofile.template
===================================================================
--- plog/trunk/templates/summary/blogprofile.template 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/summary/blogprofile.template 2006-01-06 03:36:17 UTC (rev 2757)
@@ -20,7 +20,7 @@
<a
href="?op=UserProfile&userId={$owner->getId()}">{$owner->getUsername()|strip_tags}</a>{if $blogUsers},{/if}
{foreach from=$blogUsers item=blogUser name=blogUsersLoop}
- <a href="?op=UserProfile&userId={$owner->getId()}">{$blogUser->getUsername()}</a>{if !$smarty.foreach.blogUsersLoop.last}, {/if}
+ <a href="?op=UserProfile&userId={$blogUser->getId()}">{$blogUser->getUsername()}</a>{if !$smarty.foreach.blogUsersLoop.last}, {/if}
{/foreach}
</p>
<h4>» {$locale->tr("latest_posts")}</h4>
Modified: plog/trunk/templates/summary/blogslist.template
===================================================================
--- plog/trunk/templates/summary/blogslist.template 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/summary/blogslist.template 2006-01-06 03:36:17 UTC (rev 2757)
@@ -23,7 +23,7 @@
<a
href="?op=UserProfile&userId={$owner->getId()}">{$owner->getUsername()|strip_tags}</a>{if $blogUsers},{/if}
{foreach from=$blogUsers item=blogUser name=blogUsersLoop}
- <a href="?op=UserProfile&userId={$owner->getId()}">{$blogUser->getUsername()}</a>{if !$smarty.foreach.blogUsersLoop.last}, {/if}
+ <a href="?op=UserProfile&userId={$blogUser->getId()}">{$blogUser->getUsername()}</a>{if !$smarty.foreach.blogUsersLoop.last}, {/if}
{/foreach}
</div>
{/foreach}
Modified: plog/trunk/templates/summary/rss/blogs_rss20.template
===================================================================
--- plog/trunk/templates/summary/rss/blogs_rss20.template 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/summary/rss/blogs_rss20.template 2006-01-06 03:36:17 UTC (rev 2757)
@@ -5,7 +5,7 @@
<title>Your service title</title>
<description>Your service description</description>
<link>{$url->getBaseUrl(false)}/summary.php</link>
- <generator>pLog 1.0</generator>
+ <generator>LifeType 1.0</generator>
{foreach from=$blogs item=blog}
{assign var=url value=$blog->getBlogRequestGenerator()}
<item>
Modified: plog/trunk/templates/summary/rss/rss20.template
===================================================================
--- plog/trunk/templates/summary/rss/rss20.template 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/summary/rss/rss20.template 2006-01-06 03:36:17 UTC (rev 2757)
@@ -7,7 +7,7 @@
<title>Your service title</title>
<description>Your service description</description>
<link>{$url->getBaseUrl(false)}/summary.php</link>
- <generator>pLog 1.0</generator>
+ <generator>LifeType 1.0</generator>
{foreach from=$posts item=post}
{assign var=blog value=$post->getBlogInfo()}
{assign var=url value=$blog->getBlogRequestGenerator()}
Modified: plog/trunk/templates/wizard/header.template
===================================================================
--- plog/trunk/templates/wizard/header.template 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/wizard/header.template 2006-01-06 03:36:17 UTC (rev 2757)
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="content-type" content="text/html;charset=iso-8859-1" />
<meta http-equiv="Content-Style-Type" content="text/css" />
-<title>pLog Admin</title>
+<title>LifeType Admin</title>
<link rel="stylesheet" href="styles/admin.css" type="text/css" media="screen" />
<link rel="stylesheet" href="styles/wizard.css" type="text/css" media="screen" />
</head>
Modified: plog/trunk/templates/wizard/intro.template
===================================================================
--- plog/trunk/templates/wizard/intro.template 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/wizard/intro.template 2006-01-06 03:36:17 UTC (rev 2757)
@@ -10,7 +10,7 @@
{else}
<div class="wizardInfo">
<img src="imgs/admin/icon_info-16.png" alt="Info" class="wizardInfoIcon" />
- <p class="wizardInfoText">Welcome to the configuration wizard of pLog. This wizard will guide you through the process of installing pLog {$version}
+ <p class="wizardInfoText">Welcome to the configuration wizard of LifeType. This wizard will guide you through the process of installing LifeType {$version}
<br/><br/>
The first thing that it is needed to know
is the information regarding your database configuration. The user that will be used
@@ -18,7 +18,7 @@
and update records. If you also wish to let this wizard create the database and the tables,
it should also have enough permissions to create databases and tables.
<br/><br/>
- This information will be saved to the configuration file used by pLog so you will not need
+ This information will be saved to the configuration file used by LifeType so you will not need
to make any other changes.</p>
</div>
{/if}
@@ -56,8 +56,8 @@
<div class="field">
<label for="dbPrefix">Database prefix</label>
<span class="required">*</span>
- <div class="formHelp">If needed, multiple instances of plog can run in the same database with different passwords, but the default is usually fine.</div>
- <input style="width:100%" type="text" id="dbPrefix" name="dbPrefix" value="{if $dbPrefix==""}plog_{else}{$dbPrefix}{/if}"/>
+ <div class="formHelp">If needed, multiple instances of LifeType can run in the same database with different passwords, but the default is usually fine.</div>
+ <input style="width:100%" type="text" id="dbPrefix" name="dbPrefix" value="{if $dbPrefix==""}lt_{else}{$dbPrefix}{/if}"/>
</div>
</fieldset>
Modified: plog/trunk/templates/wizard/step3.template
===================================================================
--- plog/trunk/templates/wizard/step3.template 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/wizard/step3.template 2006-01-06 03:36:17 UTC (rev 2757)
@@ -10,8 +10,8 @@
{else}
<div class="wizardInfo">
<img src="imgs/admin/icon_info-16.png" alt="Info" class="wizardInfoIcon" />
- <p class="wizardInfoText">At least one user is needed to run pLog and this user will be given administrator privileges. The administrator
- user is allowed to configure pLog from within the administration interface, as well as
+ <p class="wizardInfoText">At least one user is needed to run LifeType and this user will be given administrator privileges. The administrator
+ user is allowed to configure LifeType from within the administration interface, as well as
adding and removing users and blogs, etc.</p>
</div>
{/if}
Modified: plog/trunk/templates/wizard/update4.template
===================================================================
--- plog/trunk/templates/wizard/update4.template 2006-01-05 10:18:56 UTC (rev 2756)
+++ plog/trunk/templates/wizard/update4.template 2006-01-06 03:36:17 UTC (rev 2757)
@@ -22,7 +22,7 @@
not planning to allow internet users to create new blogs in this server, then you should also
remove <b>summary.php</b>.<br/><br/>
Enjoy,<br/>
- <a href="http://www.plogworld.net">The pLog team</a>.
+ <a href="http://www.lifetype.net">The LifeType team</a>.
</p>
</fieldset>
<div class="buttons">
More information about the pLog-svn
mailing list