Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Conflicts: admin-dev/themes/default/template/controllers/modules/configure.tpl
2013-11-18 15:13:04 +01:00
parent 73ec191fb0 2ba5dc18fd
commit 369ac0f664
23 changed files with 727 additions and 417 deletions
@@ -48,6 +48,14 @@
 							<div>{l s='Reset'}</div>
 						</a>
 					</li>
+					{if isset($module_update_link)}
+					<li>
+						<a id="desc-module-hook" class="toolbar_btn" href="{$module_update_link}" title="{l s='Update'}">
+							<i class="process-icon-refresh"></i>
+							<div>{l s='Update'}</div>
+						</a>
+					</li>
+					{/if}
 					<li>
 						<a id="desc-module-hook" class="toolbar_btn" href="{$module_hook_link}" title="{l s='Manage hooks'}">
 							<i class="process-icon-anchor"></i>