Index: branches/5.2.x/core/install/install_data.sql
===================================================================
diff -u -N -r14643 -r14662
--- branches/5.2.x/core/install/install_data.sql	(.../install_data.sql)	(revision 14643)
+++ branches/5.2.x/core/install/install_data.sql	(.../install_data.sql)	(revision 14662)
@@ -488,20 +488,20 @@
 (307, 2, 225, 'AK', NULL),
 (306, 2, 225, 'AL', NULL);
 
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.VIEW', 'la_PermName_Category.View_desc', 'In-Portal');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.ADD', 'la_PermName_Category.Add_desc', 'In-Portal');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.DELETE', 'la_PermName_Category.Delete_desc', 'In-Portal');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.ADD.PENDING', 'la_PermName_Category.AddPending_desc', 'In-Portal');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.MODIFY', 'la_PermName_Category.Modify_desc', 'In-Portal');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'ADMIN', 'la_PermName_Admin_desc', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LOGIN', 'la_PermName_Login_desc', 'Front');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.ITEM', 'la_PermName_Debug.Item_desc', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.LIST', 'la_PermName_Debug.List_desc', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.INFO', 'la_PermName_Debug.Info_desc', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PROFILE.MODIFY', 'la_PermName_Profile.Modify_desc', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'SHOWLANG', 'la_PermName_ShowLang_desc', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'FAVORITES', 'la_PermName_favorites_desc', 'In-Portal');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'SYSTEM_ACCESS.READONLY', 'la_PermName_SystemAccess.ReadOnly_desc', 'Admin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.VIEW', 'la_PermName_Category.View_desc', 'In-Portal', 1);
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.ADD', 'la_PermName_Category.Add_desc', 'In-Portal', 1);
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.DELETE', 'la_PermName_Category.Delete_desc', 'In-Portal', 1);
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.ADD.PENDING', 'la_PermName_Category.AddPending_desc', 'In-Portal', 1);
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.MODIFY', 'la_PermName_Category.Modify_desc', 'In-Portal', 1);
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'ADMIN', 'la_PermName_Admin_desc', 'Admin', 1);
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LOGIN', 'la_PermName_Login_desc', 'Front', 1);
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.ITEM', 'la_PermName_Debug.Item_desc', 'Admin', 1);
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.LIST', 'la_PermName_Debug.List_desc', 'Admin', 1);
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.INFO', 'la_PermName_Debug.Info_desc', 'Admin', 1);
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PROFILE.MODIFY', 'la_PermName_Profile.Modify_desc', 'Admin', 1);
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'SHOWLANG', 'la_PermName_ShowLang_desc', 'Admin', 1);
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'FAVORITES', 'la_PermName_favorites_desc', 'In-Portal', 1);
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'SYSTEM_ACCESS.READONLY', 'la_PermName_SystemAccess.ReadOnly_desc', 'Admin', 1);
 INSERT INTO PermCache VALUES (DEFAULT, 0, 1, '11,12,13,14,15');
 
 
@@ -688,6 +688,11 @@
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:skins.edit', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:skins.delete', 11, 1, 1, 0);
 
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:permission_types.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:permission_types.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:permission_types.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:permission_types.delete', 11, 1, 1, 0);
+
 INSERT INTO Skins VALUES (DEFAULT, 'Default', '/* General elements */\r\n\r\nhtml {\r\n	height: 100%;\r\n}\r\n\r\nbody {\r\n 	font-family: verdana,arial,helvetica,sans-serif;\r\n 	color: #000000;\r\n	overflow-x: auto; overflow-y: auto;\r\n	margin: 0px 0px 0px 0px;\r\n	text-decoration: none;\r\n}\r\n\r\nbody, td {\r\n	/* fix for Firefox, when font-size was not inherited in table cells */\r\n	font-size: 9pt;\r\n}\r\n\r\na {\r\n	color: #006699;\r\n	text-decoration: none;\r\n}\r\n\r\na:hover {\r\n	color: #009ff0;\r\n	text-decoration: none;\r\n}\r\n\r\nform {\r\n   display: inline;\r\n}\r\n\r\nimg { border: 0px; }\r\n\r\nbody.height-100 {\r\n	height: 100%;\r\n}\r\n\r\nbody.regular-body {\r\n	margin: 0px 10px 5px 10px;\r\n	color: #000000;\r\n	background-color: @@SectionBgColor@@;\r\n}\r\n\r\nbody.edit-popup {\r\n	margin: 0px 0px 0px 0px;\r\n}\r\n\r\ntable.collapsed {\r\n	border-collapse: collapse;\r\n}\r\n\r\n.bordered, table.bordered, .bordered-no-bottom {\r\n	border: 1px solid #000000;\r\n	border-top-width: 0px;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.bordered-no-bottom {\r\n	border-top-width: 1px;\r\n	border-bottom: none;\r\n}\r\n\r\n.login-table td {\r\n	padding: 1px;\r\n}\r\n\r\n.disabled {\r\n	background-color: #ebebeb;\r\n}\r\n\r\n/* Head frame */\r\ntable.head-table {\r\n	background: url(''@@base_url@@/core/admin_templates/img/top_frame/right_background.png'') top right @@HeadBgColor@@ no-repeat;\r\n}\r\n\r\n.head-table tr td, .head-table tr td a {\r\n	color: @@HeadColor@@\r\n}\r\n\r\ndiv#extra_toolbar td.button-active {\r\n	background: url(''@@base_url@@/core/admin_templates/img/top_frame/toolbar_button_background.gif'') bottom left repeat-x;\r\n	height: 22px;\r\n}\r\n\r\ndiv#extra_toolbar td.button-active a {\r\n	color: black;\r\n	text-decoration: none;\r\n}\r\n\r\ntd.kx-block-header, .head-table tr td.kx-block-header{\r\n	color: @@HeadBarColor@@;\r\n	background: url(''@@base_url@@/core/admin_templates/img/top_frame/toolbar_background.gif'') repeat-x top left;\r\n	/*background-color: @@HeadBarBgColor@@;*/\r\n	padding-left: 7px;\r\n	padding-right: 7px;\r\n}\r\n\r\na.kx-header-link {\r\n	text-decoration: underline;\r\n	font-weight: bold;\r\n	color: #0080C8;\r\n}\r\n\r\na.kx-header-link:hover {\r\n	color: #FFCB05;\r\n	text-decoration: none;\r\n}\r\n\r\n.kx-secondary-foreground 	{\r\n	color: #FFFFFF;\r\n	/*background-color: @@HeadBarBgColor@@;*/\r\n}\r\n\r\n.kx-login-button {\r\n	background-color: #2D79D6;\r\n	color: #FFFFFF;\r\n}\r\n\r\n/* General form button (yellow) */\r\n.button {\r\n	font-size: 12px;\r\n	font-weight: normal;\r\n	color: #000000;\r\n	background: url(''@@base_url@@/core/admin_templates/img/button_back.gif'') #f9eeae repeat-x;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Disabled (grayed-out) form button */\r\n.button-disabled {\r\n	font-size: 12px;\r\n	font-weight: normal;\r\n	color: #676767;\r\n	background: url(''@@base_url@@/core/admin_templates/img/button_back_disabled.gif'') #f9eeae repeat-x;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Tabs bar */\r\n\r\n.tab, .tab-active {\r\n	background-color: #F0F1EB;\r\n	padding: 3px 7px 2px 7px;\r\n	border-top: 1px solid black;\r\n	border-left: 1px solid black;\r\n	border-right: 1px solid black;\r\n	margin-left: 3px !important;\r\n	white-space: nowrap;\r\n}\r\n\r\n.tab-active {\r\n	background-color: #4487D9;\r\n}\r\n\r\n.tab a {\r\n	color: #4487D9;\r\n	font-weight: bold;\r\n}\r\n\r\n.tab-active a {\r\n	color: #FFFFFF;\r\n	font-weight: bold;\r\n}\r\n\r\na.scroll-left, a.scroll-right {\r\n	cursor: pointer;\r\n	display: block;\r\n	float: left;\r\n	height: 18px;\r\n	margin: 0px 1px;\r\n	width: 18px;\r\n}\r\n\r\na.scroll-left {\r\n	background: transparent url(''@@base_url@@/core/admin_templates/img/tabs/left.png'') no-repeat scroll 0 0;\r\n}\r\n\r\na.scroll-right {\r\n	background: transparent url(''@@base_url@@/core/admin_templates/img/tabs/right.png'') no-repeat scroll 0 0;\r\n}\r\n\r\na.disabled {\r\n	visibility: hidden !important;\r\n}\r\n\r\na.scroll-left:hover, a.scroll-right:hover {\r\n	background-position: 0 -18px;\r\n}\r\n\r\ntd.scroll-right-container {\r\n	width: 20px;\r\n}\r\n\r\ntd.scroll-right-container.disabled, td.scroll-right-container.disabled * {\r\n	width: 0px;\r\n	margin: 0px;\r\n}\r\n\r\ntd.scroll-right-container.disabled br {\r\n	display: none;\r\n}\r\n\r\n/* Toolbar */\r\n\r\n.toolbar {\r\n	font-size: 8pt;\r\n	border: 1px solid #000000;\r\n	border-width: 0px 1px 1px 1px;\r\n	background-color: @@ToolbarBgColor@@;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.toolbar td {\r\n	height: 100%;\r\n}\r\n\r\n.toolbar-button, .toolbar-button-disabled, .toolbar-button-over {\r\n	float: left;\r\n	text-align: center;\r\n	font-size: 8pt;\r\n	padding: 5px 5px 5px 5px;\r\n	vertical-align: middle;\r\n	color: #006F99;\r\n}\r\n\r\n.toolbar-button-over {\r\n	color: #000;\r\n}\r\n\r\n.toolbar-button-disabled {\r\n	color: #444;\r\n}\r\n\r\n/*  Scrollable Grids */\r\n\r\n\r\n.layout-only-table td {\r\n  border: none !important;\r\n}\r\n\r\n/* Main Grid class */\r\n.grid-scrollable {\r\n	padding: 0px;\r\n	border: 1px solid black !important;\r\n	border-top: none !important;\r\n}\r\n\r\n/* Div generated by js, which contains all the scrollable grid elements, affects the style of scrollable area without data (if there are too few rows) */\r\n.grid-container {\r\n	background-color: #fff;\r\n}\r\n\r\n.grid-container table {\r\n	border-collapse: collapse;\r\n}\r\n\r\n/* Inner div generated in each data-cell */\r\n.grid-cell-div {\r\n	overflow: hidden;\r\n	height: auto;\r\n}\r\n\r\n/* Main row definition */\r\n.grid-data-row td, .grid-data-row-selected td, .grid-data-row-even-selected td, .grid-data-row-mouseover td, .table-color1, .table-color2 {\r\n	font-weight: normal;\r\n	color: @@OddColor@@;\r\n	background-color: @@OddBgColor@@;\r\n	padding: 3px 5px 3px 5px;\r\n	overflow: hidden;\r\n	border-right: 1px solid #c9c9c9;\r\n}\r\n.grid-data-row-even td, .table-color2 {\r\n	background-color: @@EvenBgColor@@;\r\n	color: @@EvenColor@@;\r\n}\r\n.grid-data-row td a, .grid-data-row-selected td a, .grid-data-row-mouseover td a {\r\n	text-decoration: underline;\r\n}\r\n\r\n/* mouse-over rows */\r\n.grid-data-row-mouseover td, table tr.grid-data-row[_row_highlighted] td {\r\n	background: #FFFDF4;\r\n}\r\n\r\n/* Selected row, applies to both checkbox and data areas */\r\n.grid-data-row-selected td, table tr.grid-data-row[_row_selected] td {\r\n	background: #FEF2D6;\r\n}\r\n\r\n.grid-data-row-even-selected td, .grid-data-row-even[_row_selected] td {\r\n	background: #FFF7E0;\r\n}\r\n\r\n/* General header cell definition */\r\n.grid-header-row td {\r\n	font-weight: bold;\r\n	background-color: @@ColumnTitlesBgColor@@;\r\n	text-decoration: none;\r\n	padding: 3px 5px 3px 5px;\r\n	color: @@ColumnTitlesColor@@;\r\n	border-right: none;\r\n	text-align: left;\r\n	vertical-align: middle !important;\r\n	white-space: nowrap;\r\n	border-right: 1px solid #777;\r\n}\r\n\r\n/* Filters row */\r\ntr.grid-header-row-1 td {\r\n	background-color: @@FiltersBgColor@@;\r\n	border-bottom: 1px solid black;\r\n}\r\n\r\n/* Grid Filters */\r\ntable.range-filter {\r\n	width: 100%;\r\n}\r\n\r\n.range-filter td {\r\n	padding: 0px 0px 2px 2px !important;\r\n	border: none !important;\r\n	font-size: 8pt !important;\r\n	font-weight: normal !important;\r\n	text-align: left;\r\n	color: #000000 !important;\r\n}\r\n\r\ninput.filter, select.filter, input.filter-active, select.filter-active {\r\n	margin-bottom: 0px;\r\n	border: 1px solid #aaa;\r\n}\r\n\r\ninput.filter-active {\r\n  background-color: #FFFF00;\r\n}\r\n\r\nselect.filter-active {\r\n background-color: #FFFF00;\r\n}\r\n\r\ndiv.filter, div.filter-active {\r\n	background-color: white;\r\n	border: 1px solid #AAAAAA;\r\n	color: black;\r\n	font-weight: normal;\r\n	padding: 3px;\r\n}\r\n\r\ndiv.filter-active {\r\n	background-color: #FFFF00;\r\n}\r\n\r\ndiv.multioptions_filter {\r\n	position: absolute;\r\n	z-index: 100;\r\n	color: black;\r\n	background-color: white;\r\n	border: 1px solid black;\r\n	padding: 3px 5px;\r\n	display: none;\r\n	vertical-align: middle;\r\n}\r\n\r\n/* Column titles row */\r\ntr.grid-header-row-0 td {\r\n	height: 25px;\r\n	font-weight: bold;\r\n	background-color: @@ColumnTitlesBgColor@@;\r\n	color: @@ColumnTitlesColor@@;\r\n	border-bottom: 1px solid black;\r\n}\r\n\r\ntr.grid-header-row-0 td a {\r\n	color: @@ColumnTitlesColor@@;\r\n}\r\n\r\ntr.grid-header-row-0 td a:hover {\r\n	color: #FFCC00;\r\n}\r\n\r\n\r\n.grid-footer-row td {\r\n	background-color: #D7D7D7;\r\n	font-weight: bold;\r\n	border-right: 1px solid #C9C9C9;\r\n	padding: 3px 5px 3px 5px;\r\n}\r\n\r\ntd.grid-header-last-cell, td.grid-data-last-cell, td.grid-footer-last-cell {\r\n	border-right: none !important;\r\n}\r\n\r\ntd.grid-data-col-0, td.grid-data-col-0 div {\r\n	text-align: center;\r\n	vertical-align: middle !important;\r\n}\r\n\r\ntr.grid-header-row-1 td.grid-header-col-1 {\r\n	text-align: center;\r\n	vertical-align: middle !important;\r\n}\r\n\r\ntr.grid-header-row-1 td.grid-header-col-1 div {\r\n	display: table-cell;\r\n	vertical-align: middle;\r\n}\r\n\r\n.grid-status-bar {\r\n	border: 1px solid black;\r\n	border-top: none;\r\n	padding: 0px;\r\n	width: 100%;\r\n	border-collapse: collapse;\r\n	height: 30px;\r\n}\r\n\r\n.grid-status-bar td {\r\n	background-color: @@TitleBarBgColor@@;\r\n  color: @@TitleBarColor@@;\r\n	font-size: 11pt;\r\n	font-weight: normal;\r\n	padding: 2px 8px 2px 8px;\r\n}\r\n\r\n/*  /Scrollable Grids */\r\n\r\n\r\n/* Forms */\r\ntable.edit-form {\r\n	border: none;\r\n	border-top-width: 0px;\r\n	border-collapse: collapse;\r\n	width: 100%;\r\n}\r\n\r\n.edit-form-odd, .edit-form-even {\r\n	padding: 0px;\r\n}\r\n\r\n.subsectiontitle {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	background-color: #4A92CE;\r\n	color: #fff;\r\n	height: 25px;\r\n	border-top: 1px solid black;\r\n	vertical-align: middle;\r\n}\r\n\r\n/* remove top-border from first sub-section element */\r\ntable.edit-form .subsectiontitle:first-child, table.bordered .subsectiontitle:first-child {\r\n	border-top-width: 0;\r\n}\r\n\r\n.subsectiontitle td {\r\n	vertical-align: middle;\r\n	/*padding: 3px 5px 3px 5px;*/\r\n	padding: 1px 5px;\r\n}\r\n\r\n.label-cell {\r\n	background: #DEE7F6 url(''@@base_url@@/core/admin_templates/img/bgr_input_name_line.gif'') no-repeat right bottom;\r\n  font: 12px arial, sans-serif;\r\n  padding: 4px 20px;\r\n  width: 160px;\r\n}\r\n\r\n.control-mid {\r\n	width: 13px;\r\n	border-left: 1px solid #7A95C2;\r\n	background: #fff url(''@@base_url@@/core/admin_templates/img/bgr_mid.gif'') repeat-x left bottom;\r\n}\r\n\r\n.control-cell {\r\n	font: 11px arial, sans-serif;\r\n	padding: 4px 10px 5px 5px;\r\n	background: #fff url(''@@base_url@@/core/admin_templates/img/bgr_input_line.gif'') no-repeat left bottom;\r\n	width: auto;\r\n	vertical-align: middle;\r\n}\r\n\r\n.label-cell-filler {\r\n	background: #DEE7F6 none;\r\n}\r\n.control-mid-filler {\r\n	background: #fff none;\r\n	border-left: 1px solid #7A95C2;\r\n}\r\n.control-cell-filler {\r\n	background: #fff none;\r\n}\r\n\r\n.error {\r\n	color: red;\r\n}\r\n.error-cell {\r\n	color: red;\r\n}\r\n\r\n.field-required {\r\n	color: red;\r\n}\r\n\r\n.warning-table {\r\n	background-color: #F0F1EB;\r\n	border: 1px solid #000000;\r\n	border-collapse: collapse;\r\n	border-top-width: 0px;\r\n}\r\n\r\n.form-notice, .form-warning {\r\n	font-size: 11px;\r\n}\r\n\r\n.form-warning {\r\n	color: red;\r\n}\r\n\r\n.form-notice {\r\n	color: green;\r\n}\r\n\r\n.priority {\r\n	color: red;\r\n	padding-left: 1px;\r\n	padding-right: 1px;\r\n	font-size: 11px;\r\n}\r\n\r\n.small-statistics {\r\n	font-size: 11px;\r\n	color: #707070;\r\n}\r\n\r\n.req-note {\r\n	font-style: italic;\r\n	color: #333;\r\n}\r\n\r\n#scroll_container table.tableborder {\r\n	border-collapse: separate\r\n}\r\n\r\n/* Uploader */\r\n.uploader-queue div.file {\r\n	font-size: 11px;\r\n	border: 1px solid #7F99C5;\r\n	padding: 3px;\r\n	background-color: #DEE7F6;\r\n	margin-bottom: 2px;\r\n}\r\n\r\n.uploader-queue .left  {\r\n	float: left;\r\n	vertical-align: top;\r\n}\r\n\r\n.uploader-queue .file-label {\r\n	margin-left: 5px;\r\n}\r\n\r\n.uploader-queue .preview .delete-checkbox {\r\n	margin-top: -3px;\r\n}\r\n\r\n.uploader-queue .progress-container {\r\n	margin: 2px 5px 0px 5px;\r\n}\r\n\r\n.uploader-queue .progress-empty {\r\n	width: 150px;\r\n	height: 9px;\r\n	border: 1px solid black;\r\n	background: url(''@@base_url@@/core/admin_templates/img/progress_left.gif'') repeat-x;\r\n}\r\n\r\n.uploader-queue .progress-full {\r\n	height: 9px;\r\n	background: url(''@@base_url@@/core/admin_templates/img/progress_done.gif'');\r\n}\r\n\r\n.uploader-queue .thumbnail {\r\n	/*margin-bottom: 2px;*/\r\n	border: 1px solid black;\r\n	background-color: grey;\r\n}\r\n\r\n/* To be sorted */\r\nspan#category_path, span#category_path a {\r\n	color: #FFFFFF;\r\n}\r\n\r\nspan#category_path a {\r\n	text-decoration: underline;\r\n}\r\n\r\n/* Section title, right to the big icon */\r\n.admintitle {\r\n	font-size: 16pt;\r\n	font-weight: bold;\r\n	color: @@SectionColor@@;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Left side of bluebar */\r\n.header_left_bg {\r\n	background-color: @@TitleBarBgColor@@;\r\n	background-image: none;\r\n	padding-left: 5px;\r\n}\r\n\r\n/* Right side of bluebar */\r\n.tablenav, tablenav a {\r\n	font-size: 11pt;\r\n	font-weight: bold;\r\n	color: @@TitleBarColor@@;\r\n\r\n	text-decoration: none;\r\n	background-color: @@TitleBarBgColor@@;\r\n	background-image: none;\r\n}\r\n\r\n/* Section title in the bluebar * -- why ''link''? :S */\r\n.tablenav_link {\r\n	font-size: 11pt;\r\n	font-weight: bold;\r\n	color: @@TitleBarColor@@;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Active page in top and bottom bluebars pagination */\r\n.current_page {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	background-color: #fff;\r\n	color: #2D79D6;\r\n	padding: 3px 2px 3px 3px;\r\n}\r\n\r\n/* Other pages and arrows in pagination on blue */\r\n.nav_url {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	color: #fff;\r\n	padding: 3px 2px 3px 3px;\r\n}\r\n\r\n/* Tree */\r\n.tree-body {\r\n	background-color: @@TreeBgColor@@;\r\n	height: 100%\r\n}\r\n\r\n.tree_head.td, .tree_head, .tree_head:hover {\r\n font-weight: bold;\r\n font-size: 10px;\r\n color: #FFFFFF;\r\n font-family: Verdana, Arial;\r\n text-decoration: none;\r\n}\r\n\r\n.tree {\r\n	padding: 0px;\r\n	border: none;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.tree tr td {\r\n	padding: 0px;\r\n	margin: 0px;\r\n	font-family: helvetica, arial, verdana,;\r\n	font-size: 11px;\r\n	white-space: nowrap;\r\n}\r\n\r\n.tree tr td a {\r\n	font-size: 11px;\r\n	color: @@TreeColor@@;\r\n	font-family: Helvetica, Arial, Verdana;\r\n	text-decoration: none;\r\n	padding: 2px;\r\n}\r\n\r\n.tree tr td a:hover, .tree tr td a.debug-only-item:hover {\r\n	color: @@TreeHoverColor@@;\r\n}\r\n\r\n.tree tr.highlighted td a, .tree tr.highlighted td a.debug-only-item {\r\n	color: @@TreeHighColor@@;\r\n	background-color: @@TreeHighBgColor@@;\r\n}\r\n\r\n.tree tr.highlighted td a:hover {\r\n	color: @@TreeHighHoverColor@@;\r\n}\r\n\r\n.tree tr td a.debug-only-item {\r\n	color: grey;\r\n}\r\n\r\n/* Ajax Dropdown */\r\n.suggest-box {\r\n	border: 1px solid #999;\r\n	background-color: #fff;\r\n}\r\n\r\n.suggest-item, .suggest-item-over {\r\n	padding: 1px 2px 0px 2px;\r\n	font-family: arial,verdana;\r\n	font-size: 12px;\r\n}\r\n\r\n.suggest-item-over {\r\n	background-color: #3366CC;\r\n	color: #fff;\r\n}\r\n\r\n/* Dashboard Summary Boxes */\r\n.summary-box {\r\n	border: 1px solid black;\r\n	margin-bottom: 4px;\r\n}\r\n\r\n.summary-box .title {\r\n	color: white;\r\n	font-weight: bold;\r\n	padding: 6px 5px;\r\n	vertical-align: middle;\r\n	background-color: #4A92CE;\r\n	border-bottom: 1px solid black;\r\n}\r\n\r\n.summary-box .content {\r\n	padding: 4px;\r\n	background-color: #F6F6F6;\r\n}\r\n\r\n.summary-box .group {\r\n	border-bottom: 1px solid black;\r\n	margin-bottom: 10px;\r\n	padding: 0 0 10px 10px;\r\n}\r\n\r\n.summary-box .group.last {\r\n	border-width: 0px;\r\n	margin-bottom: 0;\r\n	padding-bottom: 5px;\r\n}\r\n\r\n.summary-box h4 {\r\n	margin: 0;\r\n	padding: 0 0 3px 0;\r\n	font-size: 11px;\r\n	font-weight: bold;\r\n}\r\n\r\n.summary-box .hint {\r\n	font-size: 10px;\r\n	color: grey;\r\n	margin-bottom: 3px;\r\n}\r\n\r\n.summary-box .hint .cache-key {\r\n	margin-bottom: 7px;\r\n	margin-left: 3px;\r\n}\r\n\r\n.summary-box ul {\r\n	margin-top: 5px;\r\n	margin-bottom: 3px;\r\n	padding-left: 30px;\r\n}\r\n\r\n.summary-box li {\r\n	padding-bottom: 4px;\r\n}', 'in-portal_logo_img.jpg', 'in-portal_logo_img2.jpg', 'in-portal_logo_login.gif', 'a:22:{s:11:"HeadBgColor";a:2:{s:11:"Description";s:27:"Head frame background color";s:5:"Value";s:7:"#007BF4";}s:9:"HeadColor";a:2:{s:11:"Description";s:21:"Head frame text color";s:5:"Value";s:7:"#FFFFFF";}s:14:"SectionBgColor";a:2:{s:11:"Description";s:28:"Section bar background color";s:5:"Value";s:7:"#FFFFFF";}s:12:"SectionColor";a:2:{s:11:"Description";s:22:"Section bar text color";s:5:"Value";s:7:"#2D79D6";}s:12:"HeadBarColor";a:1:{s:5:"Value";s:7:"#000000";}s:14:"HeadBarBgColor";a:1:{s:5:"Value";s:7:"#1961B8";}s:13:"TitleBarColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:15:"TitleBarBgColor";a:1:{s:5:"Value";s:7:"#2D79D6";}s:14:"ToolbarBgColor";a:1:{s:5:"Value";s:7:"#F0F1EB";}s:14:"FiltersBgColor";a:1:{s:5:"Value";s:7:"#D7D7D7";}s:17:"ColumnTitlesColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:19:"ColumnTitlesBgColor";a:1:{s:5:"Value";s:7:"#999999";}s:8:"OddColor";a:1:{s:5:"Value";s:7:"#000000";}s:10:"OddBgColor";a:1:{s:5:"Value";s:7:"#F6F6F6";}s:9:"EvenColor";a:1:{s:5:"Value";s:7:"#000000";}s:11:"EvenBgColor";a:1:{s:5:"Value";s:7:"#EBEBEB";}s:9:"TreeColor";a:1:{s:5:"Value";s:7:"#000000";}s:14:"TreeHoverColor";a:1:{s:5:"Value";s:7:"#009FF0";}s:13:"TreeHighColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:18:"TreeHighHoverColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:15:"TreeHighBgColor";a:1:{s:5:"Value";s:7:"#4A92CE";}s:11:"TreeBgColor";a:1:{s:5:"Value";s:7:"#DCECF6";}}', 1317819843, 1, 1);
 
 INSERT INTO LocalesList VALUES
Index: branches/5.2.x/core/admin_templates/permission_types/permission_type_edit.tpl
===================================================================
diff -u -N
--- branches/5.2.x/core/admin_templates/permission_types/permission_type_edit.tpl	(revision 0)
+++ branches/5.2.x/core/admin_templates/permission_types/permission_type_edit.tpl	(revision 14662)
@@ -0,0 +1,82 @@
+<inp2:adm_SetPopupSize width="550" height="400"/>
+<inp2:m_include t="incs/header"/>
+
+<inp2:m_RenderElement name="combined_header" section="in-portal:permission_types" prefix="permission-type" title_preset="permission_type_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('permission-type', '<inp2:permission-type_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							cancel_edit('permission-type', 'OnCancelEdit','<inp2:permission-type_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarButton('reset_edit', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
+						reset_form('permission-type', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
+					}
+			 	) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('permission-type', '<inp2:permission-type_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('permission-type', '<inp2:permission-type_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="permission-type_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="permission-type_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="permission-type_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:permission-type_SaveWarning name="grid_save_warning"/>
+<inp2:permission-type_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="inp_id_label" prefix="permission-type" field="PermissionConfigId" title="la_fld_Id"/>
+
+		<inp2:m_if check="permission-type_Field" name="IsSystem" db="1">
+			<inp2:m_RenderElement name="inp_label" prefix="permission-type" field="PermissionName" title="la_fld_Name"/>
+			<inp2:m_RenderElement name="inp_label" prefix="permission-type" field="Description" as_label="1"/>
+			<inp2:m_RenderElement name="inp_label" prefix="permission-type" field="ModuleId" title="la_fld_Module"/>
+		<inp2:m_else/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="permission-type" field="PermissionName" title="la_fld_Name"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="permission-type" field="Description"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="permission-type" field="ModuleId" has_empty="1" title="la_fld_Module"/>
+		</inp2:m_if>
+
+		<inp2:m_RenderElement name="inp_label" prefix="permission-type" field="IsSystem"/>
+
+
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
Index: branches/5.2.x/core/admin_templates/permission_types/permission_type_list.tpl
===================================================================
diff -u -N
--- branches/5.2.x/core/admin_templates/permission_types/permission_type_list.tpl	(revision 0)
+++ branches/5.2.x/core/admin_templates/permission_types/permission_type_list.tpl	(revision 14662)
@@ -0,0 +1,54 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:permission_types" prefix="permission-type" title_preset="permission_type_list" pagination="1"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+	  	<td>
+	  		<script type="text/javascript">
+	  			//do not rename - this function is used in default grid for double click!
+	  			function edit()
+	  			{
+	  				std_edit_item('permission-type', 'permission_types/permission_type_edit');
+	  			}
+
+	  			var a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewPermission" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_precreate_item('permission-type', 'permission_types/permission_type_edit');
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('permission-type')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="permission-type" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_if check="m_Get" name="cant_delete_system_permission">
+	<inp2:m_RenderElement design="form_message">
+		<inp2:m_Phrase name="la_error_CantDeleteSystemPermission"/>
+	</inp2:m_RenderElement>
+</inp2:m_if>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="permission-type" IdField="PermissionConfigId" grid="Default"/>
+<script type="text/javascript">
+	Grids['permission-type'].SetDependantToolbarButtons( new Array('edit','delete') );
+</script>
+<inp2:m_include t="incs/footer"/>
Index: branches/5.2.x/core/install/install_schema.sql
===================================================================
diff -u -N -r14652 -r14662
--- branches/5.2.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 14652)
+++ branches/5.2.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 14662)
@@ -3,6 +3,7 @@
   PermissionName varchar(30) NOT NULL default '',
   Description varchar(255) NOT NULL default '',
   ModuleId varchar(20) NOT NULL default '0',
+  IsSystem tinyint(1) NOT NULL DEFAULT '0',
   PRIMARY KEY  (PermissionConfigId),
   KEY PermissionName (PermissionName)
 );
Index: branches/5.2.x/core/units/permission_types/permission_type_eh.php
===================================================================
diff -u -N
--- branches/5.2.x/core/units/permission_types/permission_type_eh.php	(revision 0)
+++ branches/5.2.x/core/units/permission_types/permission_type_eh.php	(revision 14662)
@@ -0,0 +1,40 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Portal
+* @copyright	Copyright (C) 1997 - 2011 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 PermissionTypeEventHandler extends kDBEventHandler {
+
+	/**
+	 * Cant delete system permissions
+	 *
+	 * @param kEvent $event
+	 */
+	function OnBeforeItemDelete(&$event)
+	{
+		parent::OnBeforeItemDelete($event);
+
+		$object =& $event->getObject();
+		/* @var $object kDBItem */
+
+		if ( $object->GetDBField('IsSystem') ) {
+			// prevents deletion of this permission
+			$event->status = kEvent::erFAIL;
+
+			// informs main event, that redirect shouldn't be made
+			$event->MasterEvent->status = kEvent::erFAIL;
+			$this->Application->SetVar('cant_delete_system_permission', 1);
+		}
+	}
+}
Index: branches/5.2.x/core/install/upgrades.sql
===================================================================
diff -u -N -r14652 -r14662
--- branches/5.2.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 14652)
+++ branches/5.2.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 14662)
@@ -2146,3 +2146,11 @@
 ALTER TABLE ItemReview
 	ADD HelpfulCount INT NOT NULL ,
 	ADD NotHelpfulCount INT NOT NULL;
+
+ALTER TABLE PermissionConfig ADD IsSystem TINYINT(1) NOT NULL DEFAULT '0';
+UPDATE PermissionConfig SET IsSystem = 1;
+
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:permission_types.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:permission_types.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:permission_types.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:permission_types.delete', 11, 1, 1, 0);
Index: branches/5.2.x/core/units/permission_types/permission_types_config.php
===================================================================
diff -u -N
--- branches/5.2.x/core/units/permission_types/permission_types_config.php	(revision 0)
+++ branches/5.2.x/core/units/permission_types/permission_types_config.php	(revision 14662)
@@ -0,0 +1,107 @@
+<?php
+/**
+* @version	$Id: permission_types_config.php 14662 2011-10-12 09:23:02Z alex $
+* @package	In-Portal
+* @copyright	Copyright (C) 1997 - 2011 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' => 'permission-type',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'PermissionTypeEventHandler', 'file' => 'permission_type_eh.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'event',
+		4 => 'mode',
+	),
+
+	'IDField' => 'PermissionConfigId',
+
+	'TableName' => TABLE_PREFIX . 'PermissionConfig',
+
+	'TitleField' => 'PermissionName',
+
+	'TitlePresets' => Array (
+		'default' => Array (
+			'new_status_labels' => Array ('permission-type' => '!la_title_AddingPermissionType!'),
+			'edit_status_labels' => Array ('permission-type' => '!la_title_EditingPermissionType!'),
+		),
+
+		'permission_type_list' => Array ('prefixes' => Array ('permission-type_List'), 'format' => "!la_tab_PermissionTypes! (#permission-type_recordcount#)"),
+		'permission_type_edit' => Array ('prefixes' => Array ('permission-type'), 'format' => "#permission-type_status# '#permission-type_titlefield#'"),
+	),
+
+	'PermSection' => Array('main' => 'in-portal:permission_types'),
+
+	'Sections' => Array (
+		'in-portal:permission_types'	=>	Array(
+				'parent'		=>	'in-portal:website_setting_folder',
+				'icon'			=>	'custom',
+				'label'			=>	'la_tab_PermissionTypes',
+				'url'			=>	Array('t' => 'permission_types/permission_type_list', 'pass' => 'm'),
+				'permissions'	=>	Array('view', 'add', 'edit', 'delete'),
+				'priority'		=>	13,
+				'type'			=>	stTREE,
+		),
+	),
+
+	'ListSQLs' => Array (
+		'' => '	SELECT %1$s.* %2$s FROM %1$s',
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('PermissionName' => 'asc'),
+		)
+	),
+
+	'Fields' => Array (
+		'PermissionConfigId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'PermissionName' => Array (
+			'type' => 'string', 'max_len' => 30,
+			'not_null' => 1, 'unique' => Array (), 'required' => 1, 'default' => '',
+		),
+		'Description' => Array (
+			'type' => 'string', 'max_len' => 255,
+			'formatter' => 'kFormatter', 'regexp' => '/^(la|lu)_[A-Z\d:_\-\.]+$/i',
+			'not_null' => 1, 'required' => 1, 'default' => '',
+		),
+		'ModuleId' => Array (
+			'type' => 'string', 'max_len' => 20,
+			'formatter' => 'kOptionsFormatter', 'options' => Array ('Admin' => 'Admin', 'Front' => 'Front'), 'options_sql' => 'SELECT Name AS Id, Name FROM ' . TABLE_PREFIX . 'Modules', 'option_key_field' => 'Id', 'option_title_field' => 'Name',
+			'not_null' => 1, 'required' => 1, 'default' => '',
+		),
+		'IsSystem' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes',  0 => 'la_No'), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0,
+		),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Fields' => Array (
+				'PermissionConfigId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 80),
+				'PermissionName' => Array ('title' => 'column:la_fld_Name', 'filter_block' => 'grid_like_filter', 'width' => 225),
+				'Description' => Array ('filter_block' => 'grid_like_filter', 'as_label' => 1, 'width' => 225),
+				'ModuleId' => Array ('title' => 'column:la_fld_Module', 'filter_block' => 'grid_options_filter'),
+				'IsSystem' => Array ('filter_block' => 'grid_options_filter'),
+			),
+		),
+	),
+);
Index: branches/5.2.x/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -N -r14606 -r14662
--- branches/5.2.x/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 14606)
+++ branches/5.2.x/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 14662)
@@ -183,8 +183,8 @@
 	<inp2:m_RenderElement name="grid_data_td" pass_params="1"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_data_td" format="" no_special="1" nl2br="" first_chars="" td_style="">
-	<inp2:Field field="$field" first_chars="$first_chars" nl2br="$nl2br" grid="$grid" no_special="$no_special" format="$format"/>
+<inp2:m_DefineElement name="grid_data_td" format="" no_special="1" nl2br="" first_chars="" as_label="" td_style="">
+	<inp2:Field field="$field" first_chars="$first_chars" nl2br="$nl2br" as_label="$as_label" grid="$grid" no_special="$no_special" format="$format"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="grid_total_td">
Index: branches/5.2.x/admin/system_presets/simple/permission_types_permission-type.php
===================================================================
diff -u -N
--- branches/5.2.x/admin/system_presets/simple/permission_types_permission-type.php	(revision 0)
+++ branches/5.2.x/admin/system_presets/simple/permission_types_permission-type.php	(revision 14662)
@@ -0,0 +1,48 @@
+<?php
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	// section removal
+	$remove_sections = Array (
+		'in-portal:permission_types',
+	);
+
+	// debug only sections
+	$debug_only_sections = Array (
+//		'in-portal:permission_types',
+	);
+
+	// toolbar buttons
+	$remove_buttons = Array (
+
+	);
+
+	// fields to hide
+	$hidden_fields = Array (
+
+	);
+
+	// virtual fields to hide
+	$virtual_hidden_fields = Array (
+
+	);
+
+	// fields to make required
+	$required_fields = Array (
+
+	);
+
+	// virtual fields to make required
+	$virtual_required_fields = Array (
+
+	);
+
+	// tabs during editing
+	$hide_edit_tabs = Array (
+
+	);
+
+	// hide columns in grids
+	$hide_columns = Array (
+
+	);
Index: branches/5.2.x/core/install/english.lang
===================================================================
diff -u -N -r14639 -r14662
--- branches/5.2.x/core/install/english.lang	(.../english.lang)	(revision 14639)
+++ branches/5.2.x/core/install/english.lang	(.../english.lang)	(revision 14662)
@@ -229,6 +229,7 @@
 			<PHRASE Label="la_EmptyFile" Module="Core" Type="1">RmlsZSBpcyBlbXB0eQ==</PHRASE>
 			<PHRASE Label="la_empty_file" Module="Core" Type="1">RmlsZSBpcyBlbXB0eQ==</PHRASE>
 			<PHRASE Label="la_Enabled" Module="Core" Type="1">RW5hYmxlZA==</PHRASE>
+			<PHRASE Label="la_error_CantDeleteSystemPermission" Module="Core" Type="1">Q2FuJ3QgZGVsZXRlIHN5c3RlbSBwZXJtaXNzaW9u</PHRASE>
 			<PHRASE Label="la_error_CantOpenFile" Module="Core" Type="1">Q2FuJ3Qgb3BlbiB0aGUgZmlsZQ==</PHRASE>
 			<PHRASE Label="la_error_cant_save_file" Module="Core" Type="1">Q2FuJ3Qgc2F2ZSBhIGZpbGU=</PHRASE>
 			<PHRASE Label="la_error_ConnectionFailed" Module="Core" Type="1">Q29ubmVjdGlvbiBGYWlsZWQ=</PHRASE>
@@ -1084,6 +1085,7 @@
 			<PHRASE Label="la_tab_Messages" Module="Core" Type="1">TWVzc2FnZXM=</PHRASE>
 			<PHRASE Label="la_tab_PackageContent" Module="Core" Type="1">UGFja2FnZSBDb250ZW50</PHRASE>
 			<PHRASE Label="la_tab_Permissions" Module="Core" Type="1">UGVybWlzc2lvbnM=</PHRASE>
+			<PHRASE Label="la_tab_PermissionTypes" Module="Core" Type="1">UGVybWlzc2lvbiBUeXBlcw==</PHRASE>
 			<PHRASE Label="la_tab_Properties" Module="Core" Type="1">UHJvcGVydGllcw==</PHRASE>
 			<PHRASE Label="la_tab_QueryDB" Module="Core" Type="1">UXVlcnkgRGF0YWJhc2U=</PHRASE>
 			<PHRASE Label="la_tab_Regional" Module="Core" Type="1">UmVnaW9uYWw=</PHRASE>
@@ -1187,6 +1189,7 @@
 			<PHRASE Label="la_title_addingCustom" Module="Core" Type="1">QWRkaW5nIEN1c3RvbSBGaWVsZA==</PHRASE>
 			<PHRASE Label="la_title_AddingFile" Module="Core" Type="1">QWRkaW5nIEZpbGU=</PHRASE>
 			<PHRASE Label="la_title_AddingMailingList" Module="Core" Type="1">QWRkaW5nIE1haWxpbmcgTGlzdA==</PHRASE>
+			<PHRASE Label="la_title_AddingPermissionType" Module="Core" Type="1">QWRkaW5nIFBlcm1pc3Npb24gVHlwZQ==</PHRASE>
 			<PHRASE Label="la_title_AddingSiteDomain" Module="Core" Type="1">QWRkaW5nIFNpdGUgRG9tYWlu</PHRASE>
 			<PHRASE Label="la_title_AddingSkin" Module="Core" Type="1">QWRkaW5nIFNraW4=</PHRASE>
 			<PHRASE Label="la_title_AddingSpellingDictionary" Module="Core" Type="1">QWRkaW5nIFNwZWxsaW5nIERpY3Rpb25hcnk=</PHRASE>
@@ -1235,6 +1238,7 @@
 			<PHRASE Label="la_title_EditingEmailEvent" Module="Core" Type="1">RWRpdGluZyBFbWFpbCBFdmVudA==</PHRASE>
 			<PHRASE Label="la_title_EditingFile" Module="Core" Type="1">RWRpdGluZyBGaWxl</PHRASE>
 			<PHRASE Label="la_title_EditingMembership" Module="Core" Type="1">RWRpdGluZyBNZW1iZXJzaGlw</PHRASE>
+			<PHRASE Label="la_title_EditingPermissionType" Module="Core" Type="1">RWRpdGluZyBQZXJtaXNzaW9uIFR5cGU=</PHRASE>
 			<PHRASE Label="la_title_EditingSiteDomain" Module="Core" Type="1">RWRpdGluZyBTaXRlIERvbWFpbg==</PHRASE>
 			<PHRASE Label="la_title_EditingSkin" Module="Core" Type="1">RWRpdGluZyBTa2lu</PHRASE>
 			<PHRASE Label="la_title_EditingSpellingDictionary" Module="Core" Type="1">RWRpdGluZyBTcGVsbGluZyBEaWN0aW9uYXJ5</PHRASE>
@@ -1382,6 +1386,7 @@
 			<PHRASE Label="la_ToolTip_NewGroup" Module="Core" Type="1">TmV3IEdyb3Vw</PHRASE>
 			<PHRASE Label="la_ToolTip_newlabel" Module="Core" Type="1">TmV3IGxhYmVs</PHRASE>
 			<PHRASE Label="la_ToolTip_NewLanguage" Module="Core" Type="1">TmV3IExhbmd1YWdl</PHRASE>
+			<PHRASE Label="la_ToolTip_NewPermission" Module="Core" Type="1">TmV3IFBlcm1pc3Npb24=</PHRASE>
 			<PHRASE Label="la_ToolTip_NewPhrase" Module="Core" Type="1">TmV3IFBocmFzZQ==</PHRASE>
 			<PHRASE Label="la_ToolTip_NewReview" Module="Core" Type="1">TmV3IENvbW1lbnQ=</PHRASE>
 			<PHRASE Label="la_ToolTip_NewSearchConfig" Module="Core" Type="1">TmV3IFNlYXJjaCBGaWVsZA==</PHRASE>