TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into frontend

Browse Source 
Conflicts:
	templates/backOffice/default/folder-edit.html
This commit is contained in:
Manuel Raynaud
2013-12-09 16:15:58 +01:00
parent f34a4a066d 4c9eff379a
commit 462b2bec5e
16 changed files with 990 additions and 734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/backOffice/default/includes/content-folder-management.html
View File

@@ -7,7 +7,7 @@
<form method="POST" action="{url path='/admin/content/folder/add'}" id="related_content_form">
<p class="title title-without-tabs">{intl l='Additional Folders'}</p>
<p>{intl l='A content could be attached to more than one folder. Select here the additional fodlers for this content.'}
<p>{intl l='A content could be attached to more than one folder. Select here the additional folders for this content.'}
{loop name="default_folder" type="folder" id=$DEFAULT_FOLDER}
{intl l='You can change the default folder (%title) in the "General" tab.' title=$TITLE}
{/loop}