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

Merge branches 'coupon' and 'master' of https://github.com/thelia/thelia into coupon

Browse Source 
* 'coupon' of https://github.com/thelia/thelia:

# By Manuel Raynaud
# Via Manuel Raynaud
* 'master' of https://github.com/thelia/thelia:
  allow to delete content
  toofle content visibility
  allow to load jquery offline
  allow update content position number
This commit is contained in:
gmorel
2013-09-25 16:40:54 +02:00
parent b7851b2d54 1e571ffbc5
commit c10074786d
10 changed files with 248 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
templates/admin/default/admin-layout.tpl
View File

@@ -221,8 +221,16 @@
{* -- Javascript section ------------------------------------------------ *}
{block name="before-javascript-include"}{/block}
<script src="http://code.jquery.com/jquery-2.0.3.min.js"></script>
<script>
if (typeof jQuery == 'undefined') {
{javascripts file='assets/js/libs/jquery.js'}
document.write(unescape("%3Cscript src='{$asset_url}' %3E%3C/script%3E"));
{/javascripts}
}
</script>
<script src="http://code.jquery.com/jquery-2.0.3.min.js"></script>
{debugbar_renderjs}
{debugbar_renderresult}

6
templates/admin/default/assets/js/libs/jquery.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
templates/admin/default/content-edit.html
View File

@@ -57,7 +57,7 @@
{form name="thelia.admin.content.modification"}
<form method="POST" action="{url path='/admin/content/save'}" {form_enctype form=$form} class="clearfix">
{include file="includes/inner-form-toolbar.html" close_url="{url path='/admin/folders' parent=0}"}
{include file="includes/inner-form-toolbar.html" close_url="{url path='/admin/folders' parent=$DEFAULT_FOLDER}"}
{* Be sure to get the folder ID, even if the form could not be validated *}
<input type="hidden" name="content_id" value="{$content_id}" />

6
templates/admin/default/folders.html
View File

@@ -288,7 +288,7 @@
<td>
{admin_position_block
permission="admin.content.edit"
path={url path='/admin/contents/update-position' content_id=$ID}
path={url path='/admin/content/update-position' content_id=$ID}
url_parameter="content_id"
in_place_edit_class="contentPositionChange"
position=$POSITION
@@ -511,7 +511,7 @@
dialog_title = {intl l="Delete content"}
dialog_message = {intl l="Do you really want to delete this content ?"}
form_action = {url path='/admin/contents/delete'}
form_action = {url path='/admin/content/delete'}
form_content = {$smarty.capture.content_delete_dialog nofilter}
}
{/block}
@@ -567,7 +567,7 @@
$(".contentVisibleToggle").on('switch-change', function(event, data) {
$.ajax({
url : "{url path='admin/contents/toggle-online'}",
url : "{url path='admin/content/toggle-online'}",
data : {
content_id : $(this).data('id'),
action : 'visibilityToggle'