Index: /extensions/LLGBO2/include/manage_picture_content.php
===================================================================
--- /extensions/LLGBO2/include/manage_picture_content.php (revision 29483)
+++ /extensions/LLGBO2/include/manage_picture_content.php (revision 29484)
@@ -89,11 +89,19 @@
if ($conf['LLGBO2']['tooltipdisp'] )// tooltip
{ $prev = $template->get_template_vars('previous');
- $next = $template->get_template_vars('next');
- $swtimg = '|| $prev['TITLE_ESC'].$swtimg.$prev['THUMB_SRC'].'>'),TRUE);}
- if (isset($next)){$template->append('next', array('TITLE_ESC' => $next['TITLE_ESC'].$swtimg.$next['THUMB_SRC'].'>'),TRUE);}
+ $next = $template->get_template_vars('next');
+
+ if (isset($prev)){
+ $prev_thumbimg = '||get_url();
+ $template->append('previous', array('TITLE_ESC' => $prev['TITLE_ESC'].$prev_thumbimg.'>'),TRUE);
+ }
+ if (isset($next)){
+ $next_thumbimg = '||get_url();
+ $template->append('next', array('TITLE_ESC' => $next['TITLE_ESC'].$next_thumbimg.'>'),TRUE);
+ }
$template->append('llgbo', array('tooltipCSS' => $sweetcss), true);
- }
- // 2.6 paticular case automatic size and modus management
+ }
+ // -----------------------------------------------------------
+ // 2.6 paticular case automatic size and modus management
+ // -----------------------------------------------------------
if ($update_tpl)
{return $template->parse( 'default_content', true);}
@@ -107,5 +115,5 @@
// --------------------------------------
$patern = '/'.''.'/';
- $replacement = $replacement.'{$llgbo.FRAME_TITLE}'.'{$llgbo.FRAME_SIZE}'.'{$llgbo.FRAME_BEGIN}'."\n".' '.'{$llgbo.FRAME_END}';
+ $replacement = $replacement.'{$llgbo.FRAME_TITLE}'.'{$llgbo.FRAME_SIZE}'.'{$llgbo.FRAME_BEGIN}'."\n".''.'{$llgbo.FRAME_END}';
$content = preg_replace($patern, $replacement, $content);
return $content;
Index: /extensions/LLGBO2/js/jquery_llgboframeresize.js
===================================================================
--- /extensions/LLGBO2/js/jquery_llgboframeresize.js (revision 29483)
+++ /extensions/LLGBO2/js/jquery_llgboframeresize.js (revision 29484)
@@ -10,6 +10,6 @@
var FrLstBdr = 0; var frbdr=0;
jQuery(".llgboFR").each(function(){
- frbdr = parseInt(jQuery(this).css('border-top-width'));
- FrLstBdr = (frbdr * 2)+FrLstBdr;
+ frbdr = parseInt(jQuery(this).css('border-top-width'));
+ FrLstBdr = (frbdr * 2)+FrLstBdr;
});
}
Index: /extensions/LLGBO2/main.inc.php
===================================================================
--- /extensions/LLGBO2/main.inc.php (revision 29483)
+++ /extensions/LLGBO2/main.inc.php (revision 29484)
@@ -9,5 +9,7 @@
Add a border around picture ......
-- 01-07-2014
- 2.7.A Compliance Piwigo 2.7 new administration management
+ 2.7.A Compliance Piwigo 2.7 béta new administration management
+ -- 10-09-2014
+ 2.7.A Compliance Piwigo 2.7rc1 new administration management
*/
if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
Index: /extensions/LLGBO2/maintain.class.php
===================================================================
--- /extensions/LLGBO2/maintain.class.php (revision 29483)
+++ /extensions/LLGBO2/maintain.class.php (revision 29484)
@@ -34,9 +34,9 @@
private $default_header;
-function __construct(){
+ function __construct(){
// +-----------------------------------------------------------------------+
// +----------------- default values ---------------------------+
// +-----------------------------------------------------------------------+
-include(PHPWG_PLUGINS_PATH . basename(dirname(__FILE__)) . '/' .'defaultvalues.php');
+ include(PHPWG_PLUGINS_PATH . basename(dirname(__FILE__)) . '/' .'defaultvalues.php');
// variable declared in include
$this->default_main = $default_main;
@@ -44,95 +44,88 @@
$this->default_frame = $default_frame;
$this->default_header = $default_header;
- }
-// +-----------------------------------------------------------------------+
-// +----------------- default values ---------------------------+
-// +-----------------------------------------------------------------------+
+ }
// +-----------------------------------------------------------------------+
// +--------------- Install all settings --------------------------------+
// +-----------------------------------------------------------------------+
- function install($plugin_version, &$errors=array()) {
- global $conf;
+ function install($plugin_version, &$errors=array()) {
+ global $conf;
// +-----------------------------------------------------------------------+
- if (empty($conf['LLGBO2_Settings']))
- { if (isset($conf['LLGBO'])) // compatibility 2.6 --> 2.7
- { $Oldvalues = explode("," , $conf['LLGBO']);
- foreach($Oldvalues as $cle => $valeur)
- { if ($Oldvalues[$cle] == 'true' )
- {$Oldvalues[$cle] = (boolean)true ;} else { $Oldvalues[$cle] = (boolean)false;}
- }
- $this->default_main['version'] = 1;
- $this->default_main['frame'] = $Oldvalues[0];
- $this->default_main['tooltipdisp'] = $Oldvalues[1];
- $this->default_main['exifunderbt'] = $Oldvalues[2];
- $this->default_main['titleframe'] = $Oldvalues[5];
- $this->default_main['manageheader'] = $Oldvalues[6];
- $this->default_main['alwaysdisplayexif'] = $Oldvalues[10];
- conf_delete_param('LLGBO'); // old values before 2.7
+ if (empty($conf['LLGBO2_Settings']))
+ { if (isset($conf['LLGBO'])) // compatibility 2.6 --> 2.7
+ { $Oldvalues = explode("," , $conf['LLGBO']);
+ foreach($Oldvalues as $cle => $valeur)
+ { if ($Oldvalues[$cle] == 'true' )
+ {$Oldvalues[$cle] = (boolean)true ;} else { $Oldvalues[$cle] = (boolean)false;}
}
-
+ $this->default_main['version'] = 1;
+ $this->default_main['frame'] = $Oldvalues[0];
+ $this->default_main['tooltipdisp'] = $Oldvalues[1];
+ $this->default_main['exifunderbt'] = $Oldvalues[2];
+ $this->default_main['titleframe'] = $Oldvalues[5];
+ $this->default_main['manageheader'] = $Oldvalues[6];
+ $this->default_main['alwaysdisplayexif'] = $Oldvalues[10];
+ conf_delete_param('LLGBO'); // old values before 2.7
+ }
+
+// +-----------------------------------------------------------------------+
+ if (isset($conf['LLGBOTOOLTIP'])) // compatibility 2.6 --> 2.7
+ { $Oldvalues = explode("," , $conf['LLGBOTOOLTIP']);
+
+ $this->default_tooltip['TT-width'] = $Oldvalues[0];
+ $this->default_tooltip['TT-size'] = $Oldvalues[1];
+ $this->default_tooltip['TT-bordercolor'] = $Oldvalues[2];
+ $this->default_tooltip['TT-bgcolor'] = $Oldvalues[3];
+ $this->default_tooltip['TT-titlecolor'] = $Oldvalues[4];
+ $this->default_tooltip['TT-textcolor'] = $Oldvalues[5];
+
+ conf_delete_param('LLGBOTOOLTIP'); // old values before 2.7
+ }
// +-----------------------------------------------------------------------+
- if (isset($conf['LLGBOTOOLTIP'])) // compatibility 2.6 --> 2.7
- { $Oldvalues = explode("," , $conf['LLGBOTOOLTIP']);
- $this->default_tooltip['TT-width'] = $Oldvalues[0];
- $this->default_tooltip['TT-size'] = $Oldvalues[1];
- $this->default_tooltip['TT-bordercolor'] = $Oldvalues[2];
- $this->default_tooltip['TT-bgcolor'] = $Oldvalues[3];
- $this->default_tooltip['TT-titlecolor'] = $Oldvalues[4];
- $this->default_tooltip['TT-textcolor'] = $Oldvalues[5];
-
- conf_delete_param('LLGBOTOOLTIP'); // old values before 2.7
- }
-
-// +-----------------------------------------------------------------------+
+ if (isset($conf['LLGBOFRAME'])) // compatibility 2.6 --> 2.7
+ { $Oldvalues = explode("," , $conf['LLGBOFRAME']);
+ $i=0;
+ for ($x = 1 ;$x < 32 ; $x =$x +2)
+ { $newcolors[$i] = $Oldvalues[$x];
+ $newsizes[$i] = $Oldvalues[$x +1];
+ $i = $i +1;
+ }
+ $this->default_frame['FR-titlecolor'] = $Oldvalues[0];
+ $this->default_frame['FR-sizes'] = $newsizes;
+ $this->default_frame['FR-colors'] = $newcolors;
+
+ conf_delete_param('LLGBOFRAME'); // old values before 2.7
+ }
- if (isset($conf['LLGBOFRAME'])) // compatibility 2.6 --> 2.7
- { $Oldvalues = explode("," , $conf['LLGBOFRAME']);
- $i=0;
- for ($x = 1 ;$x < 32 ; $x =$x +2)
- { $newcolors[$i] = $Oldvalues[$x];
- $newsizes[$i] = $Oldvalues[$x +1];
- $i = $i +1;
- }
-
- $this->default_frame['FR-titlecolor'] = $Oldvalues[0];
- $this->default_frame['FR-sizes'] = $newsizes;
- $this->default_frame['FR-colors'] = $newcolors;
-
- conf_delete_param('LLGBOFRAME'); // old values before 2.7
- }
-
// +-----------------------------------------------------------------------+
+
+ if (isset($conf['LLGBOHEADER'])) // compatibility 2.6 --> 2.7
+ { $Oldvalues = explode("," , $conf['LLGBOHEADER']);
+ $i = 0;
+ foreach($this->default_header['HD-dispheader'] as $cle => $valeur)
+ { if ($Oldvalues[$i] == 'true' ) {$Oldvalues[$i] = (boolean)true ;} else { $Oldvalues[$i] = (boolean)false;}
+ $this->default_header['HD-dispheader'][$cle] = $Oldvalues[$i];
+ $i = $i +1;}
+ conf_delete_param('LLGBOHEADER'); // old values before 2.7
+ }
- if (isset($conf['LLGBOHEADER'])) // compatibility 2.6 --> 2.7
- { $Oldvalues = explode("," , $conf['LLGBOHEADER']);
- $i = 0;
- foreach($this->default_header['HD-dispheader'] as $cle => $valeur)
- { if ($Oldvalues[$i] == 'true' ) {$Oldvalues[$i] = (boolean)true ;} else { $Oldvalues[$i] = (boolean)false;}
- $this->default_header['HD-dispheader'][$cle] = $Oldvalues[$i];
- $i = $i +1;}
- conf_delete_param('LLGBOHEADER'); // old values before 2.7
- }
-
- $conf['LLGBO2'] =array_merge((array)$this->default_main, (array)$this->default_tooltip,(array) $this->default_frame,(array) $this->default_header);
- print_r($this->default_main);
- conf_update_param('LLGBO2_Settings', $conf['LLGBO2']);
- }
+ $conf['LLGBO2'] =array_merge((array)$this->default_main, (array)$this->default_tooltip,(array) $this->default_frame,(array) $this->default_header);
+ print_r($this->default_main);
+ conf_update_param('LLGBO2_Settings', $conf['LLGBO2']);
}
-
+ }
-// +-----------------------------------------------------------------------+
// +-----------------------------------------------------------------------+
function update($old_version, $new_version, &$errors=array())
- {
+ {
$this->install($new_version, $errors);
- }
+ }
// +-----------------------------------------------------------------------+
- function uninstall() {
+ function uninstall()
+ {
conf_delete_param('LLGBO2_Settings');
-
}
}
Index: /extensions/LLGBO2/template/llgbo_content.tpl
===================================================================
--- /extensions/LLGBO2/template/llgbo_content.tpl (revision 29483)
+++ /extensions/LLGBO2/template/llgbo_content.tpl (revision 29484)
@@ -1,21 +1,19 @@
-
- {if isset($llgbo.TOOLTIPCSS)}
- {$llgbo.TOOLTIPCSS}
- {/if}
- {if isset($llgbo.GBOCSS)}
- {combine_css path=$llgbo.GBOCSS order=+10}
- {/if}
-
- {if !isset($llgbo.NOJS)}
- {if isset($llgbo.TOOLTIP)}
- {combine_script id='llgbojqtooltip' load='footer' require='jquery' path=$LLGBO_PATH|@cat:"js/jquery_llgbotip.js"}
- {/if}
- {if isset($llgbo.FRAME_BEGIN)}
- {combine_script id='llgbojqframe' load='footer' require='jquery' path=$LLGBO_PATH|@cat:"js/jquery_llgboframeresize.js" }
- {/if}
+{if isset($llgbo.TOOLTIPCSS)}
+ {$llgbo.TOOLTIPCSS}
+{/if}
+{if isset($llgbo.GBOCSS)}
+ {combine_css path=$llgbo.GBOCSS order=+10}
+{/if}
+
+{if !isset($llgbo.NOJS)}
+ {if isset($llgbo.TOOLTIP)}
+ {combine_script id='llgbojqtooltip' load='footer' require='jquery' path=$LLGBO_PATH|@cat:"js/jquery_llgbotip.js"}
+ {/if}
+ {if isset($llgbo.FRAME_BEGIN)}
+ {combine_script id='llgbojqframe' load='footer' require='jquery' path=$LLGBO_PATH|@cat:"js/jquery_llgboframeresize.js" }
{/if}
+{/if}
-