revert hange in folder admin template

This commit is contained in:
Manuel Raynaud
2013-09-30 14:24:33 +02:00
parent 84847b8765
commit 906c97ca62

View File

@@ -5,7 +5,7 @@
{block name="check-permissions"}admin.folders.view{/block} {block name="check-permissions"}admin.folders.view{/block}
{block name="main-content"} {block name="main-content"}
<div class="folders"> <div class="folders">
<div id="wrapper" class="container"> <div id="wrapper" class="container">
@@ -20,7 +20,7 @@
<table class="table table-striped table-condensed" id="folder_list"> <table class="table table-striped table-condensed" id="folder_list">
<caption> <caption>
{* display parent folder name, and get current folder ID *} {* display parent folder name, and get current folder ID *}
{loop name="folder_title" type="folder" visible="*" id=$folder_id} {loop name="folder_title" type="folder" visible="*" id=$parent}
{intl l="Folders in %fold" fold=$TITLE} {intl l="Folders in %fold" fold=$TITLE}
{$fold_id = $ID} {$fold_id = $ID}
{/loop} {/loop}
@@ -28,6 +28,11 @@
{intl l="Top level folders"} {intl l="Top level folders"}
{/elseloop} {/elseloop}
<td class="object-title">
<a href="{url path='admin/folders' parent=$ID}" title="{intl l='Browse this folder'}">
{$TITLE}
</a>
</td>
{module_include location='folder_list_caption'} {module_include location='folder_list_caption'}
{loop type="auth" name="can_create" roles="ADMIN" permissions="admin.folders.create"} {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.folders.create"}
@@ -45,7 +50,7 @@
current_order=$folder_order current_order=$folder_order
order='id' order='id'
reverse_order='id_reverse' reverse_order='id_reverse'
path={url path='/admin/folders' id_folder=$folder_id} path={url path='/admin/folders' parent=$parent}
request_parameter_name='folder_order' request_parameter_name='folder_order'
label="{intl l='ID'}" label="{intl l='ID'}"
} }
@@ -58,7 +63,7 @@
current_order=$folder_order current_order=$folder_order
order='alpha' order='alpha'
reverse_order='alpha_reverse' reverse_order='alpha_reverse'
path={url path='/admin/folders' id_folder=$folder_id} path={url path='/admin/folders' parent=$parent}
request_parameter_name='folder_order' request_parameter_name='folder_order'
label="{intl l='Folder title'}" label="{intl l='Folder title'}"
} }
@@ -71,7 +76,7 @@
current_order=$folder_order current_order=$folder_order
order='visible' order='visible'
reverse_order='visible_reverse' reverse_order='visible_reverse'
path={url path='/admin/folders' id_folder=$folder_id} path={url path='/admin/folders' parent=$parent}
request_parameter_name='folder_order' request_parameter_name='folder_order'
label="{intl l='Online'}" label="{intl l='Online'}"
} }
@@ -82,7 +87,7 @@
current_order=$folder_order current_order=$folder_order
order='manual' order='manual'
reverse_order='manual_reverse' reverse_order='manual_reverse'
path={url path='/admin/folders' id_folder=$folder_id} path={url path='/admin/folders' parent=$parent}
request_parameter_name='folder_order' request_parameter_name='folder_order'
label="{intl l='Position'}" label="{intl l='Position'}"
} }
@@ -93,18 +98,18 @@
</thead> </thead>
<tbody> <tbody>
{loop name="folder_list" type="folder" visible="*" parent=$folder_id order=$folder_order backend_context="1" lang=$lang_id} {loop name="folder_list" type="folder" visible="*" parent=$parent order=$folder_order backend_context="1" lang=$lang_id}
<tr> <tr>
<td>{$ID}</td> <td>{$ID}</td>
<td> <td>
{loop type="image" name="folder_image" source="folder" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"} {loop type="image" name="folder_image" source="folder" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"}
<a href="{url path='admin/folder' folder_id=$ID}" title="{intl l='Browse this folder'}"><img class="img-thumbnail" src="{$IMAGE_URL}" alt="{$TITLE}" /></a> <a href="{url path='admin/folders' parent=$ID}" title="{intl l='Browse this folder'}"><img class="img-thumbnail" src="{$IMAGE_URL}" alt="{$TITLE}" /></a>
{/loop} {/loop}
</td> </td>
<td class="object-title"> <td class="object-title">
<a href="{url path='admin/folder' folder_id=$ID}" title="{intl l='Browse this folder'}"> <a href="{url path='admin/folders' parent=$ID}" title="{intl l='Browse this folder'}">
{$TITLE} {$TITLE}
</a> </a>
</td> </td>
@@ -138,10 +143,10 @@
<td class="actions"> <td class="actions">
<div class="btn-group"> <div class="btn-group">
<a class="btn btn-default btn-xs" title="{intl l='Browse this folder'}" href="{url path='admin/folder' folder_id=$ID}"><i class="glyphicon glyphicon-folder-open"></i></a> <a class="btn btn-default btn-xs" title="{intl l='Browse this folder'}" href="{url path='admin/folders' parent=$ID}"><i class="glyphicon glyphicon-folder-open"></i></a>
{loop type="auth" name="can_change" roles="ADMIN" permissions="admin.folders.edit"} {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.folders.edit"}
<a class="btn btn-default btn-xs" title="{intl l='Edit this folder'}" href="{url path='/admin/folders/update' folder_id=$ID}"><i class="glyphicon glyphicon-edit"></i></a> <a class="btn btn-default btn-xs" title="{intl l='Edit this folder'}" href="{url path="/admin/folders/update/{$ID}"}"><i class="glyphicon glyphicon-edit"></i></a>
{/loop} {/loop}
{loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.folders.delete"} {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.folders.delete"}
@@ -177,7 +182,7 @@
</div> </div>
</div> </div>
{* -- CONTENT MANAGEMENT ---------------------------------------------------- *} {* -- CONTENT MANAGEMENT ---------------------------------------------------- *}
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
@@ -186,7 +191,7 @@
<table class="table table-striped table-condensed"> <table class="table table-striped table-condensed">
<caption> <caption>
{* display parent folder name *} {* display parent folder name *}
{loop name="folder_title" type="folder" visible="*" id=$folder_id} {loop name="folder_title" type="folder" visible="*" id=$parent}
{intl l="Contents in %fold" fold=$TITLE} {intl l="Contents in %fold" fold=$TITLE}
{/loop} {/loop}
@@ -209,7 +214,7 @@
current_order=$content_order current_order=$content_order
order='id' order='id'
reverse_order='id_reverse' reverse_order='id_reverse'
path={url path='/admin/folders' id_folder=$folder_id target='contents'} path={url path='/admin/folders' parent=$parent target='contents'}
label="{intl l='ID'}" label="{intl l='ID'}"
} }
@@ -220,7 +225,7 @@
current_order=$content_order current_order=$content_order
order='alpha' order='alpha'
reverse_order='alpha_reverse' reverse_order='alpha_reverse'
path={url path='/admin/folders' id_folder=$folder_id target='contents'} path={url path='/admin/folders' parent=$parent target='contents'}
label="{intl l='Content title'}" label="{intl l='Content title'}"
} }
@@ -231,7 +236,7 @@
current_order=$content_order current_order=$content_order
order='visible' order='visible'
reverse_order='visible_reverse' reverse_order='visible_reverse'
path={url path='/admin/folders' id_folder=$folder_id target='contents'} path={url path='/admin/folders' parent=$parent target='contents'}
label="{intl l='Online'}" label="{intl l='Online'}"
} }
</th> </th>
@@ -241,7 +246,7 @@
current_order=$content_order current_order=$content_order
order='manual' order='manual'
reverse_order='manual_reverse' reverse_order='manual_reverse'
path={url path='/admin/folders' id_folder=$folder_id target='contents'} path={url path='/admin/folders' parent=$parent target='contents'}
label="{intl l='Position'}" label="{intl l='Position'}"
} }
</th> </th>
@@ -251,13 +256,13 @@
</thead> </thead>
<tbody> <tbody>
{loop name="content_list" type="content" visible="*" folder_default=$folder_id order=$content_order} {loop name="content_list" type="content" visible="*" folder_default=$parent order=$content_order}
<tr> <tr>
<td>{$ID}</td> <td>{$ID}</td>
<td> <td>
{loop type="image" name="folder_image" source="content" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"} {loop type="image" name="folder_image" source="content" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"}
<a href="{url path='admin/content/edit' id=$ID}" title="{intl l='Edit this content'}"> <a href="{url path="admin/content/update/$ID"}" title="{intl l='Edit this content'}">
<img src="{$IMAGE_URL}" alt="{$TITLE}" /> <img src="{$IMAGE_URL}" alt="{$TITLE}" />
</a> </a>
{/loop} {/loop}
@@ -325,12 +330,12 @@
</div> </div>
</div> </div>
{* -- Adding a new folder ------------------------------------------------- *} {* -- Adding a new folder ------------------------------------------------- *}
{form name="thelia.admin.folder.creation"} {form name="thelia.admin.folder.creation"}
{* Capture the dialog body, to pass it to the generic dialog *} {* Capture the dialog body, to pass it to the generic dialog *}
{capture "folder_creation_dialog"} {capture "folder_creation_dialog"}
@@ -339,11 +344,11 @@
{form_field form=$form field='success_url'} {form_field form=$form field='success_url'}
{* on success, redirect to the edition page, _ID_ is replaced with the created object ID, see controller *} {* on success, redirect to the edition page, _ID_ is replaced with the created object ID, see controller *}
<input type="hidden" name="{$name}" value="{url path='/admin/folders/update' folder_id='_ID_'}" /> <input type="hidden" name="{$name}" value="{url path='/admin/folders/update/_ID_'}" />
{/form_field} {/form_field}
{form_field form=$form field='parent'} {form_field form=$form field='parent'}
<input type="hidden" name="{$name}" value="{$folder_id}" /> <input type="hidden" name="{$name}" value="{$parent}" />
{/form_field} {/form_field}
{form_field form=$form field='title'} {form_field form=$form field='title'}
@@ -395,31 +400,31 @@
form_enctype = {form_enctype form=$form} form_enctype = {form_enctype form=$form}
form_error_message = $form_error_message form_error_message = $form_error_message
} }
{/form} {/form}
{* -- Adding a new content -------------------------------------------------- *} {* -- Adding a new content -------------------------------------------------- *}
{form name="thelia.admin.content.creation"} {form name="thelia.admin.content.creation"}
{* Capture the dialog body, to pass it to the generic dialog *} {* Capture the dialog body, to pass it to the generic dialog *}
{capture "content_creation_dialog"} {capture "content_creation_dialog"}
{form_hidden_fields form=$form} {form_hidden_fields form=$form}
{* Be sure to get the folder_id, even if the form could not be validated *} {* Be sure to get the folder_id, even if the form could not be validated *}
<input type="hidden" name="folder_id" value="{$folder_id}" /> <input type="hidden" name="parent" value="{$parent}" />
{form_field form=$form field='success_url'} {form_field form=$form field='success_url'}
{* on success, redirect to the edition page, _ID_ is replaced with the created object ID, see controller *} {* on success, redirect to the edition page, _ID_ is replaced with the created object ID, see controller *}
<input type="hidden" name="{$name}" value="{url path='/admin/contents/update' content_id='_ID_'}" /> <input type="hidden" name="{$name}" value="{url path='/admin/content/update/_ID_' }" />
{/form_field} {/form_field}
{form_field form=$form field='default_folder'} {form_field form=$form field='default_folder'}
<input type="hidden" name="{$name}" value="{$folder_id}" /> <input type="hidden" name="{$name}" value="{$parent}" />
{/form_field} {/form_field}
{form_field form=$form field='title'} {form_field form=$form field='title'}
<div class="form-group {if $error}has-error{/if}"> <div class="form-group {if $error}has-error{/if}">
<label for="{$label_attr.for}" class="control-label">{$label} : </label> <label for="{$label_attr.for}" class="control-label">{$label} : </label>
{loop type="lang" name="default-lang" default_only="1"} {loop type="lang" name="default-lang" default_only="1"}
<div class="input-group"> <div class="input-group">
@@ -463,7 +468,7 @@
dialog_ok_label = {intl l="Create this content"} dialog_ok_label = {intl l="Create this content"}
form_action = {url path='/admin/contents/create'} form_action = {url path='/admin/content/create'}
form_enctype = {form_enctype form=$form} form_enctype = {form_enctype form=$form}
form_error_message = $form_error_message form_error_message = $form_error_message
} }
@@ -487,13 +492,13 @@
form_action = {url path='/admin/folders/delete'} form_action = {url path='/admin/folders/delete'}
form_content = {$smarty.capture.folder_delete_dialog nofilter} form_content = {$smarty.capture.folder_delete_dialog nofilter}
} }
{* -- Delete content confirmation dialog ------------------------------------ *} {* -- Delete content confirmation dialog ------------------------------------ *}
{capture "content_delete_dialog"} {capture "content_delete_dialog"}
<input type="hidden" name="content_id" id="content_delete_id" value="" /> <input type="hidden" name="content_id" id="content_delete_id" value="" />
<input type="hidden" name="folder_id" value="{$folder_id}" /> <input type="hidden" name="folder_id" value="{$parent}" />
{module_include location='content_delete_form'} {module_include location='content_delete_form'}
@@ -508,7 +513,7 @@
form_action = {url path='/admin/content/delete'} form_action = {url path='/admin/content/delete'}
form_content = {$smarty.capture.content_delete_dialog nofilter} form_content = {$smarty.capture.content_delete_dialog nofilter}
} }
{/block} {/block}
{block name="javascript-initialization"} {block name="javascript-initialization"}
@@ -580,7 +585,7 @@
placement : 'left', placement : 'left',
success : function(response, newValue) { success : function(response, newValue) {
// The URL template // The URL template
var url = "{url noamp='1' path='/admin/folders/update-position' folder_id='__ID__' position='__POS__'}"; var url = "{url path='/admin/folders/update-position' folder_id='__ID__' position='__POS__'}";
// Perform subtitutions // Perform subtitutions
url = url.replace('__ID__', $(this).data('id')) url = url.replace('__ID__', $(this).data('id'))
@@ -599,7 +604,7 @@
placement : 'left', placement : 'left',
success : function(response, newValue) { success : function(response, newValue) {
// The URL template // The URL template
var url = "{url noamp='1' path='/admin/contents/update-position' content_id='__ID__' position='__POS__'}"; var url = "{url path='/admin/contents/update-position' content_id='__ID__' position='__POS__'}";
// Perform subtitutions // Perform subtitutions
url = url.replace('__ID__', $(this).data('id')) url = url.replace('__ID__', $(this).data('id'))