update for 2.1

README.md

@@ -1,17 +1,17 @@
 zpBootstrap 
 ============
 
-zpBootstrap is a « Responsive » theme for [ZenPhoto CMS](http://www.zenphoto.org), based on [Bootstrap framework](http://getbootstrap.com/).
+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!
 
 ### Important
-To use the release **2.0** of the theme, you must have **ZenPhoto 1.4.14 or more**.
+To use the release **2.1** of the theme, you must have **ZenPhoto 1.4.14 or more**.
 If you use another release of ZenPhoto, see [archives of zpBootstrape on Github](https://github.com/vincent3569/zpBootstrap/releases).
 
-You can report bugs on the [ZenPhoto forum](http://www.zenphoto.org/support/) or by creating an issue on [GitHub](https://github.com/vincent3569/zpBootstrap/issues), I will fix it as soon as possible (only the latest version is supported). You can also improve theme via [Pull requests](https://github.com/vincent3569/zpBootstrap/pulls).
+You can report bugs on the [Zenphoto forum](http://www.zenphoto.org/support/) or by creating an issue on [GitHub](https://github.com/vincent3569/zpBootstrap/issues), I will fix it as soon as possible (only the latest version is supported). You can also improve theme via [Pull requests](https://github.com/vincent3569/zpBootstrap/pulls).
 
-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.
+Please note that the Zenphoto team advise to regulary upgrade 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.
 
 Description
 -----------
@@ -28,13 +28,15 @@ The theme supports the following ZenPhoto plugins:
 
 ### Installation
 - Upload the zip file to your computer,
-- 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,
+- 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.
 
 ### 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").
+- You can display a home page, with a slider of 5 random picts, the gallery description and the latest news (if zenpage is used)
+- You can use "isotope" jQuery plugin to display albums. This layout allows to display uncropped thumbnails and to filter them based on their tags
+- You can use "infinite-scroll" jQuery plugin. This layout will automatically load items of next page (albums, images or news) without pagination
+- 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
 - In admin>options>gallery, enter the title of your website, the title and description of your gallery

changelog.txt

@@ -1,3 +1,40 @@
+* 2.1
+- upgrade to flexSlider 2.6.4
+	- hacks VBO to avoid horizontal scrollbar and to be consistant with bootstrap breakpoints
+- upgrade to FancyBox 3.1.28 to be compliant with infinite-scroll
+- album_isotope.php
+	- use global $_zp_themeroot to load js script (https://github.com/vincent3569/zpBootstrap/pull/6)
+- archives.php, functions.php, home.php, inc_header.php, news.php, pages.php, search.php :
+	- use new variables $_zenpage_and_news_enabled and $_zenpage_and_pages_enabled to manage ZP_NEWS_ENABLED and ZP_PAGES_ENABLED
+- album.php, album_infinitescroll.php, functions.php, gallery.php, inc_print_infinitescroll.php, inc_print_infinitescroll_news.php, news.php, themeoptions.php, css/zpBootstrap.css, js/infinite-scroll.pkgd.min.js:
+	- management of inifite-scroll plugin on gallery, albums and news pages
+- album_standard.php, album_isotope.php, inc_print_googlemap.php :
+	- googlemap managment in only one php file
+- contact.php, favorites.php, news.php, pages.php, register.php
+	- page 404 managmement if plugins are not enabled
+- favorites.php
+	- use more simple breadcrumb
+- functions.php
+	- set album thumb size and album thumb size for mobile device
+- home.php, themeoptions.php
+	- use new option zpB_latest_news_homepage
+- inc_header
+	- uses "switch" structure to avoids multiple "if" to determine page title
+	- rewrite of login/out link in the header (depend of user_login-out and register_user plugin)
+	- pull request to allow loading of http or https version of script (https://github.com/vincent3569/zpBootstrap/pull/3)
+	- fix issue on home and gallery links
+	- fix issue on charset meta tag
+- news.php, functions.php
+	- set shorten title size for mobile device
+- themeoptions.php
+	- uses __construct()
+	- set album thumb default for large device
+- locale/
+	- update of german, dutch and french translations
+- css/bootstrap.css
+	- uses a new compiled version of bootstrap to fix navbar breakpoint (992px rather than 768px)
+
+
 * 2.0
 - full rewrite with Bootstrap 3.3.7
 - uses a compiled bootstrap (see config file _boostrap_3.3.7/bootstrap-compiled/config.json)

inc_footer.php

@@ -18,4 +18,4 @@
 
 	</body>
 </html>
-<!-- zpBootstrap 2.1 - a ZenPhoto/ZenPage theme by Vincent3569 -->
+<!-- zpBootstrap 2.1 - a Zenphoto theme by Vincent3569 -->

license.htm

@@ -9,8 +9,8 @@
 h2{font-size: 100%; font-style: italic;font-family: "Georgia","serif";}
 h3{font-size: 110%; font-family: "Georgia","serif";}
 h4{font-size: 90%; font-style: italic; font-family: "Georgia","serif";}
-a, a:active{color: #0088CC; text-decoration: none;}
-a:focus, a:hover{color: #005580; text-decoration: underline;}
+a, a:active{color: #337ab7; text-decoration: none;} 
+a:focus, a:hover{color: #23527c; text-decoration: underline;}
 ol{margin-bottom: 0cm;}
 ul{margin-bottom: 0cm;}
 -->