[pLog-svn] r5333 - in plugins/branches/lifetype-1.2/unported/submissions: . class/action js locale templates
oscar at devel.lifetype.net
oscar at devel.lifetype.net
Mon Apr 23 17:02:00 EDT 2007
Author: oscar
Date: 2007-04-23 17:02:00 -0400 (Mon, 23 Apr 2007)
New Revision: 5333
Added:
plugins/branches/lifetype-1.2/unported/submissions/js/tinymce-submissions.js
Removed:
plugins/branches/lifetype-1.2/unported/submissions/js/htmlarea-submissions.js
Modified:
plugins/branches/lifetype-1.2/unported/submissions/class/action/addsubmissionaction.class.php
plugins/branches/lifetype-1.2/unported/submissions/class/action/adminsubmissionspluginsettingsaction.class.php
plugins/branches/lifetype-1.2/unported/submissions/class/action/adminsubmissionspluginupdatesettingsaction.class.php
plugins/branches/lifetype-1.2/unported/submissions/locale/locale_en_UK.php
plugins/branches/lifetype-1.2/unported/submissions/pluginsubmissions.class.php
plugins/branches/lifetype-1.2/unported/submissions/templates/submitform.template
Log:
Ported the submissions plugin to LT 1.2.
Modified: plugins/branches/lifetype-1.2/unported/submissions/class/action/addsubmissionaction.class.php
===================================================================
--- plugins/branches/lifetype-1.2/unported/submissions/class/action/addsubmissionaction.class.php 2007-04-22 17:59:17 UTC (rev 5332)
+++ plugins/branches/lifetype-1.2/unported/submissions/class/action/addsubmissionaction.class.php 2007-04-23 21:02:00 UTC (rev 5333)
@@ -89,9 +89,9 @@
$customFields = new CustomFields();
$customFieldValues = new CustomFieldsValues();
$submittedBy = $customFields->getCustomFieldByName( $this->_blogInfo->getId(), "submittedBy" );
- $submittedByValue = new CustomFieldValue( $submittedBy->getId(), $this->_userName, "", -1, "", $artId, $this->_blogInfo->getId(), -1 );
+ $submittedByValue = new CustomFieldValue( $submittedBy->getId(), $this->_userName, "", -1, "", -1, $this->_blogInfo->getId(), -1 );
$submitterAddress = $customFields->getCustomFieldByName( $this->_blogInfo->getId(), "submitterAddress" );
- $submitterAddressValue = new CustomFieldValue( $submitterAddress->getId(), $this->_userEmailAddress, "", -1, "", $artId, $this->_blogInfo->getId(), -1 );
+ $submitterAddressValue = new CustomFieldValue( $submitterAddress->getId(), $this->_userEmailAddress, "", -1, "", -1, $this->_blogInfo->getId(), -1 );
$article->setFields( Array( $submittedByValue, $submitterAddressValue ));
// add the article to the db, finally
Modified: plugins/branches/lifetype-1.2/unported/submissions/class/action/adminsubmissionspluginsettingsaction.class.php
===================================================================
--- plugins/branches/lifetype-1.2/unported/submissions/class/action/adminsubmissionspluginsettingsaction.class.php 2007-04-22 17:59:17 UTC (rev 5332)
+++ plugins/branches/lifetype-1.2/unported/submissions/class/action/adminsubmissionspluginsettingsaction.class.php 2007-04-23 21:02:00 UTC (rev 5333)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
lt_include( PLOG_CLASS_PATH."plugins/submissions/class/view/adminsubmissionspluginsettingsview.class.php" );
- class AdminSubmissionsPluginSettingsAction extends BlogOwnerAdminAction
+ class AdminSubmissionsPluginSettingsAction extends AdminAction
{
/**
@@ -12,7 +12,9 @@
*/
function AdminSubmissionsPluginSettingsAction( $actionInfo, $request )
{
- $this->BlogOwnerAdminAction( $actionInfo, $request );
+ $this->AdminAction( $actionInfo, $request );
+
+ $this->requirePermission( "manage_plugins" );
}
/**
Modified: plugins/branches/lifetype-1.2/unported/submissions/class/action/adminsubmissionspluginupdatesettingsaction.class.php
===================================================================
--- plugins/branches/lifetype-1.2/unported/submissions/class/action/adminsubmissionspluginupdatesettingsaction.class.php 2007-04-22 17:59:17 UTC (rev 5332)
+++ plugins/branches/lifetype-1.2/unported/submissions/class/action/adminsubmissionspluginupdatesettingsaction.class.php 2007-04-23 21:02:00 UTC (rev 5333)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
lt_include( PLOG_CLASS_PATH."plugins/submissions/class/view/adminsubmissionspluginsettingsview.class.php" );
lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfield.class.php" );
- class AdminSubmissionsPluginUpdateSettingsAction extends BlogOwnerAdminAction
+ class AdminSubmissionsPluginUpdateSettingsAction extends AdminAction
{
var $_pluginEnabled;
@@ -18,7 +18,9 @@
*/
function AdminSubmissionsPluginUpdateSettingsAction( $actionInfo, $request )
{
- $this->BlogOwnerAdminAction( $actionInfo, $request );
+ $this->AdminAction( $actionInfo, $request );
+
+ $this->requirePermission( "manage_plugins" );
}
function validate()
Deleted: plugins/branches/lifetype-1.2/unported/submissions/js/htmlarea-submissions.js
===================================================================
--- plugins/branches/lifetype-1.2/unported/submissions/js/htmlarea-submissions.js 2007-04-22 17:59:17 UTC (rev 5332)
+++ plugins/branches/lifetype-1.2/unported/submissions/js/htmlarea-submissions.js 2007-04-23 21:02:00 UTC (rev 5333)
@@ -1,28 +0,0 @@
-var submissionTextEditor = null;
-
-// this function will get called at body.onload
-function initEditor() {
-
- // ------------------------------------------------------
- // Create submissionText Editor
- // ------------------------------------------------------
- submissionTextEditor = new HTMLArea("submissionText");
-
- // add our new icon in a place better suited for this task...
- submissionTextEditor.config.toolbar = [
- [ "fontsize", "space","space",
- "bold", "italic", "underline", "strikethrough", "separator",
- "justifyleft", "justifycenter", "justifyright", "justifyfull", "separator",
- "orderedlist", "unorderedlist", "separator",
- "createlink", "insertimage", "htmlmode" ]
- ];
-
- // Generate submissionTextEditor Editor
- setTimeout(function() {submissionTextEditor.generate();}, 1000);
-
- return false;
-};
-
-// Initialize HTMLArea Editor
-HTMLArea.init();
-HTMLArea.onload = initEditor;
\ No newline at end of file
Added: plugins/branches/lifetype-1.2/unported/submissions/js/tinymce-submissions.js
===================================================================
--- plugins/branches/lifetype-1.2/unported/submissions/js/tinymce-submissions.js (rev 0)
+++ plugins/branches/lifetype-1.2/unported/submissions/js/tinymce-submissions.js 2007-04-23 21:02:00 UTC (rev 5333)
@@ -0,0 +1,12 @@
+tinyMCE.init({
+mode : "textareas",
+theme : "advanced",
+theme_advanced_buttons1 : "bold,italic,underline,separator,strikethrough,justifyleft,justifycenter,justifyright, justifyfull,bullist,numlist,undo,redo,link,unlink",
+theme_advanced_buttons2 : "",
+theme_advanced_buttons3 : "",
+theme_advanced_toolbar_location : "top",
+theme_advanced_toolbar_align : "left",
+theme_advanced_path_location : "bottom",
+extended_valid_elements : "a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]",
+plugins: "insertdatetime"
+});
\ No newline at end of file
Modified: plugins/branches/lifetype-1.2/unported/submissions/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.2/unported/submissions/locale/locale_en_UK.php 2007-04-22 17:59:17 UTC (rev 5332)
+++ plugins/branches/lifetype-1.2/unported/submissions/locale/locale_en_UK.php 2007-04-23 21:02:00 UTC (rev 5333)
@@ -5,12 +5,12 @@
$messages["submissions_plugin_enabled"] = "Enable this plugin";
$messages["submissions_plugin"] = "Submissions Plugin";
-$messages["submissions_htmlarea_enabled"] = "Enable the built-in HTMLArea editor";
+$messages["submissions_htmlarea_enabled"] = "Enable the built-in visual editor of HTML code";
$messages["submissions_settings_saved_ok"] = "Submissions settings saved successfully!";
-$messages["error_submissions_not_enabled"] = "Please kindly enable Submissions plugin first.";
-$messages["error_submission_no_topic"] = "Topic Error! Topic should not be empty.";
-$messages["error_submission_no_text"] = "Content Error! Content should not be empty.";
-$messages["error_submission_no_category"] = "Category Error! You need to select at least one or more article cateogries.";
+$messages["error_submissions_not_enabled"] = "Please enable the Submissions plugin first.";
+$messages["error_submission_no_topic"] = "Topic should not be empty.";
+$messages["error_submission_no_text"] = "Content should not be empty.";
+$messages["error_submission_no_category"] = "You need to select at least one or more article cateogries.";
$messages["submission_accepted_ok"] = "Your story was submitted successfully!";
$messages["label_configuration"] = "Configuration";
Modified: plugins/branches/lifetype-1.2/unported/submissions/pluginsubmissions.class.php
===================================================================
--- plugins/branches/lifetype-1.2/unported/submissions/pluginsubmissions.class.php 2007-04-22 17:59:17 UTC (rev 5332)
+++ plugins/branches/lifetype-1.2/unported/submissions/pluginsubmissions.class.php 2007-04-23 21:02:00 UTC (rev 5333)
@@ -19,7 +19,7 @@
$this->id = "submissions";
$this->desc = "Allows visitors to submit stories to the blog.";
$this->author = "The LifeType Project";
- $this->locales = Array();
+ $this->version = "20070423";
$this->init();
}
Modified: plugins/branches/lifetype-1.2/unported/submissions/templates/submitform.template
===================================================================
--- plugins/branches/lifetype-1.2/unported/submissions/templates/submitform.template 2007-04-22 17:59:17 UTC (rev 5332)
+++ plugins/branches/lifetype-1.2/unported/submissions/templates/submitform.template 2007-04-23 21:02:00 UTC (rev 5333)
@@ -1,12 +1,12 @@
{include file="$blogtemplate/header.template"}
{if $submissions->isEnabled()}
{if $submissions->isHtmlareaEnabled()}
- <script type="text/javascript" src="js/htmlarea/htmlarea.js"/></script>
- <script type="text/javascript" src="js/htmlarea/dialog.js"/></script>
- <script type="text/javascript" src="plugins/submissions/js/htmlarea-submissions.js"/></script>
+ <script type="text/javascript" src="{$url->getBaseUrl()}/js/tinymce/tiny_mce_gzip.php"></script>
+ <script type="text/javascript" src="{$url->getBaseUrl()}/plugins/submissions/js/tinymce-submissions.js"/></script>
{else}
- <link rel="stylesheet" href="js/editor/plogeditor.css" type="text/css" />
- <script type="text/javascript" src="js/editor/plogeditor.js"></script>
+ <link rel="stylesheet" href="{$url->getBaseUrl()}/js/editor/lifetypeeditor.css" type="text/css" />
+ <script type="text/javascript" src="{$url->getBaseUrl()}/js/ui/core.js"></script>
+ <script type="text/javascript" src="{$url->getBaseUrl()}/js/editor/lifetypeeditor.js"></script>
{/if}
{if $errors}
<p style="color: red">
@@ -14,13 +14,13 @@
</p>
{/if}
<form name="submission" method="post" action="{$url->getIndexUrl()}">
- <label for="userName">{$locale->tr("your_name")}</label>
+ <label for="userName" style="text-align:left">{$locale->tr("your_name")}</label>
<input type="text" name="userName" value="{$userName}" style="width:100%" /><br/>
- <label for="userEmailAddress">{$locale->tr("your_email_address")}</label>
+ <label for="userEmailAddress" style="text-align:left">{$locale->tr("your_email_address")}</label>
<input type="text" name="userEmailAddress" value="{$userEmailAddress}" style="width:100%" /><br/>
- <label for="submissionTopic">{$locale->tr("story_topic")}</label>
+ <label for="submissionTopic" style="text-align:left">{$locale->tr("story_topic")}</label>
<input type="text" name="submissionTopic" value="{$submissionTopic}" style="width:100%" /><br/>
{if $errors.submissionTopic}<span style="background:red;color:white;font-weight:bold"> ! </span> {$message.submissionTopic}</p>{/if}
<br/>
@@ -29,14 +29,14 @@
<div>
<div style="width:68%;float:left;padding-right:2%">
{$locale->tr("story_contents")}<br/>
- {if !$submissions->isHtmlareaEnabled()}<script type="text/javascript">var ed1 = new pLogEditor('submissionText','ed1');</script>{/if}
+ {if !$submissions->isHtmlareaEnabled()}<script type="text/javascript">var ed1 = new Lifetype.UI.Editor('submissionText','ed1');</script>{/if}
<textarea rows="15" id="submissionText" name="submissionText" style="width:100%">{$submissionText}</textarea><br/>
{if $errors.submissionText}<span style="background:red;color:white;font-weight:bold"> ! </span> {$message.submissionText}</p><br/>{/if}
<br/>
</div>
<div style="width:29%;float:right;height:100%">
- {$locale->tr("category")}<br/>
+ {$locale->tr("categories")}<br/>
<select name="submissionCategory[]" multiple="multiple" style="width:100%" size="15">
{foreach from=$articlecategories item=category}
<option value="{$category->getId()}">{$category->getName()}</option>
More information about the pLog-svn
mailing list