Index: branches/unlabeled/unlabeled-1.4.2/core/admin_templates/summary/root.tpl
===================================================================
diff -u -r6788 -r7355
--- branches/unlabeled/unlabeled-1.4.2/core/admin_templates/summary/root.tpl	(.../root.tpl)	(revision 6788)
+++ branches/unlabeled/unlabeled-1.4.2/core/admin_templates/summary/root.tpl	(.../root.tpl)	(revision 7355)
@@ -5,7 +5,7 @@
 			<td class="overviewbox_header">
 				<table cellpadding="0" cellspacing="0" width="100%">
 					<td valign="middle" align="left">
-            			<img src="img/summary/overviewbox_cl.gif" width="8" height="8" align="absMiddle" hSpace="4">
+            			<img src="<inp2:adm_ModulePath module="In-portal"/>img/summary/overviewbox_cl.gif" width="8" height="8" align="absMiddle" hSpace="4">
             			<span class="overview">Overview</span>
             		</td>
             		<td class="info" valign="middle" align="right">
@@ -45,7 +45,7 @@
 	<table cellspacing="0" cellpadding="0" width="269">
 		<tr>
 			<td class="searchbox_header">
-    			<img src="img/summary/searchbox_cl.gif" width="8" height="8" align="absMiddle" hSpace="4">
+    			<img src="<inp2:adm_ModulePath module="In-portal"/>img/summary/searchbox_cl.gif" width="8" height="8" align="absMiddle" hSpace="4">
     			<inp2:m_phrase name="la_section_UsersSearch"/>
 			</td>
 		</tr>
@@ -61,7 +61,7 @@
 
 				<img src="img/spacer.gif" width="12" height="13"><br />
 				<input name="list_search" class="search" type="text">
-				<img src="img/toolbar/icon16_search.gif" width="22" height="22" align="absMiddle" onclick="doSearch();">
+				<img src="<inp2:adm_ModulePath module="In-portal"/>img/toolbar/icon16_search.gif" width="22" height="22" align="absMiddle" onclick="doSearch();">
 			</td>
 		</tr>
 	</table>
@@ -72,7 +72,7 @@
 
 		<tr>
 			<td class="usersbox_header">
-    			<img src="img/summary/usersbox_cl.gif" width="8" height="8" align="absMiddle" hSpace="4">
+    			<img src="<inp2:adm_ModulePath module="In-portal"/>img/summary/usersbox_cl.gif" width="8" height="8" align="absMiddle" hSpace="4">
     			<inp2:m_phrase name="la_prompt_PendingItems"/> <span class="info">(<inp2:stat_GetTotalPending/>)</span>
 			</td>
 		</tr>
@@ -111,7 +111,7 @@
 	<table cellspacing="0" cellpadding="0" width="269">
 		<tr>
 			<td class="overviewbox_header">
-    			<img src="img/summary/overviewbox_cl.gif" width="8" height="8" align="absMiddle" hSpace="4">
+    			<img src="<inp2:adm_ModulePath module="In-portal"/>img/summary/overviewbox_cl.gif" width="8" height="8" align="absMiddle" hSpace="4">
     			<inp2:m_phrase name="la_section_QuickLinks"/>
 			</td>
 		</tr>
@@ -122,7 +122,7 @@
 					<tr>
 						<td>
 							<a class="userslink" href="<inp2:m_t t="in-portal/catalog" pass="m"/>">
-								<img hSpace="3" src="img/icons/icon24_navigate.gif" border="0" align="absMiddle">
+								<img hSpace="3" src="<inp2:adm_ModulePath module="In-portal"/>img/icons/icon24_navigate.gif" border="0" align="absMiddle">
 								<inp2:m_phrase name="la_Text_Catalog"/>
 							</a>
 						</td>
@@ -131,7 +131,7 @@
 					<tr>
 						<td>
 							<a class="userslink" href="<inp2:m_t t="users/users_list" index_file="users/user_list.php" pass="m"/>">
-								<img hSpace="3" src="img/icons/icon24_users.gif" border="0" align="absMiddle">
+								<img hSpace="3" src="<inp2:adm_ModulePath module="In-portal"/>img/icons/icon24_users.gif" border="0" align="absMiddle">
 								<inp2:m_phrase name="la_Text_Users"/>
 							</a>
 						</td>
Index: branches/unlabeled/unlabeled-1.4.2/kernel/admin_templates/summary/root.tpl
===================================================================
diff -u -r6788 -r7355
--- branches/unlabeled/unlabeled-1.4.2/kernel/admin_templates/summary/root.tpl	(.../root.tpl)	(revision 6788)
+++ branches/unlabeled/unlabeled-1.4.2/kernel/admin_templates/summary/root.tpl	(.../root.tpl)	(revision 7355)
@@ -5,7 +5,7 @@
 			<td class="overviewbox_header">
 				<table cellpadding="0" cellspacing="0" width="100%">
 					<td valign="middle" align="left">
-            			<img src="img/summary/overviewbox_cl.gif" width="8" height="8" align="absMiddle" hSpace="4">
+            			<img src="<inp2:adm_ModulePath module="In-portal"/>img/summary/overviewbox_cl.gif" width="8" height="8" align="absMiddle" hSpace="4">
             			<span class="overview">Overview</span>
             		</td>
             		<td class="info" valign="middle" align="right">
@@ -45,7 +45,7 @@
 	<table cellspacing="0" cellpadding="0" width="269">
 		<tr>
 			<td class="searchbox_header">
-    			<img src="img/summary/searchbox_cl.gif" width="8" height="8" align="absMiddle" hSpace="4">
+    			<img src="<inp2:adm_ModulePath module="In-portal"/>img/summary/searchbox_cl.gif" width="8" height="8" align="absMiddle" hSpace="4">
     			<inp2:m_phrase name="la_section_UsersSearch"/>
 			</td>
 		</tr>
@@ -61,7 +61,7 @@
 
 				<img src="img/spacer.gif" width="12" height="13"><br />
 				<input name="list_search" class="search" type="text">
-				<img src="img/toolbar/icon16_search.gif" width="22" height="22" align="absMiddle" onclick="doSearch();">
+				<img src="<inp2:adm_ModulePath module="In-portal"/>img/toolbar/icon16_search.gif" width="22" height="22" align="absMiddle" onclick="doSearch();">
 			</td>
 		</tr>
 	</table>
@@ -72,7 +72,7 @@
 
 		<tr>
 			<td class="usersbox_header">
-    			<img src="img/summary/usersbox_cl.gif" width="8" height="8" align="absMiddle" hSpace="4">
+    			<img src="<inp2:adm_ModulePath module="In-portal"/>img/summary/usersbox_cl.gif" width="8" height="8" align="absMiddle" hSpace="4">
     			<inp2:m_phrase name="la_prompt_PendingItems"/> <span class="info">(<inp2:stat_GetTotalPending/>)</span>
 			</td>
 		</tr>
@@ -111,7 +111,7 @@
 	<table cellspacing="0" cellpadding="0" width="269">
 		<tr>
 			<td class="overviewbox_header">
-    			<img src="img/summary/overviewbox_cl.gif" width="8" height="8" align="absMiddle" hSpace="4">
+    			<img src="<inp2:adm_ModulePath module="In-portal"/>img/summary/overviewbox_cl.gif" width="8" height="8" align="absMiddle" hSpace="4">
     			<inp2:m_phrase name="la_section_QuickLinks"/>
 			</td>
 		</tr>
@@ -122,7 +122,7 @@
 					<tr>
 						<td>
 							<a class="userslink" href="<inp2:m_t t="in-portal/catalog" pass="m"/>">
-								<img hSpace="3" src="img/icons/icon24_navigate.gif" border="0" align="absMiddle">
+								<img hSpace="3" src="<inp2:adm_ModulePath module="In-portal"/>img/icons/icon24_navigate.gif" border="0" align="absMiddle">
 								<inp2:m_phrase name="la_Text_Catalog"/>
 							</a>
 						</td>
@@ -131,7 +131,7 @@
 					<tr>
 						<td>
 							<a class="userslink" href="<inp2:m_t t="users/users_list" index_file="users/user_list.php" pass="m"/>">
-								<img hSpace="3" src="img/icons/icon24_users.gif" border="0" align="absMiddle">
+								<img hSpace="3" src="<inp2:adm_ModulePath module="In-portal"/>img/icons/icon24_users.gif" border="0" align="absMiddle">
 								<inp2:m_phrase name="la_Text_Users"/>
 							</a>
 						</td>
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/header.tpl
===================================================================
diff -u -r7283 -r7355
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 7283)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 7355)
@@ -17,12 +17,13 @@
 <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon" />
 <link rel="stylesheet" rev="stylesheet" href="incs/style.css" type="text/css" />
 
-<script language="javascript" src="js/is.js"></script>
-<script language="javascript" src="js/ajax.js"></script>
-<script language="javascript" src="js/script.js"></script>
-<script language="javascript" src="js/in-portal.js"></script>
-<script language="javascript" src="js/toolbar.js"></script>
-<script language="javascript" src="js/grid.js"></script>
+<script type="text/javascript" src="js/is.js"></script>
+<script type="text/javascript" src="js/ajax.js"></script>
+<script type="text/javascript" src="js/script.js"></script>
+<script type="text/javascript" src="js/in-portal.js"></script>
+<script type="text/javascript" src="js/toolbar.js"></script>
+<script type="text/javascript" src="js/grid.js"></script>
+<script type="text/javascript" src="js/calendar.js"></script>
 <script language="javascript">
 var t = '<inp2:m_get param="t"/>';
 var popups = '1';
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r7354 -r7355
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 7354)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 7355)
@@ -225,10 +225,6 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="grid_date_range_filter">
-	<inp2:m_if check="m_GetEquals" name="calendar_included" value="1" inverse="inverse">
-		<script type="text/javascript" src="js/calendar.js"></script>
-		<inp2:m_set calendar_included="1"/>
-	</inp2:m_if>
 	<td>
 		<input type="text" class="flat-input<inp2:m_if check="SearchField" field="$filter_field" filter_type="date_range" type="from" grid="$grid"> filter</inp2:m_if>" name="<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="from" grid="$grid"/>" id="<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="from" grid="$grid"/>" value="<inp2:SearchField field="$filter_field" filter_type="date_range" type="from" grid="$grid"/>" size="15" datepickerIcon="img/calendar_icon.gif" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);"/><br />
 		<input type="text" class="flat-input<inp2:m_if check="SearchField" field="$filter_field" filter_type="date_range" type="to" grid="$grid"> filter</inp2:m_if>" name="<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="to" grid="$grid"/>" id="<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="to" grid="$grid"/>" value="<inp2:SearchField field="$filter_field" filter_type="date_range" type="to" grid="$grid"/>" size="15" datepickerIcon="img/calendar_icon.gif" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);"/><br />
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/incs/tab_blocks.tpl
===================================================================
diff -u -r7354 -r7355
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/incs/tab_blocks.tpl	(.../tab_blocks.tpl)	(revision 7354)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/incs/tab_blocks.tpl	(.../tab_blocks.tpl)	(revision 7355)
@@ -15,7 +15,7 @@
 <inp2:m_block name="tab"/>
 	<inp2:m_ParseBlock name="prepare_tab" t="$t"/>
 	<td>
-		<table style="background: <inp2:m_get param="bgcolor"/> url(img/tab_<inp2:m_get param="active"/>back3.jpg) no-repeat top left;" cellpadding="0" cellspacing="0" border="0">
+		<table style="background: <inp2:m_get param="bgcolor"/> <inp2:m_if check="m_Param name="active">url(img/tab_active_back3.jpg) no-repeat top left;</inp2:m_if>" cellpadding="0" cellspacing="0" border="0">
 			<tr>
         		<td><img alt="" src="img/tab_<inp2:m_get param="active"/>left.gif" width="15" height="23"></td>
         		<td nowrap align="center" style="border-top: 1px solid #000000;">
@@ -30,7 +30,7 @@
 <inp2:m_block name="tab_direct" pass="m"/>
 	<inp2:m_ParseBlock name="prepare_tab" t="$t"/>
 	<td>
-		<table style="background: <inp2:m_get param="bgcolor"/> url(img/tab_<inp2:m_get param="active"/>back3.jpg) no-repeat top left;" cellpadding="0" cellspacing="0" border="0">
+		<table style="background: <inp2:m_get param="bgcolor"/> <inp2:m_if check="m_Param name="active">url(img/tab_active_back3.jpg) no-repeat top left;</inp2:m_if>" cellpadding="0" cellspacing="0" border="0">
 			<tr>
         		<td><img alt="" src="img/tab_<inp2:m_get param="active"/>left.gif" width="15" height="23"></td>
         		<td nowrap align="center" style="border-top: 1px solid #000000;">
@@ -45,7 +45,7 @@
 <inp2:m_block name="tab_list"/>
 			<inp2:m_ParseBlock name="prepare_tab" t="$t"/>
 			<td>
-				<table style="background: <inp2:m_get param="bgcolor"/> url(img/tab_<inp2:m_get param="active"/>back3.jpg) no-repeat top left;" cellpadding="0" cellspacing="0" border="0">
+				<table style="background: <inp2:m_get param="bgcolor"/> <inp2:m_if check="m_Param name="active">url(img/tab_active_back3.jpg) no-repeat top left;</inp2:m_if>" cellpadding="0" cellspacing="0" border="0">
 				<tr>
         	<td><img alt="" src="img/tab_<inp2:m_get param="active"/>left.gif" width="15" height="23"></td>
         	<td nowrap align="center" <inp2:m_if check="m_getequals" name="active" value="active_">style="border-top: black 1px solid;"</inp2:m_if> background="img/tab_<inp2:m_get param="active"/>back.gif">
Index: branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -r7354 -r7355
--- branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 7354)
+++ branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 7355)
@@ -156,10 +156,6 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_date" class="" is_last=""/>
-	<inp2:m_if check="m_GetEquals" name="calendar_included" value="1" inverse="inverse">
-		<script type="text/javascript" src="js/calendar.js"></script>
-		<inp2:m_set calendar_included="1"/>
-	</inp2:m_if>
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
@@ -178,10 +174,6 @@
 
 
 <inp2:m_block name="inp_edit_date_time" class="" is_last=""/>
-	<inp2:m_if check="m_GetEquals" name="calendar_included" value="1" inverse="inverse">
-		<script type="text/javascript" src="js/calendar.js"></script>
-		<inp2:m_set calendar_included="1"/>
-	</inp2:m_if>
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/sections_list.tpl
===================================================================
diff -u -r7345 -r7355
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/sections_list.tpl	(.../sections_list.tpl)	(revision 7345)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/sections_list.tpl	(.../sections_list.tpl)	(revision 7355)
@@ -1,7 +1,7 @@
 <inp2:adm_CheckPermCache cache_update_t="in-portal/categories/cache_updater"/>
 <inp2:m_include t="incs/header"/>
 
-<link rel="stylesheet" rev="stylesheet" href="incs/sections_list.css" type="text/css" />
+<link rel="stylesheet" rev="stylesheet" href="<inp2:adm_ModulePath module="In-portal"/>incs/sections_list.css" type="text/css" />
 
 <inp2:m_DefineElement name="section_list_header" icon_module="">
 		<!-- section header -->
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/custom_fields/custom_fields_edit.tpl
===================================================================
diff -u -r7283 -r7355
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 7283)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 7355)
@@ -21,9 +21,9 @@
 							submit_event('cf','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('cf', '<inp2:cf_PrevId/>');
 						}
@@ -32,15 +32,15 @@
 							go_to_id('cf', '<inp2:cf_NextId/>');
 						}
 				 ) );
-				
-				
+
+
 				a_toolbar.Render();
-				
+
 				<inp2:m_if prefix="cf" function="IsSingle"/>
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>			
+				<inp2:m_else/>
 					<inp2:m_if prefix="cf" function="IsLast"/>
 						a_toolbar.DisableButton('next');
 					<inp2:m_endif/>
@@ -54,44 +54,37 @@
 </tbody>
 </table>
 
-<script src="js/calendar.js"></script>
-
-
-
-
-
 <inp2:m_ParseBlock name="inp_edit_hidden" prefix="cf" field="Type" db="db"/>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>	
+	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 
-	
+
 		<inp2:m_ParseBlock name="inp_id_label" prefix="cf" field="CustomFieldId" title="!la_prompt_FieldId!"/>
-	
 
+
 	<inp2:m_ParseBlock name="inp_edit_box" prefix="cf" field="FieldName" title="!la_prompt_FieldName!" size="40"/>
-	
+
 	<inp2:m_ParseBlock name="inp_edit_box" prefix="cf" field="FieldLabel" title="!la_prompt_FieldLabel!" size="40"/>
-	
-	<inp2:m_ParseBlock name="subsection" title="!la_tab_AdminUI!"/>			
-		
+
+	<inp2:m_ParseBlock name="subsection" title="!la_tab_AdminUI!"/>
+
 		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="cf" field="OnGeneralTab" title="!la_prompt_showgeneraltab!"/>
-		
+
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="cf" field="Heading" title="!la_prompt_heading!" size="40"/>
-		
+
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="cf" field="Prompt" title="!la_prompt_FieldPrompt!" size="40"/>
-		
+
 		<inp2:m_ParseBlock name="inp_edit_options" prefix="cf" field="ElementType" title="!la_prompt_InputType!" size="20" use_phrases="1"/>
-		
+
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="cf" field="ValueList" title="!la_prompt_valuelist!" size="40"/>
-		
+
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="cf" field="DisplayOrder" title="!la_field_displayorder!" size="10"/>
-		
+
 		<inp2:m_if check="m_IsDebugMode">
 			<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="cf" field="IsSystem" title="!la_fld_IsSystem!"/>
 		</inp2:m_if>
-		
-</table>	
 
+</table>
+
 <inp2:m_include t="incs/footer"/>
-		
\ No newline at end of file