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

16
templates/backOffice/default/folder-edit.html
View File

@@ -119,12 +119,16 @@
</div>
</div>
{include
file="includes/inner-form-toolbar.html"
hide_flags = true
close_url="{url path='/admin/folders' folder_id=$folder_id}"
}
<div class="row">
<div class="col-md-12">
<div class="control-group">
<lablel>&nbsp;</lablel>
<div class="controls">
<p>{intl l='Folder created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}</p>
</div>
</div>
</div>
</div>
<small>{intl l='Colder created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}</small>