Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed bug Importing from Modx, added some features and translate to Spanish. #124

Open
wants to merge 6 commits into
base: develop-2x
Choose a base branch
from
Open

Fixed bug Importing from Modx, added some features and translate to Spanish. #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e4af5ec
The Import articles from ModX services does not import nothing
bentejuy Jun 18, 2015
01472b4
Enable the posibility to add the getResources parameter "&tplOdd" dir…
bentejuy Jun 18, 2015
623bdc3
Fixed Bug: The articles resource inherits the context of its new cont…
bentejuy Jun 26, 2015
51152b6
Allows the ability to duplicate articles in different Articles Contai…
bentejuy Jun 26, 2015
6bf34c1
Spanish translation
bentejuy Jun 28, 2015
6a3f478
Some corrections in the Spanish Lexicon
bentejuy Jul 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions assets/components/articles/js/container/articles.import.window.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,20 @@ Articles.panel.ImportOptionsMODX = function(config) {
,forId: this.ident+'-modx-tagsField'
,html: _('articles.import_modx_tagsField_desc')
,cls: 'desc-under'
},{
xtype: 'checkbox'
,boxLabel: _('articles.import_modx_duplicate')
,description: MODx.expandHelp ? '' : _('articles.import_modx_duplicate_desc')
,name: 'modx-duplicate'
,id: this.ident+'-modx-duplicate'
,inputValue: 1
,checked: false
,anchor: '100%'
},{
xtype: MODx.expandHelp ? 'label' : 'hidden'
,forId: this.ident+'-modx-duplicate'
,html: _('articles.import_modx_duplicate_desc')
,cls: 'desc-under'
}]
},{
columnWidth: .5
Expand Down
15 changes: 14 additions & 1 deletion assets/components/articles/js/container/container.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1598,7 +1598,20 @@ Ext.extend(Articles.panel.ContainerTemplateSettings,MODx.Panel,{
,forId: 'articles-setting-tplArticleRow'
,html: _('articles.setting.tplArticleRow_desc')
,cls: 'desc-under'

},{
xtype: 'textfield'
,name: 'setting_tplArticleRowOdd'
,id: 'articles-setting-tplArticleRowOdd'
,fieldLabel: _('articles.setting.tplArticleRowOdd')
,description: MODx.expandHelp ? '' : _('articles.setting.tplArticleRowOdd_desc')
,anchor: '100%'
,value: config.record.setting_tplArticleRowOdd || ''
,listeners: oc
},{
xtype: MODx.expandHelp ? 'label' : 'hidden'
,forId: 'articles-setting-tplArticleRowOdd'
,html: _('articles.setting.tplArticleRowOdd_desc')
,cls: 'desc-under'
}]
}];
}
Expand Down
4 changes: 4 additions & 0 deletions core/components/articles/lexicon/en/default.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@
$_lang['articles.import_modx_tagsField_desc'] = 'The field (or TV) that your old blog set tags on. Prefix with "tv." to specify a TV (eg, "tv.tags").';
$_lang['articles.import_modx_unpublished'] = 'Import Unpublished';
$_lang['articles.import_modx_unpublished_desc'] = 'If checked, will also import any unpublished Resources.';
$_lang['articles.import_modx_duplicate'] = 'Duplicate Article(s)?';
$_lang['articles.import_modx_duplicate_desc'] = 'If enable, create a copy of the Article(s) without deleting it from the original Articles Container (useful if you want to copy articles in different manager\'s contexts).';
$_lang['articles.import_options'] = 'Import Options';
$_lang['articles.import_service'] = 'Import From';
$_lang['articles.import_service_desc'] = 'Select the Service or Application that you would like to import from.';
Expand Down Expand Up @@ -156,6 +158,8 @@
$_lang['articles.setting.articleTemplate_desc'] = 'The default Template to use for Articles.';
$_lang['articles.setting.tplArticleRow'] = 'Article Row Chunk';
$_lang['articles.setting.tplArticleRow_desc'] = 'The Chunk to use when displaying Articles on the front page or archive pages.';
$_lang['articles.setting.tplArticleRowOdd'] = 'Article Row Odd Chunk';
$_lang['articles.setting.tplArticleRowOdd_desc'] = 'Same as "Article Row Chunk" but this chuck is applied only to odd article.';
$_lang['articles.setting.archiveByMonth'] = 'Archive By Month';
$_lang['articles.setting.archiveByMonth_desc'] = 'Whether or not to archive by month or by year. Yes will archive by month.';
$_lang['articles.setting.tplArchiveMonth'] = 'Archive Listing Chunk';
Expand Down
Loading