Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F802152
in-portal
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Sat, Feb 22, 5:56 AM
Size
84 KB
Mime Type
text/x-diff
Expires
Mon, Feb 24, 5:56 AM (2 h, 43 m)
Engine
blob
Format
Raw Data
Handle
575265
Attached To
rINP In-Portal
in-portal
View Options
Index: branches/RC/core/admin_templates/categories/ci_blocks.tpl
===================================================================
--- branches/RC/core/admin_templates/categories/ci_blocks.tpl (revision 11697)
+++ branches/RC/core/admin_templates/categories/ci_blocks.tpl (revision 11698)
@@ -1,62 +1,64 @@
<inp2:m_DefineElement name="status_mark">
<inp2:m_if check="FieldEquals" name="$field" value="1">
<img src="<inp2:ModulePath module="in-portal"/>img/ic_<inp2:m_param name="type"/>.gif" title="<inp2:m_phrase label="la_{$type}"/>" width="11" height="11" align="absmiddle" />
</inp2:m_if>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="grid_catitem_td" format="" no_special="">
<inp2:Field field="$field" grid="$grid" no_special="$no_special" format="$format" cut_first="100"/>
<inp2:m_if check="FieldEquals" field="Priority" value="0" inverse="inverse">
<span class="priority"><sup><inp2:Field field="Priority"/></sup></span>
</inp2:m_if>
<inp2:m_RenderElement name="status_mark" field="EditorsPick" type="pick" PrefixSpecial="$PrefixSpecial"/>
<inp2:m_RenderElement name="status_mark" field="IsPop" type="pop" PrefixSpecial="$PrefixSpecial"/>
<inp2:m_RenderElement name="status_mark" field="IsNew" type="new" PrefixSpecial="$PrefixSpecial"/>
<inp2:m_RenderElement name="status_mark" field="IsHot" type="hot" PrefixSpecial="$PrefixSpecial"/>
<a href="<inp2:ItemLink template='__default__' index_file='../index.php' admin='1'/>" title="<inp2:m_Phrase name='la_alt_Browse' html_escape='1'/>">
<img src="<inp2:m_TemplatesBase/>/img/arrow.gif" width="15" height="15" alt="<inp2:m_Phrase name='la_alt_Browse' html_escape='1'/>" border="0"/>
</a>
<!--##<inp2:m_if check="m_Param" name="Special" equals_to="showall|user">
<br />
<span class="small-statistics">
<inp2:Field name="CategoryId" result_to_var="item_category"/>
<inp2:m_Phrase name="la_fld_PrimaryCategory"/>: <a href="<inp2:m_Link template='catalog/catalog' m_cat_id='$item_category' anchor='tab-{$Prefix}' no_pass_through='1'/>"><inp2:CategoryName /></a><br />
</span>
</inp2:m_if>##-->
</inp2:m_DefineElement>
<inp2:m_DefineElement name="grid_primary_category_td" format="" no_special="">
<inp2:Field name="CategoryId" result_to_var="item_category"/>
<a href="<inp2:m_Link template='catalog/catalog' m_cat_id='$item_category' anchor='tab-{$Prefix}' no_pass_through='1'/>"><inp2:CategoryName /></a><br />
</inp2:m_DefineElement>
<inp2:m_DefineElement name="grid_category_td" format="" no_special="">
<td valign="top" class="text">
<inp2:CategoryName />
</td>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="no_perm_grid" prefix="" perm_label="">
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder_full" height="200">
<tr class="table-color1">
<td align="center" valign="middle" class="text">
<inp2:m_phrase name="$perm_label"/>
</td>
</tr>
</table>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="inp_edit_relation">
- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
- <td class="control-cell">
- <inp2:m_if check="{$prefix}_Field" field="$field">
- <img src="<inp2:{$prefix}_ModulePath />img/itemicons/<inp2:{$prefix}_ItemIcon grid="Default"/>" align="absmiddle"/>
- <inp2:{$prefix}_Field field="ItemName" no_special="1"/> (<inp2:{$prefix}_Field field="ItemType"/>)
- </inp2:m_if>
- </td>
- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
- </tr>
+ <inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+ <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+ <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+ <td class="control-cell">
+ <inp2:m_if check="{$prefix}_Field" field="$field">
+ <img src="<inp2:{$prefix}_ModulePath />img/itemicons/<inp2:{$prefix}_ItemIcon grid="Default"/>" align="absmiddle"/>
+ <inp2:{$prefix}_Field field="ItemName" no_special="1"/> (<inp2:{$prefix}_Field field="ItemType"/>)
+ </inp2:m_if>
+ </td>
+ <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+ </tr>
+ </inp2:m_if>
</inp2:m_DefineElement>
\ No newline at end of file
Property changes on: branches/RC/core/admin_templates/categories/ci_blocks.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7.2.10
\ No newline at end of property
+1.7.2.11
\ No newline at end of property
Index: branches/RC/core/admin_templates/skins/skin_edit.tpl
===================================================================
--- branches/RC/core/admin_templates/skins/skin_edit.tpl (revision 11697)
+++ branches/RC/core/admin_templates/skins/skin_edit.tpl (revision 11698)
@@ -1,281 +1,281 @@
<inp2:adm_SetPopupSize width="750" height="570"/>
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" section="in-portal:skins" prefix="skin" title_preset="skin_edit"/>
<!-- ToolBar -->
<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
<tbody>
<tr>
<td>
<script type="text/javascript">
a_toolbar = new ToolBar();
a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
submit_event('skin','<inp2:skin_SaveEvent/>');
}
));
a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
cancel_edit('skin','OnCancelEdit','<inp2:skin_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
}
));
a_toolbar.AddButton( new ToolBarButton('reset_edit', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
reset_form('skin', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
}
));
a_toolbar.AddButton( new ToolBarSeparator('sep1') );
a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
go_to_id('skin', '<inp2:skin_PrevId/>');
}
));
a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
go_to_id('skin', '<inp2:skin_NextId/>');
}
));
a_toolbar.Render();
<inp2:m_if check="skin_IsSingle" >
a_toolbar.HideButton('prev');
a_toolbar.HideButton('next');
a_toolbar.HideButton('sep1');
<inp2:m_else/>
<inp2:m_if check="skin_IsLast" >
a_toolbar.DisableButton('next');
</inp2:m_if>
<inp2:m_if check="skin_IsFirst" >
a_toolbar.DisableButton('prev');
</inp2:m_if>
</inp2:m_if>
</script>
<script src="js/swfobject.js" type="text/javascript"></script>
<script type="text/javascript" src="js/uploader.js"></script>
</td>
</tr>
</tbody>
</table>
<inp2:m_DefineElement name="replacement_item" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup="" style="width: 100%">
- <tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$Description" is_last="$is_last"/>
- <td class="control-cell">
- <input style="<inp2:m_Param name="style"/>" type="text"
- name="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>[<inp2:m_Param name="key"/>][Value]" id="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>[<inp2:m_Param name="key"/>]" value="<inp2:m_Param name="Value"/>">
- </td>
- </tr>
+ <inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+ <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+ <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$Description" is_last="$is_last"/>
+ <td class="control-cell">
+ <input style="<inp2:m_Param name='style'/>" type="text"
+ name="<inp2:{$prefix}_InputName field='$field' subfield='$subfield'/>[<inp2:m_Param name='key'/>][Value]" id="<inp2:{$prefix}_InputName field='$field' subfield='$subfield'/>[<inp2:m_Param name='key'/>]" value="<inp2:m_Param name='Value'/>">
+ </td>
+ </tr>
+ </inp2:m_if>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="inp_edit_serialized" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup="" style="width: 100%">
<inp2:PrintSerializedFields pass_params="1" field="$field" render_as="$item_render_as"/>
</inp2:m_DefineElement>
<inp2:skin_SaveWarning name="grid_save_warning"/>
<inp2:skin_ErrorWarning name="form_error_warning"/>
<div id="scroll_container">
<table class="edit-form">
<inp2:m_RenderElement name="inp_id_label" prefix="skin" field="SkinId" title="!la_fld_Id!"/>
<inp2:m_RenderElement name="inp_edit_box_ml" prefix="skin" field="Name" title="!la_fld_SkinName!" style="width: 100px"/>
<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="skin" field="Logo" title="!la_fld_Logo!"/>
<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="skin" field="LogoBottom" title="la_fld_LogoBottom"/>
<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="skin" field="LogoLogin" title="la_fld_LogoLogin"/>
<style type="text/css">
.skin-table td {width: 90px};
</style>
- <tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_HeadFrame"/>
- <td class="control-cell">
- <table class="skin-table">
- <tr>
- <td>Font Color (HeadColor)</td>
- <td>Background (HeadBgColor)</td>
- <td>Bar Text Color (HeadBarColor)</td>
- <td>Bar Background (HeadBarBgColor)</td>
- </tr>
- <tr>
- <td>
- <input style="width: 80px" type="text"
- name="<inp2:skin_InputName field="Options"/>[HeadColor][Value]"
- value="<inp2:skin_Field name="Options" format="HeadColor.Value"/>">
- </td>
- <td>
- <input style="width: 80px" type="text"
- name="<inp2:skin_InputName field="Options"/>[HeadBgColor][Value]"
- value="<inp2:skin_Field name="Options" format="HeadBgColor.Value"/>">
- </td>
- <td>
- <input style="width: 80px" type="text"
- name="<inp2:skin_InputName field="Options"/>[HeadBarColor][Value]"
- value="<inp2:skin_Field name="Options" format="HeadBarColor.Value"/>">
- </td>
- <td>
- <input style="width: 80px" type="text"
- name="<inp2:skin_InputName field="Options"/>[HeadBarBgColor][Value]"
- value="<inp2:skin_Field name="Options" format="HeadBarBgColor.Value"/>">
- </td>
- </tr>
- </table>
- </td>
- </tr>
+ <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+ <inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_HeadFrame"/>
+ <td class="control-cell">
+ <table class="skin-table">
+ <tr>
+ <td>Font Color (HeadColor)</td>
+ <td>Background (HeadBgColor)</td>
+ <td>Bar Text Color (HeadBarColor)</td>
+ <td>Bar Background (HeadBarBgColor)</td>
+ </tr>
+ <tr>
+ <td>
+ <input style="width: 80px" type="text"
+ name="<inp2:skin_InputName field="Options"/>[HeadColor][Value]"
+ value="<inp2:skin_Field name="Options" format="HeadColor.Value"/>">
+ </td>
+ <td>
+ <input style="width: 80px" type="text"
+ name="<inp2:skin_InputName field="Options"/>[HeadBgColor][Value]"
+ value="<inp2:skin_Field name="Options" format="HeadBgColor.Value"/>">
+ </td>
+ <td>
+ <input style="width: 80px" type="text"
+ name="<inp2:skin_InputName field="Options"/>[HeadBarColor][Value]"
+ value="<inp2:skin_Field name="Options" format="HeadBarColor.Value"/>">
+ </td>
+ <td>
+ <input style="width: 80px" type="text"
+ name="<inp2:skin_InputName field="Options"/>[HeadBarBgColor][Value]"
+ value="<inp2:skin_Field name="Options" format="HeadBarBgColor.Value"/>">
+ </td>
+ </tr>
+ </table>
+ </td>
</tr>
- <tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_GeneralSections"/>
- <td class="control-cell">
- <table class="skin-table">
- <tr>
- <td>Section Title Color (SectionColor)</td>
- <td>Section Background (SectionBgColor)</td>
- <td>Titlebar Font Color (TitleBarColor)</td>
- <td>Titlebar Background (TitleBarBgColor)</td>
- </tr>
- <tr>
- <td>
- <input style="width: 80px" type="text"
- name="<inp2:skin_InputName field="Options"/>[SectionColor][Value]"
- value="<inp2:skin_Field name="Options" format="SectionColor.Value"/>">
- </td>
- <td>
- <input style="width: 80px" type="text"
- name="<inp2:skin_InputName field="Options"/>[SectionBgColor][Value]"
- value="<inp2:skin_Field name="Options" format="SectionBgColor.Value"/>">
- </td>
- <td>
- <input style="width: 80px" type="text"
- name="<inp2:skin_InputName field="Options"/>[TitleBarColor][Value]"
- value="<inp2:skin_Field name="Options" format="TitleBarColor.Value"/>">
- </td>
- <td>
- <input style="width: 80px" type="text"
- name="<inp2:skin_InputName field="Options"/>[TitleBarBgColor][Value]"
- value="<inp2:skin_Field name="Options" format="TitleBarBgColor.Value"/>">
- </td>
- </tr>
- </table>
- </td>
- </tr>
+
+ <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+ <inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_GeneralSections"/>
+ <td class="control-cell">
+ <table class="skin-table">
+ <tr>
+ <td>Section Title Color (SectionColor)</td>
+ <td>Section Background (SectionBgColor)</td>
+ <td>Titlebar Font Color (TitleBarColor)</td>
+ <td>Titlebar Background (TitleBarBgColor)</td>
+ </tr>
+ <tr>
+ <td>
+ <input style="width: 80px" type="text"
+ name="<inp2:skin_InputName field="Options"/>[SectionColor][Value]"
+ value="<inp2:skin_Field name="Options" format="SectionColor.Value"/>">
+ </td>
+ <td>
+ <input style="width: 80px" type="text"
+ name="<inp2:skin_InputName field="Options"/>[SectionBgColor][Value]"
+ value="<inp2:skin_Field name="Options" format="SectionBgColor.Value"/>">
+ </td>
+ <td>
+ <input style="width: 80px" type="text"
+ name="<inp2:skin_InputName field="Options"/>[TitleBarColor][Value]"
+ value="<inp2:skin_Field name="Options" format="TitleBarColor.Value"/>">
+ </td>
+ <td>
+ <input style="width: 80px" type="text"
+ name="<inp2:skin_InputName field="Options"/>[TitleBarBgColor][Value]"
+ value="<inp2:skin_Field name="Options" format="TitleBarBgColor.Value"/>">
+ </td>
+ </tr>
+ </table>
+ </td>
</tr>
- <tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_DataGrid1"/>
- <td class="control-cell">
- <table class="skin-table">
- <tr>
- <td>Toolbar Backgroun (ToolbarBgColor)</td>
- <td>Filter Row Background (FiltersBgColor)</td>
- <td>Column Titles Color (ColumnTitlesColor)</td>
- <td>Column Titles Background (ColumnTitlesBgColor)</td>
- </tr>
- <tr>
- <td>
- <input style="width: 80px" type="text"
- name="<inp2:skin_InputName field="Options"/>[ToolbarBgColor][Value]"
- value="<inp2:skin_Field name="Options" format="ToolbarBgColor.Value"/>">
- </td>
- <td>
- <input style="width: 80px" type="text"
- name="<inp2:skin_InputName field="Options"/>[FiltersBgColor][Value]"
- value="<inp2:skin_Field name="Options" format="FiltersBgColor.Value"/>">
- </td>
- <td>
- <input style="width: 80px" type="text"
- name="<inp2:skin_InputName field="Options"/>[ColumnTitlesColor][Value]"
- value="<inp2:skin_Field name="Options" format="ColumnTitlesColor.Value"/>">
- </td>
- <td>
- <input style="width: 80px" type="text"
- name="<inp2:skin_InputName field="Options"/>[ColumnTitlesBgColor][Value]"
- value="<inp2:skin_Field name="Options" format="ColumnTitlesBgColor.Value"/>">
- </td>
- </tr>
- </table>
- </td>
- </tr>
+
+ <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+ <inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_DataGrid1"/>
+ <td class="control-cell">
+ <table class="skin-table">
+ <tr>
+ <td>Toolbar Backgroun (ToolbarBgColor)</td>
+ <td>Filter Row Background (FiltersBgColor)</td>
+ <td>Column Titles Color (ColumnTitlesColor)</td>
+ <td>Column Titles Background (ColumnTitlesBgColor)</td>
+ </tr>
+ <tr>
+ <td>
+ <input style="width: 80px" type="text"
+ name="<inp2:skin_InputName field="Options"/>[ToolbarBgColor][Value]"
+ value="<inp2:skin_Field name="Options" format="ToolbarBgColor.Value"/>">
+ </td>
+ <td>
+ <input style="width: 80px" type="text"
+ name="<inp2:skin_InputName field="Options"/>[FiltersBgColor][Value]"
+ value="<inp2:skin_Field name="Options" format="FiltersBgColor.Value"/>">
+ </td>
+ <td>
+ <input style="width: 80px" type="text"
+ name="<inp2:skin_InputName field="Options"/>[ColumnTitlesColor][Value]"
+ value="<inp2:skin_Field name="Options" format="ColumnTitlesColor.Value"/>">
+ </td>
+ <td>
+ <input style="width: 80px" type="text"
+ name="<inp2:skin_InputName field="Options"/>[ColumnTitlesBgColor][Value]"
+ value="<inp2:skin_Field name="Options" format="ColumnTitlesBgColor.Value"/>">
+ </td>
+ </tr>
+ </table>
+ </td>
</tr>
- <tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_DataGrid2"/>
- <td class="control-cell">
- <table class="skin-table">
- <tr>
- <td>Grid Odd Row Color (OddColor)</td>
- <td>Grid Odd Row Background Color (OddBgColor)</td>
- <td>Grid Even Row Color (EvenColor)</td>
- <td>Grid Even Row Background Color (EvenBgColor)</td>
- </tr>
- <tr>
- <td>
- <input style="width: 80px" type="text"
- name="<inp2:skin_InputName field="Options"/>[OddColor][Value]"
- value="<inp2:skin_Field name="Options" format="OddColor.Value"/>">
- </td>
- <td>
- <input style="width: 80px" type="text"
- name="<inp2:skin_InputName field="Options"/>[OddBgColor][Value]"
- value="<inp2:skin_Field name="Options" format="OddBgColor.Value"/>">
- </td>
- <td>
- <input style="width: 80px" type="text"
- name="<inp2:skin_InputName field="Options"/>[EvenColor][Value]"
- value="<inp2:skin_Field name="Options" format="EvenColor.Value"/>">
- </td>
- <td>
- <input style="width: 80px" type="text"
- name="<inp2:skin_InputName field="Options"/>[EvenBgColor][Value]"
- value="<inp2:skin_Field name="Options" format="EvenBgColor.Value"/>">
- </td>
- </tr>
- </table>
- </td>
- </tr>
+
+ <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+ <inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_DataGrid2"/>
+ <td class="control-cell">
+ <table class="skin-table">
+ <tr>
+ <td>Grid Odd Row Color (OddColor)</td>
+ <td>Grid Odd Row Background Color (OddBgColor)</td>
+ <td>Grid Even Row Color (EvenColor)</td>
+ <td>Grid Even Row Background Color (EvenBgColor)</td>
+ </tr>
+ <tr>
+ <td>
+ <input style="width: 80px" type="text"
+ name="<inp2:skin_InputName field="Options"/>[OddColor][Value]"
+ value="<inp2:skin_Field name="Options" format="OddColor.Value"/>">
+ </td>
+ <td>
+ <input style="width: 80px" type="text"
+ name="<inp2:skin_InputName field="Options"/>[OddBgColor][Value]"
+ value="<inp2:skin_Field name="Options" format="OddBgColor.Value"/>">
+ </td>
+ <td>
+ <input style="width: 80px" type="text"
+ name="<inp2:skin_InputName field="Options"/>[EvenColor][Value]"
+ value="<inp2:skin_Field name="Options" format="EvenColor.Value"/>">
+ </td>
+ <td>
+ <input style="width: 80px" type="text"
+ name="<inp2:skin_InputName field="Options"/>[EvenBgColor][Value]"
+ value="<inp2:skin_Field name="Options" format="EvenBgColor.Value"/>">
+ </td>
+ </tr>
+ </table>
+ </td>
</tr>
- <tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_Trees"/>
- <td class="control-cell">
- <table class="skin-table">
- <tr>
- <td>Tree Color (TreeColor)</td>
- <td>Tree Background Color (TreeBgColor)</td>
- <td>Tree Highlighted Color (TreeHighColor)</td>
- <td>Tree Highlighted Background Color (TreeHighBgColor)</td>
- </tr>
- <tr>
- <td>
- <input style="width: 80px" type="text"
- name="<inp2:skin_InputName field="Options"/>[TreeColor][Value]"
- value="<inp2:skin_Field name="Options" format="TreeColor.Value"/>">
- </td>
- <td>
- <input style="width: 80px" type="text"
- name="<inp2:skin_InputName field="Options"/>[TreeBgColor][Value]"
- value="<inp2:skin_Field name="Options" format="TreeBgColor.Value"/>">
- </td>
- <td>
- <input style="width: 80px" type="text"
- name="<inp2:skin_InputName field="Options"/>[TreeHighColor][Value]"
- value="<inp2:skin_Field name="Options" format="TreeHighColor.Value"/>">
- </td>
- <td>
- <input style="width: 80px" type="text"
- name="<inp2:skin_InputName field="Options"/>[TreeHighBgColor][Value]"
- value="<inp2:skin_Field name="Options" format="TreeHighBgColor.Value"/>">
- </td>
- </tr>
- </table>
- </td>
- </tr>
+ <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+ <inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_Trees"/>
+ <td class="control-cell">
+ <table class="skin-table">
+ <tr>
+ <td>Tree Color (TreeColor)</td>
+ <td>Tree Background Color (TreeBgColor)</td>
+ <td>Tree Highlighted Color (TreeHighColor)</td>
+ <td>Tree Highlighted Background Color (TreeHighBgColor)</td>
+ </tr>
+ <tr>
+ <td>
+ <input style="width: 80px" type="text"
+ name="<inp2:skin_InputName field="Options"/>[TreeColor][Value]"
+ value="<inp2:skin_Field name="Options" format="TreeColor.Value"/>">
+ </td>
+ <td>
+ <input style="width: 80px" type="text"
+ name="<inp2:skin_InputName field="Options"/>[TreeBgColor][Value]"
+ value="<inp2:skin_Field name="Options" format="TreeBgColor.Value"/>">
+ </td>
+ <td>
+ <input style="width: 80px" type="text"
+ name="<inp2:skin_InputName field="Options"/>[TreeHighColor][Value]"
+ value="<inp2:skin_Field name="Options" format="TreeHighColor.Value"/>">
+ </td>
+ <td>
+ <input style="width: 80px" type="text"
+ name="<inp2:skin_InputName field="Options"/>[TreeHighBgColor][Value]"
+ value="<inp2:skin_Field name="Options" format="TreeHighBgColor.Value"/>">
+ </td>
+ </tr>
+ </table>
+ </td>
</tr>
<!-- <inp2:m_RenderElement name="inp_edit_serialized" prefix="skin" field="Options" title="!la_fld_Options!" style="width: 100px" item_render_as="replacement_item"/>-->
<inp2:m_RenderElement name="inp_edit_textarea" prefix="skin" field="CSS" title="!la_fld_CSS!" control_options="{min_height: 300}"/>
</table>
</div>
<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Property changes on: branches/RC/core/admin_templates/skins/skin_edit.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4.2.4
\ No newline at end of property
+1.4.2.5
\ No newline at end of property
Index: branches/RC/core/admin_templates/mailing_lists/mailing_list_edit.tpl
===================================================================
--- branches/RC/core/admin_templates/mailing_lists/mailing_list_edit.tpl (revision 11697)
+++ branches/RC/core/admin_templates/mailing_lists/mailing_list_edit.tpl (revision 11698)
@@ -1,143 +1,145 @@
<inp2:adm_SetPopupSize width="865" height="640"/>
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" section="in-portal:mailing_lists" prefix="mailing-list" title_preset="mailing_list_edit"/>
<!-- ToolBar -->
<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
<tbody>
<tr>
<td>
<script type="text/javascript">
a_toolbar = new ToolBar();
<inp2:m_if check="mailing-list_IsNewItem">
a_toolbar.AddButton(
new ToolBarButton(
'select',
'<inp2:m_phrase label="la_ToolTip_Send" escape="1"/>',
function() {
submit_event('mailing-list', '<inp2:mailing-list_SaveEvent/>');
}
)
);
</inp2:m_if>
a_toolbar.AddButton(
new ToolBarButton(
'cancel',
'<inp2:m_phrase label="la_ToolTip_Close" escape="1"/>',
function() {
submit_event('mailing-list', 'OnGoBack');
}
)
);
a_toolbar.AddButton( new ToolBarSeparator('sep1') );
a_toolbar.AddButton(
new ToolBarButton(
'prev',
'<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>',
function() {
go_to_id('mailing-list', '<inp2:mailing-list_PrevId/>');
}
)
);
a_toolbar.AddButton(
new ToolBarButton(
'next',
'<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>',
function() {
go_to_id('mailing-list', '<inp2:mailing-list_NextId/>');
}
)
);
a_toolbar.Render();
<inp2:m_if check="mailing-list_IsSingle">
a_toolbar.HideButton('prev');
a_toolbar.HideButton('next');
a_toolbar.HideButton('sep1');
<inp2:m_else/>
<inp2:m_if check="mailing-list_IsLast">
a_toolbar.DisableButton('next');
</inp2:m_if>
<inp2:m_if check="mailing-list_IsFirst">
a_toolbar.DisableButton('prev');
</inp2:m_if>
</inp2:m_if>
</script>
<script type="text/javascript" src="js/swfobject.js"></script>
<script type="text/javascript" src="js/uploader.js"></script>
</td>
</tr>
</tbody>
</table>
<inp2:mailing-list_SaveWarning name="grid_save_warning"/>
<inp2:mailing-list_ErrorWarning name="form_error_warning"/>
<inp2:m_DefineElement name="recipient_element">
<<inp2:m_Param name="recipient_name"/>>
<inp2:m_if check="m_Param" name="not_last">; </inp2:m_if>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="inp_recipient_box" class="" format="" is_last="" maxlength="" onblur="" onchange="" size="" onkeyup="" style="width: 100%">
- <tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
- <td class="control-cell">
- <inp2:m_if check="{$prefix}_IsManualRecipient">
- <input style="<inp2:m_Param name="style"/>" type="text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" format="$format"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>">
- <inp2:m_else/>
- <inp2:$prefix_PrintRecipients render_as="recipient_element" strip_nl="2"/>
- <inp2:m_RenderElement name="inp_edit_hidden" prefix="$prefix" field="$field"/>
- </inp2:m_if>
+ <inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+ <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+ <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
+ <td class="control-cell">
+ <inp2:m_if check="{$prefix}_IsManualRecipient">
+ <input style="<inp2:m_Param name="style"/>" type="text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" format="$format"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>">
+ <inp2:m_else/>
+ <inp2:$prefix_PrintRecipients render_as="recipient_element" strip_nl="2"/>
+ <inp2:m_RenderElement name="inp_edit_hidden" prefix="$prefix" field="$field"/>
+ </inp2:m_if>
- <inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
- </td>
- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
- </tr>
+ <inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
+ </td>
+ <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+ </tr>
+ </inp2:m_if>
</inp2:m_DefineElement>
<div id="scroll_container">
<table class="edit-form">
<inp2:m_RenderElement name="subsection" title="la_section_General"/>
<inp2:m_RenderElement name="inp_id_label" prefix="mailing-list" field="MailingId" title="la_fld_Id"/>
<inp2:m_RenderElement name="inp_recipient_box" prefix="mailing-list" field="To" title="la_fld_To" size="60"/>
<inp2:m_if check="mailing-list_IsNewItem">
<inp2:m_RenderElement name="inp_edit_box" prefix="mailing-list" field="Subject" title="la_fld_Subject" size="60"/>
<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="mailing-list" field="Attachments" title="la_fld_Attachment"/>
<inp2:m_RenderElement name="inp_label" prefix="mailing-list" field="Status" title="la_fld_Status"/>
<inp2:m_else/>
<inp2:m_RenderElement name="inp_label" prefix="mailing-list" field="Subject" title="la_fld_Subject"/>
<inp2:m_RenderElement name="inp_label" prefix="mailing-list" field="Attachments" title="la_fld_Attachment"/>
<inp2:m_RenderElement name="inp_label" prefix="mailing-list" field="Status" title="la_fld_Status"/>
<inp2:m_RenderElement name="inp_label" prefix="mailing-list" field="EmailsQueued" title="la_fld_EmailsQueued"/>
<inp2:m_RenderElement name="inp_label" prefix="mailing-list" field="EmailsSent" title="la_fld_EmailsSent"/>
<inp2:m_RenderElement name="inp_label" prefix="mailing-list" field="EmailsTotal" title="la_fld_EmailsTotal"/>
</inp2:m_if>
<inp2:m_RenderElement name="subsection" title="la_section_Message"/>
<inp2:m_if check="mailing-list_IsNewItem">
<inp2:m_RenderElement name="inp_edit_textarea" prefix="mailing-list" field="MessageHtml" title="la_fld_HtmlVersion" control_options="{min_height: 140}" rows="10" cols="75"/>
<inp2:m_RenderElement name="inp_edit_textarea" prefix="mailing-list" field="MessageText" allow_html="0" title="la_fld_TextVersion" control_options="{min_height: 140}" rows="10" cols="75"/>
<inp2:m_else/>
<inp2:m_RenderElement name="inp_label" prefix="mailing-list" field="MessageHtml" title="la_fld_HtmlVersion"/>
<inp2:m_RenderElement name="inp_label" prefix="mailing-list" field="MessageText" title="la_fld_TextVersion" nl2br="1"/>
</inp2:m_if>
<inp2:m_RenderElement name="inp_edit_filler"/>
</table>
<input type="hidden" name="mailing_recipient_type" value="<inp2:m_Get name='mailing_recipient_type'/>"/>
</div>
<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Property changes on: branches/RC/core/admin_templates/mailing_lists/mailing_list_edit.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.3
\ No newline at end of property
+1.1.2.4
\ No newline at end of property
Index: branches/RC/core/admin_templates/incs/custom_blocks.tpl
===================================================================
--- branches/RC/core/admin_templates/incs/custom_blocks.tpl (revision 11697)
+++ branches/RC/core/admin_templates/incs/custom_blocks.tpl (revision 11698)
@@ -1,152 +1,152 @@
<inp2:m_DefineElement name="config_edit_text">
<input type="text" name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>" value="<inp2:Field field="$field"/>" <inp2:m_param name="field_params" />/>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="config_edit_password">
<input type="password" primarytype="password" name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>" value="" />
<input type="password" name="verify_<inp2:CustomInputName/>" id="verify_<inp2:CustomInputName/>" value="" />
<span class="error" id="error_<inp2:CustomInputName/>"></span>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="config_edit_option">
<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="config_edit_select">
<select name="<inp2:CustomInputName/>">
<inp2:PredefinedOptions field="$field" block="config_edit_option" selected="selected"/>
</select>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="config_edit_multiselect">
<select id="<inp2:CustomInputName/>_select" onchange="update_multiple_options('<inp2:CustomInputName/>');" multiple>
<inp2:PredefinedOptions field="$field" block="config_edit_option" selected="selected"/>
</select>
<input type="hidden" id="<inp2:CustomInputName/>" name="<inp2:CustomInputName/>" value="<inp2:Field field="$field"/>"/>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="config_edit_checkbox">
<input type="hidden" id="<inp2:CustomInputName/>" name="<inp2:CustomInputName/>" value="<inp2:Field field="$field" db="db"/>">
<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:m_param name="field"/>" <inp2:Field field="$field" checked="checked" db="db"/> onclick="update_checkbox(this, document.getElementById('<inp2:CustomInputName/>'))">
</inp2:m_DefineElement>
<inp2:m_DefineElement name="config_edit_textarea">
<textarea name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>" <inp2:m_param name="field_params" />><inp2:Field field="$field" /></textarea>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="config_radio_item">
<input type="radio" <inp2:m_param name="checked"/> name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:CustomInputName/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="config_edit_radio">
<inp2:PredefinedOptions field="$field" block="config_radio_item" selected="checked"/>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="config_edit_date">
<input type="text" name="<inp2:CustomInputName append="_date"/>" id="<inp2:CustomInputName append="_date"/>" value="<inp2:CustomField append="_date" format="_regional_InputDateFormat"/>" size="<inp2:CustomFormat append="_date" input_format="1" edit_size="edit_size"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
<img src="img/calendar_icon.gif" id="cal_img_<inp2:CustomInputName/>"
style="cursor: pointer; margin-right: 5px"
title="Date selector"
/>
<span class="small">(<inp2:CustomFormat append="_date" input_format="1" human="true"/>)</span>
<script type="text/javascript">
Calendar.setup({
inputField : "<inp2:CustomInputName append="_date"/>",
ifFormat : Calendar.phpDateFormat("<inp2:CustomFormat append="_date" input_format="1"/>"),
button : "cal_img_<inp2:CustomInputName/>",
align : "br",
singleClick : true,
showsTime : true,
weekNumbers : false,
firstDay : <inp2:m_GetConfig var="FirstDayOfWeek"/>,
onUpdate : function(cal) {
runOnChange('<inp2:CustomInputName append="_date"/>');
}
});
</script>
<input type="hidden" name="<inp2:CustomInputName append="_time"/>" value="">
</inp2:m_DefineElement>
<inp2:m_DefineElement name="config_edit_datetime">
<input type="text" name="<inp2:CustomInputName append="_date"/>" id="<inp2:CustomInputName append="_date"/>" value="<inp2:CustomField append="_date" format="_regional_InputDateFormat"/>" size="<inp2:CustomFormat append="_date" input_format="1" edit_size="edit_size"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
<img src="img/calendar_icon.gif" id="cal_img_<inp2:CustomInputName/>"
style="cursor: pointer; margin-right: 5px"
title="Date selector"
/>
<span class="small">(<inp2:CustomFormat append="_date" input_format="1" human="true"/>)</span>
<input type="hidden" id="full_date_<inp2:CustomInputName/>" value="<inp2:CustomField format=""/>" />
<script type="text/javascript">
Calendar.setup({
inputField : "full_date_<inp2:CustomInputName/>",
ifFormat : Calendar.phpDateFormat("<inp2:CustomFormat input_format="1"/>"),
button : "cal_img_<inp2:CustomInputName/>",
align : "br",
singleClick : true,
showsTime : true,
weekNumbers : false,
firstDay : <inp2:m_GetConfig var="FirstDayOfWeek"/>,
onUpdate : function(cal) {
document.getElementById('<inp2:CustomInputName append="_date"/>').value = cal.date.print( Calendar.phpDateFormat("<inp2:CustomFormat append="_date" input_format="1"/>") );
document.getElementById('<inp2:CustomInputName append="_time"/>').value = cal.date.print( Calendar.phpDateFormat("<inp2:CustomFormat append="_time" input_format="1"/>") );
}
});
</script>
<input type="text" name="<inp2:CustomInputName append="_time"/>" id="<inp2:CustomInputName append="_time"/>" value="<inp2:CustomField append="_time" format="_regional_InputTimeFormat"/>" size="<inp2:CustomFormat append="_time" input_format="1" edit_size="edit_size"/>"><span class="small"> (<inp2:CustomFormat append="_time" input_format="1" human="true"/>)</span>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="cv_row_block">
<inp2:m_if check="m_ParamEquals" name="show_heading" value="1">
<tr class="subsectiontitle">
<td colspan="3">
<inp2:Field name="Heading" as_label="1"/>
</td>
<inp2:m_if check="{$SourcePrefix}_DisplayOriginal" pass_params="1">
<td><inp2:m_phrase name="$original_title"/></td>
</inp2:m_if>
</tr>
</inp2:m_if>
- <tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+ <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
<inp2:m_inc param="tab_index" by="1"/>
<td class="label-cell" onmouseover="show_form_error('<inp2:m_Param name="SourcePrefix" js_escape="1"/>', '<inp2:m_Param name="virtual_field" js_escape="1"/>')" onmouseout="hide_form_error('<inp2:m_Param name="SourcePrefix" js_escape="1"/>')">
<inp2:m_RenderElement name="grid_data_label_ml_td" grid="$grid" SourcePrefix="$SourcePrefix" virtual_field="$virtual_field" value_field="$value_field" ElementTypeField="ElementType" field="Prompt" PrefixSpecial="$PrefixSpecial"/>
</td>
<td class="control-mid"> </td>
<script type="text/javascript">
if (typeof(fields['<inp2:m_Param name="SourcePrefix" js_escape="1"/>']) == 'undefined') {
fields['<inp2:m_Param name="SourcePrefix" js_escape="1"/>'] = new Object();
}
fields['<inp2:m_Param name="SourcePrefix" js_escape="1"/>']['<inp2:m_Param name="virtual_field" js_escape="1"/>'] = '<inp2:{$PrefixSpecial}_Field field="Prompt" grid="$grid" as_label="1" no_special="no_special" js_escape="1"/>'
</script>
<td class="control-cell" valign="top">
<inp2:ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
</td>
<inp2:m_RenderElement name="inp_edit_error" prefix="$SourcePrefix" field="$virtual_field"/>
<inp2:m_if check="{$SourcePrefix}_DisplayOriginal" pass_params="1">
<inp2:m_RenderElement prefix="$SourcePrefix" field="$field" name="inp_original_label"/>
</inp2:m_if>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="edit_custom_td">
<inp2:ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
</inp2:m_DefineElement>
<inp2:m_DefineElement name="custom_error_td">
<inp2:$SourcePrefix_Error field="$virtual_field"/>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="grid_original_td" >
<inp2:Field field="$field" grid="$grid"/>
</inp2:m_DefineElement>
<!--<inp2:m_DefineElement name="edit_custom_td">
<td valign="top" class="text">
<input type="hidden" name="<inp2:InputName field="ResourceId"/>" id="<inp2:InputName field="ResourceId"/>" value="<inp2:Field field="ResourceId" grid="$grid"/>">
<input type="hidden" name="<inp2:InputName field="CustomDataId"/>" id="<inp2:InputName field="CustomDataId"/>" value="<inp2:Field field="CustomDataId" grid="$grid"/>">
<inp2:ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
</td>
</inp2:m_DefineElement>-->
\ No newline at end of file
Property changes on: branches/RC/core/admin_templates/incs/custom_blocks.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13.2.3
\ No newline at end of property
+1.13.2.4
\ No newline at end of property
Index: branches/RC/core/admin_templates/regional/languages_export_step2.tpl
===================================================================
--- branches/RC/core/admin_templates/regional/languages_export_step2.tpl (revision 11697)
+++ branches/RC/core/admin_templates/regional/languages_export_step2.tpl (revision 11698)
@@ -1,43 +1,43 @@
<inp2:adm_SetPopupSize width="850" height="600"/>
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="export_language_results"/>
<!-- ToolBar -->
<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
<tbody>
<tr>
<td>
<script type="text/javascript">
a_toolbar = new ToolBar();
a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Close" escape="1"/>', function() {
submit_event('lang', 'OnGoBack');
}
) );
a_toolbar.Render();
</script>
</td>
</tr>
</tbody>
</table>
<div id="scroll_container">
<table class="edit-form">
<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
- <tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+ <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
<td class="label-cell">
<inp2:m_phrase label="la_DownloadLanguageExport"/>:
</td>
<td class="control-mid"> </td>
<td class="control-cell">
<a href="<inp2:lang_ExportPath as_url="1"/><inp2:m_get name="export_file"/>"><inp2:lang_ExportPath/><inp2:m_get name="export_file"/></a>
</td>
</tr>
<inp2:m_RenderElement name="inp_edit_filler"/>
</table>
</div>
<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Property changes on: branches/RC/core/admin_templates/regional/languages_export_step2.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4.2.2
\ No newline at end of property
+1.4.2.3
\ No newline at end of property
Index: branches/RC/core/admin_templates/regional/languages_export.tpl
===================================================================
--- branches/RC/core/admin_templates/regional/languages_export.tpl (revision 11697)
+++ branches/RC/core/admin_templates/regional/languages_export.tpl (revision 11698)
@@ -1,51 +1,53 @@
<inp2:adm_SetPopupSize width="850" height="600"/>
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="export_language"/>
<!-- ToolBar -->
<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
<tbody>
<tr>
<td>
<script type="text/javascript">
a_toolbar = new ToolBar();
a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
submit_event('lang','OnExportProgress');
}
) );
a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
submit_event('lang', 'OnGoBack');
}
) );
a_toolbar.Render();
</script>
</td>
</tr>
</tbody>
</table>
<inp2:phrases.export_SaveWarning name="grid_save_warning"/>
<inp2:phrases.export_ErrorWarning name="form_error_warning"/>
<div id="scroll_container">
<table class="edit-form">
<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
- <tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="phrases.export" field="LangFile" title="la_fld_ExportFileName"/>
- <td class="control-cell">
- <inp2:lang_ExportPath/> <input type="text" name="<inp2:phrases.export_InputName field="LangFile"/>" id="<inp2:phrases.export_InputName field="LangFile"/>" value="<inp2:phrases.export_Field field="LangFile"/>" />
- </td>
- <inp2:m_RenderElement name="inp_edit_error" prefix="phrases.export" field="LangFile"/>
- </tr>
+ <inp2:m_if check="phrases.export_FieldVisible" field="LangFile">
+ <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+ <inp2:m_RenderElement name="inp_edit_field_caption" prefix="phrases.export" field="LangFile" title="la_fld_ExportFileName"/>
+ <td class="control-cell">
+ <inp2:lang_ExportPath/> <input type="text" name="<inp2:phrases.export_InputName field='LangFile'/>" id="<inp2:phrases.export_InputName field='LangFile'/>" value="<inp2:phrases.export_Field field='LangFile'/>" />
+ </td>
+ <inp2:m_RenderElement name="inp_edit_error" prefix="phrases.export" field="LangFile"/>
+ </tr>
+ </inp2:m_if>
<inp2:m_RenderElement name="inp_edit_checkboxes" prefix="phrases.export" field="PhraseType" title="!la_fld_ExportPhraseTypes!"/>
<inp2:m_RenderElement name="inp_edit_checkboxes" no_empty="no_empty" prefix="phrases.export" field="Module" title="!la_fld_ExportModules!"/>
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="phrases.export" field="DoNotEncode" title="!la_fld_DoNotEncode!"/>
<inp2:m_RenderElement name="inp_edit_filler"/>
</table>
</div>
<inp2:m_include t="incs/footer"/>
Property changes on: branches/RC/core/admin_templates/regional/languages_export.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4.2.3
\ No newline at end of property
+1.4.2.4
\ No newline at end of property
Index: branches/RC/core/admin_templates/regional/languages_edit.tpl
===================================================================
--- branches/RC/core/admin_templates/regional/languages_edit.tpl (revision 11697)
+++ branches/RC/core/admin_templates/regional/languages_edit.tpl (revision 11698)
@@ -1,105 +1,107 @@
<inp2:adm_SetPopupSize width="850" height="600"/>
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="languages_edit_general" tab_preset="Default"/>
<!-- ToolBar -->
<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
<tbody>
<tr>
<td>
<script type="text/javascript">
a_toolbar = new ToolBar();
a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
submit_event('lang','<inp2:lang_SaveEvent/>');
}
) );
a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
submit_event('lang','OnCancelEdit');
}
) );
a_toolbar.AddButton( new ToolBarSeparator('sep1') );
a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
go_to_id('lang', '<inp2:lang_PrevId/>');
}
) );
a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
go_to_id('lang', '<inp2:lang_NextId/>');
}
) );
a_toolbar.Render();
<inp2:m_if check="lang_IsSingle" >
a_toolbar.HideButton('prev');
a_toolbar.HideButton('next');
a_toolbar.HideButton('sep1');
<inp2:m_else/>
<inp2:m_if check="lang_IsLast" >
a_toolbar.DisableButton('next');
</inp2:m_if>
<inp2:m_if check="lang_IsFirst" >
a_toolbar.DisableButton('prev');
</inp2:m_if>
</inp2:m_if>
</script>
</td>
</tr>
</tbody>
</table>
<inp2:lang_SaveWarning name="grid_save_warning"/>
<inp2:lang_ErrorWarning name="form_error_warning"/>
<div id="scroll_container">
<table class="edit-form">
<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
<inp2:m_RenderElement name="inp_id_label" prefix="lang" field="LanguageId" title="!la_fld_LanguageId!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="PackName" title="!la_fld_PackName!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="LocalName" title="!la_fld_LocalName!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="Charset" title="!la_fld_Charset!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="IconURL" title="!la_fld_IconURL!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="DateFormat" title="!la_fld_DateFormat!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="TimeFormat" title="!la_fld_TimeFormat!"/>
<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="InputDateFormat" title="!la_fld_InputDateFormat!"/>
<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="InputTimeFormat" title="!la_fld_InputTimeFormat!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="DecimalPoint" title="!la_fld_DecimalPoint!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="ThousandSep" title="!la_fld_ThousandSep!"/>
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="lang" field="PrimaryLang" title="!la_fld_PrimaryLang!"/>
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="lang" field="AdminInterfaceLang" title="la_fld_AdminInterfaceLang"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="Priority" title="la_fld_Priority"/>
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="lang" field="Enabled" title="!la_fld_Enabled!"/>
<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="UnitSystem" title="!la_fld_UnitSystem!"/>
<inp2:m_RenderElement name="inp_edit_options" prefix="lang" field="Locale" title="!la_fld_Locale!"/>
<inp2:m_RenderElement name="inp_edit_textarea" prefix="lang" field="FilenameReplacements" title="la_fld_FilenameReplacements" control_options="{min_height: 200}" cols="50" rows="10"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="lang" field="UserDocsUrl" title="la_fld_UserDocsUrl"/>
<inp2:m_if check="lang_IsNewMode">
- <tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
- <inp2:m_inc param="tab_index" by="1"/>
- <td class="label-cell">
- <inp2:m_phrase name="la_fld_CopyLabels"/>:
- </td>
- <td class="control-mid"> </td>
- <td class="control-cell">
- <input type="hidden" id="<inp2:lang_InputName field="CopyLabels"/>" name="<inp2:lang_InputName field="CopyLabels"/>" value="<inp2:lang_Field field="CopyLabels" db="db"/>">
- <input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_CopyLabels" name="_cb_CopyLabels" <inp2:lang_Field field="CopyLabels" checked="checked" db="db"/> onclick="update_checkbox(this, document.getElementById('<inp2:lang_InputName field="CopyLabels"/>'))">
-
+ <inp2:m_if check="lang_FieldVisible" field="CopyLabels">
+ <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
<inp2:m_inc param="tab_index" by="1"/>
- <select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:lang_InputName field="CopyFromLanguage"/>" id="<inp2:lang_InputName field="CopyFromLanguage"/>">
- <option value="0">--<inp2:m_phrase name="la_prompt_Select_Source"/></option>
- <inp2:lang_PredefinedOptions field="CopyFromLanguage" block="inp_option_item" selected="selected"/>
- </select>
- </td>
- </tr>
+ <td class="label-cell">
+ <inp2:m_phrase name="la_fld_CopyLabels"/>:
+ </td>
+ <td class="control-mid"> </td>
+ <td class="control-cell">
+ <input type="hidden" id="<inp2:lang_InputName field="CopyLabels"/>" name="<inp2:lang_InputName field="CopyLabels"/>" value="<inp2:lang_Field field="CopyLabels" db="db"/>">
+ <input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_CopyLabels" name="_cb_CopyLabels" <inp2:lang_Field field="CopyLabels" checked="checked" db="db"/> onclick="update_checkbox(this, document.getElementById('<inp2:lang_InputName field="CopyLabels"/>'))">
+
+ <inp2:m_inc param="tab_index" by="1"/>
+ <select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:lang_InputName field="CopyFromLanguage"/>" id="<inp2:lang_InputName field="CopyFromLanguage"/>">
+ <option value="0">--<inp2:m_phrase name="la_prompt_Select_Source"/></option>
+ <inp2:lang_PredefinedOptions field="CopyFromLanguage" block="inp_option_item" selected="selected"/>
+ </select>
+ </td>
+ </tr>
+ </inp2:m_if>
</inp2:m_if>
</table>
</div>
<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Property changes on: branches/RC/core/admin_templates/regional/languages_edit.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5.2.8
\ No newline at end of property
+1.5.2.9
\ No newline at end of property
Index: branches/RC/core/admin_templates/emails/send_complete.tpl
===================================================================
--- branches/RC/core/admin_templates/emails/send_complete.tpl (revision 11697)
+++ branches/RC/core/admin_templates/emails/send_complete.tpl (revision 11698)
@@ -1,28 +1,28 @@
<inp2:adm_SetPopupSize width="900" height="600"/>
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" permission_type="advanced:send_email" prefix="emailevents" title_preset="email_send_complete"/>
<script type="text/javascript">
function close_window() {
var $opener = getWindowOpener(window);
if ($opener) {
$opener.location.reload();
}
window_close();
}
</script>
<div id="scroll_container">
<table class="edit-form">
<inp2:m_RenderElement name="subsection" title="la_prompt_EmailCompleteMessage"/>
- <tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+ <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
<td colspan="3" align="center">
<input type="button" value="<inp2:m_phrase name="la_Close"/>" class="button" onclick="close_window();"/>
</td>
</tr>
</table>
</div>
<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Property changes on: branches/RC/core/admin_templates/emails/send_complete.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3.2.3
\ No newline at end of property
+1.3.2.4
\ No newline at end of property
Index: branches/RC/core/admin_templates/emails/mass_mail.tpl
===================================================================
--- branches/RC/core/admin_templates/emails/mass_mail.tpl (revision 11697)
+++ branches/RC/core/admin_templates/emails/mass_mail.tpl (revision 11698)
@@ -1,64 +1,64 @@
<inp2:adm_SetPopupSize width="900" height="600"/>
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" permission_type="advanced:send_email" prefix="emailevents" title_preset="email_send_form"/>
<!-- ToolBar -->
<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
<tbody>
<tr>
<td>
<script type="text/javascript">
var a_toolbar = new ToolBar();
a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_SendEmail" escape="1"/>', function() {
submit_event('emailmessages', 'OnMassMail');
}
) );
a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
submit_event('emailmessages', 'OnGoBack');
}
) );
a_toolbar.Render();
</script>
</td>
</tr>
</tbody>
</table>
<inp2:emailmessages_SaveWarning name="grid_save_warning"/>
<inp2:emailmessages_ErrorWarning name="form_error_warning"/>
<div id="scroll_container">
<table class="edit-form">
<inp2:m_RenderElement name="subsection" title="la_section_General"/>
<!-- recipients list -->
- <tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+ <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
<inp2:m_inc param="tab_index" by="1"/>
<td class="label-cell">
<inp2:m_phrase label="la_fld_To"/>:
</td>
<td class="control-mid"> </td>
<td class="control-cell">
<inp2:m_DefineElement name="recipient_element">
<<inp2:m_Param name="recipient_name"/>>
<inp2:m_if check="m_Param" name="not_last">
;
</inp2:m_if>
</inp2:m_DefineElement>
<inp2:emailmessages_PrintRecipients render_as="recipient_element" strip_nl="2"/>
</td>
</tr>
<!-- // recipients list -->
<inp2:m_RenderElement name="inp_edit_box" prefix="emailmessages" field="MassSubject" title="la_fld_Subject" size="60"/>
<inp2:m_RenderElement name="inp_edit_upload" prefix="emailmessages" field="MassAttachment" title="la_fld_Attachment" size="60"/>
<inp2:m_RenderElement name="subsection" title="la_section_Message"/>
<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailmessages" field="MassHtmlMessage" title="la_fld_HtmlVersion" rows="10" cols="100"/>
<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailmessages" field="MassTextMessage" allow_html="0" title="la_fld_TextVersion" rows="10" cols="100"/>
</table>
</div>
<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Property changes on: branches/RC/core/admin_templates/emails/mass_mail.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/core/admin_templates/stylesheets/style_editor.tpl
===================================================================
--- branches/RC/core/admin_templates/stylesheets/style_editor.tpl (revision 11697)
+++ branches/RC/core/admin_templates/stylesheets/style_editor.tpl (revision 11698)
@@ -1,152 +1,152 @@
<inp2:adm_SetPopupSize width="750" height="400"/>
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="css" section="in-portal:configure_styles" title_preset="style_edit"/>
<script src="js/colorselector.js" type="text/javascript"></script>
<style type="text/css">
.ColorBox
{
font-size: 1px;
border: #808080 1px solid;
width: 10px;
position: static;
height: 10px;
}
</style>
<!-- ToolBar -->
<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
<tbody>
<tr>
<td>
<script type="text/javascript">
a_toolbar = new ToolBar();
a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
submit_event('selectors','OnSaveStyle');
}
) );
a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
window_close();
}
) );
a_toolbar.AddButton( new ToolBarSeparator('sep1') );
a_toolbar.AddButton( new ToolBarButton('reset_to_base', '<inp2:m_phrase label="la_ToolTip_ResetToBase" escape="1"/>', function() {
submit_event('selectors','OnResetToBase');
}
) );
a_toolbar.Render();
</script>
</td>
</tr>
</tbody>
</table>
<inp2:m_DefineElement name="inp_edit_color">
- <tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+ <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title_phrase="$title_phrase" title="$title" is_last="$is_last"/>
<td class="control-cell">
<input type="text"
name="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>"
id="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>"
value="<inp2:{$prefix}_Field field="$field" subfield="$subfield"/>"
tabindex="<inp2:m_get param="tab_index"/>"
size="<inp2:m_param name="size"/>"
maxlength="<inp2:m_param name="maxlength"/>"
class="<inp2:m_param name="class"/>"
onkeyup="updateColor(event,'<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>')"
onblur="<inp2:m_Param name="onblur"/>">
<div id="color_<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>" style="display: inline; border: 1px solid #000000;" onclick="openColorSelector(event,'<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>');"> </div>
<script language="javascript">
updateColor(null,'<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>');
</script>
</td>
<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="inp_edit_options_style">
- <tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+ <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title_phrase="$title_phrase" title="$title" is_last="$is_last"/>
<td class="control-cell">
<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>" id="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>" onchange="<inp2:m_Param name="onchange"/>">
<inp2:{$prefix}_PredefinedOptions field="$field" value_field="$value_field" subfield="$subfield" block="inp_option_item" selected="selected"/>
</select>
</td>
<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="subsection_collapse">
<tr class="subsectiontitle">
<td colspan="5"><inp2:m_phrase label="$title"/></td>
</tr>
</inp2:m_DefineElement>
<inp2:selectors_SaveWarning name="grid_save_warning"/>
<inp2:selectors_ErrorWarning name="form_error_warning"/>
<div id="scroll_container">
<table class="edit-form">
<inp2:m_RenderElement name="subsection_collapse" title="!la_Font!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="font" title="!la_fld_Font!" size="50"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="font-family" title="!la_fld_FontFamily!" size="40"/>
<inp2:m_RenderElement name="inp_edit_color" prefix="selectors" field="SelectorData" subfield="color" title="!la_fld_FontColor!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="font-size" title="!la_fld_FontSize!"/>
<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="font-style" value_field="FontStyle" title="!la_fld_FontStyle!"/>
<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="font-weight" value_field="FontWeight" title="!la_fld_FontWeight!"/>
<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="text-align" value_field="TextAlign" title="!la_fld_TextAlign!"/>
<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="text-decoration" value_field="TextDecoration" title="!la_fld_TextDecoration!"/>
<inp2:m_RenderElement name="subsection_collapse" title="!la_Background!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="background" title="!la_fld_Background!" size="50"/>
<inp2:m_RenderElement name="inp_edit_color" prefix="selectors" field="SelectorData" subfield="background-color" title="!la_fld_BackgroundColor!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="background-image" title="!la_fld_BackgroundImage!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="background-repeat" title="!la_fld_BackgroundRepeat!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="background-attachment" title="!la_fld_BackgroundAttachment!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="background-position" title="!la_fld_BackgroundPosition!"/>
<inp2:m_RenderElement name="subsection_collapse" title="!la_Borders!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="border" title="!la_fld_Borders!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="border-top" title="!la_fld_BorderTop!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="border-right" title="!la_fld_BorderRight!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="border-bottom" title="!la_fld_BorderBottom!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="border-left" title="!la_fld_BorderLeft!"/>
<inp2:m_RenderElement name="subsection_collapse" title="!la_Paddings!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="padding" title="!la_fld_Paddings!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="padding-top" title="!la_fld_PaddingTop!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="padding-right" title="!la_fld_PaddingRight!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="padding-bottom" title="!la_fld_PaddingBottom!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="padding-left" title="!la_fld_PaddingLeft!"/>
<inp2:m_RenderElement name="subsection_collapse" title="!la_Margins!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="margin" title="!la_fld_Margins!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="margin-top" title="!la_fld_MarginTop!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="margin-right" title="!la_fld_MarginRight!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="margin-bottom" title="!la_fld_MarginBottom!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="margin-left" title="!la_fld_MarginLeft!"/>
<inp2:m_RenderElement name="subsection_collapse" title="!la_PositionAndVisibility!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="width" title="!la_fld_Width!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="height" title="!la_fld_Height!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="left" title="!la_fld_Left!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="top" title="!la_fld_Top!"/>
<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="position" value_field="StylePosition" title="!la_fld_Position!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="z-index" title="!la_fld_Z-Index!"/>
<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="display" value_field="StyleDisplay" title="!la_fld_Display!"/>
<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="visibility" value_field="StyleVisibility" title="!la_fld_Visibility!"/>
<inp2:m_RenderElement name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="cursor" value_field="StyleCursor" title="!la_fld_Cursor!"/>
<inp2:m_RenderElement name="inp_edit_filler"/>
</table>
</div>
<script type="text/javascript">
$(document).ready(
function() {
InitColorSelector();
}
);
</script>
<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Property changes on: branches/RC/core/admin_templates/stylesheets/style_editor.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.12.2.5
\ No newline at end of property
+1.12.2.6
\ No newline at end of property
Index: branches/RC/core/admin_templates/stylesheets/base_style_edit.tpl
===================================================================
--- branches/RC/core/admin_templates/stylesheets/base_style_edit.tpl (revision 11697)
+++ branches/RC/core/admin_templates/stylesheets/base_style_edit.tpl (revision 11698)
@@ -1,103 +1,103 @@
<inp2:adm_SetPopupSize width="750" height="400"/>
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="css" section="in-portal:configure_styles" title_preset="base_style_edit"/>
<!-- ToolBar -->
<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
<tbody>
<tr>
<td>
<script type="text/javascript">
a_toolbar = new ToolBar();
a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
submit_event('selectors','<inp2:selectors_SaveEvent/>');
}
) );
a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
submit_event('selectors','OnCancel');
}
) );
a_toolbar.Render();
function ValidateRequired()
{
var $fields = new Array('<inp2:selectors_InputName field="Name"/>',
'<inp2:selectors_InputName field="SelectorName"/>');
var $ret = true;
var $i = 0;
var $value = '';
while($i < $fields.length)
{
$value = document.getElementById( $fields[$i] ).value;
$value = $value.replace(' ','');
if($value.length == 0)
{
$ret = false;
break;
}
$i++;
}
return $ret;
}
function editStyle()
{
if( ValidateRequired() )
{
openSelector('selectors', '<inp2:m_t t="stylesheets/style_editor" pass="all"/>', '', '850x460', 'OnOpenStyleEditor');
}
else
{
alert( RemoveTranslationLink('<inp2:m_phrase name="la_RequiredWarning"/>') );
}
}
</script>
</td>
</tr>
</tbody>
</table>
<inp2:selectors_SaveWarning name="grid_save_warning"/>
<inp2:selectors_ErrorWarning name="form_error_warning"/>
<div id="scroll_container">
<table class="edit-form">
<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
<inp2:m_RenderElement name="inp_edit_hidden" prefix="selectors" field="StylesheetId"/>
<input type="hidden" name="<inp2:selectors_InputName field="Type"/>" value="1">
<inp2:m_RenderElement name="inp_id_label" prefix="selectors" field="SelectorId" title="!la_fld_SelectorId!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorName" title="!la_fld_SelectorName!" size="40"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="Name" title="!la_fld_Name!" size="40"/>
<inp2:m_RenderElement name="inp_edit_textarea" prefix="selectors" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
<inp2:m_RenderElement name="inp_edit_textarea" prefix="selectors" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
- <tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+ <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
<inp2:m_inc param="tab_index" by="1"/>
<td class="label-cell">
<inp2:m_phrase name="la_fld_SelectorData"/>:<br>
<a href="javascript:editStyle();"><img src="img/icons/icon24_link_editor.gif" style="cursor:hand" border="0"></a>
</td>
<td class="control-mid"> </td>
<td class="control-cell">
<table width="100%">
<tr>
<td><inp2:m_phrase name="la_StyleDefinition"/>:</td>
<td>
<inp2:selectors_PrintStyle field="SelectorData"/>
</td>
<td><inp2:m_phrase name="la_StylePreview"/>:</td>
<td style="<inp2:selectors_PrintStyle field="SelectorData" inline="inline"/>">
<inp2:m_phrase name="la_SampleText"/>
</td>
</tr>
</table>
</td>
</tr>
<inp2:m_RenderElement name="inp_edit_filler"/>
</table>
</div>
<input type="hidden" name="main_prefix" id="main_prefix" value="selectors">
<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Property changes on: branches/RC/core/admin_templates/stylesheets/base_style_edit.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11.2.5
\ No newline at end of property
+1.11.2.6
\ No newline at end of property
Index: branches/RC/core/admin_templates/stylesheets/block_style_edit.tpl
===================================================================
--- branches/RC/core/admin_templates/stylesheets/block_style_edit.tpl (revision 11697)
+++ branches/RC/core/admin_templates/stylesheets/block_style_edit.tpl (revision 11698)
@@ -1,114 +1,114 @@
<inp2:adm_SetPopupSize width="750" height="400"/>
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="css" section="in-portal:configure_styles" title_preset="block_style_edit"/>
<!-- ToolBar -->
<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
<tbody>
<tr>
<td>
<script type="text/javascript">
a_toolbar = new ToolBar();
a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
submit_event('selectors','<inp2:selectors_SaveEvent/>');
}
) );
a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
submit_event('selectors','OnCancel');
}
) );
a_toolbar.AddButton( new ToolBarSeparator('sep1') );
a_toolbar.AddButton( new ToolBarButton('reset_to_base', '<inp2:m_phrase label="la_ToolTip_ResetToBase" escape="1"/>', function() {
submit_event('selectors','OnResetToBase');
}
) );
a_toolbar.Render();
function ValidateRequired()
{
var $fields = new Array('<inp2:selectors_InputName field="Name"/>',
'<inp2:selectors_InputName field="SelectorName"/>');
var $ret = true;
var $i = 0;
var $value = '';
while($i < $fields.length)
{
$value = document.getElementById( $fields[$i] ).value;
$value = $value.replace(' ','');
if($value.length == 0)
{
$ret = false;
break;
}
$i++;
}
return $ret;
}
function editStyle()
{
if( ValidateRequired() )
{
openSelector('selectors', '<inp2:m_t t="stylesheets/style_editor" pass="all"/>', '', '850x460', 'OnOpenStyleEditor');
}
else
{
alert( RemoveTranslationLink('<inp2:m_phrase name="la_RequiredWarning"/>') );
}
}
</script>
</td>
</tr>
</tbody>
</table>
<inp2:selectors_SaveWarning name="grid_save_warning"/>
<inp2:selectors_ErrorWarning name="form_error_warning"/>
<div id="scroll_container">
<table class="edit-form">
<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
<inp2:m_RenderElement name="inp_edit_hidden" prefix="selectors" field="StylesheetId"/>
<input type="hidden" name="<inp2:selectors_InputName field="Type"/>" value="2">
<inp2:m_RenderElement name="inp_id_label" prefix="selectors" field="SelectorId" title="!la_fld_SelectorId!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorName" title="!la_fld_SelectorName!" size="40"/>
<inp2:m_RenderElement name="inp_edit_options" prefix="selectors" field="ParentId" title="!la_fld_SelectorBase!"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="Name" title="!la_fld_Name!" size="40"/>
<inp2:m_RenderElement name="inp_edit_textarea" prefix="selectors" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
<inp2:m_RenderElement name="inp_edit_textarea" prefix="selectors" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
- <tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+ <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
<inp2:m_inc param="tab_index" by="1"/>
<td class="label-cell">
<inp2:m_phrase name="la_fld_SelectorData"/>:<br>
<a href="javascript:editStyle();"><img src="img/icons/icon24_link_editor.gif" style="cursor:hand" border="0"></a>
</td>
<td class="control-mid"> </td>
<td class="control-cell">
<table width="100%">
<tr>
<td><inp2:m_phrase name="la_StyleDefinition"/>:</td>
<td>
<inp2:selectors_PrintStyle field="SelectorData"/>
</td>
<td><inp2:m_phrase name="la_StylePreview"/>:</td>
<td style="<inp2:selectors_PrintStyle field="SelectorData" inline="inline"/>">
<inp2:m_phrase name="la_SampleText"/>
</td>
</tr>
</table>
</td>
</tr>
<inp2:m_RenderElement name="inp_edit_filler"/>
</table>
</div>
<input type="hidden" name="main_prefix" id="main_prefix" value="selectors">
<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Property changes on: branches/RC/core/admin_templates/stylesheets/block_style_edit.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11.2.6
\ No newline at end of property
+1.11.2.7
\ No newline at end of property
Index: branches/RC/core/admin_templates/submissions/submission_view.tpl
===================================================================
--- branches/RC/core/admin_templates/submissions/submission_view.tpl (revision 11697)
+++ branches/RC/core/admin_templates/submissions/submission_view.tpl (revision 11698)
@@ -1,117 +1,117 @@
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" section="in-portal:submissions" prefix="formsubs" title_preset="formsubs_view"/>
<!-- ToolBar -->
<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
<tbody>
<tr>
<td>
<script type="text/javascript">
a_toolbar = new ToolBar();
a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
submit_event('formsubs','OnCancelEdit');
}
) );
a_toolbar.AddButton( new ToolBarSeparator('sep1') );
a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
go_to_id('formsubs', '<inp2:formsubs_PrevId/>');
}
) );
a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
go_to_id('formsubs', '<inp2:formsubs_NextId/>');
}
) );
//a_toolbar.AddButton( new ToolBarSeparator('sep2') );
a_toolbar.Render();
<inp2:m_if check="formsubs_IsSingle" >
a_toolbar.HideButton('prev');
a_toolbar.HideButton('next');
a_toolbar.HideButton('sep1');
//a_toolbar.HideButton('sep2');
<inp2:m_else/>
<inp2:m_if check="formsubs_IsLast" >
a_toolbar.DisableButton('next');
</inp2:m_if>
<inp2:m_if check="formsubs_IsFirst" >
a_toolbar.DisableButton('prev');
</inp2:m_if>
</inp2:m_if>
</script>
</td>
</tr>
</tbody>
</table>
<inp2:m_DefineElement name="form_field_text">
<inp2:m_if check="FieldEquals" field="Validation" value="1">
<a href="mailto:<inp2:SubmissionTag tag="Field"/>"><inp2:SubmissionTag tag="Field"/></a>
<inp2:m_else/>
<inp2:SubmissionTag tag="Field"/>
</inp2:m_if>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="form_field_password">
<inp2:SubmissionTag tag="Field"/>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="form_field_option">
<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="form_field_select">
<inp2:SubmissionTag tag="Field"/>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="form_field_checkbox">
<input type="hidden" id="<inp2:CustomInputName/>" name="<inp2:CustomInputName/>" value="<inp2:SubmissionTag tag="Field" field="$field" db="db"/>">
<input disabled="disabled" tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:m_param name="field"/>" <inp2:SubmissionTag tag="Field" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onclick="document.getElementById('<inp2:CustomInputName/>').value = this.checked ? 1:0">
</inp2:m_DefineElement>
<inp2:m_DefineElement name="form_field_textarea">
<inp2:SubmissionTag tag="Field" nl2br="1" no_special="1"/>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="form_radio_item">
<input disabled="disabled" type="radio" <inp2:m_param name="checked"/> name="<inp2:m_param name="field_name"/>" id="<inp2:m_param name="field_name"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:m_param name="field_name"/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="form_field_radio">
<inp2:SubmissionTag tag="PredefinedOptions" field="$field" tabindex="$pass_tabindex" block="form_radio_item" selected="checked"/>
</inp2:m_DefineElement>
<inp2:formsubs_SaveWarning name="grid_save_warning"/>
<inp2:formsubs_ErrorWarning name="form_error_warning"/>
<div id="scroll_container">
<table class="edit-form">
<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
<inp2:m_RenderElement name="inp_id_label" prefix="formsubs" field="FormSubmissionId" title="!la_fld_Id!"/>
<inp2:m_RenderElement name="inp_edit_date_time" prefix="formsubs" field="SubmissionTime" title="!la_fld_SubmissionTime!" />
<inp2:m_RenderElement name="subsection" title="!la_section_Data!"/>
<inp2:m_DefineElement name="form_field">
- <tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+ <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
<inp2:m_inc param="tab_index" by="1"/>
<td class="label-cell">
<inp2:Field field="Prompt" plus_or_as_label="1" no_special="no_special"/>:
</td>
<td class="control-mid"> </td>
<td class="control-cell">
<inp2:ConfigFormElement field="Value" blocks_prefix="form_field_" element_type_field="ElementType" value_list_field="ValueList" /><br/>
</td>
</tr>
</inp2:m_DefineElement>
<inp2:formflds_PrintList render_as="form_field" SourcePrefix="formsubs" per_page="-1"/>
<inp2:m_RenderElement name="inp_edit_filler"/>
</table>
</div>
<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Property changes on: branches/RC/core/admin_templates/submissions/submission_view.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.3
\ No newline at end of property
+1.1.2.4
\ No newline at end of property
Event Timeline
Log In to Comment