diff --git a/404.php b/404.php index 9fcf4fd..fef7d72 100644 --- a/404.php +++ b/404.php @@ -3,13 +3,7 @@
-

- - - - - - » 

+

diff --git a/README.md b/README.md index a43a630..6e70e3a 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Description ----------- The theme supports the following ZenPhoto plugins: -- cacheManager (**new**), colorbox, comment_form, contact_form, dynamic-locale, favoritesHandler, federated_logon, flag_thumbnail, GoogleMap, image_album_statistics, print_album_menu, rating, register_user, RSS, slideshow (**only colorbox option**), user_login-out, zenpage +- cacheManager, colorbox, comment_form, contact_form, dynamic-locale, favoritesHandler, federated_logon, flag_thumbnail, GoogleMap, image_album_statistics, print_album_menu, rating, register_user, RSS, slideshow (**only colorbox option**), user_login-out, zenpage Additional scripts used: - Galleriffic (jQuery plugin for rich experience and fast-performing photo galleries) @@ -19,7 +19,7 @@ Additional scripts used: If you use Galleriffic script, you should not have any albums that mixes sub-albums and pictures (in this case, there is no navigation bars, so all sub-albums may be not displayed on album.php). ### Important -To use the release **1.4.6** of the theme, you must have **ZenPhoto 1.4.6.x to 1.4.12**. +To use the release **1.4.13** of the theme, you must have **ZenPhoto 1.4.13 or more**. If you use another release of ZenPhoto, see [Archives of zpArdoise on Github](https://github.com/vincent3569/zpArdoise/releases). Report issues on the [ZenPhoto forum](http://www.zenphoto.org/support/) or create a new issue on [GitHub](https://github.com/vincent3569/zpArdoise/issues) and I will fix it as soon as possible (only the latest version is supported). diff --git a/album.php b/album.php index 36d9077..53ea074 100644 --- a/album.php +++ b/album.php @@ -1,13 +1,7 @@
-

- - - - - - » 

+

@@ -71,17 +65,6 @@

- - - - diff --git a/archive.php b/archive.php index bae1fb2..63e8f15 100644 --- a/archive.php +++ b/archive.php @@ -3,13 +3,7 @@
-

- - - - - - » 

+

diff --git a/changelog.txt b/changelog.txt index 7f6d6b1..bcd9f5a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,28 @@ +* 1.4.13 +- css/screen, css/light.css, js/zpardoise_light.js, functions.php, themeoptions.php + - simplifications of the theme (deleting frames and rollover effect on thumbnails, size optimization of thumbnails and images) +- css/screen, css/light.css, inc_print_album_thumb.php, inc_print_image_thumb.php + - graphical improvements +- 404.php, album.php, archive.php, contact.php, favorites.php, gallery.php, image.php, password.php, register.php, search.php + - removal of the link to homepage +- 404.php, album.php, archive.php, contact.php, favorites.php, image.php, password.php, register.php, search.php + - simplifying the title breadcrumb (removal of the link to gallery) +- album.php, image.php + - uses improvements of printGalleryIndexURL() (https://github.com/zenphoto/zenphoto/issues/1000) +- album.php + - code cleanup (removal of javascript fallback to improve loading delay) +- inc_header.php + - code cleanup (remove of javascript fallback) + - code cleanup (optimization of main menu display) + - fix issue with favorites menu item + - fix issue with $galleryactive +- news.php + - uses printZenpageItemsBreadcrumb() rather than printNewsIndexURL() (https://github.com/zenphoto/zenphoto/issues/985) + - fix issue with readmorelink +- themeoptions.php + - fix issue with settings of "custom_index_page" option (now set to 'gallery') and "zenpage_homepage" option + + * 1.4.6 - colorbox_js/colorbox.css - upgrade custom css to be compliant with colorbox 1.5.2 diff --git a/contact.php b/contact.php index d5e555b..83f8a01 100644 --- a/contact.php +++ b/contact.php @@ -6,13 +6,7 @@
-

- - - - - - » 

+

diff --git a/css/light.css b/css/light.css index be6169f..bbf4771 100644 --- a/css/light.css +++ b/css/light.css @@ -64,21 +64,9 @@ div.news-cat-list { .news-cat-active { background: #bbb; } -div#album-wrap ul li a.album-thumb { - border: 1px solid #bbb; -} -div#album-wrap ul li a.album-thumb:hover { - border: 1px solid #444; -} #image-stat h4 { background: #bbb url(../images/hr_light.gif) repeat-x 0 100%; } -a.thumb, #image-stat a { - border: 1px solid #bbb; -} -a.thumb:hover, #image-stat a:hover { - border: 1px solid #444; -} #image img, #image a img { border: 0 solid #444; box-shadow: 2px 2px 9px #111; -moz-box-shadow: 2px 2px 9px #111; -webkit-box-shadow: 2px 2px 9px #111; @@ -121,6 +109,9 @@ div.pagination a:hover { color: #333; border-color: #b45e2c; } +ul.thumbs li.selected a.thumb { + border: 1px solid #bbb; +} table#archive h4 { border-bottom: 1px solid #666; } diff --git a/css/screen.css b/css/screen.css index 3d159a2..4f5c4d6 100644 --- a/css/screen.css +++ b/css/screen.css @@ -3,7 +3,7 @@ Theme Name: zpArdoise Theme URI: http://www.vincentbourganel.fr/news/zpArdoise-a-ZenPhoto-ZenPage-theme Author: Vincent3569 Author URI: http://www.vincentbourganel.fr -Version 1.4.6 +Version 1.4.13 */ /* --------- clear -----------*/ @@ -36,10 +36,7 @@ div#page { text-align: left; margin-right: auto; margin-left: auto; - border-radius: 0 0 10px 10px; - -moz-border-radius: 0 0 10px 10px; - -khtml-border-radius: 0 0 10px 10px; - -webkit-border-radius: 0 0 10px 10px; + border-radius: 0 0 10px 10px; -moz-border-radius: 0 0 10px 10px; -khtml-border-radius: 0 0 10px 10px; -webkit-border-radius: 0 0 10px 10px; } div#container { padding: 10px 20px; @@ -378,7 +375,7 @@ div#album-wrap ul { margin: 10px 0; padding: 0; } -div#album-wrap ul li { +div#album-wrap ul li:nth-of-type(n){ width: 273px; display: block; float: left; @@ -387,16 +384,14 @@ div#album-wrap ul li { list-style-type: none; background: none; } -div#album-wrap ul li.lastcol { +div#album-wrap ul li:nth-of-type(3n){ margin-right: 0; } +div#album-wrap ul li:nth-of-type(3n+1){ + clear:both; +} div#album-wrap ul li a.album-thumb { - padding: 2px; display: block; - border: 1px solid #4a4a4a; -} -div#album-wrap ul li a.album-thumb:hover { - border: 1px solid #ccc; } div#album-wrap ul li h4 { margin: 2px 0 0; @@ -424,33 +419,37 @@ ul.thumbs-nogal, ul.thumbs, #image-stat ul { margin: 0; padding: 0; } -ul.thumbs-nogal li { +ul.thumbs-nogal li:nth-of-type(n) { float: left; padding: 0; list-style: none; - margin: 5px 20px 15px 0; + margin: 5px 27px 22px 0; } -ul.thumbs-nogal li.no-gal-li-lastimg { +ul.thumbs-nogal li:nth-of-type(5n) { margin-right: 0; } +ul.thumbs-nogal li:nth-of-type(5n+1) { + clear:both; +} a.thumb, #image-stat a { - padding: 2px; display: block; - border: 1px solid #4a4a4a; -} -a.thumb:hover, #image-stat a:hover { - border: 1px solid #ccc; } ul#no-gal-ul, #image-stat ul { text-align: center; width: auto; margin: 0 auto 20px auto; } -#image-stat li { +#image-stat li:nth-of-type(n) { float: left; padding: 0; list-style: none; - margin: 0 8px 5px 8px; + margin: 0 20px 5px 0; +} +#image-stat li:nth-of-type(1){ + margin-left: 15px; +} +#image-stat li:last-of-type{ + margin-right:0; } #image-stat img { display: block; @@ -464,7 +463,7 @@ ul#no-gal-ul, #image-stat ul { #image img, #image a img { margin-top: 10px; border: 1px solid #4a4a4a; - box-shadow: 2px 2px 9px #111; -moz-box-shadow: 2px 2px 9px #111; -webkit-box-shadow: 2px 2px 9px #111; + box-shadow: 1px 1px 5px #111; -moz-box-shadow: 1px 1px 5px #111; -webkit-box-shadow: 1px 1px 5px #111; } #img-title { font-weight: bold; @@ -510,12 +509,12 @@ div#googlemap_data { #galleriffic-wrap { margin: 15px 0 0 0; overflow: hidden; - display: none; + display: block; } div.content { - display: none; + display: block; float: right; - width: 550px; + width: 580px; } div.controls { margin-top: 5px; @@ -551,7 +550,7 @@ div.ss-controls a:hover, div.nav-controls a:hover { div.slideshow-container { position: relative; clear: both; - height: 545px; /* This should be set to be at least the height of the largest image in the slideshow */ + height: 575px; /* This should be set to be at least the height of the largest image in the slideshow */ background: url(../images/hr.gif) repeat-x; } div.loader { @@ -559,8 +558,8 @@ div.loader { top: 0; left: 0; background: url(../images/loader.gif) no-repeat center; - width: 550px; - height: 545px; /* Same comment as above */ + width: 580px; + height: 575px; /* Same comment as above */ } div.slideshow {} span.image-wrapper { @@ -574,9 +573,9 @@ div.slideshow span.image-wrapper { } div.slideshow a.advance-link { display: block; - width: 550px; - height: 545px; /* Same comment as above */ - line-height: 545px; /* Same comment as above */ + width: 580px; + height: 575px; /* Same comment as above */ + line-height: 575px; /* Same comment as above */ text-align: center; } div.slideshow a.advance-link:hover, div.slideshow a.advance-link:active, div.slideshow a.advance-link:visited { @@ -585,7 +584,7 @@ div.slideshow a.advance-link:hover, div.slideshow a.advance-link:active, div.sli div.slideshow img { vertical-align: middle; border: 1px solid #4a4a4a; - box-shadow: 2px 2px 9px #111; -moz-box-shadow: 2px 2px 9px #111; -webkit-box-shadow: 2px 2px 9px #111; + box-shadow: 1px 1px 5px #111; -moz-box-shadow: 1px 1px 5px #111; -webkit-box-shadow: 1px 1px 5px #111; } div.caption-container { position: relative; @@ -596,7 +595,7 @@ span.image-caption { top: 0; left: 0; display: block; - width: 550px; + width: 580px; /*height: 25px;*/ } div.caption { @@ -614,16 +613,19 @@ div.caption div.image-title { letter-spacing: 1px; } div.caption div.image-desc {/*width: 290px; position: absolute; left: -310px; top: -100px;*/} -div.navigation {/* The navigation style is set using jQuery so that the javascript specific styles won't be applied unless javascript is enabled. */} +div.navigation { + width: 276px; + float: left; +} div.pagination { clear: both; } div.navigation div.top { - margin-bottom: 12px; - height: 11px; + margin-bottom: 25px; + height: 13px; } div.navigation div.bottom { - padding-top: 5px; + padding-top: 10px; } div.pagination a, div.pagination span.current { display: block; @@ -655,10 +657,13 @@ ul.thumbs li { float: left; padding: 0; list-style: none; - margin: 5px 10px 5px 0; + margin: 0 5px 5px 0; +} +ul.thumbs li a.thumb { + border: 1px solid transparent; } ul.thumbs li.selected a.thumb { - background: #ccc; + border: 1px solid #4a4a4a; } ul.thumbs img { display: block; @@ -678,7 +683,8 @@ div#post { margin: 0 30px 30px 30px; } div.news-truncate { - margin: 20px 0 30px 0; + margin: 20px 0 20px 0; + padding-bottom: 10px; border-bottom: 1px dotted #4a4a4a; } div.newsarticlecredit { @@ -706,6 +712,7 @@ div#post blockquote, div#news blockquote { } p.readmorelink { clear: both; + padding-top: 10px; } /* images on news and pages */ @@ -722,11 +729,11 @@ img.cadre { border: 1px solid #4a4a4a; } img.ombre { - box-shadow: 2px 2px 9px #111; -moz-box-shadow: 2px 2px 9px #111; -webkit-box-shadow: 2px 2px 9px #111; + box-shadow: 1px 1px 5px #111; -moz-box-shadow: 1px 1px 5px #111; -webkit-box-shadow: 1px 1px 5px #111; } img.ombreB { border: 1px solid #4a4a4a !important; - box-shadow: 2px 2px 9px #111; -moz-box-shadow: 2px 2px 9px #111; -webkit-box-shadow: 2px 2px 9px #111; + box-shadow: 1px 1px 5px #111; -moz-box-shadow: 1px 1px 5px #111; -webkit-box-shadow: 1px 1px 5px #111; } /*------------------------------------------------------------------------------ diff --git a/favorites.php b/favorites.php index dffa8bc..c4eef7d 100644 --- a/favorites.php +++ b/favorites.php @@ -4,13 +4,7 @@ ?>
-

- - - - - - » 

+

diff --git a/functions.php b/functions.php index 0e16a5d..32972de 100644 --- a/functions.php +++ b/functions.php @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/gallery.php b/gallery.php index 0cc9b6a..4a4e494 100644 --- a/gallery.php +++ b/gallery.php @@ -1,7 +1,7 @@
-

+

diff --git a/image.php b/image.php index 408c549..e1c9085 100644 --- a/image.php +++ b/image.php @@ -27,13 +27,7 @@
-

- - - - - - » 

+

diff --git a/inc_footer.php b/inc_footer.php index fd553a8..a41fb12 100644 --- a/inc_footer.php +++ b/inc_footer.php @@ -67,4 +67,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/inc_header.php b/inc_header.php index 2ae2386..9044ab0 100644 --- a/inc_header.php +++ b/inc_header.php @@ -73,11 +73,6 @@ //; @@ -246,38 +241,33 @@ function keyboardNavigation(e){
- +
diff --git a/news.php b/news.php index edc9e89..167dc4d 100644 --- a/news.php +++ b/news.php @@ -26,7 +26,7 @@
-

+

- + (...)

'); ?> diff --git a/password.php b/password.php index 0ba40d0..cc60baa 100644 --- a/password.php +++ b/password.php @@ -3,13 +3,7 @@
-

- - - - - - » 

+

diff --git a/readme.htm b/readme.htm index 1a018ca..1bfeba5 100644 --- a/readme.htm +++ b/readme.htm @@ -2,7 +2,7 @@ -zpArdoise 1.4.6 – a ZenPhoto/ZenPage theme +zpArdoise 1.4.13 – a ZenPhoto/ZenPage theme