Index: branches/5.1.x/core/units/selectors/selectors_config.php
===================================================================
diff -u -N -r14241 -r14537
--- branches/5.1.x/core/units/selectors/selectors_config.php (.../selectors_config.php) (revision 14241)
+++ branches/5.1.x/core/units/selectors/selectors_config.php (.../selectors_config.php) (revision 14537)
@@ -1,6 +1,6 @@
Array(
'default'=>'icon16_selector.gif'),
'Fields' => Array(
- 'Name' => Array( 'title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
- 'SelectorName' => Array( 'title'=>'la_col_SelectorName', 'filter_block' => 'grid_like_filter'),
- 'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'grid_description_td', 'filter_block' => 'grid_like_filter'),
+ 'Name' => Array ('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
+ 'SelectorName' => Array ('filter_block' => 'grid_like_filter'),
+ 'Description' => Array ('data_block' => 'grid_description_td', 'filter_block' => 'grid_like_filter'),
),
),
'BlockStyles' => Array(
'Icons' => Array('default'=>'icon16_selector.gif'),
'Fields' => Array(
- 'Name' => Array( 'title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
- 'SelectorName' => Array( 'title'=>'la_col_SelectorName', 'filter_block' => 'grid_like_filter'),
- 'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'grid_description_td', 'filter_block' => 'grid_like_filter'),
- 'ParentId' => Array('title'=>'la_col_Basedon', 'filter_block' => 'grid_options_filter'),
+ 'Name' => Array ('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
+ 'SelectorName' => Array ('filter_block' => 'grid_like_filter'),
+ 'Description' => Array ('data_block' => 'grid_description_td', 'filter_block' => 'grid_like_filter'),
+ 'ParentId' => Array ('title' => 'la_col_Basedon', 'filter_block' => 'grid_options_filter'),
),
),
),
Index: branches/5.1.x/core/units/structure/structure_config.php
===================================================================
diff -u -N -r14241 -r14537
--- branches/5.1.x/core/units/structure/structure_config.php (.../structure_config.php) (revision 14241)
+++ branches/5.1.x/core/units/structure/structure_config.php (.../structure_config.php) (revision 14537)
@@ -1,6 +1,6 @@
'CategoryId',
- 'StatusField' => Array('IsMenu'),
+ 'StatusField' => Array('Status'),
'TitleField' => 'Name', // field, used in bluebar when editing existing item
@@ -217,40 +217,40 @@
'Default' => Array(
'Icons' => Array(1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'),
'Fields' => Array(
- 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'filter_width' => '20' ),
- 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_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' ),
- 'Protected' => Array( 'title'=>'la_col_Protected', 'filter_block' => 'grid_options_filter', 'width' => 100),
+ 'CategoryId' => Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
+ 'Name' => Array ('title'=>'column:la_fld_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
+ 'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 170),
+ 'Template' => Array ('title' => 'column:la_fld_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
+ 'IsMenu' => Array ('title' => 'la_col_Visible', 'filter_block' => 'grid_options_filter', 'width' => 70),
+ 'Path' => Array ('title'=>'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter' ),
+ 'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
),
),
'Radio' => Array(
'Icons' => Array(1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'),
'Selector' => 'radio',
'Fields' => Array(
- 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'filter_width' => '20' ),
- 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_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' ),
- 'Protected' => Array( 'title'=>'la_col_Protected', 'filter_block' => 'grid_options_filter', 'width' => 100),
+ 'CategoryId' => Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
+ 'Name' => Array ('title'=>'column:la_fld_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
+ 'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 170),
+ 'Template' => Array ('title' => 'column:la_fld_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
+ 'IsMenu' => Array ('title' => 'la_col_Visible', 'filter_block' => 'grid_options_filter', 'width' => 70),
+ 'Path' => Array ('title'=>'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter' ),
+ 'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
),
),
'AllPages' => Array(
'Icons' => Array(1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'),
'Fields' => Array(
- 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'filter_width' => '20' ),
- 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter' ),
- 'Path' => Array( 'title'=>'la_col_Path', 'data_block'=>'page_path_td', 'sort_field' => 'CachedNavbar', 'filter_block' => 'grid_like_filter' ),
- 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter' ),
- 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter', 'hidden' => true ),
- 'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter' ),
- 'Protected' => Array( 'title'=>'la_col_Protected', 'filter_block' => 'grid_options_filter', 'width' => 100),
+ 'CategoryId' => Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
+ 'Name' => Array ('title'=>'column:la_fld_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
+ 'Path' => Array ('title'=>'la_col_Path', 'data_block' => 'page_path_td', 'sort_field' => 'CachedNavbar', 'filter_block' => 'grid_like_filter' ),
+ 'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 170),
+ 'Template' => Array ('title' => 'column:la_fld_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
+ 'IsMenu' => Array ('title' => 'la_col_Visible', 'filter_block' => 'grid_options_filter', 'width' => 70),
+ 'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
),
),
),
Index: branches/5.1.x/core/install/upgrades.php
===================================================================
diff -u -N -r14327 -r14537
--- branches/5.1.x/core/install/upgrades.php (.../upgrades.php) (revision 14327)
+++ branches/5.1.x/core/install/upgrades.php (.../upgrades.php) (revision 14537)
@@ -1,6 +1,6 @@
Conn->Query($sql);
}
}
+
+ /**
+ * Update to 5.1.3; Merges column and field phrases
+ *
+ * @param string $mode when called mode {before, after)
+ */
+ function Upgrade_5_1_3($mode)
+ {
+ if ($mode != 'after') {
+ return ;
+ }
+
+ $sql = 'SELECT *
+ FROM ' . TABLE_PREFIX . 'Phrase
+ WHERE PhraseKey LIKE "LA_COL_%"';
+ $column_phrases = $this->Conn->Query($sql, 'PhraseKey');
+
+ $sql = 'SELECT *
+ FROM ' . TABLE_PREFIX . 'Phrase
+ WHERE PhraseKey LIKE "LA_FLD_%"';
+ $field_phrases = $this->Conn->Query($sql, 'PhraseKey');
+
+ $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+ /* @var $ml_helper kMultiLanguageHelper */
+
+ $ml_helper->createFields('phrases');
+
+ $delete_ids = Array ();
+ $language_count = $ml_helper->getLanguageCount();
+
+ foreach ($column_phrases as $phrase_key => $phrase_info) {
+ $field_phrase_key = 'LA_FLD_' . substr($phrase_key, 7);
+
+ if ( !isset($field_phrases[$field_phrase_key]) ) {
+ continue;
+ }
+
+ $fields_hash = Array ();
+
+ // copy column phrase main translation into field phrase column translation
+ for ($i = 1; $i <= $language_count; $i++) {
+ if ( !$ml_helper->LanguageFound($i) ) {
+ continue;
+ }
+
+ $fields_hash['l' . $i . '_ColumnTranslation'] = $phrase_info['l' . $i . '_Translation'];
+ }
+
+ $delete_ids[] = $phrase_info['PhraseId'];
+ $this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'Phrase', 'PhraseId = ' . $field_phrases[$field_phrase_key]['PhraseId']);
+ }
+
+ // delete all column phrases, that were absorbed by field phrases
+ if ( $delete_ids ) {
+ $sql = 'DELETE FROM ' . TABLE_PREFIX . 'Phrase
+ WHERE PhraseId IN (' . implode(',', $delete_ids) . ')';
+ $this->Conn->Query($sql);
+
+
+ $sql = 'DELETE FROM ' . TABLE_PREFIX . 'PhraseCache';
+ $this->Conn->Query($sql);
+ }
+ }
}
\ No newline at end of file
Index: branches/5.1.x/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -N -r14520 -r14537
--- branches/5.1.x/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 14520)
+++ branches/5.1.x/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 14537)
@@ -1,6 +1,6 @@
Application->Phrase($label, false);
+ }
+ else {
+ $label = $params['title_label'];
+ $hint = $this->Application->Phrase('hint:' . $label, false);
+ }
+
+ return $hint; // $hint != strtoupper('!' . $label . '!') ? $hint : '';
+ }
+
/**
* Returns formatted date + time on current language
*
Index: branches/5.1.x/core/units/helpers/language_import_helper.php
===================================================================
diff -u -N -r14524 -r14537
--- branches/5.1.x/core/units/helpers/language_import_helper.php (.../language_import_helper.php) (revision 14524)
+++ branches/5.1.x/core/units/helpers/language_import_helper.php (.../language_import_helper.php) (revision 14537)
@@ -1,6 +1,6 @@
_languages as $language_id) {
- $this->_performUpgrade($language_id, 'phrases', 'PhraseKey', Array ('l%s_Translation', 'PhraseType'));
+ $this->_performUpgrade($language_id, 'phrases', 'PhraseKey', Array ('l%s_Translation', 'l%s_HintTranslation', 'l%s_ColumnTranslation', 'PhraseType'));
$this->_performUpgrade($language_id, 'emailevents', 'EventId', Array ('l%s_Subject', 'Headers', 'MessageType', 'l%s_Body'));
$this->_performUpgrade($language_id, 'country-state', 'CountryStateId', Array ('l%s_Name'));
}
@@ -317,14 +321,40 @@
$ret .= "\t\t" . '' . "\n";
foreach ($phrases as $phrase_id => $phrase) {
$translation = $phrase['l' . $language_id . '_Translation'];
+ $hint_translation = $phrase['l' . $language_id . '_HintTranslation'];
+ $column_translation = $phrase['l' . $language_id . '_ColumnTranslation'];
if (!$translation) {
// phrase is not translated on given language
continue;
}
- $data = $this->_exportEncoding == 'base64' ? base64_encode($translation) : '';
- $ret .= "\t\t\t" . '' . $data . '' . "\n";
+ if ( $this->_exportEncoding == 'base64' ) {
+ $data = base64_encode($translation);
+ $hint_translation = base64_encode($hint_translation);
+ $column_translation = base64_encode($column_translation);
+ }
+ else {
+ $data = '';
+ $hint_translation = htmlspecialchars($hint_translation);
+ $column_translation = htmlspecialchars($column_translation);
+ }
+
+ $attributes = Array (
+ 'Label="' . $phrase['Phrase'] . '"',
+ 'Module="' . $phrase['Module'] . '"',
+ 'Type="' . $phrase['PhraseType'] . '"'
+ );
+
+ if ( $phrase['l' . $language_id . '_HintTranslation'] ) {
+ $attributes[] = 'Hint="' . $hint_translation . '"';
+ }
+
+ if ( $phrase['l' . $language_id . '_ColumnTranslation'] ) {
+ $attributes[] = 'Column="' . $column_translation . '"';
+ }
+
+ $ret .= "\t\t\t" . '' . $data . '' . "\n";
}
$ret .= "\t\t" . '' . "\n";
@@ -804,18 +834,26 @@
);
$translation = $phrase_node->Data;
+ $hint_translation = isset($phrase_node->Attributes['HINT']) ? $phrase_node->Attributes['HINT'] : '';
+ $column_translation = isset($phrase_node->Attributes['COLUMN']) ? $phrase_node->Attributes['COLUMN'] : '';
if (array_key_exists($fields_hash['PhraseType'], $this->phrase_types_allowed)) {
if ($language_encoding != 'plain') {
$translation = base64_decode($translation);
+ $hint_translation = base64_decode($hint_translation);
+ $column_translation = base64_decode($column_translation);
}
if (array_key_exists($phrase_key, $other_translations)) {
$other_translations[$phrase_key]['l' . $language_id . '_Translation'] = $translation;
+ $other_translations[$phrase_key]['l' . $language_id . '_HintTranslation'] = $hint_translation;
+ $other_translations[$phrase_key]['l' . $language_id . '_ColumnTranslation'] = $column_translation;
}
else {
$other_translations[$phrase_key] = Array (
- 'l' . $language_id . '_Translation' => $translation
+ 'l' . $language_id . '_Translation' => $translation,
+ 'l' . $language_id . '_HintTranslation' => $hint_translation,
+ 'l' . $language_id . '_ColumnTranslation' => $column_translation,
);
}
Index: branches/5.1.x/core/kernel/utility/multibyte.php
===================================================================
diff -u -N -r14241 -r14537
--- branches/5.1.x/core/kernel/utility/multibyte.php (.../multibyte.php) (revision 14241)
+++ branches/5.1.x/core/kernel/utility/multibyte.php (.../multibyte.php) (revision 14537)
@@ -1,6 +1,6 @@
SetDBField('PhraseKey', mb_strtoupper($object->GetDBField('Phrase')));
- if ($object->GetOriginalField('Translation') != $object->GetDBField('Translation')) {
+ if ( $this->translationChanged($object) ) {
$object->SetDBField('LastChanged_date', adodb_mktime() );
$object->SetDBField('LastChanged_time', adodb_mktime() );
$object->SetDBField('LastChangeIP', $_SERVER['REMOTE_ADDR']);
@@ -279,6 +279,28 @@
}
/**
+ * Checks, that at least one of phrase's translations was changed
+ *
+ * @param kDBItem $object
+ * @return bool
+ */
+ function translationChanged(&$object)
+ {
+ $changed_fields = array_keys( $object->GetChangedFields() );
+ $translation_fields = Array ('Translation', 'HintTranslation', 'ColumnTranslation');
+
+ foreach ($changed_fields as $changed_field) {
+ $changed_field = preg_replace('/^l[\d]+_/', '', $changed_field);
+
+ if ( in_array($changed_field, $translation_fields) ) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
* Changes default module to custom (when available)
*
* @param kEvent $event
Index: branches/5.1.x/core/install/install_schema.sql
===================================================================
diff -u -N -r14402 -r14537
--- branches/5.1.x/core/install/install_schema.sql (.../install_schema.sql) (revision 14402)
+++ branches/5.1.x/core/install/install_schema.sql (.../install_schema.sql) (revision 14537)
@@ -189,6 +189,16 @@
l3_Translation text,
l4_Translation text,
l5_Translation text,
+ l1_HintTranslation text,
+ l2_HintTranslation text,
+ l3_HintTranslation text,
+ l4_HintTranslation text,
+ l5_HintTranslation text,
+ l1_ColumnTranslation text,
+ l2_ColumnTranslation text,
+ l3_ColumnTranslation text,
+ l4_ColumnTranslation text,
+ l5_ColumnTranslation text,
PhraseType int(11) NOT NULL DEFAULT '0',
LastChanged int(10) unsigned DEFAULT NULL,
LastChangeIP varchar(15) NOT NULL DEFAULT '',
Index: branches/5.1.x/core/units/forms/form_submissions/form_submissions_config.php
===================================================================
diff -u -N -r14332 -r14537
--- branches/5.1.x/core/units/forms/form_submissions/form_submissions_config.php (.../form_submissions_config.php) (revision 14332)
+++ branches/5.1.x/core/units/forms/form_submissions/form_submissions_config.php (.../form_submissions_config.php) (revision 14537)
@@ -1,6 +1,6 @@
Array(
'Icons' => Array('default' => 'icon16_item.png', 1 => 'icon16_replied.gif', 2 => 'icon16_not_replied.gif', 3 => 'icon16_new_email.gif', 4 => 'icon16_bounce.gif'),
'Fields' => Array(
- 'FormSubmissionId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'sort_field' => 'FormFieldId', 'filter_block' => 'grid_range_filter', 'width' => 60 ),
- 'SubmissionTime' => Array( 'title'=>'la_prompt_SumbissionTime', 'filter_block' => 'grid_date_range_filter', 'width' => 145 ),
- 'IPAddress' => Array ('title' => 'la_col_IPAddress', 'filter_block' => 'grid_like_filter', 'width' => 100 ),
- 'ReferrerURL' => Array ('title' => 'la_col_ReferrerURL', 'filter_block' => 'grid_like_filter', 'first_chars' => 100, 'width' => 200 ),
- 'LogStatus' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100 ),
- 'LastUpdatedOn' => Array ('title' => 'la_col_LastUpdatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145 ),
+ 'FormSubmissionId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'sort_field' => 'FormFieldId', 'filter_block' => 'grid_range_filter', 'width' => 60 ),
+ 'SubmissionTime' => Array ('title' => 'la_prompt_SumbissionTime', 'filter_block' => 'grid_date_range_filter', 'width' => 145 ),
+ 'IPAddress' => Array ('filter_block' => 'grid_like_filter', 'width' => 100 ),
+ 'ReferrerURL' => Array ('filter_block' => 'grid_like_filter', 'first_chars' => 100, 'width' => 200 ),
+ 'LogStatus' => Array ('title' => 'column:la_fld_Status', 'filter_block' => 'grid_options_filter', 'width' => 100 ),
+ 'LastUpdatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145 ),
),
),
),
Index: branches/5.1.x/core/units/site_domains/site_domains_config.php
===================================================================
diff -u -N -r14241 -r14537
--- branches/5.1.x/core/units/site_domains/site_domains_config.php (.../site_domains_config.php) (revision 14241)
+++ branches/5.1.x/core/units/site_domains/site_domains_config.php (.../site_domains_config.php) (revision 14537)
@@ -1,6 +1,6 @@
Array (
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array (
- 'DomainId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'DomainName' => Array ('title' => 'la_col_DomainName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'SSLUrl' => Array ('title' => 'la_col_SSLUrl', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'Country' => Array ('title' => 'la_col_Country', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
- 'PrimaryLanguageId' => Array ('title' => 'la_col_Language', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
- 'PrimaryThemeId' => Array ('title' => 'la_col_Theme', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
- 'Priority' => Array ('title' => 'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'DomainId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'DomainName' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'SSLUrl' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'Country' => Array ('filter_block' => 'grid_options_filter', 'width' => 250, ),
+ 'PrimaryLanguageId' => Array ('title' => 'column:la_fld_Language', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
+ 'PrimaryThemeId' => Array ('title' => 'column:la_fld_Theme', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
+ 'Priority' => Array ('filter_block' => 'grid_range_filter', 'width' => 70, ),
),
),
),
Index: branches/5.1.x/core/units/category_items/category_items_config.php
===================================================================
diff -u -N -r14241 -r14537
--- branches/5.1.x/core/units/category_items/category_items_config.php (.../category_items_config.php) (revision 14241)
+++ branches/5.1.x/core/units/category_items/category_items_config.php (.../category_items_config.php) (revision 14537)
@@ -1,6 +1,6 @@
Array (
- 'CategoryName' => Array( 'title'=>'la_col_Category', 'data_block' => 'grid_checkbox_category_td'),
+ 'CategoryName' => Array( 'title'=>'column:la_fld_Category', 'data_block' => 'grid_checkbox_category_td'),
),
),
),
Index: branches/5.1.x/core/units/country_states/country_states_config.php
===================================================================
diff -u -N -r14241 -r14537
--- branches/5.1.x/core/units/country_states/country_states_config.php (.../country_states_config.php) (revision 14241)
+++ branches/5.1.x/core/units/country_states/country_states_config.php (.../country_states_config.php) (revision 14537)
@@ -1,6 +1,6 @@
Array (
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array (
- 'CountryStateId' => Array ('title' => 'la_col_Id', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'Name' => Array ('title' => 'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'IsoCode' => Array ('title' => 'la_col_IsoCode', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Type' => Array ('title' => 'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'StateCountryId' => Array ('title' => 'la_col_StateCountry', 'filter_block' => 'grid_options_filter', 'width' => 200, ),
- 'ShortIsoCode' => Array ('title' => 'la_col_ShortIsoCode', 'filter_block' => 'grid_like_filter', 'width' => 125, ),
+ 'CountryStateId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'Name' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'IsoCode' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'StateCountryId' => Array ('title' => 'column:la_fld_StateCountry', 'filter_block' => 'grid_options_filter', 'width' => 200, ),
+ 'ShortIsoCode' => Array ('filter_block' => 'grid_like_filter', 'width' => 125, ),
),
),
),
Index: branches/5.1.x/core/units/statistics/statistics_config.php
===================================================================
diff -u -N -r14241 -r14537
--- branches/5.1.x/core/units/statistics/statistics_config.php (.../statistics_config.php) (revision 14241)
+++ branches/5.1.x/core/units/statistics/statistics_config.php (.../statistics_config.php) (revision 14537)
@@ -1,6 +1,6 @@
Array(
'Icons' => Array('default' => 'icon16_item.png'),
'Fields' => Array(
- 'Login' => Array('title' => 'la_col_Username', 'data_block' => 'grid_checkbox_td'),
- 'LastName' => Array( 'title'=>'la_col_LastName'),
- 'FirstName' => Array( 'title'=>'la_col_FirstName'),
+ 'Login' => Array('title' => 'column:la_fld_Username', 'data_block' => 'grid_checkbox_td'),
+ 'LastName' => Array(),
+ 'FirstName' => Array(),
),
),
Index: branches/5.1.x/core/units/email_queue/email_queue_config.php
===================================================================
diff -u -N -r14241 -r14537
--- branches/5.1.x/core/units/email_queue/email_queue_config.php (.../email_queue_config.php) (revision 14241)
+++ branches/5.1.x/core/units/email_queue/email_queue_config.php (.../email_queue_config.php) (revision 14537)
@@ -1,6 +1,6 @@
Array (
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array (
- 'EmailQueueId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'EmailQueueId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
'MailingId' => Array ('title' => 'la_col_MailingList', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
'ToEmail' => Array ('title' => 'la_prompt_AddressTo', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Subject' => Array ('title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Subject' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),
'MessageHeaders' => Array ('title' => 'la_col_MessageHeaders', 'data_block' => 'grid_headers_td', 'filter_block' => 'grid_like_filter', 'width' => 130, ),
'Queued' => Array ('title' => 'la_col_Queued', 'filter_block' => 'grid_date_range_filter', 'width' => 80, ),
'SendRetries' => Array ('title' => 'la_col_SendRetries', 'filter_block' => 'grid_range_filter', 'width' => 100, ),
Index: branches/5.1.x/core/admin_templates/regional/phrases_edit.tpl
===================================================================
diff -u -N -r14241 -r14537
--- branches/5.1.x/core/admin_templates/regional/phrases_edit.tpl (.../phrases_edit.tpl) (revision 14241)
+++ branches/5.1.x/core/admin_templates/regional/phrases_edit.tpl (.../phrases_edit.tpl) (revision 14537)
@@ -1,4 +1,4 @@
-
+
@@ -78,12 +78,14 @@
|
-
-
-
+
+
+
+
+
-
-
+
+
Index: branches/5.1.x/core/install/english.lang
===================================================================
diff -u -N -r14526 -r14537
--- branches/5.1.x/core/install/english.lang (.../english.lang) (revision 14526)
+++ branches/5.1.x/core/install/english.lang (.../english.lang) (revision 14537)
@@ -1,4 +1,4 @@
-
+
QWN0aXZl
@@ -63,169 +63,69 @@
T3JkZXIgc2VjdGlvbnMgYnk=
Q2xvc2U=
QWNjZXNz
- QWN0aW9u
QWRkaXRpb25hbA==
- QWRtaW4gUHJpbWFyeQ==
QWZmZWN0ZWQgSXRlbXM=
QWx0IFZhbHVl
- QmNj
- Qm91bmNlZCBPbg==
- Qm91bmNlIEluZm8=
QnVpbGQgRGF0ZQ==
- U2VjdGlvbg==
U2VjdGlvbiBOYW1l
- Q2M=
- Q2hhbmdlcw==
- Q2hhcnNldA==
- Q291bnRyeQ==
- Q3JlYXRlZCBPbg==
- RGVzY3JpcHRpb24=
- RG9tYWluIE5hbWU=
- RHVyYXRpb24=
+ Q29sdW1uIFBocmFzZQ==
RWZmZWN0aXZl
- RW1haWw=
- RS1tYWlsIENvbW11bmljYXRpb24gUm9sZQ==
RW1haWwgRXZlbnRz
- UXVldWU=
- U2VudA==
- VG90YWw=
- RW5hYmxlZA==
RW5hYmxlIEUtbWFpbCBDb21tdW5pY2F0aW9u
- RW5kIERhdGU=
Jm5ic3A7
- RXZlbnQ=
RXZlbnQgRGVzY3JpcHRpb24=
RXZlbnQgUGFyYW1z
- TWF0Y2ggVHlwZQ==
- RmllbGQgTmFtZQ==
- TWF0Y2ggVmFsdWU=
- RmlsZW5hbWU=
- UGF0aA==
- Rmlyc3QgTmFtZQ==
- RnJvbSBFLW1haWw=
- RnJvbnQtRW5kIE9ubHk=
- QWxsb3cgUmVnaXN0cmF0aW9u
- R3JvdXAgTmFtZQ==
- SGl0cw==
- SUQ=
- SW1hZ2U=
+ SGludCBQaHJhc2U=
U3RhdHVz
SW1hZ2U=
VVJM
SW5oZXJpdGVk
SW5oZXJpdGVkIEZyb20=
SW4gTWVudQ==
SVAgQWRkcmVzcw==
- SVNPIENvZGU=
UG9wdWxhcg==
- UHJpbWFyeQ==
VXNlciBQcmltYXJ5
- U3lzdGVt
- VXNlciBGaWVsZA==
- SXRlbSBJRA==
SXRlbSBQcmVmaXg=
S2V5d29yZA==
TGFiZWw=
- TGFuZ3VhZ2U=
TGFuZ3VhZ2UgUGFjayBJbnN0YWxsZWQ=
TGFzdCBDaGFuZ2Vk
TGFzdCBDb21waWxlZA==
- TGFzdCBOYW1l
- TGFzdCBSdW4gT24=
- TGFzdCBSdW4gU3RhdHVz
TGFzdCBBdHRlbXB0
- TGFzdCBVcGRhdGVkIE9u
TGluayBVUkw=
- TmFtZQ==
- TG9jYXRpb24=
- TG9naW4=
TWFpbGluZyBMaXN0
- TWFzdGVyIElE
- TWFzdGVyIFByZWZpeA==
TWVtYmVyc2hpcCBFeHBpcmVz
- TWVzc2FnZQ==
TWVzc2FnZSBIZWFkZXJz
SFRNTA==
- UGxhaW4gVGV4dA==
- TWlzc3BlbGxlZCBXb3Jk
- TW9kaWZpZWQgT24=
- TW9kdWxl
- TmFtZQ==
- TmV4dCBSdW4gT24=
- T2NjdXJlZCBPbg==
T3JpZ2luYWwgVmFsdWU=
- UGFjayBOYW1l
- U2VjdGlvbiBUaXRsZQ==
UGF0aA==
QWRk
RGVsZXRl
RWRpdA==
UGVybWlzc2lvbiBOYW1l
QWNjZXNz
Vmlldw==
- UGhyYXNl
UGhyYXNlcw==
- VHlwZQ==
VXNlciBJRA==
- UHJlZml4
UHJldmlldw==
- UHJpbWFyeQ==
UHJpbWFyeSBHcm91cA==
UHJpbWFyeSBWYWx1ZQ==
- T3JkZXI=
RmllbGQgUHJvbXB0
- UHJvdGVjdGVk
UXVldWVk
- UmF0aW5n
- UmVjaXBpZW50IFR5cGU=
UmVmZXJlcg==
- UmVmZXJyZXIgVVJM
- UmVsYXRpb24gVHlwZQ==
- UmVwbGllZCBPbg==
- UmVwbGllZA==
- UmVxdWlyZSBMb2dpbg==
UmVzZXQgdG8gZGVmYXVsdA==
Q29tbWVudHM=
Q3JlYXRlZCBieQ==
- Q29tbWVudA==
- UnVsZSBUeXBl
- UnVuIEludGVydmFs
- UnVuIE1vZGU=
- U2VhcmNoIFRlcm0=
QXR0ZW1wdHMg
- U2VudCBPbg==
- U2VudA==
U2Vzc2lvbiBFbmQ=
- U2Vzc2lvbiBMb2cgSUQ=
U2Vzc2lvbiBTdGFydA==
- U2hvcnQgSVNPIENvZGU=
- TmFtZQ==
U29ydCBieQ==
- U1NMIFVybA==
- U3RhdGUgQ291bnRyeQ==
- U3RhdHVz
- U3RvcCBXb3Jk
- U3ViamVjdA==
- U3VnZ2VzdGVkIENvcnJlY3Rpb24=
VHlwZQ==
U3lzdGVtIFBhdGg=
- SXRlbQ==
SXRlbSBUeXBl
- VGVtcGxhdGU=
- VGhlbWU=
- VGhlc2F1cnVzIFRlcm0=
- VGhlc2F1cnVzIFR5cGU=
- VGl0bGU=
- VG8gRS1tYWls
- VmFsdWU=
- VHlwZQ==
VXNlcnM=
TGFzdG5hbWUgRmlyc3RuYW1l
- VXNlcm5hbWU=
- VXNlIFNlY3VyaXR5IEltYWdl
RmllbGQgVmFsdWU=
- VmVyc2lvbg==
- VmlzaWJpbGl0eQ==
VmlzaWJsZQ==
VmlzaXQgRGF0ZQ==
QXNjZW5kaW5n
@@ -379,16 +279,17 @@
RmllbGQ=
RGlzcGxheSBPcmRlcg==
T3JkZXI=
- QWN0aW9u
+ QWN0aW9u
QWRkcmVzcyBMaW5lIDE=
QWRkcmVzcyBMaW5lIDI=
TWVzc2FnZXMgZnJvbSBTaXRlIEFkbWluIGFyZSBmcm9t
- QWRtaW4gUHJpbWFyeQ==
+ QWRtaW4gUHJpbWFyeQ==
QWR2YW5jZWQgQ1NT
QWR2YW5jZWQgU2VhcmNo
QWxsb3cgQ2hhbmdpbmcgIlRvIiBSZWNpcGllbnQ=
QWxsb3cgQ2hhbmdpbmcgU2VuZGVy
QWx0IFZhbHVl
+ QW5zd2Vy
QXR0YWNobWVudA==
QXV0byBDcmVhdGUgRmlsZSBOYW1l
QXV0b21hdGljIEZpbGVuYW1l
@@ -399,34 +300,35 @@
QmFja2dyb3VuZCBJbWFnZQ==
QmFja2dyb3VuZCBQb3NpdGlvbg==
QmFja2dyb3VuZCBSZXBlYXQ=
- QmNj
+ QmNj
RWxlbWVudCBQb3NpdGlvbg==
Qm9yZGVyIEJvdHRvbQ==
Qm9yZGVyIExlZnQ=
Qm9yZGVyIFJpZ2h0
Qm9yZGVycw==
Qm9yZGVyIFRvcA==
- Qm91bmNlIERhdGU=
+ Qm91bmNlIERhdGU=
Qm91bmNlIEVtYWls
- Qm91bmNlIEluZm8=
- U2VjdGlvbg==
+ Qm91bmNlIEluZm8=
+ U2VjdGlvbg==
U2VjdGlvbiBGb3JtYXQ=
U2VjdGlvbiBJRA==
U2VjdGlvbiBzZXBhcmF0b3I=
U2VjdGlvbiBUZW1wbGF0ZQ==
- Q2M=
- Q2hhbmdlcw==
- Q2hhcnNldA==
+ Q2M=
+ Q2hhbmdlcw==
+ Q2hhcnNldA==
Q2hlY2sgRHVwbGljYXRlcyBieQ==
Q2l0eQ==
+ Q29sdW1uIFBocmFzZQ==
Q29tbWVudHM=
Q29tcGFueQ==
Q29uZmlndXJhdGlvbiBIZWFkZXIgTGFiZWw=
Q29udGVudCBCbG9jaw==
Q29weSBMYWJlbHMgZnJvbSB0aGlzIExhbmd1YWdl
- Q291bnRyeQ==
+ Q291bnRyeQ==
Q3JlYXRlZCBCeQ==
- Q3JlYXRlZCBPbg==
+ Q3JlYXRlZCBPbg==
Q1NTIFRlbXBsYXRl
Q3Vyc29y
Q3VzdG9tIERldGFpbHMgVGVtcGxhdGU=
@@ -435,28 +337,28 @@
DQoNCg0KDQoNCg0KDQoNCg0KDQoNCg0KDQoNCg0KDQoNCg0KDQoNCg0KDQoNCg0KDQoNCg0KRGV0YWlscyBUZW1wbGF0ZQ==
RGF0ZSBGb3JtYXQ=
RGVjaW1hbCBQb2ludA==
- RGVzY3JpcHRpb24=
+ RGVzY3JpcHRpb24=
RGlzcGxheQ==
RGlzcGxheSBpbiBHcmlk
RmllbGQgTGFiZWw=
RGlzcGxheSBUbyBQdWJsaWM=
UmFuZ2Ugb2YgSVBz
- RG9tYWluIE5hbWU=
+ RG9tYWluIE5hbWU=
QXMgUGxhaW4gVGV4dA==
- RHVyYXRpb24=
+ RHVyYXRpb24=
RWRpdG9ycyBQaWNr
RWxhcHNlZCBUaW1l
- RS1tYWls
- RS1tYWlsIENvbW11bmljYXRpb24gUm9sZQ==
- RW1haWxzIGluIFF1ZXVl
- RW1haWxzIFNlbnQ=
- RW1haWxzIFRvdGFs
+ RS1tYWls
+ RS1tYWlsIENvbW11bmljYXRpb24gUm9sZQ==
+ RW1haWxzIGluIFF1ZXVl
+ RW1haWxzIFNlbnQ=
+ RW1haWxzIFRvdGFs
RW5hYmxl
- RW5hYmxlZA==
+ RW5hYmxlZA==
RW5hYmxlIENhY2hpbmcgZm9yIHRoaXMgU2VjdGlvbg==
RXJyb3IgVGFn
RXN0aW1hdGVkIFRpbWU=
- RXZlbnQ=
+ RXZlbnQ=
RXhwaXJl
RXhwb3J0IGNvbHVtbnM=
RXhwb3J0IFNwZWNpZmllZCBFbWFpbCBFdmVudHM=
@@ -471,18 +373,18 @@
RXh0ZXJuYWwgVVJM
RXh0cmEgSGVhZGVycw==
RmF4
- TWF0Y2ggVHlwZQ==
- RmllbGQgTmFtZQ==
+ TWF0Y2ggVHlwZQ==
+ RmllbGQgTmFtZQ==
RmllbGRzIGVuY2xvc2VkIGJ5
RmllbGRzIHNlcGFyYXRlZCBieQ==
RmllbGQgVGl0bGVz
RmllbGQgVHlwZQ==
- TWF0Y2ggVmFsdWU=
+ TWF0Y2ggVmFsdWU=
RmlsZSBDb250ZW50cw==
- RmlsZW5hbWU=
+ RmlsZW5hbWU=
RmlsZW5hbWUgUmVwbGFjZW1lbnRz
- UGF0aA==
- Rmlyc3QgTmFtZQ==
+ UGF0aA==
+ Rmlyc3QgTmFtZQ==
Rm9udA==
Rm9udCBDb2xvcg==
Rm9udCBGYW1pbHk=
@@ -492,20 +394,21 @@
T25saW5lIEZvcm0=
T25saW5lIEZvcm0gU3VibWl0dGVkIFRlbXBsYXRl
U2hvcnQgVVJM
- RnJvbSBFbWFpbA==
- RnJvbnQtRW5kIE9ubHk=
- QWxsb3cgUmVnaXN0cmF0aW9uIG9uIEZyb250LWVuZA==
- VXNlciBHcm91cA==
+ RnJvbSBFbWFpbA==
+ RnJvbnQtRW5kIE9ubHk=
+ QWxsb3cgUmVnaXN0cmF0aW9uIG9uIEZyb250LWVuZA==
+ VXNlciBHcm91cA==
SUQ=
- R3JvdXAgTmFtZQ==
+ R3JvdXAgTmFtZQ==
SGVpZ2h0
- SGl0cw==
+ SGludCBQaHJhc2U=
+ SGl0cw==
SG90
SFRNTCBWZXJzaW9u
SWNvbiBVUkwgKGRpc2FibGVkKQ==
SWNvbiBVUkw=
- SUQ=
- SW1hZ2U=
+ SUQ=
+ SW1hZ2U=
SW1wb3J0IFNlY3Rpb24=
SW1wb3J0IENvbHVtbnM=
SW1wb3J0IEZpbGU=
@@ -515,31 +418,33 @@
SW5wdXQgVGltZSBGb3JtYXQ=
SW5zdGFsbCBNb2R1bGVz
SW5zdGFsbCBQaHJhc2UgVHlwZXM=
- SVAgQWRkcmVzcw==
+ SVAgQWRkcmVzcw==
VXNlIGN1cnJlbnQgc2VjdGlvbiBhcyByb290IGZvciB0aGUgZXhwb3J0
- SVNPIENvZGU=
- UHJpbWFyeQ==
+ SVNPIENvZGU=
+ UHJpbWFyeQ==
UmVxdWlyZWQ=
- SXMgU3lzdGVt
+ SXMgU3lzdGVt
U3lzdGVtIFRlbXBsYXRl
- VXNlciBGaWVsZA==
- SXRlbSBJRA==
+ VXNlciBGaWVsZA==
+ SXRlbSBJRA==
SXRlbSBUZW1wbGF0ZQ==
- TGFuZ3VhZ2U=
+ TGFuZ3VhZ2U=
TGFuZ3VhZ2UgRmlsZQ==
TGFuZ3VhZ2UgSUQ=
TGFuZ3VhZ2Vz
- TGFzdCBOYW1l
- TGFzdCBSdW4gT24=
- TGFzdCBSdW4gU3RhdHVz
- TGFzdCBVcGRhdGVkIE9u
+ TGFzdCBOYW1l
+ TGFzdCBSdW4gT24=
+ TGFzdCBSdW4gU3RhdHVz
+ TGFzdCBVcGRhdGVkIE9u
TGVmdA==
TGluZSBlbmRpbmdz
TGluZSBFbmRpbmdzIEluc2lkZSBGaWVsZHM=
+ SUQ=
+ TGlzdGluZyBUeXBl
TG9jYWxl
- TG9jYWwgTmFtZQ==
- TG9jYXRpb24=
- TG9naW4=
+ TG9jYWwgTmFtZQ==
+ TG9jYXRpb24=
+ TG9naW4=
TG9nbyBpbWFnZQ==
Qm90dG9tIExvZ28gSW1hZ2U=
TG9nbyBMb2dpbg==
@@ -548,32 +453,32 @@
TWFyZ2luIFJpZ2h0
TWFyZ2lucw==
TWFyZ2luIFRvcA==
- TWFzdGVyIElE
- TWFzdGVyIFByZWZpeA==
+ TWFzdGVyIElE
+ TWFzdGVyIFByZWZpeA==
TWF4aW11bSBudW1iZXIgb2YgU2VjdGlvbnMgb24gSXRlbSBjYW4gYmUgYWRkZWQgdG8=
Q3VzdG9tIE1lbnUgSWNvbiAoaWUuIGltZy9tZW51X3Byb2R1Y3RzLmdpZik=
TWVudSBTdGF0dXM=
TWVyZ2UgdG8gU3VibWlzc2lvbg==
- TWVzc2FnZQ==
+ TWVzc2FnZQ==
TWVzc2FnZSBCb2R5
- UGxhaW4gVGV4dCBWZXJzaW9u
+ UGxhaW4gVGV4dCBWZXJzaW9u
TWVzc2FnZSBUeXBl
TWV0YSBEZXNjcmlwdGlvbg==
TWV0YSBLZXl3b3Jkcw==
- TWlzc3BlbGxlZCBXb3Jk
- TW9kaWZpZWQ=
- TW9kdWxl
+ TWlzc3BlbGxlZCBXb3Jk
+ TW9kaWZpZWQ=
+ TW9kdWxl
TW9kdWxl
TXVsdGlsaW5ndWFs
- TmFtZQ==
+ TmFtZQ==
TmV3
- TmV4dCBSdW4gT24=
+ TmV4dCBSdW4gT24=
Tm90ZXM=
- T2NjdXJlZCBPbg==
+ T2NjdXJlZCBPbg==
T3B0aW9ucw==
T3B0aW9uIFRpdGxl
T3ZlcndyaXRlIERlZmF1bHQgQ2FjaGluZyBLZXk=
- UGFjayBOYW1l
+ UGFjayBOYW1l
UGFkZGluZyBCb3R0b20=
UGFkZGluZyBMZWZ0
UGFkZGluZyBSaWdodA==
@@ -583,108 +488,110 @@
VGl0bGUgKE9uIFBhZ2Up
Q2FjaGUgRXhwaXJhdGlvbiBpbiBzZWNvbmRz
VGl0bGUgKE1lbnUgSXRlbSk=
- U2VjdGlvbiBUaXRsZQ==
+ U2VjdGlvbiBUaXRsZQ==
UGFyZW50IFNlY3Rpb24=
UGFzc3dvcmQ=
UGVyY2VudHMgQ29tcGxldGVk
- UGhvbmU=
- TGFiZWw=
- UGhyYXNlIFR5cGU=
+ UGhvbmU=
+ TGFiZWw=
+ UGhyYXNlIFR5cGU=
UG9w
UG9wdWxhcg==
UG9ydA==
UG9zaXRpb24=
- UHJlZml4
- UHJpbWFyeQ==
+ UHJlZml4
+ UHJpbWFyeQ==
UHJpbWFyeSBTZWN0aW9u
UHJpbWFyeQ==
UHJpbWFyeSBMYW5ndWFnZSBQaHJhc2U=
- T3JkZXI=
+ T3JkZXI=
Q29udmVydCB1bm1hdGNoZWQgZS1tYWlscyBpbnRvIG5ldyBzdWJtaXNzaW9ucw==
- UHJvdGVjdGVk
- UXVhbnRpdHk=
- UmF0aW5n
+ UHJvdGVjdGVk
+ UXVhbnRpdHk=
+ UmF0aW5n
UmVjaXBpZW50J3MgQWRkcmVzcw==
UmVjaXBpZW50J3MgQWRkcmVzcyBUeXBl
UmVjaXBpZW50J3MgTmFtZQ==
UmVjaXBpZW50cw==
- UmVjaXBpZW50IFR5cGU=
+ UmVjaXBpZW50IFR5cGU=
Rm9yY2UgUmVkaXJlY3QgKHdoZW4gdXNlcidzIElQIG1hdGNoZXMp
- UmVmZXJyZXIgVVJM
+ UmVmZXJyZXIgVVJM
S2V5d29yZA==
- VHlwZQ==
+ VHlwZQ==
UmVtb3RlIFVSTA==
UmVwbGFjZSBEdXBsaWNhdGVz
- UmVwbGFjZW1lbnQ=
+ UmVwbGFjZW1lbnQ=
UmVwbGFjZW1lbnQgVGFncw==
- UmVwbGllZCBPbg==
+ UmVwbGllZCBPbg==
UmVwbHkgQmNj
UmVwbHkgQ2M=
UmVwbHkgRnJvbSBFLW1haWw=
UmVwbHkgRnJvbSBOYW1l
UmVwbHkgTWVzc2FnZSBTaWduYXR1cmU=
- UmVwbGllZA==
- UmVxdWlyZWQ=
- Q29tbWVudA==
- UnVsZSBUeXBl
- UnVuIEludGVydmFs
- UnVuIE1vZGU=
+ UmVwbGllZA==
+ UmVxdWlyZWQ=
+ UmVxdWlyZSBMb2dpbg==
+ Q29tbWVudA==
+ UnVsZSBUeXBl
+ UnVuIEludGVydmFs
+ UnVuIE1vZGU=
UnVuIFRpbWU=
U2FtZSBBcyBUaHVtYg==
- U2VhcmNoIFRlcm0=
+ U2VhcmNoIFRlcm0=
U2VuZGVyJ3MgQWRkcmVzcw==
U2VuZGVyJ3MgTmFtZQ==
- U2VudCBPbg==
- U2VudA==
+ U2VudCBPbg==
+ U2VudA==
U2VydmVy
- U2Vzc2lvbiBMb2cgSUQ=
- U2hvcnQgSVNPIENvZGU=
+ U2Vzc2lvbiBMb2cgSUQ=
+ U2hvcnQgSVNPIENvZGU=
U2ltcGxlIFNlYXJjaA==
- TmFtZQ==
+ TmFtZQ==
U2tpcCBGaXJzdCBSb3c=
U29ydCBWYWx1ZXM=
- U1NMIEZ1bGwgVVJM
+ U1NMIEZ1bGwgVVJM
+ U3RhcnQgRGF0ZQ==
U3RhdGU=
- U3RhdGUgQ291bnRyeQ==
- U3RhdHVz
- U3RvcCBXb3Jk
- U3ViamVjdA==
+ U3RhdGUgQ291bnRyeQ==
+ U3RhdHVz
+ U3RvcCBXb3Jk
+ U3ViamVjdA==
U3VibWl0dGVkIE9u
- U3VnZ2VzdGVkIENvcnJlY3Rpb24=
+ U3VnZ2VzdGVkIENvcnJlY3Rpb24=
UG9pbnRzIHRvIFNlY3Rpb24=
VGFibGUgTmFtZSBpbiBEYXRhYmFzZSA=
VGFn
- SXRlbQ==
+ SXRlbQ==
VGVtcGxhdGUgRmlsZQ==
- VGVtcGxhdGU=
+ VGVtcGxhdGU=
VGV4dCBBbGlnbg==
VGV4dCBEZWNvcmF0aW9u
VGV4dCBWZXJzaW9u
- VGhlbWU=
+ VGhlbWU=
VGhlbWVz
- VGhlc2F1cnVzIFRlcm0=
- VGhlc2F1cnVzIFR5cGU=
+ VGhlc2F1cnVzIFRlcm0=
+ VGhlc2F1cnVzIFR5cGU=
VGhvdXNhbmRzIFNlcGFyYXRvcg==
VGltZSBGb3JtYXQ=
- VGl0bGU=
+ VGl0bGU=
VG8=
- VG8gRS1tYWls
+ VG8gRS1tYWls
VG9w
QW5hbHl0aWNzIFRyYWNraW5nIENvZGU=
- UGhyYXNl
- VHlwZQ==
+ UGhyYXNl
+ VHlwZQ==
TWVhc3VyZXMgU3lzdGVt
VXBsb2FkIEZpbGUgRnJvbSBMb2NhbCBQQw==
- VVJM
+ VVJM
TGluayB0byBFeHRlcm5hbCBVUkw=
VXNlIEN1c3RvbSBNZW51IEljb24=
VXNlciBEb2N1bWVudGF0aW9uIFVSTA==
VXNlciBHcm91cHM=
- VXNlcm5hbWU=
- VXNlIFNlY3VyaXR5IEltYWdl
+ VXNlcm5hbWU=
+ VXNlIFNlY3VyaXR5IEltYWdl
UmUtZW50ZXIgUGFzc3dvcmQ=
- VmVyc2lvbg==
- VmlzaWJpbGl0eQ==
+ VmVyc2lvbg==
+ VmlzaWJpbGl0eQ==
Vm90ZXM=
V2lkdGg=
Wi1JbmRleA==
Index: branches/5.1.x/core/kernel/languages/phrases_cache.php
===================================================================
diff -u -N -r14338 -r14537
--- branches/5.1.x/core/kernel/languages/phrases_cache.php (.../phrases_cache.php) (revision 14338)
+++ branches/5.1.x/core/kernel/languages/phrases_cache.php (.../phrases_cache.php) (revision 14537)
@@ -1,6 +1,6 @@
_editExisting = true;
$this->_editMissing = true;
- $this->_simpleEditingMode = true;
+ $this->_simpleEditingMode = !$this->Application->isDebugMode();
$this->_translateHtmlTag = 'span';
}
@@ -186,10 +186,10 @@
return;
}
- $sql = 'SELECT l' . $this->LanguageId . '_Translation, PhraseKey
+ $sql = 'SELECT l' . $this->LanguageId . '_Translation AS Translation, l' . $this->LanguageId . '_HintTranslation AS HintTranslation, l' . $this->LanguageId . '_ColumnTranslation AS ColumnTranslation, PhraseKey
FROM ' . TABLE_PREFIX . 'Phrase
WHERE PhraseId IN (' . implode(',', $ids) . ') AND l' . $this->LanguageId . '_Translation IS NOT NULL';
- $this->Phrases = $this->Conn->GetCol($sql, 'PhraseKey');
+ $this->Phrases = $this->Conn->Query($sql, 'PhraseKey');
/*foreach($phrases as $phrase => $tanslation)
{
@@ -205,7 +205,7 @@
// uppercase phrase name for cases, when this method is called outside this class
$cache_key = ($allow_editing ? '' : 'NE:') . mb_strtoupper($label);
- $this->Phrases[$cache_key] = $value;
+ $this->Phrases[$cache_key] = Array ('Translation' => $value, 'HintTranslation' => $value, 'ColumnTranslation' => $value);
}
function NeedsCacheUpdate()
@@ -238,7 +238,7 @@
function GetPhrase($label, $allow_editing = true, $use_admin = false)
{
- if (!isset($this->LanguageId)) {
+ if ( !isset($this->LanguageId) ) {
//actually possible when custom field contains references to language labels and its being rebuilt in OnAfterConfigRead
//which is triggered by Sections rebuild, which in turn read all the configs and all of that happens BEFORE seeting the language...
return 'impossible case';
@@ -247,21 +247,31 @@
// cut exclamation marks - depricated form of passing phrase name from templates
$label = preg_replace('/^!(.*)!$/', '\\1', $label);
- if (strlen($label) == 0) {
+ if ( strlen($label) == 0 ) {
return '';
}
$original_label = $this->_escapePhraseName ? addslashes($label) : $label;
$label = mb_strtoupper($label);
+ if ( substr($label, 0, 5) == 'HINT:' || substr($label, 0, 7) == 'COLUMN:' ) {
+ // don't just check for ":" since phrases could have ":" in their names (e.g. advanced permission labels)
+ list ($field_prefix, $label) = explode(':', $label, 2);
+ $translation_field = mb_convert_case($field_prefix, MB_CASE_TITLE) . 'Translation';
+ }
+ else {
+ $translation_field = 'Translation';
+ }
+
$cache_key = ($allow_editing ? '' : 'NE:') . $label;
- if (array_key_exists($cache_key, $this->Phrases)) {
- $translated_label = $this->Phrases[$cache_key];
+ if ( isset($this->Phrases[$cache_key]) ) {
+ $translated_label = $this->Phrases[$cache_key][$translation_field];
if ($this->_editExisting && $allow_editing && !array_key_exists($label, $this->_missingPhrases)) {
// option to change translation for Labels
- $edit_url = 'javascript:translate_phrase(\'' . $original_label . '\', \'' . $this->_phraseEditTemplate . '\', {event: \'OnPreparePhrase\', simple_mode: ' . ($this->_simpleEditingMode ? 'true' : 'false') . '});';
+ $original_label = explode(':', $original_label, 2);
+ $edit_url = 'javascript:translate_phrase(\'' . end($original_label) . '\', \'' . $this->_phraseEditTemplate . '\', {event: \'OnPreparePhrase\', simple_mode: ' . ($this->_simpleEditingMode ? 'true' : 'false') . '});';
$translated_label = '<' . $this->_translateHtmlTag . ' href="' . $edit_url . '" name="cms-translate-phrase" title="Edit translation">' . $translated_label . '' . $this->_translateHtmlTag . '>';
if ($this->fromTag) {
@@ -274,12 +284,12 @@
$this->LoadPhraseByLabel($label, $original_label, $allow_editing, $use_admin);
- return $this->GetPhrase($label, $allow_editing);
+ return $this->GetPhrase($original_label, $allow_editing);
}
function LoadPhraseByLabel($label, $original_label, $allow_editing = true, $use_admin = false)
{
- if (!$allow_editing && !$use_admin && !array_key_exists($label, $this->_missingPhrases) && array_key_exists($label, $this->Phrases)) {
+ if ( !$allow_editing && !$use_admin && !isset($this->_missingPhrases[$label]) && isset($this->Phrases[$label]) ) {
// label is aready translated, but it's version without on the fly translation code is requested
$this->Phrases['NE:' . $label] = $this->Phrases[$label];
@@ -288,7 +298,7 @@
$language_id = $use_admin ? $this->AdminLanguageId : $this->LanguageId;
- $sql = 'SELECT PhraseId, l' . $language_id . '_Translation
+ $sql = 'SELECT PhraseId, l' . $language_id . '_Translation AS Translation, l' . $language_id . '_HintTranslation AS HintTranslation, l' . $language_id . '_ColumnTranslation AS ColumnTranslation
FROM ' . TABLE_PREFIX . 'Phrase
WHERE (PhraseKey = ' . $this->Conn->qstr($label) . ') AND (l' . $language_id . '_Translation IS NOT NULL)';
$res = $this->Conn->GetRow($sql);
@@ -297,7 +307,8 @@
$translation = '!' . $label . '!';
if ($this->_editMissing && $allow_editing) {
- $edit_url = str_replace('#LABEL#', $original_label, $this->_editLinkMask);
+ $original_label = explode(':', $original_label, 2);
+ $edit_url = str_replace('#LABEL#', end($original_label), $this->_editLinkMask);
$translation = '<' . $this->_translateHtmlTag . ' href="' . $edit_url . '" name="cms-translate-phrase" title="Translate">!' . $label . '!' . $this->_translateHtmlTag . '>';
if ($this->fromTag) {
@@ -314,7 +325,7 @@
}
$cache_key = ($allow_editing ? '' : 'NE:') . $label;
- $this->Phrases[$cache_key] = $res['l' . $language_id . '_Translation'];
+ $this->Phrases[$cache_key] = $res;
array_push($this->Ids, $res['PhraseId']);
$this->Ids = array_unique($this->Ids); // just to make sure
Index: branches/5.1.x/core/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -N -r14408 -r14537
--- branches/5.1.x/core/admin_templates/incs/custom_blocks.tpl (.../custom_blocks.tpl) (revision 14408)
+++ branches/5.1.x/core/admin_templates/incs/custom_blocks.tpl (.../custom_blocks.tpl) (revision 14537)
@@ -109,8 +109,9 @@
+
| ', '')" onmouseout="hide_form_error('')">
- *:
+ *:
Index: branches/5.1.x/core/admin_templates/regional/languages_export.tpl
===================================================================
diff -u -N -r14241 -r14537
--- branches/5.1.x/core/admin_templates/regional/languages_export.tpl (.../languages_export.tpl) (revision 14241)
+++ branches/5.1.x/core/admin_templates/regional/languages_export.tpl (.../languages_export.tpl) (revision 14537)
@@ -79,7 +79,7 @@
- |
+ |
|
|
Index: branches/5.1.x/core/units/users/users_config.php
===================================================================
diff -u -N -r14514 -r14537
--- branches/5.1.x/core/units/users/users_config.php (.../users_config.php) (revision 14514)
+++ branches/5.1.x/core/units/users/users_config.php (.../users_config.php) (revision 14537)
@@ -1,6 +1,6 @@
'icon16_user_pending.png'
),
'Fields' => Array(
- 'Login' => Array('title' => 'la_col_Username', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
- 'LastName' => Array( 'title'=>'la_col_LastName', 'filter_block' => 'grid_like_filter'),
- 'FirstName' => Array( 'title'=>'la_col_FirstName', 'filter_block' => 'grid_like_filter'),
- 'Email' => Array( 'title'=>'la_col_Email', 'filter_block' => 'grid_like_filter'),
- 'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter'),
- 'CreatedOn' => Array('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter'),
- 'Modified' => Array('title' => 'la_col_Modified', 'filter_block' => 'grid_date_range_filter'),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Login' => Array ('title' => 'column:la_fld_Username', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
+ 'LastName' => Array ('filter_block' => 'grid_like_filter'),
+ 'FirstName' => Array ('filter_block' => 'grid_like_filter'),
+ 'Email' => Array ('filter_block' => 'grid_like_filter'),
+ 'PrimaryGroup' => Array ('title' => 'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter'),
+ 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter'),
+ 'Modified' => Array('filter_block' => 'grid_date_range_filter'),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
),
),
@@ -509,14 +509,14 @@
),
'Selector' => 'radio',
'Fields' => Array(
- 'Login' => Array ('title' => 'la_col_Username', 'data_block' => 'grid_login_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'Email' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'CreatedOn' => Array('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
- 'Modified' => Array('title' => 'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Login' => Array ('title' => 'column:la_fld_Username', 'data_block' => 'grid_login_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'FirstName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'LastName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'Email' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'PrimaryGroup' => Array ('title' => 'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 150, ),
+ 'Modified' => Array('filter_block' => 'grid_date_range_filter', 'width' => 150, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
),
),
@@ -528,12 +528,12 @@
2 => 'icon16_admin_disabled.png',
),
'Fields' => Array (
- 'PortalUserId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70),
- 'Login' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'Email' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'PortalUserId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70),
+ 'Login' => Array ('title' => 'column:la_fld_Username', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'FirstName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'LastName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'Email' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
),
),
@@ -545,14 +545,14 @@
2 => 'icon16_user_pending.png'
),
'Fields' => Array(
- 'PortalUserId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70),
- 'Login' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'Email' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'PortalUserId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70),
+ 'Login' => Array ('title' => 'column:la_fld_Username', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'FirstName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'LastName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'Email' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),
'PrimaryGroup' => Array ('title' => 'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter', 'width' => 140),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 100),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 100),
'Modified' => Array ('title' => 'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 100),
),
),
Index: branches/5.1.x/core/units/user_groups/user_groups_config.php
===================================================================
diff -u -N -r14241 -r14537
--- branches/5.1.x/core/units/user_groups/user_groups_config.php (.../user_groups_config.php) (revision 14241)
+++ branches/5.1.x/core/units/user_groups/user_groups_config.php (.../user_groups_config.php) (revision 14537)
@@ -1,6 +1,6 @@
Array(
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array(
- 'PortalUserId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'PortalUserId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
'UserName' => Array ('title'=>'la_col_UserFirstLastName', 'width' => 200, ),
- 'UserLogin' => Array ('title'=>'la_col_Login', 'width' => 100, ),
+ 'UserLogin' => Array ('title'=>'column:la_fld_Login', 'width' => 100, ),
'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
'MembershipExpires' => Array ('title' => 'la_col_MembershipExpires', 'data_block' => 'grid_membership_td', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
),
@@ -120,9 +120,9 @@
1 => 'icon16_primary.png'
),
'Fields' => Array(
- 'GroupId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'GroupName' => Array ('title'=>'la_col_GroupName', 'width' => 100, ),
- 'GroupDescription' => Array ('title'=>'la_col_Description', 'width' => 150, ),
+ 'GroupId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'GroupName' => Array ('width' => 100, ),
+ 'GroupDescription' => Array ('title' => 'column:la_fld_Description', 'width' => 150, ),
'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
'MembershipExpires' => Array ('title' => 'la_col_MembershipExpires', 'data_block' => 'grid_membership_td', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
),
Index: branches/5.1.x/core/kernel/db/cat_event_handler.php
===================================================================
diff -u -N -r14508 -r14537
--- branches/5.1.x/core/kernel/db/cat_event_handler.php (.../cat_event_handler.php) (revision 14508)
+++ branches/5.1.x/core/kernel/db/cat_event_handler.php (.../cat_event_handler.php) (revision 14537)
@@ -1,6 +1,6 @@
getObject( Array('skip_autoload' => true) );
+ /* @var $object kCatDBItem */
+
$ids = $this->StoreSelectedIDs($event);
if ($ids) {
Index: branches/5.1.x/core/units/custom_fields/custom_fields_config.php
===================================================================
diff -u -N -r14408 -r14537
--- branches/5.1.x/core/units/custom_fields/custom_fields_config.php (.../custom_fields_config.php) (revision 14408)
+++ branches/5.1.x/core/units/custom_fields/custom_fields_config.php (.../custom_fields_config.php) (revision 14537)
@@ -1,6 +1,6 @@
'icon16_item.png',
),
'Fields' => Array (
- 'CustomFieldId' => Array ( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'CustomFieldId' => Array ( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
'FieldName' => Array ( 'title'=>'la_prompt_FieldName', 'width' => 250, ),
'FieldLabel' => Array ( 'title'=>'la_prompt_FieldLabel', 'data_block' => 'cf_grid_data_td', 'width' => 250, ),
'DisplayOrder' => Array ('title' => 'la_prompt_DisplayOrder', 'filter_block' => 'grid_range_filter', 'width' => 105, ),
-// 'IsSystem' => Array ('title' => 'la_col_IsSystem', 'filter_block' => 'grid_options_filter'),
+// 'IsSystem' => Array ('title' => 'column:la_fld_IsSystem', 'filter_block' => 'grid_options_filter'),
),
),
),
Index: branches/5.1.x/core/units/modules/modules_config.php
===================================================================
diff -u -N -r14241 -r14537
--- branches/5.1.x/core/units/modules/modules_config.php (.../modules_config.php) (revision 14241)
+++ branches/5.1.x/core/units/modules/modules_config.php (.../modules_config.php) (revision 14537)
@@ -1,6 +1,6 @@
'icon16_item.png',
),
'Fields' => Array (
- 'Name' => Array('title' => 'la_col_Name', 'data_block' => 'grid_checkbox_td_no_icon', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'Version' => Array('title' => 'la_col_Version', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Path' => Array('title' => 'la_col_SystemPath', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Name' => Array('data_block' => 'grid_checkbox_td_no_icon', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Version' => Array('filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'Path' => Array('title' => 'la_col_SystemPath', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
'BuildDate' => Array('title' => 'la_col_BuildDate', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'Loaded' => Array('title' => 'la_col_Status', 'header_block' => 'grid_column_title_no_sorting', 'data_block' => 'grid_module_td', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Loaded' => Array('title' => 'column:la_fld_Status', 'header_block' => 'grid_column_title_no_sorting', 'data_block' => 'grid_module_td', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
),
),
),
Index: branches/5.1.x/core/units/ban_rules/ban_rules_config.php
===================================================================
diff -u -N -r14241 -r14537
--- branches/5.1.x/core/units/ban_rules/ban_rules_config.php (.../ban_rules_config.php) (revision 14241)
+++ branches/5.1.x/core/units/ban_rules/ban_rules_config.php (.../ban_rules_config.php) (revision 14537)
@@ -1,6 +1,6 @@
'icon16_item.png',
),
'Fields' => Array (
- 'RuleId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'RuleType' => Array ('title' => 'la_col_RuleType', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'ItemField' => Array ('title' => 'la_col_ItemField', 'filter_block' => 'grid_options_filter', 'width' => 130, ),
- 'ItemVerb' => Array ('title' => 'la_col_FieldComparision', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'ItemValue' => Array ('title' => 'la_col_FieldValue', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 90, ),
+ 'RuleId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'RuleType' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'ItemField' => Array ('filter_block' => 'grid_options_filter', 'width' => 130, ),
+ 'ItemVerb' => Array ('title' => 'column:la_fld_FieldComparision', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'ItemValue' => Array ('title' => 'column:la_fld_FieldValue', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 90, ),
),
),
),
Index: branches/5.1.x/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -N -r14408 -r14537
--- branches/5.1.x/core/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 14408)
+++ branches/5.1.x/core/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 14537)
@@ -505,7 +505,7 @@
-
+
'].InvertSelection(); this.checked=false;" ondblclick="Grids[''].ClearSelection(); this.checked=false;" />
-
+
Index: branches/5.1.x/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r14319 -r14537
--- branches/5.1.x/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 14319)
+++ branches/5.1.x/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 14537)
@@ -111,11 +111,11 @@
-
+
Index: branches/5.1.x/core/admin_templates/categories/permissions_tab.tpl
===================================================================
diff -u -N -r14241 -r14537
--- branches/5.1.x/core/admin_templates/categories/permissions_tab.tpl (.../permissions_tab.tpl) (revision 14241)
+++ branches/5.1.x/core/admin_templates/categories/permissions_tab.tpl (.../permissions_tab.tpl) (revision 14537)
@@ -67,7 +67,7 @@
- |
+ |
|
|
|
Index: branches/5.1.x/core/units/stylesheets/stylesheets_config.php
===================================================================
diff -u -N -r14241 -r14537
--- branches/5.1.x/core/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 14241)
+++ branches/5.1.x/core/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 14537)
@@ -1,6 +1,6 @@
'icon16_item.png'
),
'Fields' => Array(
- 'Name' => Array('title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
- 'Description' => Array('title'=>'la_col_Description', 'first_chars' => 100, 'filter_block' => 'grid_like_filter'),
- 'Enabled' => Array('title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'),
- 'LastCompiled' => Array('title' => 'la_col_LastCompiled', 'filter_block' => 'grid_date_range_filter'),
+ 'Name' => Array ('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
+ 'Description' => Array ('first_chars' => 100, 'filter_block' => 'grid_like_filter'),
+ 'Enabled' => Array ('title' => 'column:la_fld_Status', 'filter_block' => 'grid_options_filter'),
+ 'LastCompiled' => Array ('title' => 'la_col_LastCompiled', 'filter_block' => 'grid_date_range_filter'),
),
),
),
Index: branches/5.1.x/core/admin_templates/submissions/submission_view.tpl
===================================================================
diff -u -N -r14241 -r14537
--- branches/5.1.x/core/admin_templates/submissions/submission_view.tpl (.../submission_view.tpl) (revision 14241)
+++ branches/5.1.x/core/admin_templates/submissions/submission_view.tpl (.../submission_view.tpl) (revision 14537)
@@ -150,7 +150,8 @@
- *:
+
+ *:
|
|
| |