Changeset 16509 for extensions/gally

Timestamp:

Jul 8, 2012, 7:42:39 PM (12 years ago)

Author:

grum

Message:

feature:2664 - compatibility with Piwigo 2.4
fix dependencies

Location:

extensions/gally/gally-default

Files:

• admin/gally_img_interface.tpl (modified) (1 diff)
• admin/gally_img_other.tpl (modified) (1 diff)
• template/header.tpl (modified) (3 diffs)
• themeconf.inc.php (modified) (1 diff)

extensions/gally/gally-default/admin/gally_img_interface.tpl

@@ -1 @@
-{combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
-{combine_script id="jquery.ui.slider" path="themes/default/js/ui/minified/jquery.ui.slider.min.js"}
+{combine_script id="jquery.ui" path="themes/default/js/ui/jquery.ui.core.js"}
+{combine_script id="jquery.ui.widget" path="themes/default/js/ui/jquery.ui.widget.js"}
+{combine_script id="jquery.ui.slider" path="themes/default/js/ui/jquery.ui.slider.js"}
 
 {literal}

extensions/gally/gally-default/admin/gally_img_other.tpl

@@ -1 @@
-{combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
-{combine_script id="jquery.ui.slider" path="themes/default/js/ui/minified/jquery.ui.slider.min.js"}
+{combine_script id="jquery.ui" path="themes/default/js/ui/jquery.ui.core.js" require='jquery'}
+{combine_script id="jquery.ui.widget" path="themes/default/js/ui/jquery.ui.widget.js" require='jquery.ui'}
+{combine_script id="jquery.ui.slider" path="themes/default/js/ui/jquery.ui.slider.js" require='jquery.ui.widget'}
 
 {literal}

extensions/gally/gally-default/template/header.tpl

@@ -5 +5 @@
   <meta http-equiv="Content-Type" content="text/html; charset={$CONTENT_ENCODING}">
   <meta name="generator" content="Piwigo (aka PWG), see piwigo.org">
+
+  {combine_script id="jquery" path="themes/default/js/jquery.js" load='header'}
+  {combine_script id="jquery.ui" path="themes/default/js/ui/jquery.ui.core.js" require='jquery' load='header'}
+  {combine_script id="jquery.ui.widget" path="themes/default/js/ui/jquery.ui.widget.js" require='jquery.ui' load='header'}
+  {combine_script id="jquery.ui.mouse" path="themes/default/js/ui/jquery.ui.mouse.js" require='jquery.ui.widget' load='header'}
+  {combine_script id="jquery.ui.position" path="themes/default/js/ui/jquery.ui.position.js" require='jquery.ui.widget' load='header'}
+  {combine_script id="jquery.ui.tabs" path="themes/default/js/ui/jquery.ui.tabs.js" require='jquery.ui' load='header'}
+  {combine_script id="jquery.ui.dialog" path="themes/default/js/ui/jquery.ui.dialog.js" require='jquery.ui' load='header'}
+
 
   {if isset($meta_ref) }
@@ -42 +51 @@
 
   <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/gally-default/css/content.css">
-
-  {combine_script id="jquery" path="themes/default/js/jquery.js"}
-  {combine_script id="jquery.ui" path="themes/default/js/ui/jquery.ui.core.js"}
-  {combine_script id="jquery.ui.tabs" path="themes/default/js/ui/jquery.ui.tabs.js"}
-  {combine_script id="jquery.ui.dialog" path="themes/default/js/ui/jquery.ui.dialog.js"}
 
   {include file='config.js.tpl'}
@@ -92 +96 @@
 
 {get_combined_scripts load='header'}
-{combine_script id="jquery" load="footer"}
 
 </head>

extensions/gally/gally-default/themeconf.inc.php

@@ -6 +6 @@
 Theme URI: http://piwigo.org/ext/extension_view.php?eid=382
 Author: Grum
-Author URI: http://photos.grum.fr
+Author URI: http://www.grum.fr
 */