[geeklog-hg] geeklog: fckeditor js now only loaded when needed. Removed inlin...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Mon Jul 2 09:28:39 EDT 2012
changeset 8755:ba34a3370b9a
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/ba34a3370b9a
user: Tom <websitemaster at cogeco.net>
date: Fri Jun 29 20:26:14 2012 -0400
description:
fckeditor js now only loaded when needed. Removed inline js from advance submission forms.
diffstat:
public_html/admin/plugins/staticpages/index.php | 1 +
public_html/admin/story.php | 1 +
public_html/layout/denim/submit/submitstory_advanced.thtml | 97 ++++----
public_html/layout/modern_curve/submit/submitstory_advanced.thtml | 111 ++++-----
public_html/layout/professional/submit/submitstory_advanced.thtml | 102 ++++----
public_html/layout/professional_css/submit/submitstory_advanced.thtml | 111 ++++-----
public_html/submit.php | 19 +-
system/classes/scripts.class.php | 7 +-
system/lib-comment.php | 1 +
9 files changed, 224 insertions(+), 226 deletions(-)
diffs (truncated from 542 to 300 lines):
diff -r 06b4b09e3046 -r ba34a3370b9a public_html/admin/plugins/staticpages/index.php
--- a/public_html/admin/plugins/staticpages/index.php Fri Jun 29 09:14:46 2012 -0400
+++ b/public_html/admin/plugins/staticpages/index.php Fri Jun 29 20:26:14 2012 -0400
@@ -103,6 +103,7 @@
$sp_template->set_var('noscript', COM_getNoScript(false, '', $link_message));
// Add JavaScript
+ $_SCRIPTS->setJavaScriptFile('fckeditor','/fckeditor/fckeditor.js');
$js = 'geeklogEditorBasePath = "' . $_CONF['site_url'] . '/fckeditor/";';
// Hide the Advanced Editor as Javascript is required. If JS is enabled then the JS below will un-hide it
$js .= 'document.getElementById("advanced_editor").style.display="";';
diff -r 06b4b09e3046 -r ba34a3370b9a public_html/admin/story.php
--- a/public_html/admin/story.php Fri Jun 29 09:14:46 2012 -0400
+++ b/public_html/admin/story.php Fri Jun 29 20:26:14 2012 -0400
@@ -771,6 +771,7 @@
document.getElementById("advanced_editor").style.display=""
</script>';
+ $_SCRIPTS->setJavaScriptFile('fckeditor','/fckeditor/fckeditor.js');
$_SCRIPTS->setJavaScriptFile('advanced_editor', '/javascript/advanced_editor.js');
$_SCRIPTS->setJavaScriptFile('storyeditor_fckeditor', '/javascript/storyeditor_fckeditor.js');
}
diff -r 06b4b09e3046 -r ba34a3370b9a public_html/layout/denim/submit/submitstory_advanced.thtml
--- a/public_html/layout/denim/submit/submitstory_advanced.thtml Fri Jun 29 09:14:46 2012 -0400
+++ b/public_html/layout/denim/submit/submitstory_advanced.thtml Fri Jun 29 20:26:14 2012 -0400
@@ -1,57 +1,52 @@
<!-- submit/submitstory_advanced.thtml { -->
-<script type="text/javascript">
- <!--
- // Setup editor path for FCKeditor JS Functions
- geeklogEditorBasePath = "{site_url}/fckeditor/";
- -->
-</script>
-<script type="text/JavaScript" src="{site_url}/javascript/submitstory_fckeditor.js"></script>
-
-<form action="{site_url}/submit.php" method="post" onSubmit='set_postcontent();' id="submitstory" class="compact">
-
- <div class="user_basic">
- <dl class="form_block">
- <dt>{lang_username}</dt>
- <dd>{story_username} [ <a href="{status_url}" rel="nofollow">{lang_loginout}</a>{separator}{create_account} ]</dd>
-
- <dt><label for="submitstory_advanced-title">{lang_title}</label></dt>
- <dd><input type="text" maxlength="96" value="{story_title}" name="title" id="submitstory_advanced-title" class="size5"{xhtml}></dd>
-
- <dt><label>{lang_topic}</label></dt>
- <dd>{topic_selection}</dd>
-
- <dt><label for="introtext">{lang_story}</label></dt>
- <dd>
- <div class="text_editor" style="display: {show_texteditor};">
- <textarea cols="45" rows="15" name="introtext" id="introtext" class="wide">{story_introtext}</textarea>
+{noscript}
+<div id="advanced_editor" style="display:none;">
+ <form action="{site_url}/submit.php" method="post" onSubmit='set_postcontent();' id="submitstory" class="compact">
+
+ <div class="user_basic">
+ <dl class="form_block">
+ <dt>{lang_username}</dt>
+ <dd>{story_username} [ <a href="{status_url}" rel="nofollow">{lang_loginout}</a>{separator}{create_account} ]</dd>
+
+ <dt><label for="submitstory_advanced-title">{lang_title}</label></dt>
+ <dd><input type="text" maxlength="96" value="{story_title}" name="title" id="submitstory_advanced-title" class="size5"{xhtml}></dd>
+
+ <dt><label>{lang_topic}</label></dt>
+ <dd>{topic_selection}</dd>
+
+ <dt><label for="introtext">{lang_story}</label></dt>
+ <dd>
+ <div class="text_editor" style="display: {show_texteditor};">
+ <textarea cols="45" rows="15" name="introtext" id="introtext" class="wide">{story_introtext}</textarea>
+ </div>
+ <div class="html_editor" style="display: {show_htmleditor};">
+ <textarea cols="45" rows="15" name="introhtml" id="introhtml" class="wide">{story_introtext}</textarea>
+ </div>
+ </dd>
+
+ <dt><label for="submitstory_advanced-postmode">{lang_postmode}</label></dt>
+ <dd>
+ <select name="postmode" id="sel_editmode" {change_editormode}>
+ {story_postmode_options}
+ </select>
+ </dd>
+ <dd class="description">{allowed_html}</dd>
+ </dl>
+
+ {captcha}
+
+ <div class="submit">
+ <input name="mode" type="submit" value="{lang_preview}" class="submit"{xhtml}>
+ <input type="hidden" name="type" value="story"{xhtml}>
+ <input type="hidden" name="uid" value="{story_uid}"{xhtml}>
+ <input type="hidden" name="sid" value="{story_sid}"{xhtml}>
+ <input type="hidden" name="date" value="{story_date}"{xhtml}>
+ {save_button}
</div>
- <div class="html_editor" style="display: {show_htmleditor};">
- <textarea cols="45" rows="15" name="introhtml" id="introhtml" class="wide">{story_introtext}</textarea>
- </div>
- </dd>
-
- <dt><label for="submitstory_advanced-postmode">{lang_postmode}</label></dt>
- <dd>
- <select name="postmode" id="sel_editmode" {change_editormode}>
- {story_postmode_options}
- </select>
- </dd>
- <dd class="description">{allowed_html}</dd>
- </dl>
-
- {captcha}
-
- <div class="submit">
- <input name="mode" type="submit" value="{lang_preview}" class="submit"{xhtml}>
- <input type="hidden" name="type" value="story"{xhtml}>
- <input type="hidden" name="uid" value="{story_uid}"{xhtml}>
- <input type="hidden" name="sid" value="{story_sid}"{xhtml}>
- <input type="hidden" name="date" value="{story_date}"{xhtml}>
- {save_button}
- </div>
- </div>
-</form>
+ </div>
+ </form>
+</div>
<!-- } submit/submitstory_advanced.thtml -->
diff -r 06b4b09e3046 -r ba34a3370b9a public_html/layout/modern_curve/submit/submitstory_advanced.thtml
--- a/public_html/layout/modern_curve/submit/submitstory_advanced.thtml Fri Jun 29 09:14:46 2012 -0400
+++ b/public_html/layout/modern_curve/submit/submitstory_advanced.thtml Fri Jun 29 20:26:14 2012 -0400
@@ -1,64 +1,59 @@
<!-- submit/submitstory_advanced.thtml { -->
-<script type="text/javascript">
- <!--
- // Setup editor path for FCKeditor JS Functions
- geeklogEditorBasePath = "{site_url}/fckeditor/";
- -->
-</script>
-<script type="text/JavaScript" src="{site_url}/javascript/submitstory_fckeditor.js"></script>
-
-<form action="{site_url}/submit.php" method="post" onSubmit='set_postcontent();' id="submitstory_advanced" class="compact">
-
- <div class="user_basic">
- <dl>
- <dt>{lang_username}</dt>
- <dd>{story_username}
- <ul class="navi">
- <li><a href="{status_url}" rel="nofollow">{lang_loginout}</a></li>
- <li>{create_account}</li>
+{noscript}
+<div id="advanced_editor" style="display:none;">
+ <form action="{site_url}/submit.php" method="post" onSubmit='set_postcontent();' id="submitstory_advanced" class="compact">
+
+ <div class="user_basic">
+ <dl>
+ <dt>{lang_username}</dt>
+ <dd>{story_username}
+ <ul class="navi">
+ <li><a href="{status_url}" rel="nofollow">{lang_loginout}</a></li>
+ <li>{create_account}</li>
+ </ul>
+ </dd>
+
+ <dt><label for="submitstory_advanced-title">{lang_title}</label></dt>
+ <dd><input type="text" size="36" maxlength="96" value="{story_title}" name="title" id="submitstory_advanced-title" class="text"{xhtml}></dd>
+
+ <dt><label for="submitstory_advanced-tid">{lang_topic}</label></dt>
+ <dd>{topic_selection}</dd>
+
+ <dt><label for="introtext">{lang_story}</label></dt>
+ <dd>
+ <div id="text_editor" style="display: {show_texteditor};">
+ <textarea cols="45" rows="15" name="introtext" id="introtext">{story_introtext}</textarea>
+ </div>
+ <div id="html_editor" style="display: {show_htmleditor};">
+ <textarea cols="45" rows="15" name="introhtml" id="introhtml">{story_introtext}</textarea>
+ </div>
+ </dd>
+
+ <dt><label for="submitstory_advanced-postmode">{lang_postmode}</label></dt>
+ <dd>
+ <select name="postmode" id="sel_editmode" {change_editormode}>
+ {story_postmode_options}
+ </select>
+ </dd>
+ <dd class="description">{allowed_html}</dd>
+ </dl>
+
+ {captcha}
+
+ <ul class="submit">
+ <li><input name="mode" type="submit" value="{lang_preview}" class="submit"{xhtml}></li>
+ <li>
+ <input type="hidden" name="type" value="story"{xhtml}>
+ <input type="hidden" name="uid" value="{story_uid}"{xhtml}>
+ <input type="hidden" name="sid" value="{story_sid}"{xhtml}>
+ <input type="hidden" name="date" value="{story_date}"{xhtml}>
+ {save_button}
+ </li>
</ul>
- </dd>
-
- <dt><label for="submitstory_advanced-title">{lang_title}</label></dt>
- <dd><input type="text" size="36" maxlength="96" value="{story_title}" name="title" id="submitstory_advanced-title" class="text"{xhtml}></dd>
-
- <dt><label for="submitstory_advanced-tid">{lang_topic}</label></dt>
- <dd>{topic_selection}</dd>
-
- <dt><label for="introtext">{lang_story}</label></dt>
- <dd>
- <div id="text_editor" style="display: {show_texteditor};">
- <textarea cols="45" rows="15" name="introtext" id="introtext">{story_introtext}</textarea>
- </div>
- <div id="html_editor" style="display: {show_htmleditor};">
- <textarea cols="45" rows="15" name="introhtml" id="introhtml">{story_introtext}</textarea>
- </div>
- </dd>
-
- <dt><label for="submitstory_advanced-postmode">{lang_postmode}</label></dt>
- <dd>
- <select name="postmode" id="sel_editmode" {change_editormode}>
- {story_postmode_options}
- </select>
- </dd>
- <dd class="description">{allowed_html}</dd>
- </dl>
-
- {captcha}
-
- <ul class="submit">
- <li><input name="mode" type="submit" value="{lang_preview}" class="submit"{xhtml}></li>
- <li>
- <input type="hidden" name="type" value="story"{xhtml}>
- <input type="hidden" name="uid" value="{story_uid}"{xhtml}>
- <input type="hidden" name="sid" value="{story_sid}"{xhtml}>
- <input type="hidden" name="date" value="{story_date}"{xhtml}>
- {save_button}
- </li>
- </ul>
- </div>
-</form>
+ </div>
+ </form>
+</div>
<!-- } submit/submitstory_advanced.thtml -->
diff -r 06b4b09e3046 -r ba34a3370b9a public_html/layout/professional/submit/submitstory_advanced.thtml
--- a/public_html/layout/professional/submit/submitstory_advanced.thtml Fri Jun 29 09:14:46 2012 -0400
+++ b/public_html/layout/professional/submit/submitstory_advanced.thtml Fri Jun 29 20:26:14 2012 -0400
@@ -1,52 +1,50 @@
- <script type="text/javascript">
- // Setup editor path for FCKeditor JS Functions
- geeklogEditorBasePath = "{site_url}/fckeditor/" ;
- </script>
- <script type="text/JavaScript" src="{site_url}/javascript/submitstory_fckeditor.js"></script>
- <form action="{site_url}/submit.php" method="post" onsubmit='set_postcontent();'>
- <table cellspacing="0" cellpadding="3">
- <tr>
- <td class="alignright"><b>{lang_username}:</b></td>
- <td>{story_username} [ <a href="{status_url}" rel="nofollow">{lang_loginout}</a>{separator}{create_account} ]</td>
- </tr>
- <tr>
- <td class="alignright"><b>{lang_title}:</b></td>
- <td><input type="text" size="36" maxlength="96" name="title" value="{story_title}"{xhtml}></td>
- </tr>
- <tr>
- <td class="alignright" style="vertical-align:top;"><b>{lang_topic}:</b></td>
- <td>{topic_selection}</td>
- </tr>
- <tr>
- <td class="alignright" style="vertical-align:top;"><b>{lang_story}:</b></td>
- <td style="vertical-align:top;">
- <div id="text_editor" style="display:{show_texteditor};">
- <textarea id="introtext" name="introtext" cols="45" rows="15">{story_introtext}</textarea>
- </div>
- <div id="html_editor" style="display:{show_htmleditor};">
- <textarea id="introhtml" name="introhtml" cols="45" rows="15">{story_introtext}</textarea>
- </div>
- </td>
- </tr>
- <tr>
- <td class="alignright" style="vertical-align:top;"><b>{lang_postmode}:</b></td>
- <td style="vertical-align:top;">
- <select id="sel_editmode" name="postmode" {change_editormode}>
- {story_postmode_options}
- </select>
- <br{xhtml}>{allowed_html}
- </td>
- </tr>
- {captcha}
- <tr>
- <td class="aligncenter" colspan="2">
- <input type="hidden" name="type" value="story"{xhtml}>
- <input type="hidden" name="uid" value="{story_uid}"{xhtml}>
- <input type="hidden" name="sid" value="{story_sid}"{xhtml}>
- <input type="hidden" name="date" value="{story_date}"{xhtml}>
More information about the geeklog-cvs
mailing list