Skip to content

Commit

Permalink
v4.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Kris-B committed Mar 6, 2014
1 parent 6c3da3b commit da2da43
Show file tree
Hide file tree
Showing 15 changed files with 1,305 additions and 395 deletions.
32 changes: 15 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,35 +76,33 @@ Visit the demonstration page for some usefull code samples and to test online so
- [list of images passed to the script (API)](http://jsfiddle.net/Kris_B/gvauS/)


Usage (v4.1)
Usage (v4.2)
-----


### Include JS and CSS files


``` HTML
<!-- Add jQuery library (mandatory) -->
<script type="text/javascript" src="third.party/jquery-1.8.2.min.js"></script>
<!-- Add jQuery library (MANDATORY) -->
<script type="text/javascript" src="third.party/jquery-1.7.1.min.js"></script>

<!-- Add Transit plugin (optional - this is only required for some hover effects) -->
<!-- Add Transit plugin (OPTIONAL - this is only required for some hover effects) -->
<script type="text/javascript" src="third.party/transit/jquery.transit.min.js"></script>

<!-- Add Hammer.js plugin (optional - this is only required for gesture support) -->
<!-- Add Hammer.js plugin (OPTIONAL - this is only required for gesture support) -->
<script type="text/javascript" src="third.party/hammer.js/hammer.min.js"></script>

<!-- Add imagesloaded.js plugin (optional - this is only required for parameter thumbnailHeight:'auto') -->
<!-- Add imagesloaded.js plugin (OPTIONAL - this is only required for parameter thumbnailHeight:'auto') -->
<script type="text/javascript" src="third.party/imagesloaded/imagesloaded.pkgd.min.js"></script>

<!-- Add nanoGALLERY plugin files (mandatory) -->
<!-- Add nanoGALLERY plugin files (MANDATORY) -->
<link href="css/nanogallery.css" rel="stylesheet" type="text/css">
<script type="text/javascript" src="jquery.nanogallery.js"></script>

```

Note 1: If you already use jQuery on your site, do not include it a second time.

Note 2: If you specify a theme, the corresponding css file must also be included.
Note: If you specify a theme, the corresponding css file must also be included.


### Method 1: use one Flickr account
Expand Down Expand Up @@ -145,7 +143,7 @@ $(document).ready(function () {
jQuery("#nanoGallery2").nanoGallery({
kind:'picasa',
userID:'[email protected]',
blackList:'Scrapbook|forhomepage|profil'
blackList:'Scrapbook|forhomepage|profil'
});
});
```
Expand Down Expand Up @@ -229,7 +227,7 @@ Syntax and options
| *string; Default: `internal`*
**thumbnailLabel** | Display options for the image label (title and description)
| *object; Default: `{position:'overImageOnBottom',display:true,displayDescription:true}`*
| **position** : Position of the label (possible values: `overImageOnBottom`, `overImageOnTop`, `onBottom`)
| **position** : Position of the label (possible values: `overImageOnBottom`, `overImageOnTop`, `overImageOnMiddle`, `onBottom`)
| *string; Default: `overImageOnBottom`*
| **display** : Display or not the label.
| *Boolean; Default: `true`*
Expand All @@ -239,7 +237,7 @@ Syntax and options
| *string, object, array; Default: `none`*
| Possible values: `slideUp`, `slideDown`, `slideLeft`, `slideRight`, `imageSlideUp`, `imageSlideDown`, `imageSlideLeft`, `imageSlideRight`, `labelAppear`, `labelAppear75`, `labelSlideDown`, `labelSlideUp`, `labelOpacity50`, `imageOpacity50`, `borderLighter`, `borderDarker`, `imageInvisible`, `descriptionSlideUp`
| Transit plugin is required for following values: `imageScale150`, `imageScale150Outside`, `scale120`, `overScale`, `overScaleOutside`, `scaleLabelOverImage`, `rotateCornerBR`, `rotateCornerBL`, `imageRotateCornerBR`, `imageRotateCornerBL`, `imageFlipHorizontal`, `imageFlipVertical`
**theme** | Name of the theme - the corresponding css-file must also be included in the html file (Possible values: `default`, `clean`)
**theme** | Name of the theme - the corresponding css-file must also be included in the html file (Possible values: `default`, `clean`, `light`)
| *string; Default: `default`*
**itemsBaseURL** | URL prefix for the images defined with method#1 or method#2
| *string*
Expand Down Expand Up @@ -394,7 +392,7 @@ The language defined in the browser is used. If no corresponding definition is f

### Internationalization of UI elements

Following elements support multi-language: `breadcrumbHome` `paginationPrevious` `paginationNext`.
Following elements support multi-language: `breadcrumbHome` `paginationPrevious` `paginationNext` `thumbnailImageTitle` `thumbnailAlbumTitle` `thumbnailImageDescription` `thumbnailAlbumDescription`.
Set the correponding i18n properties. Use _LanguageCode to specify one language.

Example:
Expand Down Expand Up @@ -446,7 +444,7 @@ This apply only to Flickr/Picasa/Google+.
To activate it, include following JS file:

``` HTML
<!-- Add jsonp plugin (optional - affects only the usage of Flickr, Google+ or Picasa) -->
<!-- Add jsonp plugin (OPTIONAL - affects only the usage of Flickr, Google+ or Picasa) -->
<script type="text/javascript" src="third.party/jquery-jsonp/jquery.jsonp.js"></script>
``` HTML

Expand Down Expand Up @@ -476,8 +474,8 @@ $(document).ready(function () {
jQuery("#nanoGallery2").nanoGallery({
kind:'picasa',
userID:'[email protected]',
blackList:'Scrapbook|forhomepage|profil',
viewer:'fancybox'
blackList:'Scrapbook|forhomepage|profil',
viewer:'fancybox'
});
});
```
Expand Down
23 changes: 19 additions & 4 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,25 @@ nanoGALLERY - jQuery plugin
ChangeLog
------

v4.2.1
------

##### New features:
- global photo/album title and description
- new label position `overImageOnMiddle`
- new theme `light` (optimized for light backgrounds)


##### New options:
- **i18n**: new elements `thumbnailImageTitle` `thumbnailAlbumTitle` `thumbnailImageDescription` `thumbnailAlbumDescription`.
- **thumbnailLabel**: new possible value `{position:'overImageOnMiddle'}

##### Deprecated options:
- none

##### Misc
- bug **mouse click outside gallery not working** - fixed


v4.2.0
------
Expand All @@ -29,8 +48,6 @@ v4.2.0
| *integer|auto*


**See readme.md for usage details**

##### Deprecated options:
- none

Expand Down Expand Up @@ -71,8 +88,6 @@ v4.1.0
* `thumbnailLazyLoadTreshold`: extend the viewport area for thumbnails image lazy load
* `i18n`: UI string translations

**See readme.md for usage details**

##### Outdated options:
* `topLabel`: replaced by i18n

Expand Down
3 changes: 2 additions & 1 deletion css/nanogallery.css
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,8 @@
/**************************************/

.nanogallery_theme_default .nanoGalleryContainerParent .nanoGalleryPagination{
margin: 10px auto 5px auto;
color:#eee;
margin: 10px auto 5px auto;
padding: 4px;
text-align:center;
position: relative;
Expand Down
3 changes: 2 additions & 1 deletion css/themes/clean/nanogallery_clean.css
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@
/**************************************/

.nanogallery_theme_clean .nanoGalleryContainerParent .nanoGalleryPagination{
color:#eee;
margin: 10px auto 5px auto;
padding: 4px;
text-align:center;
Expand Down Expand Up @@ -531,7 +532,7 @@
-moz-box-sizing: content-box;
-o-box-sizing: content-box;
}
.nanogallery_theme_default .nanoGalleryViewer .content .imgCurrent{
.nanogallery_theme_clean .nanoGalleryViewer .content .imgCurrent{
cursor:pointer;
}
.nanogallery_theme_clean .nanoGalleryViewer .content .contentAreaPrevious {
Expand Down
Binary file added css/themes/light/font/nano_icon_font.eot
Binary file not shown.
Loading

0 comments on commit da2da43

Please sign in to comment.