Define close_url variable

This commit is contained in:
touffies
2013-12-11 18:43:43 +01:00
parent 12d4c0fdfd
commit b46a8fd1f2

View File

@@ -6,34 +6,33 @@
{block name="page-title"}{intl l='Edit category'}{/block} {block name="page-title"}{intl l='Edit category'}{/block}
{block name="main-content"} {block name="main-content"}
<div class="catalog edit-category">
<div class="catalog edit-category">
<div id="wrapper" class="container"> <div id="wrapper" class="container">
{include file="includes/catalog-breadcrumb.html" editing_category="true"} {include file="includes/catalog-breadcrumb.html" editing_category="true"} /{$category_id}/{$edit_language_id}/
<div class="row"> <div class="row">
{loop name="category_edit" type="category" visible="*" id="{$category_id}" backend_context="1" lang="$edit_language_id"} {loop name="category_edit" type="category" visible="*" id="{$category_id}" backend_context="1" lang="$edit_language_id"}
{* Define close url *}
{if $PARENT gt 0}
{assign var='close_url' value="{url path='/admin/categories' category_id=$PARENT}"}
{else}
{assign var='close_url' value="{url path='/admin/catalog'}"}
{/if}
<div class="col-md-12 general-block-decorator"> <div class="col-md-12 general-block-decorator">
<div class="row"> <div class="row">
<div class="col-md-7 title"> <div class="col-md-7 title">
{intl l='Edit category %title' title=$TITLE} {intl l='Edit category %title</small>' title=$TITLE}
</div> </div>
<div class="col-md-5 actions"> <div class="col-md-5 actions">
<a {if $HAS_PREVIOUS != 0}href="{url path='/admin/categories/update' category_id=$PREVIOUS}"{else}disabled="disabled"{/if} class="btn btn-default" title="{intl l='Edit previous category'}"><span class="glyphicon glyphicon-arrow-left"></span></a>
{if $HAS_PREVIOUS != 0}
<a href="{url path='/admin/categories/update' category_id=$PREVIOUS}" class="btn btn-default" title="{intl l='Edit previous category'}"><span class="glyphicon glyphicon-arrow-left"></span></a>
{else}
<a href="#" disabled="disabled" class="btn btn-default"><span class="glyphicon glyphicon-arrow-left"></span></a>
{/if}
<a href="{$URL}" target="_blank" class="btn btn-default" title="{intl l='Preview category page'}"><span class="glyphicon glyphicon-eye-open"></span></a> <a href="{$URL}" target="_blank" class="btn btn-default" title="{intl l='Preview category page'}"><span class="glyphicon glyphicon-eye-open"></span></a>
<a {if $HAS_NEXT != 0}href="{url path='/admin/categories/update' category_id=$NEXT}"{else}disabled="disabled"{/if} class="btn btn-default" title="{intl l='Edit next category'}"><span class="glyphicon glyphicon-arrow-right"></span></a>
{if $HAS_NEXT != 0}
<a href="{url path='/admin/categories/update' category_id=$NEXT}" class="btn btn-default" title="{intl l='Edit next category'}"><span class="glyphicon glyphicon-arrow-right"></span></a>
{else}
<a href="#" disabled="disabled" class="btn btn-default"><span class="glyphicon glyphicon-arrow-right"></span></a>
{/if}
</div> </div>
</div> </div>
@@ -41,50 +40,42 @@
<div class="col-md-12"> <div class="col-md-12">
<ul class="nav nav-tabs" id="tabbed-menu"> <ul class="nav nav-tabs" id="tabbed-menu">
<li {if $current_tab == 'general'}class="active"{/if}><a href="#general" data-toggle="tab">{intl l="General description"}</a></li> <li><a href="#general" data-toggle="tab">{intl l="General description"}</a></li>
<li {if $current_tab == 'seo'}class="active"{/if}><a href="#seo" data-toggle="tab">{intl l="SEO"}</a></li> <li><a href="#seo" data-toggle="tab">{intl l="SEO"}</a></li>
<li {if $current_tab == 'associations'}class="active"{/if}><a href="#associations" data-toggle="tab">{intl l="Associations"}</a></li> <li><a href="#associations" data-toggle="tab">{intl l="Associations"}</a></li>
<li {if $current_tab == 'images'}class="active"{/if}><a href="#images" data-toggle="tab">{intl l="Images"}</a></li> <li><a href="#images" data-toggle="tab">{intl l="Images"}</a></li>
<li {if $current_tab == 'documents'}class="active"{/if}><a href="#documents" data-toggle="tab">{intl l="Documents"}</a></li> <li><a href="#documents" data-toggle="tab">{intl l="Documents"}</a></li>
<li {if $current_tab == 'modules'}class="active"{/if}><a href="#modules" data-toggle="tab">{intl l="Modules"}</a></li> <li><a href="#modules" data-toggle="tab">{intl l="Modules"}</a></li>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane fade {if $current_tab == 'general'}active in{/if}" id="general"> <div class="tab-pane fade" id="general">
<div class="form-container"> <div class="form-container">
{form name="thelia.admin.category.modification"} {form name="thelia.admin.category.modification"}
<form method="POST" action="{url path='/admin/categories/save'}" {form_enctype form=$form} class="clearfix"> <form method="POST" action="{url path="/admin/categories/update/$ID"}" {form_enctype form=$form} class="clearfix">
{include file="includes/inner-form-toolbar.html" close_url="{url path='/admin/categories' category_id=$PARENT}"} {include
file="includes/inner-form-toolbar.html"
{* Be sure to get the category ID, even if the form could not be validated *} close_url=$close_url
<input type="hidden" name="category_id" value="{$category_id}" /> }
<input type="hidden" name="current_tab" value="general" />
{form_hidden_fields form=$form} {form_hidden_fields form=$form}
{form_field form=$form field='success_url'} {form_field form=$form field='success_url'}
<input type="hidden" name="{$name}" value="{url path='/admin/category' category_id={$category_id}}" /> <input type="hidden" name="{$name}" value="{$close_url}">
{/form_field} {/form_field}
{form_field form=$form field='locale'} {if $form_error and $form_error_message}{include file='includes/notifications.html' message=$form_error_message}{/if}
<input type="hidden" name="{$name}" value="{$edit_language_locale}" />
{/form_field}
{if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
<div class="row"> <div class="row">
<div class="col-md-8"> <div class="col-md-8">
{include file="includes/standard-description-form-fields.html"} {include file="includes/standard-description-form-fields.html"}
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
{form_field form=$form field='parent'} {form_field form=$form field='parent'}
<div class="form-group {if $error}has-error{/if}"> <div class="form-group {if $error}has-error{/if}">
@@ -122,8 +113,7 @@
file="includes/inner-form-toolbar.html" file="includes/inner-form-toolbar.html"
hide_submit_buttons = false hide_submit_buttons = false
hide_flags = true hide_flags = true
close_url=$close_url
close_url="{url path='/admin/categories' category_id=$PARENT}"
} }
<small>{intl l='Category created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}</small> <small>{intl l='Category created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}</small>
@@ -133,17 +123,17 @@
</div> </div>
</div> </div>
<div class="tab-pane fade {if $current_tab == 'seo'}active in{/if}" id="seo"> <div class="tab-pane fade" id="seo">
{form name="thelia.admin.seo"} {form name="thelia.admin.seo"}
{include file="includes/seo-tab.html" {include file="includes/seo-tab.html"
form = $form form = $form
formAction = "{url path='/admin/categories/seo/save'}" formAction = "{url path='/admin/categories/seo/save'}"
closeUrl = "{url path='/admin/categories' category_id=$PARENT}" closeUrl = $close_url
} }
{/form} {/form}
</div> </div>
<div class="tab-pane fade {if $current_tab == 'associations'}active in{/if}" id="associations"> <div class="tab-pane fade" id="associations">
<div class="form-container"> <div class="form-container">
<div class="form-group"> <div class="form-group">
<form action="{url path='/admin/categories/related-content/add'}" id="related_content_form"> <form action="{url path='/admin/categories/related-content/add'}" id="related_content_form">
@@ -151,7 +141,7 @@
{include {include
file="includes/inner-form-toolbar.html" file="includes/inner-form-toolbar.html"
hide_submit_buttons=true hide_submit_buttons=true
close_url="{url path='/admin/categories' category_id=$PARENT}" close_url=$close_url
} }
<p class="title title-without-tabs">{intl l='Related content'}</p> <p class="title title-without-tabs">{intl l='Related content'}</p>
@@ -225,9 +215,7 @@
<tr> <tr>
<td>{$ID}</td> <td>{$ID}</td>
<td> <td>{$TITLE}</td>
{$TITLE}
</td>
{module_include location='category_contents_table_row'} {module_include location='category_contents_table_row'}
@@ -258,15 +246,16 @@
</div> </div>
</div> </div>
<div class="tab-pane fade {if $current_tab == 'images'}active in{/if}" id="images"> <div class="tab-pane fade" id="images">
{include file='includes/image-upload-form.html' imageType='category' parentId=$category_id} {include file='includes/image-upload-form.html' imageType='category' parentId=$category_id}
</div> </div>
<div class="tab-pane fade {if $current_tab == 'documents'}active in{/if}" id="documents"> <div class="tab-pane fade" id="documents">
{include file='includes/document-upload-form.html' documentType='category' parentId=$category_id} {include file='includes/document-upload-form.html' documentType='category' parentId=$category_id}
</div> </div>
<div class="tab-pane fade {if $current_tab == 'modules'}active in{/if}" id="modules"> <div class="tab-pane fade" id="modules">
{module_include location='category-edit'}
</div> </div>
</div> </div>
</div> </div>
@@ -275,20 +264,20 @@
{/loop} {/loop}
</div> </div>
</div> </div>
</div> </div>
{* Delete related content confirmation dialog *} {* Delete related content confirmation dialog *}
{capture "delete_content_dialog"} {capture "delete_content_dialog"}
<input type="hidden" name="category_id" value="{$category_id}" /> <input type="hidden" name="category_id" value="{$category_id}" />
<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" id="folder_delete_id" value="" /> <input type="hidden" name="folder_id" id="folder_delete_id" value="" />
<input type="hidden" name="current_tab" value="associations" /> <input type="hidden" name="current_tab" value="associations" />
{/capture} {/capture}
{include {include
file = "includes/generic-confirm-dialog.html" file = "includes/generic-confirm-dialog.html"
dialog_id = "delete_content_dialog" dialog_id = "delete_content_dialog"
@@ -297,7 +286,7 @@
form_action = {url path='/admin/categories/related-content/delete'} form_action = {url path='/admin/categories/related-content/delete'}
form_content = {$smarty.capture.delete_content_dialog nofilter} form_content = {$smarty.capture.delete_content_dialog nofilter}
} }
{/block} {/block}
{block name="javascript-initialization"} {block name="javascript-initialization"}
@@ -348,6 +337,9 @@ $(function() {
$('#folder_delete_id').val($('#folder_id').val()); $('#folder_delete_id').val($('#folder_id').val());
}); });
// Load active tab
$('.nav-tabs a[href="#{$current_tab}"]').trigger("click");
// Load content on folder selection // Load content on folder selection
$('#folder_id').change(function(event) { $('#folder_id').change(function(event) {