Index: branches/RC/core/units/categories/categories_config.php =================================================================== diff -u -N -r11646 -r11685 --- branches/RC/core/units/categories/categories_config.php (.../categories_config.php) (revision 11646) +++ branches/RC/core/units/categories/categories_config.php (.../categories_config.php) (revision 11685) @@ -85,8 +85,14 @@ ), 'category_list' => Array ('prefixes' => Array ('c_List'), 'format' => "!la_title_Categories! (#c_recordcount#)"), - 'catalog' => Array ('prefixes' => Array ('c_List'), 'format' => "!la_title_Categories!"), - 'advanced_view' => Array ('prefixes' => Array ('c_List'), 'format' => "!la_title_AdvancedView!"), + 'catalog' => Array ( + 'prefixes' => Array ('c_List'), 'format' => "!la_title_Categories!", + 'toolbar_buttons' => Array ('upcat', 'homecat', 'new_cat', 'new_link', 'new_article', /*'new_topic',*/ 'new_item', 'edit', 'delete', 'approve', 'decline', 'cut', 'copy', 'paste', 'move_up', 'move_down', 'rebuild_cache', 'view') + ), + 'advanced_view' => Array ( + 'prefixes' => Array ('c_List'), 'format' => "!la_title_AdvancedView!", + 'toolbar_buttons' => Array ('new_cat', 'edit', 'delete', 'approve', 'decline', 'view'), + ), 'reviews' => Array ('prefixes' => Array (), 'format' => "!la_title_Reviews!"), 'review_edit' => Array ('prefixes' => Array (), 'format' => "!la_title_Editing_Review!"), @@ -336,7 +342,7 @@ 'Fields' => Array( 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ), 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter'), - 'Modified_formatted' => Array( 'title'=>'la_col_Modified', 'sort_field' => 'Modified', 'filter_block' => 'grid_date_range_filter' ), + 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter' ), 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter' ), 'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter' ), 'IsSystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', ), @@ -350,7 +356,7 @@ 'Fields' => Array( 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', ), 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter'), - 'Modified_formatted' => Array( 'title'=>'la_col_Modified', 'sort_field' => 'Modified', 'filter_block' => 'grid_date_range_filter' ), + 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter' ), 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter' ), 'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter' ), 'IsSystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', ), @@ -363,7 +369,7 @@ 'Fields' => Array( 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ), 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter'), - 'Modified_formatted' => Array( 'title'=>'la_col_Modified', 'sort_field' => 'Modified', 'filter_block' => 'grid_date_range_filter' ), + 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter' ), 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter' ), 'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter' ), 'Path' => Array( 'title'=>'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter' ), Index: branches/RC/core/units/sections/sections_config.php =================================================================== diff -u -N -r11623 -r11685 --- branches/RC/core/units/sections/sections_config.php (.../sections_config.php) (revision 11623) +++ branches/RC/core/units/sections/sections_config.php (.../sections_config.php) (revision 11685) @@ -7,7 +7,7 @@ 'Hooks' => Array ( Array ( - 'Mode' => hBEFORE, + 'Mode' => hAFTER, 'Conditional' => false, 'HookToPrefix' => '*', 'HookToSpecial' => '*', @@ -203,6 +203,7 @@ 'icon' => 'tool_import', 'label' => 'la_tab_ImportData', 'url' => Array ('t' => 'tools/import1'), + 'onclick' => 'direct_edit(\'adm\', this.href);', 'permissions' => Array ('view'), 'priority' => 4, 'type' => stTREE, Index: branches/RC/core/units/admin/admin_config.php =================================================================== diff -u -N -r11623 -r11685 --- branches/RC/core/units/admin/admin_config.php (.../admin_config.php) (revision 11623) +++ branches/RC/core/units/admin/admin_config.php (.../admin_config.php) (revision 11685) @@ -57,7 +57,6 @@ 'url' => Array ('t' => 'tools/system_tools', 'pass' => 'm'), 'permissions' => Array ('view'), 'priority' => 10, - 'show_mode' => smDEBUG, 'type' => stTREE, ), ), Index: branches/RC/core/install/english.lang =================================================================== diff -u -N -r11674 -r11685 --- branches/RC/core/install/english.lang (.../english.lang) (revision 11674) +++ branches/RC/core/install/english.lang (.../english.lang) (revision 11685) @@ -913,6 +913,7 @@ UG9pbnRzIHRvIENhdGVnb3J5 SXRlbQ== VGVtcGxhdGUgKGRlc2lnbik= + VGVtcGxhdGUgRmlsZQ== VGVtcGxhdGUgVHlwZQ== VGV4dCBBbGlnbg== VGV4dCBEZWNvcmF0aW9u @@ -1044,6 +1045,8 @@ T24= T25lIFdheQ== Y3JlYXRlZA== + ZGVsZXRlZA== + dXBkYXRlZA== QWN0aXZl QWRkcmVzcw== QWZ0ZXI= @@ -1055,11 +1058,13 @@ RGVueQ== RGlzYWJsZWQ= RXhhY3Q= + RXhwaXJlZA== RmFpbGVk Rmlyc3QgTmFtZQ== aG91cihzKQ== SVAgQWRkcmVzcw== TGFzdCBOYW1l + TG9nZ2VkIE91dA== bWludXRlKHMp bW9udGgocyk= Tm90IFByb2Nlc3NlZA== @@ -1125,6 +1130,11 @@ TmV3IHBvc3RzIChkYXlzKQ== TnVtYmVyIG9mIHBvc3RzIHBlciBwYWdl UG9zdHM= + U2VjdGlvbg== + Q29uZmlndXJhdGlvbg== + UGhyYXNl + U2Vzc2lvbiBMb2c= + VmlzaXQ= UHJldmlvdXMgY2F0ZWdvcnk= UHJldmlvdXMgZ3JvdXA= UHJldmlvdXMgVXNlcg== @@ -2037,6 +2047,7 @@ RG9uZQ== RWRpdGluZyBBZ2VudA== RWRpdGluZyBCYW4gUnVsZQ== + RWRpdGluZyBDaGFuZ2VzIExvZw== RWRpdGluZyBFbWFpbCBFdmVudA== RWRpdGluZyBGaWxl RWRpdGluZyBHcm91cA== Index: branches/RC/core/units/custom_fields/custom_fields_event_handler.php =================================================================== diff -u -N -r11178 -r11685 --- branches/RC/core/units/custom_fields/custom_fields_event_handler.php (.../custom_fields_event_handler.php) (revision 11178) +++ branches/RC/core/units/custom_fields/custom_fields_event_handler.php (.../custom_fields_event_handler.php) (revision 11685) @@ -28,6 +28,7 @@ function SetCustomQuery(&$event) { $object =& $event->getObject(); + /* @var $object kDBList */ $item_type = $this->Application->GetVar('cf_type'); if (!$item_type) { @@ -40,6 +41,12 @@ } if ($item_type) { + $hidden_fields = array_map(Array(&$this->Conn, 'qstr'), $this->_getHiddenFiels($event)); + + if ($hidden_fields) { + $object->addFilter('hidden_filter', '%1$s.FieldName NOT IN (' . implode(',', $hidden_fields) . ')'); + } + $object->addFilter('itemtype_filter', '%1$s.Type = '.$item_type); } @@ -49,6 +56,51 @@ } /** + * Returns prefix, that custom fields are printed for + * + * @param kEvent $event + * @return string + */ + function _getSourcePrefix(&$event) + { + $prefix = $event->getEventParam('SourcePrefix'); + if (!$prefix) { + $sql = 'SELECT Prefix + FROM ' . TABLE_PREFIX . 'ItemTypes + WHERE ItemType = ' . $this->Application->GetVar('cf_type'); + $prefix = $this->Conn->GetOne($sql); + } + + return $prefix; + } + + /** + * Get custom fields, that should no be shown anywhere + * + * @param kEvent $event + * @return Array + */ + function _getHiddenFiels(&$event) + { + $prefix = $this->_getSourcePrefix($event); + + $virtual_fields = $this->Application->getUnitOption($prefix, 'VirtualFields'); + $custom_fields = $this->Application->getUnitOption($prefix, 'CustomFields'); + + $hidden_fields = Array (); + foreach ($custom_fields as $custom_field) { + $check_field = 'cust_' . $custom_field; + $show_mode = array_key_exists('show_mode', $virtual_fields[$check_field]) ? $virtual_fields[$check_field]['show_mode'] : true; + + if (($show_mode === false) || (($show_mode === smDEBUG) && !(defined('DEBUG_MODE') && DEBUG_MODE))) { + $hidden_fields[] = $custom_field; + } + } + + return $hidden_fields; + } + + /** * Prevents from duplicate item creation * * @param kEvent $event Index: branches/RC/core/admin_templates/categories/categories_edit.tpl =================================================================== diff -u -N -r11623 -r11685 --- branches/RC/core/admin_templates/categories/categories_edit.tpl (.../categories_edit.tpl) (revision 11623) +++ branches/RC/core/admin_templates/categories/categories_edit.tpl (.../categories_edit.tpl) (revision 11685) @@ -57,19 +57,16 @@
- - + - + @@ -89,14 +86,10 @@ - - - - - + - + @@ -132,11 +125,17 @@ } function reflectMenuIcon() { - getControl('MenuIconUrl').parentNode.parentNode.style.display = getControl('UseMenuIconUrl', null, '_cb').checked ? '' : 'none'; + var $menu_icon_url = getControl('MenuIconUrl'); + if ($menu_icon_url) { + $menu_icon_url.parentNode.parentNode.style.display = getControl('UseMenuIconUrl', null, '_cb').checked ? '' : 'none'; + } } function reflectExternalUrl() { - getControl('ExternalUrl').parentNode.parentNode.style.display = getControl('UseExternalUrl', null, '_cb').checked ? '' : 'none'; + var $external_url = getControl('ExternalUrl'); + if ($external_url) { + $external_url.parentNode.parentNode.style.display = getControl('UseExternalUrl', null, '_cb').checked ? '' : 'none'; + } } function OnSystemClick() { @@ -163,8 +162,11 @@ } function reflectFilename() { - var $checked = getControl('AutomaticFilename', null, '_cb').checked; - getControl('Filename').readOnly = $checked; + var $filename = getControl('Filename'); + if ($filename) { + var $checked = getControl('AutomaticFilename', null, '_cb').checked; + $filename.readOnly = $checked; + } } $(document).ready( Index: branches/RC/core/admin_templates/incs/custom_blocks.tpl =================================================================== diff -u -N -r11368 -r11685 --- branches/RC/core/admin_templates/incs/custom_blocks.tpl (.../custom_blocks.tpl) (revision 11368) +++ branches/RC/core/admin_templates/incs/custom_blocks.tpl (.../custom_blocks.tpl) (revision 11685) @@ -98,7 +98,7 @@ - Index: branches/RC/core/units/sections/site_config_eh.php =================================================================== diff -u -N -r11623 -r11685 --- branches/RC/core/units/sections/site_config_eh.php (.../site_config_eh.php) (revision 11623) +++ branches/RC/core/units/sections/site_config_eh.php (.../site_config_eh.php) (revision 11685) @@ -35,7 +35,8 @@ } $change_names = Array ( - 'remove_sections', 'remove_buttons', 'hidden_fields', 'virtual_hidden_fields', + 'remove_sections', 'debug_only_sections', 'remove_buttons', + 'hidden_fields', 'virtual_hidden_fields', 'debug_only_fields', 'debug_only_virtual_fields', 'required_fields', 'virtual_required_fields', 'hide_edit_tabs', 'hide_columns' ); @@ -77,22 +78,45 @@ } } + if (isset($debug_only_sections)) { + // process sections + foreach ($debug_only_sections as $debug_only_section) { + $section_adjustments[$debug_only_section]['show_mode'] = smDEBUG; + } + } + if (isset($remove_buttons)) { // process toolbar buttons foreach ($remove_buttons as $title_preset => $toolbar_buttons) { $title_presets[$title_preset]['toolbar_buttons'] = array_diff($title_presets[$title_preset]['toolbar_buttons'], $toolbar_buttons); } } + $reset_fields = true; + $reset_virtual_fields = true; + // process hidden fields if (isset($hidden_fields)) { - $fields = $this->_setFieldOption($fields, $hidden_fields, 'hidden', 1); + $fields = $this->_setFieldOption($fields, $hidden_fields, 'show_mode', false, $reset_fields); + $reset_fields = false; } if (isset($virtual_hidden_fields)) { - $virtual_fields = $this->_setFieldOption($virtual_fields, $virtual_hidden_fields, 'hidden', 1); + $virtual_fields = $this->_setFieldOption($virtual_fields, $virtual_hidden_fields, 'show_mode', false, $reset_virtual_fields); + $reset_virtual_fields = false; } + // process debug only fields + if (isset($debug_only_fields)) { + $fields = $this->_setFieldOption($fields, $debug_only_fields, 'show_mode', smDEBUG, $reset_fields); + $reset_fields = false; + } + + if (isset($debug_only_virtual_fields)) { + $virtual_fields = $this->_setFieldOption($virtual_fields, $debug_only_virtual_fields, 'show_mode', smDEBUG, $reset_virtual_fields); + $reset_virtual_fields = false; + } + // process required fields if (isset($required_fields)) { $fields = $this->_setFieldOption($fields, $required_fields, 'required', 1); @@ -136,14 +160,17 @@ * @param Array $set_fields * @param string $option_name * @param mixed $option_value + * @param bool $reset */ - function _setFieldOption($fields, $set_fields, $option_name, $option_value) + function _setFieldOption($fields, $set_fields, $option_name, $option_value, $reset = true) { - // unset given option for rest of fields (all except $set_fields) - $unset_fields = array_diff(array_keys($fields), $set_fields); - foreach ($unset_fields as $unset_field) { - if (array_key_exists($option_name, $fields[$unset_field])) { - unset($fields[$unset_field][$option_name]); + if ($reset) { + // unset given option for rest of fields (all except $set_fields) + $unset_fields = array_diff(array_keys($fields), $set_fields); + foreach ($unset_fields as $unset_field) { + if (array_key_exists($option_name, $fields[$unset_field])) { + unset($fields[$unset_field][$option_name]); + } } } Index: branches/RC/core/units/phrases/phrases_config.php =================================================================== diff -u -N -r11623 -r11685 --- branches/RC/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 11623) +++ branches/RC/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 11685) @@ -188,6 +188,7 @@ 'Translation' => Array ('title' => 'la_col_Translation', 'filter_block' => 'grid_like_filter', 'width' => 150), 'PackName' => Array ('title' => 'la_col_Language', 'filter_block' => 'grid_options_filter', 'width' => 100), 'PhraseType' => Array ('title' => 'la_col_Location', 'filter_block' => 'grid_options_filter', 'width' => 80), + 'LastChanged' => Array ('title' => 'la_col_LastChanged', 'filter_block' => 'grid_date_range_filter'), 'Module' => Array ('title' => 'la_col_Module', 'filter_block' => 'grid_options_filter'), ), ), Index: branches/RC/core/kernel/application.php =================================================================== diff -u -N -r11682 -r11685 --- branches/RC/core/kernel/application.php (.../application.php) (revision 11682) +++ branches/RC/core/kernel/application.php (.../application.php) (revision 11685) @@ -2119,10 +2119,6 @@ */ function &recallObject($name,$pseudo_class=null,$event_params=Array()) { - if ($name == 'c') { - echo ''; - } - $result =& $this->Factory->getObject($name, $pseudo_class, $event_params); return $result; } Index: branches/RC/core/install/upgrades.sql =================================================================== diff -u -N -r11662 -r11685 --- branches/RC/core/install/upgrades.sql (.../upgrades.sql) (revision 11662) +++ branches/RC/core/install/upgrades.sql (.../upgrades.sql) (revision 11685) @@ -1253,7 +1253,7 @@ 'la_Text_BackupPath', 'la_config_AllowManualFilenames', 'la_fld_cat_MenuLink', 'la_fld_UseCategoryTitle', 'la_In-Edit', 'la_ItemTab_Pages', 'la_Text_Pages', 'la_title_Pages', 'la_title_Page_Categories', 'lu_Pages', 'lu_page_HtmlTitle', 'lu_page_OnPageTitle', 'la_tab_AllPages', 'la_title_AllPages', 'la_title_ContentManagement', - 'la_title_ContentManagment', 'lu_ViewSubPages' + 'la_title_ContentManagment', 'lu_ViewSubPages', 'la_CMS_FormSubmitted' ); DELETE FROM Phrase WHERE (Phrase LIKE 'la_Description_In-Edit%') OR (Phrase LIKE 'la_Pages_PerPage%') OR (Phrase LIKE 'lu_PermName_Page.%'); @@ -1314,5 +1314,7 @@ SET SimpleSearch = 0 WHERE FieldType NOT IN ('text', 'range') AND SimpleSearch = 1; +DELETE FROM PersistantSessionData WHERE VariableName IN ('c_columns_.', 'c.showall_columns_.'); + DELETE FROM Modules WHERE Name = 'Proj-Base'; UPDATE Modules SET Version = '5.0.0', Loaded = 1 WHERE Name = 'In-Portal'; \ No newline at end of file Index: branches/RC/core/units/logs/session_logs/session_logs_config.php =================================================================== diff -u -N -r11612 -r11685 --- branches/RC/core/units/logs/session_logs/session_logs_config.php (.../session_logs_config.php) (revision 11612) +++ branches/RC/core/units/logs/session_logs/session_logs_config.php (.../session_logs_config.php) (revision 11685) @@ -72,7 +72,7 @@ 'SessionId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'Status' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', - 'options'=> array(0=>'la_Active',1=>'la_LoggedOut',2=>'la_Expired'), + 'options'=> array(0 => 'la_opt_Active', 1 => 'la_opt_LoggedOut', 2 => 'la_opt_Expired'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1 ), Index: branches/RC/core/units/general/cat_dbitem_export.php =================================================================== diff -u -N -r10024 -r11685 --- branches/RC/core/units/general/cat_dbitem_export.php (.../cat_dbitem_export.php) (revision 10024) +++ branches/RC/core/units/general/cat_dbitem_export.php (.../cat_dbitem_export.php) (revision 11685) @@ -214,6 +214,11 @@ if ( $automatic_fields && ($this->exportOptions['SkipFirstRow']) ) { $this->openFile($event); $this->exportOptions['ExportColumns'] = $this->readRecord(); + + if (!$this->exportOptions['ExportColumns']) { + $this->exportOptions['ExportColumns'] = Array (); + } + $this->closeFile(); // remove additional (non-parseble columns) @@ -1268,10 +1273,10 @@ } /** - * Export form validation & processing - * - * @param kEvent $event - */ + * Export form validation & processing + * + * @param kEvent $event + */ function OnExportBegin(&$event) { $items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) ); @@ -1313,7 +1318,7 @@ if( $export_object->verifyOptions($event) ) { - if ($object->GetDBField('ExportSavePreset')) { + if ($this->_getExportSavePreset($object)) { $name = $object->GetDBField('ExportPresetName'); $export_settings = $this->Application->RecallPersistentVar('export_settings'); @@ -1350,6 +1355,21 @@ } /** + * Returns export save preset name, when used at all + * + * @param kDBItem $object + * @return string + */ + function _getExportSavePreset(&$object) + { + if (!array_key_exists('ExportSavePreset', $object->Fields)) { + return ''; + } + + return $object->GetDBField('ExportSavePreset'); + } + + /** * set required fields based on import or export params * * @param kEvent $event @@ -1361,7 +1381,7 @@ $required_fields['export'] = Array('ExportFormat', 'ExportFilename','ExportColumns'); $object =& $event->getObject(); - if ($object->GetDBField('ExportSavePreset')) { + if ($this->_getExportSavePreset($object)) { $required_fields['export'][] = 'ExportPresetName'; } Index: branches/RC/core/kernel/nparser/compiler.php =================================================================== diff -u -N -r11661 -r11685 --- branches/RC/core/kernel/nparser/compiler.php (.../compiler.php) (revision 11661) +++ branches/RC/core/kernel/nparser/compiler.php (.../compiler.php) (revision 11685) @@ -79,9 +79,10 @@ $this->FindTemplateFiles($template_path, $options); } - // find Front-End templates + // find Front-End templates (from enabled themes only) $sql = 'SELECT Name - FROM ' . $this->Application->getUnitOption('theme', 'TableName'); + FROM ' . $this->Application->getUnitOption('theme', 'TableName') . ' + WHERE Enabled = 1'; $themes = $this->Conn->GetCol($sql); $options = Array (); Index: branches/RC/core/admin_templates/incs/form_blocks.tpl =================================================================== diff -u -N -r11684 -r11685 --- branches/RC/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 11684) +++ branches/RC/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 11685) @@ -112,15 +112,21 @@ - - - - - - - + + + + + + + + + + + + + - + @@ -144,25 +150,27 @@ - - - - - - - - - + + + + + + + + + + + - + @@ -175,425 +183,455 @@ - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - + + + + + - - - - - - - + + - - - + + - - - - - + + + + + + + - - - - - - - - + + + + + + + + + + - - - + + - - - - - + + + + + + + + - - - - - - - - + + + + + + + + + + - - + + + + + + + - - - - - - - - - + + - - - + Form.addControl('___Frame', ); + + + + - - + - - + Form.addControl('', ); + + + + + - + - - - + + + + + - - - - - - - - + + - - - + + + @@ -605,42 +643,46 @@ - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + @@ -652,36 +694,40 @@ - - - + + + + + - - - - - - + + - - - - - - - - + + + + + + + + + + @@ -693,62 +739,183 @@ - - - + + + + + - - - - - - - + + - + + + + + ##--> - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -930,112 +1097,3 @@
+
- - - - - -
+ + + + + +
- - -
+ + +
- - -
+ + +
- - -
- - - - - -
- - - - -
+ +
+ + +
+ + + + + +
+ + + + +
+ + + + + + () + - - - - - () - + +
-
-
0%
-
-
+ +
+
+
0%
+
+
+
+ + + + + + + + + + + + + + + + +
Uploading:
Progress:
Time elapsed:
Time remaining:
Cancel
- + +
- + + - - - - - - - - - - - -
Uploading: +   + + +
Progress:
Time elapsed:
Time remaining:
Cancel
- - - - - - -
-   - - -
+
+
-
-
+
+ + + -
- - - + - // Button settings - buttonImageURL: 'img/upload.png', // Relative to the Flash file - buttonWidth: 63, - buttonHeight: 21, - buttonText: 'Browse', - buttonTextStyle: ".theFont { font-size: 12; font-family: arial, sans}", - buttonTextTopPadding: 2, - buttonTextLeftPadding: 9, - buttonPlaceholderId: '_place_holder' - } - ) - - -
-   - - () - - -
+   + + () + + +
-   - () + +
+   + () - -
- - - " - style="cursor: pointer; margin-right: 5px" - title="Date selector" - /> - () - - -   () -
+ + + " + style="cursor: pointer; margin-right: 5px" + title="Date selector" + /> + () + + +   () +
- -  *:
- - - - - - + +
+ +  *:
+ + + + + + + + 		  + + +   - - -
- - -
- - - - - - + +
+ + + + + + - -
- - - ');"> - - + +
+ + + ');"> + + + + + +
- - - + + - - + + + +
- - - - - - + +
+ + + - + - -
+ + + + + + - - - - - - - + + + + + + + - + - -
-
+
- -
+ +
- - -
+ + +
- - - - + +
+ + + + + +
- - - class="" onchange="update_checkbox(this, document.getElementById(''));" onclick=""> - -
+ + + class="" onchange="update_checkbox(this, document.getElementById(''));" onclick=""> + +
- - - - + +
+ + + + + + +
+ + class="" onchange="update_checkbox(this, document.getElementById(''));" onclick=""> + + + +
- - - + +
+ + + + + + + + + + +
+ + + + + + + + + + +
+ + +
+ + + +
+
+ + + +
+ + + +

+
+
+
+ +
+
+ + + + + + + + + + + +
 
+ + + + + + + _move_left_button"/>
+ _move_right_button"/> + 		+ +
+ + + + + + +
- - - - - - - - - - - - - - - -
- - -
- - - -
-
- - - -
- - - -

-
-
-
- -
- - - - - - - - - - - - - - - - - - - - -
 
- - - - - - - _move_left_button"/>
- _move_right_button"/> - 		- -
- - - - - - - - - - Index: branches/RC/core/admin_templates/custom_fields/custom_fields_edit.tpl =================================================================== diff -u -N -r11623 -r11685 --- branches/RC/core/admin_templates/custom_fields/custom_fields_edit.tpl (.../custom_fields_edit.tpl) (revision 11623) +++ branches/RC/core/admin_templates/custom_fields/custom_fields_edit.tpl (.../custom_fields_edit.tpl) (revision 11685) @@ -1,4 +1,4 @@ - + @@ -89,7 +89,7 @@ - +
Index: branches/RC/core/kernel/db/db_tag_processor.php =================================================================== diff -u -N -r11662 -r11685 --- branches/RC/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 11662) +++ branches/RC/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 11685) @@ -2425,6 +2425,52 @@ { } + + /** + * Checks, that field is visible on edit form + * + * @param Array $params + * @return bool + */ + function FieldVisible($params) + { + $check_field = $params['field']; + $fields = $this->Application->getUnitOption($this->Prefix, 'Fields'); + $show_mode = array_key_exists('show_mode', $fields[$check_field]) ? $fields[$check_field]['show_mode'] : true; + + if ($show_mode === smDEBUG) { + return defined('DEBUG_MODE') && DEBUG_MODE; + } + + return $show_mode; + } + + /** + * Checks, that there area visible fields in given section on edit form + * + * @param Array $params + * @return bool + */ + function FieldsVisible($params) + { + if (!$params['fields']) { + return true; + } + + $fields = $this->Application->getUnitOption($this->Prefix, 'Fields'); + $check_fields = explode(',', $params['fields']); + + foreach ($check_fields as $check_field) { + // when at least one field in subsection is visible, then subsection is visible too + $show_mode = array_key_exists('show_mode', $fields[$check_field]) ? $fields[$check_field]['show_mode'] : true; + if (($show_mode === true) || (($show_mode === smDEBUG) && (defined('DEBUG_MODE') && DEBUG_MODE))) { + // field is visible + return true; + } + } + + return false; + } } ?> \ No newline at end of file