1.4.3

global commit for 1.4.3 release

.gitattributes

@@ -1,2 +1,22 @@
 # Auto detect text files and perform LF normalization
-* text=auto
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc   diff=astextplain
+*.DOC   diff=astextplain
+*.docx  diff=astextplain
+*.DOCX  diff=astextplain
+*.dot   diff=astextplain
+*.DOT   diff=astextplain
+*.pdf   diff=astextplain
+*.PDF   diff=astextplain
+*.rtf   diff=astextplain
+*.RTF   diff=astextplain

.gitignore

@@ -0,0 +1,12 @@
+############
+## Windows
+############
+
+# Windows image file caches
+Thumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Mac crap
+.DS_Store

404.php

@@ -0,0 +1,22 @@
+<?php include('inc_header.php'); ?>
+
+	<!-- wrap -->
+		<!-- container -->
+			<!-- header -->
+				<h3><?php printGalleryTitle(); ?> &raquo; <?php echo gettext("Object not found"); ?></h3>
+			</div> <!-- / header -->
+
+			<h4>
+			<?php echo gettext('The Zenphoto object you are requesting cannot be found.');
+			if (isset($album)) {
+				echo '<br />'.sprintf(gettext('Album: %s'), html_encode($album));
+			}
+			if (isset($image)) {
+				echo '<br />'.sprintf(gettext('Image: %s'), html_encode($image));
+			}
+			if (isset($obj)) {
+				echo '<br />'.sprintf(gettext('Page: %s'), html_encode(substr(basename($obj), 0, -4)));
+			} ?>
+			</h4>
+
+<?php include('inc_footer.php'); ?>

README.md

@@ -0,0 +1,48 @@
+zpBootstrap 
+============
+
+zpBootstrap is a « Responsive » theme for [ZenPhoto CMS](http://www.zenphoto.org), based on [Bootstrap framework](http://getbootstrap.com/).
+
+Feel free to download and use it, and thanks in advance for your feedback!
+
+Description
+-----------
+
+Scripts used:
+- Bootstrap (HTML, CSS, and JS toolkit for Responsive WebSite)
+- Flexslider (a fully responsive jQuery slider plugin)
+- AddThis (snippet to add sharing tools to your site)
+- Colorbox (lightweight customizable lightbox plugin for jQuery)
+- script for navigation with the arrow keys.
+
+The theme supports the following ZenPhoto plugins:
+
+- comment_form, contact_form, dynamic-locale, flag_thumbnail, GoogleMap, rating, register_user, 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)
+
+### Important
+To use the release **1.4.3** of the theme, you must have **ZenPhoto 1.4.3 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).
+
+Please note that the ZenPhoto team advise to regulary upgrade its site with the latest version of ZenPhoto to benefit from the latest features of the application, to solve the various security holes, and to benefit from the support of the ZenPhoto team.
+
+### 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,
+- 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.
+
+### Options
+- You can display a home page, with a slider of 5 random picts, the gallery description and the latest news (if zenpage is used),
+- Only one RSS Feed is displayed: go to options>RSS and select the RSS feed to use (RSS Feed "All News" has priority over RSS Feed "Gallery").
+
+### Tips
+- Enter the title and url of your website, the title and description of your gallery in admin>options>gallery.
+- Make responsive images in news and pages : to do that, edit the html source of news and pages and add class="remove-attributes" on each image (the result should be < img class="remove-attributes" src="the_path_to_your_image" />)
+
+### ChangeLog
+Please, read [changelog.txt](https://github.com/vincent3569/zpBootstrap/blob/master/changelog.txt)

album.php

@@ -0,0 +1,67 @@
+<?php include ('inc_header.php'); ?>
+
+	<!-- wrap -->
+		<!-- container -->
+			<!-- header -->
+				<h3><?php printGalleryTitle(); ?></h3>
+			</div> <!-- / header -->
+
+			<div class="breadcrumb">
+				<h4>
+					<?php if (getOption('zpB_homepage')) { ?>
+						<?php printCustomPageURL(getGalleryTitle(), 'gallery'); ?>
+					<?php } else { ?>
+						<a href="<?php echo html_encode(getGalleryIndexURL()); ?>" title="<?php echo gettext('Albums Index'); ?>"><?php echo html_encode(getGalleryTitle()); ?></a>
+					<?php } ?>&raquo;
+					<?php printParentBreadcrumb('', ' » ', ' » '); ?>
+					<?php printAlbumTitle(); ?>
+				</h4>
+			</div>
+
+			<?php if (getOption('zpB_slideshow') <> 'none') { ?>
+			<ul class="pager hidden-phone pull-right">
+				<li>
+					<?php zpB_printSlideShowLink(gettext('Slideshow')); ?>
+				</li>
+			</ul>
+			<?php } ?>
+
+			<?php printPageListWithNav('«', '»', false, true, 'pagination', NULL, true, 7); ?>
+
+			<div class="page-header bottom-margin-reset">
+				<p><?php printAlbumDesc(true); ?></p>
+			</div>
+
+			<?php include('inc_print_album_thumb.php'); ?>
+
+			<?php include('inc_print_image_thumb.php'); ?>
+
+			<?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 include('inc_print_comment.php'); ?>
+
+<?php include ('inc_footer.php'); ?>

archive.php

@@ -0,0 +1,45 @@
+<?php include('inc_header.php'); ?>
+
+	<!-- wrap -->
+		<!-- container -->
+			<!-- header -->
+				<h3><?php echo gettext('Archive View'); ?></h3>
+			</div> <!-- /header -->
+
+			<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>
+					<?php } ?>
+				</thead>
+				<tbody>
+					<tr>
+						<td>
+							<?php printAllDates('unstyled', 'year', 'nav nav-pills', 'desc'); ?>
+						</td>
+						<?php if (function_exists('printNewsArchive')) { ?>
+						<td id="newsarchives">
+							<?php printNewsArchive('unstyled', 'year', 'nav nav-pills', null, false, 'desc'); ?>
+						</td>
+						<?php } ?>
+					</tr>
+				</tbody>
+			</table>
+
+			<?php if (getOption('zpB_show_tags')) { ?>
+			<table id="tags" class="table">
+				<thead>
+					<th><h4 class="center"><?php echo gettext('Tags'); ?></h4></th>
+				</thead>
+				<tbody>
+					<tr>
+						<td>
+							<?php printAllTagsAs('cloud', 'nav nav-pills', 'abc', false, true, 2.5, 30, 5, NULL, 1); ?>
+						</td>
+					</tr>
+				</tbody>
+			</table>
+			<?php } ?>
+
+<?php include('inc_footer.php'); ?>

changelog.txt

@@ -0,0 +1,49 @@
+* 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)
+	- 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)
+- home.php :
+	- change request (thanks to Nikolay Vakulovich) : images of the slideshow link to the gallery page rather than the image page
+- image.php :
+	- supports new option to display Exif data
+- inc_footer.php :
+	- adaptation to zenphoto 1.4.3 (redesign login calling to avoid colorbox)
+- inc_header.php :
+	- fix an issue with 1.4.3 : use only $isHomePage variable to avoid warning of unknown value
+	- fix an issue with 1.4.3 : force $galleryactive to false to avoid warning of unknown value
+	- use rss icon of zpBootstrap theme
+	- supports GoogleMap plugin (never called in colorbox)
+- inc_print_album_thumb.php :
+	- fix an issue with 1.4.3 : missing some '' on options
+	- change request (Nikolay Vakulovich) : suppression of album description in the tooltip to avoid long description
+- inc_print_image_thumb.php :
+	- fix an issue  with 1.4.3 : code cleanup on next_image()
+- index.php :
+	- fix an issue with 1.4.3 : use only isHomePage variable to avoid warning of unknown value
+- functions.php :
+	- adaptation to zenphoto 1.4.3 (renaming of colorbox plugin)
+- register.php :
+	- fix an issue : add script to force modal to be open after confirmation of the registration
+- themeoptions.php :
+	- supports new option to display Exif data
+	- set some options (ie : albums_per_row, albums_per_page, images_per_row, images_per_page, colorbox_js)
+	- use SetOption instead SetOptionDefault for some options (in order to force the value of the options)
+
+
+*1.4.2.1
+- inc_header.php :
+	- fix an issue on RSS Feed : use options 'RSS_album_image' and 'RSS_articles'
+
+
+* 1.4.2
+initial version