Index: branches/5.1.x/in-news/install.php
===================================================================
--- branches/5.1.x/in-news/install.php	(revision 13095)
+++ branches/5.1.x/in-news/install.php	(nonexistent)
@@ -1,53 +0,0 @@
-<?php
-/**
-* @version	$Id$
-* @package	In-News
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
-*/
-	$module_folder = 'in-news';
-
-	if (!defined('IS_INSTALL')) {
-		// separate module install
-		define('IS_INSTALL', 1);
-		define('ADMIN', 1);
-		define('REL_PATH', $module_folder);
-		define('FULL_PATH', realpath(dirname(__FILE__) . '/..') );
-
-		include_once(FULL_PATH . '/core/kernel/startup.php');
-		require_once FULL_PATH . '/core/install/install_toolkit.php';
-
-		$toolkit = new kInstallToolkit();
-	}
-	else {
-		// install, using installation wizard
-		$toolkit =& $this->toolkit;
-		/* @var $toolkit kInstallToolkit */
-	}
-
-	$application =& kApplication::Instance();
-	$application->Init();
-
-	if ($application->RecallVar('user_id') != -1) {
-		die('restricted access!');
-	}
-
-	$category =& $toolkit->createModuleCategory('News', 'News Articles', '/in-news/designs/section', 'in-news/img/menu_articles.gif');
-
-	$toolkit->RunSQL('/' . $module_folder . '/install/install_schema.sql');
-	$toolkit->RunSQL('/' . $module_folder . '/install/install_data.sql', '{NewsCatId}', $category->GetID());
-	$toolkit->ImportLanguage('/' . $module_folder . '/install/english');
-
-	$toolkit->SetModuleRootCategory($module_folder, $category->GetID());
-
-	$toolkit->linkCustomFields($module_folder, 'n', 2); // to create Custom Fields for News
-	$toolkit->linkCustomFields('KERNEL', 'c', 1); // to create ItemTemplate custom field
-	$toolkit->setModuleItemTemplate($category, 'n', 'in-news/articles/article_detail');
-
-	$toolkit->finalizeModuleInstall($module_folder, true);
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/install.php
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.4
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Index: branches/5.1.x/in-news/install/.htaccess
===================================================================
--- branches/5.1.x/in-news/install/.htaccess	(revision 13095)
+++ branches/5.1.x/in-news/install/.htaccess	(nonexistent)
@@ -1 +0,0 @@
-deny from all
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/install/.htaccess
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Index: branches/5.1.x/in-news/install/module_info.xml
===================================================================
--- branches/5.1.x/in-news/install/module_info.xml	(revision 13095)
+++ branches/5.1.x/in-news/install/module_info.xml	(nonexistent)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<module_info>
-	<name>In-News</name>
-	<description>News Management</description>
-	<image>in-news/install/img/icon_news_management.gif</image>
-</module_info>
\ No newline at end of file
Index: branches/5.1.x/in-news/install/install_schema.sql
===================================================================
--- branches/5.1.x/in-news/install/install_schema.sql	(revision 13095)
+++ branches/5.1.x/in-news/install/install_schema.sql	(nonexistent)
@@ -1,86 +0,0 @@
-CREATE TABLE News (
-  NewsId int(11) NOT NULL auto_increment,
-  Title varchar(255) NOT NULL default '',
-  l1_Title varchar(255) NOT NULL default '',
-  l2_Title varchar(255) NOT NULL default '',
-  l3_Title varchar(255) NOT NULL default '',
-  l4_Title varchar(255) NOT NULL default '',
-  l5_Title varchar(255) NOT NULL default '',
-  AutomaticFilename tinyint(3) unsigned NOT NULL default '1',
-  Excerpt text,
-  l1_Excerpt text,
-  l2_Excerpt text,
-  l3_Excerpt text,
-  l4_Excerpt text,
-  l5_Excerpt text,
-  Author varchar(255) NOT NULL default '',
-  Body text,
-  l1_Body text,
-  l2_Body text,
-  l3_Body text,
-  l4_Body text,
-  l5_Body text,
-  MetaKeywords varchar(255) DEFAULT NULL,
-  MetaDescription text NULL DEFAULT NULL,
-  CreatedOn int(11) NOT NULL default '0',
-  TextFormat int(11) NOT NULL default '0',
-  EndOn INT(11) NULL DEFAULT NULL,
-  Hits double(20,6) NOT NULL default '0.000000',
-  CachedRating varchar(10) default '0',
-  CachedVotesQty int(11) NOT NULL default '0',
-  CreatedById int(11) NOT NULL default '-1',
-  Priority INT(11) NOT NULL DEFAULT '0',
-  `Status` tinyint(4) NOT NULL default '2',
-  EditorsPick tinyint(4) NOT NULL default '0',
-  LeadStory tinyint(4) NOT NULL default '0',
-  LeadCatStory tinyint(4) NOT NULL default '0',
-  ResourceId int(11) default NULL,
-  CachedReviewsQty int(11) NOT NULL default '0',
-  StartDate int(11) NOT NULL default '0',
-  NewItem tinyint(4) NOT NULL default '2',
-  PopItem tinyint(4) NOT NULL default '2',
-  HotItem tinyint(4) NOT NULL default '2',
-  Archived int(11) NOT NULL default '0',
-  Modified int(11) NOT NULL default '0',
-  ModifiedById int(11) NOT NULL default '-1',
-  OrgId int(11) default NULL,
-  PRIMARY KEY  (NewsId),
-  UNIQUE KEY ResourceId (ResourceId),
-  KEY Title (Title),
-  KEY l1_Title (l1_Title),
-  KEY l2_Title (l2_Title),
-  KEY l3_Title (l3_Title),
-  KEY l4_Title (l4_Title),
-  KEY l5_Title (l5_Title),
-  KEY Excerpt (Excerpt(5)),
-  KEY l1_Excerpt (l1_Excerpt(5)),
-  KEY l2_Excerpt (l2_Excerpt(5)),
-  KEY l3_Excerpt (l3_Excerpt(5)),
-  KEY l4_Excerpt (l4_Excerpt(5)),
-  KEY l5_Excerpt (l5_Excerpt(5)),
-  KEY Body (Body(5)),
-  KEY l1_Body (l1_Body(5)),
-  KEY l2_Body (l2_Body(5)),
-  KEY l3_Body (l3_Body(5)),
-  KEY l4_Body (l4_Body(5)),
-  KEY l5_Body (l5_Body(5)),
-  KEY CreatedOn (CreatedOn),
-  KEY EndOn (EndOn),
-  KEY Priority (Priority),
-  KEY Status (Status),
-  KEY EditorsPick (EditorsPick),
-  KEY Hits (Hits),
-  KEY Modified (Modified),
-  KEY NewItem (NewItem),
-  KEY PopItem (PopItem),
-  KEY HotItem (HotItem),
-  KEY StartDate (StartDate),
-  KEY Archived (Archived)
-);
-
-CREATE TABLE NewsCustomData (
-  CustomDataId int(11) NOT NULL auto_increment,
-  ResourceId int(10) unsigned NOT NULL default '0',
-  KEY ResourceId (ResourceId),
-  PRIMARY KEY  (CustomDataId)
-);
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/install/install_schema.sql
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.2
\ No newline at end of property
Index: branches/5.1.x/in-news/install/upgrades.sql
===================================================================
--- branches/5.1.x/in-news/install/upgrades.sql	(revision 13095)
+++ branches/5.1.x/in-news/install/upgrades.sql	(nonexistent)
@@ -1,52 +0,0 @@
-# ===== v 4.3.9 =====
-
-INSERT INTO ImportScripts VALUES (DEFAULT, 'Articles from CSV file [In-News]', '', 'n', 'In-News', '', 'CSV', '1');
-
-# ===== v 5.0.0 =====
-ALTER TABLE News ADD INDEX (StartDate), ADD INDEX (Archived);
-
-UPDATE Category SET Template = '/in-news/designs/section' WHERE Template = 'innews/index';
-UPDATE Category SET CachedTemplate = '/in-news/designs/section' WHERE CachedTemplate = 'innews/index';
-
-UPDATE ConfigurationValues SET VariableValue = '/in-news/designs/section' WHERE VariableName = 'n_CategoryTemplate';
-UPDATE ConfigurationValues SET VariableValue = 'in-news/designs/detail' WHERE VariableName = 'n_ItemTemplate';
-
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:articles.view', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:setting_folder.view', 11, 1, 1, 0);
-DELETE FROM Permissions WHERE Permission LIKE 'in-news:innews_general.%';
-
-UPDATE Phrase SET Module = 'In-News' WHERE ((Phrase LIKE '%Article%' OR Phrase LIKE '%News%') AND (Module = 'Core') AND Phrase NOT IN ('la_ToolTip_NewSearchConfig', 'la_tooltip_newstylesheet'));
-
-UPDATE Phrase SET Module = 'In-News' WHERE Phrase = 'la_title_In-News';
-
-# ===== v 5.0.1 =====
-UPDATE ConfigurationValues SET VariableValue = 'in-news/articles/article_detail' WHERE VariableName = 'n_ItemTemplate';
-
-UPDATE ConfigurationAdmin
-SET ValueList = 'ReviewText=la_opt_CommentText,CreatedOn=la_opt_CreatedOn'
-WHERE VariableName IN ('News_SortReviews', 'News_SortReviews2');
-
-UPDATE ConfigurationAdmin SET ValueList = 'ASC=la_common_Ascending,DESC=la_common_Descending'
-WHERE VariableName IN ('News_SortReviewsOrder', 'News_SortReviewsOrder2');
-
-UPDATE ConfigurationAdmin
-SET ValueList = '1=la_opt_Sec,60=la_opt_Min,3600=la_opt_Hour,86400=la_opt_Day,604800=la_opt_Week,2419200=la_opt_Month,29030400=la_opt_Year'
-WHERE VariableName IN ('News_ReviewDelay_Interval', 'News_RatingDelay_Interval');
-
-UPDATE CustomField SET FieldLabel = 'la_fld_RssSource', Prompt = 'la_fld_RssSource' WHERE FieldName = 'RssSource';
-UPDATE CustomField SET FieldLabel = 'la_fld_RssDefaultExpiration', Prompt = 'la_fld_RssDefaultExpiration' WHERE FieldName = 'RssDefaultExpiration';
-UPDATE CustomField SET FieldLabel = 'la_fld_RssUpdateInterval', Prompt = 'la_fld_RssUpdateInterval' WHERE FieldName = 'RssUpdateInterval';
-UPDATE CustomField SET FieldLabel = 'la_fld_RssExpireInterval', Prompt = 'la_fld_RssExpireInterval' WHERE FieldName = 'RssExpireInterval';
-UPDATE CustomField SET FieldLabel = 'la_fld_RssDeleteExpired', Prompt = 'la_fld_RssDeleteExpired' WHERE FieldName = 'RssDeleteExpired';
-
-UPDATE CustomField SET FieldLabel = 'la_fld_RssLastExpired', Prompt = 'la_fld_RssLastExpired' WHERE FieldName = 'RssLastExpired';
-UPDATE CustomField SET FieldLabel = 'la_fld_RssDefaultExpirationType', Prompt = 'la_fld_RssDefaultExpirationType' WHERE FieldName = 'RssDefaultExpirationType';
-UPDATE CustomField SET FieldLabel = 'la_fld_RssExpireIntervalType', Prompt = 'la_fld_RssExpireIntervalType' WHERE FieldName = 'RssExpireIntervalType';
-UPDATE CustomField SET FieldLabel = 'la_fld_RssUpdateIntervalType', Prompt = 'la_fld_RssUpdateIntervalType' WHERE FieldName = 'RssUpdateIntervalType';
-UPDATE CustomField SET FieldLabel = 'la_fld_RssLastUpdated', Prompt = 'la_fld_RssLastUpdated' WHERE FieldName = 'RssLastUpdated';
-UPDATE CustomField SET FieldLabel = 'la_fld_RssArticleCRC', Prompt = 'la_fld_RssArticleCRC' WHERE FieldName = 'RssArticleCRC';
-UPDATE CustomField SET FieldLabel = 'la_fld_cust_n_ItemTemplate', Prompt = 'la_fld_cust_n_ItemTemplate' WHERE FieldName = 'n_ItemTemplate';
-
-INSERT INTO Events VALUES(DEFAULT, 'NEWS.REVIEW.ADD.PENDING', NULL, 1, 0, NULL, 'In-News', 'la_event_article.review.add.pending', 1);
-
-UPDATE ConfigurationAdmin SET ValueList = 'style="width: 50px;"' WHERE VariableName IN ('News_ReviewDelay_Value', 'News_RatingDelay_Value');
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/install/upgrades.sql
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.8
\ No newline at end of property
Index: branches/5.1.x/in-news/install/english.lang
===================================================================
--- branches/5.1.x/in-news/install/english.lang	(revision 13095)
+++ branches/5.1.x/in-news/install/english.lang	(nonexistent)
@@ -1,178 +0,0 @@
-<LANGUAGES>
-	<LANGUAGE PackName="English" Encoding="base64"><DATEFORMAT>m/d/Y</DATEFORMAT><TIMEFORMAT>g:i A</TIMEFORMAT><INPUTDATEFORMAT>m/d/Y</INPUTDATEFORMAT><INPUTTIMEFORMAT>g:i:s A</INPUTTIMEFORMAT><DECIMAL>.</DECIMAL><THOUSANDS>,</THOUSANDS><CHARSET>utf-8</CHARSET><DOCS_URL>http://docs.in-portal.org/eng/index.php</DOCS_URL><UNITSYSTEM>2</UNITSYSTEM>
-		<PHRASES>
-			<PHRASE Label="la_Article_Author" Module="In-News" Type="1">QXV0aG9y</PHRASE>
-			<PHRASE Label="la_Article_Date" Module="In-News" Type="1">RGF0ZQ==</PHRASE>
-			<PHRASE Label="la_Article_Excerpt" Module="In-News" Type="1">QXJ0aWNsZSBFeGNlcnB0</PHRASE>
-			<PHRASE Label="la_Article_Hits" Module="In-News" Type="1">SGl0cw==</PHRASE>
-			<PHRASE Label="la_Article_Rating" Module="In-News" Type="1">UmF0aW5n</PHRASE>
-			<PHRASE Label="la_Article_Title" Module="In-News" Type="1">QXJ0aWNsZSBUaXRsZQ==</PHRASE>
-			<PHRASE Label="la_col_Author" Module="In-News" Type="1">QXV0aG9y</PHRASE>
-			<PHRASE Label="la_col_EndOn" Module="In-News" Type="1">QXJjaGl2YXRpb24gRGF0ZQ==</PHRASE>
-			<PHRASE Label="la_col_LeadCatStory" Module="In-News" Type="1">U2VjdGlvbiBMZWFk</PHRASE>
-			<PHRASE Label="la_col_LeadStory" Module="In-News" Type="1">U2l0ZSBMZWFk</PHRASE>
-			<PHRASE Label="la_col_StartDate" Module="In-News" Type="1">U3RhcnQgRGF0ZQ==</PHRASE>
-			<PHRASE Label="la_event_article.add" Module="In-News" Type="1">QWRkIEFydGljbGU=</PHRASE>
-			<PHRASE Label="la_event_article.approve" Module="In-News" Type="1">QXBwcm92ZSBBcnRpY2xl</PHRASE>
-			<PHRASE Label="la_event_article.deny" Module="In-News" Type="1">RGVjbGluZSBBcnRpY2xl</PHRASE>
-			<PHRASE Label="la_event_article.modify" Module="In-News" Type="1">TW9kaWZ5IEFydGljbGU=</PHRASE>
-			<PHRASE Label="la_event_article.modify.approve" Module="In-News" Type="1">QXBwcm92ZSBBcnRpY2xlIE1vZGlmaWNhdGlvbg==</PHRASE>
-			<PHRASE Label="la_event_article.modify.deny" Module="In-News" Type="1">RGVjbGluZSBBcnRpY2xlIE1vZGlmaWNhdGlvbg==</PHRASE>
-			<PHRASE Label="la_event_article.review.add" Module="In-News" Type="1">QXJ0aWNsZSBDb21tZW50IEFkZGVk</PHRASE>
-			<PHRASE Label="la_event_article.review.add.pending" Module="In-News" Type="1">QXJ0aWNsZSBDb21tZW50IFBlbmRpbmc=</PHRASE>
-			<PHRASE Label="la_event_article.review.approve" Module="In-News" Type="1">QXJ0aWNsZSBDb21tZW50IEFwcHJvdmVk</PHRASE>
-			<PHRASE Label="la_event_article.review.deny" Module="In-News" Type="1">QXJ0aWNsZSBDb21tZW50IERlY2xpbmVk</PHRASE>
-			<PHRASE Label="la_event_news.add.pending" Module="In-News" Type="1">QXJ0aWNsZSBBZGQgUGVuZGluZw==</PHRASE>
-			<PHRASE Label="la_event_news.modify.pending" Module="In-News" Type="1">QXJ0aWNsZSBNb2RpZnkgUGVuZGluZw==</PHRASE>
-			<PHRASE Label="la_fld_Author" Module="In-News" Type="1">QXV0aG9y</PHRASE>
-			<PHRASE Label="la_fld_Body" Module="In-News" Type="1">QXJ0aWNsZSBCb2R5</PHRASE>
-			<PHRASE Label="la_fld_cust_n_ItemTemplate" Module="In-News" Type="1">TmV3cyBJdGVtIFRlbXBsYXRl</PHRASE>
-			<PHRASE Label="la_fld_EndOn" Module="In-News" Type="1">QXJjaGl2YXRpb24gRGF0ZQ==</PHRASE>
-			<PHRASE Label="la_fld_Excerpt" Module="In-News" Type="1">QXJ0aWNsZSBFeGNlcnB0</PHRASE>
-			<PHRASE Label="la_fld_LeadCatStory" Module="In-News" Type="1">U2VjdGlvbiBMZWFkIFN0b3J5</PHRASE>
-			<PHRASE Label="la_fld_LeadStory" Module="In-News" Type="1">U2l0ZSBMZWFkIFN0b3J5</PHRASE>
-			<PHRASE Label="la_fld_News_MaxHotNumber" Module="In-News" Type="1">TWF4aW11bSBudW1iZXIgb2YgSE9UIGFydGljbGVz</PHRASE>
-			<PHRASE Label="la_fld_News_MinPopRating" Module="In-News" Type="1">TWluaW11bSByYXRpbmcgdG8gY29uc2lkZXIgYXJ0aWNsZSBQT1A=</PHRASE>
-			<PHRASE Label="la_fld_News_MinPopVotes" Module="In-News" Type="1">TWluaW11bSBudW1iZXIgb2Ygdm90ZXMgdG8gY29uc2lkZXIgYXJ0aWNsZSBQT1A=</PHRASE>
-			<PHRASE Label="la_fld_RssArticleCRC" Module="In-News" Type="1">UlNTIEFydGljbGUgQ1JDMzI=</PHRASE>
-			<PHRASE Label="la_fld_RssDefaultExpiration" Module="In-News" Type="1">RGVmYXVsdCBFeHBpcmF0aW9u</PHRASE>
-			<PHRASE Label="la_fld_RssDefaultExpirationType" Module="In-News" Type="1">RGVmYXVsdCBFeHBpcmF0aW9uIFR5cGU=</PHRASE>
-			<PHRASE Label="la_fld_RssDeleteExpired" Module="In-News" Type="1">RGVsZXRlIEV4cGlyZWQ=</PHRASE>
-			<PHRASE Label="la_fld_RssExpireInterval" Module="In-News" Type="1">RXhwaXJhdGlvbiBDaGVjayBJbnRlcnZhbA==</PHRASE>
-			<PHRASE Label="la_fld_RssExpireIntervalType" Module="In-News" Type="1">RXhwaXJhdGlvbiBJbnRlcnZhbCBUeXBl</PHRASE>
-			<PHRASE Label="la_fld_RssLastExpired" Module="In-News" Type="1">TGFzdCBFeHBpcmVkIE9u</PHRASE>
-			<PHRASE Label="la_fld_RssLastUpdated" Module="In-News" Type="1">TGFzdCBVcGRhdGVk</PHRASE>
-			<PHRASE Label="la_fld_RssOriginalURL" Module="In-News" Type="1">RmVlZCBPcmlnaW5hbCBVUkw=</PHRASE>
-			<PHRASE Label="la_fld_RssSource" Module="In-News" Type="1">U291cmNlIFVSTA==</PHRASE>
-			<PHRASE Label="la_fld_RssUpdateInterval" Module="In-News" Type="1">VXBkYXRlIEludGVydmFs</PHRASE>
-			<PHRASE Label="la_fld_RssUpdateIntervalType" Module="In-News" Type="1">VXBkYXRlIEludGVydmFsIFR5cGU=</PHRASE>
-			<PHRASE Label="la_fld_StartDate" Module="In-News" Type="1">U3RhcnQgRGF0ZQ==</PHRASE>
-			<PHRASE Label="la_In-news" Module="In-News" Type="1">SW4tTmV3cw==</PHRASE>
-			<PHRASE Label="la_ItemTab_News" Module="In-News" Type="1">QXJ0aWNsZXM=</PHRASE>
-			<PHRASE Label="la_news_daysarchive_prompt" Module="In-News" Type="1">TnVtYmVyIG9mIGRheXMgdG8gYXJjaGl2ZSBhcnRpY2xlcyBhdXRvbWF0aWNhbGx5</PHRASE>
-			<PHRASE Label="la_news_editorpicksabove_prompt" Module="In-News" Type="1">RGlzcGxheSBlZGl0b3IgUElDS3MgYWJvdmUgcmVndWxhciBhcnRpY2xlcw==</PHRASE>
-			<PHRASE Label="la_news_newdays_prompt" Module="In-News" Type="1">TnVtYmVyIG9mIGRheXMgZm9yIGEgYXJ0aWNsZSB0byBiZSBORVc=</PHRASE>
-			<PHRASE Label="la_news_perpage_prompt" Module="In-News" Type="1">TnVtYmVyIG9mIGFydGljbGVzIHBlciBwYWdl</PHRASE>
-			<PHRASE Label="la_news_perpage_short_prompt" Module="In-News" Type="1">QXJ0aWNsZXMgUGVyIFBhZ2UgKFNob3J0bGlzdCk=</PHRASE>
-			<PHRASE Label="la_news_sortfield2_pompt" Module="In-News" Type="1">QW5kIHRoZW4gYnk=</PHRASE>
-			<PHRASE Label="la_news_sortfield_pompt" Module="In-News" Type="1">T3JkZXIgYXJ0aWNsZXMgYnk=</PHRASE>
-			<PHRASE Label="la_news_sortreviews2_prompt" Module="In-News" Type="1">QW5kIHRoZW4gYnk=</PHRASE>
-			<PHRASE Label="la_news_sortreviews_prompt" Module="In-News" Type="1">U29ydCBDb21tZW50cyBieQ==</PHRASE>
-			<PHRASE Label="la_prompt_ActiveArticles" Module="In-News" Type="1">QWN0aXZlIEFydGljbGVz</PHRASE>
-			<PHRASE Label="la_prompt_ArticleAverageRating" Module="In-News" Type="1">QXZlcmFnZSBSYXRpbmcgb2YgQXJ0aWNsZXM=</PHRASE>
-			<PHRASE Label="la_prompt_ArticleReviews" Module="In-News" Type="1">VG90YWwgQXJ0aWNsZSBDb21tZW50cw==</PHRASE>
-			<PHRASE Label="la_prompt_ArticlesActive" Module="In-News" Type="1">QWN0aXZlIEFydGljbGVz</PHRASE>
-			<PHRASE Label="la_prompt_ArticlesArchived" Module="In-News" Type="1">QXJjaGl2ZWQgQXJ0aWNsZXM=</PHRASE>
-			<PHRASE Label="la_prompt_ArticlesPending" Module="In-News" Type="1">UGVuZGluZyBBcnRpY2xlcw==</PHRASE>
-			<PHRASE Label="la_prompt_ArticlesTotal" Module="In-News" Type="1">VG90YWwgQXJ0aWNsZXM=</PHRASE>
-			<PHRASE Label="la_prompt_CategoryLeadStoryArticles" Module="In-News" Type="1">U2VjdGlvbiBMZWFkIFN0b3J5IEFydGljbGVz</PHRASE>
-			<PHRASE Label="la_prompt_DisabledArticles" Module="In-News" Type="1">RGlzYWJsZWQgQXJ0aWNsZXM=</PHRASE>
-			<PHRASE Label="la_prompt_EditorsPickArticles" Module="In-News" Type="1">RWRpdG9yJ3MgUGljayBBcnRpY2xlcw==</PHRASE>
-			<PHRASE Label="la_prompt_HotArticles" Module="In-News" Type="1">SG90IEFydGljbGVz</PHRASE>
-			<PHRASE Label="la_prompt_LastArticleUpdate" Module="In-News" Type="1">TGFzdCBVcGRhdGVkIEFydGljbGU=</PHRASE>
-			<PHRASE Label="la_prompt_LeadStoryArticles" Module="In-News" Type="1">TGVhZCBTdG9yeSBBcnRpY2xlcw==</PHRASE>
-			<PHRASE Label="la_prompt_MaxHitsArticles" Module="In-News" Type="1">TWF4aW11bSBIaXRzIG9mIGFuIEFydGljbGU=</PHRASE>
-			<PHRASE Label="la_prompt_MaxVotesArticles" Module="In-News" Type="1">TWF4aW11bSBWb3RlcyBvZiBhbiBBcnRpY2xl</PHRASE>
-			<PHRASE Label="la_prompt_NewArticles" Module="In-News" Type="1">TmV3IEFydGljbGVz</PHRASE>
-			<PHRASE Label="la_prompt_NewestArticleDate" Module="In-News" Type="1">TmV3ZXN0IEFydGljbGUgRGF0ZQ==</PHRASE>
-			<PHRASE Label="la_prompt_PopularArticles" Module="In-News" Type="1">UG9wdWxhciBBcnRpY2xlcw==</PHRASE>
-			<PHRASE Label="la_section_Article" Module="In-News" Type="1">QXJ0aWNsZQ==</PHRASE>
-			<PHRASE Label="la_section_RssExpiration" Module="In-News" Type="1">UlNTIEZlZWQgQXJ0aWNsZSBFeHBpcmF0aW9u</PHRASE>
-			<PHRASE Label="la_section_RssProperties" Module="In-News" Type="1">UlNTIEZlZWQgUHJvcGVydGllcw==</PHRASE>
-			<PHRASE Label="la_tab_Articles" Module="In-News" Type="1">QXJ0aWNsZXM=</PHRASE>
-			<PHRASE Label="la_Text_Article" Module="In-News" Type="1">QXJ0aWNsZQ==</PHRASE>
-			<PHRASE Label="la_Text_Articles" Module="In-News" Type="1">QXJ0aWNsZXM=</PHRASE>
-			<PHRASE Label="la_title_AddingArticle" Module="In-News" Type="1">QWRkaW5nIEFydGljbGU=</PHRASE>
-			<PHRASE Label="la_title_Articles" Module="In-News" Type="1">QXJ0aWNsZXM=</PHRASE>
-			<PHRASE Label="la_title_EditingArticle" Module="In-News" Type="1">RWRpdGluZyBBcnRpY2xl</PHRASE>
-			<PHRASE Label="la_title_ImportArticles" Module="In-News" Type="1">SW1wb3J0IEFydGljbGVz</PHRASE>
-			<PHRASE Label="la_title_In-News" Module="In-News" Type="1">TmV3cw==</PHRASE>
-			<PHRASE Label="la_title_NewArticle" Module="In-News" Type="1">TmV3IEFydGljbGU=</PHRASE>
-			<PHRASE Label="la_ToolTip_NewArticle" Module="In-News" Type="1">TmV3IEFydGljbGU=</PHRASE>
-			<PHRASE Label="lu_ArticlesUpdated" Module="In-News" Type="0">TGFzdCB1cGRhdGVkIG9u</PHRASE>
-			<PHRASE Label="lu_articletitleaz" Module="In-News" Type="0">VGl0bGUgQSB0byBa</PHRASE>
-			<PHRASE Label="lu_articletitleza" Module="In-News" Type="0">VGl0bGUgWiB0byBB</PHRASE>
-			<PHRASE Label="lu_authoraz" Module="In-News" Type="0">QXV0aG9yIEEgdG8gWg==</PHRASE>
-			<PHRASE Label="lu_authorza" Module="In-News" Type="0">QXV0aG9yIFogdG8gQQ==</PHRASE>
-			<PHRASE Label="lu_btn_RateThisArticle" Module="In-News" Type="0">UmF0ZSB0aGlzIGFydGljbGU=</PHRASE>
-			<PHRASE Label="lu_btn_ReviewThisArticle" Module="In-News" Type="0">Q29tbWVudCB0aGlzIEFydGljbGU=</PHRASE>
-			<PHRASE Label="lu_categoryleadstory" Module="In-News" Type="0">Q2F0ZWdvcnkgTGVhZCBTdG9yeQ==</PHRASE>
-			<PHRASE Label="lu_DeleteArticleConfirm" Module="In-News" Type="0">QXJlIHlvdSBzdXJlIHlvdSB3YW50IHRvIGRlbGV0ZSB0aGUgYXJ0aWNsZT8NClRoaXMgYWN0aW9uIGNhbm5vdCBiZSB1bmRvbmUu</PHRASE>
-			<PHRASE Label="lu_description_MyArticles" Module="In-News" Type="0">TWFuYWdlIHlvdXIgQXJ0aWNsZXMgaGVyZQ==</PHRASE>
-			<PHRASE Label="lu_field_newsid" Module="In-News" Type="0">QXJ0aWNsZSBJRA==</PHRASE>
-			<PHRASE Label="lu_fld_RssOriginalURL" Module="In-News" Type="0">RmVlZCBPcmlnaW5hbCBVUkw=</PHRASE>
-			<PHRASE Label="lu_MyArticles" Module="In-News" Type="0">TXkgQXJ0aWNsZXM=</PHRASE>
-			<PHRASE Label="lu_NoArticles" Module="In-News" Type="0">Tm8gQXJ0aWNsZXM=</PHRASE>
-			<PHRASE Label="lu_PermName_News.Add.Pending_desc" Module="In-News" Type="0">QWRkIFBlbmRpbmcgTmV3cw==</PHRASE>
-			<PHRASE Label="lu_PermName_News.Add_desc" Module="In-News" Type="0">QWRkIE5ld3M=</PHRASE>
-			<PHRASE Label="lu_PermName_News.Delete_desc" Module="In-News" Type="0">RGVsZXRlIE5ld3M=</PHRASE>
-			<PHRASE Label="lu_PermName_News.Modify.Pending_desc" Module="In-News" Type="0">TW9kaWZ5IEFydGljbGUgUGVuZGluZw==</PHRASE>
-			<PHRASE Label="lu_PermName_News.Modify_desc" Module="In-News" Type="0">TW9kaWZ5IE5ld3M=</PHRASE>
-			<PHRASE Label="lu_PermName_News.Owner.Delete_desc" Module="In-News" Type="0">QXJ0aWNsZSBEZWxldGUgYnkgT3duZXI=</PHRASE>
-			<PHRASE Label="lu_PermName_News.Owner.Modify.Pending_desc" Module="In-News" Type="0">QXJ0aWNsZSBNb2RpZnkgUGVuZGluZyBieSBPd25lcg==</PHRASE>
-			<PHRASE Label="lu_PermName_News.Owner.Modify_desc" Module="In-News" Type="0">QXJ0aWNsZSBNb2RpZnkgYnkgT3duZXI=</PHRASE>
-			<PHRASE Label="lu_PermName_News.Rate_desc" Module="In-News" Type="0">UmF0ZSBOZXdz</PHRASE>
-			<PHRASE Label="lu_PermName_News.Review.Pending_desc" Module="In-News" Type="2">UmV2aWV3IE5ld3MgUGVuZGluZw==</PHRASE>
-			<PHRASE Label="lu_PermName_News.Review_desc" Module="In-News" Type="1">Q29tbWVudCBBcnRpY2xl</PHRASE>
-			<PHRASE Label="lu_PermName_News.View_desc" Module="In-News" Type="0">VmlldyBOZXdz</PHRASE>
-			<PHRASE Label="lu_rss_feed" Module="In-News" Type="0">UlNTIEZlZWQ=</PHRASE>
-			<PHRASE Label="lu_section_ArticleDetails" Module="In-News" Type="0">QXJ0aWNsZSBEZXRhaWxz</PHRASE>
-			<PHRASE Label="lu_SiteLeadStory" Module="In-News" Type="0">c2l0ZSBsZWFkIHN0b3J5</PHRASE>
-			<PHRASE Label="lu_SortArticlesBy" Module="In-News" Type="0">U29ydCBBcnRpY2xlcyBCeQ==</PHRASE>
-			<PHRASE Label="lu_SuggestArticle" Module="In-News" Type="0">U3VnZ2VzdCBBcnRpY2xl</PHRASE>
-			<PHRASE Label="lu_text_addarticlereviewconfirm" Module="In-News" Type="0">VGhhbmsgeW91IGZvciBjb21tZW50aW5nIHRoaXMgYXJ0aWNsZS4=</PHRASE>
-			<PHRASE Label="lu_text_addarticlereviewpendingconfirm" Module="In-News" Type="0">VGhhbmsgeW91IGZvciBjb21tZW50aW5nIHRoaXMgYXJ0aWNsZSAtIGl0J3Mgd2FpdGluZyBmb3IgYWRtaW5pc3RyYXRpdmUgYXBwcm92YWwu</PHRASE>
-			<PHRASE Label="lu_text_modifyarticleconfirm" Module="In-News" Type="0">VGhhbmsgeW91IGZvciB1cGRhdGluZyB5b3VyIGFydGljbGUu</PHRASE>
-			<PHRASE Label="lu_text_modifyarticlependingconfirm" Module="In-News" Type="0">VGhhbmsgeW91IGZvciB1cGRhdGluZyB5b3VyIGFydGljbGUuIFlvdXIgbW9kaWZpY2F0aW9ucyBhcmUgcGVuZGluZyBhZG1pbmlzdHJhdGl2ZSBhcHByb3ZhbC4=</PHRASE>
-			<PHRASE Label="lu_text_noarticlereviewpermission" Module="In-News" Type="0">Tm8gcGVybWlzc2lvbnMgdG8gY29tbWVudCB0aGlzIGFydGljbGUu</PHRASE>
-			<PHRASE Label="lu_text_nomodifyarticlepermission" Module="In-News" Type="0">Tm8gcGVybWlzc2lvbnMgdG8gbW9kaWZ5IHRoaXMgYXJ0aWNsZS4=</PHRASE>
-			<PHRASE Label="lu_text_nosuggestarticlepermission" Module="In-News" Type="0">Tm8gcGVybWlzc2lvbnMgdG8gc3VnZ2VzdCBhcnRpY2xlIGludG8gdGhlIGN1cnJlbnQgY2F0ZWdvcnku</PHRASE>
-			<PHRASE Label="lu_text_suggestarticleconfirm" Module="In-News" Type="0">VGhhbmsgeW91IGZvciBzdWJtaXR0aW5nIHlvdXIgYXJ0aWNsZS4=</PHRASE>
-			<PHRASE Label="lu_text_suggestarticlependingconfirm" Module="In-News" Type="0">VGhhbmsgeW91IGZvciBzdWJtaXR0aW5nIHlvdXIgYXJ0aWNsZS4gQ3VycmVudGx5IGl0J3Mgd2FpdGluZyBmb3IgYWRtaW5pc3RyYXRpdmUgYXBwcm92YWw=</PHRASE>
-			<PHRASE Label="lu_title_addarticlereviewconfirm" Module="In-News" Type="0">QXJ0aWNsZSBDb21tZW50IEFkZGVk</PHRASE>
-			<PHRASE Label="lu_title_addarticlereviewpendingconfirm" Module="In-News" Type="0">QXJ0aWNsZSBDb21tZW50IFBlbmRpbmc=</PHRASE>
-			<PHRASE Label="lu_title_ArticleDetails" Module="In-News" Type="0">QXJ0aWNsZSBEZXRhaWxz</PHRASE>
-			<PHRASE Label="lu_title_Articles" Module="In-News" Type="0">QXJ0aWNsZXM=</PHRASE>
-			<PHRASE Label="lu_title_articlesearchresults" Module="In-News" Type="0">QXJ0aWNsZXMgU2VhcmNoIFJlc3VsdHM=</PHRASE>
-			<PHRASE Label="lu_title_categoryleadstory" Module="In-News" Type="0">Q2F0ZWdvcnkgTGVhZCBTdG9yeQ==</PHRASE>
-			<PHRASE Label="lu_title_favoritearticles" Module="In-News" Type="0">RmF2b3JpdGUgQXJ0aWNsZXM=</PHRASE>
-			<PHRASE Label="lu_title_HotArticles" Module="In-News" Type="0">SG90IEFydGljbGVz</PHRASE>
-			<PHRASE Label="lu_title_ModifyArticle" Module="In-News" Type="0">TW9kaWZ5IEFydGljbGU=</PHRASE>
-			<PHRASE Label="lu_title_modifyarticleconfirm" Module="In-News" Type="0">QXJ0aWNsZSBNb2RpZmllZA==</PHRASE>
-			<PHRASE Label="lu_title_modifyarticlependingconfirm" Module="In-News" Type="0">QXJ0aWNsZSBNb2RpZmljYXRpb25zIFBlbmRpbmc=</PHRASE>
-			<PHRASE Label="lu_title_ModifyTopic" Module="In-News" Type="0">TW9kaWZ5IFRvcGlj</PHRASE>
-			<PHRASE Label="lu_title_MyArticles" Module="In-News" Type="0">TXkgQXJ0aWNsZXM=</PHRASE>
-			<PHRASE Label="lu_title_MyTopics" Module="In-News" Type="0">TXkgVG9waWNz</PHRASE>
-			<PHRASE Label="lu_title_NewArticles" Module="In-News" Type="0">TmV3IEFydGljbGVz</PHRASE>
-			<PHRASE Label="lu_title_News" Module="In-News" Type="0">QXJ0aWNsZXM=</PHRASE>
-			<PHRASE Label="lu_title_PickArticles" Module="In-News" Type="0">RWRpdG9yJ3MgUGljayBBcnRpY2xlcw==</PHRASE>
-			<PHRASE Label="lu_title_poparticles" Module="In-News" Type="0">UG9wdWxhciBBcnRpY2xlcw==</PHRASE>
-			<PHRASE Label="lu_title_ReviewThisArticle" Module="In-News" Type="0">Q29tbWVudCBBcnRpY2xl</PHRASE>
-			<PHRASE Label="lu_title_SiteLeadStory" Module="In-News" Type="0">TGVhZCBTdG9yeQ==</PHRASE>
-			<PHRASE Label="lu_title_SuggestArticle" Module="In-News" Type="0">U3VnZ2VzdCBBcnRpY2xl</PHRASE>
-			<PHRASE Label="lu_title_suggestarticleconfirm" Module="In-News" Type="0">QXJ0aWNsZSBBZGRlZA==</PHRASE>
-			<PHRASE Label="lu_title_suggestarticlependingconfirm" Module="In-News" Type="0">QXJ0aWNsZSBQZW5kaW5n</PHRASE>
-			<PHRASE Label="lu_TotalArticles" Module="In-News" Type="0">VG90YWwgQXJ0aWNsZXM=</PHRASE>
-		</PHRASES>
-		<EVENTS>
-			<EVENT MessageType="html" Event="NEWS.ADD" Type="0">U3ViamVjdDogWW91ciBOZXcgQXJ0aWNsZSAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBBZGRlZAoKVGhhbmsgeW91IGZvciBzdWJtaXR0aW5nIHlvdXIgQXJ0aWNsZSB0byBvdXIgd2Vic2l0ZSE8YnIvPjxici8+DQ1BcnRpY2xlIGRldGFpbHMgYXJlIGxpc3RlZCBiZWxvdzo8YnIvPjxici8+DQ1BcnRpY2xlIFRpdGxlOiA8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+PGJyLz4NPGlucDI6bV9pZiBjaGVjaz0ibl9GaWVsZCIgbmFtZT0iQm9keSI+DUJvZHk6IDxpbnAyOm5fRmllbGQgbmFtZT0iQm9keSIvPjxici8+DTwvaW5wMjptX2lmPg08YnIvPjxici8+DQ1Zb3UgY2FuIHZpZXcgeW91ciBhcnRpY2xlIGhlcmUgPGEgaHJlZj0iPGlucDI6bl9BcnRpY2xlTGluayB0ZW1wbGF0ZT0iX19kZWZhdWx0X18iLz4iPjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz48L2E+</EVENT>
-			<EVENT MessageType="html" Event="NEWS.ADD" Type="1">U3ViamVjdDogTmV3IEFydGljbGUgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iIGhhcyBiZWVuIEFkZGVkCgpOZXcgQXJ0aWNsZSBoYXMgYmVlbiBzdWJtaXR0ZWQgdG8gb3VyIHdlYnNpdGUhPGJyLz48YnIvPg0NQXJ0aWNsZSBkZXRhaWxzIGFyZSBsaXN0ZWQgYmVsb3c6PGJyLz48YnIvPg0NQXJ0aWNsZSBUaXRsZTogPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPjxici8+DTxpbnAyOm1faWYgY2hlY2s9Im5fRmllbGQiIG5hbWU9IkJvZHkiPg1Cb2R5OiA8aW5wMjpuX0ZpZWxkIG5hbWU9IkJvZHkiLz48YnIvPg08L2lucDI6bV9pZj4NPGJyLz48YnIvPg0NWW91IGNhbiB2aWV3IHlvdXIgYXJ0aWNsZSBoZXJlIDxhIGhyZWY9IjxpbnAyOm5fQXJ0aWNsZUxpbmsgdGVtcGxhdGU9Il9fZGVmYXVsdF9fIi8+Ij48aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+PC9hPg==</EVENT>
-			<EVENT MessageType="html" Event="NEWS.ADD.PENDING" Type="0">U3ViamVjdDogTmV3IEFydGljbGUgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iIC0gUGVuZGluZwoKTmV3IEFydGljbGUgaGFzIGJlZW4gc3VibWl0dGVkIHRvIG91ciB3ZWJzaXRlIGFuZCBwZW5kaW5nIGZvciBhZG1pbmlzdHJhdGl2ZSBhcHByb3ZhbCE8YnIvPjxici8+DQoNCkFydGljbGUgZGV0YWlscyBhcmUgbGlzdGVkIGJlbG93Ojxici8+PGJyLz4NCg0KQXJ0aWNsZSBUaXRsZTogPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPjxici8+DQo8aW5wMjptX2lmIGNoZWNrPSJuX0ZpZWxkIiBuYW1lPSJCb2R5Ij4NCkJvZHk6IDxpbnAyOm5fRmllbGQgbmFtZT0iQm9keSIvPjxici8+DQo8L2lucDI6bV9pZj4NCjxici8+PGJyLz4NCg0KWW91IGNhbiB2aWV3IHlvdXIgYXJ0aWNsZSBoZXJlIDxhIGhyZWY9IjxpbnAyOm5fQXJ0aWNsZUxpbmsgdGVtcGxhdGU9Il9fZGVmYXVsdF9fIi8+Ij48aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+PC9hPg==</EVENT>
-			<EVENT MessageType="html" Event="NEWS.ADD.PENDING" Type="1">U3ViamVjdDogTmV3IEFydGljbGUgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iIC0gUGVuZGluZwoKTmV3IEFydGljbGUgaGFzIGJlZW4gc3VibWl0dGVkIHRvIG91ciB3ZWJzaXRlIGFuZCBwZW5kaW5nIGZvciBhZG1pbmlzdHJhdGl2ZSBhcHByb3ZhbCE8YnIvPjxici8+DQoNCkFydGljbGUgZGV0YWlscyBhcmUgbGlzdGVkIGJlbG93Ojxici8+PGJyLz4NCg0KQXJ0aWNsZSBUaXRsZTogPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPjxici8+DQo8aW5wMjptX2lmIGNoZWNrPSJuX0ZpZWxkIiBuYW1lPSJCb2R5Ij4NCkJvZHk6IDxpbnAyOm5fRmllbGQgbmFtZT0iQm9keSIvPjxici8+DQo8L2lucDI6bV9pZj4NCjxici8+PGJyLz4NCg0KWW91IGNhbiB2aWV3IHlvdXIgYXJ0aWNsZSBoZXJlIDxhIGhyZWY9IjxpbnAyOm5fQXJ0aWNsZUxpbmsgdGVtcGxhdGU9Il9fZGVmYXVsdF9fIi8+Ij48aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+PC9hPg==</EVENT>
-			<EVENT MessageType="html" Event="NEWS.APPROVE" Type="0">U3ViamVjdDogWW91ciBBcnRpY2xlICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiAtIEFwcHJvdmVkCgpZb3VyIEFydGljbGUgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iIGhhcyBiZWVuIGFwcHJvdmVk</EVENT>
-			<EVENT MessageType="html" Event="NEWS.DENY" Type="0">U3ViamVjdDogWW91ciBBcnRpY2xlICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiAtIERlY2xpbmVkCgpZb3VyIEFydGljbGUgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iIGhhcyBiZWVuIGRlY2xpbmVkLg==</EVENT>
-			<EVENT MessageType="html" Event="NEWS.MODIFY" Type="0">U3ViamVjdDogWW91ciBBcnRpY2xlICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiAtIFVwZGF0ZWQKCllvdXIgQXJ0aWNsZSAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgaGFzIGJlZW4gdXBkYXRlZC4=</EVENT>
-			<EVENT MessageType="html" Event="NEWS.MODIFY" Type="1">U3ViamVjdDogQXJ0aWNsZSAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBVcGRhdGVkCgpBcnRpY2xlICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiBoYXMgYmVlbiB1cGRhdGVkLg==</EVENT>
-			<EVENT MessageType="html" Event="NEWS.MODIFY.APPROVE" Type="0">U3ViamVjdDogWW91ciBNb2RpZmljYXRpb25zIGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIgLz4iIC0gQXBwcm92ZWQhCgpZb3VyIE1vZGlmaWNhdGlvbnMgZm9yICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIiAvPiIgbGluayB3ZXJlIGFwcHJvdmVkIGJ5IHRoZSB3ZWJzaXRlLg==</EVENT>
-			<EVENT MessageType="html" Event="NEWS.MODIFY.DENY" Type="0">U3ViamVjdDogWW91ciBNb2RpZmljYXRpb25zIGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBEZWNsaW5lZAoKWW91ciBtb2RpZmljYXRpb25zIGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgYXJ0aWNsZSB3ZXJlIGRlY2xpbmVkLg==</EVENT>
-			<EVENT MessageType="html" Event="NEWS.MODIFY.PENDING" Type="0">U3ViamVjdDogTW9kaWZpY2F0aW9ucyBmb3IgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iIC0gUGVuZGluZwoKTW9kaWZpY2F0aW9ucyBmb3IgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iIGFydGljbGUgYXJlIHBlbmRpbmcgZm9yIGFkbWluaXN0cmF0aXZlIGFwcHJvdmFsLg==</EVENT>
-			<EVENT MessageType="html" Event="NEWS.MODIFY.PENDING" Type="1">U3ViamVjdDogQXJ0aWNsZSBNb2RpZmljYXRpb25zIGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBQZW5kaW5nCgpNb2RpZmljYXRpb25zIGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgYXJ0aWNsZSBhcmUgcGVuZGluZyBmb3IgYWRtaW5pc3RyYXRpdmUgYXBwcm92YWwu</EVENT>
-			<EVENT MessageType="html" Event="NEWS.REVIEW.ADD" Type="0">U3ViamVjdDogWW91ciBDb21tZW50IGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgYXJ0aWNsZSAtIFB1Ymxpc2hlZAoKWW91ciBjb21tZW50IGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgYXJ0aWNsZSBoYXMgYmVlbiBwdWJsaXNoZWQu</EVENT>
-			<EVENT MessageType="html" Event="NEWS.REVIEW.ADD" Type="1">U3ViamVjdDogTmV3IENvbW1lbnQgZm9yICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiBBcnRpY2xlIFN1Ym1pdHRlZAoKTmV3IGNvbW1lbnQgZm9yICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiBhcnRpY2xlIGhhcyBiZWVuIHN1Ym1pdHRlZC4=</EVENT>
-			<EVENT MessageType="html" Event="NEWS.REVIEW.ADD.PENDING" Type="0">U3ViamVjdDogWW91ciBDb21tZW50IGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBQZW5kaW5nCgpUaGFuayB5b3UgZm9yIHN1Ym1pdHRpbmcgeW91ciBjb21tZW50IGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIuPGJyLz48YnIvPg0KDQpDdXJyZW50bHkgaXQncyBwZW5kaW5nIGZvciBhZG1pbmlzdHJhdGl2ZSBhcHByb3ZhbCBhbmQgd2lsbCBiZSBwdWJsaXNoZWQgc2hvcnRseS4=</EVENT>
-			<EVENT MessageType="html" Event="NEWS.REVIEW.ADD.PENDING" Type="1">WC1NYWlsZXI6IEluLVBvcnRhbApTdWJqZWN0OiBZb3VyIENvbW1lbnQgZm9yICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiAtIFBlbmRpbmcgW2FkbWluXQoKVGhhbmsgeW91IGZvciBzdWJtaXR0aW5nIHlvdXIgY29tbWVudCBmb3IgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iLjxici8+PGJyLz4NCg0KQ3VycmVudGx5IGl0J3MgcGVuZGluZyBmb3IgYWRtaW5pc3RyYXRpdmUgYXBwcm92YWwgYW5kIHdpbGwgYmUgcHVibGlzaGVkIHNob3J0bHku</EVENT>
-			<EVENT MessageType="html" Event="NEWS.REVIEW.APPROVE" Type="0">U3ViamVjdDogWW91ciBDb21tZW50IGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBQdWJsaXNoZWQKClRoYW5rIHlvdSBmb3Igc3VibWl0dGluZyB5b3VyIGNvbW1lbnQgZm9yICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+Ii48YnIvPjxici8+DQoNCkl0J3MgYWxyZWFkeSBwdWJsaXNoZWQgb24gdGhlIHdlYnNpdGUh</EVENT>
-			<EVENT MessageType="html" Event="NEWS.REVIEW.DENY" Type="0">U3ViamVjdDogWW91ciBDb21tZW50IGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBEZWNsaW5lZAoKU29ycnksIGJ1dCB5b3VyIGNvbW1lbnQgZm9yICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiBhcnRpY2xlIGhhcyBiZWVuIGRlY2xpbmVkLg==</EVENT>
-		</EVENTS>
-	</LANGUAGE>
-</LANGUAGES>
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/install/english.lang
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.5
\ No newline at end of property
Index: branches/5.1.x/in-news/install/remove_schema.sql
===================================================================
--- branches/5.1.x/in-news/install/remove_schema.sql	(revision 13095)
+++ branches/5.1.x/in-news/install/remove_schema.sql	(nonexistent)
@@ -1,2 +0,0 @@
-DROP TABLE News;
-DROP TABLE NewsCustomData;
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/install/remove_schema.sql
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/5.1.x/in-news/install/prerequisites.php
===================================================================
--- branches/5.1.x/in-news/install/prerequisites.php	(revision 13095)
+++ branches/5.1.x/in-news/install/prerequisites.php	(nonexistent)
@@ -1,79 +0,0 @@
-<?php
-/**
-* @version	$Id$
-* @package	In-News
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
-*/
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	$prerequisite_class = 'InNewsPrerequisites';
-
-	/**
-	 * Class, that holds all prerequisite scripts for "In-News" module
-	 *
-	 */
-	class InNewsPrerequisites extends kHelper {
-
-		/**
-		 * Install toolkit instance
-		 *
-		 * @var kInstallToolkit
-		 */
-		var $_toolkit = null;
-
-		/**
-		 * Sets common instance of installator toolkit
-		 *
-		 * @param kInstallToolkit $instance
-		 */
-		function setToolkit(&$instance)
-		{
-			$this->_toolkit =& $instance;
-		}
-
-		/**
-		 * Checks minimal version, that could be upgradeable
-		 *
-		 * @param string $mode when called mode {install, standalone, upgrade)
-		 */
-		function CheckPrerequisites($versions, $mode)
-		{
-			$errors = Array ();
-
-			if ($mode == 'standalone') {
-				if (!$this->Application->isModuleEnabled('In-Portal')) {
-					$errors[] = 'Please install or enable "In-Portal" module first';
-				}
-			}
-
-			if ($mode == 'upgrade') {
-				$sql = 'SELECT Version
-						FROM ' . TABLE_PREFIX . 'Modules
-						WHERE Name = "In-Portal"';
-				$inportal_version = $this->Conn->GetOne($sql);
-
-				if ($inportal_version === false) {
-					// only, when In-Portal was installed
-					return $errors;
-				}
-
-				$min_version = '4.3.1';
-
-				$current_version = $this->_toolkit->ConvertModuleVersion($inportal_version);
-				$needed_version = $this->_toolkit->ConvertModuleVersion($min_version);
-				if ($current_version < $needed_version) {
-					$errors[] = 'Please upgrade "In-Portal" to version ' . $min_version;
-				}
-			}
-
-			return $errors;
-		}
-	}
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/install/prerequisites.php
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.3
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Index: branches/5.1.x/in-news/install/install_order.txt
===================================================================
--- branches/5.1.x/in-news/install/install_order.txt	(revision 13095)
+++ branches/5.1.x/in-news/install/install_order.txt	(nonexistent)
@@ -1 +0,0 @@
-103
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/install/install_order.txt
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/5.1.x/in-news/install/img/.htaccess
===================================================================
--- branches/5.1.x/in-news/install/img/.htaccess	(revision 13095)
+++ branches/5.1.x/in-news/install/img/.htaccess	(nonexistent)
@@ -1 +0,0 @@
-allow from all
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/install/img/.htaccess
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Index: branches/5.1.x/in-news/install/img/icon_news_management.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/in-news/install/img/icon_news_management.gif
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/in-news/install/install_data.sql
===================================================================
--- branches/5.1.x/in-news/install/install_data.sql	(revision 13095)
+++ branches/5.1.x/in-news/install/install_data.sql	(nonexistent)
@@ -1,248 +0,0 @@
-INSERT INTO ConfigurationAdmin VALUES ('News_Search_Id', 'la_Text_Search', 'la_prompt_for_Id', 'checkbox', '', '', 1, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('News_SortField', 'la_Text_Articles', 'la_news_sortfield_pompt', 'select', '', 'Title=la_Article_Title,Excerpt=la_Article_Excerpt,Author=la_Article_Author,CreatedOn=la_Article_Date,Hits=la_Article_Hits,CachedRating=la_Article_Rating,<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 2) AND (IsSystem = 0)</SQL>', 10.01, 1, 1);
-INSERT INTO ConfigurationAdmin VALUES ('News_SortOrder', 'la_Text_Articles', 'la_news_sortfield_pompt', 'select', '', 'asc=la_common_ascending,desc=la_common_descending', 10.01, 2, 1);
-INSERT INTO ConfigurationAdmin VALUES ('News_SortField2', 'la_Text_Articles', 'la_news_sortfield2_pompt', 'select', '', 'Title=la_Article_Title,Excerpt=la_Article_Excerpt,Author=la_Article_Author,CreatedOn=la_Article_Date,Hits=la_Article_Hits,CachedRating=la_Article_Rating,<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 2) AND (IsSystem = 0)</SQL>', 10.02, 1, 1);
-INSERT INTO ConfigurationAdmin VALUES ('News_SortOrder2', 'la_Text_Articles', 'la_news_sortfield2_pompt', 'select', '', 'asc=la_common_ascending,desc=la_common_descending', 10.02, 2, 1);
-INSERT INTO ConfigurationAdmin VALUES ('News_CatNewDays', 'la_Text_Articles', 'la_news_newdays_prompt', 'text', '', '', 10.05, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Perpage_News', 'la_Text_Articles', 'la_news_perpage_prompt', 'text', '', '', 10.03, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Perpage_News_Short', 'la_Text_Articles', 'la_news_perpage_short_prompt', 'text', '', '', 10.04, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('News_MinPopRating', 'la_Text_Articles', 'la_fld_News_MinPopRating', 'text', '', '', 10.06, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('News_MaxHotNumber', 'la_Text_Articles', 'la_fld_News_MaxHotNumber', 'text', '', '', 10.08, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('News_ShowPick', 'la_Text_Articles', 'la_news_editorpicksabove_prompt', 'checkbox', '', '', 10.1, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('News_Archive', 'la_Text_Articles', 'la_news_daysarchive_prompt', 'text', '', '', 10.09, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('News_SortReviews', 'la_Text_Reviews', 'la_news_sortreviews_prompt', 'select', '', 'ReviewText=la_opt_CommentText,CreatedOn=la_opt_CreatedOn', 20.01, 1, 1);
-INSERT INTO ConfigurationAdmin VALUES ('News_SortReviewsOrder', 'la_Text_Reviews', 'la_news_sortreviews_prompt', 'select', '', 'asc=la_common_Ascending,desc=la_common_Descending', 20.01, 2, 1);
-INSERT INTO ConfigurationAdmin VALUES ('News_SortReviews2', 'la_Text_Reviews', 'la_news_sortreviews2_prompt', 'select', '', 'ReviewText=la_opt_CommentText,CreatedOn=la_opt_CreatedOn', 20.02, 1, 1);
-INSERT INTO ConfigurationAdmin VALUES ('News_SortReviewsOrder2', 'la_Text_Reviews', 'la_news_sortreviews2_prompt', 'select', '', 'asc=la_common_Ascending,desc=la_common_Descending', 20.02, 2, 1);
-INSERT INTO ConfigurationAdmin VALUES ('News_MinPopVotes', 'la_Text_Articles', 'la_fld_News_MinPopVotes', 'text', '', '', 10.07, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Perpage_NewsReviews', 'la_Text_Reviews', 'la_review_perpage_prompt', 'text', NULL, NULL, 20.03, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Perpage_NewsReviews_Short', 'la_Text_Reviews', 'la_review_perpage_short_prompt', 'text', NULL, NULL, 20.03, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('News_RatingDelay_Interval', 'la_Text_Articles', 'la_prompt_DupRating', 'select', '', '1=la_opt_Sec,60=la_opt_Min,3600=la_opt_Hour,86400=la_opt_Day,604800=la_opt_Week,2419200=la_opt_Month,29030400=la_opt_Year', 10.12, 2, 1);
-INSERT INTO ConfigurationAdmin VALUES ('News_RatingDelay_Value', 'la_Text_Articles', 'la_prompt_DupRating', 'text', '', 'style="width: 50px;"', 10.12, 1, 1);
-INSERT INTO ConfigurationAdmin VALUES ('News_ReviewDelay_Interval', 'la_Text_Articles', 'la_prompt_DupReviews', 'select', '', '1=la_opt_Sec,60=la_opt_Min,3600=la_opt_Hour,86400=la_opt_Day,604800=la_opt_Week,2419200=la_opt_Month,29030400=la_opt_Year', 10.11, 2, 1);
-INSERT INTO ConfigurationAdmin VALUES ('News_ReviewDelay_Value', 'la_Text_Articles', 'la_prompt_DupReviews', 'text', '', 'style="width: 50px;"', 10.11, 1, 1);
-INSERT INTO ConfigurationAdmin VALUES ('n_CategoryTemplate', 'la_section_Templates', 'la_fld_CategoryTemplate', 'text', '', '', 30.01, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('n_ItemTemplate', 'la_section_Templates', 'la_fld_ItemTemplate', 'text', '', '', 30.02, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('n_MaxImageCount', 'la_section_ImageSettings', 'la_config_MaxImageCount', 'text', '', '', 40.01, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('n_ThumbnailImageWidth', 'la_section_ImageSettings', 'la_config_ThumbnailImageWidth', 'text', '', '', 40.02, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('n_ThumbnailImageHeight', 'la_section_ImageSettings', 'la_config_ThumbnailImageHeight', 'text', '', '', 40.03, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('n_FullImageWidth', 'la_section_ImageSettings', 'la_config_FullImageWidth', 'text', '', '', 40.04, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('n_FullImageHeight', 'la_section_ImageSettings', 'la_config_FullImageHeight', 'text', '', '', 40.05, 0, 0);
-
-INSERT INTO ConfigurationAdmin VALUES ('SearchRel_Keyword_articles', 'la_config_SearchRel_DefaultKeyword', 'la_text_keyword', 'text', NULL, NULL, 0, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('SearchRel_Pop_articles', 'la_config_DefaultPop', 'la_text_popularity', 'text', NULL, NULL, 0, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('SearchRel_Rating_articles', 'la_config_DefaultRating', 'la_prompt_Rating', 'text', NULL, NULL, 0, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('SearchRel_Increase_articles', 'la_config_DefaultIncreaseImportance', 'la_text_increase_importance', 'text', NULL, NULL, 0, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Search_ShowMultiple_articles', 'la_config_ShowMultiple', 'la_Text_MultipleShow', 'text', NULL, NULL, 0, 0, 1);
-
-INSERT INTO ConfigurationAdmin VALUES ('n_MaxCategories', 'la_Text_Articles', 'la_fld_MaxCategories', 'text', NULL, NULL, 10.13, 0, 1);
-
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_News', '8', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_PopCount', '4', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_ArticleSort', 'CreatedOn desc, Title asc', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_CatSort', 'cat_date desc, cat_name asc', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_MinPopRating', '4', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_Archive', '0', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_ShowPick', '1', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_CatNewDays', '5', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_ShowMulti', '1', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_Admin_Notice_New', '1', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_Admin_Notice_Modify', '1', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_Admin_Notice_Suggest', '1', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_User_Notice_New', '1', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_User_Notice_Approve', '1', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_User_Notice_Deny', '1', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_User_Notice_Modify', '1', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_User_Notice_Modify_Approve', '1', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_User_Notice_Modify_Deny', '1', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_SortField', 'CreatedOn', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_SortOrder', 'desc', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_MaxHotNumber', '5', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_SortReviews', 'ReviewText', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_SortReviews2', 'ReviewText', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_SortReviewsOrder', 'desc', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_SortReviewsOrder2', 'asc', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_SortField2', 'Title', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_SortOrder2', 'desc', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_MinPopVotes', '20', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_RatingDelay_Value', '1', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_RatingDelay_Interval', '86400', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Article_Root', '{NewsCatId}', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_News_Short', '3', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_NewsReviews_Short', '3', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_NewsReviews', '10', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_ReviewDelay_Interval', '3600', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_ReviewDelay_Value', '12', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_Highlight_OpenTag', '<span class="match">', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_Highlight_CloseTag', '</span>', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'n_CategoryTemplate', '/in-news/designs/section', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'n_ItemTemplate', 'in-news/designs/detail', 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'n_MaxImageCount', 5, 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'n_ThumbnailImageWidth', 120, 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'n_ThumbnailImageHeight', 120, 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'n_FullImageWidth', 450, 'In-News', 'in-news:configuration_output');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'n_FullImageHeight', 450, 'In-News', 'in-news:configuration_output');
-
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SearchRel_Keyword_articles', '90', 'In-News', 'in-news:configuration_search');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SearchRel_Pop_articles', '10', 'In-News', 'in-news:configuration_search');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SearchRel_Rating_articles', '10', 'In-News', 'in-news:configuration_search');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SearchRel_Increase_articles', '30', 'In-News', 'in-news:configuration_search');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Search_ShowMultiple_articles', '0', 'In-News', 'in-news:configuration_search');
-
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'n_MaxCategories', '3', 'In-News', 'in-news:configuration_output');
-
-INSERT INTO Events VALUES(DEFAULT, 'NEWS.ADD', NULL, 1, 1, NULL, 'In-News', 'la_event_article.add', 1);
-INSERT INTO Events VALUES(DEFAULT, 'NEWS.ADD', NULL, 1, 0, NULL, 'In-News', 'la_event_article.add', 0);
-INSERT INTO Events VALUES(DEFAULT, 'NEWS.ADD.PENDING', NULL, 1, 1, NULL, 'In-News', 'la_event_news.add.pending', 1);
-INSERT INTO Events VALUES(DEFAULT, 'NEWS.ADD.PENDING', NULL, 1, 0, NULL, 'In-News', 'la_event_news.add.pending', 0);
-INSERT INTO Events VALUES(DEFAULT, 'NEWS.MODIFY', NULL, 1, 1, NULL, 'In-News', 'la_event_article.modify', 1);
-INSERT INTO Events VALUES(DEFAULT, 'NEWS.MODIFY', NULL, 1, 0, NULL, 'In-News', 'la_event_article.modify', 0);
-INSERT INTO Events VALUES(DEFAULT, 'NEWS.MODIFY.PENDING', NULL, 1, 1, NULL, 'In-News', 'la_event_news.modify.pending', 1);
-INSERT INTO Events VALUES(DEFAULT, 'NEWS.MODIFY.PENDING', NULL, 1, 0, NULL, 'In-News', 'la_event_news.modify.pending', 0);
-INSERT INTO Events VALUES(DEFAULT, 'NEWS.MODIFY.APPROVE', NULL, 1, 0, NULL, 'In-News', 'la_event_article.modify.approve', 0);
-INSERT INTO Events VALUES(DEFAULT, 'NEWS.MODIFY.DENY', NULL, 1, 0, NULL, 'In-News', 'la_event_article.modify.deny', 0);
-INSERT INTO Events VALUES(DEFAULT, 'NEWS.APPROVE', NULL, 1, 0, NULL, 'In-News', 'la_event_article.approve', 0);
-INSERT INTO Events VALUES(DEFAULT, 'NEWS.DENY', NULL, 1, 0, NULL, 'In-News', 'la_event_article.deny', 0);
-INSERT INTO Events VALUES(DEFAULT, 'NEWS.REVIEW.ADD', NULL, 1, 1, NULL, 'In-News', 'la_event_article.review.add', 1);
-INSERT INTO Events VALUES(DEFAULT, 'NEWS.REVIEW.ADD', NULL, 1, 0, NULL, 'In-News', 'la_event_article.review.add', 0);
-INSERT INTO Events VALUES(DEFAULT, 'NEWS.REVIEW.APPROVE', NULL, 1, 0, NULL, 'In-News', 'la_event_article.review.approve', 0);
-INSERT INTO Events VALUES(DEFAULT, 'NEWS.REVIEW.DENY', NULL, 1, 0, NULL, 'In-News', 'la_event_article.review.deny', 0);
-INSERT INTO Events VALUES(DEFAULT, 'NEWS.REVIEW.ADD.PENDING', NULL, 1, 0, NULL, 'In-News', 'la_event_article.review.add.pending', 1);
-INSERT INTO Events VALUES(DEFAULT, 'NEWS.REVIEW.ADD.PENDING', NULL, 1, 0, NULL, 'In-News', 'la_event_article.review.add.pending', 0);
-
-INSERT INTO ItemTypes VALUES (2, 'In-News', 'n', 'News', 'Title', 'CreatedById', 'Hits', 'CachedRating', 'la_ItemTab_News', 1, 'in-news/admin/addarticle.php', 'clsNews', 'Article');
-
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.ADD', 'lu_PermName_News.Add_desc', 'lu_PermName_News.Add_desc', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.VIEW', 'lu_PermName_News.View_desc', 'lu_PermName_News.View_desc', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.ADD.PENDING', 'lu_PermName_News.Add.Pending_desc', 'lu_PermName_News.Add.Pending_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.MODIFY', 'lu_PermName_News.Modify_desc', 'lu_PermName_News.Modify_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.DELETE', 'lu_PermName_News.Delete_desc', 'lu_PermName_News.Delete_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.RATE', 'lu_PermName_News.Rate_desc', 'lu_PermName_News.Rate_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.REVIEW', 'lu_PermName_News.Review_desc', 'lu_PermName_News.Review_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.REVIEW.PENDING', 'lu_PermName_News.Review.Pending_desc', 'lu_PermName_News.Review.Pending_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.MODIFY.PENDING', 'lu_PermName_News.Modify.Pending_desc', 'lu_PermName_News.Modify.Pending_desc', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.MODIFY', 'lu_PermName_News.Owner.Modify_desc', 'lu_PermName_News.Owner.Modify_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.MODIFY.PENDING', 'lu_PermName_News.Owner.Modify.Pending_desc', 'lu_PermName_News.Owner.Modify.Pending_error', 'In-News');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.DELETE', 'lu_PermName_News.Owner.Delete_desc', 'lu_PermName_News.Owner.Delete_error', 'In-News');
-
-INSERT INTO SearchConfig VALUES ('News', 'Title', 1, 1, 'lu_fielddesc_news_title', 'lu_field_title', 'In-News', 'la_text_article', 2, DEFAULT, 2, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'Excerpt', 1, 1, 'lu_fielddesc_news_excerpt', 'lu_field_excerpt', 'In-News', 'la_text_article', 3, DEFAULT, 1, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'Author', 1, 1, 'lu_fielddesc_news_author', 'lu_field_author', 'In-News', 'la_text_article', 4, DEFAULT, 1, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'Body', 1, 1, 'lu_fielddesc_news_body', 'lu_field_body', 'In-News', 'la_text_article', 5, DEFAULT, 1, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'CreatedOn', 0, 1, 'lu_fielddesc_news_createdon', 'lu_field_createdon', 'In-News', 'la_text_article', 6, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'EndOn', 0, 1, 'lu_fielddesc_news_endon', 'lu_field_endon', 'In-News', 'la_text_article', 7, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'Hits', 0, 1, 'lu_fielddesc_news_hits', 'lu_field_hits', 'In-News', 'la_text_article', 8, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'CachedRating', 0, 1, 'lu_fielddesc_news_cachedrating', 'lu_field_cachedrating', 'In-News', 'la_text_article', 9, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'CachedVotesQty', 0, 1, 'lu_fielddesc_news_cachedvotesqty', 'lu_field_cachedvotesqty', 'In-News', 'la_text_article', 10, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'CreatedById', 0, 1, 'lu_fielddesc_news_createdbyid', 'lu_field_createdbyid', 'In-News', 'la_text_article', 11, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'Priority', 0, 1, 'lu_fielddesc_news_priority', 'lu_field_priority', 'In-News', 'la_text_article', 12, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'Status', 0, 1, 'lu_fielddesc_news_status', 'lu_field_status', 'In-News', 'la_text_article', 13, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'EditorsPick', 0, 1, 'lu_fielddesc_news_editorspick', 'lu_field_editorspick', 'In-News', 'la_text_article', 14, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'LeadStory', 0, 1, 'lu_fielddesc_news_leadstory', 'lu_field_leadstory', 'In-News', 'la_text_article', 15, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'LeadCatStory', 0, 1, 'lu_fielddesc_news_leadcatstory', 'lu_field_leadcatstory', 'In-News', 'la_text_article', 16, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'ResourceId', 0, 1, 'lu_fielddesc_news_resourceid', 'lu_field_resourceid', 'In-News', 'la_text_article', 17, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'CachedReviewsQty', 0, 1, 'lu_fielddesc_news_cachedreviewsqty', 'lu_field_cachedreviewsqty', 'In-News', 'la_text_article', 18, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'StartDate', 0, 1, 'lu_fielddesc_news_startdate', 'lu_field_startdate', 'In-News', 'la_text_article', 19, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'NewItem', 0, 1, 'lu_fielddesc_news_newitem', 'lu_field_newitem', 'In-News', 'la_text_article', 20, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'PopItem', 0, 1, 'lu_fielddesc_news_popitem', 'lu_field_popitem', 'In-News', 'la_text_article', 21, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'HotItem', 0, 1, 'lu_fielddesc_news_hotitem', 'lu_field_hotitem', 'In-News', 'la_text_article', 22, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'Archived', 0, 1, 'lu_fielddesc_news_archived', 'lu_field_archived', 'In-News', 'la_text_article', 23, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'Modified', 0, 1, 'lu_fielddesc_news_modified', 'lu_field_modified', 'In-News', 'la_text_article', 24, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'ModifiedById', 0, 1, 'lu_fielddesc_news_modifiedbyid', 'lu_field_modifiedbyid', 'In-News', 'la_text_article', 25, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'OrgId', 0, 0, 'lu_fielddesc_news_orgid', 'lu_field_orgid', 'In-News', 'la_text_article', 26, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'NewsId', 0, 1, 'lu_fielddesc_news_newsid', 'lu_field_newsid', 'In-News', 'la_text_article', 0, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('CustomField', 'RssOriginalURL', 1, 0, 'la_fld_RssOriginalURL', 'lu_fld_RssOriginalURL', 'In-News', 'la_section_CustomFields', 0, DEFAULT, 1, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-
-INSERT INTO CustomField VALUES (DEFAULT, 1, 'RssExpireInterval', 'la_fld_RssExpireInterval', 0, 'la_title_SystemCF', 'la_fld_RssExpireInterval', 'text', NULL, '', 0, 0, 1, 0);
-INSERT INTO CustomField VALUES (DEFAULT, 1, 'RssUpdateInterval', 'la_fld_RssUpdateInterval', 0, 'la_title_SystemCF', 'la_fld_RssUpdateInterval', 'text', NULL, '', 0, 0, 1, 0);
-INSERT INTO CustomField VALUES (DEFAULT, 1, 'RssLastUpdated', 'la_fld_RssLastUpdated', 0, 'la_title_SystemCF', 'la_fld_RssLastUpdated', 'text', NULL, '', 0, 0, 1, 0);
-INSERT INTO CustomField VALUES (DEFAULT, 1, 'RssDeleteExpired', 'la_fld_RssDeleteExpired', 0, 'la_title_SystemCF', 'la_fld_RssDeleteExpired', 'text', NULL, '', 0, 0, 1, 0);
-INSERT INTO CustomField VALUES (DEFAULT, 2, 'RssOriginalURL', 'lu_fld_RssOriginalURL', 0, 'la_section_CustomFields', 'la_fld_RssOriginalURL', 'label', 'cut_first="100"', '', 0, 1, 0, 0);
-INSERT INTO CustomField VALUES (DEFAULT, 1, 'RssUpdateIntervalType', 'la_fld_RssUpdateIntervalType', 0, 'la_title_SystemCF', 'la_fld_RssUpdateIntervalType', 'text', NULL, '', 0, 0, 1, 0);
-INSERT INTO CustomField VALUES (DEFAULT, 1, 'RssSource', 'la_fld_RssSource', 0, 'la_title_SystemCF', 'la_fld_RssSource', 'text', NULL, '', 0, 0, 1, 0);
-INSERT INTO CustomField VALUES (DEFAULT, 1, 'RssExpireIntervalType', 'la_fld_RssExpireIntervalType', 0, 'la_title_SystemCF', 'la_fld_RssExpireIntervalType', 'text', NULL, '', 0, 0, 1, 0);
-INSERT INTO CustomField VALUES (DEFAULT, 1, 'RssDefaultExpiration', 'la_fld_RssDefaultExpiration', 0, 'la_title_SystemCF', 'la_fld_RssDefaultExpiration', 'text', NULL, '', 0, 0, 1, 0);
-INSERT INTO CustomField VALUES (DEFAULT, 1, 'RssDefaultExpirationType', 'la_fld_RssDefaultExpirationType', 0, 'la_title_SystemCF', 'la_fld_RssDefaultExpirationType', 'text', NULL, '', 0, 0, 1, 0);
-INSERT INTO CustomField VALUES (DEFAULT, 1, 'RssLastExpired', 'la_fld_RssLastExpired', 0, 'la_title_SystemCF', 'la_fld_RssLastExpired', 'text', NULL, '', 0, 0, 1, 0);
-INSERT INTO CustomField VALUES (DEFAULT, 2, 'RssArticleCRC', 'la_fld_RssArticleCRC', 0, 'la_section_SystemCF', 'la_fld_RssArticleCRC', 'text', NULL, '', 0, 0, 1, 0);
-INSERT INTO CustomField VALUES (DEFAULT, 1, 'n_ItemTemplate', 'la_fld_cust_n_ItemTemplate', 0, 'la_title_SystemCF', 'la_fld_cust_n_ItemTemplate', 'text', NULL, '', 0, 0, 1, 0);
-
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT count(*) FROM <%prefix%>News WHERE Status=1', NULL, 'la_prompt_ActiveArticles', 0, 1);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS TotalArticles FROM <%prefix%>News', NULL, 'la_prompt_ArticlesTotal', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS ActiveArticles FROM <%prefix%>News WHERE Status = 1', NULL, 'la_prompt_ArticlesActive', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS PendingArticles FROM <%prefix%>News WHERE Status = 2', NULL, 'la_prompt_ArticlesPending', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS DisabledArticles FROM <%prefix%>News WHERE Status = 0', NULL, 'la_prompt_DisabledArticles', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS ArchivedArticles FROM <%prefix%>News WHERE Archived = 1', NULL, 'la_prompt_ArticlesArchived', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS NewArticles FROM <%prefix%>News WHERE (NewItem = 1) OR ( (UNIX_TIMESTAMP() - CreatedOn) <= <%m:config name="News_CatNewDays"%>*86400 AND (NewItem = 2) )', NULL, 'la_prompt_NewArticles', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) FROM <%prefix%>News WHERE EditorsPick = 1', NULL, 'la_prompt_EditorsPickArticles', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS HotArticles FROM <%prefix%>News WHERE (HotItem = 1) OR (Hits >= <%m:config name="News_MaxHotNumber"%> AND (HotItem = 2) )', NULL, 'la_prompt_HotArticles', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) FROM <%prefix%>News WHERE LeadStory  = 1', NULL, 'la_prompt_LeadStoryArticles', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) FROM <%prefix%>News WHERE LeadCatStory = 1', NULL, 'la_prompt_CategoryLeadStoryArticles', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT <%m:post_format field="AVG(CachedRating)" type="currency" precision="2"%> FROM <%prefix%>News WHERE CachedRating > 0', NULL, 'la_prompt_ArticleAverageRating', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS PopularArticles FROM <%prefix%>News WHERE (PopItem = 1) OR ( (CachedRating >= <%article:hit_count type="top"%>) AND <%article:hit_count type="top"%> AND (PopItem = 2) )', NULL, 'la_prompt_PopularArticles', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT MAX(Hits) AS MaxHitsArticles FROM <%prefix%>News', NULL, 'la_prompt_MaxHitsArticles', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT MAX(CachedVotesQty) AS MaxVotesArticles FROM <%prefix%>News', NULL, 'la_prompt_MaxVotesArticles', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT <%m:post_format field="MAX(CreatedOn)" type="date"%> FROM <%prefix%>News', NULL, 'la_prompt_NewestArticleDate', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT <%m:post_format field="MAX(Modified)" type="date"%> FROM <%prefix%>News', NULL, 'la_prompt_LastArticleUpdate', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) FROM <%prefix%>ItemReview WHERE Module = \'<%modules:get_current%>\'', NULL, 'la_prompt_ArticleReviews', 0, 2);
-
-INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.VIEW', 14, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.VIEW', 14, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.VIEW', 13, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.ADD.PENDING', 13, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'FAVORITES', 13, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.VIEW', 13, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.RATE', 13, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.REVIEW', 13, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.ADD', 13, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.MODIFY', 13, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.MODIFY.PENDING', 13, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.DELETE', 13, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.VIEW', 11, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.ADD', 11, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.DELETE', 11, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.MODIFY', 11, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'FAVORITES', 11, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.VIEW', 11, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.ADD', 11, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.DELETE', 11, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.MODIFY', 11, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.RATE', 11, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.REVIEW', 11, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.VIEW', 12, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'FAVORITES', 12, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.VIEW', 12, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.RATE', 12, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.REVIEW.PENDING', 12, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.ADD.PENDING', 12, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.MODIFY', 12, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.MODIFY.PENDING', 12, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.VIEW', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.ADD', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.DELETE', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.MODIFY', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.RATE', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.REVIEW', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.REVIEW.PENDING', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.ADD.PENDING', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.MODIFY.PENDING', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.MODIFY', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.MODIFY.PENDING', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.DELETE', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news.view', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:articles.view', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:setting_folder.view', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_output.view', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_output.edit', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_search.view', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_search.edit', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_email.view', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_email.edit', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_custom.view', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_custom.add', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_custom.edit', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_custom.delete', 11, 1, 1, 0);
-
-INSERT INTO ImportScripts VALUES (DEFAULT, 'Articles from CSV file [In-News]', '', 'n', 'In-News', '', 'CSV', '1');
-
-INSERT INTO Modules VALUES ('In-News', 'in-news/', 'n', DEFAULT, 1, 2, 'in-news/', {NewsCatId}, NULL);
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/install/install_data.sql
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.7
\ No newline at end of property
Index: branches/5.1.x/in-news/install/upgrades.php
===================================================================
--- branches/5.1.x/in-news/install/upgrades.php	(revision 13095)
+++ branches/5.1.x/in-news/install/upgrades.php	(nonexistent)
@@ -1,118 +0,0 @@
-<?php
-/**
-* @version	$Id$
-* @package	In-News
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
-*/
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	$upgrade_class = 'InNewsUpgrades';
-
-	/**
-	 * Class, that holds all upgrade scripts for "Core" module
-	 *
-	 */
-	class InNewsUpgrades extends kHelper {
-
-		/**
-		 * Install toolkit instance
-		 *
-		 * @var kInstallToolkit
-		 */
-		var $_toolkit = null;
-
-		/**
-		 * Sets common instance of installator toolkit
-		 *
-		 * @param kInstallToolkit $instance
-		 */
-		function setToolkit(&$instance)
-		{
-			$this->_toolkit =& $instance;
-		}
-
-		/**
-		 * Changes table structure, where multilingual fields of TEXT type are present
-		 *
-		 * @param string $mode when called mode {before, after)
-		 */
-		function Upgrade_5_0_0($mode)
-		{
-			if ($mode == 'after') {
-				$root_category = $this->Application->findModule('Name', 'In-News', 'RootCat');
-
-				$sql = 'UPDATE ' . $this->Application->getUnitOption('c', 'TableName') . '
-						SET UseMenuIconUrl = 1, MenuIconUrl = "in-news/img/menu_articles.gif"
-						WHERE ' . $this->Application->getUnitOption('c', 'IDField') . ' = ' . $root_category;
-				$this->Conn->Query($sql);
-
-				$this->_updateDetailTemplate('n', 'innews/detail', 'in-news/designs/detail');
-			}
-		}
-
-		/**
-		 * Replaces deprecated detail template design with new one
-		 *
-		 * @param string $prefix
-		 * @param string $from_template
-		 * @param string $to_template
-		 */
-		function _updateDetailTemplate($prefix, $from_template, $to_template)
-		{
-			$sql = 'SELECT CustomFieldId
-					FROM ' . TABLE_PREFIX . 'CustomField
-					WHERE FieldName = "' . $prefix . '_ItemTemplate"';
-			$custom_field_id = $this->Conn->GetOne($sql);
-
-			$ml_formatter =& $this->Application->recallObject('kMultiLanguage');
-			/* @var $ml_formatter kMultiLanguage */
-
-			$field = $ml_formatter->LangFieldName('cust_' . $custom_field_id, true);
-
-			$sql = 'UPDATE ' . TABLE_PREFIX . 'CategoryCustomData
-					SET ' . $field . ' = "' . $to_template . '"
-					WHERE ' . $field . ' = "' . $from_template . '"';
-			$this->Conn->Query($sql);
-		}
-
-		/**
-		 * Update to 5.0.1
-		 *
-		 * @param string $mode when called mode {before, after)
-		 */
-		function Upgrade_5_0_1($mode)
-		{
-			if ($mode == 'after') {
-				$this->_updateDetailTemplate('n', 'in-news/designs/detail', 'in-news/articles/article_detail');
-
-				// delete old events
-				$events_to_delete = Array ( 'NEWS.OWNER.MODIFY.PENDING', 'NEWS.OWNER.MODIFY' );
-
-				$sql = 'SELECT EventId FROM ' . TABLE_PREFIX . 'Events
-							WHERE Event IN ("' . implode('","', $events_to_delete) . '")';
-				$event_ids = $this->Conn->GetCol($sql);
-
-				if ($event_ids) {
-					$sql = 'DELETE FROM ' . TABLE_PREFIX . 'EmailMessage
-								WHERE EventId IN (' . implode(',', $event_ids) . ')';
-					$this->Conn->Query($sql);
-
-					$sql = 'DELETE FROM ' . TABLE_PREFIX . 'Events
-								WHERE EventId IN (' . implode(',', $event_ids) . ')';
-					$this->Conn->Query($sql);
-
-					$sql = 'DELETE FROM ' . TABLE_PREFIX . 'Phrase
-								WHERE Phrase IN ("la_event_news.owner.modify", "la_event_news.owner.modify.pending")';
-					$this->Conn->Query($sql);
-				}
-			}
-		}
-	}
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/install/upgrades.php
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.3
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Index: branches/5.1.x/in-news/units/.htaccess
===================================================================
--- branches/5.1.x/in-news/units/.htaccess	(revision 13095)
+++ branches/5.1.x/in-news/units/.htaccess	(nonexistent)
@@ -1 +0,0 @@
-deny from all
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/units/.htaccess
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Index: branches/5.1.x/in-news/units/articles/articles_tag_processor.php
===================================================================
--- branches/5.1.x/in-news/units/articles/articles_tag_processor.php	(revision 13095)
+++ branches/5.1.x/in-news/units/articles/articles_tag_processor.php	(nonexistent)
@@ -1,33 +0,0 @@
-<?php
-/**
-* @version	$Id$
-* @package	In-News
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
-*/
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	class ArticlesTagProcessor extends kCatDBTagProcessor {
-
-		function ListRelatedArticles($params)
-		{
-			return $this->PrintList2($params);
-		}
-
-		function ListArticles($params)
-		{
-			return $this->PrintList2($params);
-		}
-
-		function ArticleLink($params)
-		{
-			return $this->ItemLink($params, 'article');
-		}
-	}
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/units/articles/articles_tag_processor.php
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Index: branches/5.1.x/in-news/units/articles/articles_config.php
===================================================================
--- branches/5.1.x/in-news/units/articles/articles_config.php	(revision 13095)
+++ branches/5.1.x/in-news/units/articles/articles_config.php	(nonexistent)
@@ -1,476 +0,0 @@
-<?php
-/**
-* @version	$Id$
-* @package	In-News
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
-*/
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	$config =	Array(
-					'Prefix'			=>	'n',
-
-					'ItemClass'			=>	Array('class' => 'kCatDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
-					'ListClass'			=>	Array('class' => 'kCatDBList', 'file' => '', 'build_event' => 'OnListBuild'),
-					'EventHandlerClass'	=>	Array('class' => 'ArticlesEventHandler', 'file' => 'articles_event_handler.php', 'require_classes' => Array('kCatDBEventHandler'), 'build_event' => 'OnBuild'),
-					'TagProcessorClass' =>	Array('class' => 'ArticlesTagProcessor', 'file' => 'articles_tag_processor.php', 'require_classes' => Array('kCatDBTagProcessor'), 'build_event' => 'OnBuild'),
-					'AutoLoad'			=>	true,
-
-					'ConfigPriority' => 0,
-
-					'RewritePriority' => 102,
-					'RewriteListener' => 'ModRewriteHelper:CategoryItemRewriteListener',
-
-					'Hooks' => Array (
-						Array (
-							'Mode' => hAFTER,
-							'Conditional' => false,
-							'HookToPrefix' => 'c',
-							'HookToSpecial' => '*',
-							'HookToEvent' => Array('OnAfterConfigRead'),
-							'DoPrefix' => '',
-							'DoSpecial' => '',
-							'DoEvent' => 'OnUpdateCategoryCustomFields',
-						),
-
-						Array (
-							'Mode' => hBEFORE,
-							'Conditional' => false,
-							'HookToPrefix' => '',
-							'HookToSpecial' => '*',
-							'HookToEvent' => Array('OnAfterConfigRead'),
-							'DoPrefix' => '#file',
-							'DoSpecial' => '*',
-							'DoEvent' => 'OnDefineFiles',
-						),
-
-						Array (
-							'Mode' => hBEFORE,
-							'Conditional' => false,
-							'HookToPrefix' => '',
-							'HookToSpecial' => '*',
-							'HookToEvent' => Array('OnAfterConfigRead'),
-							'DoPrefix' => 'cdata',
-							'DoSpecial' => '*',
-							'DoEvent' => 'OnDefineCustomFields',
-						),
-					),
-
-					'CatalogItem' 			=>	true,
-					'AdminTemplatePath'		=>	'articles',
-					'AdminTemplatePrefix'	=>	'articles_',
-					'SearchConfigPostfix' 	=>	'articles',
-
-					'QueryString'		=>	Array(
-												1	=>	'id',
-												2	=>	'Page',
-												3	=>	'event',
-												4	=>	'mode',
-											),
-
-					'RegularEvents'		=>	Array(
-													'rss_category_update' =>	Array('EventName' => 'OnUpdateRSSAtricles', 'RunInterval' => 0, 'Type' => reBEFORE),
-											),
-
-					'IDField'			=>	'NewsId',
- 					'StatusField'		=>	Array('Status'),	// field, that is affected by Approve/Decline events
-
-					'TitleField'		=>	'Title',		// field, used in bluebar when editing existing item
-					'TitlePhrase'		=>	'la_Text_Article',	// phrase used to specify item type in relationship list
-
-					'TitlePresets'		=>	Array(
-	   												'default'	=>	Array(	'new_status_labels'		=> Array('n' => '!la_title_AddingArticle!'),
-																			'edit_status_labels'	=> Array('n' => '!la_title_EditingArticle!'),
-																			'new_titlefield'		=> Array('n' => '!la_title_NewArticle!'),
-																	),
-
-													'articles_edit' => Array('prefixes' => Array('n'), 'format' => "#n_status# '#n_titlefield#' - !la_title_General!"),
-
-													'articles_categories'=>Array('prefixes' => Array('n','n-ci_List'), 'format' => "#n_status# '#n_titlefield#' - !la_title_Categories!"),
-													'articles_relations'=>	Array('prefixes' => Array('n'), 'format' => "#n_status# '#n_titlefield#' - !la_title_Relations!"),
-													'articles_images'	=>	Array('prefixes' => Array('n'), 'format' => "#n_status# '#n_titlefield#' - !la_title_Images!"),
-													'articles_files'	=>	Array('prefixes' => Array('n'), 'format' => "#n_status# '#n_titlefield#' - !la_title_Files!"),
-													'articles_reviews'	=>	Array('prefixes' => Array('n'), 'format' => "#n_status# '#n_titlefield#' - !la_title_Reviews!"),
-													'articles_custom'	=>	Array('prefixes' => Array('n'), 'format' => "#n_status# '#n_titlefield#' - !la_title_Custom!"),
-
-													'images_edit'		=>	Array(	'prefixes'				=>	Array('n', 'n-img'),
-																					'new_status_labels'		=>	Array('n-img'=>'!la_title_Adding_Image!'),
-																					'edit_status_labels'	=>	Array('n-img'=>'!la_title_Editing_Image!'),
-																					'new_titlefield'		=>	Array('n-img'=>'!la_title_New_Image!'),
-																					'format'				=>	"#n_status# '#n_titlefield#' - #n-img_status# '#n-img_titlefield#'",
-																			),
-													'file_edit' => Array (
-														'prefixes' => Array ('n', 'n-file'),
-														'new_status_labels' => Array ('n-file' => "!la_title_AddingFile!"),
-														'edit_status_labels' => Array ('n-file' => '!la_title_EditingFile!'),
-														'new_titlefield' => Array ('n-file' => '!la_title_NewFile!'),
-														'format' => "#n_status# '#n_titlefield#' - #n-file_status# '#n-file_titlefield#'",
-														),
-
-													'reviews_edit'	=>	Array(		'prefixes'				=>	Array('n', 'n-rev'),
-																					'new_status_labels'		=>	Array('n-rev'=>"!la_title_Adding_Review! '!la_title_New_Review!'"),
-																					'edit_status_labels'	=>	Array('n-rev'=>'!la_title_Editing_Review!'),
-																					'format'				=>	"#n_status# '#n_titlefield#' - #n-rev_status#",
-																			),
-
-													'relations_edit'	=>	Array(	'prefixes'				=>	Array('n', 'n-rel'),
-																					'new_status_labels'		=>	Array('n-rel'=>"!la_title_Adding_Relationship! '!la_title_New_Relationship!'"),
-																					'edit_status_labels'	=>	Array('n-rel'=>'!la_title_Editing_Relationship!'),
-																					'format'				=>	"#n_status# '#n_titlefield#' - #n-rel_status#",
-																			),
-
-	   												'tree_in-news'	=>	Array('format' => '!la_Text_Version! '.$this->Application->findModule('Name', 'In-News', 'Version')),
-
-													'articles_export' => Array('format' => '!la_title_ArticlesExport!'),
-
-													'articles_import' => Array('format' => '!la_title_ImportArticles!'),
-   											),
-
-   					'EditTabPresets' => Array (
-   						'Default' => Array (
-   							Array ('title' => 'la_tab_General', 't' => 'in-news/articles/articles_edit', 'priority' => 1),
-   							Array ('title' => 'la_tab_Categories', 't' => 'in-news/articles/articles_categories', 'priority' => 2),
-   							Array ('title' => 'la_tab_Relations', 't' => 'in-news/articles/articles_relations', 'priority' => 3),
-   							Array ('title' => 'la_tab_Images', 't' => 'in-news/articles/articles_images', 'priority' => 4),
-   							Array ('title' => 'la_tab_Files', 't' => 'in-news/articles/articles_files', 'priority' => 5),
-   							Array ('title' => 'la_tab_Reviews', 't' => 'in-news/articles/articles_reviews', 'priority' => 6),
-   							Array ('title' => 'la_tab_Custom', 't' => 'in-news/articles/articles_custom', 'priority' => 7),
-   						),
-   					),
-
-   					'PermItemPrefix'	=>	'NEWS',
-
-   					'PermTabText'		=>	'In-News',
-   					'PermSection'		=>	Array('main' => 'CATEGORY:in-news:articles_list', 'search' => 'in-news:configuration_search', 'email' => 'in-news:configuration_email', 'custom' => 'in-news:configuration_custom'),
-
-					'Sections'			=>	Array(
-						/*'in-news'	=>	Array(
-							'parent'		=>	'in-portal:root',
-							'icon'			=>	'settings_in-newz',
-							'label'			=>	'la_title_In-News',
-							'url'			=>	Array('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
-							'permissions'	=>	Array('view'),
-							'priority'		=>	3.2,
-							'container'		=>	true,
-							'type'			=>	stTREE,
-						),*/
-
-						'in-news:articles'	=>	Array(
-							'parent'		=>	'in-portal:site',
-							'icon'			=>	'articles',
-							'label'			=>	'la_tab_Articles',
-							'url'			=>	Array('t' => 'catalog/advanced_view', 'anchor' => 'tab-n.showall', 'pass' => 'm'),
-							'onclick'		=>	'setCatalogTab(\'n.showall\')',
-							'permissions'	=>	Array('view'),
-							'priority'		=>	3.3,
-							'type'			=>	stTREE,
-						),
-
-						// article settings
-						'in-news:setting_folder' => Array (
-							'parent'		=>	'in-portal:system',
-							'icon'			=>	'conf_news',
-							'label'			=>	'la_title_In-News',
-							'url'			=>	Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
-							'permissions'	=>	Array ('view'),
-							'priority'		=>	3.4,
-							'container'		=>	true,
-							'type'			=>	stTREE,
-						),
-
-						/*'in-news:innews_general'	=>	Array(
-							'parent'		=>	'in-news:setting_folder',
-							'icon'			=>	'core:settings_general',
-							'label'			=>	'la_tab_GeneralSettings',
-							'url'			=>	Array('t' => 'config/config_general', 'pass_section' => true, 'pass' => 'm'),
-							'permissions'	=>	Array('view', 'edit'),
-							'priority'		=>	0.9,
-							'type'			=>	stTREE,
-						),*/
-
-						'in-news:configuration_output'	=>	Array(
-							'parent'		=>	'in-news:setting_folder',
-							'icon'			=>	'core:conf_output',
-							'label'			=>	'la_tab_ConfigOutput',
-							'url'			=>	Array('t' => 'config/config_general', 'pass_section' => true, 'pass' => 'm'),
-							'permissions'	=>	Array('view', 'edit'),
-							'priority'		=>	1,
-							'type'			=>	stTREE,
-						),
-
-						'in-news:configuration_search'	=>	Array(
-							'parent'		=>	'in-news:setting_folder',
-							'icon'			=>	'core:conf_search',
-							'label'			=>	'la_tab_ConfigSearch',
-							'url'			=>	Array('t' => 'config/config_search', 'module_key' => 'articles', 'pass_section' => true, 'pass' => 'm'),
-							'permissions'	=>	Array('view', 'edit'),
-							'priority'		=>	2,
-							'type'			=>	stTREE,
-						),
-
-						'in-news:configuration_email'	=>	Array(
-							'parent'		=>	'in-news:setting_folder',
-							'icon'			=>	'core:conf_email',
-							'label'			=>	'la_tab_ConfigE-mail',
-							'url'			=>	Array('t' => 'config/config_email', 'pass_section' => true, 'pass' => 'm'),
-							'permissions'	=>	Array('view', 'edit'),
-							'priority'		=>	3,
-							'type'			=>	stTREE,
-						),
-
-						'in-news:configuration_custom'	=>	Array(
-							'parent'		=>	'in-news:setting_folder',
-							'icon'			=>	'core:conf_customfields',
-							'label'			=>	'la_tab_ConfigCustom',
-							'url'			=>	Array('t' => 'custom_fields/custom_fields_list', 'cf_type' => 2, 'pass_section' => true, 'pass' => 'm,cf'),
-							'permissions'	=>	Array('view', 'add', 'edit', 'delete'),
-							'priority'		=>	4,
-							'type'			=>	stTREE,
-						),
-
-					),
-
-					'FilterMenu'		=>	Array(
-												'Groups' => Array(
-													Array('mode' => 'AND', 'filters' => Array('show_active','show_pending','show_disabled'), 'type' => WHERE_FILTER),
-													Array('mode' => 'AND', 'filters' => Array('show_new'), 'type' => HAVING_FILTER),
-													Array('mode' => 'AND', 'filters' => Array('show_hot'), 'type' => HAVING_FILTER),
-													Array('mode' => 'AND', 'filters' => Array('show_pop'), 'type' => HAVING_FILTER),
-													Array('mode' => 'AND', 'filters' => Array('show_pick'), 'type' => WHERE_FILTER),
-												),
-												'Filters' => Array(
-													'show_active'	=>	Array('label' =>'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ),
-													'show_pending'	=>	Array('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2'  ),
-													'show_disabled'	=>	Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0'  ),
-													's1'	=>	Array(),
-													'show_new'	=>	Array('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1'  ),
-													'show_hot'	=>	Array('label' => 'la_Text_Hot', 'on_sql' => '', 'off_sql' => '`IsHot` != 1'  ),
-													'show_pop'	=>	Array('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1'  ),
-													'show_pick'	=>	Array('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1'  ),
-												)
-											),
-
-					'CatalogSelectorName'	=>	'newslist',
-
-					'ItemPropertyMappings'	=>	Array(
-														'NewDays'		=>	'News_CatNewDays',	// number of days item to be NEW
-														'MinPopVotes'	=>	'News_MinPopVotes',	// minimum number of votes for an item to be POP
-														'MinPopRating'	=>	'News_MinPopRating',// minimum rating for an item to be POP
-														'MaxHotNumber'	=>	'News_MaxHotNumber',// maximum number of HOT items
-
-														'HotLimit'		=>	'News_HotLimit',	// variable name in inp_Cache table
-														'ClickField'	=>	'Hits',				// item click count is stored here (in item table)
-												),
-
-					'ItemType'			=>	2,	// this is used when relation to product is added from in-portal and via-versa
-
-					'ViewMenuPhrase'	=>	'la_title_Articles',
-					'CatalogTabIcon' => 'in-news:icon16_articles.png',
-					'UsePendingEditing'	=>	true, // item editing is controlled by NEWS.ADD/EDIT, NEWS.ADD/EDIT.PENDING permissions
-
-					'StatisticsInfo'	=>	Array(
-													'pending'	=>	Array(
-																			'icon'		=>	'icon16_article_pending.gif',
-																			'label'		=>	'la_Text_Articles',
-																			'js_url' 	=>	'#url#',
-																			'url'		=>	Array('t' => 'catalog/advanced_view', 'SetTab' => 'n', 'pass' => 'm,n.showall', 'n.showall_event' => 'OnSetFilterPattern', 'n.showall_filters' => 'show_active=0,show_pending=1,show_disabled=0,show_new=1,show_hot=1,show_pop=1,show_pick=1'),
-																			'status'	=>	STATUS_PENDING,
-																	),
-											),
-
-					'TableName'			=>	TABLE_PREFIX.'News',
-
-					'CalculatedFields' => Array(
-						'' => Array (
-							'UserName'		=>	'IF (ISNULL(u.Login), IF (%1$s.CreatedById = -1, "root", IF (%1$s.CreatedById = -2, "Guest", "n/a")), u.Login)',
-							'CategoryId'	=>	TABLE_PREFIX.'%3$sCategoryItems.CategoryId',
-							'Filename' => TABLE_PREFIX.'%3$sCategoryItems.Filename',
-							'CategoryFilename' => TABLE_PREFIX.'Category.NamedParentPath',
-							'PrimaryCat'	=> TABLE_PREFIX.'%3$sCategoryItems.PrimaryCat',
-							'ParentPath' => TABLE_PREFIX.'Category.ParentPath',
-
-							'SameImages'	=>	'img.SameImages',
-							'LocalThumb'	=>	'img.LocalThumb',
-							'ThumbPath'		=>	'img.ThumbPath',
-							'ThumbUrl'		=>	'img.ThumbUrl',
-							'LocalImage'	=>	'img.LocalImage',
-							'LocalPath'		=>	'img.LocalPath',
-							'FullUrl'		=>	'img.Url',
-						),
-					),
-
-					'CacheModRewrite' => true,
-
-					'ListSQLs'			=>	Array(	''=>'	SELECT %1$s.* %2$s
-															FROM %1$s
-															LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryItems ON '.TABLE_PREFIX.'%3$sCategoryItems.ItemResourceId = %1$s.ResourceId
-															LEFT JOIN '.TABLE_PREFIX.'Category ON '.TABLE_PREFIX.'Category.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
-															LEFT JOIN '.TABLE_PREFIX.'Images img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
-															LEFT JOIN '.TABLE_PREFIX.'PermCache perm ON perm.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
-															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.CreatedById = u.PortalUserId
-															LEFT JOIN '.TABLE_PREFIX.'%3$sNewsCustomData cust ON %1$s.ResourceId = cust.ResourceId',
-											), // key - special, value - list select sql
-
-					'ListSortings'	=> 	Array(
-												'' => Array(
-															'ForcedSorting' => Array('Priority' => 'desc'),
-															'Sorting' => Array('Title' => 'asc'),
-														)
-										),
-					'ItemSQLs'			=>	Array(	''=>'	SELECT %1$s.* %2$s
-															FROM %1$s
-															LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryItems ON '.TABLE_PREFIX.'%3$sCategoryItems.ItemResourceId = %1$s.ResourceId
-															LEFT JOIN '.TABLE_PREFIX.'Category ON '.TABLE_PREFIX.'Category.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
-															LEFT JOIN '.TABLE_PREFIX.'Images img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
-															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.CreatedById = u.PortalUserId
-															LEFT JOIN '.TABLE_PREFIX.'%3$sNewsCustomData cust ON %1$s.ResourceId = cust.ResourceId'),
-
-					'SubItems'			=>	Array('n-rev', 'n-ci', 'n-rel', 'n-img', 'n-cdata', 'n-fav', 'n-file'),
-
-					'Fields' => Array (
-							            'NewsId'			=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0,),
-							            'Title'				=>	Array('type' => 'string', /*'formatter' => 'kMultiLanguage', */'not_null' => 1, 'required' => 1, 'default' => '', 'max_len' => 255),
-							            'AutomaticFilename' =>	Array('type' => 'int', 'not_null' => 1, 'default' => 1),
-							            'Excerpt'			=>	Array('type' => 'string', /*'formatter' => 'kMultiLanguage',*/ 'default' => null),
-							            'Author'			=>	Array('type' => 'string', 'not_null' => 1, 'default' => ''),
-							            'Body'				=>	Array('type' => 'string', 'formatter' => 'kFormatter',/*'kMultiLanguage'*/ 'using_fck' => 1, 'required' => 1, 'default' => null),
-							            'CreatedOn'			=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'not_null' => 1,'default' => '#NOW#'),
-							            'TextFormat'		=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0),
-							            'EndOn'				=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null),
-							            'Hits'				=>	Array('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%d', 'not_null' => 1, 'default' => 0),
-							            'CachedRating'		=>	Array('type' => 'string', 'default' => 0),
-							            'CachedVotesQty'	=>	Array('type' => 'int','not_null' => 1,'default' => 0),
-							            'CreatedById' 		=>	Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1, 'required' => 1, 'default' => -1),
-							            'Priority'			=>	Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-							            'Status'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2),
-							            'EditorsPick'		=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
-							            'LeadStory'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
-							            'LeadCatStory'		=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
-							            'ResourceId'		=>	Array('type' => 'int', 'default' => null),
-							            'CachedReviewsQty'	=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0),
-							            'StartDate'			=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'not_null' => 1, 'default' => '#NOW#'),
-							            'NewItem'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1,'default' => 2),
-										'PopItem'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1,'default' => 2),
-							            'HotItem'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1,'default' => 2),
-							            'Archived'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 2 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
-							            'Modified'			=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1,'default' => '#NOW#'),
-							            'ModifiedById'		=>	Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1,'default' => -1),
-							            'OrgId'				=>	Array('type' => 'int', 'default' => null),
-							            'MetaKeywords'			=>	Array('type' => 'string', 'default' => null),
-										'MetaDescription'		=>	Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null),
-							),
-
-					'VirtualFields'	=> 	Array (
-						'MoreCategories'		=>	Array ('type' => 'string', 'default' => ''),
-
-						'UserName'				=>	Array('type' => 'string', 'default' => ''),
-						'CategoryId'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => 0),
-
-						'cust_RssOriginalURL'	=>	Array('type' => 'string', 'default' => ''),
-						'cust_RssArticleCRC'	=>	Array('type' => 'int', 'default' => 0),
-						'Filename'				=>	Array('type' => 'string', 'not_null' => 1, 'default' => ''),
-						'CachedNavbar'			=>	Array('type' => 'string', 'default' => ''),
-						'ParentPath'			=>	Array('type' => 'string', 'default' => ''),
-
-						// for primary image
-						'SameImages'	=>	Array('type' => 'string', 'default' => ''),
-						'LocalThumb'	=>	Array('type' => 'string', 'default' => ''),
-						'ThumbPath'		=>	Array('type' => 'string', 'default' => ''),
-						'ThumbUrl'		=>	Array('type' => 'string', 'default' => ''),
-						'LocalImage'	=>	Array('type' => 'string', 'default' => ''),
-						'LocalPath'		=>	Array('type' => 'string', 'default' => ''),
-						'FullUrl'		=>	Array('type' => 'string', 'default' => ''),
-
-						// export related fields: begin
-						'CategoryId'	=>	Array('type' => 'int', 'default' => 0),
-						'ExportFormat'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'CSV', /*2 => 'XML'*/), 'default' => 1),
-						'ExportFilename'		=>	Array('type' => 'string', 'default' => ''),
-						'FieldsSeparatedBy'		=>	Array('type' => 'string', 'default' => ','),
-						'FieldsEnclosedBy'		=>	Array('type' => 'string', 'default' => '"'),
-						'LineEndings'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'Windows', 2 => 'UNIX'), 'default' => 1),
-						'LineEndingsInside'		=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'CRLF', 2 => 'LF'), 'default' => 2),
-						'IncludeFieldTitles'	=>	Array('type' => 'int', 'default' => 1),
-						'ExportColumns'			=>	Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array()),
-						'AvailableColumns'		=>	Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array()),
-						'CategoryFormat'		=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_MixedCategoryPath', 2 => 'la_SeparatedCategoryPath'), 'use_phrases' => 1, 'default' => 1),
-						'CategorySeparator'		=>	Array('type' => 'string', 'default' => ':'),
-						'IsBaseCategory'		=>	Array('type' => 'int', 'default' => 0),
-						// export related fields: end
-
-						// import related fields: begin
-						'FieldTitles'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Automatic', 2 => 'la_Manual'), 'use_phrases' => 1, 'default' => 1),
-						'ImportSource'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Upload', 2 => 'la_Local'), 'use_phrases' => 1, 'default' => 2),
-						'ImportFilename'		=>	Array('type' => 'string', 'formatter' => 'kUploadFormatter', 'max_size' => MAX_UPLOAD_SIZE, 'upload_dir' => (defined('EXPORT_BASE_PATH') ? EXPORT_BASE_PATH : '/admin/export') . '/'),
-						'ImportLocalFilename'	=>	Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'default' => ''),
-						'CheckDuplicatesMethod'	=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_IDField', 2 => 'la_OtherFields'), 'use_phrases' => 1, 'default' => 1),
-						'ReplaceDuplicates'		=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'default' => 0),
-						'DuplicateCheckFields'	=>	Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('Title' => 'TITLE'), 'default' => '|Title|'),
-						'SkipFirstRow'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'default' => 1),
-						// import related fields: end
-					),
-
-					'Grids'	=> Array(
-						'Default' => Array (
-							'Icons' => Array (
-								0 => 'icon16_article_disabled.png',
-								1 => 'icon16_article.png',
-								2 => 'icon16_article_pending.png',
-								'NEW' => 'icon16_article_new.png',
-							),
-
-							'Fields' => Array (
-								'NewsId' =>	Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-								'Title' => Array ('title' => 'la_col_Title', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
-								'UserName' => Array ('title' => 'la_col_Author', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
-								'LeadStory' => Array('title' => 'la_col_LeadStory', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
-								'LeadCatStory' => Array('title' => 'la_col_LeadCatStory', 'filter_block' => 'grid_options_filter', 'width' => 85, ),
-								'Status' => Array('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
-								'StartDate' => Array('title' => 'la_col_StartDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
-								'EndOn' => Array('title' => 'la_col_EndOn', 'data_block' => 'article_expire_td', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
-							),
-						),
-
-
-						'Radio'	=>	Array (
-							'Icons' => Array (
-								0 => 'icon16_article_disabled.png',
-								1 => 'icon16_article.png',
-								2 => 'icon16_article_pending.png',
-								-2 => 'icon16_article_pending.png', // pending DUPLICATE item
-								'NEW' => 'icon16_article_new.gif',
-							),
-
-							'Selector' => 'radio',
-							'Fields' => Array (
-								'NewsId' =>	Array ('title' => 'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-								'Title' => Array ('title' => 'la_col_Title', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
-								'UserName' => Array ('title' => 'la_col_Author', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
-								'LeadStory' => Array('title' => 'la_col_LeadStory', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
-								'LeadCatStory' => Array('title' => 'la_col_LeadCatStory', 'filter_block' => 'grid_options_filter', 'width' => 85, ),
-								'Status' => Array('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
-								'StartDate' => Array('title' => 'la_col_StartDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
-								'EndOn' => Array('title' => 'la_col_EndOn', 'data_block' => 'article_expire_td', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
-							),
-						),
-					),
-
-					'ConfigMapping' => 	Array(
-												'PerPage'				=>	'Perpage_News',
-												'ShortListPerPage'		=>	'Perpage_News_Short',
-												'ForceEditorPick'		=>	'News_ShowPick',
-												'DefaultSorting1Field'	=>	'News_SortField',
-												'DefaultSorting2Field'	=>	'News_SortField2',
-												'DefaultSorting1Dir'	=>	'News_SortOrder',
-												'DefaultSorting2Dir'	=>	'News_SortOrder2',
-
-												'RatingDelayValue'		=>	'News_RatingDelay_Value',
-												'RatingDelayInterval'	=>	'News_RatingDelay_Interval',
-										),
-			);
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/units/articles/articles_config.php
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.52.2.18
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Index: branches/5.1.x/in-news/units/articles/articles_event_handler.php
===================================================================
--- branches/5.1.x/in-news/units/articles/articles_event_handler.php	(revision 13095)
+++ branches/5.1.x/in-news/units/articles/articles_event_handler.php	(nonexistent)
@@ -1,503 +0,0 @@
-<?php
-/**
-* @version	$Id$
-* @package	In-News
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
-*/
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	class ArticlesEventHandler extends kCatDBEventHandler {
-
-		/**
-		 * Filters out archived articles
-		 *
-		 * @param kEvent $event
-		 */
-		function SetCustomQuery(&$event)
-		{
-			parent::SetCustomQuery($event);
-
-			$object =& $event->getObject();
-
-			if (!$this->Application->IsAdmin()) {
-				$where_clause = '(Archived = 0) AND (StartDate < '.adodb_mktime().' OR StartDate = 0) AND (EndOn > '.adodb_mktime().' OR EndOn IS NULL)';
-				$object->addFilter('archived_filter', $where_clause);
-			}
-		}
-
-		/**
-		 * Return type clauses for list bulding on front
-		 *
-		 * @param kEvent $event
-		 * @return Array
-		 */
-		function getTypeClauses(&$event)
-		{
-			$type_clauses = parent::getTypeClauses($event);
-
-			$type_clauses['site_lead']['include']='%1$s.LeadStory = 1 AND '.TABLE_PREFIX.'CategoryItems.PrimaryCat = 1';
-			$type_clauses['site_lead']['except']='%1$s.LeadStory <> 1 AND '.TABLE_PREFIX.'CategoryItems.PrimaryCat = 1';
-			$type_clauses['site_lead']['having_filter'] = false;
-
-			$type_clauses['cat_lead']['include']='%1$s.LeadCatStory = 1 AND '.TABLE_PREFIX.'CategoryItems.PrimaryCat = 1';
-			$type_clauses['cat_lead']['except']='%1$s.LeadCatStory <> 1 AND '.TABLE_PREFIX.'CategoryItems.PrimaryCat = 1';
-			$type_clauses['cat_lead']['having_filter'] = false;
-
-			return $type_clauses;
-		}
-
-
-		/**
-		 * [REGULAR EVENT] Deletes expired articles + update existing articles from rss feed with new data (key - article url)
-		 *
-		 * @param kEvent $event
-		 */
-		function OnUpdateRSSAtricles(&$event)
-		{
-			$category_table = $this->Application->getUnitOption('c', 'TableName');
-			$custom_table = $this->Application->getUnitOption('c-cdata', 'TableName');
-
-			$category_custom_fields = $this->getCustomColumns('c');
-			$article_custom_fields = $this->getCustomColumns($event->Prefix);
-
-
-			// update categories which sould be updated
-			$sql = 'SELECT cd.*, c.CategoryId
-					FROM '.$category_table.' c
-					LEFT JOIN '.$custom_table.' cd ON c.ResourceId = cd.ResourceId
-					WHERE 	(IF(cd.'.$category_custom_fields['RssLastUpdated'].' IS NULL, 0, cd.'.$category_custom_fields['RssLastUpdated'].') +
-							cd.'.$category_custom_fields['RssUpdateInterval'].' * cd.'.$category_custom_fields['RssUpdateIntervalType'].' <=
-							'.adodb_mktime().') AND (LENGTH('.$category_custom_fields['RssSource'].') > 0)';
-			$categories = $this->Conn->Query($sql, 'CategoryId');
-			if ($categories) {
-				$resource_ids = Array();
-				foreach ($categories as $category_id => $category_data) {
-					$resource_ids[] = $category_data['ResourceId'];
-					$event->setEventParam('source_url', $category_data[ $category_custom_fields['RssSource'] ]);
-					$event->setEventParam('category_id', $category_id);
-					$event->setEventParam('custom_fields', $article_custom_fields);
-					$event->setEventParam('life_time',  $category_data[ $category_custom_fields['RssDefaultExpiration'] ] * $category_data[ $category_custom_fields['RssDefaultExpirationType'] ]);
-					$this->parseFeed($event);
-				}
-
-				$sql = 'UPDATE '.$custom_table.'
-						SET '.$category_custom_fields['RssLastUpdated'].' = '.adodb_mktime().'
-						WHERE ResourceId IN ('.implode(',', $resource_ids).')';
-				$this->Conn->Query($sql);
-			}
-
-			// delete expired articles from feed categories
-			$sql = 'SELECT c.CategoryId, c.ResourceId
-					FROM '.$category_table.' c
-					LEFT JOIN '.$custom_table.' cd ON c.ResourceId = cd.ResourceId
-					WHERE (	IF(cd.'.$category_custom_fields['RssLastExpired'].' IS NULL, 0, cd.'.$category_custom_fields['RssLastExpired'].') +
-							cd.'.$category_custom_fields['RssExpireInterval'].' * cd.'.$category_custom_fields['RssExpireIntervalType'].' <=
-							'.adodb_mktime().') AND (cd.'.$category_custom_fields['RssDeleteExpired'].' = 1)';
-
-			$categories = $this->Conn->GetCol($sql, 'ResourceId');
-
-			$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
-			$table = $this->Application->getUnitOption($event->Prefix, 'TableName');
-			$ci_table = $this->Application->getUnitOption($event->Prefix.'-ci', 'TableName');
-
-			if ($categories) {
-				$article_custom_table = $this->Application->getUnitOption($event->Prefix.'-cdata', 'TableName');
-
-				$sql = 'SELECT main_table.'.$id_field.'
-						FROM '.$table.' main_table
-						LEFT JOIN '.$ci_table.' ci ON main_table.ResourceId = ci.ItemResourceId
-						LEFT JOIN '.$article_custom_table.' cd ON main_table.ResourceId = cd.ResourceId
-						WHERE 	(ci.PrimaryCat = 1) AND
-								(ci.CategoryId IN ('.implode(',', $categories).')) AND
-								(main_table.EndOn < '.adodb_mktime().' AND main_table.EndOn IS NOT NULL) AND
-								(LENGTH(cd.'.$article_custom_fields['RssOriginalURL'].') > 0)';
-				$article_ids = $this->Conn->GetCol($sql);
-				if ($article_ids) {
-					$temp =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
-					$temp->DeleteItems($event->Prefix, $event->Special, $article_ids);
-				}
-
-				$sql = 'UPDATE '.$custom_table.'
-						SET '.$category_custom_fields['RssLastExpired'].' = '.adodb_mktime().'
-						WHERE ResourceId IN ('.implode(',', array_keys($categories)).')';
-				$this->Conn->Query($sql);
-			}
-		}
-
-		/**
-		 * Returns article ids & crc, that are created during feed import
-		 *
-		 * @param kEvent $event
-		 * @return Array
-		 */
-		function getFeedArticles(&$event)
-		{
-			$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
-			$table = $this->Application->getUnitOption($event->Prefix, 'TableName');
-			$custom_table = $this->Application->getUnitOption($event->Prefix.'-cdata', 'TableName');
-
-			$crc_field = $event->getEventParam('custom_fields', 'RssArticleCRC');
-
-			$sql = 'SELECT main_table.'.$id_field.', cd.'.$crc_field.'
-					FROM '.$table.' main_table
-					LEFT JOIN '.$custom_table.' cd ON cd.ResourceId = main_table.ResourceId
-					WHERE LENGTH(cd.'.$crc_field.') > 0';
-			return $this->Conn->GetCol($sql, $crc_field);
-		}
-
-		/**
-		 * Creates new, updates existing articles from feed url specified
-		 *
-		 * @param kEvent $event
-		 */
-		function parseFeed(&$event)
-		{
-			$source_urls = explode(',', $event->getEventParam('source_url'));
-			if (count($source_urls) > 1) {
-				foreach ($source_urls as $source_url) {
-					$event->setEventParam('source_url', $source_url);
-					$this->parseFeed($event);
-				}
-				return true;
-			}
-
-			$curl_helper =& $this->Application->recallObject('CurlHelper');
-			/* @var $curl_helper kCurlHelper */
-
-			$curl_helper->followLocation = true;
-			$curl_helper->setOptions( Array (CURLOPT_USERAGENT => 'Wget/1.10.2') ); // otherwise FeedBurner will return HTML
-
-			$xml_data = $curl_helper->Send($event->getEventParam('source_url'));
-
-			if (!$xml_data) {
-				return false;
-			}
-
-			$xml_helper =& $this->Application->recallObject('kXMLHelper');
-			/* @var $xml_helper kXMLHelper */
-
-			$root_node =& $xml_helper->Parse($xml_data, XML_WITH_TEXT_NODES);
-
-			$feed_types = Array (
-				'rss_2.0' => 'channel', 'atom' => 'feed',
-			);
-
-			foreach ($feed_types as $feed_type => $node_name) {
-				$article_node =& $root_node->FindChild($node_name);
-				if (is_object($article_node)) {
-					break;
-				}
-			}
-
-			if (!$article_node) {
-				return false;
-			}
-
-			$category_id = $event->getEventParam('category_id');
-			$backup_category_id = $this->Application->GetVar('m_cat_id');
-			$this->Application->SetVar('m_cat_id', $category_id);
-
-			switch ($feed_type) {
-				case 'rss_2.0':
-					$this->parseRssFeed($article_node, $event);
-					break;
-
-				case 'atom':
-					$this->parseAtomFeed($article_node, $event);
-					break;
-			}
-
-			$this->Application->SetVar('m_cat_id', $backup_category_id);
-		}
-
-		/**
-		 * Returns ML field names for article record
-		 *
-		 * @return Array
-		 */
-		function _getMLFields()
-		{
-			$ml_formatter =& $this->Application->recallObject('kMultiLanguage');
-			/* @var $ml_formatter kMultiLanguage */
-
-			$title_field = $ml_formatter->LangFieldName('Title');
-			$body_field = $ml_formatter->LangFieldName('Body');
-
-			return Array ('Title', 'Body');
-			return Array ($title_field, $body_field);
-		}
-
-		/**
-		 * Parses RSS 2.0 feed
-		 *
-		 * @param kXMLNode $root_node
-		 * @param kEvent $event
-		 */
-		function parseRssFeed(&$root_node, &$event)
-		{
-			$current_node = $root_node->firstChild;
-			$feed_articles = $this->getFeedArticles($event);
-
-			$object =& $this->Application->recallObject($event->Prefix.'.-item', null, Array('skip_autoload' => true));
-			/* @var $object kDBItem */
-
-			list ($title_field, $body_field) = $this->_getMLFields();
-
-			do {
-				// IMAGE is information about channel and is not useful here
-				if ($current_node->Name != 'ITEM') continue;
-				// collect item data
-				$data = Array();
-				$sub_node =& $current_node->firstChild;
-				/* @var $sub_node kXMLNode */
-
-				do {
-					if ($sub_node->Name == 'ATOM:SUMMARY') {
-						$data[$sub_node->Name] = $this->getNodeContent($sub_node);
-					} else {
-						if ($sub_node->Children) {
-							foreach ($sub_node->Children as $child_node) {
-								$data[$sub_node->Name].= $child_node->Data; // was  $sub_node->Data;
-							}
-						}
-					}
-
-				} while ( ($sub_node =& $sub_node->NextSibling()) );
-
-				// create/update article
-				$article_crc = crc32($data['LINK'].$data['TITLE']);
-				$article_id = getArrayValue($feed_articles, $article_crc);
-				if ($article_id) {
-					$object->Load($article_id);
-				}
-				else {
-					$object->Clear();
-				}
-
-				$object->SetDBField($title_field, $data['TITLE']);
-				$object->SetDBField('cust_RssOriginalURL', $data['LINK']);
-				$object->SetDBField('cust_RssArticleCRC', $article_crc);
-				$object->SetDBField($body_field, !array_key_exists('DESCRIPTION', $data) ? $data['ATOM:SUMMARY'] : $data['DESCRIPTION']);
-				$expiration_time = adodb_mktime() + $event->getEventParam('life_time');
-				$object->SetDBField('EndOn_date', $expiration_time);
-				$object->SetDBField('EndOn_time', $expiration_time);
-				$object->SetDBField('Status', STATUS_ACTIVE);
-				$object->SetDBField('Author', 'root');
-				$object->SetDBField('CreatedById', -1);
-
-				$status = $object->isLoaded() ? $object->Update() : $object->Create();
-			} while (($current_node =& $current_node->NextSibling()));
-		}
-
-		/**
-		 * Returns parsed node content
-		 *
-		 * @param kXMLNode $node
-		 * @return string
-		 */
-		function getNodeContent(&$node)
-		{
-			$content_type = array_key_exists('TYPE', $node->Attributes) ? $node->Attributes['TYPE'] : false;
-
-			switch ($content_type) {
-				case 'xhtml':
-					$data = $node->GetXML(true);
-					break;
-
-				case 'html':
-					$data = unhtmlentities($node->firstChild->Data); // $node->Data
-					break;
-
-				default:
-					$data = $node->firstChild->Data; // $node->Data; also for 'text'
-					break;
-			}
-
-			return trim($data);
-		}
-
-		/**
-		 * Parses ATOM feed
-		 *
-		 * @param kXMLNode $root_node
-		 * @param kEvent $event
-		 */
-		function parseAtomFeed(&$root_node, &$event)
-		{
-			$current_node = $root_node->firstChild;
-			$feed_articles = $this->getFeedArticles($event);
-
-			$object =& $this->Application->recallObject($event->Prefix.'.-item', null, Array('skip_autoload' => true));
-			/* @var $object kDBItem */
-
-			list ($title_field, $body_field) = $this->_getMLFields();
-
-			do {
-				if ($current_node->Name != 'ENTRY') continue;
-				// collect item data
-				$data = Array();
-				$sub_node =& $current_node->firstChild;
-				/* @var $sub_node kXMLNode */
-
-				do {
-					if ($sub_node->Name == 'LINK') {
-						if ($sub_node->Attributes['REL'] == 'alternate') {
-							$data[$sub_node->Name] = $sub_node->Attributes['HREF'];
-						}
-					}
-					elseif ($sub_node->Name == 'CONTENT' || $sub_node->Name == 'SUMMARY' || $sub_node->Name == 'TITLE') {
-						$data[$sub_node->Name] = $this->getNodeContent($sub_node);
-					}
-					else {
-						$data[$sub_node->Name] = $sub_node->firstChild->Data; // $sub_node->Data
-					}
-				} while ( ($sub_node =& $sub_node->NextSibling()) );
-
-				// create/update article
-				$article_crc = crc32($data['LINK'].$data['TITLE']);
-				$article_id = getArrayValue($feed_articles, $article_crc);
-				if ($article_id) {
-					$object->Load($article_id);
-				}
-				else {
-					$object->Clear();
-				}
-
-				$object->SetDBField($title_field, $data['TITLE']);
-				$object->SetDBField('cust_RssOriginalURL', $data['LINK']);
-				$object->SetDBField('cust_RssArticleCRC', $article_crc);
-				$object->SetDBField($body_field, !array_key_exists('CONTENT', $data) ? $data['SUMMARY'] : $data['CONTENT']);
-				$expiration_time = adodb_mktime() + $event->getEventParam('life_time');
-				$object->SetDBField('EndOn_date', $expiration_time);
-				$object->SetDBField('EndOn_time', $expiration_time);
-				$object->SetDBField('Status', STATUS_ACTIVE);
-				$object->SetDBField('Author', 'root');
-				$object->SetDBField('CreatedById', -1);
-
-				$status = $object->isLoaded() ? $object->Update() : $object->Create();
-			} while (($current_node =& $current_node->NextSibling()));
-		}
-
-		function getCustomColumns($prefix)
-		{
-			$ml_formatter =& $this->Application->recallObject('kMultiLanguage');
-
-			$custom_fields = array_flip($this->Application->getUnitOption($prefix, 'CustomFields'));
-			foreach ($custom_fields as $custom_name => $custom_id) {
-				$custom_fields[$custom_name] = $ml_formatter->LangFieldName('cust_'.$custom_id);
-			}
-
-			return $custom_fields;
-		}
-
-		/**
-		 * Create missing excerpt
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemUpdate(&$event)
-		{
-			parent::OnBeforeItemUpdate($event);
-
-			$this->createExcerpt($event);
-			$this->cacheItemOwner($event, 'CreatedById', 'Author');
-		}
-
-		/**
-		 * Create missing excerpt
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemCreate(&$event)
-		{
-			parent::OnBeforeItemCreate($event);
-
-			$this->createExcerpt($event);
-			$this->cacheItemOwner($event, 'CreatedById', 'Author');
-		}
-
-		/**
-		 * Create excerpt if missing
-		 *
-		 * @param kEvent $event
-		 */
-		function createExcerpt(&$event)
-		{
-			$object =& $event->getObject();
-
-			if (!$object->GetField('Excerpt') || $this->Application->GetVar('generate_excerpt')) {
-				$excerpt = strip_tags( $object->GetField('Body') );
-
-
-				$length = mb_strlen($excerpt);
-				if ($length > 100) {
-					$excerpt = mb_substr(strip_tags($excerpt), 0, 100);
-					if (mb_substr($excerpt,-1) != ' ') {
-						$pos = mb_strrpos($excerpt, ' ');
-						if ($pos) {
-							$excerpt = mb_substr($excerpt, 0, $pos);
-						}
-					}
-					$excerpt .= '...';
-				}
-
-				$ml_formatter =& $this->Application->recallObject('kMultiLanguage');
-				/* @var $ml_formatter kMultiLanguage */
-
-				$object->SetDBField($ml_formatter->LangFieldName('Excerpt'), $excerpt);
-			}
-		}
-
-		/**
-		 * [HOOK] Updates category custom fields options in config
-		 *
-		 * @param kEvent $event
-		 */
-		function OnUpdateCategoryCustomFields(&$event)
-		{
-			$new_virtual_fields =	Array(
-											'cust_RssSource'				=>	Array('type' => 'string', 'default' => ''),
-											'cust_RssDefaultExpiration'		=>	Array('type' => 'int', 'not_null' => 1, 'default' => ''),
-											'cust_RssDefaultExpirationType'	=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array(60 => 'la_opt_min', 3600 => 'la_opt_hour', 86400 => 'la_opt_day', 2419200 => 'la_opt_month', 29030400 => 'la_opt_year'), 'default' => 60),
-											'cust_RssExpireInterval'		=>	Array('type' => 'int', 'not_null' => 1, 'default' => ''),
-											'cust_RssExpireIntervalType'	=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array(60 => 'la_opt_min', 3600 => 'la_opt_hour', 86400 => 'la_opt_day', 2419200 => 'la_opt_month'), 'default' => 60),
-											'cust_RssDeleteExpired'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'default' => 0),
-											'cust_RssUpdateInterval'		=>	Array('type' => 'int', 'not_null' => 1, 'default' => ''),
-											'cust_RssUpdateIntervalType'	=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array(60 => 'la_opt_min', 3600 => 'la_opt_hour', 86400 => 'la_opt_day', 2419200 => 'la_opt_month'), 'default' => 60),
-											'cust_RssLastUpdated'			=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => ''),
-											'cust_RssLastExpired'			=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => ''),
-									);
-			$virtual_fields = $this->Application->getUnitOption('c', 'VirtualFields');
-			$virtual_fields = array_merge_recursive2($virtual_fields, $new_virtual_fields);
-			$this->Application->setUnitOption('c', 'VirtualFields', $virtual_fields);
-		}
-
-		/**
-		 * Sets default expiration based on module setting
-		 *
-		 * @param kEvent $event
-		 */
-		function OnPreCreate(&$event)
-		{
-			parent::OnPreCreate($event);
-
-			if ($event->status == erSUCCESS) {
-				$object =& $event->getObject();
-
-				$archive_days = $this->Application->ConfigValue('News_Archive');
-				if ($archive_days) {
-					$expire_date = adodb_mktime() + $archive_days * 3600 * 24;
-					$object->SetDBField('EndOn_date', $expire_date);
-					$object->SetDBField('EndOn_time', $expire_date);
-				}
-			}
-		}
-	}
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/units/articles/articles_event_handler.php
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.14.2.13
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/articles/articles_custom.tpl
===================================================================
--- branches/5.1.x/in-news/admin_templates/articles/articles_custom.tpl	(revision 13095)
+++ branches/5.1.x/in-news/admin_templates/articles/articles_custom.tpl	(nonexistent)
@@ -1,62 +0,0 @@
-<inp2:adm_SetPopupSize width="880" height="680"/>
-
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="articles_custom" grid="SeparateTab" 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('n','<inp2:n_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n','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('n', '<inp2:n_PrevId/>');
-						}
-				 ) );
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-							go_to_id('n', '<inp2:n_NextId/>');
-						}
-				 ) );
-
-				function edit(){ }
-
-				a_toolbar.Render();
-
-				<inp2:m_if check="n_IsSingle">
-					a_toolbar.HideButton('prev');
-					a_toolbar.HideButton('next');
-					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>
-					<inp2:m_if check="n_IsLast" >
-						a_toolbar.DisableButton('next');
-					</inp2:m_if>
-					<inp2:m_if check="n_IsFirst" >
-						a_toolbar.DisableButton('prev');
-					</inp2:m_if>
-				</inp2:m_if>
-			</script>
-		</td>
-
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="cf" grid="SeparateTab"/>
-	</tr>
-</tbody>
-</table>
-
-<inp2:m_include t="incs/custom_blocks"/>
-<inp2:m_RenderElement name="grid" PrefixSpecial="cf" IdField="CustomFieldId" SourcePrefix="n" value_field="Value" per_page="-1" grid="SeparateTab" header_block="grid_column_title_no_sorting" no_init="no_init"/>
-
-<input type="hidden" name="cf_type" value="<inp2:n_UnitOption name='ItemType'/>"/>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/admin_templates/articles/articles_custom.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5.2.4
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/articles/relations_edit.tpl
===================================================================
--- branches/5.1.x/in-news/admin_templates/articles/relations_edit.tpl	(revision 13095)
+++ branches/5.1.x/in-news/admin_templates/articles/relations_edit.tpl	(nonexistent)
@@ -1,49 +0,0 @@
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="relations_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('n-rel','<inp2:n-rel_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n-rel','OnCancel');
-						}
-				 ) );
-
-				a_toolbar.Render();
-			</script>
-		</td>
-	</tr>
-</tbody>
-</table>
-
-<inp2:m_include t="categories/ci_blocks"/>
-
-<inp2:n-rel_SaveWarning name="grid_save_warning"/>
-<inp2:n-rel_ErrorWarning name="form_error_warning"/>
-
-<div id="scroll_container">
-	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_Relation!"/>
-			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-rel" field="SourceId"/>
-			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-rel" field="SourceType"/>
-			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-rel" field="TargetId"/>
-			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-rel" field="TargetType"/>
-
-			<inp2:m_RenderElement name="inp_id_label" prefix="n-rel" field="RelationshipId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_relation" prefix="n-rel" field="TargetId" title="!la_fld_TargetId!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="n-rel" field="Type" title="!la_fld_RelationshipType!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n-rel" field="Enabled" title="!la_fld_Enabled!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n-rel" field="Priority" title="!la_fld_Priority!" size="4"/>
-		<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/5.1.x/in-news/admin_templates/articles/relations_edit.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4.2.4
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/articles/articles_images.tpl
===================================================================
--- branches/5.1.x/in-news/admin_templates/articles/articles_images.tpl	(revision 13095)
+++ branches/5.1.x/in-news/admin_templates/articles/articles_images.tpl	(nonexistent)
@@ -1,107 +0,0 @@
-<inp2:adm_SetPopupSize width="880" height="680"/>
-
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="articles_images" pagination="1" pagination_prefix="n-img" tab_preset="Default"/>
-
-<inp2:m_include t="incs/image_blocks"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
-
-  				function edit()
-	  			{
-	  				std_edit_temp_item('n-img', 'in-news/articles/images_edit');
-	  			}
-
-  				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('n','<inp2:n_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n','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('n', '<inp2:n_PrevId/>');
-						}
-				 ) );
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-							go_to_id('n', '<inp2:n_NextId/>');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-
-
-
-				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Images" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
-						function() {
-							std_new_item('n-img', 'in-news/articles/images_edit')
-						} ) );
-
-				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
-				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
-						function() {
-							std_delete_items('n-img')
-						} ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
-
-				a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>', function() {
-							submit_event('n-img','OnMassMoveUp');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', function() {
-							submit_event('n-img','OnMassMoveDown');
-						}
-				 ) );
-
-				 a_toolbar.AddButton( new ToolBarButton('setprimary', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>', function() {
-							submit_event('n-img','OnSetPrimary');
-						}
-				 ) );
-
-				  a_toolbar.AddButton( new ToolBarSeparator('sep4') );
-
-				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
-							show_viewmenu(a_toolbar,'view');
-						}
-				) );
-
-				a_toolbar.Render();
-
-				<inp2:m_if check="n_IsSingle" >
-					a_toolbar.HideButton('prev');
-					a_toolbar.HideButton('next');
-					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>
-					<inp2:m_if check="n_IsLast" >
-						a_toolbar.DisableButton('next');
-					</inp2:m_if>
-					<inp2:m_if check="n_IsFirst" >
-						a_toolbar.DisableButton('prev');
-					</inp2:m_if>
-				</inp2:m_if>
-			</script>
-		</td>
-
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="n-img" grid="Default"/>
-	</tr>
-</tbody>
-</table>
-
-<inp2:m_RenderElement name="grid" PrefixSpecial="n-img" IdField="ImageId" grid="Default" menu_filters="yes"/>
-<script type="text/javascript">
-	Grids['n-img'].SetDependantToolbarButtons( new Array('edit','delete','move_up','move_down','setprimary') );
-</script>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/admin_templates/articles/articles_images.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5.2.4
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/articles/articles_relations.tpl
===================================================================
--- branches/5.1.x/in-news/admin_templates/articles/articles_relations.tpl	(revision 13095)
+++ branches/5.1.x/in-news/admin_templates/articles/articles_relations.tpl	(nonexistent)
@@ -1,105 +0,0 @@
-<inp2:adm_SetPopupSize width="880" height="680"/>
-
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="articles_relations" pagination="1" pagination_prefix="n-rel" 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('n','<inp2:n_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n','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('n', '<inp2:n_PrevId/>');
-						}
-				 ) );
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-							go_to_id('n', '<inp2:n_NextId/>');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-
-				//Relations related:
-				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Relation" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
-						function() {
-							openSelector('n-rel', '<inp2:adm_SelectorLink prefix="n-rel" selection_mode="single" tab_prefixes="all"/>', 'TargetId', '950x600');
-						} ) );
-
-				function edit()
-	  			{
-	  				std_edit_temp_item('n-rel', 'in-news/articles/relations_edit');
-	  			}
-
-				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
-				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
-						function() {
-							std_delete_items('n-rel')
-						} ) );
-
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
-
-				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
-							submit_event('n-rel','OnMassApprove');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
-							submit_event('n-rel','OnMassDecline');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
-
-				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
-							show_viewmenu(a_toolbar,'view');
-						}
-				) );
-
-				a_toolbar.Render();
-
-				<inp2:m_if check="n_IsSingle" >
-					a_toolbar.HideButton('prev');
-					a_toolbar.HideButton('next');
-					a_toolbar.HideButton('sep1');
-					//a_toolbar.HideButton('sep2');
-				<inp2:m_else/>
-					<inp2:m_if check="n_IsLast" >
-						a_toolbar.DisableButton('next');
-					</inp2:m_if>
-					<inp2:m_if check="n_IsFirst" >
-						a_toolbar.DisableButton('prev');
-					</inp2:m_if>
-				</inp2:m_if>
-			</script>
-		</td>
-
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="n-rel" grid="Default"/>
-	</tr>
-</tbody>
-</table>
-
-<inp2:m_RenderElement name="grid" PrefixSpecial="n-rel" IdField="RelationshipId" grid="Default" menu_filters="yes"/>
-<script type="text/javascript">
-	Grids['n-rel'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') );
-</script>
-<input type="hidden" name="TargetId" id="TargetId" value="<inp2:m_get name="TargetId"/>">
-<input type="hidden" name="TargetType" id="TargetType" value="<inp2:m_get name="TargetType"/>">
-<inp2:m_include t="incs/footer"/>
-
-<script type="text/javascript">
-	var $env = document.getElementById('sid').value+'-:m<inp2:m_get name="m_cat_id"/>-1-1-1-s';
-</script>
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/admin_templates/articles/articles_relations.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3.2.3
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/articles/file_edit.tpl
===================================================================
--- branches/5.1.x/in-news/admin_templates/articles/file_edit.tpl	(revision 13095)
+++ branches/5.1.x/in-news/admin_templates/articles/file_edit.tpl	(nonexistent)
@@ -1,41 +0,0 @@
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="file_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('n-file','<inp2:n-file_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n-file','OnCancel');
-						}
-				 ) );
-
-				a_toolbar.Render();
-			</script>
-		</td>
-	</tr>
-</tbody>
-</table>
-
-<inp2:n-file_SaveWarning name="grid_save_warning"/>
-<inp2:n-file_ErrorWarning name="form_error_warning"/>
-
-<div id="scroll_container">
-	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_File!"/>
-			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-file" field="ResourceId"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n-file" field="FileName" title="la_fld_Name" size="50" />
-			<inp2:m_RenderElement name="inp_edit_upload" prefix="n-file" field="FilePath" title="la_fld_FilePath" />
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n-file" field="Status" title="la_fld_Enabled" onchange="check_primary()" />
-			<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/5.1.x/in-news/admin_templates/articles/file_edit.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.5
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/articles/articles_edit.tpl
===================================================================
--- branches/5.1.x/in-news/admin_templates/articles/articles_edit.tpl	(revision 13095)
+++ branches/5.1.x/in-news/admin_templates/articles/articles_edit.tpl	(nonexistent)
@@ -1,146 +0,0 @@
-<inp2:adm_SetPopupSize width="880" height="680"/>
-
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="articles_edit" 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('n','<inp2:n_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n','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('n', '<inp2:n_PrevId/>');
-						}
-				 ) );
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-							go_to_id('n', '<inp2:n_NextId/>');
-						}
-				 ) );
-
-				//a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-
-				a_toolbar.Render();
-
-				<inp2:m_if check="n_IsSingle" >
-					a_toolbar.HideButton('prev');
-					a_toolbar.HideButton('next');
-					a_toolbar.HideButton('sep1');
-					//a_toolbar.HideButton('sep2');
-				<inp2:m_else/>
-					<inp2:m_if check="n_IsLast" >
-						a_toolbar.DisableButton('next');
-					</inp2:m_if>
-					<inp2:m_if check="n_IsFirst" >
-						a_toolbar.DisableButton('prev');
-					</inp2:m_if>
-				</inp2:m_if>
-			</script>
-		</td>
-	</tr>
-</tbody>
-</table>
-
-
-<inp2:n_SaveWarning name="grid_save_warning"/>
-<inp2:n_ErrorWarning name="form_error_warning"/>
-
-<div id="scroll_container">
-	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="n" title="la_section_Article" original_title="la_section_OriginalValues" display_original="1"/>
-
-			<inp2:m_RenderElement name="inp_id_label" prefix="n" field="NewsId" title="!la_fld_Id!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Title" title="!la_fld_Title!" size="70" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_user" prefix="n" field="CreatedById" title="!la_fld_Author!" size="25" display_original="1"/>
-
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="n" field="Body" title="!la_fld_Body!" control_options="{min_height: 100}" cols="70" rows="8" display_original="1"/>
-
-			<!-- excerpt: begin -->
-			<inp2:m_if check="n_FieldVisible" field="Excerpt">
-				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-					<inp2:m_RenderElement name="inp_edit_field_caption" prefix="n" field="Excerpt" title="la_fld_Excerpt"/>
-					<td class="control-cell">
-						<textarea tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:n_InputName field="Excerpt"/>" name="<inp2:n_InputName field="Excerpt"/>" style="width: 100%; height: 45px" cols="70" rows="3"><inp2:n_Field field="Excerpt"/></textarea><br />
-						<script type="text/javascript">
-							Form.addControl('<inp2:n_InputName field="Excerpt"/>', {min_height: 100});
-						</script>
-						<input type="checkbox" name="generate_excerpt" id="generate_excerpt" value="1" /><label for="generate_excerpt"><inp2:m_phrase name="la_prompt_AutoGen_Excerpt"/></label>
-					</td>
-					<inp2:m_RenderElement name="inp_edit_error" prefix="n" field="Excerpt"/>
-
-					<inp2:m_if check="n_DisplayOriginal" pass_params="1">
-						<inp2:m_RenderElement prefix="n" field="Excerpt" name="inp_original_label"/>
-					</inp2:m_if>
-				</tr>
-			</inp2:m_if>
-			<!-- excerpt: end -->
-
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n" field="AutomaticFilename" title="la_fld_AutomaticFilename" onchange="reflect_filename()" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Filename" title="la_fld_Filename" size="70" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="n" field="CategoryId" title="la_fld_ParentSection" display_original="1"/>
-		<inp2:m_RenderElement name="subsection" prefix="n" title="la_section_Properties" original_title="la_section_OriginalValues" display_original="1"/>
-			<inp2:m_if check="n_DisplayOriginal" display_original="1">
-				<inp2:m_if check="n_FieldVisible" field="Status">
-					<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-						<inp2:m_RenderElement name="inp_edit_field_caption" prefix="n" field="Status" title="!la_fld_Status!"/>
-						<td class="control-cell">
-							<inp2:m_Phrase label="la_UseGridToApproveDecline" />
-						</td>
-					</tr>
-				</inp2:m_if>
-			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="Status" title="!la_fld_Status!" display_original="1"/>
-			</inp2:m_if>
-
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="NewItem" title="!la_fld_New!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="HotItem" title="!la_fld_Hot!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="PopItem" title="!la_fld_Pop!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n" field="EditorsPick" title="!la_fld_EditorsPick!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n" field="LeadStory" title="!la_fld_LeadStory!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n" field="LeadCatStory" title="!la_fld_LeadCatStory!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Priority" title="!la_fld_Priority!" size="4" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n" field="CreatedOn" title="!la_fld_CreatedOn!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n" field="StartDate" title="!la_fld_StartDate!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n" field="EndOn" title="!la_fld_EndOn!" display_original="1"/>
-
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="MetaKeywords" title="!la_fld_MetaKeywords!" size="70"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="n" field="MetaDescription" title="!la_fld_MetaDescription!" control_options="{min_height: 100}" cols="70" rows="5"/>
-
-		<inp2:m_RenderElement name="subsection" prefix="n" title="la_section_Counters" original_title="la_section_OriginalValues" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="CachedRating" title="!la_fld_Rating!" hint_label="la_prompt_RatingLimits" size="4" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="CachedVotesQty" title="!la_fld_Votes!" hint_label="la_prompt_VoteLimits" size="4" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Hits" title="!la_fld_Hits!" hint_label="la_prompt_HitLimits" size="4" display_original="1"/>
-			<input type="hidden" name="Hits_original" id="Hits_original" value="<inp2:n_Field name="Hits" db="db" />" />
-
-		<!-- custom fields: begin -->
-		<inp2:m_include t="incs/custom_blocks"/>
-		<inp2:cf.general_PrintList render_as="cv_row_block" SourcePrefix="n" value_field="Value" per_page="-1" grid="Default" original_title="la_section_OriginalValues" display_original="1"/>
-		<!-- custom fields: end -->
-
-		<inp2:m_RenderElement name="inp_edit_filler"/>
-	</table>
-</div>
-
-<script type="text/javascript">
-	$(document).ready(reflect_filename);
-
-	function reflect_filename()
-    {
-    	var $checked = document.getElementById('_cb_<inp2:n_InputName field="AutomaticFilename"/>').checked;
-    	document.getElementById('<inp2:n_InputName field="Filename"/>').readOnly = $checked;
-    }
-</script>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/admin_templates/articles/articles_edit.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.6.2.10
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/articles/articles_files.tpl
===================================================================
--- branches/5.1.x/in-news/admin_templates/articles/articles_files.tpl	(revision 13095)
+++ branches/5.1.x/in-news/admin_templates/articles/articles_files.tpl	(nonexistent)
@@ -1,86 +0,0 @@
-<inp2:adm_SetPopupSize width="880" height="680"/>
-
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="articles_files" pagination="1" pagination_prefix="n-file" tab_preset="Default"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
-
-  				function edit()
-	  			{
-	  				std_edit_temp_item('n-file', 'in-news/articles/file_edit');
-	  			}
-
-  				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('n','<inp2:n_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n','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('n', '<inp2:n_PrevId/>');
-						}
-				 ) );
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-							go_to_id('n', '<inp2:n_NextId/>');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-
-				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewFile" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
-						function() {
-							std_new_item('n-file', 'in-news/articles/file_edit')
-						} ) );
-
-				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
-				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
-						function() {
-							std_delete_items('n-file')
-						} ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
-
-				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
-							show_viewmenu(a_toolbar,'view');
-						}
-				) );
-
-				a_toolbar.Render();
-
-				<inp2:m_if check="n_IsSingle" >
-					a_toolbar.HideButton('prev');
-					a_toolbar.HideButton('next');
-					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>
-					<inp2:m_if check="n_IsLast" >
-						a_toolbar.DisableButton('next');
-					</inp2:m_if>
-					<inp2:m_if check="n_IsFirst" >
-						a_toolbar.DisableButton('prev');
-					</inp2:m_if>
-				</inp2:m_if>
-			</script>
-		</td>
-
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="n-file" grid="Default"/>
-	</tr>
-</tbody>
-</table>
-
-<inp2:m_RenderElement name="grid" PrefixSpecial="n-file" IdField="FileId" grid="Default" menu_filters="yes"/>
-<script type="text/javascript">
-	Grids['n-file'].SetDependantToolbarButtons( new Array('edit','delete') );
-</script>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/admin_templates/articles/articles_files.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.6
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/articles/articles_reviews.tpl
===================================================================
--- branches/5.1.x/in-news/admin_templates/articles/articles_reviews.tpl	(revision 13095)
+++ branches/5.1.x/in-news/admin_templates/articles/articles_reviews.tpl	(nonexistent)
@@ -1,114 +0,0 @@
-<inp2:adm_SetPopupSize width="880" height="680"/>
-
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="articles_reviews" pagination="1" pagination_prefix="n-rev" 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('n','<inp2:n_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n','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('n', '<inp2:n_PrevId/>');
-						}
-				 ) );
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-							go_to_id('n', '<inp2:n_NextId/>');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-
-				//Pricing related:
-				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewReview" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
-						function() {
-							std_new_item('n-rev', 'in-news/articles/review_edit')
-						} ) );
-
-				function edit()
-	  			{
-	  				std_edit_temp_item('n-rev', 'in-news/articles/review_edit');
-	  			}
-
-				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
-				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
-						function() {
-							std_delete_items('n-rev')
-						} ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
-
-				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
-							submit_event('n-rev','OnMassApprove');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
-							submit_event('n-rev','OnMassDecline');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
-
-				a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>', function() {
-							submit_event('n-rev','OnMassMoveUp');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', function() {
-							submit_event('n-rev','OnMassMoveDown');
-						}
-				 ) );
-
-				 a_toolbar.AddButton( new ToolBarSeparator('sep5') );
-
-				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
-							show_viewmenu(a_toolbar,'view');
-						}
-				) );
-
-				a_toolbar.Render();
-
-				<inp2:m_if check="n_IsSingle" >
-					a_toolbar.HideButton('prev');
-					a_toolbar.HideButton('next');
-					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>
-					<inp2:m_if check="n_IsLast" >
-						a_toolbar.DisableButton('next');
-					</inp2:m_if>
-					<inp2:m_if check="n_IsFirst" >
-						a_toolbar.DisableButton('prev');
-					</inp2:m_if>
-				</inp2:m_if>
-			</script>
-		</td>
-
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="n-rev" grid="Default"/>
-	</tr>
-</tbody>
-</table>
-
-<inp2:m_DefineElement name="reviewtext_checkbox_td">
-	<inp2:Field field="$field" no_special="no_special" cut_first="100"/>
-</inp2:m_DefineElement>
-
-<inp2:m_RenderElement name="grid" PrefixSpecial="n-rev" IdField="ReviewId" grid="Default" menu_filters="yes"/>
-<script type="text/javascript">
-	Grids['n-rev'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','move_up','move_down') );
-</script>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/admin_templates/articles/articles_reviews.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3.2.3
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/articles/images_edit.tpl
===================================================================
--- branches/5.1.x/in-news/admin_templates/articles/images_edit.tpl	(revision 13095)
+++ branches/5.1.x/in-news/admin_templates/articles/images_edit.tpl	(nonexistent)
@@ -1,60 +0,0 @@
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="images_edit"/>
-
-<inp2:m_include t="incs/image_blocks"/>
-
-<!-- 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('n-img','<inp2:n-img_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n-img','OnCancel');
-						}
-				 ) );
-
-				a_toolbar.Render();
-			</script>
-		</td>
-	</tr>
-</tbody>
-</table>
-
-<inp2:n-img_SaveWarning name="grid_save_warning"/>
-<inp2:n-img_ErrorWarning name="form_error_warning"/>
-
-<div id="scroll_container">
-	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_Image!"/>
-			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-img" field="ResourceId"/>
-			<inp2:m_RenderElement name="inp_label" prefix="n-img" field="ImageId" title="!la_fld_Id!"/>
-
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n-img" field="Name" title="!la_fld_Name!" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n-img" field="AltName" title="!la_fld_AltValue!" size="40"/>
-
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n-img" field="Enabled" title="!la_fld_Enabled!" onchange="check_primary()" />
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n-img" field="DefaultImg" title="!la_fld_Primary!" onchange="check_status()" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n-img" field="Priority" title="!la_fld_Priority!" size="5"/>
-
-		<inp2:m_RenderElement name="subsection" title="!la_section_ThumbnailImage!"/>
-			<inp2:m_RenderElement name="thumbnail_section" prefix="n-img"/>
-
-		<inp2:m_RenderElement name="subsection" title="!la_section_FullSizeImage!"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n-img" field="SameImages" title="!la_fld_SameAsThumb!" onchange="toggle_fullsize()"/>
-			<inp2:m_RenderElement name="fullsize_section" prefix="n-img"/>
-		<inp2:m_RenderElement name="inp_edit_filler"/>
-	</table>
-</div>
-
-<script type="text/javascript">
-	<inp2:m_RenderElement name="images_edit_js" prefix="n-img"/>
-	toggle_fullsize();
-</script>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/admin_templates/articles/images_edit.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5.2.4
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/articles/articles_categories.tpl
===================================================================
--- branches/5.1.x/in-news/admin_templates/articles/articles_categories.tpl	(revision 13095)
+++ branches/5.1.x/in-news/admin_templates/articles/articles_categories.tpl	(nonexistent)
@@ -1,84 +0,0 @@
-<inp2:adm_SetPopupSize width="880" height="680"/>
-
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="articles_categories" pagination="1" pagination_prefix="n-ci" tab_preset="Default"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
-  				function edit(){ }
-
-				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('n','<inp2:n_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n','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('n', '<inp2:n_PrevId/>');
-						}
-				 ) );
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-							go_to_id('n', '<inp2:n_NextId/>');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-
-				//Category related:
-				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Category" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
-						function() {
-							openSelector('n', '<inp2:adm_SelectorLink prefix="n" selection_mode="multi" tab_prefixes="none"/>', 'ItemCategory');
-						} ) );
-
-				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
-						function() {
-							std_delete_items('n-ci')
-						} ) );
-
-				a_toolbar.AddButton( new ToolBarButton('setprimary', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>', function() {
-							submit_event('n-ci','OnSetPrimary');
-						}
-				 ) );
-
-				a_toolbar.Render();
-
-				<inp2:m_if check="n_IsSingle" >
-					a_toolbar.HideButton('prev');
-					a_toolbar.HideButton('next');
-					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>
-					<inp2:m_if check="n_IsLast" >
-						a_toolbar.DisableButton('next');
-					</inp2:m_if>
-					<inp2:m_if check="n_IsFirst" >
-						a_toolbar.DisableButton('prev');
-					</inp2:m_if>
-				</inp2:m_if>
-			</script>
-		</td>
-
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="n-ci" grid="Default"/>
-	</tr>
-</tbody>
-</table>
-
-<inp2:m_DefineElement name="grid_checkbox_category_td">
-	<inp2:CategoryName field="$field" primary_title="!la_PrimaryCategory!" no_special="1"/>
-</inp2:m_DefineElement>
-
-<inp2:m_RenderElement name="grid" PrefixSpecial="n-ci" IdField="CategoryId" grid="Default"/>
-<script type="text/javascript">
-	Grids['n-ci'].SetDependantToolbarButtons( new Array('delete','setprimary') );
-</script>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/admin_templates/articles/articles_categories.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3.2.4
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/articles/review_edit.tpl
===================================================================
--- branches/5.1.x/in-news/admin_templates/articles/review_edit.tpl	(revision 13095)
+++ branches/5.1.x/in-news/admin_templates/articles/review_edit.tpl	(nonexistent)
@@ -1,59 +0,0 @@
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="reviews_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('n-rev','<inp2:n-rev_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n-rev','OnCancel');
-						}
-				 ) );
-
-				a_toolbar.Render();
-
-				<inp2:m_if check="n-rev_IsSingle" >
-					a_toolbar.HideButton('prev');
-					a_toolbar.HideButton('next');
-					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>
-					<inp2:m_if check="n-rev_IsLast" >
-						a_toolbar.DisableButton('next');
-					</inp2:m_if>
-					<inp2:m_if check="n-rev_IsFirst" >
-						a_toolbar.DisableButton('prev');
-					</inp2:m_if>
-				</inp2:m_if>
-			</script>
-		</td>
-	</tr>
-</tbody>
-</table>
-
-<inp2:n-rev_SaveWarning name="grid_save_warning"/>
-<inp2:n-rev_ErrorWarning name="form_error_warning"/>
-
-<div id="scroll_container">
-	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_Text_Review!"/>
-			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-rev" field="ItemId"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox_allow_html" prefix="n-rev" field="TextFormat"/>
-			<inp2:m_RenderElement name="inp_label" prefix="n-rev" field="ReviewId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_user" prefix="n-rev" field="CreatedById" title="!la_fld_CreatedById!" class="text"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="n-rev" field="ReviewText" title="!la_fld_ReviewText!" cols="70" rows="8"/>
-		<inp2:m_RenderElement name="subsection" title="!la_Text_General!"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="n-rev" field="Status" title="!la_fld_Status!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n-rev" field="Priority" title="!la_fld_Priority!" size="3" class="text"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n-rev" field="CreatedOn" title="!la_fld_CreatedOn!" size="20" class="text"/>
-		<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/5.1.x/in-news/admin_templates/articles/review_edit.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3.2.3
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/category_properties.tpl
===================================================================
--- branches/5.1.x/in-news/admin_templates/category_properties.tpl	(revision 13095)
+++ branches/5.1.x/in-news/admin_templates/category_properties.tpl	(nonexistent)
@@ -1,32 +0,0 @@
-<inp2:m_RenderElement name="subsection" title="la_In-news"/>
-
-<inp2:m_DefineElement name="inp_edit_type" class="" is_last="" maxlength="" onblur="" size="" is_last="" has_empty="0" empty_value="" onchange="" hint_label="" type_field="">
-	<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" hint_label="$hint_label" is_last="$is_last"/>
-			<td class="control-cell">
-				<input type="text" name="<inp2:{$prefix}_InputName field="$field" />" id="<inp2:{$prefix}_InputName field="$field" />" value="<inp2:{$prefix}_Field field="$field" />" 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"/>" onblur="<inp2:m_Param name="onblur"/>">
-
-				<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$type_field"/>" id="<inp2:{$prefix}_InputName field="$type_field"/>" onchange="<inp2:m_Param name="onchange"/>">
-					<inp2:m_if check="{$prefix}_FieldOption" field="$type_field" option="use_phrases">
-						<inp2:{$prefix}_PredefinedOptions field="$type_field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
-					<inp2:m_else/>
-						<inp2:{$prefix}_PredefinedOptions field="$type_field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
-					</inp2:m_if>
-				</select>
-			</td>
-			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		</tr>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
-<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="cust_n_ItemTemplate" type_field="cust_n_ItemTemplate" title="!la_fld_cust_n_ItemTemplate!" size="50"/>
-
-<inp2:m_RenderElement name="subsection" title="!la_section_RssProperties!"/>
-<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="cust_RssSource" type_field="cust_RssSource" title="!la_fld_RssSource!" size="50"/>
-<inp2:m_RenderElement name="inp_edit_type" prefix="c" field="cust_RssUpdateInterval" type_field="cust_RssUpdateIntervalType" title="!la_fld_RssUpdateInterval!"/>
-
-<inp2:m_RenderElement name="subsection" title="!la_section_RssExpiration!"/>
-<inp2:m_RenderElement name="inp_edit_type" prefix="c" field="cust_RssDefaultExpiration" type_field="cust_RssDefaultExpirationType" title="!la_fld_RssDefaultExpiration!"/>
-<inp2:m_RenderElement name="inp_edit_type" prefix="c" field="cust_RssExpireInterval" type_field="cust_RssExpireIntervalType" title="!la_fld_RssExpireInterval!"/>
-<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="cust_RssDeleteExpired" title="!la_fld_RssDeleteExpired!"/>

Property changes on: branches/5.1.x/in-news/admin_templates/category_properties.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3.2.3
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/catalog_tab.tpl
===================================================================
--- branches/5.1.x/in-news/admin_templates/catalog_tab.tpl	(revision 13095)
+++ branches/5.1.x/in-news/admin_templates/catalog_tab.tpl	(nonexistent)
@@ -1,64 +0,0 @@
-<inp2:m_RequireLogin permissions="in-portal:browse.view" system="1"/>
-<inp2:m_DefineElement name="catalog_tab">
-	<inp2:m_if check="m_ParamEquals" name="tab_init" value="" inverse="inverse">
-		<inp2:m_if check="m_ParamEquals" name="tab_init" value="1">
-			a_toolbar.AddButton(
-				new ToolBarButton(
-					'in-news:new_article',
-					'<inp2:m_phrase label="la_ToolTip_NewArticle" escape="1"/>',
-					add_item,
-					true
-		 		)
-		 	);
-		</inp2:m_if>
-
-		<inp2:m_if check="m_ParamEquals" name="tab_init" value="2">
-			<div id="articles_div" prefix="<inp2:m_param name="prefix"/>" view_template="in-news/catalog_tab"  edit_template="in-news/articles/articles_edit" category_id="-1" dep_buttons="new_article" class="catalog-tab"><!-- IE minimal height problem fix --></div>
-			<script type="text/javascript">$Catalog.registerTab('articles');</script>
-		</inp2:m_if>
-
-		<inp2:m_if check="m_ParamEquals" name="tab_init" value="3">
-			$Catalog.setItemCount('<inp2:m_Param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount grid="$grid_name"/>');
-		</inp2:m_if>
-	<inp2:m_else/>
-		<inp2:lang.current_Field name="Charset" result_to_var="charset"/>
-		<inp2:m_Header data="Content-type: text/plain; charset=$charset"/>
-		<inp2:m_include t="incs/blocks"/>
-		<inp2:m_include t="incs/in-portal"/>
-		<inp2:m_include t="categories/ci_blocks"/>
-		<inp2:$prefix_InitList grid="$grid_name"/>
-
-		$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount/>');
-		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id"/>);
-		$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword no_special="1" js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
-
-		<inp2:m_DefineElement name="article_expire_td">
-			<inp2:m_if check="Field" name="$field">
-				<inp2:Field field="$field" grid="$grid" no_special="$no_special" format="$format"/>
-			<inp2:m_else/>
-				<inp2:m_phrase name="la_Never"/>
-			</inp2:m_if>
-		</inp2:m_DefineElement>
-
-		<inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="NewsId" grid="$grid_name" menu_filters="yes"/>
-		<inp2:m_RenderElement name="grid_search_buttons" PrefixSpecial="$prefix" grid="$grid_name" ajax="1"/>
-
-		<inp2:m_if check="m_ParamEquals" name="tab_dependant" value="yes">
-			Grids['<inp2:m_param name="prefix"/>'].AddAlternativeGrid('<inp2:m_param name="cat_prefix"/>', true);
-		</inp2:m_if>
-		Grids['<inp2:m_param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','sep3','cut','copy','move_up','move_down','sep6'));
-		$Catalog.reflectPasteButton(<inp2:c_HasClipboard/>);
-		$Catalog.setViewMenu('<inp2:m_param name="prefix"/>');
-		<inp2:m_if check="m_ParamEquals" name="tab_mode" value="single">
-			Grids['<inp2:m_param name="prefix"/>'].DblClick = function() {return false};
-		</inp2:m_if>
-		#separator#
-		<!-- articles tab: begin -->
-		<inp2:m_RenderElement name="kernel_form" form_name="articles_form"/>
-		<inp2:m_RenderElement name="grid" ajax="1" PrefixSpecial="$prefix" IdField="NewsId" grid="$grid_name" menu_filters="yes"/>
-		<inp2:m_RenderElement name="kernel_form_end"/>
-		<!-- articles tab: end -->
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
-<inp2:n_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/admin_templates/catalog_tab.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.12.2.4
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/export_progress.tpl
===================================================================
--- branches/5.1.x/in-news/admin_templates/export_progress.tpl	(revision 13095)
+++ branches/5.1.x/in-news/admin_templates/export_progress.tpl	(nonexistent)
@@ -1,14 +0,0 @@
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n.export" section="in-portal:browse" perm_section="NEWS" permission_type="VIEW" system_permission="0" title_preset="articles_export"/>
-
-<inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
-
-<script type="text/javascript">
-	function cancel_action() {
-		submit_event('n.export', 'OnExportCancel');
-	}
-
-	$LinkExport = new AjaxProgressBar('<inp2:m_t t="dummy" n.export_event="OnExportProgress" pass="m,n.export" js_escape="1"/>');
-</script>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/admin_templates/export_progress.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.3
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/export.tpl
===================================================================
--- branches/5.1.x/in-news/admin_templates/export.tpl	(revision 13095)
+++ branches/5.1.x/in-news/admin_templates/export.tpl	(nonexistent)
@@ -1,127 +0,0 @@
-<inp2:adm_SetPopupSize width="780" height="670"/>
-
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n.export" section="in-portal:browse" perm_section="NEWS" permission_type="VIEW" system_permission="0" title_preset="articles_export"/>
-
-<!-- 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() {
-						document.getElementById('hidden_export_columns').value = select_to_string('<inp2:n.export_InputName field="ExportColumns"/>');
-						submit_event('n.export','OnExportBegin');
-
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n.export','OnGoBack');
-						}
-				 ) );
-
-				a_toolbar.Render();
-			</script>
-		</td>
-	</tr>
-</tbody>
-</table>
-
-
-<inp2:n.export_SaveWarning name="grid_save_warning"/>
-<inp2:n.export_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_radio" prefix="n.export" field="ExportFormat" title="la_fld_ExportFormat" use_phrases="0"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n.export" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n.export" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="n.export" field="LineEndings" title="la_fld_LineEndings" use_phrases="0"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="n.export" field="LineEndingsInside" title="la_fld_LineEndingsInside" use_phrases="0"/>
-
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n.export" field="IncludeFieldTitles" title="la_fld_IncludeFieldTitles"/>
-
-			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="n.export" field="ExportColumns" title="la_fld_ExportColumns"/>
-				<td class="control-cell">
-					<table cellpadding="0" cellspacing="0" border="0">
-						<tr>
-							<td>
-								<input type="button" value="<inp2:m_phrase name="la_btn_Up"/>" onclick="move_options_up('<inp2:n.export_InputName field="ExportColumns"/>', 1)" class="button">
-								<input type="button" value="<inp2:m_phrase name="la_btn_Down"/>" onclick="move_options_down('<inp2:n.export_InputName field="ExportColumns"/>', 1)" class="button"><br />
-								<img src="img/spacer.gif" width="1" height="5" alt=""><br />
-							</td>
-							<td><img src="img/spacer.gif" width="45" height="1" alt=""><br></td>
-							<td><inp2:m_phrase name="la_fld_AvailableColumns"/>:</td>
-						</tr>
-						<tr>
-							<td>
-								<select multiple id="<inp2:n.export_InputName field="ExportColumns"/>" size="15" style="width: 225px;">
-									<inp2:n.export_PredefinedOptions field="ExportColumns" block="inp_option_item" selected="selected"/>
-								</select>
-								<input type="hidden" id="hidden_export_columns" name="<inp2:n.export_InputName field="ExportColumns"/>" value="<inp2:n.export_Field field="ExportColumns"/>" />
-							</td>
-							<td align="center">
-								<input type="button" value="&nbsp;&laquo;&laquo;&nbsp;" onclick="move_selected('<inp2:n.export_InputName field="AvailableColumns"/>', '<inp2:n.export_InputName field="ExportColumns"/>')" class="button"><br>
-								<img src="img/spacer.gif" width="1" height="4" alt=""><br>
-								<input type="button" value="&nbsp;&raquo;&raquo;&nbsp;" onclick="move_selected('<inp2:n.export_InputName field="ExportColumns"/>', '<inp2:n.export_InputName field="AvailableColumns"/>'); select_sort('<inp2:n.export_InputName field="AvailableColumns"/>');" class="button">
-							</td>
-							<td>
-								<select multiple id="<inp2:n.export_InputName field="AvailableColumns"/>" size="15" style="width: 225px;">
-									<inp2:n.export_PredefinedOptions field="AvailableColumns" block="inp_option_item" selected="selected"/>
-								</select>
-							</td>
-						</tr>
-					</table>
-				</td>
-				<inp2:m_RenderElement name="inp_edit_error" prefix="n.export" field="ExportColumns"/>
-			</tr>
-
-			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="n.export" field="CategoryFormat" title="la_fld_CategoryFormat"/>
-				<td class="control-cell">
-					<table cellspacing="0" cellpadding="0">
-						<tr>
-							<td rowspan="2" valign="top">
-								<input type="radio"<inp2:m_if check="n.export_FieldEquals" field="CategoryFormat" value="1"> checked</inp2:m_if> name="<inp2:n.export_InputName field="CategoryFormat"/>" id="<inp2:n.export_InputName field="CategoryFormat"/>_1" value="1" />
-							</td>
-							<td>
-								<label for="<inp2:n.export_InputName field="CategoryFormat"/>_1"><inp2:m_phrase label="la_MixedCategoryPath"/></label>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<span class="<inp2:m_if check="n.export_HasError" field="CategorySeparator">error</inp2:m_if>"><inp2:m_phrase name="la_fld_CategorySeparator"/></span><inp2:m_if check="n.export_IsRequired" field="CategorySeparator"><span class="error"> *</span></inp2:m_if>:
-								 <input type="text" name="<inp2:n.export_InputName field="CategorySeparator"/>" id="<inp2:n.export_InputName field="CategorySeparator"/>" value="<inp2:n.export_Field field="CategorySeparator"/>" size="2" maxlength="1" /><br />
-								(will look like "Category:Sub-category:Sub-sub-category")
-
-							</td>
-						</tr>
-
-						<tr>
-							<td rowspan="2" valign="top">
-								<input type="radio"<inp2:m_if check="n.export_FieldEquals" field="CategoryFormat" value="2"> checked</inp2:m_if> name="<inp2:n.export_InputName field="CategoryFormat"/>" id="<inp2:n.export_InputName field="CategoryFormat"/>_2" value="2" />
-							</td>
-							<td>
-								<label for="<inp2:n.export_InputName field="CategoryFormat"/>_2"><inp2:m_phrase label="la_SeparatedCategoryPath"/></label><br />
-								(the fields will be titled Category1..CategoryN accordingly)
-							</td>
-						</tr>
-					</table>
-				</td>
-				<inp2:m_RenderElement name="inp_edit_error" prefix="n.export" field="CategoryFormat"/>
-			</tr>
-
-			<inp2:m_if check="m_GetEquals" name="m_cat_id" value="0" inverse="inverse">
-				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n.export" field="IsBaseCategory" title="la_fld_IsBaseCategory" />
-			</inp2:m_if>
-
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n.export" field="ExportFilename" title="la_fld_ExportFilename" size="20" />
-			<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/5.1.x/in-news/admin_templates/export.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.5
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/import_progress.tpl
===================================================================
--- branches/5.1.x/in-news/admin_templates/import_progress.tpl	(revision 13095)
+++ branches/5.1.x/in-news/admin_templates/import_progress.tpl	(nonexistent)
@@ -1,14 +0,0 @@
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n.import" section="in-portal:browse" perm_section="NEWS" permission_type="VIEW" system_permission="0" title_preset="articles_import"/>
-
-<inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
-
-<script type="text/javascript">
-	function cancel_action() {
-		submit_event('n.import', 'OnExportCancel');
-	}
-
-	$LinkImport = new AjaxProgressBar('<inp2:m_t t="dummy" n.import_event="OnExportProgress" pass="m,n.import" js_escape="1"/>');
-</script>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/admin_templates/import_progress.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.4
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/import.tpl
===================================================================
--- branches/5.1.x/in-news/admin_templates/import.tpl	(revision 13095)
+++ branches/5.1.x/in-news/admin_templates/import.tpl	(nonexistent)
@@ -1,232 +0,0 @@
-<inp2:adm_SetPopupSize width="780" height="670"/>
-
-<inp2:m_include t="incs/header"/>
-<inp2:n.import_PresetFormFields/>
-<inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:main_import" title_preset="import"/>
-
-<!-- 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('import', '<inp2:m_phrase label="la_ToolTip_Import" escape="1"/>', function() {
-
-						document.getElementById('export_columns').value = select_to_string('<inp2:n.import_InputName field="ExportColumns"/>');
-						submit_event('n.import','OnExportBegin');
-
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n.import','OnGoBack');
-						}
-				 ) );
-
-				a_toolbar.Render();
-
-				function check_radio($id)
-				{
-					document.getElementById($id).checked = true;
-				}
-
-				// gets value of checked radio button
-				function get_checked($field_name) {
-					var $ret = false;
-					var $fields = document.getElementsByName($field_name);
-
-					for(var $i = 0; $i < $fields.length; $i++) {
-						if ($fields[$i].checked) {
-							$ret = $fields[$i].value;
-							break;
-						}
-					}
-					return $ret;
-				}
-
-				// enable/disable form fields based on other field values
-				function reflectFormFields()
-				{
-					var $auto_fields = get_checked('<inp2:n.import_InputName field="FieldTitles"/>') == 1 ? true : false;
-
-					if ($auto_fields) {
-						document.getElementById('_cb_<inp2:n.import_InputName field="SkipFirstRow"/>').checked = true;
-					}
-					document.getElementById('_cb_<inp2:n.import_InputName field="SkipFirstRow"/>').onchange();
-					document.getElementById('<inp2:n.import_InputName field="ExportColumns"/>').disabled = $auto_fields;
-					document.getElementById('<inp2:n.import_InputName field="AvailableColumns"/>').disabled = $auto_fields;
-
-					var $btn = null;
-					var $btns = Array('up', 'down', 'left', 'right');
-					var $i = 0;
-					while ($i < $btns.length) {
-						$btn = document.getElementById('btn_move_'+$btns[$i]);
-						$btn.disabled = $auto_fields;
-						$btn.className = $auto_fields ? 'button-disabled' : 'button';
-						$i++;
-					}
-				}
-
-				Application.setHook('n.import:OnBeforeOpenSelector',
-					function() {
-						document.getElementById('export_columns').value = select_to_string('<inp2:n.import_InputName field="ExportColumns"/>');
-					}
-				);
-
-				$(document).ready(
-					function() {
-						$('#step_number').text(3);
-					}
-				);
-			</script>
-		</td>
-	</tr>
-</tbody>
-</table>
-
-
-<inp2:n.import_SaveWarning name="grid_save_warning"/>
-<inp2:n.import_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="n.import" field="ImportSource" title="la_fld_ImportFilename"/>
-				<td class="control-cell">
-					<table border="0">
-						<tr>
-							<td>
-								<input type="radio" name="<inp2:n.import_InputName field="ImportSource"/>" id="<inp2:n.import_InputName field="ImportSource"/>_1"<inp2:m_if check="n.import_FieldEquals" field="ImportSource" value="1"> checked</inp2:m_if> value="1" />
-							</td>
-							<td>
-								<label for="<inp2:n.import_InputName field="ImportSource"/>_1">upload</label>
-							</td>
-							<td>
-								<input type="file" name="<inp2:n.import_InputName field="ImportFilename"/>" id="<inp2:n.import_InputName field="ImportFilename"/>" onclick="check_radio('<inp2:n.import_InputName field="ImportSource"/>_1');">
-							</td>
-						</tr>
-
-						<tr>
-							<td>
-								<input type="radio" name="<inp2:n.import_InputName field="ImportSource"/>" id="<inp2:n.import_InputName field="ImportSource"/>_2"<inp2:m_if check="n.import_FieldEquals" field="ImportSource" value="2"> checked</inp2:m_if> value="2" />
-							</td>
-							<td>
-								<label for="<inp2:n.import_InputName field="ImportSource"/>_2">select</label>
-							</td>
-							<td>
-								<select name="<inp2:n.import_InputName field="ImportLocalFilename"/>" onclick="check_radio('<inp2:n.import_InputName field="ImportSource"/>_2');">
-									<inp2:n.import_PredefinedOptions field="ImportLocalFilename" block="inp_option_item" selected="selected"/>
-								</select>
-							</td>
-						</tr>
-
-					</table>
-				</td>
-				<inp2:m_RenderElement name="inp_edit_error" prefix="n.import" field="ImportSource"/>
-			</tr>
-
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n.import" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n.import" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="n.import" field="LineEndings" title="la_fld_LineEndings" use_phrases="0"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n.import" field="SkipFirstRow" title="la_fld_SkipFirstRow"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="n.import" field="FieldTitles" title="la_fld_FieldTitles" onclick="reflectFormFields();"/>
-
-			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="n.import" field="ExportColumns" title="la_fld_ImportColumns"/>
-				<td class="control-cell">
-					<table cellpadding="0" cellspacing="0" border="0">
-						<tr>
-							<td>
-								<input type="button" value="<inp2:m_phrase name="la_btn_Up"/>" id="btn_move_up" onclick="move_options_up('<inp2:n.import_InputName field="ExportColumns"/>', 1)" class="button">
-								<input type="button" value="<inp2:m_phrase name="la_btn_Down"/>" id="btn_move_down" onclick="move_options_down('<inp2:n.import_InputName field="ExportColumns"/>', 1)" class="button"><br />
-								<img src="img/spacer.gif" width="1" height="5" alt=""><br />
-							</td>
-							<td><img src="img/spacer.gif" width="45" height="1" alt=""><br></td>
-							<td><inp2:m_phrase name="la_fld_AvailableColumns"/>:</td>
-						</tr>
-						<tr>
-							<td>
-								<select multiple id="<inp2:n.import_InputName field="ExportColumns"/>" size="15" style="width: 225px;">
-									<inp2:n.import_PredefinedOptions field="ExportColumns" block="inp_option_item" selected="selected"/>
-								</select>
-								<input type="hidden" id="export_columns" name="<inp2:n.import_InputName field="ExportColumns"/>" value="<inp2:n.import_Field field="ExportColumns"/>" />
-							</td>
-							<td align="center">
-								<input type="button" value="&nbsp;&laquo;&laquo;&nbsp;" id="btn_move_left" onclick="move_selected('<inp2:n.import_InputName field="AvailableColumns"/>', '<inp2:n.import_InputName field="ExportColumns"/>')" class="button"><br>
-								<img src="img/spacer.gif" width="1" height="4" alt=""><br>
-								<input type="button" value="&nbsp;&raquo;&raquo;&nbsp;" id="btn_move_right" onclick="move_selected('<inp2:n.import_InputName field="ExportColumns"/>', '<inp2:n.import_InputName field="AvailableColumns"/>'); select_sort('<inp2:n.import_InputName field="AvailableColumns"/>');" class="button">
-							</td>
-							<td>
-								<select multiple id="<inp2:n.import_InputName field="AvailableColumns"/>" size="15" style="width: 225px;">
-									<inp2:n.import_PredefinedOptions field="AvailableColumns" block="inp_option_item" selected="selected"/>
-								</select>
-							</td>
-						</tr>
-					</table>
-				</td>
-				<inp2:m_RenderElement name="inp_edit_error" prefix="n.import" field="ExportColumns"/>
-			</tr>
-
-	<!-- CATEGORY SELECTOR: BEGIN -->
-		<inp2:m_DefineElement name="root_cat_caption">
-			<inp2:c_RootCategoryName/>
-		</inp2:m_DefineElement>
-
-		<inp2:m_DefineElement name="category_caption">
-			<inp2:m_param name="separator"/><inp2:m_param name="cat_name"/>
-		</inp2:m_DefineElement>
-
-		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="n.import" field="CategoryId" title="la_fld_ImportCategory"/>
-			<td class="control-cell">
-				<b><inp2:n.import_CategoryPath separator=" &gt; " root_cat_render_as="root_cat_caption" render_as="category_caption" session_var="ImportCategory"/></b>
-				<input type="hidden" name="<inp2:n.import_InputName field='CategoryId'/>" value="<inp2:n.import_Field field='CategoryId' db='db'/>" />
-				<a href="javascript:openSelector('n.import', '<inp2:adm_SelectorLink prefix="n.import" selection_mode="single" tab_prefixes="none"/>', 'ImportCategory', null, 'OnSaveSettings');"><img src="img/icons/icon24_cat.gif" border="0" align="absmiddle" /></a>
-			</td>
-			<inp2:m_RenderElement name="inp_edit_error" prefix="n.import" field="CategoryId"/>
-		</tr>
-	<!-- CATEGORY SELECTOR: END -->
-
-		<inp2:m_RenderElement name="inp_edit_box" prefix="n.import" field="CategorySeparator" title="la_fld_CategorySeparator" size="2" maxlength="1"/>
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n.import" field="ReplaceDuplicates" title="la_fld_ReplaceDuplicates" />
-
-		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="n.import" field="CheckDuplicatesMethod" title="la_fld_CheckDuplicatesMethod"/>
-			<td class="control-cell">
-				<table cellspacing="0" cellpadding="0">
-					<tr>
-						<td valign="top">
-							<input type="radio"<inp2:m_if check="n.import_FieldEquals" field="CheckDuplicatesMethod" value="1"> checked</inp2:m_if> name="<inp2:n.import_InputName field="CheckDuplicatesMethod"/>" id="<inp2:n.import_InputName field="CheckDuplicatesMethod"/>_1" value="1" />
-						</td>
-						<td>
-							<label for="<inp2:n.import_InputName field="CheckDuplicatesMethod"/>_1"><inp2:m_phrase name="la_IDField" />: ARTICLEID</label>
-						</td>
-					</tr>
-
-					<tr>
-						<td valign="top">
-							<input type="radio"<inp2:m_if check="n.import_FieldEquals" field="CheckDuplicatesMethod" value="2"> checked</inp2:m_if> name="<inp2:n.import_InputName field="CheckDuplicatesMethod"/>" id="<inp2:n.import_InputName field="CheckDuplicatesMethod"/>_2" value="2" />
-						</td>
-						<td>
-							<label for="<inp2:n.import_InputName field="CheckDuplicatesMethod"/>_2"><inp2:m_phrase name="la_OtherFields" />: </label>
-							<inp2:n.import_PredefinedOptions prefix="n.import" field="DuplicateCheckFields" block="inp_checkbox_item" selected="checked"/>
-
-							<inp2:m_RenderElement prefix="n.import" name="inp_edit_hidden" field="DuplicateCheckFields"/>
-						</td>
-					</tr>
-				</table>
-			</td>
-			<inp2:m_RenderElement name="inp_edit_error" prefix="n.import" field="CheckDuplicatesMethod"/>
-		</tr>
-
-		<inp2:m_RenderElement name="inp_edit_filler"/>
-	</table>
-</div>
-
-<script language="javascript" type="text/javascript">
-	reflectFormFields();
-</script>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/admin_templates/import.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.7
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/export_finish.tpl
===================================================================
--- branches/5.1.x/in-news/admin_templates/export_finish.tpl	(revision 13095)
+++ branches/5.1.x/in-news/admin_templates/export_finish.tpl	(nonexistent)
@@ -1,43 +0,0 @@
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n.export" section="in-portal:browse" perm_section="NEWS" permission_type="VIEW" system_permission="0" title_preset="articles_export"/>
-
-<!-- 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('n.export', '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'/>">
-			<inp2:m_inc param="tab_index" by="1"/>
-			<td class="label-cell">
-				<inp2:m_phrase label="la_DownloadExportFile"/>
-			</td>
-			<td class="control-mid">&nbsp;</td>
-			<td class="control-cell">
-				<a href="<inp2:n.export_ExportPath as_url="1"/>"><inp2:n.export_ExportPath /></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/5.1.x/in-news/admin_templates/export_finish.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.6
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/img/toolbar/tool_new_article_f2.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/in-news/admin_templates/img/toolbar/tool_new_article_f2.gif
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/img/toolbar/tool_new_article_f3.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/in-news/admin_templates/img/toolbar/tool_new_article_f3.gif
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/img/toolbar/tool_new_article.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/in-news/admin_templates/img/toolbar/tool_new_article.gif
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/img/icons/icon24_articles.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/in-news/admin_templates/img/icons/icon24_articles.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/img/icons/icon24_conf_news.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/in-news/admin_templates/img/icons/icon24_conf_news.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/img/itemicons/icon16_articles.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/in-news/admin_templates/img/itemicons/icon16_articles.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/img/itemicons/icon16_article_new.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/in-news/admin_templates/img/itemicons/icon16_article_new.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/img/itemicons/icon16_article_pending.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/in-news/admin_templates/img/itemicons/icon16_article_pending.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/img/itemicons/icon16_article_disabled.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/in-news/admin_templates/img/itemicons/icon16_article_disabled.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/img/itemicons/icon16_article.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/in-news/admin_templates/img/itemicons/icon16_article.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/in-news/admin_templates/user_item_tab.tpl
===================================================================
--- branches/5.1.x/in-news/admin_templates/user_item_tab.tpl	(revision 13095)
+++ branches/5.1.x/in-news/admin_templates/user_item_tab.tpl	(nonexistent)
@@ -1,43 +0,0 @@
-<inp2:m_RequireLogin permissions="in-portal:user_list.view" system="1"/>
-<inp2:m_DefineElement name="catalog_tab">
-	<inp2:m_if check="m_ParamEquals" name="tab_init" value="" inverse="inverse">
-		<inp2:m_if check="m_ParamEquals" name="tab_init" value="1">
-			<div id="articles_div" prefix="<inp2:m_param name="prefix"/>" view_template="in-news/user_item_tab" edit_template="in-news/articles/articles_edit" dep_buttons="new_article" category_id="-1" class="catalog-tab"><!-- IE minimal height problem fix --></div>
-			<script type="text/javascript">$Catalog.registerTab('articles');</script>
-		</inp2:m_if>
-		<inp2:m_if check="m_ParamEquals" name="tab_init" value="2">
-			<inp2:adm_CatalogTab render_as="item_tab" prefix="$prefix" title_property="$title_property"/>
-		</inp2:m_if>
-	<inp2:m_else/>
-
-		<inp2:m_include t="incs/blocks"/>
-		<inp2:m_include t="incs/in-portal"/>
-		<inp2:m_include t="categories/ci_blocks"/>
-		<inp2:$prefix_InitList grid="$grid_name"/>
-
-		$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount/>');
-		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id"/>);
-		$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
-
-		<inp2:m_DefineElement name="article_expire_td">
-			<inp2:m_if check="Field" name="$field">
-				<inp2:Field field="$field" grid="$grid" no_special="$no_special" format="$format"/>
-			<inp2:m_else/>
-				<inp2:m_phrase name="la_Never"/>
-			</inp2:m_if>
-		</inp2:m_DefineElement>
-
-		<inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="NewsId" grid="$grid_name" menu_filters="yes"/>
-
-		Grids['<inp2:m_param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit','delete'));
-		$Catalog.setViewMenu('<inp2:m_param name="prefix"/>');
-		#separator#
-		<!-- articles tab: begin -->
-		<inp2:m_RenderElement name="kernel_form" form_name="articles_form"/>
-			<inp2:m_RenderElement name="grid" ajax="1" PrefixSpecial="$prefix" IdField="NewsId" grid="$grid_name" menu_filters="yes"/>
-		<inp2:m_RenderElement name="kernel_form_end"/>
-		<!-- articles tab: end -->
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
-<inp2:n_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
\ No newline at end of file

Property changes on: branches/5.1.x/in-news/admin_templates/user_item_tab.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.6
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/articles/suggest_article.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/articles/suggest_article.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/articles/suggest_article.tpl	(nonexistent)
@@ -1,84 +0,0 @@
-<!--##
-<NAME>Suggest Article</NAME>
-<DESC>Article Suggestion Form</DESC>
-<SECTION>Platform||Articles</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_SuggestArticle"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/action_box.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SuggestArticle" templates="in-news/articles/suggest_article" show_category="1"/>
-		</div>
-		<div class="movable-element">
-			<!-- suggest article -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_SuggestArticle"/>
-				</inp2:m_Capture>
-
-				<inp2:m_if check="n_HasPermission" permissions="NEWS.ADD|NEWS.ADD.PENDING">
-					<inp2:n_PresetFormFields/>
-					<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
-
-					<inp2:m_if check="n_HasError" field="any">
-						<inp2:m_RenderElement name="error_message" />
-					</inp2:m_if>
-
-					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
-
-					<form method="post" action="<inp2:m_FormAction/>" enctype="multipart/form-data">
-						<table class="form-data fullwidth">
-
-							<tr><td colspan="2"><inp2:m_RenderElement name="subsection" title="lu_section_ArticleDetails" break=""/></td></tr>
-
-							<!--## SHOW PRIMARY CATEGORY ##-->
-							<inp2:m_RenderElement name="inp_pr_category_label" prefix="n" field="PrimaryCat" title="lu_fld_SubmittingTo" />
-							<!--## //SHOW PRIMARY CATEGORY ##-->
-
-							<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Title" title="lu_fld_Title" maxlength="50" style="width:400px"/>
-							<inp2:m_RenderElement name="inp_edit_textarea" prefix="n" field="Body" title="lu_fld_Body" cols="80" rows="7" style="width:400px"/>
-							<inp2:m_RenderElement name="inp_edit_categories" prefix="n" field="MoreCategories" title="lu_fld_MoreCategories" is_last="1"/>
-							<tr><td colspan="2"><br/><inp2:m_RenderElement name="subsection" title="lu_section_Images" break=""/></td></tr>
-							<inp2:m_RenderElement name="inp_edit_image_upload" prefix="n" field="PrimaryImage" title="lu_fld_PrimaryImage"/>
-							<inp2:m_RenderElement name="inp_edit_image_upload" prefix="n" field="Image1" title="lu_fld_Image1"/>
-							<inp2:m_RenderElement name="inp_edit_image_upload" prefix="n" field="Image2" title="lu_fld_Image2" is_last="1"/>
-
-							<inp2:m_RenderElement design="inp_edit_buttons">
-								<input type="hidden" name="suggest_confirm_template" value="in-news/articles/suggest_confirm"/>
-								<input type="hidden" name="suggest_pending_confirm_template" value="in-news/articles/suggest_pending_confirm"/>
-								<input class="button" type="submit" name="events[n][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Create" no_editing="1"/>"/>
-							</inp2:m_RenderElement>
-						</table>
-					</form>
-				<inp2:m_else/>
-					<inp2:m_phrase name="lu_text_NoSuggestArticlePermission"/>
-				</inp2:m_if>
-			</inp2:m_RenderElement>
-			<!-- // suggest article -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/articles/suggest_article.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.8
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/articles/article_detail.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/articles/article_detail.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/articles/article_detail.tpl	(nonexistent)
@@ -1,191 +0,0 @@
-<!--##
-<NAME>Articles - Details Design</NAME>
-<DESC>General design template for Article Details section</DESC>
-<SECTION>Platform||Articles</SECTION>
-##-->
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:n_Field name="Title"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/action_box.elm" item_actions="1" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<!--## ADDITIONAL IMAGE ELEMENT ##-->
-<inp2:m_DefineElement name="additional_image_element">
-	<td>
-		<a href="<inp2:ImageSrc MaxWidth="fullsize"/>" class="thickbox" rel="article-images" title="<inp2:m_param name="alt"/>">
-			<img src="<inp2:m_param name="img_path"/>" title="<inp2:m_param name="alt"/>" alt="<inp2:m_param name="alt"/>" <inp2:m_param name="img_size"/> border="0" /><br />
-		</a>
-	</td>
-	<inp2:m_if check="m_Param" name="not_last">
-		<td>
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="8" height="1" alt="" />
-		</td>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-<!--## /ADDITIONAL IMAGE ELEMENT ##-->
-
-<!--## MAIN CONTENT ##-->
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="__item__" templates="__default__" show_category="1"/>
-		</div>
-		<div class="movable-element">
-		<!--## article details ##-->
-		<inp2:m_RenderElement design="content_box">
-
-			<inp2:m_Capture to_var="header">
-				<inp2:m_phrase name="lu_title_ArticleDetails"/>
-			</inp2:m_Capture>
-
-			<table class="fullwidth table-border">
-				<tr>
-					<td class="item-padding">
-						<table class="fullwidth">
-							<tr>
-								<td width="25" valign="top">
-									<img src="<inp2:m_TemplatesBase module="In-News"/>img/articles_icon.gif" width="16" height="23" alt="" />
-								</td>
-								<td valign="top">
-
-									<!--## STANDARD ARTICLE TITLE ##-->
-									<inp2:m_if check="n_Field" name="cust_RssOriginalURL" inverse="1">
-										<span class="text-title"><inp2:n_Field name="Title"/></span>
-									<inp2:m_else/>
-									<!--## RSS ARTICLE TITLE WITH LINK ##-->
-										<span class="text-title"><a href="<inp2:n_Field name="cust_RssOriginalURL"/>" target="_blank"><inp2:n_Field name="Title"/></a></span>
-									</inp2:m_if>
-
-									<inp2:m_if check="n_Field" name="IsHot"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_hot.gif" alt="<inp2:m_Phrase name="lu_Hot" no_editing="1"/>"/></inp2:m_if>
-									<inp2:m_if check="n_Field" name="IsNew"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_new.gif" alt="<inp2:m_Phrase name="lu_New" no_editing="1"/>"/></inp2:m_if>
-									<inp2:m_if check="n_Field" name="IsPop"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_popular.gif" alt="<inp2:m_Phrase name="lu_Pop" no_editing="1"/>"/></inp2:m_if>
-									<inp2:m_if check="n_IsEditorsPick"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_pick.gif" alt="<inp2:m_Phrase name="lu_Pick" no_editing="1"/>"/></inp2:m_if>
-									<inp2:m_if check="n_IsFavorite"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_favorite.gif" alt="<inp2:m_Phrase name="lu_Favorite" no_editing="1"/>"/></inp2:m_if>
-									<inp2:n_VotesIndicator render_as="rating_element"/>
-
-									<br />
-
-									<span class="item-statistics">
-										<inp2:m_phrase name="lu_Added"/>: <inp2:n_Field name="CreatedOn" format="_regional_DateFormat"/>,
-										<inp2:m_phrase name="lu_Hits"/>: <inp2:n_Field name="Hits"/>,
-										<inp2:m_phrase name="lu_Rating"/>: <inp2:n_Field name="CachedRating"/>,
-										<inp2:m_phrase name="lu_Reviews"/>: <inp2:n_Field name="CachedReviewsQty"/>,
-										<inp2:m_phrase name="lu_Votes"/>: <inp2:n_Field name="CachedVotesQty"/>
-									</span>
-								</td>
-							</tr>
-						</table>
-
-						<table>
-							<tr>
-								<inp2:m_if check="n_Field" name="cust_RssOriginalURL" inverse="1">
-								<td class="picture-padding" style="padding-left:25px" valign="top">
-									<inp2:m_if check="n_ImageSrc" MaxWidth="fullsize">
-										<a href="<inp2:n_ImageSrc MaxWidth="fullsize" DefaultImage="platform/img/no_picture.gif"/>" class="thickbox" rel="article-images">
-											<inp2:n_Image render_as="image_element" Primary="1" MaxWidth="thumbnail" DefaultWidth="150" DefaultImage="platform/img/no_picture.gif"/><br />
-										</a>
-									<inp2:m_else/>
-										<inp2:n_Image render_as="image_element" Primary="1" MaxWidth="thumbnail" DefaultWidth="150" DefaultImage="platform/img/no_picture.gif"/><br />
-									</inp2:m_if>
-								</td>
-								</inp2:m_if>
-								<td class="text-padding" valign="top">
-									<inp2:n_Field name="Body" nl2br="1"/>
-
-									<br/>
-									<inp2:m_if check="n_IsFavorite">
-										<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_removefromfav.gif" width="11" height="10" alt="" /> <a class="item-action" href="<inp2:n_FavoriteToggleLink/>"><inp2:m_phrase name="lu_btn_RemoveFromFavorites"/></a>
-									<inp2:m_else/>
-										<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_addtofav.gif" width="11" height="10" alt="" /> <a class="item-action" href="<inp2:n_FavoriteToggleLink template="platform/my_account/my_favorites"/>"><inp2:m_phrase name="lu_btn_AddToFavorites"/></a>
-									</inp2:m_if>
-								</td>
-							</tr>
-						</table>
-
-						<br />
-
-						<inp2:m_if check="n_HasAdditionalImages">
-							<inp2:m_RenderElement name="subsection" title="lu_section_AdditionalImages"/>
-							<table>
-								<tr>
-									<inp2:n_ListImages render_as="additional_image_element" types="additional" per_page="-1" no_table="1" thumbnail="1" DefaultImage="platform/img/no_picture.gif" MaxWidth="120"/>
-								</tr>
-							</table>
-						</inp2:m_if>
-
-						<!--## LIST LINK FILES ##-->
-						<inp2:m_RenderElement design="content_box_subsection" data_exists="1">
-								<inp2:m_Capture to_var="subsection_header">
-									<strong><inp2:m_Phrase name="lu_section_Files"/></strong>
-								</inp2:m_Capture>
-								<table>
-									<inp2:n-file_PrintList render_as="file_element" columns="1" direction="V" per_page="10" />
-								</table>
-								<br /><br />
-						</inp2:m_RenderElement>
-						<!--## //LIST LINK FILES ##-->
-					</td>
-				</tr>
-			</table>
-		</inp2:m_RenderElement>
-		<!--## // article details ##-->
-		</div>
-
-		<div class="movable-element">
-			<!--## article reviews ##-->
-			<inp2:m_DefineElement name="no_reviews">
-				<inp2:m_phrase name="lu_NoReviews"/>
-			</inp2:m_DefineElement>
-
-			<inp2:m_RenderElement design="content_box" data_exists="1" block_no_data="no_reviews">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_section_Reviews"/> (<inp2:n-rev_TotalRecords/>)
-				</inp2:m_Capture>
-
-				<table>
-					<inp2:n-rev_PrintList render_as="review_element"/>
-				</table>
-
-				<inp2:m_include template="platform/elements/pagination.elm" prefix="n-rev"/>
-			</inp2:m_RenderElement>
-			<!--## // article reviews ##-->
-		</div>
-
-		<div class="movable-element">
-			<!--## RELATED TO ARTICLE ITEMS ##-->
-			<inp2:m_RenderElement design="content_box" related_to="Article" data_exists="1">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_Phrase label="lu_title_RelatedItems"/>
-				</inp2:m_Capture>
-
-				<inp2:m_ModuleInclude template="elements/content_boxes/related_items.elm" related_to="$related_to" />
-			</inp2:m_RenderElement>
-			<!--## // RELATED TO ARTICLE ITEMS ##-->
-		</div>
-	</div>
-
-	<!--## INCREASE HITS COUNTER ##-->
-	<inp2:n_RegisterHit/>
-	<!--## // INCREASE HITS COUNTER ##-->
-</inp2:m_DefineElement>
-<!--## /MAIN CONTENT ##-->
-
-<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
-<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/articles/article_detail.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.3
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/articles/suggest_confirm.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/articles/suggest_confirm.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/articles/suggest_confirm.tpl	(nonexistent)
@@ -1,49 +0,0 @@
-<!--##
-<NAME>Suggest Article - Confirmation</NAME>
-<DESC>Suggest Article Confirmation page</DESC>
-<SECTION>Platform||Articles</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_SuggestArticleConfirm"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/action_box.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SuggestArticleConfirm" templates="in-news/articles/suggest_confirm" show_category="1"/>
-		</div>
-		<div class="movable-element">
-			<!-- suggest article confirm -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_SuggestArticleConfirm"/>
-				</inp2:m_Capture>
-
-				<inp2:m_phrase name="lu_text_SuggestArticleConfirm"/><br /><br />
-				<a href="<inp2:m_Link template="in-news/my_account/my_articles" m_cat_id="0" m_cat_page="1"/>"><inp2:m_phrase name="lu_title_MyArticles"/></a>
-			</inp2:m_RenderElement>
-			<!-- // suggest article confirm -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/articles/suggest_confirm.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.8
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/articles/add_review_pending_confirm.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/articles/add_review_pending_confirm.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/articles/add_review_pending_confirm.tpl	(nonexistent)
@@ -1,49 +0,0 @@
-<!--##
-<NAME>New Article Review (Pending) Confirmation</NAME>
-<DESC>Confirmation page for Pending Article submition</DESC>
-<SECTION>Platform||Articles</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_AddArticleReviewPendingConfirm"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/action_box.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="__item__,lu_title_AddArticleReviewPendingConfirm" templates="__default__,in-news/articles/add_review_pending_confirm" show_category="1"/>
-		</div>
-		<div class="movable-element">
-			<!-- add article review pending confirm -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_AddArticleReviewPendingConfirm"/>
-				</inp2:m_Capture>
-
-				<inp2:m_phrase name="lu_text_AddArticleReviewPendingConfirm"/><br /><br />
-				<a href="<inp2:n_ArticleLink template="__default__"/>"><inp2:n_Field name="Title"/></a>
-			</inp2:m_RenderElement>
-			<!-- // add article review pending confirm -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/articles/add_review_pending_confirm.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.9
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/articles/modify_pending_confirm.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/articles/modify_pending_confirm.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/articles/modify_pending_confirm.tpl	(nonexistent)
@@ -1,49 +0,0 @@
-<!--##
-<NAME>Modify Article Pending Confirmation</NAME>
-<DESC>Confirmation page for Pending Article Modification</DESC>
-<SECTION>Platform||Articles</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_ModifyArticlePendingConfirm"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/action_box.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyArticles,__item__,lu_title_ModifyArticlePendingConfirm" templates="platform/my_account/my_account,in-news/my_account/my_articles,__default__,in-news/articles/modify_pending_confirm"/>
-		</div>
-		<div class="movable-element">
-			<!-- article modify pending confirm -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_ModifyArticlePendingConfirm"/>
-				</inp2:m_Capture>
-
-				<inp2:m_phrase name="lu_text_ModifyArticlePendingConfirm"/><br /><br />
-				<a href="<inp2:m_Link template="in-news/my_account/my_articles" m_cat_id="0" m_cat_page="1"/>"><inp2:m_phrase name="lu_title_MyArticles"/></a>
-			</inp2:m_RenderElement>
-			<!-- // article modify pending confirm -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/articles/modify_pending_confirm.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.8
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/articles/pick_articles.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/articles/pick_articles.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/articles/pick_articles.tpl	(nonexistent)
@@ -1,66 +0,0 @@
-<!--##
-<NAME>Editor's Pick Articles</NAME>
-<DESC>List of Editor's Pick Articles</DESC>
-<SECTION>Platform||Articles</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_PickArticles"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/action_box.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/hot.elm" design="blue_box" data_exists="1"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/pop.elm" design="blue_box" data_exists="1"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/new.elm" design="blue_box" data_exists="1"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_PickArticles" templates="in-news/articles/pick_articles"/>
-		</div>
-		<div class="movable-element">
-			<!-- pick articles -->
-			<inp2:m_RenderElement design="content_box" data_exists="1" block_no_data="no_articles">
-				<inp2:n_InitList list_name="pick_articles" m_cat_id="0" recursive="1" types="pick"/>
-
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_PickArticles"/> (<inp2:n_TotalRecords list_name="pick_articles"/>)
-				</inp2:m_Capture>
-
-				<inp2:m_include template="in-news/elements/sorting.elm" list_name="pick_articles"/>
-
-				<inp2:m_include template="in-news/elements/articles.elm"/>
-				<table class="fullwidth item-listing table-border">
-					<inp2:n_ListArticles list_name="pick_articles" render_as="article_element" direction="H"/>
-				</table>
-
-				<inp2:m_include template="platform/elements/pagination.elm" prefix="n" list_name="new_articles"/>
-			</inp2:m_RenderElement>
-			<!-- // pick articles -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/articles/pick_articles.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.9
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/articles/suggest_pending_confirm.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/articles/suggest_pending_confirm.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/articles/suggest_pending_confirm.tpl	(nonexistent)
@@ -1,49 +0,0 @@
-<!--##
-<NAME>Pending Article - Confirmation</NAME>
-<DESC>Pending Article Confirmation page</DESC>
-<SECTION>Platform||Articles</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_SuggestArticlePendingConfirm"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/action_box.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SuggestArticlePendingConfirm" templates="in-news/articles/suggest_pending_confirm" show_category="1"/>
-		</div>
-		<div class="movable-element">
-			<!-- suggest article pending confirm -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_SuggestArticlePendingConfirm"/>
-				</inp2:m_Capture>
-
-				<inp2:m_phrase name="lu_text_SuggestArticlePendingConfirm"/><br /><br />
-				<a href="<inp2:m_Link template="in-news/my_account/my_articles" m_cat_id="0" m_cat_page="1"/>"><inp2:m_Phrase name="lu_title_MyArticles"/></a>
-			</inp2:m_RenderElement>
-			<!-- // suggest article pending confirm -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/articles/suggest_pending_confirm.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.8
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/articles/add_review.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/articles/add_review.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/articles/add_review.tpl	(nonexistent)
@@ -1,140 +0,0 @@
-<!--##
-<NAME>Add Article Review</NAME>
-<DESC>Form for submitting Article Review</DESC>
-<SECTION>Platform||Articles</SECTION>
-##-->
-
-<inp2:m_RequireLogin login_template="platform/login/register" permissions="NEWS.REVIEW|NEWS.REVIEW.PENDING"/>
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:n_Field name="Title"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/action_box.elm" item_actions="1" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="__item__,lu_title_Reviews" templates="__default__,in-news/articles/add_review" show_category="1"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_ArticleDetails"/>
-				</inp2:m_Capture>
-
-				<table class="fullwidth table-border">
-					<tr><td class="item-padding">
-
-				<table>
-					<tr>
-						<td width="25" valign="top">
-							<img src="<inp2:m_TemplatesBase module="In-News"/>img/articles_icon.gif" width="16" height="23" alt="" />
-						</td>
-						<td valign="top">
-
-							<span class="text-title"><inp2:n_Field name="Title"/></span>
-
-							<inp2:m_if check="n_Field" name="IsHot"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_hot.gif" alt="<inp2:m_Phrase name="lu_Hot" no_editing="1"/>"/></inp2:m_if>
-							<inp2:m_if check="n_Field" name="IsNew"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_new.gif" alt="<inp2:m_Phrase name="lu_New" no_editing="1"/>"/></inp2:m_if>
-							<inp2:m_if check="n_Field" name="IsPop"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_popular.gif" alt="<inp2:m_Phrase name="lu_Pop" no_editing="1"/>"/></inp2:m_if>
-							<inp2:m_if check="n_IsEditorsPick"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_pick.gif" alt="<inp2:m_Phrase name="lu_Pick" no_editing="1"/>"/></inp2:m_if>
-							<inp2:m_if check="n_IsFavorite"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_favorite.gif" alt="<inp2:m_Phrase name="lu_Favorite" no_editing="1"/>"/></inp2:m_if>
-							<inp2:n_VotesIndicator render_as="rating_element"/>
-
-							<br />
-
-							<span class="item-statistics">
-								<inp2:m_phrase name="lu_Added"/>: <inp2:n_Field name="CreatedOn" format="_regional_DateFormat"/>,
-								<inp2:m_phrase name="lu_Hits"/>: <inp2:n_Field name="Hits"/>,
-								<inp2:m_phrase name="lu_Rating"/>: <inp2:n_Field name="CachedRating"/>,
-								<inp2:m_phrase name="lu_Reviews"/>: <inp2:n_Field name="CachedReviewsQty"/>,
-								<inp2:m_phrase name="lu_Votes"/>: <inp2:n_Field name="CachedVotesQty"/>
-							</span>
-						</td>
-					</tr>
-				</table>
-
-				<table>
-					<tr>
-						<td class="picture-padding" style="padding-left:25px" valign="top">
-							<inp2:m_if check="n_ImageSrc" MaxWidth="fullsize">
-								<a href="<inp2:n_ImageSrc MaxWidth="fullsize" DefaultImage="platform/img/no_picture.gif"/>" class="thickbox" rel="article-images" title="<inp2:n_Field name='Title' html_escape='1'/>">
-									<inp2:n_Image render_as="image_element" Primary="1" MaxWidth="thumbnail" DefaultImage="platform/img/no_picture.gif"/><br />
-								</a>
-							<inp2:m_else/>
-								<inp2:n_Image render_as="image_element" Primary="1" MaxWidth="thumbnail" DefaultImage="platform/img/no_picture.gif"/><br />
-							</inp2:m_if>
-						</td>
-						<td class="text-padding" valign="top">
-							<inp2:n_Field name="Excerpt" nl2br="1"/>
-						</td>
-					</tr>
-				</table>
-			</td></tr></table>
-			</inp2:m_RenderElement>
-			</div>
-
-			<div class="movable-element">
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_ReviewThisArticle"/>
-				</inp2:m_Capture>
-
-
-				<inp2:m_if check="n_HasPermission" permissions="NEWS.REVIEW|NEWS.REVIEW.PENDING">
-					<inp2:m_if check="n-rev_AlreadyReviewed">
-						<inp2:m_Phrase label="lu_ErrorAlreadyReviewed"/>
-						<table>
-							<inp2:n-rev_PrintList render_as="review_element" type="current_user" per_page="-1"/>
-						</table>
-						<inp2:m_include template="platform/elements/pagination.elm" prefix="n-rev"/>
-					<inp2:m_else/>
-						<inp2:n-rev_PresetFormFields/>
-						<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
-
-						<inp2:m_if check="n-rev_HasError" field="any">
-							<inp2:m_RenderElement name="error_message" />
-						</inp2:m_if>
-
-						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
-
-						<form method="post" action="<inp2:m_FormAction/>">
-							<table class="form-data fullwidth">
-								<inp2:m_RenderElement name="inp_edit_radio" prefix="n-rev" field="Rating" title="lu_fld_Rating"/>
-								<inp2:m_RenderElement name="inp_edit_textarea" prefix="n-rev" field="ReviewText" rows="8" cols="40" title="lu_fld_ReviewText" is_last="1"/>
-
-								<inp2:m_RenderElement design="inp_edit_buttons">
-									<input type="hidden" name="success_template" value="in-news/articles/add_review_confirm"/>
-									<input type="hidden" name="success_pending_template" value="in-news/articles/add_review_pending_confirm"/>
-									<input class="button" type="submit" name="events[n-rev][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Create" no_editing="1"/>"/>
-								</inp2:m_RenderElement>
-							</table>
-						</form>
-					</inp2:m_if>
-				<inp2:m_else/>
-					<inp2:m_phrase name="lu_text_NoArticleReviewPermission"/>
-				</inp2:m_if>
-			</inp2:m_RenderElement>
-			<!-- // add review -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/articles/add_review.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.8
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/articles/hot_articles.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/articles/hot_articles.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/articles/hot_articles.tpl	(nonexistent)
@@ -1,66 +0,0 @@
-<!--##
-<NAME>Hot Articles</NAME>
-<DESC>List of Hot Articles</DESC>
-<SECTION>Platform||Articles</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_HotArticles"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/action_box.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/pick.elm" design="blue_box" data_exists="1"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/pop.elm" design="blue_box" data_exists="1"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/new.elm" design="blue_box" data_exists="1"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_HotArticles" templates="in-news/articles/hot_articles"/>
-		</div>
-		<div class="movable-element">
-			<!-- hot articles -->
-			<inp2:m_RenderElement design="content_box" data_exists="1" block_no_data="no_articles">
-				<inp2:n_InitList list_name="hot_articles" m_cat_id="0" recursive="1" types="hot"/>
-
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_HotArticles"/> (<inp2:n_TotalRecords list_name="hot_articles"/>)
-				</inp2:m_Capture>
-
-				<inp2:m_include template="in-news/elements/sorting.elm" list_name="hot_articles"/>
-
-				<inp2:m_include template="in-news/elements/articles.elm"/>
-				<table class="fullwidth item-listing">
-					<inp2:n_ListArticles list_name="hot_articles" render_as="article_element" direction="H"/>
-				</table>
-
-				<inp2:m_include template="platform/elements/pagination.elm" prefix="n" list_name="hot_articles"/>
-			</inp2:m_RenderElement>
-			<!-- // hot articles -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/articles/hot_articles.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.11
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/articles/modify_article.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/articles/modify_article.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/articles/modify_article.tpl	(nonexistent)
@@ -1,85 +0,0 @@
-<!--##
-<NAME>Modify Article</NAME>
-<DESC>Form for Article Modification</DESC>
-<SECTION>Platform||Articles</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_ModifyArticle"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/action_box.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/action_box.elm" item_actions="1" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyArticles,__item__,lu_title_ModifyArticle" templates="platform/my_account/my_account,in-news/my_account/my_articles,__default__,in-news/articles/modify_article"/>
-		</div>
-		<div class="movable-element">
-			<!-- modify article -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_ModifyArticle"/>
-				</inp2:m_Capture>
-
-				<inp2:m_if check="n_HasPermission" permissions="NEWS.MODIFY|NEWS.MODIFY.PENDING|NEWS.OWNER.MODIFY|NEWS.OWNER.MODIFY.PENDING">
-
-					<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
-
-					<inp2:m_if check="n_HasError" field="any">
-						<inp2:m_RenderElement name="error_message" />
-					</inp2:m_if>
-
-					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
-
-					<form method="post" action="<inp2:m_FormAction/>" enctype="multipart/form-data">
-						<table class="form-data fullwidth">
-							<tr><td colspan="2"><inp2:m_RenderElement name="subsection" title="lu_section_ArticleDetails" break=""/></td></tr>
-							<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Title" title="lu_fld_Title" maxlength="50" style="width:400px"/>
-							<inp2:m_RenderElement name="inp_edit_textarea" prefix="n" field="Body" title="lu_fld_Body" cols="80" rows="7" style="width:400px"/>
-							<!--## SHOW PRIMARY CATEGORY ##-->
-							<inp2:m_RenderElement name="inp_pr_category_label" prefix="n" field="PrimaryCat" title="lu_fld_PrimaryCategory" editing="1"/>
-							<!--## //SHOW PRIMARY CATEGORY ##-->
-
-							<inp2:m_RenderElement name="inp_edit_categories" prefix="n" field="MoreCategories" title="lu_fld_MoreCategories" is_last="1"/>
-							<tr><td colspan="2"><br/><inp2:m_RenderElement name="subsection" title="lu_section_Images" break=""/></td></tr>
-							<inp2:m_RenderElement name="inp_edit_image_upload" prefix="n" field="PrimaryImage" title="lu_fld_PrimaryImage"/>
-							<inp2:m_RenderElement name="inp_edit_image_upload" prefix="n" field="Image1" title="lu_fld_Image1"/>
-							<inp2:m_RenderElement name="inp_edit_image_upload" prefix="n" field="Image2" title="lu_fld_Image2" is_last="1"/>
-
-							<inp2:m_RenderElement design="inp_edit_buttons">
-								<input type="hidden" name="modify_confirm_template" value="in-news/articles/modify_confirm"/>
-								<input type="hidden" name="modify_pending_confirm_template" value="in-news/articles/modify_pending_confirm"/>
-								<input class="button" type="submit" name="events[n][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_Update" no_editing="1"/>"/>
-							</inp2:m_RenderElement>
-						</table>
-					</form>
-				<inp2:m_else/>
-					<inp2:m_phrase name="lu_text_NoModifyArticlePermission"/>
-				</inp2:m_if>
-			</inp2:m_RenderElement>
-			<!-- // modify article -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/articles/modify_article.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.8
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/articles/.smsignore
===================================================================
--- branches/5.1.x/themes/advanced/in-news/articles/.smsignore	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/articles/.smsignore	(nonexistent)
@@ -1 +0,0 @@
-article_detail\.tpl
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/articles/.smsignore
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/articles/add_review_confirm.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/articles/add_review_confirm.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/articles/add_review_confirm.tpl	(nonexistent)
@@ -1,49 +0,0 @@
-<!--##
-<NAME>New Article Review Confirmation</NAME>
-<DESC>Confirmation page for New Article Review</DESC>
-<SECTION>Platform||Articles</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_AddArticleReviewConfirm"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/action_box.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="__item__,lu_title_AddArticleReviewConfirm" templates="__default__,in-news/articles/add_review_confirm" show_category="1"/>
-		</div>
-		<div class="movable-element">
-			<!-- add article review confirm -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_AddArticleReviewConfirm"/>
-				</inp2:m_Capture>
-
-				<inp2:m_phrase name="lu_text_AddArticleReviewConfirm"/><br /><br />
-				<a href="<inp2:n_ArticleLink template="__default__"/>"><inp2:n_Field name="Title"/></a>
-			</inp2:m_RenderElement>
-			<!-- // add article review confirm -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/articles/add_review_confirm.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.9
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/articles/modify_confirm.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/articles/modify_confirm.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/articles/modify_confirm.tpl	(nonexistent)
@@ -1,49 +0,0 @@
-<!--##
-<NAME>Modify Article Confirmation</NAME>
-<DESC>Confirmation page for Article Modification</DESC>
-<SECTION>Platform||Articles</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_ModifyArticleConfirm"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/action_box.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyArticles,__item__,lu_title_ModifyArticleConfirm" templates="platform/my_account/my_account,in-news/my_account/my_articles,__default__,in-news/articles/modify_confirm"/>
-		</div>
-		<div class="movable-element">
-			<!-- article modify confirm -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_ModifyArticleConfirm"/>
-				</inp2:m_Capture>
-
-				<inp2:m_phrase name="lu_text_ModifyArticleConfirm"/><br /><br />
-				<a href="<inp2:m_Link template="in-news/my_account/my_articles" m_cat_id="0" m_cat_page="1"/>"><inp2:m_phrase name="lu_title_MyArticles"/></a>
-			</inp2:m_RenderElement>
-			<!-- // article modify confirm -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/articles/modify_confirm.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.9
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/articles/search_results.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/articles/search_results.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/articles/search_results.tpl	(nonexistent)
@@ -1,67 +0,0 @@
-<!--##
-<NAME>Articles - Search Results</NAME>
-<DESC>List of Articles Search Results</DESC>
-<SECTION>Platform||Articles</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_Phrase label="lu_title_ArticleSearchResults"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/action_box.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/pick.elm" design="blue_box" data_exists="1"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/pop.elm" design="blue_box" data_exists="1"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/new.elm" design="blue_box" data_exists="1"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-
-<div class="movable-element">
-	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ArticleSearchResults" templates="in-news/search/search_results"/>
-</div>
-
-<div class="movable-element">
-	<inp2:m_RenderElement design="content_box">
-		<inp2:n_InitList list_name="article_search_results" types="search" parent_cat_id="any" recursive="1"/>
-
-		<inp2:m_Capture to_var="header">
-			<inp2:m_Phrase label="lu_title_ArticleSearchResults"/> (<inp2:n_TotalRecords list_name="article_search_results"/>)
-		</inp2:m_Capture>
-
-		<inp2:m_include template="in-news/elements/sorting.elm" list_name="article_search_results"/>
-
-		<inp2:m_include template="in-news/elements/articles.elm"/>
-		<inp2:m_include template="platform/elements/search_results.elm"/>
-
-		<table class="fullwidth item-listing table-border">
-			<inp2:n_ListArticles list_name="article_search_results" render_as="article_element" show_relevance="1"/>
-		</table>
-
-		<inp2:m_include template="platform/elements/pagination.elm" prefix="n" list_name="article_search_results"/>
-	</inp2:m_RenderElement>
-</div>
-
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/articles/search_results.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.11
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/articles/pop_articles.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/articles/pop_articles.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/articles/pop_articles.tpl	(nonexistent)
@@ -1,66 +0,0 @@
-<!--##
-<NAME>Popular Articles</NAME>
-<DESC>List of Popular Articles</DESC>
-<SECTION>Platform||Articles</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_PopArticles"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">\
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/action_box.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/hot.elm" design="blue_box" data_exists="1"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/pick.elm" design="blue_box" data_exists="1"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/new.elm" design="blue_box" data_exists="1"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_PopArticles" templates="in-news/articless/pop_articles"/>
-		</div>
-		<div class="movable-element">
-			<!-- popular articles -->
-			<inp2:m_RenderElement design="content_box" data_exists="1" block_no_data="no_articles">
-				<inp2:n_InitList list_name="pop_articles" m_cat_id="0" recursive="1" types="pop"/>
-
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_PopArticles"/> (<inp2:n_TotalRecords list_name="pop_articles"/>)
-				</inp2:m_Capture>
-
-				<inp2:m_include template="in-news/elements/sorting.elm" list_name="pop_articles"/>
-
-				<inp2:m_include template="in-news/elements/articles.elm"/>
-				<table class="fullwidth item-listing table-border">
-					<inp2:n_ListArticles list_name="pop_articles" render_as="article_element" direction="H"/>
-				</table>
-
-				<inp2:m_include template="platform/elements/pagination.elm" prefix="n" list_name="pop_articles"/>
-			</inp2:m_RenderElement>
-			<!-- // popular articles -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/articles/pop_articles.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.9
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/articles/new_articles.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/articles/new_articles.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/articles/new_articles.tpl	(nonexistent)
@@ -1,66 +0,0 @@
-<!--##
-<NAME>New Articles</NAME>
-<DESC>List of New Articles</DESC>
-<SECTION>Platform||Articles</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_NewArticles"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/action_box.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/hot.elm" design="blue_box" data_exists="1"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/pop.elm" design="blue_box" data_exists="1"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/pick.elm" design="blue_box" data_exists="1"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_NewArticles" templates="in-news/articles/new_articles"/>
-		</div>
-		<div class="movable-element">
-			<!-- new articles -->
-			<inp2:m_RenderElement design="content_box" data_exists="1" block_no_data="no_articles">
-				<inp2:n_InitList list_name="new_articles" m_cat_id="0" recursive="1" types="new"/>
-
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_NewArticles"/> (<inp2:n_TotalRecords list_name="new_articles"/>)
-				</inp2:m_Capture>
-
-				<inp2:m_include template="in-news/elements/sorting.elm" list_name="new_articles"/>
-
-				<inp2:m_include template="in-news/elements/articles.elm"/>
-				<table class="fullwidth item-listing table-border">
-					<inp2:n_ListArticles list_name="new_articles" render_as="article_element" direction="H"/>
-				</table>
-
-				<inp2:m_include template="platform/elements/pagination.elm" prefix="n" list_name="new_articles"/>
-			</inp2:m_RenderElement>
-			<!-- // new articles -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/articles/new_articles.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.9
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/module_info.xml
===================================================================
--- branches/5.1.x/themes/advanced/in-news/module_info.xml	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/module_info.xml	(nonexistent)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<module_info>
-	<section_design_template>in-news/index</section_design_template>
-	<item_design_template>in-news/detail</item_design_template>
-</module_info>
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/module_info.xml
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.2
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/designs/section.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/designs/section.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/designs/section.tpl	(nonexistent)
@@ -1,117 +0,0 @@
-<!--##
-<NAME>Articles - Section Template</NAME>
-<DESC>Articles</DESC>
-<SECTION>Platform||Articles</SECTION>
-##-->
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_include template="platform/elements/title_bar.elm"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/action_box.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/pick.elm" design="blue_box" data_exists="1"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/new.elm" design="blue_box" data_exists="1"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/pop.elm" design="blue_box" data_exists="1"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/hot.elm" design="blue_box" data_exists="1"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<!--## MAIN CONTENT ##-->
-<inp2:m_DefineElement name="content">
-	<div class="movable-element">
-		<!--## INCLUDE NAVIGATION BAR ##-->
-		<inp2:m_include template="platform/elements/navigation_bar.elm"/>
-		<!--## //INCLUDE NAVIGATION BAR ##-->
-	</div>
-
-	<div class="movable-element">
-		<inp2:m_if check="n_IsModuleHome">
-			<inp2:m_include template="in-news/elements/content_boxes/site_lead_article.elm"/>
-		</inp2:m_if>
-	</div>
-
-	<div class="movable-element">
-		<inp2:m_include template="platform/elements/content_boxes/sub_categories.elm"/>
-	</div>
-
-	<div class="movable-element">
-		<!-- category lead articles -->
-		<inp2:m_RenderElement design="content_box" data_exists="1">
-			<inp2:n_InitList list_name="category_lead" types="cat_lead" per_page="-1"/>
-
-			<inp2:m_Capture to_var="header">
-				<inp2:m_phrase name="lu_title_CategoryLeadStory"/>
-			</inp2:m_Capture>
-
-			<table class="table-gradient-grey" width="100%">
-				<inp2:n_ListArticles list_name="category_lead" render_as="category_lead_article_element" no_table="1"/>
-			</table>
-		</inp2:m_RenderElement>
-		<!-- // category lead articles -->
-	</div>
-
-	<div class="movable-element">
-		<!-- articles in category -->
-		<inp2:m_RenderElement design="content_box" data_exists="1" block_no_data="no_articles">
-			<inp2:m_include template="in-news/elements/articles.elm"/>
-			<inp2:n_InitList list_name="items_in_current_cat" />
-
-			<inp2:m_Capture to_var="header">
-				<inp2:m_phrase name="lu_title_Articles"/> (<inp2:n_TotalRecords list_name="items_in_current_cat"/>)
-			</inp2:m_Capture>
-
-			<inp2:m_include template="in-news/elements/sorting.elm" list_name="items_in_current_cat"/>
-
-			<table class="fullwidth item-listing table-border">
-				<inp2:n_ListArticles list_name="items_in_current_cat" render_as="article_element" direction="H"/>
-			</table>
-
-			<inp2:m_include template="platform/elements/pagination.elm" prefix="n" list_name="items_in_current_cat"/>
-
-			<div align="left">
-				<a href="<inp2:c_CategoryLink template="in-news/elements/rss.xml" cat_id="current"/>"><inp2:m_Phrase name="lu_rss_feed"/></a>
-			</div>
-		</inp2:m_RenderElement>
-		<!-- // articles in category -->
-	</div>
-
-	<!--## LIST RELATED CATEGORIES ##-->
-	<!--##
-	<div class="movable-element">
-		<inp2:m_RenderElement design="content_box" related_to="Category" data_exists="1">
-			<inp2:m_Capture to_var="header">
-				<inp2:m_Phrase label="lu_title_RelatedCategories"/>
-			</inp2:m_Capture>
-
-			<inp2:m_include template="platform/elements/content_boxes/related_items.elm" related_to="$related_to" />
-		</inp2:m_RenderElement>
-	</div>
-	##-->
-	<!--## //LIST RELATED CATEGORIES ##-->
-</inp2:m_DefineElement>
-<!--## /MAIN CONTENT ##-->
-
-<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
-<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/designs/section.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.6
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/designs/.smsignore
===================================================================
--- branches/5.1.x/themes/advanced/in-news/designs/.smsignore	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/designs/.smsignore	(nonexistent)
@@ -1 +0,0 @@
-.*\.tpl
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/designs/.smsignore
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/elements/side_boxes/pop.elm.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/elements/side_boxes/pop.elm.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/elements/side_boxes/pop.elm.tpl	(nonexistent)
@@ -1,18 +0,0 @@
-<!-- popular links -->
-<inp2:n_InitList list_name="pop_articles" types="pop" parent_cat_id="0" recursive="1" per_page="short_list"/>
-
-<inp2:m_Capture to_var="header">
-	<a href="<inp2:m_Link template="in-news/articles/pop_articles" m_cat_id="0" m_cat_page="1" />"><inp2:m_phrase name="lu_title_PopArticles"/></a> (<inp2:n_TotalRecords list_name="pop_articles"/>)
-</inp2:m_Capture>
-
-<inp2:m_include template="in-news/elements/articles.elm"/>
-
-<inp2:m_DefineElement name="all_pop_articles">
-	<a href="<inp2:m_Link template="in-news/links/pop_articles" m_cat_id="0" m_cat_page="1" />"><inp2:m_Phrase label="lu_More" /></a>
-</inp2:m_DefineElement>
-
-<table width="100%" style="border-width: 0px;">
-	<inp2:n_ListArticles list_name="pop_articles" render_as="article_short_element" direction="H"/>
-</table>
-<inp2:n_MoreLink list_name="pop_articles" render_as="all_pop_articles"/>
-<!-- // popular links -->
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/elements/side_boxes/pop.elm.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.3
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/elements/side_boxes/new.elm.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/elements/side_boxes/new.elm.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/elements/side_boxes/new.elm.tpl	(nonexistent)
@@ -1,18 +0,0 @@
-<!-- popular links -->
-<inp2:n_InitList list_name="new_articles" types="new" parent_cat_id="0" recursive="1" per_page="short_list"/>
-
-<inp2:m_Capture to_var="header">
-	<a href="<inp2:m_Link template="in-news/articles/new_articles" m_cat_id="0" m_cat_page="1" />"><inp2:m_phrase name="lu_title_NewArticles"/></a> (<inp2:n_TotalRecords list_name="new_articles"/>)
-</inp2:m_Capture>
-
-<inp2:m_include template="in-news/elements/articles.elm"/>
-
-<inp2:m_DefineElement name="all_new_articles">
-	<a href="<inp2:m_Link template="in-news/articles/new_articles" m_cat_id="0" m_cat_page="1" />"><inp2:m_Phrase label="lu_More" /></a>
-</inp2:m_DefineElement>
-
-<table width="100%" style="border-width: 0px;">
-	<inp2:n_ListArticles list_name="new_articles" render_as="article_short_element" direction="H"/>
-</table>
-<inp2:n_MoreLink list_name="new_articles" render_as="all_new_articles"/>
-<!-- // popular links -->
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/elements/side_boxes/new.elm.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.3
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/elements/side_boxes/pick.elm.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/elements/side_boxes/pick.elm.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/elements/side_boxes/pick.elm.tpl	(nonexistent)
@@ -1,18 +0,0 @@
-<!-- popular links -->
-<inp2:n_InitList list_name="pick_articles" types="pick" parent_cat_id="0" recursive="1" per_page="short_list"/>
-
-<inp2:m_Capture to_var="header">
-	<a href="<inp2:m_Link template="in-news/articles/pick_articles" m_cat_id="0" m_cat_page="1" />"><inp2:m_phrase name="lu_title_PickArticles"/></a> (<inp2:n_TotalRecords list_name="pick_articles"/>)
-</inp2:m_Capture>
-
-<inp2:m_include template="in-news/elements/articles.elm"/>
-
-<inp2:m_DefineElement name="all_pick_articles">
-	<a href="<inp2:m_Link template="in-news/articles/pick_articles" m_cat_id="0" m_cat_page="1" />"><inp2:m_Phrase label="lu_More" /></a>
-</inp2:m_DefineElement>
-
-<table width="100%" style="border-width: 0px;">
-	<inp2:n_ListArticles list_name="pick_articles" render_as="article_short_element" direction="H"/>
-</table>
-<inp2:n_MoreLink list_name="pick_articles" render_as="all_pick_articles"/>
-<!-- // popular links -->
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/elements/side_boxes/pick.elm.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.3
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/elements/side_boxes/hot.elm.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/elements/side_boxes/hot.elm.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/elements/side_boxes/hot.elm.tpl	(nonexistent)
@@ -1,18 +0,0 @@
-<!-- popular links -->
-<inp2:n_InitList list_name="hot_articles" types="hot" parent_cat_id="0" recursive="1" per_page="short_list"/>
-
-<inp2:m_Capture to_var="header">
-	<a href="<inp2:m_Link template="in-news/articles/hot_articles" m_cat_id="0" m_cat_page="1" />"><inp2:m_phrase name="lu_title_HotArticles"/></a> (<inp2:n_TotalRecords list_name="hot_articles"/>)
-</inp2:m_Capture>
-
-<inp2:m_include template="in-news/elements/articles.elm"/>
-
-<inp2:m_DefineElement name="all_hot_articles">
-	<a href="<inp2:m_Link template="in-news/articles/hot_articles" m_cat_id="0" m_cat_page="1" />"><inp2:m_Phrase label="lu_More" /></a>
-</inp2:m_DefineElement>
-
-<table width="100%" style="border-width: 0px;">
-	<inp2:n_ListArticles list_name="hot_articles" render_as="article_short_element" direction="H"/>
-</table>
-<inp2:n_MoreLink list_name="hot_articles" render_as="all_hot_articles"/>
-<!-- // popular links -->
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/elements/side_boxes/hot.elm.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.3
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/elements/side_boxes/action_box.elm.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/elements/side_boxes/action_box.elm.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/elements/side_boxes/action_box.elm.tpl	(nonexistent)
@@ -1,42 +0,0 @@
-<inp2:m_Capture to_var="header">
-	<inp2:m_phrase name="lu_title_ActionBox"/>
-</inp2:m_Capture>
-
-<table width="100%" style="border-width: 0px;">
-	<inp2:m_RenderElement name="box_element" template="platform/categories/suggest_category" title="lu_SuggestCategory" prefix="n"/>
-	<inp2:m_RenderElement name="box_element" template="in-news/articles/suggest_article" title="lu_SuggestArticle" prefix="n"/>
-
-	<inp2:m_if check="m_Param" name="item_actions">
-		<tr>
-			<td>-</td>
-			<td>
-				<inp2:m_if check="n_IsFavorite">
-					<a href="<inp2:n_FavoriteToggleLink/>">
-						<inp2:m_phrase name="lu_btn_RemoveFromFavorites"/>
-					</a>
-				<inp2:m_else/>
-					<a href="<inp2:n_FavoriteToggleLink template="platform/my_account/my_favorites"/>">
-						<inp2:m_phrase name="lu_btn_AddToFavorites"/>
-					</a>
-				</inp2:m_if>
-			</td>
-		</tr>
-
-		<tr>
-			<td>-</td>
-			<td>
-				<a href="<inp2:n_ArticleLink template="in-news/articles/add_review"/>"><inp2:m_phrase name="lu_btn_ReviewThisArticle"/></a>
-			</td>
-		</tr>
-
-		<!--##
-		<tr>
-			<td>-</td>
-			<td>
-				<a href="<inp2:n_ArticleLink template="in-news/articles/rate"/>"><inp2:m_phrase name="lu_btn_RateThisArticle"/></a>
-			</td>
-		</tr>
-		##-->
-		
-	</inp2:m_if>
-</table>
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/elements/side_boxes/action_box.elm.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.2
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/elements/sorting.elm.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/elements/sorting.elm.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/elements/sorting.elm.tpl	(nonexistent)
@@ -1,41 +0,0 @@
-<table class="fullwidth">
-	<tr>
-		<td class="category-statistics">
-			<inp2:m_phrase name="lu_TotalArticles"/>: <inp2:n_ItemCount/>  &nbsp;|&nbsp;  <inp2:m_phrase name="lu_AddedToday"/>: <inp2:n_ItemCount today="1"/>
-		</td>
-		<td class="category-statistics" align="right">
-			<inp2:m_phrase name="lu_ArticlesUpdated"/>: <inp2:n_LastUpdated format="_regional_DateFormat"/>
-		</td>
-	</tr>
-</table>
-<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="4" alt="" /><br />
-<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" alt="" /><br />
-<br />
-
-<table class="fullwidth">
-	<tr>
-		<td align="right">
-			<form method="post" action="<inp2:m_FormAction />">
-				<inp2:m_Phrase label="lu_SortArticlesBy"/>:
-
-				<select name="<inp2:n_CombinedSortingDropDownName/>" class="input-select">
-					<option value="Title|asc" <inp2:n_SortingSelected sorting="Title|asc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_ArticleTitleAZ"/></option>
-					<option value="Title|desc" <inp2:n_SortingSelected sorting="Title|desc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_ArticleTitleZA"/></option>
-					<option value="CreatedOn|asc" <inp2:n_SortingSelected sorting="CreatedOn|asc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_RecentToOld"/></option>
-					<option value="CreatedOn|desc" <inp2:n_SortingSelected sorting="CreatedOn|desc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_OldToRecent"/></option>
-					<option value="Author|asc" <inp2:n_SortingSelected sorting="Author|asc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_AuthorAZ"/></option>
-					<option value="Author|desc" <inp2:n_SortingSelected sorting="Author|desc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_AuthorZA"/></option>
-					<option value="CachedRating|asc" <inp2:n_SortingSelected sorting="CachedRating|asc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_RatingLH"/></option>
-					<option value="CachedRating|desc" <inp2:n_SortingSelected sorting="CachedRating|desc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_RatingHL"/></option>
-					<option value="CachedVotesQty|asc" <inp2:n_SortingSelected sorting="CachedVotesQty|asc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_VotesLH"/></option>
-					<option value="CachedVotesQty|desc" <inp2:n_SortingSelected sorting="CachedVotesQty|desc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_VotesHL"/></option>
-					<option value="Hits|asc" <inp2:n_SortingSelected sorting="Hits|asc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_HitsLH"/></option>
-					<option value="Hits|desc" <inp2:n_SortingSelected sorting="Hits|desc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_HitsHL"/></option>
-				</select>
-				<input type="submit" class="button" name="<inp2:n_SubmitName event="OnSetSortingDirect"/>" value="<inp2:m_Phrase label="lu_btn_Sort" no_editing="1"/>" />
-			</form>
-		</td>
-	</tr>
-</table>
-
-<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="10" alt="" /><br />
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/elements/sorting.elm.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/elements/html_head.elm.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/elements/html_head.elm.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/elements/html_head.elm.tpl	(nonexistent)
@@ -1,3 +0,0 @@
-<link rel="stylesheet" rev="stylesheet" href="<inp2:m_TemplatesBase module="In-News"/>inc/styles.css" type="text/css" />
-<!--<script type="text/javascript" src="<inp2:m_TemplatesBase module="In-News"/>inc/script.js"></script>-->
-

Property changes on: branches/5.1.x/themes/advanced/in-news/elements/html_head.elm.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.2
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/elements/rss.xml.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/elements/rss.xml.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/elements/rss.xml.tpl	(nonexistent)
@@ -1,13 +0,0 @@
-<inp2:m_XMLTemplate xml_version="1.0"/>
-<rss version="2.0">
-	<channel>
-		<title><inp2:m_GetConfig name="Site_Name"/></title>
-		<link><inp2:c_CategoryLink template="in-news/designs/section"/></link>
-		<generator><inp2:m_GetConfig name="Site_Name"/></generator>
-		<managingEditor><inp2:m_GetConfig name="Smtp_AdminMailFrom"/></managingEditor>
-    	<webMaster><inp2:m_GetConfig name="Smtp_AdminMailFrom"/>m</webMaster>
-
-    	<inp2:m_include template="in-news/elements/articles.elm"/>
-		<inp2:n_PrintList render_as="article_rss_element" per_page="-1"/>
-	</channel>
-</rss>

Property changes on: branches/5.1.x/themes/advanced/in-news/elements/rss.xml.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.2
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/elements/articles.elm.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/elements/articles.elm.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/elements/articles.elm.tpl	(nonexistent)
@@ -1,302 +0,0 @@
-
-
-<inp2:m_DefineElement name="article_element">
-	<td>
-		<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /><br /></div>
-		<br />
-		<table>
-			<tr>
-				<td class="picture-padding">
-					<inp2:m_if check="m_Param" name="show_relevance">
-						<inp2:RelevanceIndicator on_color="Red" off_color="White" relevance_normal_render_as="search_relevance_normal" relevance_full_render_as="search_relevance_full" /><br/>
-					</inp2:m_if>
-					<a href="<inp2:ArticleLink template="__default__"/>" title="<inp2:Field name="Title" html_escape="1"/>"><inp2:Image render_as="image_element" Primary="1" DefaultImage="platform/img/no_picture.gif" MaxWidth="thumbnail" DefaultWidth="150"/></a>
-				</td>
-				<td class="text-padding" valign="top">
-					<a href="<inp2:ArticleLink template="__default__"/>" class="text-title"><inp2:Field name="Title"/></a>
-					<!--##(Owner: <inp2:Field name="CreatedById"/>) ##-->
-
-					<inp2:m_if check="Field" name="IsHot"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_hot.gif" alt="<inp2:m_Phrase name="lu_Hot" no_editing="1"/>"/></inp2:m_if>
-					<inp2:m_if check="Field" name="IsNew"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_new.gif" alt="<inp2:m_Phrase name="lu_New" no_editing="1"/>"/></inp2:m_if>
-					<inp2:m_if check="Field" name="IsPop"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_popular.gif" alt="<inp2:m_Phrase name="lu_Pop" no_editing="1"/>"/></inp2:m_if>
-					<inp2:m_if check="IsEditorsPick"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_pick.gif" alt="<inp2:m_Phrase name="lu_Pick" no_editing="1"/>"/></inp2:m_if>
-					<inp2:m_if check="IsFavorite"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_favorite.gif" alt="<inp2:m_Phrase name="lu_Favorite" no_editing="1"/>"/></inp2:m_if>
-					<inp2:VotesIndicator render_as="rating_element" no_editing="1"/>
-
-					<br />
-					<span class="item-statistics">
-						<inp2:m_phrase name="lu_Added"/>: <inp2:Field name="CreatedOn" format="_regional_DateFormat"/>,
-						<inp2:m_phrase name="lu_Hits"/>: <inp2:Field name="Hits"/>,
-						<inp2:m_phrase name="lu_Reviews"/>: <inp2:Field name="CachedReviewsQty"/>,
-						<inp2:m_phrase name="lu_Rating"/>: <inp2:Field name="CachedRating"/>,
-						<inp2:m_phrase name="lu_Votes"/>: <inp2:Field name="CachedVotesQty"/>
-					</span>
-
-					<br />
-
-					<inp2:m_if check="IsFavorite">
-						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_removefromfav.gif" width="11" height="10" alt="" /> <a class="item-action" href="<inp2:FavoriteToggleLink/>"><inp2:m_phrase name="lu_btn_RemoveFromFavorites"/></a>
-					<inp2:m_else/>
-						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_addtofav.gif" width="11" height="10" alt="" /> <a class="item-action" href="<inp2:FavoriteToggleLink template="platform/my_account/my_favorites"/>"><inp2:m_phrase name="lu_btn_AddToFavorites"/></a>
-					</inp2:m_if>
-
-					 &nbsp;|&nbsp;
-
-					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/reviews.gif" width="14" height="10" alt="" /> <a class="item-action" href="<inp2:ArticleLink template="in-news/articles/add_review"/>"><inp2:m_phrase name="lu_btn_AddReview"/></a>
-
-					<br /><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="4" alt="" /><br />
-
-					<inp2:m_if check="Field" name="Excerpt">
-						<br/><inp2:Field name="Excerpt" nl2br="1"/>
-					</inp2:m_if>
-				</td>
-			</tr>
-		</table>
-
-		<br />
-	</td>
-</inp2:m_DefineElement>
-
-<!--## RELATED ARTICLE ELEMENT ##-->
-<inp2:m_DefineElement name="related_article_element">
-	<tr>
-		<td width="25"><img src="<inp2:m_TemplatesBase module="In-News"/>img/articles_icon.gif" width="16" height="23" alt="" /></td>
-		<td><a href="<inp2:ArticleLink template="__default__"/>" class="text-title"><inp2:Field name="Title"/></a></td>
-	</tr>
-</inp2:m_DefineElement>
-<!--## // RELATED ARTICLE ELEMENT ##-->
-
-<inp2:m_DefineElement name="my_article_element">
-	<td>
-		<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /><br /></div>
-		<table class="fullwidth">
-			<tr>
-				<td class="article-picture-padding-lead">
-					<a href="<inp2:ArticleLink template="__default__"/>" title="<inp2:Field name="Title" html_escape="1"/>"><inp2:Image render_as="image_element" primary="1" thumbnail="1" DefaultImage="platform/img/no_picture.gif" MaxWidth="thumbnail" DefaultWidth="150"/></a><br />
-				</td>
-				<td class="text-padding" valign="top">
-					<a href="<inp2:ArticleLink template="__default__"/>"><inp2:Field name="Title"/></a> <inp2:m_if check="IsPending"><span class="pending-item"><strong><inp2:m_phrase name="lu_PendingItem"/></strong></span></inp2:m_if>
-
-					<inp2:m_if check="Field" name="IsHot"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_hot.gif" alt="<inp2:m_Phrase name="lu_Hot" no_editing="1"/>"/></inp2:m_if>
-					<inp2:m_if check="Field" name="IsNew"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_new.gif" alt="<inp2:m_Phrase name="lu_New" no_editing="1"/>"/></inp2:m_if>
-					<inp2:m_if check="Field" name="IsPop"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_popular.gif" alt="<inp2:m_Phrase name="lu_Pop" no_editing="1"/>"/></inp2:m_if>
-					<inp2:m_if check="IsEditorsPick"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_pick.gif" alt="<inp2:m_Phrase name="lu_Pick" no_editing="1"/>"/></inp2:m_if>
-					<inp2:m_if check="IsFavorite"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_favorite.gif" alt="<inp2:m_Phrase name="lu_Favorite" no_editing="1"/>"/></inp2:m_if>
-					<inp2:VotesIndicator render_as="rating_element" no_editing="1"/>
-
-					<br />
-
-					<strong><inp2:CategoryPath separator="&gt;" render_as="category_path_element"/></strong><br />
-
-					<inp2:m_if check="Field" name="Excerpt">
-						<br /><inp2:Field name="Excerpt" nl2br="1"/><br />
-					</inp2:m_if>
-					<br />
-
-					<span class="item-statistics">
-						<inp2:m_phrase name="lu_Added"/>: <inp2:Field name="CreatedOn" format="_regional_DateFormat"/>,
-						<inp2:m_phrase name="lu_Hits"/>: <inp2:Field name="Hits"/>,
-						<inp2:m_phrase name="lu_Reviews"/>: <inp2:Field name="CachedReviewsQty"/>,
-						<inp2:m_phrase name="lu_Rating"/>: <inp2:Field name="CachedRating"/>,
-						<inp2:m_phrase name="lu_Votes"/>: <inp2:Field name="CachedVotesQty"/>
-					</span>
-
-					<table>
-						<tr>
-							<td>
-								<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_details.gif" width="14" height="13" alt="" /> <a class="item-action" href="<inp2:ArticleLink template="__default__"/>"><inp2:m_phrase name="lu_btn_Details"/></a>
-							</td>
-
-							<inp2:m_if check="HasPermission" permissions="NEWS.MODIFY|NEWS.MODIFY.PENDING|NEWS.OWNER.MODIFY|NEWS.OWNER.MODIFY.PENDING">
-							<td>
-								 &nbsp;|&nbsp; <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_edit.gif" width="11" height="10" alt="" /> <a class="item-action" href="<inp2:ArticleLink template="in-news/articles/modify_article"/>"><inp2:m_phrase name="lu_btn_Modify"/></a>
-							</td>
-							</inp2:m_if>
-
-							<inp2:m_if check="HasPermission" permissions="NEWS.DELETE|NEWS.OWNER.DELETE">
-							<td>
-								 &nbsp;|&nbsp; <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_delete.gif" width="11" height="10" alt="" /> <a class="item-action" href="<inp2:ArticleLink n_event="OnDelete"/>" onclick="return confirm('<inp2:m_phrase name="lu_DeleteArticleConfirm" js_escape="1"/>');"><inp2:m_phrase name="lu_btn_Delete"/></a>
-							</td>
-							</inp2:m_if>
-						</tr>
-					</table>
-
-
-				</td>
-			</tr>
-		</table>
-	</td>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="site_lead_article_element">
-
-		<td>
-		<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt=""/><br /></div><br/>
-			<table class="fullwidth">
-				<tr>
-					<td class="articles-icon-cell" align="left" valign="top">
-						<img src="<inp2:m_TemplatesBase module="In-News"/>img/articles_icon.gif" width="22" height="18" alt="" /><br />
-					</td>
-					<td valign="top">
-						<a href="<inp2:ArticleLink template="__default__"/>"  class="text-title"><inp2:Field name="Title"/></a>
-
-						<inp2:m_if check="Field" name="IsHot"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_hot.gif" alt="<inp2:m_Phrase name="lu_Hot" no_editing="1"/>"/></inp2:m_if>
-						<inp2:m_if check="Field" name="IsNew"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_new.gif" alt="<inp2:m_Phrase name="lu_New" no_editing="1"/>"/></inp2:m_if>
-						<inp2:m_if check="Field" name="IsPop"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_popular.gif" alt="<inp2:m_Phrase name="lu_Pop" no_editing="1"/>"/></inp2:m_if>
-						<inp2:m_if check="IsEditorsPick"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_pick.gif" alt="<inp2:m_Phrase name="lu_Pick" no_editing="1"/>"/></inp2:m_if>
-						<inp2:m_if check="IsFavorite"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_favorite.gif" alt="<inp2:m_Phrase name="lu_Favorite" no_editing="1"/>"/></inp2:m_if>
-						<inp2:VotesIndicator render_as="rating_element" no_editing="1"/>
-
-						<div class="item-statistics">
-							(<inp2:m_phrase name="lu_Added"/>: <inp2:Field name="CreatedOn" format="_regional_DateFormat"/>,
-							<inp2:m_phrase name="lu_Hits"/>: <inp2:Field name="Hits"/>,
-							<inp2:m_phrase name="lu_Reviews"/>: <inp2:Field name="CachedReviewsQty"/>,
-							<inp2:m_phrase name="lu_Rating"/>: <inp2:Field name="CachedRating"/>,
-							<inp2:m_phrase name="lu_Votes"/>: <inp2:Field name="CachedVotesQty"/>)
-						</div>
-					</td>
-				</tr>
-			</table>
-			<br />
-			<table>
-				<tr>
-					<td class="lead-article-picture-padding">
-						<a href="<inp2:ArticleLink template="__default__"/>" title="<inp2:Field name="Title" html_escape="1"/>"><inp2:Image render_as="image_element" primary="1" DefaultImage="platform/img/no_picture.gif" MaxWidth="thumbnail"/></a>
-					</td>
-					<td valign="top" >
-						<inp2:Field name="Excerpt" nl2br="1"/>
-					</td>
-
-				</tr>
-			</table>
-
-			<br />
-		</td>
-
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="category_lead_article_element">
-	<!--##
-	<tr>
-		<td>
-			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt=""/></div>
-			<div class="category-lead-article"><inp2:m_Phrase label="lu_CategoryLeadStory"/></div>
-			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt=""/></div>
-		</td>
-	</tr>
-	##-->
-	<tr>
-		<td class="category-lead-article-padding">
-			<table style="width:auto">
-				<tr>
-					<td class="articles-icon-cell" align="left" valign="top">
-						<img src="<inp2:m_TemplatesBase module="In-News"/>img/articles_icon.gif" width="22" height="18" alt="" /><br />
-					</td>
-					<td valign="top">
-						<a href="<inp2:ArticleLink template="__default__"/>"  class="text-title"><inp2:Field name="Title"/></a>
-
-						<inp2:m_if check="Field" name="IsHot"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_hot.gif" alt="<inp2:m_Phrase name="lu_Hot" no_editing="1"/>"/></inp2:m_if>
-						<inp2:m_if check="Field" name="IsNew"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_new.gif" alt="<inp2:m_Phrase name="lu_New" no_editing="1"/>"/></inp2:m_if>
-						<inp2:m_if check="Field" name="IsPop"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_popular.gif" alt="<inp2:m_Phrase name="lu_Pop" no_editing="1"/>"/></inp2:m_if>
-						<inp2:m_if check="IsEditorsPick"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_pick.gif" alt="<inp2:m_Phrase name="lu_Pick" no_editing="1"/>"/></inp2:m_if>
-						<inp2:m_if check="IsFavorite"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_favorite.gif" alt="<inp2:m_Phrase name="lu_Favorite" no_editing="1"/>"/></inp2:m_if>
-						<inp2:VotesIndicator render_as="rating_element" no_editing="1"/>
-
-						<div class="item-statistics">
-							(<inp2:m_phrase name="lu_Added"/>: <inp2:Field name="CreatedOn" format="_regional_DateFormat"/>,
-							<inp2:m_phrase name="lu_Hits"/>: <inp2:Field name="Hits"/>,
-							<inp2:m_phrase name="lu_Reviews"/>: <inp2:Field name="CachedReviewsQty"/>,
-							<inp2:m_phrase name="lu_Rating"/>: <inp2:Field name="CachedRating"/>,
-							<inp2:m_phrase name="lu_Votes"/>: <inp2:Field name="CachedVotesQty"/>)
-						</div>
-					</td>
-				</tr>
-			</table>
-			<br />
-			<table>
-				<tr>
-					<td class="article-picture-padding">
-						<a href="<inp2:ArticleLink template="__default__"/>" title="<inp2:Field name="Title" html_escape="1"/>"><inp2:Image render_as="image_element" primary="1" DefaultImage="platform/img/no_picture.gif" MaxWidth="thumbnail"/></a>
-					</td>
-					<td valign="top" >
-						<inp2:Field name="Excerpt" nl2br="1"/>
-					</td>
-				</tr>
-			</table>
-
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="article_short_element">
-	<td>
-		<a href="<inp2:ArticleLink template="__default__"/>"><inp2:Field name="Title"/></a>
-	</td>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="no_articles">
-	<inp2:m_phrase name="lu_NoArticles"/>
-</inp2:m_DefineElement>
-
-<!--## ARTICLE RSS ELEMENT ##-->
-<inp2:m_DefineElement name="article_rss_element">
-<item>
-	<title><inp2:Field name="Title" html_escape="1"/></title>
-	<link><inp2:ArticleLink template="__default__"/></link>
-	<description><inp2:Field name="Body" html_escape="1"/></description>
-</item>
-</inp2:m_DefineElement>
-<!--## /ARTICLE RSS ELEMENT ##-->
-
-
-<inp2:m_DefineElement name="article_element_search">
-	<td>
-		<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /><br /></div>
-		<br />
-		<table>
-			<tr>
-				<td class="picture-padding">
-					<inp2:m_if check="m_Param" name="show_relevance">
-						<inp2:RelevanceIndicator on_color="Red" off_color="White" relevance_normal_render_as="search_relevance_normal" relevance_full_render_as="search_relevance_full" /><br/>
-					</inp2:m_if>
-					<a href="<inp2:ArticleLink template="__default__"/>" title="<inp2:Field name="Title" html_escape="1"/>"><inp2:Image render_as="image_element" Primary="1" DefaultImage="platform/img/no_picture.gif" MaxWidth="thumbnail" DefaultWidth="150"/></a>
-				</td>
-				<td class="text-padding" valign="top">
-					<a href="<inp2:ArticleLink template="__default__"/>" class="text-title"><inp2:Field name="Title"/></a>
-					<!--##(Owner: <inp2:Field name="CreatedById"/>) ##-->
-
-					<inp2:m_if check="Field" name="IsHot"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_hot.gif" alt="<inp2:m_Phrase name="lu_Hot" no_editing="1"/>"/></inp2:m_if>
-					<inp2:m_if check="Field" name="IsNew"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_new.gif" alt="<inp2:m_Phrase name="lu_New" no_editing="1"/>"/></inp2:m_if>
-					<inp2:m_if check="Field" name="IsPop"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_popular.gif" alt="<inp2:m_Phrase name="lu_Pop" no_editing="1"/>"/></inp2:m_if>
-					<inp2:m_if check="IsEditorsPick"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_pick.gif" alt="<inp2:m_Phrase name="lu_Pick" no_editing="1"/>"/></inp2:m_if>
-					<inp2:m_if check="IsFavorite"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_favorite.gif" alt="<inp2:m_Phrase name="lu_Favorite" no_editing="1"/>"/></inp2:m_if>
-					<inp2:VotesIndicator render_as="rating_element" no_editing="1"/>
-
-					<br />
-					<span class="item-statistics">
-						<inp2:m_phrase name="lu_Added"/>: <inp2:Field name="CreatedOn" format="_regional_DateFormat"/>,
-						<inp2:m_phrase name="lu_Hits"/>: <inp2:Field name="Hits"/>,
-						<inp2:m_phrase name="lu_Reviews"/>: <inp2:Field name="CachedReviewsQty"/>,
-						<inp2:m_phrase name="lu_Rating"/>: <inp2:Field name="CachedRating"/>,
-						<inp2:m_phrase name="lu_Votes"/>: <inp2:Field name="CachedVotesQty"/>
-					</span>
-
-					<br />
-
-					<inp2:m_if check="IsFavorite">
-						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_removefromfav.gif" width="11" height="10" alt="" /> <a class="item-action" href="<inp2:FavoriteToggleLink/>"><inp2:m_phrase name="lu_btn_RemoveFromFavorites"/></a>
-					<inp2:m_else/>
-						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_addtofav.gif" width="11" height="10" alt="" /> <a class="item-action" href="<inp2:FavoriteToggleLink template="platform/my_account/my_favorites"/>"><inp2:m_phrase name="lu_btn_AddToFavorites"/></a>
-					</inp2:m_if>
-
-					 &nbsp;|&nbsp;
-
-					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/reviews.gif" width="14" height="10" alt="" /> <a class="item-action" href="<inp2:ArticleLink template="in-news/articles/add_review"/>"><inp2:m_phrase name="lu_btn_AddReview"/></a>
-
-				</td>
-			</tr>
-		</table>
-
-		<br />
-	</td>
-</inp2:m_DefineElement>
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/elements/articles.elm.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.2
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/elements/content_boxes/related_items.elm.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/elements/content_boxes/related_items.elm.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/elements/content_boxes/related_items.elm.tpl	(nonexistent)
@@ -1,6 +0,0 @@
-<!--## RELATED ARTICLES ##-->
-	<inp2:m_include template="in-news/elements/articles.elm"/>	
-	<table>
-		<inp2:n_PrintList2 render_as="related_article_element" types="related" related_to="$related_to" parent_cat_id="any" no_table="1"/>
-	</table> 
-<!--## // RELATED ARTICLES ##-->
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/elements/content_boxes/related_items.elm.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.3
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/elements/content_boxes/site_lead_article.elm.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/elements/content_boxes/site_lead_article.elm.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/elements/content_boxes/site_lead_article.elm.tpl	(nonexistent)
@@ -1,15 +0,0 @@
-<inp2:m_include template="in-news/elements/articles.elm"/>
-
-<inp2:m_RenderElement design="content_box" data_exists="1">
-	<inp2:n_InitList list_name="site_lead" types="site_lead" parent_cat_id="0" per_page="1" recursive="1"/>
-
-	<inp2:m_Capture to_var="header">
-		<inp2:m_phrase name="lu_title_SiteLeadStory"/>
-	</inp2:m_Capture>
-
-	<inp2:m_include template="in-news/elements/articles.elm"/>
-
-	<table class="fullwidth item-listing-lead table-border" >
-		<inp2:n_ListArticles list_name="site_lead" render_as="site_lead_article_element" no_table="0"/>
-	</table>
-</inp2:m_RenderElement>
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/elements/content_boxes/site_lead_article.elm.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.2
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/elements/content_boxes/my_favorites.elm.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/elements/content_boxes/my_favorites.elm.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/elements/content_boxes/my_favorites.elm.tpl	(nonexistent)
@@ -1,22 +0,0 @@
-<!-- favorite articles -->
-<inp2:m_RenderElement design="content_box" data_exists="1">
-	<inp2:n_InitList list_name="favorite_articles" types="favorites" parent_cat_id="0" recursive="1"/>
-
-	<inp2:m_Capture to_var="header">
-		<inp2:m_phrase name="lu_title_FavoriteArticles"/> (<inp2:n_TotalRecords list_name="favorite_articles"/>)
-	</inp2:m_Capture>
-
-	<inp2:m_include template="in-news/elements/articles.elm"/>
-
-	<table class="fullwidth item-listing">
-		<inp2:n_ListArticles list_name="favorite_articles" render_as="article_element" direction="H"/>
-	</table>
-
-	<inp2:m_if check="n_TotalRecords" list_name="favorite_articles">
-		<inp2:m_Set favorites_found="1"/>
-	</inp2:m_if>
-
-	<inp2:m_include template="platform/elements/pagination.elm" prefix="n" list_name="favorite_articles"/>
-</inp2:m_RenderElement>
-
-<!-- // favorite articles -->
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/elements/content_boxes/my_favorites.elm.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.3
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/elements/content_boxes/search_results.elm.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/elements/content_boxes/search_results.elm.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/elements/content_boxes/search_results.elm.tpl	(nonexistent)
@@ -1,26 +0,0 @@
-<inp2:m_RenderElement design="content_box" data_exists="1">
-	<inp2:n_InitList list_name="article_search_results" types="search" parent_cat_id="any" recursive="1" per_page="short_list"/>
-
-	<inp2:m_Capture to_var="header">
-			<inp2:m_phrase name="lu_title_ArticleSearchResults"/> (<inp2:n_TotalRecords list_name="article_search_results" />)
-	</inp2:m_Capture>
-
-	<inp2:m_include template="in-news/elements/articles.elm"/>
-	<inp2:m_include template="platform/elements/search_results.elm"/>
-
-	<table class="fullwidth item-listing">
-		<inp2:n_ListArticles list_name="article_search_results" render_as="article_element_search" show_relevance="1"/>
-	</table>
-
-	<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /><br /></div>
-
-	<inp2:m_if check="n_TotalRecords" list_name="article_search_results">
-		<inp2:m_Set items_found="1"/>
-	</inp2:m_if>
-
-	<inp2:m_DefineElement name="more_link">
-		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="5" alt="" /><br />
-		<a href="<inp2:m_Link template="in-news/articles/search_results" />"><inp2:m_Phrase label="lu_More"/>...</a>
-	</inp2:m_DefineElement>
-	<inp2:n_MoreLink list_name="article_search_results" render_as="more_link"/>
-</inp2:m_RenderElement>
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/elements/content_boxes/search_results.elm.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.5
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/elements/content_boxes/home_page_items.elm.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/elements/content_boxes/home_page_items.elm.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/elements/content_boxes/home_page_items.elm.tpl	(nonexistent)
@@ -1 +0,0 @@
-<inp2:m_include template="in-news/elements/content_boxes/site_lead_article.elm"/>

Property changes on: branches/5.1.x/themes/advanced/in-news/elements/content_boxes/home_page_items.elm.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.3
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/elements/.smsignore
===================================================================
--- branches/5.1.x/themes/advanced/in-news/elements/.smsignore	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/elements/.smsignore	(nonexistent)
@@ -1 +0,0 @@
-.*\.xml\.tpl
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/elements/.smsignore
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/my_account/my_items.elm.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/my_account/my_items.elm.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/my_account/my_items.elm.tpl	(nonexistent)
@@ -1,9 +0,0 @@
-<inp2:m_if check="m_ParamEquals" name="section" value="2">
-	<inp2:m_if check="m_ParamEquals" name="place" value="sidebox">
-		<inp2:m_RenderElement name="box_element" template="in-news/my_account/my_articles" title="lu_MyArticles"/>
-	</inp2:m_if>
-
-	<inp2:m_if check="m_ParamEquals" name="place" value="contentbox">
-		<inp2:m_RenderElement name="my_account_element" template="in-news/my_account/my_articles" title="lu_MyArticles" description="lu_description_MyArticles"  icon_image="in-news/img/ic_myarticles46.gif"/>
-	</inp2:m_if>
-</inp2:m_if>
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/my_account/my_items.elm.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.2
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/my_account/my_articles.tpl
===================================================================
--- branches/5.1.x/themes/advanced/in-news/my_account/my_articles.tpl	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/my_account/my_articles.tpl	(nonexistent)
@@ -1,58 +0,0 @@
-<!--##
-<NAME>User's Articles</NAME>
-<DESC>List of User's Articles</DESC>
-<SECTION>My Account</SECTION>
-##-->
-
-<inp2:m_RequireLogin login_template="platform/login/register"/>
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_MyArticles"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/action_box.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyArticles" templates="platform/my_account/my_account,in-news/my_account/my_articles"/>
-		</div>
-		<div class="movable-element">
-			<!-- my articles -->
-			<inp2:m_RenderElement design="content_box" data_exists="1" block_no_data="no_articles">
-				<inp2:n_InitList list_name="my_articles" types="my_items" parent_cat_id="0" recursive="1"/>
-
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_MyArticles"/> (<inp2:n_TotalRecords list_name="my_articles"/>)
-				</inp2:m_Capture>
-
-				<inp2:m_include template="in-news/elements/sorting.elm" list_name="my_articles"/>
-
-				<inp2:m_include template="in-news/elements/articles.elm"/>
-				<table class="item-listing fullwidth">
-					<inp2:n_ListArticles list_name="my_articles" render_as="my_article_element" direction="H"/>
-				</table>
-
-				<inp2:m_include template="platform/elements/pagination.elm" prefix="n" list_name="my_articles"/>
-			</inp2:m_RenderElement>
-			<!-- // my articles -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/my_account/my_articles.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.10
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/inc/styles.css
===================================================================
--- branches/5.1.x/themes/advanced/in-news/inc/styles.css	(revision 13095)
+++ branches/5.1.x/themes/advanced/in-news/inc/styles.css	(nonexistent)
@@ -1,39 +0,0 @@
-.article-picture-padding {
-	padding: 20px 5px 20px 20px;
-	width: 120px;
-	vertical-align: top;
-}
-
-.lead-article-picture-padding {
-	padding: 0px 20px 0px 30px;
-	width: 120px;
-	vertical-align: top;
-}
-
-.articles-icon-cell
-	{
-	width:22px;
-	padding: 5px 5px 5px 5px;
-	}
-
-/* --- Category Lead Story & Site Lead Story Styles --- */
-.category-lead-article, .site-lead-article {
-	text-align: right;
-	padding: 1px 4px;
-	margin: 1px 0px;
-	font-size: 10px;
-}
-
-.category-lead-article {
-	background-color: #EBEBEB;
-	color: #666666;
-}
-
-.site-lead-article {
-	background-color: #FFC2C2;
-	color: #165A9B;
-}
-
-.category-lead-article-padding, .site-lead-article-padding {
-	padding: 8px;
-}
\ No newline at end of file

Property changes on: branches/5.1.x/themes/advanced/in-news/inc/styles.css
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/img/articles_icon.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/themes/advanced/in-news/img/articles_icon.gif
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/img/menu_articles.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/themes/advanced/in-news/img/menu_articles.gif
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/themes/advanced/in-news/img/ic_myarticles46.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/themes/advanced/in-news/img/ic_myarticles46.gif
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/units/articles/articles_config.php
===================================================================
--- branches/5.1.x/units/articles/articles_config.php	(nonexistent)
+++ branches/5.1.x/units/articles/articles_config.php	(revision 13096)
@@ -0,0 +1,477 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-News
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license      GNU/GPL
+* In-Portal is Open Source software.
+* This means that this software may have been modified pursuant
+* the GNU General Public License, and as distributed it includes
+* or is derivative of works licensed under the GNU General Public License
+* or other free or open source software licenses.
+* See http://www.in-portal.org/license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	$config =	Array(
+					'Prefix'			=>	'n',
+
+					'ItemClass'			=>	Array('class' => 'kCatDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+					'ListClass'			=>	Array('class' => 'kCatDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+					'EventHandlerClass'	=>	Array('class' => 'ArticlesEventHandler', 'file' => 'articles_event_handler.php', 'require_classes' => Array('kCatDBEventHandler'), 'build_event' => 'OnBuild'),
+					'TagProcessorClass' =>	Array('class' => 'ArticlesTagProcessor', 'file' => 'articles_tag_processor.php', 'require_classes' => Array('kCatDBTagProcessor'), 'build_event' => 'OnBuild'),
+					'AutoLoad'			=>	true,
+
+					'ConfigPriority' => 0,
+
+					'RewritePriority' => 102,
+					'RewriteListener' => 'ModRewriteHelper:CategoryItemRewriteListener',
+
+					'Hooks' => Array (
+						Array (
+							'Mode' => hAFTER,
+							'Conditional' => false,
+							'HookToPrefix' => 'c',
+							'HookToSpecial' => '*',
+							'HookToEvent' => Array('OnAfterConfigRead'),
+							'DoPrefix' => '',
+							'DoSpecial' => '',
+							'DoEvent' => 'OnUpdateCategoryCustomFields',
+						),
+
+						Array (
+							'Mode' => hBEFORE,
+							'Conditional' => false,
+							'HookToPrefix' => '',
+							'HookToSpecial' => '*',
+							'HookToEvent' => Array('OnAfterConfigRead'),
+							'DoPrefix' => '#file',
+							'DoSpecial' => '*',
+							'DoEvent' => 'OnDefineFiles',
+						),
+
+						Array (
+							'Mode' => hBEFORE,
+							'Conditional' => false,
+							'HookToPrefix' => '',
+							'HookToSpecial' => '*',
+							'HookToEvent' => Array('OnAfterConfigRead'),
+							'DoPrefix' => 'cdata',
+							'DoSpecial' => '*',
+							'DoEvent' => 'OnDefineCustomFields',
+						),
+					),
+
+					'CatalogItem' 			=>	true,
+					'AdminTemplatePath'		=>	'articles',
+					'AdminTemplatePrefix'	=>	'articles_',
+					'SearchConfigPostfix' 	=>	'articles',
+
+					'QueryString'		=>	Array(
+												1	=>	'id',
+												2	=>	'Page',
+												3	=>	'event',
+												4	=>	'mode',
+											),
+
+					'RegularEvents'		=>	Array(
+													'rss_category_update' =>	Array('EventName' => 'OnUpdateRSSAtricles', 'RunInterval' => 0, 'Type' => reBEFORE),
+											),
+
+					'IDField'			=>	'NewsId',
+ 					'StatusField'		=>	Array('Status'),	// field, that is affected by Approve/Decline events
+
+					'TitleField'		=>	'Title',		// field, used in bluebar when editing existing item
+					'TitlePhrase'		=>	'la_Text_Article',	// phrase used to specify item type in relationship list
+
+					'TitlePresets'		=>	Array(
+	   												'default'	=>	Array(	'new_status_labels'		=> Array('n' => '!la_title_AddingArticle!'),
+																			'edit_status_labels'	=> Array('n' => '!la_title_EditingArticle!'),
+																			'new_titlefield'		=> Array('n' => '!la_title_NewArticle!'),
+																	),
+
+													'articles_edit' => Array('prefixes' => Array('n'), 'format' => "#n_status# '#n_titlefield#' - !la_title_General!"),
+
+													'articles_categories'=>Array('prefixes' => Array('n','n-ci_List'), 'format' => "#n_status# '#n_titlefield#' - !la_title_Categories!"),
+													'articles_relations'=>	Array('prefixes' => Array('n'), 'format' => "#n_status# '#n_titlefield#' - !la_title_Relations!"),
+													'articles_images'	=>	Array('prefixes' => Array('n'), 'format' => "#n_status# '#n_titlefield#' - !la_title_Images!"),
+													'articles_files'	=>	Array('prefixes' => Array('n'), 'format' => "#n_status# '#n_titlefield#' - !la_title_Files!"),
+													'articles_reviews'	=>	Array('prefixes' => Array('n'), 'format' => "#n_status# '#n_titlefield#' - !la_title_Reviews!"),
+													'articles_custom'	=>	Array('prefixes' => Array('n'), 'format' => "#n_status# '#n_titlefield#' - !la_title_Custom!"),
+
+													'images_edit'		=>	Array(	'prefixes'				=>	Array('n', 'n-img'),
+																					'new_status_labels'		=>	Array('n-img'=>'!la_title_Adding_Image!'),
+																					'edit_status_labels'	=>	Array('n-img'=>'!la_title_Editing_Image!'),
+																					'new_titlefield'		=>	Array('n-img'=>'!la_title_New_Image!'),
+																					'format'				=>	"#n_status# '#n_titlefield#' - #n-img_status# '#n-img_titlefield#'",
+																			),
+													'file_edit' => Array (
+														'prefixes' => Array ('n', 'n-file'),
+														'new_status_labels' => Array ('n-file' => "!la_title_AddingFile!"),
+														'edit_status_labels' => Array ('n-file' => '!la_title_EditingFile!'),
+														'new_titlefield' => Array ('n-file' => '!la_title_NewFile!'),
+														'format' => "#n_status# '#n_titlefield#' - #n-file_status# '#n-file_titlefield#'",
+														),
+
+													'reviews_edit'	=>	Array(		'prefixes'				=>	Array('n', 'n-rev'),
+																					'new_status_labels'		=>	Array('n-rev'=>"!la_title_Adding_Review! '!la_title_New_Review!'"),
+																					'edit_status_labels'	=>	Array('n-rev'=>'!la_title_Editing_Review!'),
+																					'format'				=>	"#n_status# '#n_titlefield#' - #n-rev_status#",
+																			),
+
+													'relations_edit'	=>	Array(	'prefixes'				=>	Array('n', 'n-rel'),
+																					'new_status_labels'		=>	Array('n-rel'=>"!la_title_Adding_Relationship! '!la_title_New_Relationship!'"),
+																					'edit_status_labels'	=>	Array('n-rel'=>'!la_title_Editing_Relationship!'),
+																					'format'				=>	"#n_status# '#n_titlefield#' - #n-rel_status#",
+																			),
+
+	   												'tree_in-news'	=>	Array('format' => '!la_Text_Version! '.$this->Application->findModule('Name', 'In-News', 'Version')),
+
+													'articles_export' => Array('format' => '!la_title_ArticlesExport!'),
+
+													'articles_import' => Array('format' => '!la_title_ImportArticles!'),
+   											),
+
+   					'EditTabPresets' => Array (
+   						'Default' => Array (
+   							Array ('title' => 'la_tab_General', 't' => 'in-news/articles/articles_edit', 'priority' => 1),
+   							Array ('title' => 'la_tab_Categories', 't' => 'in-news/articles/articles_categories', 'priority' => 2),
+   							Array ('title' => 'la_tab_Relations', 't' => 'in-news/articles/articles_relations', 'priority' => 3),
+   							Array ('title' => 'la_tab_Images', 't' => 'in-news/articles/articles_images', 'priority' => 4),
+   							Array ('title' => 'la_tab_Files', 't' => 'in-news/articles/articles_files', 'priority' => 5),
+   							Array ('title' => 'la_tab_Reviews', 't' => 'in-news/articles/articles_reviews', 'priority' => 6),
+   							Array ('title' => 'la_tab_Custom', 't' => 'in-news/articles/articles_custom', 'priority' => 7),
+   						),
+   					),
+
+   					'PermItemPrefix'	=>	'NEWS',
+
+   					'PermTabText'		=>	'In-News',
+   					'PermSection'		=>	Array('main' => 'CATEGORY:in-news:articles_list', 'search' => 'in-news:configuration_search', 'email' => 'in-news:configuration_email', 'custom' => 'in-news:configuration_custom'),
+
+					'Sections'			=>	Array(
+						/*'in-news'	=>	Array(
+							'parent'		=>	'in-portal:root',
+							'icon'			=>	'settings_in-newz',
+							'label'			=>	'la_title_In-News',
+							'url'			=>	Array('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
+							'permissions'	=>	Array('view'),
+							'priority'		=>	3.2,
+							'container'		=>	true,
+							'type'			=>	stTREE,
+						),*/
+
+						'in-news:articles'	=>	Array(
+							'parent'		=>	'in-portal:site',
+							'icon'			=>	'articles',
+							'label'			=>	'la_tab_Articles',
+							'url'			=>	Array('t' => 'catalog/advanced_view', 'anchor' => 'tab-n.showall', 'pass' => 'm'),
+							'onclick'		=>	'setCatalogTab(\'n.showall\')',
+							'permissions'	=>	Array('view'),
+							'priority'		=>	3.3,
+							'type'			=>	stTREE,
+						),
+
+						// article settings
+						'in-news:setting_folder' => Array (
+							'parent'		=>	'in-portal:system',
+							'icon'			=>	'conf_news',
+							'label'			=>	'la_title_In-News',
+							'use_parent_header' => 1,
+							'url'			=>	Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
+							'permissions'	=>	Array ('view'),
+							'priority'		=>	3.4,
+							'container'		=>	true,
+							'type'			=>	stTREE,
+						),
+
+						/*'in-news:innews_general'	=>	Array(
+							'parent'		=>	'in-news:setting_folder',
+							'icon'			=>	'core:settings_general',
+							'label'			=>	'la_tab_GeneralSettings',
+							'url'			=>	Array('t' => 'config/config_general', 'pass_section' => true, 'pass' => 'm'),
+							'permissions'	=>	Array('view', 'edit'),
+							'priority'		=>	0.9,
+							'type'			=>	stTREE,
+						),*/
+
+						'in-news:configuration_output'	=>	Array(
+							'parent'		=>	'in-news:setting_folder',
+							'icon'			=>	'core:conf_output',
+							'label'			=>	'la_tab_ConfigOutput',
+							'url'			=>	Array('t' => 'config/config_general', 'pass_section' => true, 'pass' => 'm'),
+							'permissions'	=>	Array('view', 'edit'),
+							'priority'		=>	1,
+							'type'			=>	stTREE,
+						),
+
+						'in-news:configuration_search'	=>	Array(
+							'parent'		=>	'in-news:setting_folder',
+							'icon'			=>	'core:conf_search',
+							'label'			=>	'la_tab_ConfigSearch',
+							'url'			=>	Array('t' => 'config/config_search', 'module_key' => 'articles', 'pass_section' => true, 'pass' => 'm'),
+							'permissions'	=>	Array('view', 'edit'),
+							'priority'		=>	2,
+							'type'			=>	stTREE,
+						),
+
+						'in-news:configuration_email'	=>	Array(
+							'parent'		=>	'in-news:setting_folder',
+							'icon'			=>	'core:conf_email',
+							'label'			=>	'la_tab_ConfigE-mail',
+							'url'			=>	Array('t' => 'config/config_email', 'pass_section' => true, 'pass' => 'm'),
+							'permissions'	=>	Array('view', 'edit'),
+							'priority'		=>	3,
+							'type'			=>	stTREE,
+						),
+
+						'in-news:configuration_custom'	=>	Array(
+							'parent'		=>	'in-news:setting_folder',
+							'icon'			=>	'core:conf_customfields',
+							'label'			=>	'la_tab_ConfigCustom',
+							'url'			=>	Array('t' => 'custom_fields/custom_fields_list', 'cf_type' => 2, 'pass_section' => true, 'pass' => 'm,cf'),
+							'permissions'	=>	Array('view', 'add', 'edit', 'delete'),
+							'priority'		=>	4,
+							'type'			=>	stTREE,
+						),
+
+					),
+
+					'FilterMenu'		=>	Array(
+												'Groups' => Array(
+													Array('mode' => 'AND', 'filters' => Array('show_active','show_pending','show_disabled'), 'type' => WHERE_FILTER),
+													Array('mode' => 'AND', 'filters' => Array('show_new'), 'type' => HAVING_FILTER),
+													Array('mode' => 'AND', 'filters' => Array('show_hot'), 'type' => HAVING_FILTER),
+													Array('mode' => 'AND', 'filters' => Array('show_pop'), 'type' => HAVING_FILTER),
+													Array('mode' => 'AND', 'filters' => Array('show_pick'), 'type' => WHERE_FILTER),
+												),
+												'Filters' => Array(
+													'show_active'	=>	Array('label' =>'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ),
+													'show_pending'	=>	Array('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2'  ),
+													'show_disabled'	=>	Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0'  ),
+													's1'	=>	Array(),
+													'show_new'	=>	Array('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1'  ),
+													'show_hot'	=>	Array('label' => 'la_Text_Hot', 'on_sql' => '', 'off_sql' => '`IsHot` != 1'  ),
+													'show_pop'	=>	Array('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1'  ),
+													'show_pick'	=>	Array('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1'  ),
+												)
+											),
+
+					'CatalogSelectorName'	=>	'newslist',
+
+					'ItemPropertyMappings'	=>	Array(
+														'NewDays'		=>	'News_CatNewDays',	// number of days item to be NEW
+														'MinPopVotes'	=>	'News_MinPopVotes',	// minimum number of votes for an item to be POP
+														'MinPopRating'	=>	'News_MinPopRating',// minimum rating for an item to be POP
+														'MaxHotNumber'	=>	'News_MaxHotNumber',// maximum number of HOT items
+
+														'HotLimit'		=>	'News_HotLimit',	// variable name in inp_Cache table
+														'ClickField'	=>	'Hits',				// item click count is stored here (in item table)
+												),
+
+					'ItemType'			=>	2,	// this is used when relation to product is added from in-portal and via-versa
+
+					'ViewMenuPhrase'	=>	'la_title_Articles',
+					'CatalogTabIcon' => 'in-news:icon16_articles.png',
+					'UsePendingEditing'	=>	true, // item editing is controlled by NEWS.ADD/EDIT, NEWS.ADD/EDIT.PENDING permissions
+
+					'StatisticsInfo'	=>	Array(
+													'pending'	=>	Array(
+																			'icon'		=>	'icon16_article_pending.gif',
+																			'label'		=>	'la_Text_Articles',
+																			'js_url' 	=>	'#url#',
+																			'url'		=>	Array('t' => 'catalog/advanced_view', 'SetTab' => 'n', 'pass' => 'm,n.showall', 'n.showall_event' => 'OnSetFilterPattern', 'n.showall_filters' => 'show_active=0,show_pending=1,show_disabled=0,show_new=1,show_hot=1,show_pop=1,show_pick=1'),
+																			'status'	=>	STATUS_PENDING,
+																	),
+											),
+
+					'TableName'			=>	TABLE_PREFIX.'News',
+
+					'CalculatedFields' => Array(
+						'' => Array (
+							'UserName'		=>	'IF (ISNULL(u.Login), IF (%1$s.CreatedById = -1, "root", IF (%1$s.CreatedById = -2, "Guest", "n/a")), u.Login)',
+							'CategoryId'	=>	TABLE_PREFIX.'%3$sCategoryItems.CategoryId',
+							'Filename' => TABLE_PREFIX.'%3$sCategoryItems.Filename',
+							'CategoryFilename' => TABLE_PREFIX.'Category.NamedParentPath',
+							'PrimaryCat'	=> TABLE_PREFIX.'%3$sCategoryItems.PrimaryCat',
+							'ParentPath' => TABLE_PREFIX.'Category.ParentPath',
+
+							'SameImages'	=>	'img.SameImages',
+							'LocalThumb'	=>	'img.LocalThumb',
+							'ThumbPath'		=>	'img.ThumbPath',
+							'ThumbUrl'		=>	'img.ThumbUrl',
+							'LocalImage'	=>	'img.LocalImage',
+							'LocalPath'		=>	'img.LocalPath',
+							'FullUrl'		=>	'img.Url',
+						),
+					),
+
+					'CacheModRewrite' => true,
+
+					'ListSQLs'			=>	Array(	''=>'	SELECT %1$s.* %2$s
+															FROM %1$s
+															LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryItems ON '.TABLE_PREFIX.'%3$sCategoryItems.ItemResourceId = %1$s.ResourceId
+															LEFT JOIN '.TABLE_PREFIX.'Category ON '.TABLE_PREFIX.'Category.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
+															LEFT JOIN '.TABLE_PREFIX.'Images img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
+															LEFT JOIN '.TABLE_PREFIX.'PermCache perm ON perm.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
+															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.CreatedById = u.PortalUserId
+															LEFT JOIN '.TABLE_PREFIX.'%3$sNewsCustomData cust ON %1$s.ResourceId = cust.ResourceId',
+											), // key - special, value - list select sql
+
+					'ListSortings'	=> 	Array(
+												'' => Array(
+															'ForcedSorting' => Array('Priority' => 'desc'),
+															'Sorting' => Array('Title' => 'asc'),
+														)
+										),
+					'ItemSQLs'			=>	Array(	''=>'	SELECT %1$s.* %2$s
+															FROM %1$s
+															LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryItems ON '.TABLE_PREFIX.'%3$sCategoryItems.ItemResourceId = %1$s.ResourceId
+															LEFT JOIN '.TABLE_PREFIX.'Category ON '.TABLE_PREFIX.'Category.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
+															LEFT JOIN '.TABLE_PREFIX.'Images img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
+															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.CreatedById = u.PortalUserId
+															LEFT JOIN '.TABLE_PREFIX.'%3$sNewsCustomData cust ON %1$s.ResourceId = cust.ResourceId'),
+
+					'SubItems'			=>	Array('n-rev', 'n-ci', 'n-rel', 'n-img', 'n-cdata', 'n-fav', 'n-file'),
+
+					'Fields' => Array (
+							            'NewsId'			=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0,),
+							            'Title'				=>	Array('type' => 'string', /*'formatter' => 'kMultiLanguage', */'not_null' => 1, 'required' => 1, 'default' => '', 'max_len' => 255),
+							            'AutomaticFilename' =>	Array('type' => 'int', 'not_null' => 1, 'default' => 1),
+							            'Excerpt'			=>	Array('type' => 'string', /*'formatter' => 'kMultiLanguage',*/ 'default' => null),
+							            'Author'			=>	Array('type' => 'string', 'not_null' => 1, 'default' => ''),
+							            'Body'				=>	Array('type' => 'string', 'formatter' => 'kFormatter',/*'kMultiLanguage'*/ 'using_fck' => 1, 'required' => 1, 'default' => null),
+							            'CreatedOn'			=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'),
+							            'TextFormat'		=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0),
+							            'EndOn'				=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null),
+							            'Hits'				=>	Array('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%d', 'not_null' => 1, 'default' => 0),
+							            'CachedRating'		=>	Array('type' => 'string', 'default' => 0),
+							            'CachedVotesQty'	=>	Array('type' => 'int','not_null' => 1,'default' => 0),
+							            'CreatedById' 		=>	Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1, 'required' => 1, 'default' => -1),
+							            'Priority'			=>	Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+							            'Status'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2),
+							            'EditorsPick'		=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
+							            'LeadStory'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
+							            'LeadCatStory'		=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
+							            'ResourceId'		=>	Array('type' => 'int', 'default' => null),
+							            'CachedReviewsQty'	=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0),
+							            'StartDate'			=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'),
+							            'NewItem'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1,'default' => 2),
+										'PopItem'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1,'default' => 2),
+							            'HotItem'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1,'default' => 2),
+							            'Archived'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 2 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
+							            'Modified'			=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
+							            'ModifiedById'		=>	Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1,'default' => -1),
+							            'OrgId'				=>	Array('type' => 'int', 'default' => null),
+							            'MetaKeywords'			=>	Array('type' => 'string', 'default' => null),
+										'MetaDescription'		=>	Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null),
+							),
+
+					'VirtualFields'	=> 	Array (
+						'MoreCategories'		=>	Array ('type' => 'string', 'default' => ''),
+
+						'UserName'				=>	Array('type' => 'string', 'default' => ''),
+						'CategoryId'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => 0),
+
+						'cust_RssOriginalURL'	=>	Array('type' => 'string', 'default' => ''),
+						'cust_RssArticleCRC'	=>	Array('type' => 'int', 'default' => 0),
+						'Filename'				=>	Array('type' => 'string', 'not_null' => 1, 'default' => ''),
+						'CachedNavbar'			=>	Array('type' => 'string', 'default' => ''),
+						'ParentPath'			=>	Array('type' => 'string', 'default' => ''),
+
+						// for primary image
+						'SameImages'	=>	Array('type' => 'string', 'default' => ''),
+						'LocalThumb'	=>	Array('type' => 'string', 'default' => ''),
+						'ThumbPath'		=>	Array('type' => 'string', 'default' => ''),
+						'ThumbUrl'		=>	Array('type' => 'string', 'default' => ''),
+						'LocalImage'	=>	Array('type' => 'string', 'default' => ''),
+						'LocalPath'		=>	Array('type' => 'string', 'default' => ''),
+						'FullUrl'		=>	Array('type' => 'string', 'default' => ''),
+
+						// export related fields: begin
+						'CategoryId'	=>	Array('type' => 'int', 'default' => 0),
+						'ExportFormat'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'CSV', /*2 => 'XML'*/), 'default' => 1),
+						'ExportFilename'		=>	Array('type' => 'string', 'default' => ''),
+						'FieldsSeparatedBy'		=>	Array('type' => 'string', 'default' => ','),
+						'FieldsEnclosedBy'		=>	Array('type' => 'string', 'default' => '"'),
+						'LineEndings'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'Windows', 2 => 'UNIX'), 'default' => 1),
+						'LineEndingsInside'		=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'CRLF', 2 => 'LF'), 'default' => 2),
+						'IncludeFieldTitles'	=>	Array('type' => 'int', 'default' => 1),
+						'ExportColumns'			=>	Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array()),
+						'AvailableColumns'		=>	Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array()),
+						'CategoryFormat'		=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_MixedCategoryPath', 2 => 'la_SeparatedCategoryPath'), 'use_phrases' => 1, 'default' => 1),
+						'CategorySeparator'		=>	Array('type' => 'string', 'default' => ':'),
+						'IsBaseCategory'		=>	Array('type' => 'int', 'default' => 0),
+						// export related fields: end
+
+						// import related fields: begin
+						'FieldTitles'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Automatic', 2 => 'la_Manual'), 'use_phrases' => 1, 'default' => 1),
+						'ImportSource'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Upload', 2 => 'la_Local'), 'use_phrases' => 1, 'default' => 2),
+						'ImportFilename'		=>	Array('type' => 'string', 'formatter' => 'kUploadFormatter', 'max_size' => MAX_UPLOAD_SIZE, 'upload_dir' => (defined('EXPORT_BASE_PATH') ? EXPORT_BASE_PATH : '/admin/export') . '/'),
+						'ImportLocalFilename'	=>	Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'default' => ''),
+						'CheckDuplicatesMethod'	=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_IDField', 2 => 'la_OtherFields'), 'use_phrases' => 1, 'default' => 1),
+						'ReplaceDuplicates'		=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'default' => 0),
+						'DuplicateCheckFields'	=>	Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('Title' => 'TITLE'), 'default' => '|Title|'),
+						'SkipFirstRow'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'default' => 1),
+						// import related fields: end
+					),
+
+					'Grids'	=> Array(
+						'Default' => Array (
+							'Icons' => Array (
+								0 => 'icon16_article_disabled.png',
+								1 => 'icon16_article.png',
+								2 => 'icon16_article_pending.png',
+								'NEW' => 'icon16_article_new.png',
+							),
+
+							'Fields' => Array (
+								'NewsId' =>	Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+								'Title' => Array ('title' => 'la_col_Title', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+								'UserName' => Array ('title' => 'la_col_Author', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+								'LeadStory' => Array('title' => 'la_col_LeadStory', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+								'LeadCatStory' => Array('title' => 'la_col_LeadCatStory', 'filter_block' => 'grid_options_filter', 'width' => 85, ),
+								'Status' => Array('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
+								'StartDate' => Array('title' => 'la_col_StartDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+								'EndOn' => Array('title' => 'la_col_EndOn', 'data_block' => 'article_expire_td', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+							),
+						),
+
+
+						'Radio'	=>	Array (
+							'Icons' => Array (
+								0 => 'icon16_article_disabled.png',
+								1 => 'icon16_article.png',
+								2 => 'icon16_article_pending.png',
+								-2 => 'icon16_article_pending.png', // pending DUPLICATE item
+								'NEW' => 'icon16_article_new.gif',
+							),
+
+							'Selector' => 'radio',
+							'Fields' => Array (
+								'NewsId' =>	Array ('title' => 'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+								'Title' => Array ('title' => 'la_col_Title', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+								'UserName' => Array ('title' => 'la_col_Author', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+								'LeadStory' => Array('title' => 'la_col_LeadStory', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+								'LeadCatStory' => Array('title' => 'la_col_LeadCatStory', 'filter_block' => 'grid_options_filter', 'width' => 85, ),
+								'Status' => Array('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
+								'StartDate' => Array('title' => 'la_col_StartDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+								'EndOn' => Array('title' => 'la_col_EndOn', 'data_block' => 'article_expire_td', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+							),
+						),
+					),
+
+					'ConfigMapping' => 	Array(
+												'PerPage'				=>	'Perpage_News',
+												'ShortListPerPage'		=>	'Perpage_News_Short',
+												'ForceEditorPick'		=>	'News_ShowPick',
+												'DefaultSorting1Field'	=>	'News_SortField',
+												'DefaultSorting2Field'	=>	'News_SortField2',
+												'DefaultSorting1Dir'	=>	'News_SortOrder',
+												'DefaultSorting2Dir'	=>	'News_SortOrder2',
+
+												'RatingDelayValue'		=>	'News_RatingDelay_Value',
+												'RatingDelayInterval'	=>	'News_RatingDelay_Interval',
+										),
+			);
\ No newline at end of file

Property changes on: branches/5.1.x/units/articles/articles_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.52.2.18
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: branches/5.1.x/units/articles/articles_event_handler.php
===================================================================
--- branches/5.1.x/units/articles/articles_event_handler.php	(nonexistent)
+++ branches/5.1.x/units/articles/articles_event_handler.php	(revision 13096)
@@ -0,0 +1,515 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-News
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license      GNU/GPL
+* In-Portal is Open Source software.
+* This means that this software may have been modified pursuant
+* the GNU General Public License, and as distributed it includes
+* or is derivative of works licensed under the GNU General Public License
+* or other free or open source software licenses.
+* See http://www.in-portal.org/license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class ArticlesEventHandler extends kCatDBEventHandler {
+
+		/**
+		 * Filters out archived articles
+		 *
+		 * @param kEvent $event
+		 */
+		function SetCustomQuery(&$event)
+		{
+			parent::SetCustomQuery($event);
+
+			$object =& $event->getObject();
+
+			if (!$this->Application->isAdminUser) {
+				$where_clause = '(Archived = 0) AND (StartDate < '.adodb_mktime().' OR StartDate = 0) AND (EndOn > '.adodb_mktime().' OR EndOn IS NULL)';
+				$object->addFilter('archived_filter', $where_clause);
+			}
+		}
+
+		/**
+		 * Return type clauses for list bulding on front
+		 *
+		 * @param kEvent $event
+		 * @return Array
+		 */
+		function getTypeClauses(&$event)
+		{
+			$type_clauses = parent::getTypeClauses($event);
+
+			$type_clauses['site_lead']['include']='%1$s.LeadStory = 1 AND '.TABLE_PREFIX.'CategoryItems.PrimaryCat = 1';
+			$type_clauses['site_lead']['except']='%1$s.LeadStory <> 1 AND '.TABLE_PREFIX.'CategoryItems.PrimaryCat = 1';
+			$type_clauses['site_lead']['having_filter'] = false;
+
+			$type_clauses['cat_lead']['include']='%1$s.LeadCatStory = 1 AND '.TABLE_PREFIX.'CategoryItems.PrimaryCat = 1';
+			$type_clauses['cat_lead']['except']='%1$s.LeadCatStory <> 1 AND '.TABLE_PREFIX.'CategoryItems.PrimaryCat = 1';
+			$type_clauses['cat_lead']['having_filter'] = false;
+
+			return $type_clauses;
+		}
+
+
+		/**
+		 * [REGULAR EVENT] Deletes expired articles + update existing articles from rss feed with new data (key - article url)
+		 *
+		 * @param kEvent $event
+		 */
+		function OnUpdateRSSAtricles(&$event)
+		{
+			$category_table = $this->Application->getUnitOption('c', 'TableName');
+			$custom_table = $this->Application->getUnitOption('c-cdata', 'TableName');
+
+			$category_custom_fields = $this->getCustomColumns('c');
+			$article_custom_fields = $this->getCustomColumns($event->Prefix);
+
+
+			// update categories which sould be updated
+			$sql = 'SELECT cd.*, c.CategoryId
+					FROM '.$category_table.' c
+					LEFT JOIN '.$custom_table.' cd ON c.ResourceId = cd.ResourceId
+					WHERE 	(IF(cd.'.$category_custom_fields['RssLastUpdated'].' IS NULL, 0, cd.'.$category_custom_fields['RssLastUpdated'].') +
+							cd.'.$category_custom_fields['RssUpdateInterval'].' * cd.'.$category_custom_fields['RssUpdateIntervalType'].' <=
+							'.adodb_mktime().') AND (LENGTH('.$category_custom_fields['RssSource'].') > 0)';
+			$categories = $this->Conn->Query($sql, 'CategoryId');
+			if ($categories) {
+				$resource_ids = Array();
+				foreach ($categories as $category_id => $category_data) {
+					$resource_ids[] = $category_data['ResourceId'];
+					$event->setEventParam('source_url', $category_data[ $category_custom_fields['RssSource'] ]);
+					$event->setEventParam('category_id', $category_id);
+					$event->setEventParam('custom_fields', $article_custom_fields);
+					$event->setEventParam('life_time',  $category_data[ $category_custom_fields['RssDefaultExpiration'] ] * $category_data[ $category_custom_fields['RssDefaultExpirationType'] ]);
+					$this->parseFeed($event);
+				}
+
+				$sql = 'UPDATE '.$custom_table.'
+						SET '.$category_custom_fields['RssLastUpdated'].' = '.adodb_mktime().'
+						WHERE ResourceId IN ('.implode(',', $resource_ids).')';
+				$this->Conn->Query($sql);
+			}
+
+			// delete expired articles from feed categories
+			$sql = 'SELECT c.CategoryId, c.ResourceId
+					FROM '.$category_table.' c
+					LEFT JOIN '.$custom_table.' cd ON c.ResourceId = cd.ResourceId
+					WHERE (	IF(cd.'.$category_custom_fields['RssLastExpired'].' IS NULL, 0, cd.'.$category_custom_fields['RssLastExpired'].') +
+							cd.'.$category_custom_fields['RssExpireInterval'].' * cd.'.$category_custom_fields['RssExpireIntervalType'].' <=
+							'.adodb_mktime().') AND (cd.'.$category_custom_fields['RssDeleteExpired'].' = 1)';
+
+			$categories = $this->Conn->GetCol($sql, 'ResourceId');
+
+			$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
+			$table = $this->Application->getUnitOption($event->Prefix, 'TableName');
+			$ci_table = $this->Application->getUnitOption($event->Prefix.'-ci', 'TableName');
+
+			if ($categories) {
+				$article_custom_table = $this->Application->getUnitOption($event->Prefix.'-cdata', 'TableName');
+
+				$sql = 'SELECT main_table.'.$id_field.'
+						FROM '.$table.' main_table
+						LEFT JOIN '.$ci_table.' ci ON main_table.ResourceId = ci.ItemResourceId
+						LEFT JOIN '.$article_custom_table.' cd ON main_table.ResourceId = cd.ResourceId
+						WHERE 	(ci.PrimaryCat = 1) AND
+								(ci.CategoryId IN ('.implode(',', $categories).')) AND
+								(main_table.EndOn < '.adodb_mktime().' AND main_table.EndOn IS NOT NULL) AND
+								(LENGTH(cd.'.$article_custom_fields['RssOriginalURL'].') > 0)';
+				$article_ids = $this->Conn->GetCol($sql);
+				if ($article_ids) {
+					$temp =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
+					$temp->DeleteItems($event->Prefix, $event->Special, $article_ids);
+				}
+
+				$sql = 'UPDATE '.$custom_table.'
+						SET '.$category_custom_fields['RssLastExpired'].' = '.adodb_mktime().'
+						WHERE ResourceId IN ('.implode(',', array_keys($categories)).')';
+				$this->Conn->Query($sql);
+			}
+		}
+
+		/**
+		 * Returns article ids & crc, that are created during feed import
+		 *
+		 * @param kEvent $event
+		 * @return Array
+		 */
+		function getFeedArticles(&$event)
+		{
+			$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
+			$table = $this->Application->getUnitOption($event->Prefix, 'TableName');
+			$custom_table = $this->Application->getUnitOption($event->Prefix.'-cdata', 'TableName');
+
+			$crc_field = $event->getEventParam('custom_fields', 'RssArticleCRC');
+
+			$sql = 'SELECT main_table.'.$id_field.', cd.'.$crc_field.'
+					FROM '.$table.' main_table
+					LEFT JOIN '.$custom_table.' cd ON cd.ResourceId = main_table.ResourceId
+					WHERE LENGTH(cd.'.$crc_field.') > 0';
+			return $this->Conn->GetCol($sql, $crc_field);
+		}
+
+		/**
+		 * Creates new, updates existing articles from feed url specified
+		 *
+		 * @param kEvent $event
+		 */
+		function parseFeed(&$event)
+		{
+			$source_urls = explode(',', $event->getEventParam('source_url'));
+			if (count($source_urls) > 1) {
+				foreach ($source_urls as $source_url) {
+					$event->setEventParam('source_url', $source_url);
+					$this->parseFeed($event);
+				}
+				return true;
+			}
+
+			$curl_helper =& $this->Application->recallObject('CurlHelper');
+			/* @var $curl_helper kCurlHelper */
+
+			$curl_helper->followLocation = true;
+			$curl_helper->setOptions( Array (CURLOPT_USERAGENT => 'Mozilla/5.0 (Windows; U; Windows NT 5.2; ru; rv:1.9.1.3) Gecko/20090824 Firefox/3.5.3 (.NET CLR 3.5.30729)') ); // otherwise FeedBurner will return HTML
+
+			$xml_data = $curl_helper->Send($event->getEventParam('source_url'));
+
+			if (!$xml_data) {
+				return false;
+			}
+
+			$xml_helper =& $this->Application->recallObject('kXMLHelper');
+			/* @var $xml_helper kXMLHelper */
+
+			$root_node =& $xml_helper->Parse($xml_data, XML_WITH_TEXT_NODES);
+
+			$feed_types = Array (
+				'rss_2.0' => 'channel', 'atom' => 'feed',
+			);
+
+			foreach ($feed_types as $feed_type => $node_name) {
+				$article_node =& $root_node->FindChild($node_name);
+				if (is_object($article_node)) {
+					break;
+				}
+			}
+
+			if (!$article_node) {
+				return false;
+			}
+
+			$category_id = $event->getEventParam('category_id');
+			$backup_category_id = $this->Application->GetVar('m_cat_id');
+			$this->Application->SetVar('m_cat_id', $category_id);
+
+			switch ($feed_type) {
+				case 'rss_2.0':
+					$this->parseRssFeed($article_node, $event);
+					break;
+
+				case 'atom':
+					$this->parseAtomFeed($article_node, $event);
+					break;
+			}
+
+			$this->Application->SetVar('m_cat_id', $backup_category_id);
+		}
+
+		/**
+		 * Returns ML field names for article record
+		 *
+		 * @return Array
+		 */
+		function _getMLFields()
+		{
+			$title_field = 'Title';
+			$body_field = 'Body';
+
+			$fields = $this->Application->getUnitOption($this->Prefix, 'Fields');
+
+			$ml_formatter =& $this->Application->recallObject('kMultiLanguage');
+			/* @var $ml_formatter kMultiLanguage */
+
+			$title_formatter = array_key_exists('formatter', $fields[$title_field]) ? $fields[$title_field]['formatter'] : false;
+
+			if ($title_formatter == 'kMultiLanguage') {
+				$title_field = $ml_formatter->LangFieldName($title_field);
+			}
+
+			$body_formatter = array_key_exists('formatter', $fields[$body_field]) ? $fields[$body_field]['formatter'] : false;
+
+			if ($body_formatter == 'kMultiLanguage') {
+				$body_field = $ml_formatter->LangFieldName($body_field);
+			}
+
+			return Array ($title_field, $body_field);
+		}
+
+		/**
+		 * Parses RSS 2.0 feed
+		 *
+		 * @param kXMLNode $root_node
+		 * @param kEvent $event
+		 */
+		function parseRssFeed(&$root_node, &$event)
+		{
+			$current_node = $root_node->firstChild;
+			$feed_articles = $this->getFeedArticles($event);
+
+			$object =& $this->Application->recallObject($event->Prefix.'.-item', null, Array('skip_autoload' => true));
+			/* @var $object kDBItem */
+
+			list ($title_field, $body_field) = $this->_getMLFields();
+
+			do {
+				// IMAGE is information about channel and is not useful here
+				if ($current_node->Name != 'ITEM') continue;
+				// collect item data
+				$data = Array();
+				$sub_node =& $current_node->firstChild;
+				/* @var $sub_node kXMLNode */
+
+				do {
+					if ($sub_node->Name == 'ATOM:SUMMARY') {
+						$data[$sub_node->Name] = $this->getNodeContent($sub_node);
+					} else {
+						$data[$sub_node->Name] = $this->getNodeContent($sub_node, 'xhtml'); // $sub_node->firstChild->Data; // was  $sub_node->Data;
+					}
+
+				} while ( ($sub_node =& $sub_node->NextSibling()) );
+
+				// create/update article
+				$article_crc = crc32($data['LINK'].$data['TITLE']);
+				$article_id = getArrayValue($feed_articles, $article_crc);
+				if ($article_id) {
+					$object->Load($article_id);
+				}
+				else {
+					$object->Clear();
+				}
+
+				$object->SetDBField($title_field, $data['TITLE']);
+				$object->SetDBField('cust_RssOriginalURL', $data['LINK']);
+				$object->SetDBField('cust_RssArticleCRC', $article_crc);
+				$object->SetDBField($body_field, !array_key_exists('DESCRIPTION', $data) ? $data['ATOM:SUMMARY'] : $data['DESCRIPTION']);
+				$expiration_time = adodb_mktime() + $event->getEventParam('life_time');
+				$object->SetDBField('EndOn_date', $expiration_time);
+				$object->SetDBField('EndOn_time', $expiration_time);
+				$object->SetDBField('Status', STATUS_ACTIVE);
+				$object->SetDBField('Author', 'root');
+				$object->SetDBField('CreatedById', -1);
+
+				$status = $object->isLoaded() ? $object->Update() : $object->Create();
+			} while (($current_node =& $current_node->NextSibling()));
+		}
+
+		/**
+		 * Returns parsed node content
+		 *
+		 * @param kXMLNode $node
+		 * @param string $content_type
+		 * @return string
+		 */
+		function getNodeContent(&$node, $content_type = null)
+		{
+			if (!isset($content_type)) {
+				$content_type = array_key_exists('TYPE', $node->Attributes) ? $node->Attributes['TYPE'] : false;
+			}
+
+			switch ($content_type) {
+				case 'xhtml':
+					$data = $node->GetXML(true);
+					break;
+
+				case 'html':
+					$data = unhtmlentities($node->firstChild->Data); // $node->Data
+					break;
+
+				default:
+					$data = $node->firstChild->Data; // $node->Data; also for 'text'
+					break;
+			}
+
+			return trim($data);
+		}
+
+		/**
+		 * Parses ATOM feed
+		 *
+		 * @param kXMLNode $root_node
+		 * @param kEvent $event
+		 */
+		function parseAtomFeed(&$root_node, &$event)
+		{
+			$current_node = $root_node->firstChild;
+			$feed_articles = $this->getFeedArticles($event);
+
+			$object =& $this->Application->recallObject($event->Prefix.'.-item', null, Array('skip_autoload' => true));
+			/* @var $object kDBItem */
+
+			list ($title_field, $body_field) = $this->_getMLFields();
+
+			do {
+				if ($current_node->Name != 'ENTRY') continue;
+				// collect item data
+				$data = Array();
+				$sub_node =& $current_node->firstChild;
+				/* @var $sub_node kXMLNode */
+
+				do {
+					if ($sub_node->Name == 'LINK') {
+						if ($sub_node->Attributes['REL'] == 'alternate') {
+							$data[$sub_node->Name] = $sub_node->Attributes['HREF'];
+						}
+					}
+					elseif ($sub_node->Name == 'CONTENT' || $sub_node->Name == 'SUMMARY' || $sub_node->Name == 'TITLE') {
+						$data[$sub_node->Name] = $this->getNodeContent($sub_node);
+					}
+					else {
+						$data[$sub_node->Name] = $sub_node->firstChild->Data; // $sub_node->Data
+					}
+				} while ( ($sub_node =& $sub_node->NextSibling()) );
+
+				// create/update article
+				$article_crc = crc32($data['LINK'].$data['TITLE']);
+				$article_id = getArrayValue($feed_articles, $article_crc);
+				if ($article_id) {
+					$object->Load($article_id);
+				}
+				else {
+					$object->Clear();
+				}
+
+				$object->SetDBField($title_field, $data['TITLE']);
+				$object->SetDBField('cust_RssOriginalURL', $data['LINK']);
+				$object->SetDBField('cust_RssArticleCRC', $article_crc);
+				$object->SetDBField($body_field, !array_key_exists('CONTENT', $data) ? $data['SUMMARY'] : $data['CONTENT']);
+				$expiration_time = adodb_mktime() + $event->getEventParam('life_time');
+				$object->SetDBField('EndOn_date', $expiration_time);
+				$object->SetDBField('EndOn_time', $expiration_time);
+				$object->SetDBField('Status', STATUS_ACTIVE);
+				$object->SetDBField('Author', 'root');
+				$object->SetDBField('CreatedById', -1);
+
+				$status = $object->isLoaded() ? $object->Update() : $object->Create();
+			} while (($current_node =& $current_node->NextSibling()));
+		}
+
+		function getCustomColumns($prefix)
+		{
+			$ml_formatter =& $this->Application->recallObject('kMultiLanguage');
+
+			$custom_fields = array_flip($this->Application->getUnitOption($prefix, 'CustomFields'));
+			foreach ($custom_fields as $custom_name => $custom_id) {
+				$custom_fields[$custom_name] = $ml_formatter->LangFieldName('cust_'.$custom_id);
+			}
+
+			return $custom_fields;
+		}
+
+		/**
+		 * Create missing excerpt
+		 *
+		 * @param kEvent $event
+		 */
+		function OnBeforeItemUpdate(&$event)
+		{
+			parent::OnBeforeItemUpdate($event);
+
+			$this->createExcerpt($event);
+			$this->cacheItemOwner($event, 'CreatedById', 'Author');
+		}
+
+		/**
+		 * Create missing excerpt
+		 *
+		 * @param kEvent $event
+		 */
+		function OnBeforeItemCreate(&$event)
+		{
+			parent::OnBeforeItemCreate($event);
+
+			$this->createExcerpt($event);
+			$this->cacheItemOwner($event, 'CreatedById', 'Author');
+		}
+
+		/**
+		 * Create excerpt if missing
+		 *
+		 * @param kEvent $event
+		 */
+		function createExcerpt(&$event)
+		{
+			$object =& $event->getObject();
+
+			if (!$object->GetField('Excerpt') || $this->Application->GetVar('generate_excerpt')) {
+				$excerpt = strip_tags( $object->GetField('Body') );
+
+
+				$length = mb_strlen($excerpt);
+				if ($length > 100) {
+					$excerpt = mb_substr(strip_tags($excerpt), 0, 100);
+					if (mb_substr($excerpt,-1) != ' ') {
+						$pos = mb_strrpos($excerpt, ' ');
+						if ($pos) {
+							$excerpt = mb_substr($excerpt, 0, $pos);
+						}
+					}
+					$excerpt .= '...';
+				}
+
+				$ml_formatter =& $this->Application->recallObject('kMultiLanguage');
+				/* @var $ml_formatter kMultiLanguage */
+
+				$object->SetDBField($ml_formatter->LangFieldName('Excerpt'), $excerpt);
+			}
+		}
+
+		/**
+		 * [HOOK] Updates category custom fields options in config
+		 *
+		 * @param kEvent $event
+		 */
+		function OnUpdateCategoryCustomFields(&$event)
+		{
+			$new_virtual_fields =	Array(
+											'cust_RssSource'				=>	Array('type' => 'string', 'default' => ''),
+											'cust_RssDefaultExpiration'		=>	Array('type' => 'int', 'not_null' => 1, 'default' => ''),
+											'cust_RssDefaultExpirationType'	=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array(60 => 'la_opt_min', 3600 => 'la_opt_hour', 86400 => 'la_opt_day', 2419200 => 'la_opt_month', 29030400 => 'la_opt_year'), 'default' => 60),
+											'cust_RssExpireInterval'		=>	Array('type' => 'int', 'not_null' => 1, 'default' => ''),
+											'cust_RssExpireIntervalType'	=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array(60 => 'la_opt_min', 3600 => 'la_opt_hour', 86400 => 'la_opt_day', 2419200 => 'la_opt_month'), 'default' => 60),
+											'cust_RssDeleteExpired'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'default' => 0),
+											'cust_RssUpdateInterval'		=>	Array('type' => 'int', 'not_null' => 1, 'default' => ''),
+											'cust_RssUpdateIntervalType'	=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array(60 => 'la_opt_min', 3600 => 'la_opt_hour', 86400 => 'la_opt_day', 2419200 => 'la_opt_month'), 'default' => 60),
+											'cust_RssLastUpdated'			=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => ''),
+											'cust_RssLastExpired'			=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => ''),
+									);
+			$virtual_fields = $this->Application->getUnitOption('c', 'VirtualFields');
+			$virtual_fields = array_merge_recursive2($virtual_fields, $new_virtual_fields);
+			$this->Application->setUnitOption('c', 'VirtualFields', $virtual_fields);
+		}
+
+		/**
+		 * Sets default expiration based on module setting
+		 *
+		 * @param kEvent $event
+		 */
+		function OnPreCreate(&$event)
+		{
+			parent::OnPreCreate($event);
+
+			if ($event->status == erSUCCESS) {
+				$object =& $event->getObject();
+
+				$archive_days = $this->Application->ConfigValue('News_Archive');
+				if ($archive_days) {
+					$expire_date = adodb_mktime() + $archive_days * 3600 * 24;
+					$object->SetDBField('EndOn_date', $expire_date);
+					$object->SetDBField('EndOn_time', $expire_date);
+				}
+			}
+		}
+	}
\ No newline at end of file

Property changes on: branches/5.1.x/units/articles/articles_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.14.2.13
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: branches/5.1.x/units/articles/articles_tag_processor.php
===================================================================
--- branches/5.1.x/units/articles/articles_tag_processor.php	(nonexistent)
+++ branches/5.1.x/units/articles/articles_tag_processor.php	(revision 13096)
@@ -0,0 +1,33 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-News
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license      GNU/GPL
+* In-Portal is Open Source software.
+* This means that this software may have been modified pursuant
+* the GNU General Public License, and as distributed it includes
+* or is derivative of works licensed under the GNU General Public License
+* or other free or open source software licenses.
+* See http://www.in-portal.org/license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class ArticlesTagProcessor extends kCatDBTagProcessor {
+
+		function ListRelatedArticles($params)
+		{
+			return $this->PrintList2($params);
+		}
+
+		function ListArticles($params)
+		{
+			return $this->PrintList2($params);
+		}
+
+		function ArticleLink($params)
+		{
+			return $this->ItemLink($params, 'article');
+		}
+	}
\ No newline at end of file

Property changes on: branches/5.1.x/units/articles/articles_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.5
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: branches/5.1.x/units/.htaccess
===================================================================
--- branches/5.1.x/units/.htaccess	(nonexistent)
+++ branches/5.1.x/units/.htaccess	(revision 13096)
@@ -0,0 +1 @@
+deny from all
\ No newline at end of file

Property changes on: branches/5.1.x/units/.htaccess
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/5.1.x/admin_templates/user_item_tab.tpl
===================================================================
--- branches/5.1.x/admin_templates/user_item_tab.tpl	(nonexistent)
+++ branches/5.1.x/admin_templates/user_item_tab.tpl	(revision 13096)
@@ -0,0 +1,43 @@
+<inp2:m_RequireLogin permissions="in-portal:user_list.view" system="1"/>
+<inp2:m_DefineElement name="catalog_tab">
+	<inp2:m_if check="m_ParamEquals" name="tab_init" value="" inverse="inverse">
+		<inp2:m_if check="m_ParamEquals" name="tab_init" value="1">
+			<div id="articles_div" prefix="<inp2:m_param name="prefix"/>" view_template="in-news/user_item_tab" edit_template="in-news/articles/articles_edit" dep_buttons="new_article" category_id="-1" class="catalog-tab"><!-- IE minimal height problem fix --></div>
+			<script type="text/javascript">$Catalog.registerTab('articles');</script>
+		</inp2:m_if>
+		<inp2:m_if check="m_ParamEquals" name="tab_init" value="2">
+			<inp2:adm_CatalogTab render_as="item_tab" prefix="$prefix" title_property="$title_property"/>
+		</inp2:m_if>
+	<inp2:m_else/>
+
+		<inp2:m_include t="incs/blocks"/>
+		<inp2:m_include t="incs/in-portal"/>
+		<inp2:m_include t="categories/ci_blocks"/>
+		<inp2:$prefix_InitList grid="$grid_name"/>
+
+		$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount/>');
+		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id"/>);
+		$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
+
+		<inp2:m_DefineElement name="article_expire_td" no_special="">
+			<inp2:m_if check="Field" name="$field">
+				<inp2:Field field="$field" grid="$grid" no_special="$no_special" format="$format"/>
+			<inp2:m_else/>
+				<inp2:m_phrase name="la_Never"/>
+			</inp2:m_if>
+		</inp2:m_DefineElement>
+
+		<inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="NewsId" grid="$grid_name" menu_filters="yes"/>
+
+		Grids['<inp2:m_param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit','delete'));
+		$Catalog.setViewMenu('<inp2:m_param name="prefix"/>');
+		#separator#
+		<!-- articles tab: begin -->
+		<inp2:m_RenderElement name="kernel_form" form_name="articles_form"/>
+			<inp2:m_RenderElement name="grid" ajax="1" PrefixSpecial="$prefix" IdField="NewsId" grid="$grid_name" menu_filters="yes"/>
+		<inp2:m_RenderElement name="kernel_form_end"/>
+		<!-- articles tab: end -->
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:n_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
\ No newline at end of file

Property changes on: branches/5.1.x/admin_templates/user_item_tab.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.6
\ No newline at end of property
Index: branches/5.1.x/admin_templates/catalog_tab.tpl
===================================================================
--- branches/5.1.x/admin_templates/catalog_tab.tpl	(nonexistent)
+++ branches/5.1.x/admin_templates/catalog_tab.tpl	(revision 13096)
@@ -0,0 +1,64 @@
+<inp2:m_RequireLogin permissions="in-portal:browse.view" system="1"/>
+<inp2:m_DefineElement name="catalog_tab">
+	<inp2:m_if check="m_ParamEquals" name="tab_init" value="" inverse="inverse">
+		<inp2:m_if check="m_ParamEquals" name="tab_init" value="1">
+			a_toolbar.AddButton(
+				new ToolBarButton(
+					'in-news:new_article',
+					'<inp2:m_phrase label="la_ToolTip_NewArticle" escape="1"/>',
+					add_item,
+					true
+		 		)
+		 	);
+		</inp2:m_if>
+
+		<inp2:m_if check="m_ParamEquals" name="tab_init" value="2">
+			<div id="articles_div" prefix="<inp2:m_param name="prefix"/>" view_template="in-news/catalog_tab"  edit_template="in-news/articles/articles_edit" category_id="-1" dep_buttons="new_article" class="catalog-tab"><!-- IE minimal height problem fix --></div>
+			<script type="text/javascript">$Catalog.registerTab('articles');</script>
+		</inp2:m_if>
+
+		<inp2:m_if check="m_ParamEquals" name="tab_init" value="3">
+			$Catalog.setItemCount('<inp2:m_Param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount grid="$grid_name"/>');
+		</inp2:m_if>
+	<inp2:m_else/>
+		<inp2:lang.current_Field name="Charset" result_to_var="charset"/>
+		<inp2:m_Header data="Content-type: text/plain; charset=$charset"/>
+		<inp2:m_include t="incs/blocks"/>
+		<inp2:m_include t="incs/in-portal"/>
+		<inp2:m_include t="categories/ci_blocks"/>
+		<inp2:$prefix_InitList grid="$grid_name"/>
+
+		$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount/>');
+		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id"/>);
+		$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
+
+		<inp2:m_DefineElement name="article_expire_td" no_special="">
+			<inp2:m_if check="Field" name="$field">
+				<inp2:Field field="$field" grid="$grid" no_special="$no_special" format="$format"/>
+			<inp2:m_else/>
+				<inp2:m_phrase name="la_Never"/>
+			</inp2:m_if>
+		</inp2:m_DefineElement>
+
+		<inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="NewsId" grid="$grid_name" menu_filters="yes"/>
+		<inp2:m_RenderElement name="grid_search_buttons" PrefixSpecial="$prefix" grid="$grid_name" ajax="1"/>
+
+		<inp2:m_if check="m_ParamEquals" name="tab_dependant" value="yes">
+			Grids['<inp2:m_param name="prefix"/>'].AddAlternativeGrid('<inp2:m_param name="cat_prefix"/>', true);
+		</inp2:m_if>
+		Grids['<inp2:m_param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','sep3','cut','copy','move_up','move_down','sep6'));
+		$Catalog.reflectPasteButton(<inp2:c_HasClipboard/>);
+		$Catalog.setViewMenu('<inp2:m_param name="prefix"/>');
+		<inp2:m_if check="m_ParamEquals" name="tab_mode" value="single">
+			Grids['<inp2:m_param name="prefix"/>'].DblClick = function() {return false};
+		</inp2:m_if>
+		#separator#
+		<!-- articles tab: begin -->
+		<inp2:m_RenderElement name="kernel_form" form_name="articles_form"/>
+		<inp2:m_RenderElement name="grid" ajax="1" PrefixSpecial="$prefix" IdField="NewsId" grid="$grid_name" menu_filters="yes"/>
+		<inp2:m_RenderElement name="kernel_form_end"/>
+		<!-- articles tab: end -->
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:n_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
\ No newline at end of file

Property changes on: branches/5.1.x/admin_templates/catalog_tab.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.12.2.4
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/5.1.x/admin_templates/img/icons/icon24_conf_news.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/admin_templates/img/icons/icon24_conf_news.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/admin_templates/img/icons/icon24_articles.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/admin_templates/img/icons/icon24_articles.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/admin_templates/img/itemicons/icon16_article.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/admin_templates/img/itemicons/icon16_article.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/admin_templates/img/itemicons/icon16_article_pending.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/admin_templates/img/itemicons/icon16_article_pending.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/admin_templates/img/itemicons/icon16_article_disabled.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/admin_templates/img/itemicons/icon16_article_disabled.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/admin_templates/img/itemicons/icon16_article_new.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/admin_templates/img/itemicons/icon16_article_new.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/admin_templates/img/itemicons/icon16_articles.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/admin_templates/img/itemicons/icon16_articles.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/admin_templates/img/toolbar/tool_new_article_f2.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/admin_templates/img/toolbar/tool_new_article_f2.gif
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/admin_templates/img/toolbar/tool_new_article.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/admin_templates/img/toolbar/tool_new_article.gif
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/admin_templates/img/toolbar/tool_new_article_f3.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/admin_templates/img/toolbar/tool_new_article_f3.gif
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/admin_templates/articles/articles_relations.tpl
===================================================================
--- branches/5.1.x/admin_templates/articles/articles_relations.tpl	(nonexistent)
+++ branches/5.1.x/admin_templates/articles/articles_relations.tpl	(revision 13096)
@@ -0,0 +1,105 @@
+<inp2:adm_SetPopupSize width="880" height="680"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="articles_relations" pagination="1" pagination_prefix="n-rel" 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('n','<inp2:n_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('n','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('n', '<inp2:n_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('n', '<inp2:n_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				//Relations related:
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Relation" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							openSelector('n-rel', '<inp2:adm_SelectorLink prefix="n-rel" selection_mode="single" tab_prefixes="all"/>', 'TargetId', '950x600');
+						} ) );
+
+				function edit()
+	  			{
+	  				std_edit_temp_item('n-rel', 'in-news/articles/relations_edit');
+	  			}
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('n-rel')
+						} ) );
+
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
+							submit_event('n-rel','OnMassApprove');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
+							submit_event('n-rel','OnMassDecline');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="n_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					//a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="n_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="n_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="n-rel" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="n-rel" IdField="RelationshipId" grid="Default" menu_filters="yes"/>
+<script type="text/javascript">
+	Grids['n-rel'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') );
+</script>
+<input type="hidden" name="TargetId" id="TargetId" value="<inp2:m_get name="TargetId"/>">
+<input type="hidden" name="TargetType" id="TargetType" value="<inp2:m_get name="TargetType"/>">
+<inp2:m_include t="incs/footer"/>
+
+<script type="text/javascript">
+	var $env = document.getElementById('sid').value+'-:m<inp2:m_get name="m_cat_id"/>-1-1-1-s';
+</script>
\ No newline at end of file

Property changes on: branches/5.1.x/admin_templates/articles/articles_relations.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.3.2.3
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/5.1.x/admin_templates/articles/articles_files.tpl
===================================================================
--- branches/5.1.x/admin_templates/articles/articles_files.tpl	(nonexistent)
+++ branches/5.1.x/admin_templates/articles/articles_files.tpl	(revision 13096)
@@ -0,0 +1,86 @@
+<inp2:adm_SetPopupSize width="880" height="680"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="articles_files" pagination="1" pagination_prefix="n-file" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+
+  				function edit()
+	  			{
+	  				std_edit_temp_item('n-file', 'in-news/articles/file_edit');
+	  			}
+
+  				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('n','<inp2:n_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('n','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('n', '<inp2:n_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('n', '<inp2:n_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewFile" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_new_item('n-file', 'in-news/articles/file_edit')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('n-file')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="n_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="n_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="n_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="n-file" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="n-file" IdField="FileId" grid="Default" menu_filters="yes"/>
+<script type="text/javascript">
+	Grids['n-file'].SetDependantToolbarButtons( new Array('edit','delete') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: branches/5.1.x/admin_templates/articles/articles_files.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.6
\ No newline at end of property
Index: branches/5.1.x/admin_templates/articles/articles_categories.tpl
===================================================================
--- branches/5.1.x/admin_templates/articles/articles_categories.tpl	(nonexistent)
+++ branches/5.1.x/admin_templates/articles/articles_categories.tpl	(revision 13096)
@@ -0,0 +1,84 @@
+<inp2:adm_SetPopupSize width="880" height="680"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="articles_categories" pagination="1" pagination_prefix="n-ci" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+  				function edit(){ }
+
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('n','<inp2:n_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('n','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('n', '<inp2:n_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('n', '<inp2:n_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				//Category related:
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Category" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							openSelector('n', '<inp2:adm_SelectorLink prefix="n" selection_mode="multi" tab_prefixes="none"/>', 'ItemCategory');
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('n-ci')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('setprimary', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>', function() {
+							submit_event('n-ci','OnSetPrimary');
+						}
+				 ) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="n_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="n_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="n_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="n-ci" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="grid_checkbox_category_td">
+	<inp2:CategoryName field="$field" primary_title="!la_PrimaryCategory!" no_special="1"/>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="n-ci" IdField="CategoryId" grid="Default"/>
+<script type="text/javascript">
+	Grids['n-ci'].SetDependantToolbarButtons( new Array('delete','setprimary') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: branches/5.1.x/admin_templates/articles/articles_categories.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.3.2.4
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/5.1.x/admin_templates/articles/articles_images.tpl
===================================================================
--- branches/5.1.x/admin_templates/articles/articles_images.tpl	(nonexistent)
+++ branches/5.1.x/admin_templates/articles/articles_images.tpl	(revision 13096)
@@ -0,0 +1,107 @@
+<inp2:adm_SetPopupSize width="880" height="680"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="articles_images" pagination="1" pagination_prefix="n-img" tab_preset="Default"/>
+
+<inp2:m_include t="incs/image_blocks"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+
+  				function edit()
+	  			{
+	  				std_edit_temp_item('n-img', 'in-news/articles/images_edit');
+	  			}
+
+  				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('n','<inp2:n_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('n','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('n', '<inp2:n_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('n', '<inp2:n_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+
+
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Images" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_new_item('n-img', 'in-news/articles/images_edit')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('n-img')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>', function() {
+							submit_event('n-img','OnMassMoveUp');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', function() {
+							submit_event('n-img','OnMassMoveDown');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarButton('setprimary', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>', function() {
+							submit_event('n-img','OnSetPrimary');
+						}
+				 ) );
+
+				  a_toolbar.AddButton( new ToolBarSeparator('sep4') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="n_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="n_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="n_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="n-img" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="n-img" IdField="ImageId" grid="Default" menu_filters="yes"/>
+<script type="text/javascript">
+	Grids['n-img'].SetDependantToolbarButtons( new Array('edit','delete','move_up','move_down','setprimary') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: branches/5.1.x/admin_templates/articles/articles_images.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.5.2.4
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/5.1.x/admin_templates/articles/articles_reviews.tpl
===================================================================
--- branches/5.1.x/admin_templates/articles/articles_reviews.tpl	(nonexistent)
+++ branches/5.1.x/admin_templates/articles/articles_reviews.tpl	(revision 13096)
@@ -0,0 +1,114 @@
+<inp2:adm_SetPopupSize width="880" height="680"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="articles_reviews" pagination="1" pagination_prefix="n-rev" 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('n','<inp2:n_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('n','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('n', '<inp2:n_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('n', '<inp2:n_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				//Pricing related:
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewReview" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_new_item('n-rev', 'in-news/articles/review_edit')
+						} ) );
+
+				function edit()
+	  			{
+	  				std_edit_temp_item('n-rev', 'in-news/articles/review_edit');
+	  			}
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('n-rev')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
+							submit_event('n-rev','OnMassApprove');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
+							submit_event('n-rev','OnMassDecline');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
+
+				a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>', function() {
+							submit_event('n-rev','OnMassMoveUp');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', function() {
+							submit_event('n-rev','OnMassMoveDown');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarSeparator('sep5') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="n_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="n_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="n_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="n-rev" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="reviewtext_checkbox_td">
+	<inp2:Field field="$field" no_special="no_special" cut_first="100"/>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="n-rev" IdField="ReviewId" grid="Default" menu_filters="yes"/>
+<script type="text/javascript">
+	Grids['n-rev'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','move_up','move_down') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: branches/5.1.x/admin_templates/articles/articles_reviews.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.3.2.3
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/5.1.x/admin_templates/articles/relations_edit.tpl
===================================================================
--- branches/5.1.x/admin_templates/articles/relations_edit.tpl	(nonexistent)
+++ branches/5.1.x/admin_templates/articles/relations_edit.tpl	(revision 13096)
@@ -0,0 +1,49 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="relations_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('n-rel','<inp2:n-rel_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('n-rel','OnCancel');
+						}
+				 ) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_include t="categories/ci_blocks"/>
+
+<inp2:n-rel_SaveWarning name="grid_save_warning"/>
+<inp2:n-rel_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="!la_section_Relation!"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-rel" field="SourceId"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-rel" field="SourceType"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-rel" field="TargetId"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-rel" field="TargetType"/>
+
+			<inp2:m_RenderElement name="inp_id_label" prefix="n-rel" field="RelationshipId" title="!la_fld_Id!"/>
+			<inp2:m_RenderElement name="inp_edit_relation" prefix="n-rel" field="TargetId" title="!la_fld_TargetId!"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="n-rel" field="Type" title="!la_fld_RelationshipType!"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n-rel" field="Enabled" title="!la_fld_Enabled!"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n-rel" field="Priority" title="!la_fld_Priority!" size="4"/>
+		<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/5.1.x/admin_templates/articles/relations_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.4.2.4
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/5.1.x/admin_templates/articles/review_edit.tpl
===================================================================
--- branches/5.1.x/admin_templates/articles/review_edit.tpl	(nonexistent)
+++ branches/5.1.x/admin_templates/articles/review_edit.tpl	(revision 13096)
@@ -0,0 +1,59 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="reviews_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('n-rev','<inp2:n-rev_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('n-rev','OnCancel');
+						}
+				 ) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="n-rev_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="n-rev_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="n-rev_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:n-rev_SaveWarning name="grid_save_warning"/>
+<inp2:n-rev_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="!la_Text_Review!"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-rev" field="ItemId"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox_allow_html" prefix="n-rev" field="TextFormat"/>
+			<inp2:m_RenderElement name="inp_label" prefix="n-rev" field="ReviewId" title="!la_fld_Id!"/>
+			<inp2:m_RenderElement name="inp_edit_user" prefix="n-rev" field="CreatedById" title="!la_fld_CreatedById!" class="text"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="n-rev" field="ReviewText" title="!la_fld_ReviewText!" cols="70" rows="8"/>
+		<inp2:m_RenderElement name="subsection" title="!la_Text_General!"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="n-rev" field="Status" title="!la_fld_Status!"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n-rev" field="Priority" title="!la_fld_Priority!" size="3" class="text"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n-rev" field="CreatedOn" title="!la_fld_CreatedOn!" size="20" class="text"/>
+		<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/5.1.x/admin_templates/articles/review_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.3.2.3
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/5.1.x/admin_templates/articles/images_edit.tpl
===================================================================
--- branches/5.1.x/admin_templates/articles/images_edit.tpl	(nonexistent)
+++ branches/5.1.x/admin_templates/articles/images_edit.tpl	(revision 13096)
@@ -0,0 +1,60 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="images_edit"/>
+
+<inp2:m_include t="incs/image_blocks"/>
+
+<!-- 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('n-img','<inp2:n-img_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('n-img','OnCancel');
+						}
+				 ) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:n-img_SaveWarning name="grid_save_warning"/>
+<inp2:n-img_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="!la_section_Image!"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-img" field="ResourceId"/>
+			<inp2:m_RenderElement name="inp_label" prefix="n-img" field="ImageId" title="!la_fld_Id!"/>
+
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n-img" field="Name" title="!la_fld_Name!" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n-img" field="AltName" title="!la_fld_AltValue!" size="40"/>
+
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n-img" field="Enabled" title="!la_fld_Enabled!" onchange="check_primary()" />
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n-img" field="DefaultImg" title="!la_fld_Primary!" onchange="check_status()" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n-img" field="Priority" title="!la_fld_Priority!" size="5"/>
+
+		<inp2:m_RenderElement name="subsection" title="!la_section_ThumbnailImage!"/>
+			<inp2:m_RenderElement name="thumbnail_section" prefix="n-img"/>
+
+		<inp2:m_RenderElement name="subsection" title="!la_section_FullSizeImage!"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n-img" field="SameImages" title="!la_fld_SameAsThumb!" onchange="toggle_fullsize()"/>
+			<inp2:m_RenderElement name="fullsize_section" prefix="n-img"/>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<script type="text/javascript">
+	<inp2:m_RenderElement name="images_edit_js" prefix="n-img"/>
+	toggle_fullsize();
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: branches/5.1.x/admin_templates/articles/images_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.5.2.4
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/5.1.x/admin_templates/articles/file_edit.tpl
===================================================================
--- branches/5.1.x/admin_templates/articles/file_edit.tpl	(nonexistent)
+++ branches/5.1.x/admin_templates/articles/file_edit.tpl	(revision 13096)
@@ -0,0 +1,41 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="file_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('n-file','<inp2:n-file_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('n-file','OnCancel');
+						}
+				 ) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:n-file_SaveWarning name="grid_save_warning"/>
+<inp2:n-file_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="!la_section_File!"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-file" field="ResourceId"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n-file" field="FileName" title="la_fld_Name" size="50" />
+			<inp2:m_RenderElement name="inp_edit_upload" prefix="n-file" field="FilePath" title="la_fld_FilePath" />
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n-file" field="Status" title="la_fld_Enabled" onchange="check_primary()" />
+			<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/5.1.x/admin_templates/articles/file_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.5
\ No newline at end of property
Index: branches/5.1.x/admin_templates/articles/articles_edit.tpl
===================================================================
--- branches/5.1.x/admin_templates/articles/articles_edit.tpl	(nonexistent)
+++ branches/5.1.x/admin_templates/articles/articles_edit.tpl	(revision 13096)
@@ -0,0 +1,146 @@
+<inp2:adm_SetPopupSize width="880" height="680"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="articles_edit" 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('n','<inp2:n_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('n','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('n', '<inp2:n_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('n', '<inp2:n_NextId/>');
+						}
+				 ) );
+
+				//a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="n_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					//a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="n_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="n_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+
+<inp2:n_SaveWarning name="grid_save_warning"/>
+<inp2:n_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" prefix="n" title="la_section_Article" original_title="la_section_OriginalValues" display_original="1"/>
+
+			<inp2:m_RenderElement name="inp_id_label" prefix="n" field="NewsId" title="!la_fld_Id!" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Title" title="!la_fld_Title!" size="70" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_user" prefix="n" field="CreatedById" title="!la_fld_Author!" size="25" display_original="1"/>
+
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="n" field="Body" title="!la_fld_Body!" control_options="{min_height: 100}" cols="70" rows="8" display_original="1"/>
+
+			<!-- excerpt: begin -->
+			<inp2:m_if check="n_FieldVisible" field="Excerpt">
+				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+					<inp2:m_RenderElement name="inp_edit_field_caption" prefix="n" field="Excerpt" title="la_fld_Excerpt"/>
+					<td class="control-cell">
+						<textarea tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:n_InputName field="Excerpt"/>" name="<inp2:n_InputName field="Excerpt"/>" style="width: 100%; height: 45px" cols="70" rows="3"><inp2:n_Field field="Excerpt"/></textarea><br />
+						<script type="text/javascript">
+							Form.addControl('<inp2:n_InputName field="Excerpt"/>', {min_height: 100});
+						</script>
+						<input type="checkbox" name="generate_excerpt" id="generate_excerpt" value="1" /><label for="generate_excerpt"><inp2:m_phrase name="la_prompt_AutoGen_Excerpt"/></label>
+					</td>
+					<inp2:m_RenderElement name="inp_edit_error" prefix="n" field="Excerpt"/>
+
+					<inp2:m_if check="n_DisplayOriginal" pass_params="1">
+						<inp2:m_RenderElement prefix="n" field="Excerpt" name="inp_original_label"/>
+					</inp2:m_if>
+				</tr>
+			</inp2:m_if>
+			<!-- excerpt: end -->
+
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n" field="AutomaticFilename" title="la_fld_AutomaticFilename" onchange="reflect_filename()" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Filename" title="la_fld_Filename" size="70" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="n" field="CategoryId" title="la_fld_ParentSection" display_original="1"/>
+		<inp2:m_RenderElement name="subsection" prefix="n" title="la_section_Properties" original_title="la_section_OriginalValues" display_original="1"/>
+			<inp2:m_if check="n_DisplayOriginal" display_original="1">
+				<inp2:m_if check="n_FieldVisible" field="Status">
+					<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+						<inp2:m_RenderElement name="inp_edit_field_caption" prefix="n" field="Status" title="!la_fld_Status!"/>
+						<td class="control-cell">
+							<inp2:m_Phrase label="la_UseGridToApproveDecline" />
+						</td>
+					</tr>
+				</inp2:m_if>
+			<inp2:m_else/>
+				<inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="Status" title="!la_fld_Status!" display_original="1"/>
+			</inp2:m_if>
+
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="NewItem" title="!la_fld_New!" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="HotItem" title="!la_fld_Hot!" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="PopItem" title="!la_fld_Pop!" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n" field="EditorsPick" title="!la_fld_EditorsPick!" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n" field="LeadStory" title="!la_fld_LeadStory!" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n" field="LeadCatStory" title="!la_fld_LeadCatStory!" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Priority" title="!la_fld_Priority!" size="4" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n" field="CreatedOn" title="!la_fld_CreatedOn!" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n" field="StartDate" title="!la_fld_StartDate!" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n" field="EndOn" title="!la_fld_EndOn!" display_original="1"/>
+
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="MetaKeywords" title="!la_fld_MetaKeywords!" size="70"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="n" field="MetaDescription" title="!la_fld_MetaDescription!" control_options="{min_height: 100}" cols="70" rows="5"/>
+
+		<inp2:m_RenderElement name="subsection" prefix="n" title="la_section_Counters" original_title="la_section_OriginalValues" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="CachedRating" title="!la_fld_Rating!" hint_label="la_prompt_RatingLimits" size="4" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="CachedVotesQty" title="!la_fld_Votes!" hint_label="la_prompt_VoteLimits" size="4" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Hits" title="!la_fld_Hits!" hint_label="la_prompt_HitLimits" size="4" display_original="1"/>
+			<input type="hidden" name="Hits_original" id="Hits_original" value="<inp2:n_Field name="Hits" db="db" />" />
+
+		<!-- custom fields: begin -->
+		<inp2:m_include t="incs/custom_blocks"/>
+		<inp2:cf.general_PrintList render_as="cv_row_block" SourcePrefix="n" value_field="Value" per_page="-1" grid="Default" original_title="la_section_OriginalValues" display_original="1"/>
+		<!-- custom fields: end -->
+
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<script type="text/javascript">
+	$(document).ready(reflect_filename);
+
+	function reflect_filename()
+    {
+    	var $checked = document.getElementById('_cb_<inp2:n_InputName field="AutomaticFilename"/>').checked;
+    	document.getElementById('<inp2:n_InputName field="Filename"/>').readOnly = $checked;
+    }
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: branches/5.1.x/admin_templates/articles/articles_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.6.2.10
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/5.1.x/admin_templates/articles/articles_custom.tpl
===================================================================
--- branches/5.1.x/admin_templates/articles/articles_custom.tpl	(nonexistent)
+++ branches/5.1.x/admin_templates/articles/articles_custom.tpl	(revision 13096)
@@ -0,0 +1,62 @@
+<inp2:adm_SetPopupSize width="880" height="680"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="articles_custom" grid="SeparateTab" 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('n','<inp2:n_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('n','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('n', '<inp2:n_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('n', '<inp2:n_NextId/>');
+						}
+				 ) );
+
+				function edit(){ }
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="n_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="n_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="n_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="cf" grid="SeparateTab"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_include t="incs/custom_blocks"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="cf" IdField="CustomFieldId" SourcePrefix="n" value_field="Value" per_page="-1" grid="SeparateTab" header_block="grid_column_title_no_sorting" no_init="no_init"/>
+
+<input type="hidden" name="cf_type" value="<inp2:n_UnitOption name='ItemType'/>"/>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: branches/5.1.x/admin_templates/articles/articles_custom.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.5.2.4
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/5.1.x/admin_templates/import.tpl
===================================================================
--- branches/5.1.x/admin_templates/import.tpl	(nonexistent)
+++ branches/5.1.x/admin_templates/import.tpl	(revision 13096)
@@ -0,0 +1,232 @@
+<inp2:adm_SetPopupSize width="780" height="670"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:n.import_PresetFormFields/>
+<inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:main_import" title_preset="import"/>
+
+<!-- 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('import', '<inp2:m_phrase label="la_ToolTip_Import" escape="1"/>', function() {
+
+						document.getElementById('export_columns').value = select_to_string('<inp2:n.import_InputName field="ExportColumns"/>');
+						submit_event('n.import','OnExportBegin');
+
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('n.import','OnGoBack');
+						}
+				 ) );
+
+				a_toolbar.Render();
+
+				function check_radio($id)
+				{
+					document.getElementById($id).checked = true;
+				}
+
+				// gets value of checked radio button
+				function get_checked($field_name) {
+					var $ret = false;
+					var $fields = document.getElementsByName($field_name);
+
+					for(var $i = 0; $i < $fields.length; $i++) {
+						if ($fields[$i].checked) {
+							$ret = $fields[$i].value;
+							break;
+						}
+					}
+					return $ret;
+				}
+
+				// enable/disable form fields based on other field values
+				function reflectFormFields()
+				{
+					var $auto_fields = get_checked('<inp2:n.import_InputName field="FieldTitles"/>') == 1 ? true : false;
+
+					if ($auto_fields) {
+						document.getElementById('_cb_<inp2:n.import_InputName field="SkipFirstRow"/>').checked = true;
+					}
+					document.getElementById('_cb_<inp2:n.import_InputName field="SkipFirstRow"/>').onchange();
+					document.getElementById('<inp2:n.import_InputName field="ExportColumns"/>').disabled = $auto_fields;
+					document.getElementById('<inp2:n.import_InputName field="AvailableColumns"/>').disabled = $auto_fields;
+
+					var $btn = null;
+					var $btns = Array('up', 'down', 'left', 'right');
+					var $i = 0;
+					while ($i < $btns.length) {
+						$btn = document.getElementById('btn_move_'+$btns[$i]);
+						$btn.disabled = $auto_fields;
+						$btn.className = $auto_fields ? 'button-disabled' : 'button';
+						$i++;
+					}
+				}
+
+				Application.setHook('n.import:OnBeforeOpenSelector',
+					function() {
+						document.getElementById('export_columns').value = select_to_string('<inp2:n.import_InputName field="ExportColumns"/>');
+					}
+				);
+
+				$(document).ready(
+					function() {
+						$('#step_number').text(3);
+					}
+				);
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+
+<inp2:n.import_SaveWarning name="grid_save_warning"/>
+<inp2:n.import_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="n.import" field="ImportSource" title="la_fld_ImportFilename"/>
+				<td class="control-cell">
+					<table border="0">
+						<tr>
+							<td>
+								<input type="radio" name="<inp2:n.import_InputName field="ImportSource"/>" id="<inp2:n.import_InputName field="ImportSource"/>_1"<inp2:m_if check="n.import_FieldEquals" field="ImportSource" value="1"> checked</inp2:m_if> value="1" />
+							</td>
+							<td>
+								<label for="<inp2:n.import_InputName field="ImportSource"/>_1">upload</label>
+							</td>
+							<td>
+								<input type="file" name="<inp2:n.import_InputName field="ImportFilename"/>" id="<inp2:n.import_InputName field="ImportFilename"/>" onclick="check_radio('<inp2:n.import_InputName field="ImportSource"/>_1');">
+							</td>
+						</tr>
+
+						<tr>
+							<td>
+								<input type="radio" name="<inp2:n.import_InputName field="ImportSource"/>" id="<inp2:n.import_InputName field="ImportSource"/>_2"<inp2:m_if check="n.import_FieldEquals" field="ImportSource" value="2"> checked</inp2:m_if> value="2" />
+							</td>
+							<td>
+								<label for="<inp2:n.import_InputName field="ImportSource"/>_2">select</label>
+							</td>
+							<td>
+								<select name="<inp2:n.import_InputName field="ImportLocalFilename"/>" onclick="check_radio('<inp2:n.import_InputName field="ImportSource"/>_2');">
+									<inp2:n.import_PredefinedOptions field="ImportLocalFilename" block="inp_option_item" selected="selected"/>
+								</select>
+							</td>
+						</tr>
+
+					</table>
+				</td>
+				<inp2:m_RenderElement name="inp_edit_error" prefix="n.import" field="ImportSource"/>
+			</tr>
+
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n.import" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n.import" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="n.import" field="LineEndings" title="la_fld_LineEndings" use_phrases="0"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n.import" field="SkipFirstRow" title="la_fld_SkipFirstRow"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="n.import" field="FieldTitles" title="la_fld_FieldTitles" onclick="reflectFormFields();"/>
+
+			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="n.import" field="ExportColumns" title="la_fld_ImportColumns"/>
+				<td class="control-cell">
+					<table cellpadding="0" cellspacing="0" border="0">
+						<tr>
+							<td>
+								<input type="button" value="<inp2:m_phrase name="la_btn_Up"/>" id="btn_move_up" onclick="move_options_up('<inp2:n.import_InputName field="ExportColumns"/>', 1)" class="button">
+								<input type="button" value="<inp2:m_phrase name="la_btn_Down"/>" id="btn_move_down" onclick="move_options_down('<inp2:n.import_InputName field="ExportColumns"/>', 1)" class="button"><br />
+								<img src="img/spacer.gif" width="1" height="5" alt=""><br />
+							</td>
+							<td><img src="img/spacer.gif" width="45" height="1" alt=""><br></td>
+							<td><inp2:m_phrase name="la_fld_AvailableColumns"/>:</td>
+						</tr>
+						<tr>
+							<td>
+								<select multiple id="<inp2:n.import_InputName field="ExportColumns"/>" size="15" style="width: 225px;">
+									<inp2:n.import_PredefinedOptions field="ExportColumns" block="inp_option_item" selected="selected"/>
+								</select>
+								<input type="hidden" id="export_columns" name="<inp2:n.import_InputName field="ExportColumns"/>" value="<inp2:n.import_Field field="ExportColumns"/>" />
+							</td>
+							<td align="center">
+								<input type="button" value="&nbsp;&laquo;&laquo;&nbsp;" id="btn_move_left" onclick="move_selected('<inp2:n.import_InputName field="AvailableColumns"/>', '<inp2:n.import_InputName field="ExportColumns"/>')" class="button"><br>
+								<img src="img/spacer.gif" width="1" height="4" alt=""><br>
+								<input type="button" value="&nbsp;&raquo;&raquo;&nbsp;" id="btn_move_right" onclick="move_selected('<inp2:n.import_InputName field="ExportColumns"/>', '<inp2:n.import_InputName field="AvailableColumns"/>'); select_sort('<inp2:n.import_InputName field="AvailableColumns"/>');" class="button">
+							</td>
+							<td>
+								<select multiple id="<inp2:n.import_InputName field="AvailableColumns"/>" size="15" style="width: 225px;">
+									<inp2:n.import_PredefinedOptions field="AvailableColumns" block="inp_option_item" selected="selected"/>
+								</select>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<inp2:m_RenderElement name="inp_edit_error" prefix="n.import" field="ExportColumns"/>
+			</tr>
+
+	<!-- CATEGORY SELECTOR: BEGIN -->
+		<inp2:m_DefineElement name="root_cat_caption">
+			<inp2:c_RootCategoryName/>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="category_caption">
+			<inp2:m_param name="separator"/><inp2:m_param name="cat_name"/>
+		</inp2:m_DefineElement>
+
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="n.import" field="CategoryId" title="la_fld_ImportCategory"/>
+			<td class="control-cell">
+				<b><inp2:n.import_CategoryPath separator=" &gt; " root_cat_render_as="root_cat_caption" render_as="category_caption" session_var="ImportCategory"/></b>
+				<input type="hidden" name="<inp2:n.import_InputName field='CategoryId'/>" value="<inp2:n.import_Field field='CategoryId' db='db'/>" />
+				<a href="javascript:openSelector('n.import', '<inp2:adm_SelectorLink prefix="n.import" selection_mode="single" tab_prefixes="none"/>', 'ImportCategory', null, 'OnSaveSettings');"><img src="img/icons/icon24_cat.gif" border="0" align="absmiddle" /></a>
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" prefix="n.import" field="CategoryId"/>
+		</tr>
+	<!-- CATEGORY SELECTOR: END -->
+
+		<inp2:m_RenderElement name="inp_edit_box" prefix="n.import" field="CategorySeparator" title="la_fld_CategorySeparator" size="2" maxlength="1"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n.import" field="ReplaceDuplicates" title="la_fld_ReplaceDuplicates" />
+
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="n.import" field="CheckDuplicatesMethod" title="la_fld_CheckDuplicatesMethod"/>
+			<td class="control-cell">
+				<table cellspacing="0" cellpadding="0">
+					<tr>
+						<td valign="top">
+							<input type="radio"<inp2:m_if check="n.import_FieldEquals" field="CheckDuplicatesMethod" value="1"> checked</inp2:m_if> name="<inp2:n.import_InputName field="CheckDuplicatesMethod"/>" id="<inp2:n.import_InputName field="CheckDuplicatesMethod"/>_1" value="1" />
+						</td>
+						<td>
+							<label for="<inp2:n.import_InputName field="CheckDuplicatesMethod"/>_1"><inp2:m_phrase name="la_IDField" />: ARTICLEID</label>
+						</td>
+					</tr>
+
+					<tr>
+						<td valign="top">
+							<input type="radio"<inp2:m_if check="n.import_FieldEquals" field="CheckDuplicatesMethod" value="2"> checked</inp2:m_if> name="<inp2:n.import_InputName field="CheckDuplicatesMethod"/>" id="<inp2:n.import_InputName field="CheckDuplicatesMethod"/>_2" value="2" />
+						</td>
+						<td>
+							<label for="<inp2:n.import_InputName field="CheckDuplicatesMethod"/>_2"><inp2:m_phrase name="la_OtherFields" />: </label>
+							<inp2:n.import_PredefinedOptions prefix="n.import" field="DuplicateCheckFields" block="inp_checkbox_item" selected="checked"/>
+
+							<inp2:m_RenderElement prefix="n.import" name="inp_edit_hidden" field="DuplicateCheckFields"/>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" prefix="n.import" field="CheckDuplicatesMethod"/>
+		</tr>
+
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<script language="javascript" type="text/javascript">
+	reflectFormFields();
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: branches/5.1.x/admin_templates/import.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.7
\ No newline at end of property
Index: branches/5.1.x/admin_templates/category_properties.tpl
===================================================================
--- branches/5.1.x/admin_templates/category_properties.tpl	(nonexistent)
+++ branches/5.1.x/admin_templates/category_properties.tpl	(revision 13096)
@@ -0,0 +1,32 @@
+<inp2:m_RenderElement name="subsection" title="la_In-news"/>
+
+<inp2:m_DefineElement name="inp_edit_type" class="" is_last="" maxlength="" onblur="" size="" is_last="" has_empty="0" empty_value="" onchange="" hint_label="" type_field="">
+	<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" hint_label="$hint_label" is_last="$is_last"/>
+			<td class="control-cell">
+				<input type="text" name="<inp2:{$prefix}_InputName field="$field" />" id="<inp2:{$prefix}_InputName field="$field" />" value="<inp2:{$prefix}_Field field="$field" />" 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"/>" onblur="<inp2:m_Param name="onblur"/>">
+
+				<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$type_field"/>" id="<inp2:{$prefix}_InputName field="$type_field"/>" onchange="<inp2:m_Param name="onchange"/>">
+					<inp2:m_if check="{$prefix}_FieldOption" field="$type_field" option="use_phrases">
+						<inp2:{$prefix}_PredefinedOptions field="$type_field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
+					<inp2:m_else/>
+						<inp2:{$prefix}_PredefinedOptions field="$type_field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
+					</inp2:m_if>
+				</select>
+			</td>
+			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+		</tr>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="cust_n_ItemTemplate" type_field="cust_n_ItemTemplate" title="!la_fld_cust_n_ItemTemplate!" size="50"/>
+
+<inp2:m_RenderElement name="subsection" title="!la_section_RssProperties!"/>
+<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="cust_RssSource" type_field="cust_RssSource" title="!la_fld_RssSource!" size="50"/>
+<inp2:m_RenderElement name="inp_edit_type" prefix="c" field="cust_RssUpdateInterval" type_field="cust_RssUpdateIntervalType" title="!la_fld_RssUpdateInterval!"/>
+
+<inp2:m_RenderElement name="subsection" title="!la_section_RssExpiration!"/>
+<inp2:m_RenderElement name="inp_edit_type" prefix="c" field="cust_RssDefaultExpiration" type_field="cust_RssDefaultExpirationType" title="!la_fld_RssDefaultExpiration!"/>
+<inp2:m_RenderElement name="inp_edit_type" prefix="c" field="cust_RssExpireInterval" type_field="cust_RssExpireIntervalType" title="!la_fld_RssExpireInterval!"/>
+<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="cust_RssDeleteExpired" title="!la_fld_RssDeleteExpired!"/>

Property changes on: branches/5.1.x/admin_templates/category_properties.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.3.2.3
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/5.1.x/admin_templates/export.tpl
===================================================================
--- branches/5.1.x/admin_templates/export.tpl	(nonexistent)
+++ branches/5.1.x/admin_templates/export.tpl	(revision 13096)
@@ -0,0 +1,127 @@
+<inp2:adm_SetPopupSize width="780" height="670"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="n.export" section="in-portal:browse" perm_section="NEWS" permission_type="VIEW" system_permission="0" title_preset="articles_export"/>
+
+<!-- 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() {
+						document.getElementById('hidden_export_columns').value = select_to_string('<inp2:n.export_InputName field="ExportColumns"/>');
+						submit_event('n.export','OnExportBegin');
+
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('n.export','OnGoBack');
+						}
+				 ) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+
+<inp2:n.export_SaveWarning name="grid_save_warning"/>
+<inp2:n.export_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_radio" prefix="n.export" field="ExportFormat" title="la_fld_ExportFormat" use_phrases="0"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n.export" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n.export" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="n.export" field="LineEndings" title="la_fld_LineEndings" use_phrases="0"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="n.export" field="LineEndingsInside" title="la_fld_LineEndingsInside" use_phrases="0"/>
+
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n.export" field="IncludeFieldTitles" title="la_fld_IncludeFieldTitles"/>
+
+			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="n.export" field="ExportColumns" title="la_fld_ExportColumns"/>
+				<td class="control-cell">
+					<table cellpadding="0" cellspacing="0" border="0">
+						<tr>
+							<td>
+								<input type="button" value="<inp2:m_phrase name="la_btn_Up"/>" onclick="move_options_up('<inp2:n.export_InputName field="ExportColumns"/>', 1)" class="button">
+								<input type="button" value="<inp2:m_phrase name="la_btn_Down"/>" onclick="move_options_down('<inp2:n.export_InputName field="ExportColumns"/>', 1)" class="button"><br />
+								<img src="img/spacer.gif" width="1" height="5" alt=""><br />
+							</td>
+							<td><img src="img/spacer.gif" width="45" height="1" alt=""><br></td>
+							<td><inp2:m_phrase name="la_fld_AvailableColumns"/>:</td>
+						</tr>
+						<tr>
+							<td>
+								<select multiple id="<inp2:n.export_InputName field="ExportColumns"/>" size="15" style="width: 225px;">
+									<inp2:n.export_PredefinedOptions field="ExportColumns" block="inp_option_item" selected="selected"/>
+								</select>
+								<input type="hidden" id="hidden_export_columns" name="<inp2:n.export_InputName field="ExportColumns"/>" value="<inp2:n.export_Field field="ExportColumns"/>" />
+							</td>
+							<td align="center">
+								<input type="button" value="&nbsp;&laquo;&laquo;&nbsp;" onclick="move_selected('<inp2:n.export_InputName field="AvailableColumns"/>', '<inp2:n.export_InputName field="ExportColumns"/>')" class="button"><br>
+								<img src="img/spacer.gif" width="1" height="4" alt=""><br>
+								<input type="button" value="&nbsp;&raquo;&raquo;&nbsp;" onclick="move_selected('<inp2:n.export_InputName field="ExportColumns"/>', '<inp2:n.export_InputName field="AvailableColumns"/>'); select_sort('<inp2:n.export_InputName field="AvailableColumns"/>');" class="button">
+							</td>
+							<td>
+								<select multiple id="<inp2:n.export_InputName field="AvailableColumns"/>" size="15" style="width: 225px;">
+									<inp2:n.export_PredefinedOptions field="AvailableColumns" block="inp_option_item" selected="selected"/>
+								</select>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<inp2:m_RenderElement name="inp_edit_error" prefix="n.export" field="ExportColumns"/>
+			</tr>
+
+			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="n.export" field="CategoryFormat" title="la_fld_CategoryFormat"/>
+				<td class="control-cell">
+					<table cellspacing="0" cellpadding="0">
+						<tr>
+							<td rowspan="2" valign="top">
+								<input type="radio"<inp2:m_if check="n.export_FieldEquals" field="CategoryFormat" value="1"> checked</inp2:m_if> name="<inp2:n.export_InputName field="CategoryFormat"/>" id="<inp2:n.export_InputName field="CategoryFormat"/>_1" value="1" />
+							</td>
+							<td>
+								<label for="<inp2:n.export_InputName field="CategoryFormat"/>_1"><inp2:m_phrase label="la_MixedCategoryPath"/></label>
+							</td>
+						</tr>
+						<tr>
+							<td>
+								<span class="<inp2:m_if check="n.export_HasError" field="CategorySeparator">error</inp2:m_if>"><inp2:m_phrase name="la_fld_CategorySeparator"/></span><inp2:m_if check="n.export_IsRequired" field="CategorySeparator"><span class="error"> *</span></inp2:m_if>:
+								 <input type="text" name="<inp2:n.export_InputName field="CategorySeparator"/>" id="<inp2:n.export_InputName field="CategorySeparator"/>" value="<inp2:n.export_Field field="CategorySeparator"/>" size="2" maxlength="1" /><br />
+								(will look like "Category:Sub-category:Sub-sub-category")
+
+							</td>
+						</tr>
+
+						<tr>
+							<td rowspan="2" valign="top">
+								<input type="radio"<inp2:m_if check="n.export_FieldEquals" field="CategoryFormat" value="2"> checked</inp2:m_if> name="<inp2:n.export_InputName field="CategoryFormat"/>" id="<inp2:n.export_InputName field="CategoryFormat"/>_2" value="2" />
+							</td>
+							<td>
+								<label for="<inp2:n.export_InputName field="CategoryFormat"/>_2"><inp2:m_phrase label="la_SeparatedCategoryPath"/></label><br />
+								(the fields will be titled Category1..CategoryN accordingly)
+							</td>
+						</tr>
+					</table>
+				</td>
+				<inp2:m_RenderElement name="inp_edit_error" prefix="n.export" field="CategoryFormat"/>
+			</tr>
+
+			<inp2:m_if check="m_GetEquals" name="m_cat_id" value="0" inverse="inverse">
+				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n.export" field="IsBaseCategory" title="la_fld_IsBaseCategory" />
+			</inp2:m_if>
+
+			<inp2:m_RenderElement name="inp_edit_box" prefix="n.export" field="ExportFilename" title="la_fld_ExportFilename" size="20" />
+			<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/5.1.x/admin_templates/export.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.5
\ No newline at end of property
Index: branches/5.1.x/admin_templates/export_finish.tpl
===================================================================
--- branches/5.1.x/admin_templates/export_finish.tpl	(nonexistent)
+++ branches/5.1.x/admin_templates/export_finish.tpl	(revision 13096)
@@ -0,0 +1,43 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="n.export" section="in-portal:browse" perm_section="NEWS" permission_type="VIEW" system_permission="0" title_preset="articles_export"/>
+
+<!-- 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('n.export', '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'/>">
+			<inp2:m_inc param="tab_index" by="1"/>
+			<td class="label-cell">
+				<inp2:m_phrase label="la_DownloadExportFile"/>
+			</td>
+			<td class="control-mid">&nbsp;</td>
+			<td class="control-cell">
+				<a href="<inp2:n.export_ExportPath as_url="1"/>"><inp2:n.export_ExportPath /></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/5.1.x/admin_templates/export_finish.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.6
\ No newline at end of property
Index: branches/5.1.x/admin_templates/import_progress.tpl
===================================================================
--- branches/5.1.x/admin_templates/import_progress.tpl	(nonexistent)
+++ branches/5.1.x/admin_templates/import_progress.tpl	(revision 13096)
@@ -0,0 +1,14 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="n.import" section="in-portal:browse" perm_section="NEWS" permission_type="VIEW" system_permission="0" title_preset="articles_import"/>
+
+<inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
+
+<script type="text/javascript">
+	function cancel_action() {
+		submit_event('n.import', 'OnExportCancel');
+	}
+
+	$LinkImport = new AjaxProgressBar('<inp2:m_t t="dummy" n.import_event="OnExportProgress" pass="m,n.import" js_escape="1"/>');
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: branches/5.1.x/admin_templates/import_progress.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.4
\ No newline at end of property
Index: branches/5.1.x/admin_templates/export_progress.tpl
===================================================================
--- branches/5.1.x/admin_templates/export_progress.tpl	(nonexistent)
+++ branches/5.1.x/admin_templates/export_progress.tpl	(revision 13096)
@@ -0,0 +1,14 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="n.export" section="in-portal:browse" perm_section="NEWS" permission_type="VIEW" system_permission="0" title_preset="articles_export"/>
+
+<inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
+
+<script type="text/javascript">
+	function cancel_action() {
+		submit_event('n.export', 'OnExportCancel');
+	}
+
+	$LinkExport = new AjaxProgressBar('<inp2:m_t t="dummy" n.export_event="OnExportProgress" pass="m,n.export" js_escape="1"/>');
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: branches/5.1.x/admin_templates/export_progress.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.3
\ No newline at end of property
Index: branches/5.1.x/install/upgrades.sql
===================================================================
--- branches/5.1.x/install/upgrades.sql	(nonexistent)
+++ branches/5.1.x/install/upgrades.sql	(revision 13096)
@@ -0,0 +1,64 @@
+# ===== v 4.3.9 =====
+
+INSERT INTO ImportScripts VALUES (DEFAULT, 'Articles from CSV file [In-News]', '', 'n', 'In-News', '', 'CSV', '1');
+
+# ===== v 5.0.0 =====
+ALTER TABLE News ADD INDEX (StartDate), ADD INDEX (Archived);
+
+UPDATE Category SET Template = '/in-news/designs/section' WHERE Template = 'innews/index';
+UPDATE Category SET CachedTemplate = '/in-news/designs/section' WHERE CachedTemplate = 'innews/index';
+
+UPDATE ConfigurationValues SET VariableValue = '/in-news/designs/section' WHERE VariableName = 'n_CategoryTemplate';
+UPDATE ConfigurationValues SET VariableValue = 'in-news/designs/detail' WHERE VariableName = 'n_ItemTemplate';
+
+INSERT INTO Permissions VALUES (DEFAULT, 'in-news:articles.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-news:setting_folder.view', 11, 1, 1, 0);
+DELETE FROM Permissions WHERE Permission LIKE 'in-news:innews_general.%';
+
+UPDATE Phrase SET Module = 'In-News' WHERE ((Phrase LIKE '%Article%' OR Phrase LIKE '%News%') AND (Module = 'Core') AND Phrase NOT IN ('la_ToolTip_NewSearchConfig', 'la_tooltip_newstylesheet'));
+
+UPDATE Phrase SET Module = 'In-News' WHERE Phrase = 'la_title_In-News';
+
+# ===== v 5.0.1 =====
+UPDATE ConfigurationValues SET VariableValue = 'in-news/articles/article_detail' WHERE VariableName = 'n_ItemTemplate';
+
+UPDATE ConfigurationAdmin
+SET ValueList = 'ReviewText=la_opt_CommentText,CreatedOn=la_opt_CreatedOn'
+WHERE VariableName IN ('News_SortReviews', 'News_SortReviews2');
+
+UPDATE ConfigurationAdmin SET ValueList = 'ASC=la_common_Ascending,DESC=la_common_Descending'
+WHERE VariableName IN ('News_SortReviewsOrder', 'News_SortReviewsOrder2');
+
+UPDATE ConfigurationAdmin
+SET ValueList = '1=la_opt_Sec,60=la_opt_Min,3600=la_opt_Hour,86400=la_opt_Day,604800=la_opt_Week,2419200=la_opt_Month,29030400=la_opt_Year'
+WHERE VariableName IN ('News_ReviewDelay_Interval', 'News_RatingDelay_Interval');
+
+UPDATE CustomField SET FieldLabel = 'la_fld_RssSource', Prompt = 'la_fld_RssSource' WHERE FieldName = 'RssSource';
+UPDATE CustomField SET FieldLabel = 'la_fld_RssDefaultExpiration', Prompt = 'la_fld_RssDefaultExpiration' WHERE FieldName = 'RssDefaultExpiration';
+UPDATE CustomField SET FieldLabel = 'la_fld_RssUpdateInterval', Prompt = 'la_fld_RssUpdateInterval' WHERE FieldName = 'RssUpdateInterval';
+UPDATE CustomField SET FieldLabel = 'la_fld_RssExpireInterval', Prompt = 'la_fld_RssExpireInterval' WHERE FieldName = 'RssExpireInterval';
+UPDATE CustomField SET FieldLabel = 'la_fld_RssDeleteExpired', Prompt = 'la_fld_RssDeleteExpired' WHERE FieldName = 'RssDeleteExpired';
+
+UPDATE CustomField SET FieldLabel = 'la_fld_RssLastExpired', Prompt = 'la_fld_RssLastExpired' WHERE FieldName = 'RssLastExpired';
+UPDATE CustomField SET FieldLabel = 'la_fld_RssDefaultExpirationType', Prompt = 'la_fld_RssDefaultExpirationType' WHERE FieldName = 'RssDefaultExpirationType';
+UPDATE CustomField SET FieldLabel = 'la_fld_RssExpireIntervalType', Prompt = 'la_fld_RssExpireIntervalType' WHERE FieldName = 'RssExpireIntervalType';
+UPDATE CustomField SET FieldLabel = 'la_fld_RssUpdateIntervalType', Prompt = 'la_fld_RssUpdateIntervalType' WHERE FieldName = 'RssUpdateIntervalType';
+UPDATE CustomField SET FieldLabel = 'la_fld_RssLastUpdated', Prompt = 'la_fld_RssLastUpdated' WHERE FieldName = 'RssLastUpdated';
+UPDATE CustomField SET FieldLabel = 'la_fld_RssArticleCRC', Prompt = 'la_fld_RssArticleCRC' WHERE FieldName = 'RssArticleCRC';
+UPDATE CustomField SET FieldLabel = 'la_fld_cust_n_ItemTemplate', Prompt = 'la_fld_cust_n_ItemTemplate' WHERE FieldName = 'n_ItemTemplate';
+
+INSERT INTO Events VALUES(DEFAULT, 'NEWS.REVIEW.ADD.PENDING', NULL, 1, 0, NULL, 'In-News', 'la_event_article.review.add.pending', 1);
+
+UPDATE ConfigurationAdmin SET ValueList = 'style="width: 50px;"' WHERE VariableName IN ('News_ReviewDelay_Value', 'News_RatingDelay_Value');
+
+# ===== v 5.0.2-B1 =====
+ALTER TABLE News
+	CHANGE CreatedOn CreatedOn INT(11) NULL DEFAULT NULL,
+	CHANGE StartDate StartDate INT(11) NULL DEFAULT NULL,
+	CHANGE Modified Modified INT(11) NULL DEFAULT NULL;
+
+# ===== v 5.0.2-B2 =====
+
+# ===== v 5.0.2-RC1 =====
+
+# ===== v 5.0.2 =====
\ No newline at end of file

Property changes on: branches/5.1.x/install/upgrades.sql
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.8
\ No newline at end of property
Index: branches/5.1.x/install/english.lang
===================================================================
--- branches/5.1.x/install/english.lang	(nonexistent)
+++ branches/5.1.x/install/english.lang	(revision 13096)
@@ -0,0 +1,116 @@
+<LANGUAGES>
+	<LANGUAGE PackName="English" Encoding="base64"><DATEFORMAT>m/d/Y</DATEFORMAT><TIMEFORMAT>g:i A</TIMEFORMAT><INPUTDATEFORMAT>m/d/Y</INPUTDATEFORMAT><INPUTTIMEFORMAT>g:i:s A</INPUTTIMEFORMAT><DECIMAL>.</DECIMAL><THOUSANDS>,</THOUSANDS><CHARSET>utf-8</CHARSET><DOCS_URL>http://docs.in-portal.org/eng/index.php</DOCS_URL><UNITSYSTEM>2</UNITSYSTEM>
+		<PHRASES>
+			<PHRASE Label="la_Article_Author" Module="In-News" Type="1">QXV0aG9y</PHRASE>
+			<PHRASE Label="la_Article_Date" Module="In-News" Type="1">RGF0ZQ==</PHRASE>
+			<PHRASE Label="la_Article_Excerpt" Module="In-News" Type="1">QXJ0aWNsZSBFeGNlcnB0</PHRASE>
+			<PHRASE Label="la_Article_Hits" Module="In-News" Type="1">SGl0cw==</PHRASE>
+			<PHRASE Label="la_Article_Rating" Module="In-News" Type="1">UmF0aW5n</PHRASE>
+			<PHRASE Label="la_Article_Title" Module="In-News" Type="1">QXJ0aWNsZSBUaXRsZQ==</PHRASE>
+			<PHRASE Label="la_col_Author" Module="In-News" Type="1">QXV0aG9y</PHRASE>
+			<PHRASE Label="la_col_EndOn" Module="In-News" Type="1">QXJjaGl2YXRpb24gRGF0ZQ==</PHRASE>
+			<PHRASE Label="la_col_LeadCatStory" Module="In-News" Type="1">U2VjdGlvbiBMZWFk</PHRASE>
+			<PHRASE Label="la_col_LeadStory" Module="In-News" Type="1">U2l0ZSBMZWFk</PHRASE>
+			<PHRASE Label="la_col_StartDate" Module="In-News" Type="1">U3RhcnQgRGF0ZQ==</PHRASE>
+			<PHRASE Label="la_event_article.add" Module="In-News" Type="1">QWRkIEFydGljbGU=</PHRASE>
+			<PHRASE Label="la_event_article.approve" Module="In-News" Type="1">QXBwcm92ZSBBcnRpY2xl</PHRASE>
+			<PHRASE Label="la_event_article.deny" Module="In-News" Type="1">RGVjbGluZSBBcnRpY2xl</PHRASE>
+			<PHRASE Label="la_event_article.modify" Module="In-News" Type="1">TW9kaWZ5IEFydGljbGU=</PHRASE>
+			<PHRASE Label="la_event_article.modify.approve" Module="In-News" Type="1">QXBwcm92ZSBBcnRpY2xlIE1vZGlmaWNhdGlvbg==</PHRASE>
+			<PHRASE Label="la_event_article.modify.deny" Module="In-News" Type="1">RGVjbGluZSBBcnRpY2xlIE1vZGlmaWNhdGlvbg==</PHRASE>
+			<PHRASE Label="la_event_article.review.add" Module="In-News" Type="1">QXJ0aWNsZSBDb21tZW50IEFkZGVk</PHRASE>
+			<PHRASE Label="la_event_article.review.add.pending" Module="In-News" Type="1">QXJ0aWNsZSBDb21tZW50IFBlbmRpbmc=</PHRASE>
+			<PHRASE Label="la_event_article.review.approve" Module="In-News" Type="1">QXJ0aWNsZSBDb21tZW50IEFwcHJvdmVk</PHRASE>
+			<PHRASE Label="la_event_article.review.deny" Module="In-News" Type="1">QXJ0aWNsZSBDb21tZW50IERlY2xpbmVk</PHRASE>
+			<PHRASE Label="la_event_news.add.pending" Module="In-News" Type="1">QXJ0aWNsZSBBZGQgUGVuZGluZw==</PHRASE>
+			<PHRASE Label="la_event_news.modify.pending" Module="In-News" Type="1">QXJ0aWNsZSBNb2RpZnkgUGVuZGluZw==</PHRASE>
+			<PHRASE Label="la_fld_Author" Module="In-News" Type="1">QXV0aG9y</PHRASE>
+			<PHRASE Label="la_fld_Body" Module="In-News" Type="1">QXJ0aWNsZSBCb2R5</PHRASE>
+			<PHRASE Label="la_fld_cust_n_ItemTemplate" Module="In-News" Type="1">TmV3cyBJdGVtIFRlbXBsYXRl</PHRASE>
+			<PHRASE Label="la_fld_EndOn" Module="In-News" Type="1">QXJjaGl2YXRpb24gRGF0ZQ==</PHRASE>
+			<PHRASE Label="la_fld_Excerpt" Module="In-News" Type="1">QXJ0aWNsZSBFeGNlcnB0</PHRASE>
+			<PHRASE Label="la_fld_LeadCatStory" Module="In-News" Type="1">U2VjdGlvbiBMZWFkIFN0b3J5</PHRASE>
+			<PHRASE Label="la_fld_LeadStory" Module="In-News" Type="1">U2l0ZSBMZWFkIFN0b3J5</PHRASE>
+			<PHRASE Label="la_fld_News_MaxHotNumber" Module="In-News" Type="1">TWF4aW11bSBudW1iZXIgb2YgSE9UIGFydGljbGVz</PHRASE>
+			<PHRASE Label="la_fld_News_MinPopRating" Module="In-News" Type="1">TWluaW11bSByYXRpbmcgdG8gY29uc2lkZXIgYXJ0aWNsZSBQT1A=</PHRASE>
+			<PHRASE Label="la_fld_News_MinPopVotes" Module="In-News" Type="1">TWluaW11bSBudW1iZXIgb2Ygdm90ZXMgdG8gY29uc2lkZXIgYXJ0aWNsZSBQT1A=</PHRASE>
+			<PHRASE Label="la_fld_RssArticleCRC" Module="In-News" Type="1">UlNTIEFydGljbGUgQ1JDMzI=</PHRASE>
+			<PHRASE Label="la_fld_RssDefaultExpiration" Module="In-News" Type="1">RGVmYXVsdCBFeHBpcmF0aW9u</PHRASE>
+			<PHRASE Label="la_fld_RssDefaultExpirationType" Module="In-News" Type="1">RGVmYXVsdCBFeHBpcmF0aW9uIFR5cGU=</PHRASE>
+			<PHRASE Label="la_fld_RssDeleteExpired" Module="In-News" Type="1">RGVsZXRlIEV4cGlyZWQ=</PHRASE>
+			<PHRASE Label="la_fld_RssExpireInterval" Module="In-News" Type="1">RXhwaXJhdGlvbiBDaGVjayBJbnRlcnZhbA==</PHRASE>
+			<PHRASE Label="la_fld_RssExpireIntervalType" Module="In-News" Type="1">RXhwaXJhdGlvbiBJbnRlcnZhbCBUeXBl</PHRASE>
+			<PHRASE Label="la_fld_RssLastExpired" Module="In-News" Type="1">TGFzdCBFeHBpcmVkIE9u</PHRASE>
+			<PHRASE Label="la_fld_RssLastUpdated" Module="In-News" Type="1">TGFzdCBVcGRhdGVk</PHRASE>
+			<PHRASE Label="la_fld_RssOriginalURL" Module="In-News" Type="1">RmVlZCBPcmlnaW5hbCBVUkw=</PHRASE>
+			<PHRASE Label="la_fld_RssSource" Module="In-News" Type="1">U291cmNlIFVSTA==</PHRASE>
+			<PHRASE Label="la_fld_RssUpdateInterval" Module="In-News" Type="1">VXBkYXRlIEludGVydmFs</PHRASE>
+			<PHRASE Label="la_fld_RssUpdateIntervalType" Module="In-News" Type="1">VXBkYXRlIEludGVydmFsIFR5cGU=</PHRASE>
+			<PHRASE Label="la_fld_StartDate" Module="In-News" Type="1">U3RhcnQgRGF0ZQ==</PHRASE>
+			<PHRASE Label="la_In-news" Module="In-News" Type="1">SW4tTmV3cw==</PHRASE>
+			<PHRASE Label="la_ItemTab_News" Module="In-News" Type="1">QXJ0aWNsZXM=</PHRASE>
+			<PHRASE Label="la_news_daysarchive_prompt" Module="In-News" Type="1">TnVtYmVyIG9mIGRheXMgdG8gYXJjaGl2ZSBhcnRpY2xlcyBhdXRvbWF0aWNhbGx5</PHRASE>
+			<PHRASE Label="la_news_editorpicksabove_prompt" Module="In-News" Type="1">RGlzcGxheSBlZGl0b3IgUElDS3MgYWJvdmUgcmVndWxhciBhcnRpY2xlcw==</PHRASE>
+			<PHRASE Label="la_news_newdays_prompt" Module="In-News" Type="1">TnVtYmVyIG9mIGRheXMgZm9yIGEgYXJ0aWNsZSB0byBiZSBORVc=</PHRASE>
+			<PHRASE Label="la_news_perpage_prompt" Module="In-News" Type="1">TnVtYmVyIG9mIGFydGljbGVzIHBlciBwYWdl</PHRASE>
+			<PHRASE Label="la_news_perpage_short_prompt" Module="In-News" Type="1">QXJ0aWNsZXMgUGVyIFBhZ2UgKFNob3J0bGlzdCk=</PHRASE>
+			<PHRASE Label="la_news_sortfield2_pompt" Module="In-News" Type="1">QW5kIHRoZW4gYnk=</PHRASE>
+			<PHRASE Label="la_news_sortfield_pompt" Module="In-News" Type="1">T3JkZXIgYXJ0aWNsZXMgYnk=</PHRASE>
+			<PHRASE Label="la_news_sortreviews2_prompt" Module="In-News" Type="1">QW5kIHRoZW4gYnk=</PHRASE>
+			<PHRASE Label="la_news_sortreviews_prompt" Module="In-News" Type="1">U29ydCBDb21tZW50cyBieQ==</PHRASE>
+			<PHRASE Label="la_prompt_ActiveArticles" Module="In-News" Type="1">QWN0aXZlIEFydGljbGVz</PHRASE>
+			<PHRASE Label="la_prompt_ArticleAverageRating" Module="In-News" Type="1">QXZlcmFnZSBSYXRpbmcgb2YgQXJ0aWNsZXM=</PHRASE>
+			<PHRASE Label="la_prompt_ArticleReviews" Module="In-News" Type="1">VG90YWwgQXJ0aWNsZSBDb21tZW50cw==</PHRASE>
+			<PHRASE Label="la_prompt_ArticlesActive" Module="In-News" Type="1">QWN0aXZlIEFydGljbGVz</PHRASE>
+			<PHRASE Label="la_prompt_ArticlesArchived" Module="In-News" Type="1">QXJjaGl2ZWQgQXJ0aWNsZXM=</PHRASE>
+			<PHRASE Label="la_prompt_ArticlesPending" Module="In-News" Type="1">UGVuZGluZyBBcnRpY2xlcw==</PHRASE>
+			<PHRASE Label="la_prompt_ArticlesTotal" Module="In-News" Type="1">VG90YWwgQXJ0aWNsZXM=</PHRASE>
+			<PHRASE Label="la_prompt_CategoryLeadStoryArticles" Module="In-News" Type="1">U2VjdGlvbiBMZWFkIFN0b3J5IEFydGljbGVz</PHRASE>
+			<PHRASE Label="la_prompt_DisabledArticles" Module="In-News" Type="1">RGlzYWJsZWQgQXJ0aWNsZXM=</PHRASE>
+			<PHRASE Label="la_prompt_EditorsPickArticles" Module="In-News" Type="1">RWRpdG9yJ3MgUGljayBBcnRpY2xlcw==</PHRASE>
+			<PHRASE Label="la_prompt_HotArticles" Module="In-News" Type="1">SG90IEFydGljbGVz</PHRASE>
+			<PHRASE Label="la_prompt_LastArticleUpdate" Module="In-News" Type="1">TGFzdCBVcGRhdGVkIEFydGljbGU=</PHRASE>
+			<PHRASE Label="la_prompt_LeadStoryArticles" Module="In-News" Type="1">TGVhZCBTdG9yeSBBcnRpY2xlcw==</PHRASE>
+			<PHRASE Label="la_prompt_MaxHitsArticles" Module="In-News" Type="1">TWF4aW11bSBIaXRzIG9mIGFuIEFydGljbGU=</PHRASE>
+			<PHRASE Label="la_prompt_MaxVotesArticles" Module="In-News" Type="1">TWF4aW11bSBWb3RlcyBvZiBhbiBBcnRpY2xl</PHRASE>
+			<PHRASE Label="la_prompt_NewArticles" Module="In-News" Type="1">TmV3IEFydGljbGVz</PHRASE>
+			<PHRASE Label="la_prompt_NewestArticleDate" Module="In-News" Type="1">TmV3ZXN0IEFydGljbGUgRGF0ZQ==</PHRASE>
+			<PHRASE Label="la_prompt_PopularArticles" Module="In-News" Type="1">UG9wdWxhciBBcnRpY2xlcw==</PHRASE>
+			<PHRASE Label="la_section_Article" Module="In-News" Type="1">QXJ0aWNsZQ==</PHRASE>
+			<PHRASE Label="la_section_RssExpiration" Module="In-News" Type="1">UlNTIEZlZWQgQXJ0aWNsZSBFeHBpcmF0aW9u</PHRASE>
+			<PHRASE Label="la_section_RssProperties" Module="In-News" Type="1">UlNTIEZlZWQgUHJvcGVydGllcw==</PHRASE>
+			<PHRASE Label="la_tab_Articles" Module="In-News" Type="1">QXJ0aWNsZXM=</PHRASE>
+			<PHRASE Label="la_Text_Article" Module="In-News" Type="1">QXJ0aWNsZQ==</PHRASE>
+			<PHRASE Label="la_Text_Articles" Module="In-News" Type="1">QXJ0aWNsZXM=</PHRASE>
+			<PHRASE Label="la_title_AddingArticle" Module="In-News" Type="1">QWRkaW5nIEFydGljbGU=</PHRASE>
+			<PHRASE Label="la_title_Articles" Module="In-News" Type="1">QXJ0aWNsZXM=</PHRASE>
+			<PHRASE Label="la_title_EditingArticle" Module="In-News" Type="1">RWRpdGluZyBBcnRpY2xl</PHRASE>
+			<PHRASE Label="la_title_ImportArticles" Module="In-News" Type="1">SW1wb3J0IEFydGljbGVz</PHRASE>
+			<PHRASE Label="la_title_In-News" Module="In-News" Type="1">TmV3cw==</PHRASE>
+			<PHRASE Label="la_title_NewArticle" Module="In-News" Type="1">TmV3IEFydGljbGU=</PHRASE>
+			<PHRASE Label="la_ToolTip_NewArticle" Module="In-News" Type="1">TmV3IEFydGljbGU=</PHRASE>
+			<PHRASE Label="lu_PermName_News.Review.Pending_desc" Module="In-News" Type="2">UmV2aWV3IE5ld3MgUGVuZGluZw==</PHRASE>
+			<PHRASE Label="lu_PermName_News.Review_desc" Module="In-News" Type="1">Q29tbWVudCBBcnRpY2xl</PHRASE>
+		</PHRASES>
+		<EVENTS>
+			<EVENT MessageType="html" Event="NEWS.ADD" Type="0">U3ViamVjdDogWW91ciBOZXcgQXJ0aWNsZSAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBBZGRlZAoKVGhhbmsgeW91IGZvciBzdWJtaXR0aW5nIHlvdXIgQXJ0aWNsZSB0byBvdXIgd2Vic2l0ZSE8YnIvPjxici8+DQ1BcnRpY2xlIGRldGFpbHMgYXJlIGxpc3RlZCBiZWxvdzo8YnIvPjxici8+DQ1BcnRpY2xlIFRpdGxlOiA8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+PGJyLz4NPGlucDI6bV9pZiBjaGVjaz0ibl9GaWVsZCIgbmFtZT0iQm9keSI+DUJvZHk6IDxpbnAyOm5fRmllbGQgbmFtZT0iQm9keSIvPjxici8+DTwvaW5wMjptX2lmPg08YnIvPjxici8+DQ1Zb3UgY2FuIHZpZXcgeW91ciBhcnRpY2xlIGhlcmUgPGEgaHJlZj0iPGlucDI6bl9BcnRpY2xlTGluayB0ZW1wbGF0ZT0iX19kZWZhdWx0X18iLz4iPjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz48L2E+</EVENT>
+			<EVENT MessageType="html" Event="NEWS.ADD" Type="1">U3ViamVjdDogTmV3IEFydGljbGUgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iIGhhcyBiZWVuIEFkZGVkCgpOZXcgQXJ0aWNsZSBoYXMgYmVlbiBzdWJtaXR0ZWQgdG8gb3VyIHdlYnNpdGUhPGJyLz48YnIvPg0NQXJ0aWNsZSBkZXRhaWxzIGFyZSBsaXN0ZWQgYmVsb3c6PGJyLz48YnIvPg0NQXJ0aWNsZSBUaXRsZTogPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPjxici8+DTxpbnAyOm1faWYgY2hlY2s9Im5fRmllbGQiIG5hbWU9IkJvZHkiPg1Cb2R5OiA8aW5wMjpuX0ZpZWxkIG5hbWU9IkJvZHkiLz48YnIvPg08L2lucDI6bV9pZj4NPGJyLz48YnIvPg0NWW91IGNhbiB2aWV3IHlvdXIgYXJ0aWNsZSBoZXJlIDxhIGhyZWY9IjxpbnAyOm5fQXJ0aWNsZUxpbmsgdGVtcGxhdGU9Il9fZGVmYXVsdF9fIi8+Ij48aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+PC9hPg==</EVENT>
+			<EVENT MessageType="html" Event="NEWS.ADD.PENDING" Type="0">U3ViamVjdDogTmV3IEFydGljbGUgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iIC0gUGVuZGluZwoKTmV3IEFydGljbGUgaGFzIGJlZW4gc3VibWl0dGVkIHRvIG91ciB3ZWJzaXRlIGFuZCBwZW5kaW5nIGZvciBhZG1pbmlzdHJhdGl2ZSBhcHByb3ZhbCE8YnIvPjxici8+DQoNCkFydGljbGUgZGV0YWlscyBhcmUgbGlzdGVkIGJlbG93Ojxici8+PGJyLz4NCg0KQXJ0aWNsZSBUaXRsZTogPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPjxici8+DQo8aW5wMjptX2lmIGNoZWNrPSJuX0ZpZWxkIiBuYW1lPSJCb2R5Ij4NCkJvZHk6IDxpbnAyOm5fRmllbGQgbmFtZT0iQm9keSIvPjxici8+DQo8L2lucDI6bV9pZj4NCjxici8+PGJyLz4NCg0KWW91IGNhbiB2aWV3IHlvdXIgYXJ0aWNsZSBoZXJlIDxhIGhyZWY9IjxpbnAyOm5fQXJ0aWNsZUxpbmsgdGVtcGxhdGU9Il9fZGVmYXVsdF9fIi8+Ij48aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+PC9hPg==</EVENT>
+			<EVENT MessageType="html" Event="NEWS.ADD.PENDING" Type="1">U3ViamVjdDogTmV3IEFydGljbGUgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iIC0gUGVuZGluZwoKTmV3IEFydGljbGUgaGFzIGJlZW4gc3VibWl0dGVkIHRvIG91ciB3ZWJzaXRlIGFuZCBwZW5kaW5nIGZvciBhZG1pbmlzdHJhdGl2ZSBhcHByb3ZhbCE8YnIvPjxici8+DQoNCkFydGljbGUgZGV0YWlscyBhcmUgbGlzdGVkIGJlbG93Ojxici8+PGJyLz4NCg0KQXJ0aWNsZSBUaXRsZTogPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPjxici8+DQo8aW5wMjptX2lmIGNoZWNrPSJuX0ZpZWxkIiBuYW1lPSJCb2R5Ij4NCkJvZHk6IDxpbnAyOm5fRmllbGQgbmFtZT0iQm9keSIvPjxici8+DQo8L2lucDI6bV9pZj4NCjxici8+PGJyLz4NCg0KWW91IGNhbiB2aWV3IHlvdXIgYXJ0aWNsZSBoZXJlIDxhIGhyZWY9IjxpbnAyOm5fQXJ0aWNsZUxpbmsgdGVtcGxhdGU9Il9fZGVmYXVsdF9fIi8+Ij48aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+PC9hPg==</EVENT>
+			<EVENT MessageType="html" Event="NEWS.APPROVE" Type="0">U3ViamVjdDogWW91ciBBcnRpY2xlICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiAtIEFwcHJvdmVkCgpZb3VyIEFydGljbGUgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iIGhhcyBiZWVuIGFwcHJvdmVk</EVENT>
+			<EVENT MessageType="html" Event="NEWS.DENY" Type="0">U3ViamVjdDogWW91ciBBcnRpY2xlICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiAtIERlY2xpbmVkCgpZb3VyIEFydGljbGUgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iIGhhcyBiZWVuIGRlY2xpbmVkLg==</EVENT>
+			<EVENT MessageType="html" Event="NEWS.MODIFY" Type="0">U3ViamVjdDogWW91ciBBcnRpY2xlICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiAtIFVwZGF0ZWQKCllvdXIgQXJ0aWNsZSAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgaGFzIGJlZW4gdXBkYXRlZC4=</EVENT>
+			<EVENT MessageType="html" Event="NEWS.MODIFY" Type="1">U3ViamVjdDogQXJ0aWNsZSAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBVcGRhdGVkCgpBcnRpY2xlICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiBoYXMgYmVlbiB1cGRhdGVkLg==</EVENT>
+			<EVENT MessageType="html" Event="NEWS.MODIFY.APPROVE" Type="0">U3ViamVjdDogWW91ciBNb2RpZmljYXRpb25zIGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIgLz4iIC0gQXBwcm92ZWQhCgpZb3VyIE1vZGlmaWNhdGlvbnMgZm9yICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIiAvPiIgbGluayB3ZXJlIGFwcHJvdmVkIGJ5IHRoZSB3ZWJzaXRlLg==</EVENT>
+			<EVENT MessageType="html" Event="NEWS.MODIFY.DENY" Type="0">U3ViamVjdDogWW91ciBNb2RpZmljYXRpb25zIGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBEZWNsaW5lZAoKWW91ciBtb2RpZmljYXRpb25zIGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgYXJ0aWNsZSB3ZXJlIGRlY2xpbmVkLg==</EVENT>
+			<EVENT MessageType="html" Event="NEWS.MODIFY.PENDING" Type="0">U3ViamVjdDogTW9kaWZpY2F0aW9ucyBmb3IgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iIC0gUGVuZGluZwoKTW9kaWZpY2F0aW9ucyBmb3IgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iIGFydGljbGUgYXJlIHBlbmRpbmcgZm9yIGFkbWluaXN0cmF0aXZlIGFwcHJvdmFsLg==</EVENT>
+			<EVENT MessageType="html" Event="NEWS.MODIFY.PENDING" Type="1">U3ViamVjdDogQXJ0aWNsZSBNb2RpZmljYXRpb25zIGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBQZW5kaW5nCgpNb2RpZmljYXRpb25zIGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgYXJ0aWNsZSBhcmUgcGVuZGluZyBmb3IgYWRtaW5pc3RyYXRpdmUgYXBwcm92YWwu</EVENT>
+			<EVENT MessageType="html" Event="NEWS.REVIEW.ADD" Type="0">U3ViamVjdDogWW91ciBDb21tZW50IGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgYXJ0aWNsZSAtIFB1Ymxpc2hlZAoKWW91ciBjb21tZW50IGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgYXJ0aWNsZSBoYXMgYmVlbiBwdWJsaXNoZWQu</EVENT>
+			<EVENT MessageType="html" Event="NEWS.REVIEW.ADD" Type="1">U3ViamVjdDogTmV3IENvbW1lbnQgZm9yICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiBBcnRpY2xlIFN1Ym1pdHRlZAoKTmV3IGNvbW1lbnQgZm9yICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiBhcnRpY2xlIGhhcyBiZWVuIHN1Ym1pdHRlZC4=</EVENT>
+			<EVENT MessageType="html" Event="NEWS.REVIEW.ADD.PENDING" Type="0">U3ViamVjdDogWW91ciBDb21tZW50IGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBQZW5kaW5nCgpUaGFuayB5b3UgZm9yIHN1Ym1pdHRpbmcgeW91ciBjb21tZW50IGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIuPGJyLz48YnIvPg0KDQpDdXJyZW50bHkgaXQncyBwZW5kaW5nIGZvciBhZG1pbmlzdHJhdGl2ZSBhcHByb3ZhbCBhbmQgd2lsbCBiZSBwdWJsaXNoZWQgc2hvcnRseS4=</EVENT>
+			<EVENT MessageType="html" Event="NEWS.REVIEW.ADD.PENDING" Type="1">WC1NYWlsZXI6IEluLVBvcnRhbApTdWJqZWN0OiBZb3VyIENvbW1lbnQgZm9yICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiAtIFBlbmRpbmcgW2FkbWluXQoKVGhhbmsgeW91IGZvciBzdWJtaXR0aW5nIHlvdXIgY29tbWVudCBmb3IgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iLjxici8+PGJyLz4NCg0KQ3VycmVudGx5IGl0J3MgcGVuZGluZyBmb3IgYWRtaW5pc3RyYXRpdmUgYXBwcm92YWwgYW5kIHdpbGwgYmUgcHVibGlzaGVkIHNob3J0bHku</EVENT>
+			<EVENT MessageType="html" Event="NEWS.REVIEW.APPROVE" Type="0">U3ViamVjdDogWW91ciBDb21tZW50IGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBQdWJsaXNoZWQKClRoYW5rIHlvdSBmb3Igc3VibWl0dGluZyB5b3VyIGNvbW1lbnQgZm9yICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+Ii48YnIvPjxici8+DQoNCkl0J3MgYWxyZWFkeSBwdWJsaXNoZWQgb24gdGhlIHdlYnNpdGUh</EVENT>
+			<EVENT MessageType="html" Event="NEWS.REVIEW.DENY" Type="0">U3ViamVjdDogWW91ciBDb21tZW50IGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBEZWNsaW5lZAoKU29ycnksIGJ1dCB5b3VyIGNvbW1lbnQgZm9yICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiBhcnRpY2xlIGhhcyBiZWVuIGRlY2xpbmVkLg==</EVENT>
+		</EVENTS>
+	</LANGUAGE>
+</LANGUAGES>
\ No newline at end of file

Property changes on: branches/5.1.x/install/english.lang
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.5
\ No newline at end of property
Index: branches/5.1.x/install/upgrades.php
===================================================================
--- branches/5.1.x/install/upgrades.php	(nonexistent)
+++ branches/5.1.x/install/upgrades.php	(revision 13096)
@@ -0,0 +1,118 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-News
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license      GNU/GPL
+* In-Portal is Open Source software.
+* This means that this software may have been modified pursuant
+* the GNU General Public License, and as distributed it includes
+* or is derivative of works licensed under the GNU General Public License
+* or other free or open source software licenses.
+* See http://www.in-portal.org/license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	$upgrade_class = 'InNewsUpgrades';
+
+	/**
+	 * Class, that holds all upgrade scripts for "Core" module
+	 *
+	 */
+	class InNewsUpgrades extends kHelper {
+
+		/**
+		 * Install toolkit instance
+		 *
+		 * @var kInstallToolkit
+		 */
+		var $_toolkit = null;
+
+		/**
+		 * Sets common instance of installator toolkit
+		 *
+		 * @param kInstallToolkit $instance
+		 */
+		function setToolkit(&$instance)
+		{
+			$this->_toolkit =& $instance;
+		}
+
+		/**
+		 * Changes table structure, where multilingual fields of TEXT type are present
+		 *
+		 * @param string $mode when called mode {before, after)
+		 */
+		function Upgrade_5_0_0($mode)
+		{
+			if ($mode == 'after') {
+				$root_category = $this->Application->findModule('Name', 'In-News', 'RootCat');
+
+				$sql = 'UPDATE ' . $this->Application->getUnitOption('c', 'TableName') . '
+						SET UseMenuIconUrl = 1, MenuIconUrl = "in-news/img/menu_articles.gif"
+						WHERE ' . $this->Application->getUnitOption('c', 'IDField') . ' = ' . $root_category;
+				$this->Conn->Query($sql);
+
+				$this->_updateDetailTemplate('n', 'innews/detail', 'in-news/designs/detail');
+			}
+		}
+
+		/**
+		 * Replaces deprecated detail template design with new one
+		 *
+		 * @param string $prefix
+		 * @param string $from_template
+		 * @param string $to_template
+		 */
+		function _updateDetailTemplate($prefix, $from_template, $to_template)
+		{
+			$sql = 'SELECT CustomFieldId
+					FROM ' . TABLE_PREFIX . 'CustomField
+					WHERE FieldName = "' . $prefix . '_ItemTemplate"';
+			$custom_field_id = $this->Conn->GetOne($sql);
+
+			$ml_formatter =& $this->Application->recallObject('kMultiLanguage');
+			/* @var $ml_formatter kMultiLanguage */
+
+			$field = $ml_formatter->LangFieldName('cust_' . $custom_field_id, true);
+
+			$sql = 'UPDATE ' . TABLE_PREFIX . 'CategoryCustomData
+					SET ' . $field . ' = "' . $to_template . '"
+					WHERE ' . $field . ' = "' . $from_template . '"';
+			$this->Conn->Query($sql);
+		}
+
+		/**
+		 * Update to 5.0.1
+		 *
+		 * @param string $mode when called mode {before, after)
+		 */
+		function Upgrade_5_0_1($mode)
+		{
+			if ($mode == 'after') {
+				$this->_updateDetailTemplate('n', 'in-news/designs/detail', 'in-news/articles/article_detail');
+
+				// delete old events
+				$events_to_delete = Array ( 'NEWS.OWNER.MODIFY.PENDING', 'NEWS.OWNER.MODIFY' );
+
+				$sql = 'SELECT EventId FROM ' . TABLE_PREFIX . 'Events
+							WHERE Event IN ("' . implode('","', $events_to_delete) . '")';
+				$event_ids = $this->Conn->GetCol($sql);
+
+				if ($event_ids) {
+					$sql = 'DELETE FROM ' . TABLE_PREFIX . 'EmailMessage
+								WHERE EventId IN (' . implode(',', $event_ids) . ')';
+					$this->Conn->Query($sql);
+
+					$sql = 'DELETE FROM ' . TABLE_PREFIX . 'Events
+								WHERE EventId IN (' . implode(',', $event_ids) . ')';
+					$this->Conn->Query($sql);
+
+					$sql = 'DELETE FROM ' . TABLE_PREFIX . 'Phrase
+								WHERE Phrase IN ("la_event_news.owner.modify", "la_event_news.owner.modify.pending")';
+					$this->Conn->Query($sql);
+				}
+			}
+		}
+	}
\ No newline at end of file

Property changes on: branches/5.1.x/install/upgrades.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.3
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: branches/5.1.x/install/prerequisites.php
===================================================================
--- branches/5.1.x/install/prerequisites.php	(nonexistent)
+++ branches/5.1.x/install/prerequisites.php	(revision 13096)
@@ -0,0 +1,79 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-News
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license      GNU/GPL
+* In-Portal is Open Source software.
+* This means that this software may have been modified pursuant
+* the GNU General Public License, and as distributed it includes
+* or is derivative of works licensed under the GNU General Public License
+* or other free or open source software licenses.
+* See http://www.in-portal.org/license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	$prerequisite_class = 'InNewsPrerequisites';
+
+	/**
+	 * Class, that holds all prerequisite scripts for "In-News" module
+	 *
+	 */
+	class InNewsPrerequisites extends kHelper {
+
+		/**
+		 * Install toolkit instance
+		 *
+		 * @var kInstallToolkit
+		 */
+		var $_toolkit = null;
+
+		/**
+		 * Sets common instance of installator toolkit
+		 *
+		 * @param kInstallToolkit $instance
+		 */
+		function setToolkit(&$instance)
+		{
+			$this->_toolkit =& $instance;
+		}
+
+		/**
+		 * Checks minimal version, that could be upgradeable
+		 *
+		 * @param string $mode when called mode {install, standalone, upgrade)
+		 */
+		function CheckPrerequisites($versions, $mode)
+		{
+			$errors = Array ();
+
+			if ($mode == 'standalone') {
+				if (!$this->Application->isModuleEnabled('In-Portal')) {
+					$errors[] = 'Please install or enable "In-Portal" module first';
+				}
+			}
+
+			if ($mode == 'upgrade') {
+				$sql = 'SELECT Version
+						FROM ' . TABLE_PREFIX . 'Modules
+						WHERE Name = "In-Portal"';
+				$inportal_version = $this->Conn->GetOne($sql);
+
+				if ($inportal_version === false) {
+					// only, when In-Portal was installed
+					return $errors;
+				}
+
+				$min_version = '4.3.1';
+
+				$current_version = $this->_toolkit->ConvertModuleVersion($inportal_version);
+				$needed_version = $this->_toolkit->ConvertModuleVersion($min_version);
+				if ($current_version < $needed_version) {
+					$errors[] = 'Please upgrade "In-Portal" to version ' . $min_version;
+				}
+			}
+
+			return $errors;
+		}
+	}
\ No newline at end of file

Property changes on: branches/5.1.x/install/prerequisites.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.3
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: branches/5.1.x/install/install_schema.sql
===================================================================
--- branches/5.1.x/install/install_schema.sql	(nonexistent)
+++ branches/5.1.x/install/install_schema.sql	(revision 13096)
@@ -0,0 +1,86 @@
+CREATE TABLE News (
+  NewsId int(11) NOT NULL AUTO_INCREMENT,
+  Title varchar(255) NOT NULL DEFAULT '',
+  l1_Title varchar(255) NOT NULL DEFAULT '',
+  l2_Title varchar(255) NOT NULL DEFAULT '',
+  l3_Title varchar(255) NOT NULL DEFAULT '',
+  l4_Title varchar(255) NOT NULL DEFAULT '',
+  l5_Title varchar(255) NOT NULL DEFAULT '',
+  AutomaticFilename tinyint(3) unsigned NOT NULL DEFAULT '1',
+  Excerpt text,
+  l1_Excerpt text,
+  l2_Excerpt text,
+  l3_Excerpt text,
+  l4_Excerpt text,
+  l5_Excerpt text,
+  Author varchar(255) NOT NULL DEFAULT '',
+  Body text,
+  l1_Body text,
+  l2_Body text,
+  l3_Body text,
+  l4_Body text,
+  l5_Body text,
+  MetaKeywords varchar(255) DEFAULT NULL,
+  MetaDescription text,
+  CreatedOn int(11) DEFAULT NULL,
+  TextFormat int(11) NOT NULL DEFAULT '0',
+  EndOn int(11) DEFAULT NULL,
+  Hits double(20,6) NOT NULL DEFAULT '0.000000',
+  CachedRating varchar(10) DEFAULT '0',
+  CachedVotesQty int(11) NOT NULL DEFAULT '0',
+  CreatedById int(11) NOT NULL DEFAULT '-1',
+  Priority int(11) NOT NULL DEFAULT '0',
+  `Status` tinyint(4) NOT NULL DEFAULT '2',
+  EditorsPick tinyint(4) NOT NULL DEFAULT '0',
+  LeadStory tinyint(4) NOT NULL DEFAULT '0',
+  LeadCatStory tinyint(4) NOT NULL DEFAULT '0',
+  ResourceId int(11) DEFAULT NULL,
+  CachedReviewsQty int(11) NOT NULL DEFAULT '0',
+  StartDate int(11) DEFAULT NULL,
+  NewItem tinyint(4) NOT NULL DEFAULT '2',
+  PopItem tinyint(4) NOT NULL DEFAULT '2',
+  HotItem tinyint(4) NOT NULL DEFAULT '2',
+  Archived int(11) NOT NULL DEFAULT '0',
+  Modified int(11) DEFAULT NULL,
+  ModifiedById int(11) NOT NULL DEFAULT '-1',
+  OrgId int(11) DEFAULT NULL,
+  PRIMARY KEY (NewsId),
+  UNIQUE KEY ResourceId (ResourceId),
+  KEY Title (Title),
+  KEY l1_Title (l1_Title),
+  KEY l2_Title (l2_Title),
+  KEY l3_Title (l3_Title),
+  KEY l4_Title (l4_Title),
+  KEY l5_Title (l5_Title),
+  KEY Excerpt (Excerpt(5)),
+  KEY l1_Excerpt (l1_Excerpt(5)),
+  KEY l2_Excerpt (l2_Excerpt(5)),
+  KEY l3_Excerpt (l3_Excerpt(5)),
+  KEY l4_Excerpt (l4_Excerpt(5)),
+  KEY l5_Excerpt (l5_Excerpt(5)),
+  KEY Body (Body(5)),
+  KEY l1_Body (l1_Body(5)),
+  KEY l2_Body (l2_Body(5)),
+  KEY l3_Body (l3_Body(5)),
+  KEY l4_Body (l4_Body(5)),
+  KEY l5_Body (l5_Body(5)),
+  KEY CreatedOn (CreatedOn),
+  KEY EndOn (EndOn),
+  KEY Priority (Priority),
+  KEY `Status` (`Status`),
+  KEY EditorsPick (EditorsPick),
+  KEY Hits (Hits),
+  KEY Modified (Modified),
+  KEY NewItem (NewItem),
+  KEY PopItem (PopItem),
+  KEY HotItem (HotItem),
+  KEY StartDate (StartDate),
+  KEY Archived (Archived)
+);
+
+CREATE TABLE NewsCustomData (
+  CustomDataId int(11) NOT NULL auto_increment,
+  ResourceId int(10) unsigned NOT NULL default '0',
+  KEY ResourceId (ResourceId),
+  PRIMARY KEY  (CustomDataId)
+);
\ No newline at end of file

Property changes on: branches/5.1.x/install/install_schema.sql
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.2
\ No newline at end of property
Index: branches/5.1.x/install/install_data.sql
===================================================================
--- branches/5.1.x/install/install_data.sql	(nonexistent)
+++ branches/5.1.x/install/install_data.sql	(revision 13096)
@@ -0,0 +1,248 @@
+INSERT INTO ConfigurationAdmin VALUES ('News_Search_Id', 'la_Text_Search', 'la_prompt_for_Id', 'checkbox', '', '', 1, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('News_SortField', 'la_Text_Articles', 'la_news_sortfield_pompt', 'select', '', 'Title=la_Article_Title,Excerpt=la_Article_Excerpt,Author=la_Article_Author,CreatedOn=la_Article_Date,Hits=la_Article_Hits,CachedRating=la_Article_Rating,<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 2) AND (IsSystem = 0)</SQL>', 10.01, 1, 1);
+INSERT INTO ConfigurationAdmin VALUES ('News_SortOrder', 'la_Text_Articles', 'la_news_sortfield_pompt', 'select', '', 'asc=la_common_ascending,desc=la_common_descending', 10.01, 2, 1);
+INSERT INTO ConfigurationAdmin VALUES ('News_SortField2', 'la_Text_Articles', 'la_news_sortfield2_pompt', 'select', '', 'Title=la_Article_Title,Excerpt=la_Article_Excerpt,Author=la_Article_Author,CreatedOn=la_Article_Date,Hits=la_Article_Hits,CachedRating=la_Article_Rating,<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 2) AND (IsSystem = 0)</SQL>', 10.02, 1, 1);
+INSERT INTO ConfigurationAdmin VALUES ('News_SortOrder2', 'la_Text_Articles', 'la_news_sortfield2_pompt', 'select', '', 'asc=la_common_ascending,desc=la_common_descending', 10.02, 2, 1);
+INSERT INTO ConfigurationAdmin VALUES ('News_CatNewDays', 'la_Text_Articles', 'la_news_newdays_prompt', 'text', '', '', 10.05, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('Perpage_News', 'la_Text_Articles', 'la_news_perpage_prompt', 'text', '', '', 10.03, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('Perpage_News_Short', 'la_Text_Articles', 'la_news_perpage_short_prompt', 'text', '', '', 10.04, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('News_MinPopRating', 'la_Text_Articles', 'la_fld_News_MinPopRating', 'text', '', '', 10.06, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('News_MaxHotNumber', 'la_Text_Articles', 'la_fld_News_MaxHotNumber', 'text', '', '', 10.08, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('News_ShowPick', 'la_Text_Articles', 'la_news_editorpicksabove_prompt', 'checkbox', '', '', 10.1, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('News_Archive', 'la_Text_Articles', 'la_news_daysarchive_prompt', 'text', '', '', 10.09, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('News_SortReviews', 'la_Text_Reviews', 'la_news_sortreviews_prompt', 'select', '', 'ReviewText=la_opt_CommentText,CreatedOn=la_opt_CreatedOn', 20.01, 1, 1);
+INSERT INTO ConfigurationAdmin VALUES ('News_SortReviewsOrder', 'la_Text_Reviews', 'la_news_sortreviews_prompt', 'select', '', 'asc=la_common_Ascending,desc=la_common_Descending', 20.01, 2, 1);
+INSERT INTO ConfigurationAdmin VALUES ('News_SortReviews2', 'la_Text_Reviews', 'la_news_sortreviews2_prompt', 'select', '', 'ReviewText=la_opt_CommentText,CreatedOn=la_opt_CreatedOn', 20.02, 1, 1);
+INSERT INTO ConfigurationAdmin VALUES ('News_SortReviewsOrder2', 'la_Text_Reviews', 'la_news_sortreviews2_prompt', 'select', '', 'asc=la_common_Ascending,desc=la_common_Descending', 20.02, 2, 1);
+INSERT INTO ConfigurationAdmin VALUES ('News_MinPopVotes', 'la_Text_Articles', 'la_fld_News_MinPopVotes', 'text', '', '', 10.07, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('Perpage_NewsReviews', 'la_Text_Reviews', 'la_review_perpage_prompt', 'text', NULL, NULL, 20.03, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('Perpage_NewsReviews_Short', 'la_Text_Reviews', 'la_review_perpage_short_prompt', 'text', NULL, NULL, 20.03, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('News_RatingDelay_Interval', 'la_Text_Articles', 'la_prompt_DupRating', 'select', '', '1=la_opt_Sec,60=la_opt_Min,3600=la_opt_Hour,86400=la_opt_Day,604800=la_opt_Week,2419200=la_opt_Month,29030400=la_opt_Year', 10.12, 2, 1);
+INSERT INTO ConfigurationAdmin VALUES ('News_RatingDelay_Value', 'la_Text_Articles', 'la_prompt_DupRating', 'text', '', 'style="width: 50px;"', 10.12, 1, 1);
+INSERT INTO ConfigurationAdmin VALUES ('News_ReviewDelay_Interval', 'la_Text_Articles', 'la_prompt_DupReviews', 'select', '', '1=la_opt_Sec,60=la_opt_Min,3600=la_opt_Hour,86400=la_opt_Day,604800=la_opt_Week,2419200=la_opt_Month,29030400=la_opt_Year', 10.11, 2, 1);
+INSERT INTO ConfigurationAdmin VALUES ('News_ReviewDelay_Value', 'la_Text_Articles', 'la_prompt_DupReviews', 'text', '', 'style="width: 50px;"', 10.11, 1, 1);
+INSERT INTO ConfigurationAdmin VALUES ('n_CategoryTemplate', 'la_section_Templates', 'la_fld_CategoryTemplate', 'text', '', '', 30.01, 0, 0);
+INSERT INTO ConfigurationAdmin VALUES ('n_ItemTemplate', 'la_section_Templates', 'la_fld_ItemTemplate', 'text', '', '', 30.02, 0, 0);
+INSERT INTO ConfigurationAdmin VALUES ('n_MaxImageCount', 'la_section_ImageSettings', 'la_config_MaxImageCount', 'text', '', '', 40.01, 0, 0);
+INSERT INTO ConfigurationAdmin VALUES ('n_ThumbnailImageWidth', 'la_section_ImageSettings', 'la_config_ThumbnailImageWidth', 'text', '', '', 40.02, 0, 0);
+INSERT INTO ConfigurationAdmin VALUES ('n_ThumbnailImageHeight', 'la_section_ImageSettings', 'la_config_ThumbnailImageHeight', 'text', '', '', 40.03, 0, 0);
+INSERT INTO ConfigurationAdmin VALUES ('n_FullImageWidth', 'la_section_ImageSettings', 'la_config_FullImageWidth', 'text', '', '', 40.04, 0, 0);
+INSERT INTO ConfigurationAdmin VALUES ('n_FullImageHeight', 'la_section_ImageSettings', 'la_config_FullImageHeight', 'text', '', '', 40.05, 0, 0);
+
+INSERT INTO ConfigurationAdmin VALUES ('SearchRel_Keyword_articles', 'la_config_SearchRel_DefaultKeyword', 'la_text_keyword', 'text', NULL, NULL, 0, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('SearchRel_Pop_articles', 'la_config_DefaultPop', 'la_text_popularity', 'text', NULL, NULL, 0, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('SearchRel_Rating_articles', 'la_config_DefaultRating', 'la_prompt_Rating', 'text', NULL, NULL, 0, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('SearchRel_Increase_articles', 'la_config_DefaultIncreaseImportance', 'la_text_increase_importance', 'text', NULL, NULL, 0, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('Search_ShowMultiple_articles', 'la_config_ShowMultiple', 'la_Text_MultipleShow', 'text', NULL, NULL, 0, 0, 1);
+
+INSERT INTO ConfigurationAdmin VALUES ('n_MaxCategories', 'la_Text_Articles', 'la_fld_MaxCategories', 'text', NULL, NULL, 10.13, 0, 1);
+
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_News', '8', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_PopCount', '4', 'inportal', '');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_ArticleSort', 'CreatedOn desc, Title asc', 'inportal', '');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_CatSort', 'cat_date desc, cat_name asc', 'inportal', '');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_MinPopRating', '4', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_Archive', '0', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_ShowPick', '1', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_CatNewDays', '5', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_ShowMulti', '1', 'inportal', '');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_Admin_Notice_New', '1', 'inportal', '');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_Admin_Notice_Modify', '1', 'inportal', '');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_Admin_Notice_Suggest', '1', 'inportal', '');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_User_Notice_New', '1', 'inportal', '');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_User_Notice_Approve', '1', 'inportal', '');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_User_Notice_Deny', '1', 'inportal', '');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_User_Notice_Modify', '1', 'inportal', '');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_User_Notice_Modify_Approve', '1', 'inportal', '');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_User_Notice_Modify_Deny', '1', 'inportal', '');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_SortField', 'CreatedOn', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_SortOrder', 'desc', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_MaxHotNumber', '5', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_SortReviews', 'ReviewText', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_SortReviews2', 'ReviewText', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_SortReviewsOrder', 'desc', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_SortReviewsOrder2', 'asc', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_SortField2', 'Title', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_SortOrder2', 'desc', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_MinPopVotes', '20', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_RatingDelay_Value', '1', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_RatingDelay_Interval', '86400', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Article_Root', '{NewsCatId}', 'In-Portal', '');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_News_Short', '3', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_NewsReviews_Short', '3', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_NewsReviews', '10', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_ReviewDelay_Interval', '3600', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_ReviewDelay_Value', '12', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_Highlight_OpenTag', '<span class="match">', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'News_Highlight_CloseTag', '</span>', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'n_CategoryTemplate', '/in-news/designs/section', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'n_ItemTemplate', 'in-news/designs/detail', 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'n_MaxImageCount', 5, 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'n_ThumbnailImageWidth', 120, 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'n_ThumbnailImageHeight', 120, 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'n_FullImageWidth', 450, 'In-News', 'in-news:configuration_output');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'n_FullImageHeight', 450, 'In-News', 'in-news:configuration_output');
+
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SearchRel_Keyword_articles', '90', 'In-News', 'in-news:configuration_search');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SearchRel_Pop_articles', '10', 'In-News', 'in-news:configuration_search');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SearchRel_Rating_articles', '10', 'In-News', 'in-news:configuration_search');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SearchRel_Increase_articles', '30', 'In-News', 'in-news:configuration_search');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Search_ShowMultiple_articles', '0', 'In-News', 'in-news:configuration_search');
+
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'n_MaxCategories', '3', 'In-News', 'in-news:configuration_output');
+
+INSERT INTO Events VALUES(DEFAULT, 'NEWS.ADD', NULL, 1, 1, NULL, 'In-News', 'la_event_article.add', 1);
+INSERT INTO Events VALUES(DEFAULT, 'NEWS.ADD', NULL, 1, 0, NULL, 'In-News', 'la_event_article.add', 0);
+INSERT INTO Events VALUES(DEFAULT, 'NEWS.ADD.PENDING', NULL, 1, 1, NULL, 'In-News', 'la_event_news.add.pending', 1);
+INSERT INTO Events VALUES(DEFAULT, 'NEWS.ADD.PENDING', NULL, 1, 0, NULL, 'In-News', 'la_event_news.add.pending', 0);
+INSERT INTO Events VALUES(DEFAULT, 'NEWS.MODIFY', NULL, 1, 1, NULL, 'In-News', 'la_event_article.modify', 1);
+INSERT INTO Events VALUES(DEFAULT, 'NEWS.MODIFY', NULL, 1, 0, NULL, 'In-News', 'la_event_article.modify', 0);
+INSERT INTO Events VALUES(DEFAULT, 'NEWS.MODIFY.PENDING', NULL, 1, 1, NULL, 'In-News', 'la_event_news.modify.pending', 1);
+INSERT INTO Events VALUES(DEFAULT, 'NEWS.MODIFY.PENDING', NULL, 1, 0, NULL, 'In-News', 'la_event_news.modify.pending', 0);
+INSERT INTO Events VALUES(DEFAULT, 'NEWS.MODIFY.APPROVE', NULL, 1, 0, NULL, 'In-News', 'la_event_article.modify.approve', 0);
+INSERT INTO Events VALUES(DEFAULT, 'NEWS.MODIFY.DENY', NULL, 1, 0, NULL, 'In-News', 'la_event_article.modify.deny', 0);
+INSERT INTO Events VALUES(DEFAULT, 'NEWS.APPROVE', NULL, 1, 0, NULL, 'In-News', 'la_event_article.approve', 0);
+INSERT INTO Events VALUES(DEFAULT, 'NEWS.DENY', NULL, 1, 0, NULL, 'In-News', 'la_event_article.deny', 0);
+INSERT INTO Events VALUES(DEFAULT, 'NEWS.REVIEW.ADD', NULL, 1, 1, NULL, 'In-News', 'la_event_article.review.add', 1);
+INSERT INTO Events VALUES(DEFAULT, 'NEWS.REVIEW.ADD', NULL, 1, 0, NULL, 'In-News', 'la_event_article.review.add', 0);
+INSERT INTO Events VALUES(DEFAULT, 'NEWS.REVIEW.APPROVE', NULL, 1, 0, NULL, 'In-News', 'la_event_article.review.approve', 0);
+INSERT INTO Events VALUES(DEFAULT, 'NEWS.REVIEW.DENY', NULL, 1, 0, NULL, 'In-News', 'la_event_article.review.deny', 0);
+INSERT INTO Events VALUES(DEFAULT, 'NEWS.REVIEW.ADD.PENDING', NULL, 1, 0, NULL, 'In-News', 'la_event_article.review.add.pending', 1);
+INSERT INTO Events VALUES(DEFAULT, 'NEWS.REVIEW.ADD.PENDING', NULL, 1, 0, NULL, 'In-News', 'la_event_article.review.add.pending', 0);
+
+INSERT INTO ItemTypes VALUES (2, 'In-News', 'n', 'News', 'Title', 'CreatedById', 'Hits', 'CachedRating', 'la_ItemTab_News', 1, 'in-news/admin/addarticle.php', 'clsNews', 'Article');
+
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.ADD', 'lu_PermName_News.Add_desc', 'lu_PermName_News.Add_desc', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.VIEW', 'lu_PermName_News.View_desc', 'lu_PermName_News.View_desc', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.ADD.PENDING', 'lu_PermName_News.Add.Pending_desc', 'lu_PermName_News.Add.Pending_error', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.MODIFY', 'lu_PermName_News.Modify_desc', 'lu_PermName_News.Modify_error', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.DELETE', 'lu_PermName_News.Delete_desc', 'lu_PermName_News.Delete_error', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.RATE', 'lu_PermName_News.Rate_desc', 'lu_PermName_News.Rate_error', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.REVIEW', 'lu_PermName_News.Review_desc', 'lu_PermName_News.Review_error', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.REVIEW.PENDING', 'lu_PermName_News.Review.Pending_desc', 'lu_PermName_News.Review.Pending_error', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.MODIFY.PENDING', 'lu_PermName_News.Modify.Pending_desc', 'lu_PermName_News.Modify.Pending_desc', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.MODIFY', 'lu_PermName_News.Owner.Modify_desc', 'lu_PermName_News.Owner.Modify_error', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.MODIFY.PENDING', 'lu_PermName_News.Owner.Modify.Pending_desc', 'lu_PermName_News.Owner.Modify.Pending_error', 'In-News');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.DELETE', 'lu_PermName_News.Owner.Delete_desc', 'lu_PermName_News.Owner.Delete_error', 'In-News');
+
+INSERT INTO SearchConfig VALUES ('News', 'Title', 1, 1, 'lu_fielddesc_news_title', 'lu_field_title', 'In-News', 'la_text_article', 2, DEFAULT, 2, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'Excerpt', 1, 1, 'lu_fielddesc_news_excerpt', 'lu_field_excerpt', 'In-News', 'la_text_article', 3, DEFAULT, 1, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'Author', 1, 1, 'lu_fielddesc_news_author', 'lu_field_author', 'In-News', 'la_text_article', 4, DEFAULT, 1, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'Body', 1, 1, 'lu_fielddesc_news_body', 'lu_field_body', 'In-News', 'la_text_article', 5, DEFAULT, 1, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'CreatedOn', 0, 1, 'lu_fielddesc_news_createdon', 'lu_field_createdon', 'In-News', 'la_text_article', 6, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'EndOn', 0, 1, 'lu_fielddesc_news_endon', 'lu_field_endon', 'In-News', 'la_text_article', 7, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'Hits', 0, 1, 'lu_fielddesc_news_hits', 'lu_field_hits', 'In-News', 'la_text_article', 8, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'CachedRating', 0, 1, 'lu_fielddesc_news_cachedrating', 'lu_field_cachedrating', 'In-News', 'la_text_article', 9, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'CachedVotesQty', 0, 1, 'lu_fielddesc_news_cachedvotesqty', 'lu_field_cachedvotesqty', 'In-News', 'la_text_article', 10, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'CreatedById', 0, 1, 'lu_fielddesc_news_createdbyid', 'lu_field_createdbyid', 'In-News', 'la_text_article', 11, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'Priority', 0, 1, 'lu_fielddesc_news_priority', 'lu_field_priority', 'In-News', 'la_text_article', 12, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'Status', 0, 1, 'lu_fielddesc_news_status', 'lu_field_status', 'In-News', 'la_text_article', 13, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'EditorsPick', 0, 1, 'lu_fielddesc_news_editorspick', 'lu_field_editorspick', 'In-News', 'la_text_article', 14, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'LeadStory', 0, 1, 'lu_fielddesc_news_leadstory', 'lu_field_leadstory', 'In-News', 'la_text_article', 15, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'LeadCatStory', 0, 1, 'lu_fielddesc_news_leadcatstory', 'lu_field_leadcatstory', 'In-News', 'la_text_article', 16, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'ResourceId', 0, 1, 'lu_fielddesc_news_resourceid', 'lu_field_resourceid', 'In-News', 'la_text_article', 17, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'CachedReviewsQty', 0, 1, 'lu_fielddesc_news_cachedreviewsqty', 'lu_field_cachedreviewsqty', 'In-News', 'la_text_article', 18, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'StartDate', 0, 1, 'lu_fielddesc_news_startdate', 'lu_field_startdate', 'In-News', 'la_text_article', 19, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'NewItem', 0, 1, 'lu_fielddesc_news_newitem', 'lu_field_newitem', 'In-News', 'la_text_article', 20, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'PopItem', 0, 1, 'lu_fielddesc_news_popitem', 'lu_field_popitem', 'In-News', 'la_text_article', 21, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'HotItem', 0, 1, 'lu_fielddesc_news_hotitem', 'lu_field_hotitem', 'In-News', 'la_text_article', 22, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'Archived', 0, 1, 'lu_fielddesc_news_archived', 'lu_field_archived', 'In-News', 'la_text_article', 23, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'Modified', 0, 1, 'lu_fielddesc_news_modified', 'lu_field_modified', 'In-News', 'la_text_article', 24, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'ModifiedById', 0, 1, 'lu_fielddesc_news_modifiedbyid', 'lu_field_modifiedbyid', 'In-News', 'la_text_article', 25, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'OrgId', 0, 0, 'lu_fielddesc_news_orgid', 'lu_field_orgid', 'In-News', 'la_text_article', 26, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('News', 'NewsId', 0, 1, 'lu_fielddesc_news_newsid', 'lu_field_newsid', 'In-News', 'la_text_article', 0, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('CustomField', 'RssOriginalURL', 1, 0, 'la_fld_RssOriginalURL', 'lu_fld_RssOriginalURL', 'In-News', 'la_section_CustomFields', 0, DEFAULT, 1, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT INTO CustomField VALUES (DEFAULT, 1, 'RssExpireInterval', 'la_fld_RssExpireInterval', 0, 'la_title_SystemCF', 'la_fld_RssExpireInterval', 'text', NULL, '', 0, 0, 1, 0);
+INSERT INTO CustomField VALUES (DEFAULT, 1, 'RssUpdateInterval', 'la_fld_RssUpdateInterval', 0, 'la_title_SystemCF', 'la_fld_RssUpdateInterval', 'text', NULL, '', 0, 0, 1, 0);
+INSERT INTO CustomField VALUES (DEFAULT, 1, 'RssLastUpdated', 'la_fld_RssLastUpdated', 0, 'la_title_SystemCF', 'la_fld_RssLastUpdated', 'text', NULL, '', 0, 0, 1, 0);
+INSERT INTO CustomField VALUES (DEFAULT, 1, 'RssDeleteExpired', 'la_fld_RssDeleteExpired', 0, 'la_title_SystemCF', 'la_fld_RssDeleteExpired', 'text', NULL, '', 0, 0, 1, 0);
+INSERT INTO CustomField VALUES (DEFAULT, 2, 'RssOriginalURL', 'lu_fld_RssOriginalURL', 0, 'la_section_CustomFields', 'la_fld_RssOriginalURL', 'label', 'cut_first="100"', '', 0, 1, 0, 0);
+INSERT INTO CustomField VALUES (DEFAULT, 1, 'RssUpdateIntervalType', 'la_fld_RssUpdateIntervalType', 0, 'la_title_SystemCF', 'la_fld_RssUpdateIntervalType', 'text', NULL, '', 0, 0, 1, 0);
+INSERT INTO CustomField VALUES (DEFAULT, 1, 'RssSource', 'la_fld_RssSource', 0, 'la_title_SystemCF', 'la_fld_RssSource', 'text', NULL, '', 0, 0, 1, 0);
+INSERT INTO CustomField VALUES (DEFAULT, 1, 'RssExpireIntervalType', 'la_fld_RssExpireIntervalType', 0, 'la_title_SystemCF', 'la_fld_RssExpireIntervalType', 'text', NULL, '', 0, 0, 1, 0);
+INSERT INTO CustomField VALUES (DEFAULT, 1, 'RssDefaultExpiration', 'la_fld_RssDefaultExpiration', 0, 'la_title_SystemCF', 'la_fld_RssDefaultExpiration', 'text', NULL, '', 0, 0, 1, 0);
+INSERT INTO CustomField VALUES (DEFAULT, 1, 'RssDefaultExpirationType', 'la_fld_RssDefaultExpirationType', 0, 'la_title_SystemCF', 'la_fld_RssDefaultExpirationType', 'text', NULL, '', 0, 0, 1, 0);
+INSERT INTO CustomField VALUES (DEFAULT, 1, 'RssLastExpired', 'la_fld_RssLastExpired', 0, 'la_title_SystemCF', 'la_fld_RssLastExpired', 'text', NULL, '', 0, 0, 1, 0);
+INSERT INTO CustomField VALUES (DEFAULT, 2, 'RssArticleCRC', 'la_fld_RssArticleCRC', 0, 'la_section_SystemCF', 'la_fld_RssArticleCRC', 'text', NULL, '', 0, 0, 1, 0);
+INSERT INTO CustomField VALUES (DEFAULT, 1, 'n_ItemTemplate', 'la_fld_cust_n_ItemTemplate', 0, 'la_title_SystemCF', 'la_fld_cust_n_ItemTemplate', 'text', NULL, '', 0, 0, 1, 0);
+
+INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT count(*) FROM <%prefix%>News WHERE Status=1', NULL, 'la_prompt_ActiveArticles', 0, 1);
+INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS TotalArticles FROM <%prefix%>News', NULL, 'la_prompt_ArticlesTotal', 0, 2);
+INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS ActiveArticles FROM <%prefix%>News WHERE Status = 1', NULL, 'la_prompt_ArticlesActive', 0, 2);
+INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS PendingArticles FROM <%prefix%>News WHERE Status = 2', NULL, 'la_prompt_ArticlesPending', 0, 2);
+INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS DisabledArticles FROM <%prefix%>News WHERE Status = 0', NULL, 'la_prompt_DisabledArticles', 0, 2);
+INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS ArchivedArticles FROM <%prefix%>News WHERE Archived = 1', NULL, 'la_prompt_ArticlesArchived', 0, 2);
+INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS NewArticles FROM <%prefix%>News WHERE (NewItem = 1) OR ( (UNIX_TIMESTAMP() - CreatedOn) <= <%m:config name="News_CatNewDays"%>*86400 AND (NewItem = 2) )', NULL, 'la_prompt_NewArticles', 0, 2);
+INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) FROM <%prefix%>News WHERE EditorsPick = 1', NULL, 'la_prompt_EditorsPickArticles', 0, 2);
+INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS HotArticles FROM <%prefix%>News WHERE (HotItem = 1) OR (Hits >= <%m:config name="News_MaxHotNumber"%> AND (HotItem = 2) )', NULL, 'la_prompt_HotArticles', 0, 2);
+INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) FROM <%prefix%>News WHERE LeadStory  = 1', NULL, 'la_prompt_LeadStoryArticles', 0, 2);
+INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) FROM <%prefix%>News WHERE LeadCatStory = 1', NULL, 'la_prompt_CategoryLeadStoryArticles', 0, 2);
+INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT <%m:post_format field="AVG(CachedRating)" type="currency" precision="2"%> FROM <%prefix%>News WHERE CachedRating > 0', NULL, 'la_prompt_ArticleAverageRating', 0, 2);
+INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS PopularArticles FROM <%prefix%>News WHERE (PopItem = 1) OR ( (CachedRating >= <%article:hit_count type="top"%>) AND <%article:hit_count type="top"%> AND (PopItem = 2) )', NULL, 'la_prompt_PopularArticles', 0, 2);
+INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT MAX(Hits) AS MaxHitsArticles FROM <%prefix%>News', NULL, 'la_prompt_MaxHitsArticles', 0, 2);
+INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT MAX(CachedVotesQty) AS MaxVotesArticles FROM <%prefix%>News', NULL, 'la_prompt_MaxVotesArticles', 0, 2);
+INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT <%m:post_format field="MAX(CreatedOn)" type="date"%> FROM <%prefix%>News', NULL, 'la_prompt_NewestArticleDate', 0, 2);
+INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT <%m:post_format field="MAX(Modified)" type="date"%> FROM <%prefix%>News', NULL, 'la_prompt_LastArticleUpdate', 0, 2);
+INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) FROM <%prefix%>ItemReview WHERE Module = \'<%modules:get_current%>\'', NULL, 'la_prompt_ArticleReviews', 0, 2);
+
+INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.VIEW', 14, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.VIEW', 14, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.VIEW', 13, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.ADD.PENDING', 13, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'FAVORITES', 13, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.VIEW', 13, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.RATE', 13, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.REVIEW', 13, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.ADD', 13, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.MODIFY', 13, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.MODIFY.PENDING', 13, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.DELETE', 13, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.VIEW', 11, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.ADD', 11, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.DELETE', 11, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.MODIFY', 11, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'FAVORITES', 11, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.VIEW', 11, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.ADD', 11, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.DELETE', 11, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.MODIFY', 11, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.RATE', 11, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.REVIEW', 11, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.VIEW', 12, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'FAVORITES', 12, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.VIEW', 12, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.RATE', 12, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.REVIEW.PENDING', 12, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.ADD.PENDING', 12, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.MODIFY', 12, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.MODIFY.PENDING', 12, 1, 0, {NewsCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.VIEW', 15, 0, 0, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.ADD', 15, 0, 0, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.DELETE', 15, 0, 0, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.MODIFY', 15, 0, 0, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.RATE', 15, 0, 0, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.REVIEW', 15, 0, 0, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.REVIEW.PENDING', 15, 0, 0, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.ADD.PENDING', 15, 0, 0, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.MODIFY.PENDING', 15, 0, 0, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.MODIFY', 15, 0, 0, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.MODIFY.PENDING', 15, 0, 0, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.DELETE', 15, 0, 0, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-news.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-news:articles.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-news:setting_folder.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_output.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_output.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_search.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_search.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_email.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_email.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_custom.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_custom.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_custom.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_custom.delete', 11, 1, 1, 0);
+
+INSERT INTO ImportScripts VALUES (DEFAULT, 'Articles from CSV file [In-News]', '', 'n', 'In-News', '', 'CSV', '1');
+
+INSERT INTO Modules VALUES ('In-News', 'in-news/', 'n', DEFAULT, 1, 2, 'in-news/', {NewsCatId}, NULL);
\ No newline at end of file

Property changes on: branches/5.1.x/install/install_data.sql
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.7
\ No newline at end of property
Index: branches/5.1.x/install/img/icon_news_management.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: branches/5.1.x/install/img/icon_news_management.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/5.1.x/install/img/.htaccess
===================================================================
--- branches/5.1.x/install/img/.htaccess	(nonexistent)
+++ branches/5.1.x/install/img/.htaccess	(revision 13096)
@@ -0,0 +1 @@
+allow from all
\ No newline at end of file

Property changes on: branches/5.1.x/install/img/.htaccess
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/5.1.x/install/module_info.xml
===================================================================
--- branches/5.1.x/install/module_info.xml	(nonexistent)
+++ branches/5.1.x/install/module_info.xml	(revision 13096)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<module_info>
+	<name>In-News</name>
+	<description>News Management</description>
+	<image>in-news/install/img/icon_news_management.gif</image>
+</module_info>
\ No newline at end of file
Index: branches/5.1.x/install/.htaccess
===================================================================
--- branches/5.1.x/install/.htaccess	(nonexistent)
+++ branches/5.1.x/install/.htaccess	(revision 13096)
@@ -0,0 +1 @@
+deny from all
\ No newline at end of file

Property changes on: branches/5.1.x/install/.htaccess
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: branches/5.1.x/install/remove_schema.sql
===================================================================
--- branches/5.1.x/install/remove_schema.sql	(nonexistent)
+++ branches/5.1.x/install/remove_schema.sql	(revision 13096)
@@ -0,0 +1,2 @@
+DROP TABLE News;
+DROP TABLE NewsCustomData;
\ No newline at end of file

Property changes on: branches/5.1.x/install/remove_schema.sql
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Index: branches/5.1.x/install/install_order.txt
===================================================================
--- branches/5.1.x/install/install_order.txt	(nonexistent)
+++ branches/5.1.x/install/install_order.txt	(revision 13096)
@@ -0,0 +1 @@
+103
\ No newline at end of file

Property changes on: branches/5.1.x/install/install_order.txt
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Index: branches/5.1.x/install.php
===================================================================
--- branches/5.1.x/install.php	(nonexistent)
+++ branches/5.1.x/install.php	(revision 13096)
@@ -0,0 +1,53 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-News
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license      GNU/GPL
+* In-Portal is Open Source software.
+* This means that this software may have been modified pursuant
+* the GNU General Public License, and as distributed it includes
+* or is derivative of works licensed under the GNU General Public License
+* or other free or open source software licenses.
+* See http://www.in-portal.org/license for copyright notices and details.
+*/
+	$module_folder = 'in-news';
+
+	if (!defined('IS_INSTALL')) {
+		// separate module install
+		define('IS_INSTALL', 1);
+		define('ADMIN', 1);
+		define('REL_PATH', $module_folder);
+		define('FULL_PATH', realpath(dirname(__FILE__) . '/..') );
+
+		include_once(FULL_PATH . '/core/kernel/startup.php');
+		require_once FULL_PATH . '/core/install/install_toolkit.php';
+
+		$toolkit = new kInstallToolkit();
+	}
+	else {
+		// install, using installation wizard
+		$toolkit =& $this->toolkit;
+		/* @var $toolkit kInstallToolkit */
+	}
+
+	$application =& kApplication::Instance();
+	$application->Init();
+
+	if ($application->RecallVar('user_id') != -1) {
+		die('restricted access!');
+	}
+
+	$category =& $toolkit->createModuleCategory('News', 'News Articles', '#in-news/section_design#', 'in-news/img/menu_articles.gif');
+
+	$toolkit->RunSQL('/' . $module_folder . '/install/install_schema.sql');
+	$toolkit->RunSQL('/' . $module_folder . '/install/install_data.sql', '{NewsCatId}', $category->GetID());
+	$toolkit->ImportLanguage('/' . $module_folder . '/install/english');
+
+	$toolkit->SetModuleRootCategory($module_folder, $category->GetID());
+
+	$toolkit->linkCustomFields($module_folder, 'n', 2); // to create Custom Fields for News
+	$toolkit->linkCustomFields('KERNEL', 'c', 1); // to create ItemTemplate custom field
+	$toolkit->setModuleItemTemplate($category, 'n', '#in-news/item_design#');
+
+	$toolkit->finalizeModuleInstall($module_folder, true);
\ No newline at end of file

Property changes on: branches/5.1.x/install.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.4
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Index: branches/5.1.x
===================================================================
--- branches/5.1.x	(revision 13095)
+++ branches/5.1.x	(revision 13096)

Property changes on: branches/5.1.x
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,3 ##
   Merged /modules/in-news/releases/5.0.2:r13077-13095
   Merged /modules/in-news/branches/5.0.x:r12747-13076
   Merged /in-news/branches/5.0.x:r12619-12746