1.4.6

global commit for 1.4.6 release

404.php

@@ -7,7 +7,8 @@
 			</div> <!-- / header -->
 
 			<h4>
-			<?php echo gettext('The Zenphoto object you are requesting cannot be found.');
+			<?php
+			echo gettext('The Zenphoto object you are requesting cannot be found.');
 			if (isset($album)) {
 				echo '<br />'.sprintf(gettext('Album: %s'), html_encode($album));
 			}
@@ -16,7 +17,8 @@
 			}
 			if (isset($obj)) {
 				echo '<br />'.sprintf(gettext('Page: %s'), html_encode(substr(basename($obj), 0, -4)));
-			} ?>
+			}
+			?>
 			</h4>
 
 <?php include('inc_footer.php'); ?>

README.md

@@ -17,13 +17,13 @@ Scripts used:
 
 The theme supports the following ZenPhoto plugins:
 
-- comment_form, contact_form, dynamic-locale, flag_thumbnail, GoogleMap, rating, register_user, user_login-out, zenpage
+- cacheManager (**new**), colorbox, comment_form, contact_form, dynamic-locale, favoritesHandler (**new**), flag_thumbnail, GoogleMap (**colorbox option not supported**), rating, register_user, slideshow (**new, only colorbox option supported**), user_login-out, zenpage
 
 The theme does not support the following ZenPhoto plugins:
-- colorbox and slideshow (zpBoostrap uses and configures it's own colorbox and modal plugins)
+- colorbox and slideshow (zpBootstrap uses and configures it's own colorbox and modal plugins)
 
 ### Important
-To use the release **1.4.3** of the theme, you must have **ZenPhoto 1.4.3 or more**.
+To use the release **1.4.6** of the theme, you must have **ZenPhoto 1.4.6 or more**.
 If you use another release of ZenPhoto, see [archives of zpBootstrape on Github](https://github.com/vincent3569/zpBootstrap/releases).
 
 Report issues on the [ZenPhoto forum](http://www.zenphoto.org/support/) or create a new issue on [GitHub](https://github.com/vincent3569/zpBootstrap/issues) and I will fix it as soon as possible (only the latest version is supported).
@@ -32,7 +32,7 @@ Please note that the ZenPhoto team advise to regulary upgrade its site with the
 
 ### Installation
 - Upload the zip file to your computer,
-- Unzip the downloaded zip file locally, and upload the zpBoostrap folder to the directory /themes/ of your ZenPhoto site,
+- Unzip the downloaded zip file locally, and upload the zpBootstrap folder to the directory /themes/ of your ZenPhoto site,
 - In ZenPhoto administration, go to the Themes tab and activate the zpBootstrap theme,
 - Navigate to Options>Theme to view and configure the available options for zpBootstrap.
 

album.php

@@ -1,4 +1,4 @@
-<?php include ('inc_header.php'); ?>
+<?php include('inc_header.php'); ?>
 
 	<!-- wrap -->
 		<!-- container -->
@@ -18,10 +18,10 @@
 				</h4>
 			</div>
 
-			<?php if (getOption('zpB_slideshow') <> 'none') { ?>
-			<ul class="pager hidden-phone pull-right">
+			<?php if (extensionEnabled('slideshow')) { ?>
+			<ul class="pager hidden-phone pull-right"> <!--hidden-phone -->
 				<li>
-					<?php zpB_printSlideShowLink(gettext('Slideshow')); ?>
+					<?php printSlideShowLink(gettext('Slideshow')); ?>
 				</li>
 			</ul>
 			<?php } ?>
@@ -38,30 +38,57 @@
 
 			<?php printPageListWithNav('«', '»', false, true, 'pagination', NULL, true, 7); ?>
 
-			<?php if (function_exists('printGoogleMap')) {
-				$MAP = new GoogleMapAPI();
-				if (getAlbumGeodata($_zp_current_album, $MAP)) {
-				?>
-				<div class="accordion" id="gmap_accordion">
-					<div class="accordion-heading">
-						<a class="accordion-toggle" data-toggle="collapse" data-parent="#gmap_accordion" href="#zpB_googlemap_data" title="<?php echo gettext('Display or hide the Google Map.'); ?>">
-							<i class="icon-map-marker"></i><?php echo gettext('Google Map'); ?>
-						</a>
-						<?php printGoogleMap(NULL, 'googlemap'); ?>
-						<script type="text/javascript">
-							jQuery(document).ready(function($) {
-								$('#zpB_googlemap_data').collapse(
-									'<?php if ((getoption('gmap_display') == 'hide') || (getoption('gmap_display') == 'colorbox'))  { echo 'hide'; } else if (getoption('gmap_display') == 'show') { echo 'show'; } ?>'
-								);
-							});
-						</script>
-					</div>
-				</div>
-				<?php
+			<?php if ((zp_loggedin()) && (extensionEnabled('favoritesHandler'))) { ?>
+				<div class="favorites"><?php printAddToFavorites($_zp_current_album); ?></div>
+			<?php } ?>
+
+			<?php if(extensionEnabled('GoogleMap')) {
+				// theme doesnot support colorbox option for googlemap plugin
+				// display map only if they are geodata
+				if ((getOption('gmap_display') == 'hide') || (getOption('gmap_display') == 'show')) {
+					$hasAlbumGeodata = false;
+					$album = $_zp_current_album;
+					$images = $album->getImages();
+
+					foreach ($images as $an_image) {
+						$image = newImage($album, $an_image);
+						$exif = $image->getMetaData();
+						if ((!empty($exif['EXIFGPSLatitude'])) && (!empty($exif['EXIFGPSLongitude']))) {
+							$hasAlbumGeodata = true; // at least one image has geodata
+						}
+					}
+
+					if ($hasAlbumGeodata == true) {
+						if (getOption('gmap_display') == 'hide') {
+							$gmap_display = 'zB_hide';
+						} else  if (getOption('gmap_display') == 'show') {
+							$gmap_display = 'zB_show';
+						}
+						?>
+						<div class="accordion" id="gmap_accordion">
+							<div class="accordion-heading" id="<?php echo $gmap_display; ?>">
+								<?php setOption('gmap_width', '100%', false); // override this option of Google Map plugin to make it reponsive ?>
+								<a class="accordion-toggle" data-toggle="collapse" data-parent="#gmap_accordion" href="#zpB_googlemap_data" title="<?php echo gettext('Display or hide the Google Map.'); ?>">
+									<i class="icon-map-marker"></i><?php echo gettext('Google Map'); ?>
+								</a>
+								<?php printGoogleMap(NULL, 'googlemap'); ?>
+								<script type="text/javascript">
+									jQuery(document).ready(function($) {
+										$('#zpB_googlemap_data').collapse(
+											'<?php echo $gmap_display; ?>'
+										);
+									});
+								</script>
+							</div>
+						</div>
+						<?php
+					}
 				}
 			}
 			?>
 
-			<?php include('inc_print_comment.php'); ?>
+			<?php if (extensionEnabled('comment_form')) { ?>
+				<?php include('inc_print_comment.php'); ?>
+			<?php } ?>
 
-<?php include ('inc_footer.php'); ?>
+<?php include('inc_footer.php'); ?>

archive.php

@@ -8,17 +8,17 @@
 
 			<table id="archives" class="table">
 				<thead>
-					<th><h4 class="center"><?php echo gettext('Gallery Archive'); ?></h4></th>
-					<?php if (function_exists('printNewsArchive')) { ?>
-					<th><h4 class="center"><?php echo gettext_th('News archive'); ?></h4></th>
+					<th><h4 class="center"><?php echo gettext('Gallery archive'); ?></h4></th>
+					<?php if ($_zenpage_enabled) { ?>
+					<th><h4 class="center"><?php echo gettext('News archive'); ?></h4></th>
 					<?php } ?>
 				</thead>
 				<tbody>
 					<tr>
 						<td>
 							<?php printAllDates('unstyled', 'year', 'nav nav-pills', 'desc'); ?>
 						</td>
-						<?php if (function_exists('printNewsArchive')) { ?>
+						<?php if ($_zenpage_enabled) { ?>
 						<td id="newsarchives">
 							<?php printNewsArchive('unstyled', 'year', 'nav nav-pills', null, false, 'desc'); ?>
 						</td>

changelog.txt

@@ -1,17 +1,74 @@
+* 1.4.6
+- locale/
+	- update German, Spanish, French, Italian, Dutch translations
+- comment_form/comment_form.php :
+	- rewrite of file to be compliant with zenphoto 1.4.6
+- contact_form/form.php :
+	- rewrite of file to be compliant with zenphoto 1.4.6
+- register_user/register_user_form.php :
+	- rewrite of file to be compliant with zenphoto 1.4.6
+- css/screen.css :
+	- graphical improvements
+- js/zpBootstrap.js :
+	- adaptation to zenphoto 1.4.6 (register and googlemap parts)
+	- fix issue : auto display login form when there is an error message
+- js/zpBootstrap.js, album.php, image.php, inc_header.php, favorites.php :
+	- supports favorites handler
+- js/zpBootstrap.js, inc_footer.php :
+	- rewrite of login part, to be compliant with 1.4.6
+- album.php, contact.php, image.php, inc_footer.php, inc_header.php, inc_print_comment.php, news.php, pages.php :
+	- replace function_exists('function_name') by extensionEnabled('plugin_name')
+	- replace class_exists('class_name') by extensionEnabled('plugin_name')
+- album.php, image.php, inc_header.php, favorites.php, functions.php, search.php, themeoptions.php :
+	- cleanup to use official slideshow plugin (only with colorbox option)
+- album.php, image.php, news.php, page.php :
+	- include of inc_print_comment.php only if comment_form is enabled
+- archives.php, home.php, inc_header.php, news.php, page.php :
+	- use new variable $_zenpage_enabled
+- inc_print_news.php, search.php :
+	- replace printNewsTitleLink() by printNewsURL() (deprecated with 1.4.6)
+- functions.php :
+	- add some operations (cleaned from inc_header.php)
+	- use new variable $_zenpage_enabled
+	- cleanup of some options not used
+	- new function my_checkPageValidity() to be compliant with zenphoto 1.4.6 (http://www.zenphoto.org/news/zenphoto-1.4.6#theme-changes-i-pagination-out-of-bound-checks)
+- home.php :
+	- rewrite of random picture loop
+	- cleanup printLatestNews() call (parameters deprecated with 1.4.6)
+- inc_header.php :
+	- supress some operations (now included in functions.php)
+	- fix issue : <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> is deprecated with html5, replaced by <meta charset="UTF-8">
+	- add pagination in title tag on gallery, album, news, search and favorites pages
+	- cleanup getGalleryIndexURL() function (parameters deprecated with 1.4.6)
+	- use printRSSLink() instead of printZenpageRSSLink(), deprecated with 1.4.5
+- inc_print_album_thumb.php :
+	- replace getAlbumLinkURL() by getAlbumURL() (deprecated with 1.4.6)
+- inc_print_comment.php :
+	- use $_zp_current_obj->getCommentsAllowed() (getCommentsAllowed() and zenpageOpenedForComments() deprecated with 1.4.6) (https://github.com/zenphoto/zenphoto/commit/b276f34877fd3465bb4a9793f42d0814037fe9d3)
+- inc_print_image_thumb.php :
+	- replace getImageLinkURL() by getImageURL() (deprecated with 1.4.6)
+- search.php :
+	- cleanup next_news() function (parameters deprecated with 1.4.6)
+- themeoptions.php :
+	- use setThemeOptionDefault insteed of setThemeOption
+	- cleanup of some options not used
+	- supports cacheManager plugin (https://github.com/zenphoto/zenphoto/issues/696)
+
+
 * 1.4.3
 - bootstrap framework (css, js, images) :
 	- upgrade to bootstrap 2.0.4 (release of 06/01/2012)
 - css/screen.css :
 	- graphical improvements
 - js/zpBootstrap.js :
-	- supports GoogleMap plugin (never called in colorbox)
+	- supports GoogleMap plugin (never called with colorbox)
 	- adaptation to zenphoto 1.4.3 (login part)
 - register_user/register_user_form.php :
 	- rewrite of the file to be compliant to zenphoto 1.4.3 (inspired from register_user_form.php and printPasswordForm.php)
 - album.php, gallery.php, image.php, news.php, search.php, inc_header.php :
 	- fix html encoding
 - album.php :
-	- supports GoogleMap plugin (never called in colorbox)
+	- supports GoogleMap plugin (never called with colorbox option)
 - home.php :
 	- change request (thanks to Nikolay Vakulovich) : images of the slideshow link to the gallery page rather than the image page
 - image.php :