{$locale->tr("story_contents")}
- {if !$submissions->isHtmlareaEnabled()}{/if} + {if !$submissions->isHtmlareaEnabled()}{/if}
{if $errors.submissionText} ! {$message.submissionText}

{/if}
From jondaley at devel.lifetype.net Thu Dec 15 11:34:01 2011 From: jondaley at devel.lifetype.net (jondaley at devel.lifetype.net) Date: Thu, 15 Dec 2011 11:34:01 -0500 Subject: [pLog-svn] r7164 - in plog/branches/lifetype-1.2: . templates/admin Message-ID: <20111215163401.8492A6DD63@tangerine.limedaley.com> Author: jondaley Date: 2011-12-15 11:34:01 -0500 (Thu, 15 Dec 2011) New Revision: 7164 Modified: plog/branches/lifetype-1.2/.htaccess plog/branches/lifetype-1.2/runtests.php plog/branches/lifetype-1.2/templates/admin/editpost.template Log: I forgot to remove the text links in the edit post template Modified: plog/branches/lifetype-1.2/.htaccess =================================================================== --- plog/branches/lifetype-1.2/.htaccess 2011-12-15 16:28:28 UTC (rev 7163) +++ plog/branches/lifetype-1.2/.htaccess 2011-12-15 16:34:01 UTC (rev 7164) @@ -6,84 +6,47 @@ deny from all -Options -Indexes -Options +FollowSymLinks +RewriteEngine On +RewriteBase /plog - +RewriteRule ^subscribe$ index.php?op=subscribe [L] -RewriteEngine On -RewriteBase / +#RewriteCond %{REMOTE_HOST} !orange.limedaley.com +#RewriteRule .* /temporary_failure.html [L] + +Deny from 109.230.216.79 + + # Point to the sitemap file that is local to the blog. This is a Plugin # specific rewrite rule and can safely be commented out, if you are not using # the Sitemap plugin (http://wiki.lifetype.net/index.php/Plugin_sitemap). RewriteRule ^sitemap([0-9]+)\.gz$ tmp/sitemap/$1/sitemap.gz [L,NC] -# Permalink to the blog entry (i.e. /1_userfoo/archive/3_title-foo-bar.html) -RewriteRule ^([0-9]+)_[^/]+/archive/([0-9]+)_[^.]+\.html$ index.php?op=ViewArticle&blogId=$1&articleId=$2 [L,NC] -# -- same as above but with paging included -RewriteRule ^([0-9]+)_[^/]+/archive/([0-9]+)_[^.]+\.html\.page\.([0-9]+)$ index.php?op=ViewArticle&blogId=$1&articleId=$2&page=$3 [L,NC] +# old category name +RewriteRule ^category/internet(-|_)stuff(.*) /plog/category/internet$2 [R=permanent,L] -# Monthly archive (i.e. /1_userfoo/archive/200401.html) -RewriteRule ^([0-9]+)_[^/]+/archive/([0-9]{6})\.html$ index.php?blogId=$1&Date=$2 [L,NC] -# -- same as above but with paging included -RewriteRule ^([0-9]+)_[^/]+/archive/([0-9]{6})\.html\.page\.([0-9]+)$ index.php?blogId=$1&Date=$2&page=$3 [L,NC] +# old links +RewriteRule ^content(.*) /plog/static$1 [R=permanent,L] -# Daily archive (i.e. /1_blogfoo/archive/20040101.html) -RewriteRule ^([0-9]+)_[^/]+/archive/([0-9]{8})\.html$ index.php?blogId=$1&Date=$2 [L,NC] -# -- same as above but with paging included -RewriteRule ^([0-9]+)_[^/]+/archive/([0-9]{8})\.html\.page\.([0-9]+)$ index.php?blogId=$1&Date=$2&page=$3 [L,NC] +RewriteCond %{REQUEST_URI} ^/plog/(category|archives)/[^_]+_ +RewriteRule ^([^_]+)_(.*)$ $1-$2 [R=permanent,L] -# Album (i.e. /88_userfoo/albums/34_title-foo-bar.html) -RewriteRule ^([0-9]+)_[^/]+/albums/([0-9]+)_[^.]+\.html$ index.php?op=ViewAlbum&blogId=$1&albumId=$2 [L,NC] -# -- same as above but with paging included -RewriteRule ^([0-9]+)_[^/]+/albums/([0-9]+)_[^.]+\.html\.page\.([0-9]+)$ index.php?op=ViewAlbum&blogId=$1&albumId=$2&page=$3 [L,NC] +RewriteRule ^category/programming(.*) http://limedaley.com/category/blog$2 [R=permanent,L] +RewriteRule ^jonathan/?$ /plog/category/jonathan [R,L] +RewriteRule ^isaac/?$ /plog/category/isaac [R,L] +RewriteRule ^(1|jondaley)/?$ /plog/ [R,L] -# Albums (i.e. /88_userfoo/albums/) -RewriteRule ^([0-9]+)_[^/]+/albums/$ index.php?op=ViewAlbum&blogId=$1&albumId=0 [L,NC] +############################### +## catch all to avoid errors in the error.log +#RewriteCond %{REQUEST_URI} !^/plog/error.php +#RewriteCond %{REQUEST_URI} !^/plog/admin.php +#RewriteCond %{REQUEST_URI} !^/plog/index.php +#RewriteCond %{REQUEST_URI} !^/plog/templates +#RewriteCond %{REQUEST_URI} !^/plog/files +#RewriteRule (.*) /plog/error.php [L] +############################### -# Category view (i.e. /88_userfoo/categories/4_cat-foobar.html) -RewriteRule ^([0-9]+)_[^/]+/categories/([0-9]+)_[^.]+\.html$ index.php?blogId=$1&postCategoryId=$2 [L,NC] -# -- same as above but with paging included -RewriteRule ^([0-9]+)_[^/]+/categories/([0-9]+)_[^.]+\.html\.page\.([0-9]+)$ index.php?blogId=$1&postCategoryId=$2&page=$3 [L,NC] - -# Category-Feeds (i.e. /3_userfoo/feeds/categories/2_category/atom) -RewriteRule ^([0-9]+)_[^/]+/feeds/categories/([0-9]+)_[^.]+/(.*)$ rss.php?blogId=$1&categoryId=$2&profile=$3 [L,NC] - -# Feeds (i.e. /3_userfoo/feeds/atom) -RewriteRule ^([0-9]+)_[^/]+/feeds/(.*)$ rss.php?blogId=$1&profile=$2 [L,NC] - -# Trackbacks (i.e. /3_userfoo/trackbacks/34_title-foo-bar.html) -RewriteRule ^([0-9]+)_[^/]+/trackbacks/([0-9]+)_[^.]+\.html$ index.php?op=Trackbacks&blogId=$1&articleId=$2 [L,NC] - -# Comment form (i.e. /88_userfoo/comment/34_title-foo-bar.html) -RewriteRule ^([0-9]+)_[^/]+/comment/([0-9]+)_[^.]+\.html$ index.php?op=Comment&blogId=$1&articleId=$2 [L,NC] - -# Resources (i.e. /88_userfoo/resources/this-is-a-resource-name.pdf.html) -RewriteRule ^([0-9]+)_[^/]+/resources/([^.]+)\.([^.]+)\.html$ index.php?op=ViewResource&blogId=$1&resource=$2.$3 [L,NC] - -# Download a resource (i.e. /88_userfoo/get/this-is-a-resource-name.pdf) -RewriteRule ^([0-9]+)_[^/]+/get/(.+)$ resserver.php?blogId=$1&resource=$2 [L,NC] - -# Static Pages (i.e /3_userfoo/demosites) -RewriteRule ^([0-9]+)_[^/]+/(.+)$ index.php?op=Template&blogId=$1&show=$2 [L,NC] - -# A non-default blog (i.e. /88_userfoo) -RewriteRule ^([0-9]+)_[^.]+$ index.php?blogId=$1 [L,NC] -# -- same as above but with paging included -RewriteRule ^([0-9]+)_[^.]+\.page\.([0-9]+)$ index.php?blogId=$1&page=$2 [L,NC] - -# If you would like to use custom urls but ForceType or SetType directives do -# not work on your server (e.g. PHP is running as CGI/FastCGI) you may uncomment -# the rewrite rule below to rewrite all requests to ./blog to ./blog.php. -# Please note that this works only as long as you don't change the default -# custom url patterns in your LifeType administration. -## RewriteRule ^blog/(.+) blog.php/$1 [L,NC] - - - - - ForceType application/x-httpd-php @@ -140,6 +103,6 @@ ForceType application/x-httpd-php -ErrorDocument 401 /error.php -ErrorDocument 403 /error.php -ErrorDocument 404 /error.php +ErrorDocument 401 /plog/error.php +ErrorDocument 403 /plog/error.php +ErrorDocument 404 /plog/error.php Modified: plog/branches/lifetype-1.2/runtests.php =================================================================== --- plog/branches/lifetype-1.2/runtests.php 2011-12-15 16:28:28 UTC (rev 7163) +++ plog/branches/lifetype-1.2/runtests.php 2011-12-15 16:34:01 UTC (rev 7164) @@ -1,6 +1,6 @@ {$locale->tr("text_help")}

{if !$htmlarea}{/if} - {$locale->tr("insert_media")} | - {$locale->tr("insert_more")} + {if !$htmlarea} + {$locale->tr("insert_media")} | + {$locale->tr("insert_more")} + {/if} {include file="$admintemplatepath/validate.template" field=postText message=$locale->tr("error_missing_post_text")}

Lifetype Javascript Sample