Page MenuHomeIn-Portal Phabricator

advanced
No OneTemporary

File Metadata

Created
Thu, Feb 13, 1:06 AM

advanced

Index: branches/1.3.x/maintenance.tpl
===================================================================
--- branches/1.3.x/maintenance.tpl (revision 15965)
+++ branches/1.3.x/maintenance.tpl (revision 15966)
@@ -1,193 +1,193 @@
<!--##
<NAME>Maintenance Mode</NAME>
<DESC></DESC>
<SECTION>Platform</SECTION>
##-->
<inp2:m_NoDebug/>
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_MaintenanceMode" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
</div>
</div>
</inp2:m_DefineElement>
<!--## //SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="add_to_head">
<meta name="robots" content="noindex, nofollow">
<meta http-equiv="refresh" content="120; url=<inp2:m_if check='m_Get' name='next_template'><inp2:m_Get name='next_template'/><inp2:m_else/><inp2:m_Link template='index' m_cat_id='0'/></inp2:m_if>">
<script type="text/javascript">
var a_parent = window.parent,
to_close = new Array (),
$modal_windows = <inp2:m_if check="adm_UsePopups" mode="modal">true<inp2:m_else/>false</inp2:m_if>;
function getFrame($name) {
var $main_window = window;
// 1. cycle through popups to get main window
try {
// will be error, when other site is opened in parent window
var $i = 0;
var $opener;
do {
if ( $i == 10 ) {
break;
}
// get popup opener
$opener = $main_window.opener;
if ( !$opener ) {
// when no opener found, then try parent window
$opener = $main_window.parent;
}
if ( $opener ) {
$main_window = $opener;
}
$i++;
} while ($opener);
}
catch (err) {
// catch Access/Permission Denied error
return window;
}
var $frameset = $main_window.parent.frames;
for ($i = 0; $i < $frameset.length; $i++) {
if ( $frameset[$i].name == $name ) {
return $frameset[$i];
}
}
return $main_window.parent;
}
function getWindowOpener($window) {
// use this instead of "window.opener"
if ( !$modal_windows ) {
return $window.opener;
}
if ( $window.name == 'main' || $window.name == 'main_frame' ) {
return null;
}
return getFrame('main').TB.findWindow($window.name, -1);
}
function redirect() {
var $main_frame = getFrame('main');
a_parent = window;
try {
var i = 0;
while (i < 10) {
i++;
var $opener = $main_frame.getWindowOpener(a_parent);
if ( $opener ) {
to_close.push(a_parent);
a_parent = $opener;
continue;
}
if ( a_parent.name == 'main_frame' ) {
break;
}
if ( a_parent.parent && a_parent.parent.name != a_parent.name ) {
a_parent = a_parent.parent;
continue;
}
}
}
catch (err) {
// another website is opened in parent window
alert('Error while trying to access window opener: [' + err.message + ']');
i = 10;
}
if ( i < 10 ) {
setTimeout(close_windows, 100);
}
}
function window_close($close_callback) {
// use this instead of "window.close();"
if ( !$modal_windows ) {
if ( $.isFunction($close_callback) ) {
// use close callback, because iframe will be removed later in this method
$close_callback();
}
window.close();
return;
}
if ( window.name == 'main' ) {
return;
}
if ( $close_callback !== undefined ) {
return getFrame('main').TB.remove(null, $close_callback);
}
return getFrame('main').TB.remove();
}
function close_windows() {
- page = '<inp2:m_Link template="login" js_escape="1" no_amp="1" index_file="admin/index.php" __NO_REWRITE__="1" m_cat_id="0" m_wid=""/>';
+ page = '<inp2:m_Link template="login" index_file="admin/index.php" __NO_REWRITE__="1" m_cat_id="0" m_wid="" no_amp="1" js_escape="1"/>';
a_parent.location.href = page;
for (var c = (to_close.length - 1); c >= 0; c--) {
window_close(to_close[c]);
}
}
if ( window.top.frames.length > 0 ) {
redirect();
}
</script>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MaintenanceMode" templates="maintenance"/>
</div>
<div class="movable-element">
<!-- MAINTENANCE MODE -->
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_MaintenanceMode"/>
</inp2:m_Capture>
<inp2:m_GetConfig name="MaintenanceMessageFront"/>
</inp2:m_RenderElement>
<!-- // MAINTENANCE MODE -->
</div>
</div>
</inp2:m_DefineElement>
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/1.3.x/in-bulletin/my_account/private_messages/new_message.tpl
===================================================================
--- branches/1.3.x/in-bulletin/my_account/private_messages/new_message.tpl (revision 15965)
+++ branches/1.3.x/in-bulletin/my_account/private_messages/new_message.tpl (revision 15966)
@@ -1,76 +1,76 @@
<!--##
<NAME>Write Private Message</NAME>
<DESC>Write Private Message Form</DESC>
<SECTION>My Account||Private Messages</SECTION>
##-->
<inp2:m_RequireLogin login_template="platform/login/register"/>
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_NewPrivateMessage" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="in-bulletin/elements/side_boxes/action_box.elm" design="blue_box"/>
</div>
</div>
</inp2:m_DefineElement>
<!--## //SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_PrivateMessages,lu_title_NewPrivateMessage" templates="platform/my_account/my_account,in-bulletin/my_account/private_messages/private_messages,in-bulletin/my_account/private_messages/new_message"/>
</div>
<div class="movable-element">
<!-- new private message -->
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_NewPrivateMessage"/>
</inp2:m_Capture>
<inp2:private-message_PresetFormFields/>
<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
<inp2:m_if check="private-message_HasError" field="any">
<inp2:m_RenderElement name="error_message" />
</inp2:m_if>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
<inp2:m_include template="in-bulletin/elements/forms.elm"/>
<form method="post" action="<inp2:m_FormAction/>">
<table class="form-data fullwidth">
<inp2:m_RenderElement name="inp_edit_box" prefix="private-message" field="ToId" title="lu_fld_To"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="private-message" field="Subject" title="lu_fld_Subject"/>
<inp2:m_RenderElement name="inp_edit_textarea_bb" prefix="private-message" field="Body" cols="50" rows="10" title="lu_fld_MessageBody"/>
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="private-message" field="DisableBBCodes" title="lu_fld_DisableBBCodes"/>
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="private-message" field="DisableSmileys" title="lu_fld_DisableSmileys"/>
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="private-message" field="ShowSignatures" title="lu_fld_ShowSignatures" is_last="1"/>
<inp2:m_RenderElement design="inp_edit_buttons">
<input type="hidden" name="next_template" value="in-bulletin/my_account/private_messages/add_confirm"/>
<input class="button" type="submit" name="events[private-message][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Create" no_editing="1"/>"/>
- <input class="button" type="button" onclick="redirect('<inp2:m_Link template="in-bulletin/my_account/private_messages/private_messages"/>');" value="<inp2:m_Phrase label="lu_btn_Cancel" no_editing="1"/>"/>
+ <input class="button" type="button" onclick="redirect('<inp2:m_Link template="in-bulletin/my_account/private_messages/private_messages" no_amp="1" js_escape="1"/>');" value="<inp2:m_Phrase label="lu_btn_Cancel" no_editing="1"/>"/>
</inp2:m_RenderElement>
</table>
</form>
</inp2:m_RenderElement>
<!-- // new private message -->
</div>
</div>
</inp2:m_DefineElement>
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/1.3.x/in-bulletin/topics/new_topic.tpl
===================================================================
--- branches/1.3.x/in-bulletin/topics/new_topic.tpl (revision 15965)
+++ branches/1.3.x/in-bulletin/topics/new_topic.tpl (revision 15966)
@@ -1,81 +1,81 @@
<!--##
<NAME>New Topic</NAME>
<DESC>New Topic Form</DESC>
<SECTION>Platform||Topics</SECTION>
##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_NewTopic" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="in-bulletin/elements/side_boxes/action_box.elm" design="blue_box"/>
</div>
</div>
</inp2:m_DefineElement>
<!--## //SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_NewTopic" templates="in-bulletin/topics/new_topic" show_category="1"/>
</div>
<div class="movable-element">
<!-- new topic -->
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_NewTopic"/>
</inp2:m_Capture>
<inp2:m_if check="bb_HasPermission" permissions="TOPIC.ADD|TOPIC.ADD.PENDING">
<inp2:bb_PresetFormFields/>
<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
<inp2:m_if check="bb_HasError" field="any">
<inp2:m_RenderElement name="error_message" />
</inp2:m_if>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
<inp2:m_include template="in-bulletin/elements/forms.elm"/>
<form method="post" action="<inp2:m_FormAction/>">
<table class="form-data fullwidth">
<inp2:m_RenderElement name="inp_edit_box" prefix="bb" field="TopicText" title="lu_fld_Subject" style="width: 300px"/>
<inp2:m_RenderElement name="inp_edit_textarea_bb" prefix="bb" field="PostingText" cols="70" rows="13" title="lu_fld_MessageBody" style="width: 400px"/>
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb" field="DisableBBCodes" title="lu_fld_DisableBBCodes"/>
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb" field="DisableSmileys" title="lu_fld_DisableSmileys"/>
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb" field="ShowSignatures" title="lu_fld_ShowSignatures"/>
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="bb" field="NotifyOwnerOnChanges" title="lu_fld_NotifyOwnerOnChanges" is_last="1"/>
<inp2:m_RenderElement design="inp_edit_buttons">
<input type="hidden" name="suggest_confirm_template" value="in-bulletin/topics/add_confirm"/>
<input type="hidden" name="suggest_pending_confirm_template" value="in-bulletin/topics/add_pending_confirm"/>
<input class="button" type="submit" name="events[bb][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Create" no_editing="1"/>"/>
- <input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Cancel" no_editing="1"/>" onclick="redirect('<inp2:m_Link template="__default__"/>');"/>
+ <input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Cancel" no_editing="1"/>" onclick="redirect('<inp2:m_Link template="__default__" no_amp="1" js_escape="1"/>');"/>
</inp2:m_RenderElement>
</table>
</form>
<inp2:m_else/>
<inp2:m_phrase name="lu_text_NoNewTopicPermission"/>
</inp2:m_if>
</inp2:m_RenderElement>
<!-- // new topic -->
</div>
</div>
</inp2:m_DefineElement>
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/1.3.x/in-bulletin/elements/html_head.elm.tpl
===================================================================
--- branches/1.3.x/in-bulletin/elements/html_head.elm.tpl (revision 15965)
+++ branches/1.3.x/in-bulletin/elements/html_head.elm.tpl (revision 15966)
@@ -1,12 +1,12 @@
<inp2:m_Compress files="in-bulletin/inc/styles.css" to="all_css"/>
<inp2:m_Compress files="in-bulletin/inc/script.js" to="all_js"/>
<script type="text/javascript">
var aPollManager = null;
$(document).ready(
function () {
- aPollManager = new PollManager('<inp2:m_Link template="in-bulletin/elements/side_boxes/poll_results.elm" events[#PREFIX#]="OnMakeVote" poll_id="#POLL_ID#" option_id="#OPTION_ID#" no_amp="1"/>');
+ aPollManager = new PollManager('<inp2:m_Link template="in-bulletin/elements/side_boxes/poll_results.elm" events[#PREFIX#]="OnMakeVote" poll_id="#POLL_ID#" option_id="#OPTION_ID#" no_amp="1" js_escape="1"/>');
}
);
</script>
\ No newline at end of file
Index: branches/1.3.x/platform/login/forgot_password_reset_confirm.tpl
===================================================================
--- branches/1.3.x/platform/login/forgot_password_reset_confirm.tpl (revision 15965)
+++ branches/1.3.x/platform/login/forgot_password_reset_confirm.tpl (revision 15966)
@@ -1,61 +1,61 @@
<!--##
<NAME>Password Reset Confirmed</NAME>
<DESC></DESC>
<SECTION>My Account||Login</SECTION>
##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_ForgotPasswordConfirm" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
</div>
</div>
</inp2:m_DefineElement>
<!--## //SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ForgotPasswordConfirm" templates="platform/login/forgot_password_reset_confirm"/>
</div>
<div class="movable-element">
<!-- forgot password reset confirm -->
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_ForgotPasswordConfirm"/>
</inp2:m_Capture>
<form method="POST" action="<inp2:m_FormAction />">
<inp2:m_Phrase label="lu_text_ForgotPassHasBeenReset"/>
<br /><br />
- <input type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" class="button" onclick="redirect('<inp2:m_Link template="platform/login/register" next_template="index"/>');"/>
+ <input type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" class="button" onclick="redirect('<inp2:m_Link template="platform/login/register" next_template="index" no_amp="1" js_escape="1"/>');"/>
</form>
</inp2:m_RenderElement>
<!-- // forgot password reset confirm -->
</div>
</div>
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/1.3.x/platform/login/register_confirm.tpl
===================================================================
--- branches/1.3.x/platform/login/register_confirm.tpl (revision 15965)
+++ branches/1.3.x/platform/login/register_confirm.tpl (revision 15966)
@@ -1,60 +1,60 @@
<!--##
<NAME>Registration Completed</NAME>
<DESC></DESC>
<SECTION>My Account||Login</SECTION>
##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_RegistrationConfirmation" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
</div>
</div>
</inp2:m_DefineElement>
<!--## //SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_UserRegistration,lu_title_RegistrationConfirmation" templates="platform/login/register,platform/login/register_confirm"/>
</div>
<div class="movable-element">
<!-- registration confirmation -->
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_RegistrationConfirmation"/>
</inp2:m_Capture>
<form method="POST" action="<inp2:m_FormAction />">
<inp2:m_phrase name="lu_RegistrationCompleted"/>
<inp2:m_if check="conf_ConfigValue" name="User_Password_Auto">
<br /><br /><inp2:m_phrase name="lu_RegistrationEmailed"/>
</inp2:m_if>
<br /><br />
- <input type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" class="button" onclick="redirect('<inp2:m_Link template="index" />');"/>
+ <input type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" class="button" onclick="redirect('<inp2:m_Link template="index" no_amp="1" js_escape="1"/>');"/>
</form>
</inp2:m_RenderElement>
<!-- // registration confirmation -->
</div>
</div>
</inp2:m_DefineElement>
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/1.3.x/platform/login/forgot_password.tpl
===================================================================
--- branches/1.3.x/platform/login/forgot_password.tpl (revision 15965)
+++ branches/1.3.x/platform/login/forgot_password.tpl (revision 15966)
@@ -1,78 +1,78 @@
<!--##
<NAME>Forgot Password</NAME>
<DESC></DESC>
<SECTION>My Account||Login</SECTION>
##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_ForgotPassword" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
</div>
</div>
</inp2:m_DefineElement>
<!--## //SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ForgotPassword" templates="platform/login/forgot_password"/>
</div>
<div class="movable-element">
<!-- forgot password -->
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_ForgotPassword"/>
</inp2:m_Capture>
<inp2:m_Phrase label="lu_EnterForgotUserEmail"/>
<br /><br />
<inp2:u.forgot_FormName name="forgot_password"/>
<inp2:m_if check="u.forgot_HasError" field="any">
<inp2:m_RenderElement name="error_message"/>
</inp2:m_if>
<img src="<inp2:m_TemplatesBase module='In-Portal'/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
<form method="post" action="<inp2:m_FormAction/>">
<table class="form-data fullwidth">
<inp2:m_RenderElement name="inp_edit_box" prefix="u.forgot" field="ForgotLogin" title="lu_fld_EmailOrUsername" style="width: 155px;" is_last="1"/>
<inp2:m_RenderElement design="inp_edit_buttons">
<input type="hidden" name="template_success" value="platform/login/forgot_password_reset_notice"/>
<input type="hidden" name="reset_confirm_template" value="platform/login/forgot_password_reset"/>
<input type="submit" class="button" name="events[u.forgot][OnForgotPassword]" value="<inp2:m_Phrase label='lu_btn_SendPassword' no_editing='1'/>" />
- <input type="button" class="button" onclick="redirect('<inp2:m_Link template="index"/>');" value="<inp2:m_Phrase label="lu_btn_Cancel" no_editing="1"/>">
+ <input type="button" class="button" onclick="redirect('<inp2:m_Link template="index" no_amp="1" js_escape="1"/>');" value="<inp2:m_Phrase label="lu_btn_Cancel" no_editing="1"/>">
</inp2:m_RenderElement>
</table>
</form>
</inp2:m_RenderElement>
<!-- // forgot password -->
</div>
</div>
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/1.3.x/platform/login/forgot_password_reset_notice.tpl
===================================================================
--- branches/1.3.x/platform/login/forgot_password_reset_notice.tpl (revision 15965)
+++ branches/1.3.x/platform/login/forgot_password_reset_notice.tpl (revision 15966)
@@ -1,60 +1,60 @@
<!--##
<NAME>Forgot Password Notification</NAME>
<DESC>Password Sent Confirmation</DESC>
<SECTION>My Account||Login</SECTION>
##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_ForgotPasswordNotification" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
</div>
</div>
</inp2:m_DefineElement>
<!--## //SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ForgotPasswordNotification" templates="platform/login/forgot_password_reset_notice"/>
</div>
<div class="movable-element">
<!-- forgot password reset confirm -->
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_ForgotPasswordNotification"/>
</inp2:m_Capture>
<form method="POST" action="<inp2:m_FormAction />">
<inp2:m_Phrase label="lu_text_ForgotPassResetEmailSent"/>
<br /><br />
- <input type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" class="button" onclick="redirect('<inp2:m_Link template="index" />');"/>
+ <input type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" class="button" onclick="redirect('<inp2:m_Link template="index" no_amp="1" js_escape="1"/>');"/>
</form>
</inp2:m_RenderElement>
<!-- // forgot password reset confirm -->
</div>
</div>
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/1.3.x/platform/login/activate_confirm.tpl
===================================================================
--- branches/1.3.x/platform/login/activate_confirm.tpl (revision 15965)
+++ branches/1.3.x/platform/login/activate_confirm.tpl (revision 15966)
@@ -1,61 +1,61 @@
<!--##
<NAME>Registration Activation</NAME>
<DESC></DESC>
<SECTION>My Account||Login</SECTION>
##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_RegistrationConfirmation" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
</div>
</div>
</inp2:m_DefineElement>
<!--## //SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_UserRegistration,lu_title_RegistrationConfirmation" templates="platform/login/register,platform/login/register_confirm_pending"/>
</div>
<div class="movable-element">
<!-- registration confirmation -->
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_RegistrationConfirmation"/>
</inp2:m_Capture>
<inp2:m_if check="u_TestCodeIsValid" code_type="activation">
<inp2:u_ActivateUser/>
<inp2:m_Phrase name="lu_RegistrationCompleted"/>
<br /><br />
- <input type="button" value="<inp2:m_Phrase label='lu_btn_Ok'/>" class="button" onclick="redirect('<inp2:m_Link template='index' m_cat_id='0' m_cat_page='1'/>');"/>
+ <input type="button" value="<inp2:m_Phrase label='lu_btn_Ok'/>" class="button" onclick="redirect('<inp2:m_Link template='index' m_cat_id='0' m_cat_page='1' no_amp='1' js_escape='1'/>');"/>
<inp2:m_else />
<span class="field-error"><inp2:u_Error field="PwResetConfirm"/></span>
<br /><br />
<a href="<inp2:m_Link template='index' m_cat_id='0' m_cat_page='1'/>"><inp2:m_Phrase label="lu_ReturnToHome"/></a>
</inp2:m_if>
</inp2:m_RenderElement>
<!-- // registration confirmation -->
</div>
</div>
</inp2:m_DefineElement>
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/1.3.x/platform/recommend/recommend.tpl
===================================================================
--- branches/1.3.x/platform/recommend/recommend.tpl (revision 15965)
+++ branches/1.3.x/platform/recommend/recommend.tpl (revision 15966)
@@ -1,49 +1,49 @@
<!--##
<NAME>Recommend</NAME>
<DESC></DESC>
<SECTION>Platform</SECTION>
##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_RecommendConfirm" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
</div>
</div>
</inp2:m_DefineElement>
<!--## //SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_RecommendConfirm" templates="platform/recommend/recommend"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_RecommendConfirm"/>
</inp2:m_Capture>
<inp2:m_Phrase label="lu_recommend_confirm_text" />
<br /><br />
- <input type="button" class="button" onclick="redirect('<inp2:m_Link template="index" />');" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>"/>
+ <input type="button" class="button" onclick="redirect('<inp2:m_Link template="index" no_amp="1" js_escape="1"/>');" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>"/>
</inp2:m_RenderElement>
</div>
</div>
</inp2:m_DefineElement>
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
Index: branches/1.3.x/platform/mailing_list/subscribe.tpl
===================================================================
--- branches/1.3.x/platform/mailing_list/subscribe.tpl (revision 15965)
+++ branches/1.3.x/platform/mailing_list/subscribe.tpl (revision 15966)
@@ -1,54 +1,54 @@
<!--##
<NAME>Subscribe</NAME>
<DESC></DESC>
<SECTION>Platform||Mailing</SECTION>
##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_SubscribeConfirm" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
</div>
</div>
</inp2:m_DefineElement>
<!--## //SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SubscribeConfirm" templates="platform/mailing_list/subscribe"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_SubscribeConfirm"/>
</inp2:m_Capture>
<inp2:m_Phrase label="lu_subscribe_confirm_prompt" />
<br /><br />
<form method="POST" action="<inp2:m_FormAction />">
<input class="button" name="events[u.subscriber][OnSubscribeUser]" type="submit" value="<inp2:m_Phrase label="lu_btn_Yes" no_editing="1"/>" />&nbsp;
- <input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_No" no_editing="1"/>" onclick="redirect('<inp2:m_Link template="index"/>');" />&nbsp;
+ <input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_No" no_editing="1"/>" onclick="redirect('<inp2:m_Link template="index" no_amp="1" js_escape="1"/>');" />&nbsp;
<input type="hidden" name="subscribe_ok_template" value="platform/mailing_list/subscribe_ok"/>
<input type="hidden" name="subscriber_email" value="<inp2:m_Get name='subscriber_email' html_escape='1'/>"/>
</form>
</inp2:m_RenderElement>
</div>
</div>
</inp2:m_DefineElement>
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/1.3.x/platform/mailing_list/unsubscribe.tpl
===================================================================
--- branches/1.3.x/platform/mailing_list/unsubscribe.tpl (revision 15965)
+++ branches/1.3.x/platform/mailing_list/unsubscribe.tpl (revision 15966)
@@ -1,54 +1,54 @@
<!--##
<NAME>Unsubscribe</NAME>
<DESC>Unsubscribe from mailing list</DESC>
<SECTION>Platform||Mailing</SECTION>
##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_UnsubscribeConfirm" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
</div>
</div>
</inp2:m_DefineElement>
<!--## //SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_UnsubscribeConfirm" templates="platform/mailing_list/unsubscribe"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_UnsubscribeConfirm"/>
</inp2:m_Capture>
<inp2:m_Phrase label="lu_unsubscribe_confirm_prompt" />
<br /><br />
<form method="POST" action="<inp2:m_FormAction />">
<input class="button" name="events[u.subscriber][OnSubscribeUser]" type="submit" value="<inp2:m_Phrase label="lu_btn_Yes" no_editing="1"/>" />&nbsp;
- <input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_No" no_editing="1"/>" onclick="redirect('<inp2:m_Link template="index"/>');" />&nbsp;
+ <input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_No" no_editing="1"/>" onclick="redirect('<inp2:m_Link template="index" no_amp="1" js_escape="1"/>');" />&nbsp;
<input type="hidden" name="unsubscribe_ok_template" value="platform/mailing_list/unsubscribe_ok"/>
<input type="hidden" name="subscriber_email" value="<inp2:m_Get name='subscriber_email' html_escape='1'/>"/>
</form>
</inp2:m_RenderElement>
</div>
</div>
</inp2:m_DefineElement>
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/1.3.x/platform/mailing_list/subscribe_ok.tpl
===================================================================
--- branches/1.3.x/platform/mailing_list/subscribe_ok.tpl (revision 15965)
+++ branches/1.3.x/platform/mailing_list/subscribe_ok.tpl (revision 15966)
@@ -1,49 +1,49 @@
<!--##
<NAME>Subscription Confirmed</NAME>
<DESC>Subscription confirmed to mailing list</DESC>
<SECTION>Platform||Mailing</SECTION>
##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_SubscribeOk" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
</div>
</div>
</inp2:m_DefineElement>
<!--## //SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SubscribeConfirm,lu_title_SubscribeOk" templates="platform/mailing_list/subscribe,platform/mailing_list/subscribe_ok"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_SubscribeOk"/>
</inp2:m_Capture>
<inp2:m_Phrase label="lu_ThankForSubscribing"/>
<br /><br />
- <input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
+ <input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" onClick="window.location.href='<inp2:m_Link template="index" no_amp="1" js_escape="1"/>'" />&nbsp;
</inp2:m_RenderElement>
</div>
</div>
</inp2:m_DefineElement>
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/1.3.x/platform/mailing_list/unsubscribe_ok.tpl
===================================================================
--- branches/1.3.x/platform/mailing_list/unsubscribe_ok.tpl (revision 15965)
+++ branches/1.3.x/platform/mailing_list/unsubscribe_ok.tpl (revision 15966)
@@ -1,49 +1,49 @@
<!--##
<NAME>Unsubscribe Confirmed</NAME>
<DESC>Unsubscribe from mailing list confirmed</DESC>
<SECTION>Platform||Mailing</SECTION>
##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_UnsubscribeOk" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
</div>
</div>
</inp2:m_DefineElement>
<!--## //SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_UnsubscribeConfirm,lu_title_UnsubscribeOk" templates="platform/mailing_list/unsubscribe,platform/mailing_list/unsubscribe_ok"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_UnsubscribeOk"/>
</inp2:m_Capture>
<inp2:m_Phrase label="lu_TextUnsubscribe"/>
<br /><br />
- <input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
+ <input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" onClick="window.location.href='<inp2:m_Link template="index" no_amp="1" js_escape="1"/>'" />&nbsp;
</inp2:m_RenderElement>
</div>
</div>
</inp2:m_DefineElement>
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/1.3.x/platform/designs/default_design.des.tpl
===================================================================
--- branches/1.3.x/platform/designs/default_design.des.tpl (revision 15965)
+++ branches/1.3.x/platform/designs/default_design.des.tpl (revision 15966)
@@ -1,159 +1,159 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<inp2:m_if check="st_Field" name="RequireLogin" db="db">
<inp2:m_RequireLogin login_template="platform/login/register" />
</inp2:m_if>
<inp2:m_if check="st_Field" name="RequireSSL" db="db">
<inp2:m_CheckSSL mode="required"/>
</inp2:m_if>
<inp2:m_DefaultParam item_prefix=""/>
<inp2:m_CheckSSL/>
<inp2:m_include template="platform/elements/side_boxes.elm" strip_nl="1"/>
<inp2:m_include template="platform/elements/content_boxes.elm" strip_nl="1"/>
<inp2:m_include template="platform/elements/forms.elm" strip_nl="1"/>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<inp2:m_DefineElement name="cms_page_title">
<inp2:st_PageInfo type="htmlhead_title" html_escape="1"/>
</inp2:m_DefineElement>
<title><inp2:m_GetConfig name="Site_Name"/> :: <inp2:m_RenderElement name="page_title" default_element="cms_page_title" no_editing="1"/></title>
<!--## Include module specific HEADER (META INFORMATION inside) template ##-->
<inp2:m_ModuleInclude template="elements/html_head.elm" in-portal_template="platform/elements/html_head.elm"/>
<link rel="stylesheet" rev="stylesheet" href="<inp2:m_Compress from='all_css'/>" type="text/css" />
<script type="text/javascript" src="<inp2:m_Compress from='all_js'/>"></script>
<script type="text/javascript">
FormManager.init(
{
- url: '<inp2:m_Link template="#TEMPLATE#" js_escape="1" __NO_REWRITE__="1" no_amp="1"/>',
+ url: '<inp2:m_Link template="#TEMPLATE#" __NO_REWRITE__="1" no_amp="1" js_escape="1"/>',
// windowManager: new FormManager_WindowManagerThickBox()
windowManager: new FormManager_WindowManagerColorBox()
// windowManager: new FormManager_WindowManagerFancyBox()
}
);
- var aRatingManager = new RatingManager('<inp2:m_Link template="index" events[#PREFIX#]="OnMakeVote" rating="#VOTE#" id="#ID#" no_amp="1" size="#SIZE#"/>');
+ var aRatingManager = new RatingManager('<inp2:m_Link template="index" events[#PREFIX#]="OnMakeVote" rating="#VOTE#" id="#ID#" size="#SIZE#" no_amp="1" js_escape="1"/>');
<inp2:m_Cache key="prefix:lang;skip_var:t,page,per_page,sort_by">
<inp2:m_DefineElement name="ml_selector_language_element">
<inp2:Field name="LanguageId"/>: {'on': '<inp2:Field name="IconURL" js_ecape="1"/>', 'off': '<inp2:Field name="IconDisabledURL" js_ecape="1"/>'}
<inp2:m_ifnot check="m_Param" name="is_last">,</inp2:m_ifnot>
</inp2:m_DefineElement>
var aMultiLanguageSelector = new MultiLanguageSelector({<inp2:lang.enabled_PrintList render_as="ml_selector_language_element" per_page="-1" no_editing="1" strip_nl="2"/>}, <inp2:m_Get name="m_lang"/>);
</inp2:m_Cache>
</script>
<inp2:m_DefineElement name="default_add_to_head"></inp2:m_DefineElement>
<inp2:m_RenderElement name="add_to_head" default_element="default_add_to_head" no_editing="1"/>
<inp2:st_EditingScripts/>
<!--## /Include module specific HEADER template ##-->
</head>
<body>
<inp2:st_EditPage mode="start" item_prefix="$item_prefix"/>
<div align="left">
<div align="left" style="width:100%">
<table class="fullwidth">
<tr>
<td>
<inp2:m_include template="platform/elements/header.elm"/>
</td>
</tr>
<tr>
<td>
<inp2:m_include template="platform/elements/menu.elm"/>
</td>
</tr>
</table>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt=""/><br />
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" alt=""/><br />
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt=""/><br />
<table class="fullwidth">
<tr>
<!-- SIDEBAR -->
<td style="width: 200px;" valign="top">
<inp2:m_DefineElement name="cms_sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
</div>
</inp2:m_DefineElement>
<inp2:m_RenderElement name="sidebar" default_element="cms_sidebar"/>
</td>
<!-- /SIDEBAR -->
<!-- SEPARATOR -->
<td width="3" class="vertical-separator" style="width: 3px;">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br />
</td>
<!-- /SEPARATOR -->
<!-- CONTENT -->
<td style="width: auto;" valign="top">
<inp2:m_DefineElement name="cms_content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:st_PageInfo type="title"/>
</inp2:m_Capture>
<inp2:st_ContentBlock num="1"/>
</inp2:m_RenderElement>
</div>
</div>
</inp2:m_DefineElement>
<inp2:m_RenderElement name="content" default_element="cms_content"/>
<br />
</td>
<!-- /CONTENT -->
<!--## REMOVE THIS LINE TO UNCOMMENT
<!-- SEPARATOR -->
<td width="3" class="vertical-separator">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br />
</td>
<!-- /SEPARATOR -->
<!-- RIGHT-SIDEBAR WITH BANNER -->
<td style="width: 200px;" valign="top">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/banners/banner_right.elm"/>
</div>
</div>
</td>
<!-- /RIGHT-SIDEBAR WITH BANNER -->
REMOVE THIS LINE TO UNCOMMENT ##-->
</tr>
</table>
<table class="fullwidth">
<tr>
<td >
<inp2:m_include template="platform/elements/footer.elm"/>
</td>
</tr>
</table>
</div>
</div>
<inp2:st_EditPage mode="end"/>
</body>
</html>
\ No newline at end of file
Index: branches/1.3.x/in-commerce/my_account/cancel_recurring.tpl
===================================================================
--- branches/1.3.x/in-commerce/my_account/cancel_recurring.tpl (revision 15965)
+++ branches/1.3.x/in-commerce/my_account/cancel_recurring.tpl (revision 15966)
@@ -1,78 +1,78 @@
<!--##
<NAME>Cancel Reoccurring Order</NAME>
<DESC>Cancel Reoccurring Order page</DESC>
<SECTION>My Account||Store</SECTION>
##-->
<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
<inp2:m_CheckSSL mode="required" condition="Require_SSL" /> <!--## CHECK IF SSL REQUIRED ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_CancelRecurring" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENTS ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
</div>
</div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENTS ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyOrders,lu_title_CancelRecurring" templates="platform/my_account/my_account,in-commerce/my_account/my_orders,in-commerce/my_account/cancel_recurring"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement design="content_box" block_no_data="no_orders">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_CancelRecurring"/>
</inp2:m_Capture>
<table border="0" cellspacing="0" cellpadding="0">
<tr>
<td>
<strong><inp2:m_Phrase label="lu_CancelRecurring_confirm" /></strong>
<inp2:m_Phrase label="lu_CancelRecurring_confirm_prompt" />
<br />
<br />
<form method="POST" action="<inp2:m_FormAction />">
<input class="button" name="events[ord][OnCancelRecurring]" type="submit" value="<inp2:m_Phrase label="lu_Yes" no_editing="1"/>" />&nbsp;
- <input class="button" type="button" value="<inp2:m_Phrase label="lu_No" no_editing="1"/>" onClick="window.location.href='<inp2:m_Link template="in-commerce/my_account/account"/>'" />&nbsp;
+ <input class="button" type="button" value="<inp2:m_Phrase label="lu_No" no_editing="1"/>" onClick="window.location.href='<inp2:m_Link template="in-commerce/my_account/account" no_amp="1" js_escape="1"/>'" />&nbsp;
<input type="hidden" name="cancelrecurring_ok_template" value="in-commerce/my_account/cancel_recurring_ok"/>
</form>
</td>
</tr>
</table>
</inp2:m_RenderElement>
</div>
</div>
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/1.3.x/in-commerce/elements/side_boxes/affiliate_navigation.elm.tpl
===================================================================
--- branches/1.3.x/in-commerce/elements/side_boxes/affiliate_navigation.elm.tpl (revision 15965)
+++ branches/1.3.x/in-commerce/elements/side_boxes/affiliate_navigation.elm.tpl (revision 15966)
@@ -1,24 +1,24 @@
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_Affiliate"/>
</inp2:m_Capture>
<table class="fullwidth" style="border-width: 0px;">
<inp2:m_RenderElement name="box_element" template="in-commerce/my_account/affiliate/affiliate_statistics" title="lu_Statistics"/>
<inp2:m_RenderElement name="box_element" template="in-commerce/my_account/affiliate/affiliate_payments" title="lu_Payments"/>
<inp2:m_RenderElement name="box_element" template="in-commerce/my_account/affiliate/affiliate_materials" title="lu_Materials"/>
<inp2:m_RenderElement name="box_element" template="in-commerce/my_account/affiliate/affiliate_payment_type" title="lu_ChangePaymentType"/>
<tr>
<td>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-2-level.gif" alt="" width="4" height="4" border="0" /><br />
</td>
<td>
<a href="<inp2:m_Link t='in-commerce/my_account/affiliate'/>" onclick="showAffiliateAgreement(); return false;"><inp2:m_phrase label="lu_TermsAndConditionsLink"/></a>
</td>
</tr>
</table>
<script type="text/javascript">
function showAffiliateAgreement() {
- window.open('<inp2:m_Link template="in-commerce/my_account/affiliate/affiliate_agreement" />', null, 'menubar=no,toolbars=no,width=500,height=300');
+ window.open('<inp2:m_Link template="in-commerce/my_account/affiliate/affiliate_agreement" no_amp="1" js_escape="1"/>', null, 'menubar=no,toolbars=no,width=500,height=300');
}
</script>
\ No newline at end of file
Index: branches/1.3.x/in-commerce/elements/forms.elm.tpl
===================================================================
--- branches/1.3.x/in-commerce/elements/forms.elm.tpl (revision 15965)
+++ branches/1.3.x/in-commerce/elements/forms.elm.tpl (revision 15966)
@@ -1,47 +1,47 @@
<inp2:m_DefineElement name="affiliate_payment_type_element">
<tr>
<td valign="top" nowrap>
<input type="radio" name="<inp2:$prefix_InputName name='$field'/>" id="<inp2:$prefix_InputName name='$field'/>_<inp2:Field name='PaymentTypeId'/>" value="<inp2:Field name='PaymentTypeId'/>"<inp2:m_if check="Checked" prefix="$prefix" field="$field"> checked</inp2:m_if>/>
</td>
<td>
<label for="<inp2:$prefix_InputName name='$field'/>_<inp2:Field name='PaymentTypeId'/>">
<inp2:Field name="Name" />
<inp2:m_if check="Field" name="Description">
<br /><inp2:Field name="Description" />
</inp2:m_if>
</label>
</td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="inp_affiliate_payment_types" is_last="0" required="0">
<inp2:m_RenderElement design="form_row" pass_params="1">
<table>
<inp2:apt_PrintList render_as="affiliate_payment_type_element" prefix="$prefix" field="$field"/>
</table>
</inp2:m_RenderElement>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="inp_affiliate_terms_checkbox" title="" is_last="0">
<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
<td class="field-name" nowrap>&nbsp;</td>
<td>
<inp2:m_if check="{$prefix}_HasError" field="$field">
<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
</inp2:m_if>
<input tabindex="<inp2:m_get param='tab_index'/>" type="checkbox" id="<inp2:{$prefix}_InputName field='$field'/>" name="<inp2:{$prefix}_InputName field='$field'/>" <inp2:{$prefix}_Field field="$field" checked="checked" db="db"/> value="1"/>
<label for="<inp2:$prefix_InputName field='$field'/>"><inp2:m_Phrase label="lu_comm_IAgreeTo" /></label>
<a href="javascript:showAffiliateAgreement()"><inp2:m_Phrase label="lu_comm_AffiliateAgreement" /></a>
<label for="<inp2:$prefix_InputName field='$field'/>"><inp2:m_Phrase label="lu_comm_TermsAndConditions" /></label>
</td>
</tr>
<script type="text/javascript">
function showAffiliateAgreement() {
- window.open('<inp2:m_Link template="in-commerce/my_account/affiliate/affiliate_agreement" />', null, 'menubar=no,toolbars=no,width=500,height=300');
+ window.open('<inp2:m_Link template="in-commerce/my_account/affiliate/affiliate_agreement" no_amp="1" js_escape="1"/>', null, 'menubar=no,toolbars=no,width=500,height=300');
}
</script>
</inp2:m_DefineElement>
\ No newline at end of file
Index: branches/1.3.x/in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl
===================================================================
--- branches/1.3.x/in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl (revision 15965)
+++ branches/1.3.x/in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl (revision 15966)
@@ -1,214 +1,214 @@
<inp2:m_DefineElement name="order_payment_credit_card">
<table width="100%" class="block-no-border">
<tr class="cart-header">
<td>
<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
<div class="sub-section-header"><inp2:ord_PaymentTypeDescription/></div>
<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
<br />
</td>
</tr>
<tr class="block-data">
<td>
<inp2:m_if check="ord_HasGatewayError">
<inp2:m_RenderElement name="error_message" />
<strong><inp2:ord_ShowGatewayError/></strong>
</inp2:m_if>
<br />
<strong><inp2:ord_PaymentTypeInstructions/></strong>
<br /><br />
</td>
</tr>
</table>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
<table class="form-data fullwidth">
<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="PaymentCardType" title="lu_billing_CardType"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentAccount" title="lu_billing_CreditCardNumber" style="width: 200px;"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentNameOnCard" title="lu_billing_NameOnCard" style="width: 260px;"/>
<!-- credit card expiration -->
<inp2:m_RenderElement design="form_row" prefix="ord" field="PaymentCCExpDate" title="lu_billing_CardExpiration" field_type="cc_expiration">
<select class="input-select" name="<inp2:ord_InputName field='PaymentCCExpMonth'/>">
<inp2:ord_PredefinedOptions field="PaymentCCExpMonth" render_as="inp_option_item" selected="selected"/>
</select>
/
<select class="input-select" name="<inp2:ord_InputName field='PaymentCCExpYear'/>">
<option value=''></option>
<inp2:ord_PrintYearOptions field="PaymentCCExpYear" render_as="inp_option_item" selected="selected"/>
</select>
</inp2:m_RenderElement>
<!-- // credit card expiration -->
<!-- credit card CVV2 -->
<inp2:m_RenderElement design="form_row" prefix="ord" field="PaymentCVV2" title="lu_billing_CVV2">
<input type="text" class="input-text" name="<inp2:ord_InputName field='PaymentCVV2'/>" value="<inp2:ord_Field field='PaymentCVV2'/>" tabindex="<inp2:m_get param='tab_index'/>" style="width: 50px;">
&nbsp;&nbsp;<a href="javascript:showCVV2Help()"><inp2:m_Phrase label="lu_WhatIsThis" /></a>
</inp2:m_RenderElement>
<!-- // credit card CVV2 -->
<inp2:m_RenderElement design="inp_edit_buttons">
<input type="hidden" name="check_credit_card" id="check_credit_card" value="0"/>
<input type="hidden" name="preview_template" value="in-commerce/checkout/preview">
<input class="button" type="submit" name="events[ord][OnProceedToPreview]" value="<inp2:m_Phrase label='lu_btn_ProceedToPreview' no_editing='1'/>">
<script type="text/javascript">
var $submit_event = '';
$(document).ready(
function () {
// mark all submit buttons on form ("Update Address" & "Proceed to preview")
$("input[type='submit']", '#billing_info').each(
function () {
var $me = $(this);
if ( $me.attr('name').match(/^events\[ord\]\[(.*)\]$/) ) {
$me
.attr('event_name', RegExp.$1)
.click(
function ($e) {
$submit_event = $(this).attr('event_name');
}
);
}
}
);
$('#billing_info').submit(
function ($e) {
$('#check_credit_card').val($submit_event == 'OnProceedToPreview' ? 1 : 0);
}
);
}
)
</script>
</inp2:m_RenderElement>
</table>
<br />
<script language="JavaScript">
function showCVV2Help(){
- window.open('<inp2:m_Link template="in-commerce/checkout/cvv2help" />', null, 'scrollbars=no,menubar=no,toolbars=no,width=300,height=150');
+ window.open('<inp2:m_Link template="in-commerce/checkout/cvv2help" no_amp="1" js_escape="1"/>', null, 'scrollbars=no,menubar=no,toolbars=no,width=300,height=150');
}
</script>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="order_payment_type_default">
<table>
<tr class="cart-header">
<td>
<inp2:ord_PaymentTypeDescription/>
</td>
</tr>
<tr class="form-data">
<td>
<inp2:m_if check="ord_HasGatewayError">
<table class="warning">
<tr>
<td valign="top" align="left" class="block-data">
<img src="img/message.gif" alt="" width="19" height="19" />
<span class="warning-text"><inp2:m_Phrase label="lu_Warning"/></span><br />
<inp2:ord_ShowGatewayError/>
</td>
</tr>
</table>
</inp2:m_if>
<br/>
<inp2:ord_PaymentTypeInstructions/>
</td>
</tr>
</table>
<br/>
<input type="hidden" name="preview_template" value="in-commerce/checkout/preview">
<input class="button" type="submit" name="events[ord][OnProceedToPreview]" value="<inp2:m_Phrase label="lu_btn_ProceedToPreview" no_editing="1"/>">
</inp2:m_DefineElement>
<inp2:m_DefineElement name="products_total">
<tr>
<td><strong><inp2:m_Phrase label="lu_comm_ProductsTotal"/>:</strong></td>
<td><inp2:ord_Field name="SubTotal" currency="selected"/></td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="shipping_total">
<tr>
<td><strong><inp2:m_Phrase label="lu_comm_ShippingCost"/> (<inp2:ord_ShippingType />):</strong></td>
<td><inp2:ord_Field name="ShippingCost" currency="selected"/></td>
</tr>
<tr>
<td><strong><inp2:m_Phrase label="lu_comm_Insurance_Fee"/>:</strong></td>
<td><inp2:ord_Field name="InsuranceFee" currency="selected"/></td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="processing_total">
<tr>
<td><strong><inp2:m_Phrase label="lu_comm_ProcessingFee"/>: </strong></td>
<td><inp2:ord_Field name="ProcessingFee" currency="selected"/></td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="sub_total">
<tr>
<td><strong><inp2:m_Phrase label="lu_comm_SubTotal"/>: </strong></td>
<td><inp2:ord_Field name="AmountWithoutVAT" currency="selected"/></td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="vat_total">
<tr>
<td><strong><inp2:m_Phrase label="lu_comm_VAT"/> <inp2:ord_Field name="VATPercent"/>%: </strong></td>
<td><inp2:ord_Field name="VAT" currency="selected"/></td>
</tr>
</inp2:m_DefineElement>
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_comm_BillingOptions"/>
</inp2:m_Capture>
<inp2:m_RenderElement name="subsection" title="lu_section_CostSummary"/>
<table class="order-totals">
<inp2:ord_PrintTotals
products_render_as="products_total"
shipping_render_as="shipping_total"
processing_render_as="processing_total"
sub_total_render_as="sub_total"
vat_render_as="vat_total"/>
<inp2:m_if check="ord_Field" name="GiftCertificateId">
<tr>
<td><strong><inp2:m_Phrase label="lu_comm_Gift_Certificate"/>: </strong></td>
<td><inp2:ord_Field name="GiftCertificateDiscount" currency="selected"/></td>
</tr>
</inp2:m_if>
<tr class="order-grand-total">
<td><inp2:m_Phrase label="lu_comm_GrandTotal"/>:</td>
<td><span class="price1"><inp2:ord_Field name="TotalAmount" currency="selected"/></span></td>
</tr>
</table>
<br />
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" alt="" /><br /><br />
<br />
<br />
<strong><inp2:m_Phrase label="lu_comm_PaymentType"/>:</strong>
<select class="input-select" name="<inp2:ord_InputName field="PaymentType"/>" onchange="document.getElementById('events[ord][OnUpdate]').click();">
<inp2:ord_PredefinedOptions render_as="inp_option_item" field="PaymentType" selected="selected"/>
</select>
&nbsp;<input class="button" type="submit" value="<inp2:m_Phrase label="lu_btn_Select" no_editing="1"/>" name="events[ord][OnUpdate]" id="events[ord][OnUpdate]">
<br/><br/>
<inp2:ord_PaymentTypeForm cc_render_as="order_payment_credit_card" default_render_as="order_payment_type_default"/>
</inp2:m_RenderElement>
\ No newline at end of file

Event Timeline