From 874e17aa6ff99715831d866cca8f1f1036dfa764 Mon Sep 17 00:00:00 2001
From: Jerome Nadaud <jerome.nadaud@prestashop.com>
Date: Thu, 3 Oct 2013 17:55:30 +0200
Subject: [PATCH] // remove javascript include from tpl

---
 .../controllers/modules_positions/list_modules.tpl    | 11 +----------
 controllers/admin/AdminModulesPositionsController.php |  2 ++
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl b/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
index 2df0de182..5d77360ff 100644
--- a/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
+++ b/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
@@ -27,15 +27,6 @@
 	var token = '{$token}';
 	var come_from = 'AdminModulesPositions';
 </script>
-<script type="text/javascript" src="../js/vendor/jquery.sortable.js"></script>
-<style type="text/css">
-	li.sortable-placeholder {
-		border: 1px dashed #CCC;
-		background: #8EB1D7;
-		list-style: none;
-		margin-bottom: 4px;
-	}
-</style>
 
 {include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
 <div>{block name="leadin"}{/block}</div>
@@ -90,7 +81,7 @@
 
 	{if $hook['module_count']}
 						<section class="module_list">
-						<ul{if $hook['modules']|count > 1} class="sortable"{/if}>
+						<ul class="list-unstyled{if $hook['modules']|count > 1} sortable{/if}">
 
 						{foreach $hook['modules'] as $position => $module}
 							{if isset($module['instance'])}
diff --git a/controllers/admin/AdminModulesPositionsController.php b/controllers/admin/AdminModulesPositionsController.php
index a122b6a7e..3b3c08de8 100644
--- a/controllers/admin/AdminModulesPositionsController.php
+++ b/controllers/admin/AdminModulesPositionsController.php
@@ -226,6 +226,8 @@ class AdminModulesPositionsControllerCore extends AdminController
 
 	public function initContent()
 	{
+		$this->addJS(__PS_BASE_URI__.'js/vendor/jquery.sortable.js');
+
 		if (array_key_exists('addToHook', $_GET) || array_key_exists('editGraft', $_GET) || (Tools::isSubmit('submitAddToHook') && $this->errors))
 		{
 			$this->display = 'edit';