Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F2115083
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
Wed, Nov 18, 5:20 PM
Size
19 KB
Mime Type
text/x-diff
Expires
Fri, Nov 20, 5:20 PM (20 m, 50 s)
Engine
blob
Format
Raw Data
Handle
994822
Attached To
rINP In-Portal
in-portal
View Options
Index: trunk/core/admin_templates/users/user_edit_password.tpl
===================================================================
--- trunk/core/admin_templates/users/user_edit_password.tpl (revision 8894)
+++ trunk/core/admin_templates/users/user_edit_password.tpl (revision 8895)
@@ -1,39 +1,39 @@
<inp2:adm_SetPopupSize width="564" height="377"/>
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" section="proj-base:users" pagination="0" prefix="u" title_preset="admins_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('u','<inp2:u_SaveEvent/>');
}
) );
a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
cancel_edit('u','OnCancelEdit','<inp2:u_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
}
) );
a_toolbar.Render();
</script>
</td>
</tr>
</tbody>
</table>
<inp2:u_SaveWarning name="grid_save_warning"/>
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="table-collapsed">
- <inp2:m_ParseBlock name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
- <inp2:m_ParseBlock name="inp_label" prefix="u" field="Login" title="la_fld_Username"/>
- <inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
- <inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
- <inp2:m_ParseBlock name="inp_label" prefix="u" field="FirstName" title="la_fld_FirstName"/>
- <inp2:m_ParseBlock name="inp_label" prefix="u" field="LastName" title="la_fld_LastName"/>
- <inp2:m_ParseBlock name="inp_label" prefix="u" field="Email" title="la_fld_Email"/>
+ <inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
+ <inp2:m_RenderElement name="inp_label" prefix="u" field="Login" title="la_fld_Username"/>
+ <inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
+ <inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
+ <inp2:m_RenderElement name="inp_label" prefix="u" field="FirstName" title="la_fld_FirstName"/>
+ <inp2:m_RenderElement name="inp_label" prefix="u" field="LastName" title="la_fld_LastName"/>
+ <inp2:m_RenderElement name="inp_label" prefix="u" field="Email" title="la_fld_Email"/>
</table>
<inp2:m_include t="incs/footer"/>
Property changes on: trunk/core/admin_templates/users/user_edit_password.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: trunk/core/admin_templates/users/admins_list.tpl
===================================================================
--- trunk/core/admin_templates/users/admins_list.tpl (revision 8894)
+++ trunk/core/admin_templates/users/admins_list.tpl (revision 8895)
@@ -1,52 +1,52 @@
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" section="proj-base:admins" pagination="1" prefix="u.admins" title_preset=""/>
<!-- ToolBar --->
<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
<tbody>
<tr>
<td>
<script type="text/javascript">
//do not rename - this function is used in default grid for double click!
function edit()
{
set_hidden_field('remove_specials[u.admins]', 1);
std_edit_item('u.admins', 'proj-base/users/admins_edit');
}
var a_toolbar = new ToolBar();
a_toolbar.AddButton( new ToolBarButton('proj-base:new_user', '<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
function() {
set_hidden_field('remove_specials[u.admins]', 1);
std_precreate_item('u.admins', 'proj-base/users/admins_edit')
} ) );
a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Edit" escape="1"/>', edit) );
a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
function() {
set_hidden_field('remove_specials[u.admins]', 1);
std_delete_items('u.admins')
} ) );
a_toolbar.AddButton( new ToolBarSeparator('sep1') );
a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
show_viewmenu(a_toolbar,'view');
}
) );
a_toolbar.Render();
</script>
</td>
<inp2:m_RenderElement name="search_main_toolbar" prefix="u.admins" grid="Admins"/>
</tr>
</tbody>
</table>
-<inp2:m_ParseBlock name="grid" PrefixSpecial="u.admins" IdField="PortalUserId" grid="Admins" menu_filters="yes" grid_filters="1"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="u.admins" IdField="PortalUserId" grid="Admins" menu_filters="yes" grid_filters="1"/>
<script type="text/javascript">
Grids['u.admins'].SetDependantToolbarButtons( new Array('edit','delete') );
</script>
<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Property changes on: trunk/core/admin_templates/users/admins_list.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: trunk/core/admin_templates/users/users_edit.tpl
===================================================================
--- trunk/core/admin_templates/users/users_edit.tpl (revision 8894)
+++ trunk/core/admin_templates/users/users_edit.tpl (revision 8895)
@@ -1,75 +1,75 @@
<inp2:adm_SetPopupSize width="550" height="425"/>
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" section="proj-base:users" pagination="0" prefix="u" title_preset="admins_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('u','<inp2:u_SaveEvent/>');
}
) );
a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
cancel_edit('u','OnCancelEdit','<inp2:u_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('u', '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('u', '<inp2:u_PrevId/>');
}
) );
a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
go_to_id('u', '<inp2:u_NextId/>');
}
) );
a_toolbar.Render();
- <inp2:m_if prefix="u" function="IsSingle"/>
+ <inp2:m_if check="u_IsSingle" >
a_toolbar.HideButton('prev');
a_toolbar.HideButton('next');
a_toolbar.HideButton('sep1');
<inp2:m_else/>
- <inp2:m_if prefix="u" function="IsLast"/>
+ <inp2:m_if check="u_IsLast" >
a_toolbar.DisableButton('next');
- <inp2:m_endif/>
- <inp2:m_if prefix="u" function="IsFirst"/>
+ </inp2:m_if>
+ <inp2:m_if check="u_IsFirst" >
a_toolbar.DisableButton('prev');
- <inp2:m_endif/>
- <inp2:m_endif/>
+ </inp2:m_if>
+ </inp2:m_if>
</script>
</td>
<inp2:m_RenderElement name="ml_selector" prefix="u"/>
</tr>
</tbody>
</table>
<inp2:u_SaveWarning name="grid_save_warning"/>
<inp2:u_ErrorWarning name="form_error_warning"/>
<div id="scroll_container">
<table class="edit-form">
- <inp2:m_ParseBlock name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
- <inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
- <inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
- <inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
- <inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="FirstName" title="la_fld_FirstName"/>
- <inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="LastName" title="la_fld_LastName"/>
- <inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Email" title="la_fld_Email"/>
- <inp2:m_ParseBlock name="inp_edit_options" prefix="u" field="Country" title="la_fld_Country"/>
+ <inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
+ <inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
+ <inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="la_fld_FirstName"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="la_fld_LastName"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="la_fld_Email"/>
+ <inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="la_fld_Country"/>
<inp2:m_RenderElement name="inp_edit_filler"/>
</table>
</div>
<inp2:m_include t="incs/footer"/>
Property changes on: trunk/core/admin_templates/users/users_edit.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: trunk/core/admin_templates/users/root_edit_password.tpl
===================================================================
--- trunk/core/admin_templates/users/root_edit_password.tpl (revision 8894)
+++ trunk/core/admin_templates/users/root_edit_password.tpl (revision 8895)
@@ -1,35 +1,35 @@
<inp2:adm_SetPopupSize width="564" height="377"/>
<inp2:m_include t="incs/header"/>
<inp2:m_set u_id="-1"/>
<inp2:m_RenderElement name="combined_header" section="proj-base:admins" pagination="0" prefix="u" title_preset="root_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('u','OnUpdateRootPassword');
}
) );
a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
window.close();
}
) );
a_toolbar.Render();
</script>
</td>
</tr>
</tbody>
</table>
<inp2:u_SaveWarning name="grid_save_warning"/>
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="table-collapsed">
- <inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="RootPassword" title="la_fld_Password"/>
- <inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="VerifyRootPassword" title="la_fld_VerifyPassword"/>
+ <inp2:m_RenderElement name="inp_edit_password" prefix="u" field="RootPassword" title="la_fld_Password"/>
+ <inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyRootPassword" title="la_fld_VerifyPassword"/>
</table>
<inp2:m_include t="incs/footer"/>
Property changes on: trunk/core/admin_templates/users/root_edit_password.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: trunk/core/admin_templates/users/users_list.tpl
===================================================================
--- trunk/core/admin_templates/users/users_list.tpl (revision 8894)
+++ trunk/core/admin_templates/users/users_list.tpl (revision 8895)
@@ -1,52 +1,52 @@
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" section="proj-base:users" pagination="1" prefix="u" title_preset=""/>
<!-- ToolBar --->
<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
<tbody>
<tr>
<td>
<script type="text/javascript">
//do not rename - this function is used in default grid for double click!
function edit()
{
set_hidden_field('remove_specials[u.regular]', 1);
std_edit_item('u.regular', 'proj-base/users/users_edit');
}
var a_toolbar = new ToolBar();
a_toolbar.AddButton( new ToolBarButton('proj-base:new_user', '<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
function() {
set_hidden_field('remove_specials[u.regular]', 1);
std_precreate_item('u.regular', 'proj-base/users/users_edit')
} ) );
a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Edit" escape="1"/>', edit) );
a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
function() {
set_hidden_field('remove_specials[u.regular]', 1);
std_delete_items('u.regular')
} ) );
a_toolbar.AddButton( new ToolBarSeparator('sep1') );
a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
show_viewmenu(a_toolbar,'view');
}
) );
a_toolbar.Render();
</script>
</td>
<inp2:m_RenderElement name="search_main_toolbar" prefix="u.regular" grid="RegularUsers"/>
</tr>
</tbody>
</table>
-<inp2:m_ParseBlock name="grid" PrefixSpecial="u.regular" IdField="PortalUserId" grid="RegularUsers" menu_filters="yes" grid_filters="1"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="u.regular" IdField="PortalUserId" grid="RegularUsers" menu_filters="yes" grid_filters="1"/>
<script type="text/javascript">
Grids['u.regular'].SetDependantToolbarButtons( new Array('edit','delete') );
</script>
<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Property changes on: trunk/core/admin_templates/users/users_list.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: trunk/core/admin_templates/users/admins_edit.tpl
===================================================================
--- trunk/core/admin_templates/users/admins_edit.tpl (revision 8894)
+++ trunk/core/admin_templates/users/admins_edit.tpl (revision 8895)
@@ -1,76 +1,76 @@
<inp2:adm_SetPopupSize width="550" height="400"/>
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" section="proj-base:admins" pagination="0" prefix="u" title_preset="admins_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('u','<inp2:u_SaveEvent/>');
}
) );
a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
cancel_edit('u','OnCancelEdit','<inp2:u_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('u', '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('u', '<inp2:u_PrevId/>');
}
) );
a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
go_to_id('u', '<inp2:u_NextId/>');
}
) );
a_toolbar.Render();
- <inp2:m_if prefix="u" function="IsSingle"/>
+ <inp2:m_if check="u_IsSingle" >
a_toolbar.HideButton('prev');
a_toolbar.HideButton('next');
a_toolbar.HideButton('sep1');
<inp2:m_else/>
- <inp2:m_if prefix="u" function="IsLast"/>
+ <inp2:m_if check="u_IsLast" >
a_toolbar.DisableButton('next');
- <inp2:m_endif/>
- <inp2:m_if prefix="u" function="IsFirst"/>
+ </inp2:m_if>
+ <inp2:m_if check="u_IsFirst" >
a_toolbar.DisableButton('prev');
- <inp2:m_endif/>
- <inp2:m_endif/>
+ </inp2:m_if>
+ </inp2:m_if>
</script>
</td>
<inp2:m_RenderElement name="ml_selector" prefix="u"/>
</tr>
</tbody>
</table>
<inp2:u_SaveWarning name="grid_save_warning"/>
<inp2:u_ErrorWarning name="form_error_warning"/>
<input type="hidden" name="user_group" value="11"/>
<div id="scroll_container">
<table class="edit-form">
- <inp2:m_ParseBlock name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
- <inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
- <inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
- <inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
- <inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="FirstName" title="la_fld_FirstName"/>
- <inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="LastName" title="la_fld_LastName"/>
- <inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Email" title="la_fld_Email"/>
+ <inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
+ <inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
+ <inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="la_fld_FirstName"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="la_fld_LastName"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="la_fld_Email"/>
<inp2:m_RenderElement name="inp_edit_filler"/>
</table>
</div>
<inp2:m_include t="incs/footer"/>
Property changes on: trunk/core/admin_templates/users/admins_edit.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Event Timeline
Log In to Comment