promethee 1.6.33 → 1.6.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4477d1e9b6847139e7f97b6ade12f935e68766db
-  data.tar.gz: 5ba091543c580e90381b24fc376ee1307fd7bf41
+  metadata.gz: 6677b79bdc6728f864d8158b4f8e2401c941ae86
+  data.tar.gz: 633189433f5978110c405563d8bbb89ff0d45f2d
 SHA512:
-  metadata.gz: 0aa8b6faa11bca1a6be4590ff154adb9bfc8da42f39b138a9210c7f902be2a7dcbf845ab12cf234e7e5d77fe05532e8ce97f87465a20c0c05ad8a5d3b44ed6a6
-  data.tar.gz: 173a9f3eb00a0b30aaa0800541acde24b3ded27efb3a1eed757ad2a4d5629d438c6ccf96f1ea28ca3bdaf5efdb6dc657f95e81a31fe6c6ee8d2d23bd01d14dd3
+  metadata.gz: c5161cc7bc9c045e23e71bc0221c7e734386e87e469cf5cd753e338f8820a7abcf0ddc69489703249542aa0ce400a3f7f897a5237595b25ccb7b1bbc019e177d
+  data.tar.gz: dad1d243cda3b3ea5a208dad974d6e6aefda731d6aa54549d53fb7b2ba6a89b804b2ae67da93974224c812afd3ef7bef0807a3ad2dff1366d21aeae01838481b

data/app/assets/javascripts/promethee.js

@@ -2,3 +2,5 @@
 //= require angular-ui-sortable/dist/sortable
 //= require ng-file-upload/dist/ng-file-upload
 //= require angular-bootstrap-colorpicker/js/bootstrap-colorpicker-module
+//= require fancybox/dist/js/jquery.fancybox
+//= require promethee/fancybox

data/app/assets/javascripts/promethee/fancybox.js

@@ -0,0 +1,3 @@
+$(document).ready(function() {
+  $("a.fancybox").fancybox();
+});

data/app/assets/stylesheets/promethee.sass

@@ -1,3 +1,5 @@
+@import fancybox/dist/css/jquery.fancybox
+
 .promethee
   &__component
     &__cover

data/app/views/promethee/components/collection_item/_show.html.erb

@@ -1,4 +1,5 @@
 <%
+searchable_caption = component[:attributes][:searchable_caption]
 media_type = component[:attributes][:media_type]
 case media_type
 when 'image'
@@ -26,7 +27,7 @@ end
     <iframe frameborder="0" webkitallowfullscreen="" mozallowfullscreen="" allowfullscreen="allowfullscreen" src="<%= iframe_src %>"></iframe>
   </div>
   <% elsif image_blob.present? %>
-  <%= render 'promethee/show/image.srcset', blob: image_blob, alt: '' %>
+  <%= render 'promethee/show/image.srcset', blob: image_blob, alt: '', caption: searchable_caption %>
   <% end %>
-  <%= component[:attributes][:searchable_caption].to_s.html_safe %>
+  <%= searchable_caption.to_s.html_safe %>
 </div>

data/app/views/promethee/components/image/_show.html.erb

@@ -8,7 +8,7 @@ searchable_alt = component[:attributes][:searchable_alt].to_s
 searchable_caption = component[:attributes][:searchable_caption].to_s
 %>
 <figure class="<%= promethee_class_for component %>">
-  <%= render 'promethee/show/image.srcset', blob: blob, alt: searchable_alt if blob %>
+  <%= render 'promethee/show/image.srcset', blob: blob, alt: searchable_alt, caption: searchable_caption if blob %>
   <% unless searchable_caption.blank? %>
     <figcaption>
       <%= searchable_caption %>

data/app/views/promethee/components/slider/_localize.html.erb

@@ -1,18 +1,2 @@
 <script type="text/ng-template" id="promethee/components/slider/localize">
-  <div ng-show="(component.master.attributes.contents | json) !== '{}'">
-    <hr>
-
-    <div ng-repeat="(key, content) in component.master.attributes.contents">
-      <div class="row">
-        <div class="col-md-6">
-          <b>Item {{$index + 1}} Text</b>
-          <div class="promethee-edit__wrapper" ng-bind-html="component.master.attributes.contents[key] | htmlSafe"></div>
-        </div>
-        <div class="col-md-6">
-          <label class="label-control">Item {{$index + 1}} Text</label>
-          <summernote config="summernoteConfig" ng-model="component.attributes.contents[key]"></summernote>
-        </div>
-      </div>
-    </div>
-  </div>
 </script>

data/app/views/promethee/components/slider_item/_show.html.erb

@@ -1,5 +1,6 @@
 <%
 media_type = component[:attributes][:media_type]
+searchable_caption = component[:attributes][:searchable_caption]
 case media_type
 when 'image'
   image_data = component[:attributes][:image]
@@ -26,7 +27,7 @@ end
     <iframe frameborder="0" webkitallowfullscreen="" mozallowfullscreen="" allowfullscreen="allowfullscreen" src="<%= iframe_src %>"></iframe>
   </div>
   <% elsif image_blob.present? %>
-  <%= render 'promethee/show/image.srcset', blob: image_blob, alt: '' %>
+  <%= render 'promethee/show/image.srcset', blob: image_blob, alt: '', caption: searchable_caption %>
   <% end %>
-  <%= component[:attributes][:searchable_caption].to_s.html_safe %>
+  <%= searchable_caption.to_s.html_safe %>
 </div>

data/app/views/promethee/show/_image.srcset.html.erb

@@ -1,10 +1,13 @@
-<img  src="<%= url_for(blob.variant(resize: '1920')) %>"
-      srcset="
-        <% [1920, 1600, 1440, 1366, 1280, 1024, 800, 768, 640, 360, 200].each do |size| %>
-          <%= url_for(blob.variant(resize: size, quality: 95)) %> <%= size%>w,
-        <% end %>
-      "
-      sizes="100vw"
-      alt="<%= alt.html_safe %>"
-      class="img-responsive"
-      >
+<% fullsize_url = url_for(blob.variant(resize: '1920')) %>
+<a class="fancybox" title="<%= strip_tags(caption) %>" href="<%= fullsize_url %>">
+  <img src="<%= fullsize_url %>"
+        srcset="
+          <% [1920, 1600, 1440, 1366, 1280, 1024, 800, 768, 640, 360, 200].each do |size| %>
+            <%= url_for(blob.variant(resize: size, quality: 95)) %> <%= size%>w,
+          <% end %>
+        "
+        sizes="100vw"
+        alt="<%= alt.html_safe %>"
+        class="img-responsive"
+        >
+</a>

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '1.6.33'
+    VERSION = '1.6.34'
   end
 end

data/node_modules/fancybox/CHANGELOG.md

@@ -0,0 +1,125 @@
+fancyBox - Changelog
+=========
+
+### Version 2.1.5 - June 14, 2013
+* Fixed #493 - Broken slideshow
+* Fixed #556 - Parent option
+* Retina graphics (#564) and retina display support (#420)
+* Improved "lock" feature
+
+### Version 2.1.4 - January 10, 2013
+* Update to be compatible with jQuery v1.9
+* Small changes that should fix usability issues for certain users
+
+### Version 2.1.3 - October 23, 2012
+
+* Fixed #426 - Broken IE7
+* Fixed #423 - Background flickering on iOS
+* Fixed #418 - Automatically Grow/Shrink and Center
+* Updated the script to work with jQuery 1.6
+* Media helper supports YouTube video series
+
+### Version 2.1.2 - October 15, 2012
+
+* Fixed #414 - Don't allow nextClick if there is only one item
+* Fixed #397 - Button helper 'Menu' not visible in IE7
+* Overlay can be opened/closed manually:
+*     $.fancybox.helpers.overlay.open();
+*     $.fancybox.helpers.overlay.open({closeClick : false});
+*     $.fancybox.helpers.overlay.close();
+* Optimized for Internet Explorer 10 (Windows 8)
+
+### Version 2.1.1 - October 01, 2012
+
+* Fixed #357 - Converting values like 'auto' in getScalar()
+* Fixed #358 - Updated overlay background image
+* New "fancybox-href" and "fancybox-title" HTML5 data-attributes (#317)
+* Improved helpers:
+*     - now they can have a property 'defaults' that contains default settings
+*     - updated vimeo and youtube parsers for media helper
+* Content locking now can be turned off
+
+### Version 2.1.0 - August 20, 2012
+
+* Fixed #103 - DOM element re-injection after closing
+* Fixed #188 - navigation keys inside editable content
+* New animation directions (see https://github.com/fancyapps/fancyBox/issues/233#issuecomment-5512453)
+* New option "iframe" - it is now possible to separate scrolling for iframe and wrapping element; choose to preload
+* New option "swf" - brings back functionality from fancyBox v1
+* Improved media helper - better support for vimeo and youtube; links are now configurable
+* Rewritten overlay helper:
+*     - new option "showEarly" - toggles if should be open before of after content is loaded
+*     - Facebook-style (https://github.com/fancyapps/fancyBox/issues/24) and therefore uses image for background
+* Option "padding" accepts array (e.g., padding: [15, 50, 10, 5])
+* One of dimensions (width or height) can now be set to "auto" (option "autoSize" needs to be "false")
+* Updated callbacks:
+*     - "beforeClose" is now called only once
+*     - "afterLoad" receives current and previous object as arguments
+* Method "$.fancybox.update();" recalculates content width/height
+* Updated to work with jQuery v1.8
+
+### Version 2.0.6 - April 16, 2012
+
+* Fixed #188 - keystrokes in contenteditable
+* Fixed #171 - non-images should not be preloaded
+* Fixed #158 - 'closeClick: true' breaks gallery navigation
+* New "media" helper - detects and displays various media types
+* New option "groupAttr" - name of group selector attribute, default is "data-fancybox-group"
+* New feature - selector expressions in URLs, see #170
+* Improved 'overlay' helper to use "position: fixed"
+* Improved autoSize, fixed wrong height in some cases
+* Improved centering and iframe scrolling for iOS
+* Updated markup, new element '.fancybox-skin' is now used for styling
+
+### Version 2.0.5 - February 21, 2012
+
+* Fixed #155 - easing for prev/next animations
+* Fixed #153 - overriding "keys" options
+* Fixed #147 - IE7 problem with #hash links
+* Fixed #130 - changing dynamically data-fancybox-group
+* Fixed #126 - obey minWidth/minHeight
+* Fixed #118 - placement of loading icon and navigation arrows
+* Fixed #101 - "index" option not working
+* Fixed #94 - "orig" option not working
+* Fixed #80 - does not work on IE6
+* Fixed #72 - can't set overlay opacity to 0
+* Fixed #63 - properly set gallery index
+* New option "autoCenter" - toggles centering on window resize or scroll, disabled for mobile devices by default
+* New option "autoResize" - toggles responsivity, disabled for mobile devices by default
+* New option "preload" - number of images to preload
+* New feature to target mobile/desktop browsers using CSS, see #108
+* Changed ajax option defaults to "{ dataType: 'html', headers: { 'X-fancyBox': true } }", see #150 and #128
+* Updated loading icon for IE7, IE8
+* Calculates height of the iframe if 'autoSize' is set to 'true' and the iframe is on the same domain as the main page
+
+### Version 2.0.4 - December 12, 2011
+
+* Fixed #47 - fix overriding properties
+* New option "position" to thumbnail and button helpers
+
+
+### Version 2.0.3 - November 29, 2011
+
+* Fixed #29 - broken elastic transitions
+
+
+### Version 2.0.2 - November 28, 2011
+
+* Fixed slideshow
+* Fixed scrollbars issue when displayed a very tall image
+* New option "nextClick" - navigate to next gallery item when user clicks the content
+* New option "modal" - to disable navigation and closing
+* Add 'metadata' plugin support
+* Add ability to create groups using 'data-fancybox-group' attribute
+* Updated manual usage to match earlier releases
+
+
+### Version 2.0.1 - November 23, 2011
+
+* Fixed keyboard events inside form elements
+* Fixed manual usage
+
+
+### Version 2.0.0 - November 21, 2011
+
+First release - completely rewritten, many new features and updated graphics.

data/node_modules/fancybox/README.md

@@ -0,0 +1,249 @@
+fancyBox (deprecated)
+========
+
+**WARNING: This fork is deprecated. Please head over to https://www.npmjs.com/package/@fancyapps/fancybox for the official version**
+
+fancyBox is a tool that offers a nice and elegant way to add zooming functionality for images, html content and multi-media on your webpages.
+
+More information and examples: http://www.fancyapps.com/fancybox/
+
+License: http://www.fancyapps.com/fancybox/#license
+
+Copyright (c) 2012 Janis Skarnelis - janis@fancyapps.com
+
+##Npm specific
+\*\* NOTE: I didn't realize npm's limitations on versioning.  They only allow three numbers.  At first I was aiming to keep the versioning equal to fancybox's, but this is no longer possible without deleting the repo and starting over.  You can find the fancybox version this repo uses in either package.json's "original-version" property, or in a browser console by running: $.fancybox.version.
+
+Install
+```
+npm install fancybox --save-dev
+```
+
+Example usage
+```
+// home.html
+<div class="fancybox-me"><h2>Ain't this a fancy box?</h2></div>
+
+// main.js (1)
+var $ = require('jquery');
+require('fancybox')($); <------- (2)
+
+$(document).ready(function() {
+    $.fancybox.open($('.fancybox-me'));
+});
+```
+(1) Make sure your html file is referencing the browserified version of your javascript.  
+(2) This is where fancybox attaches itself to the jquery object.
+
+Please visit [the official site](http://fancyapps.com/fancybox/) for more info.  Their official github repository [can also be found here](https://github.com/fancyapps/fancyBox).
+
+###New structure of asset files (css/img/scss)
+When turning this into an npm module I decided to standardize the structure a bit.  Before fancybox relied on all asset files residing in the same directory.  Now if you were to reference the css directly, it expects the images to be relatively located at the '../img' directory.  For those unfamiliar, this structure makes more sense because css files _should_ be all concatenated and minified while images won't be.  This means typically you'll want your css in a separate folder.  However, if this doesn't work with your existing structure then you'll have to change the paths manually.  If you opt to reference the scss instead of the css file, then you have the option of modifying the sass variable '$fancybox-image-url' to match your image folder path.  By default this path will be set to '../img'.  (Note the lack of a trailing slash)
+
+#Note: Below is the previous documentation as seen on their official github repository
+
+How to use
+----------
+
+To get started, download the plugin, unzip it and copy files to your website/application directory.
+Load files in the <head> section of your HTML document. Make sure you also add the jQuery library.
+
+    <head>
+        <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>
+        <link rel="stylesheet" href="/fancybox/jquery.fancybox.css" type="text/css" media="screen" />
+        <script type="text/javascript" src="/fancybox/jquery.fancybox.pack.js"></script>
+    </head>
+
+Create your links with a `title` if you want a title to be shown, and add a class:
+
+    <a href="large_image.jpg" class="fancybox" title="Sample title"><img src="small_image.jpg" /></a>
+
+If you have a set of related items that you would like to group,
+additionally include a group name in the `rel` (or `data-fancybox-group`) attribute:
+
+    <a href="large_1.jpg" class="fancybox" rel="gallery" title="Sample title 1"><img src="small_1.jpg" /></a>
+    <a href="large_2.jpg" class="fancybox" rel="gallery" title="Sample title 1"><img src="small_2.jpg" /></a>
+
+Initialise the script like this:
+
+    <script>
+        $(document).ready(function() {
+            $('.fancybox').fancybox();
+        });
+    </script>
+
+May also be passed an optional options object which will extend the default values. Example:
+
+    <script>
+        $(document).ready(function() {
+            $('.fancybox').fancybox({
+                padding : 0,
+                openEffect  : 'elastic'
+            });
+        });
+    </script>
+
+Tip: Automatically group and apply fancyBox to all images:
+
+    $("a[href$='.jpg'],a[href$='.jpeg'],a[href$='.png'],a[href$='.gif']").attr('rel', 'gallery').fancybox();
+
+Script uses the `href` attribute of the matched elements to obtain the location of the content and to figure out content type you want to display.
+You can specify type directly by adding classname (fancybox.image, fancybox.iframe, etc) or `data-fancybox-type` attribute:
+
+    //Ajax:
+    <a href="/example.html" class="fancybox fancybox.ajax">Example</a>
+    //or
+    <a href="/example.html" class="fancybox" data-fancybox-type="ajax">Example</a>
+
+    //Iframe:
+    <a href="example.html" class="fancybox fancybox.iframe">Example</a>
+
+    //Inline (will display an element with `id="example"`)
+    <a href="#example" class="fancybox">Example</a>
+
+    //SWF:
+    <a href="example.swf" class="fancybox">Example</a>
+
+    //Image:
+    <a href="example.jpg" class="fancybox">Example</a>
+
+Note, ajax requests are subject to the [same origin policy](http://en.wikipedia.org/wiki/Same_origin_policy).
+If fancyBox will not be able to get content type, it will try to guess based on 'href' and will quit silently if would not succeed.
+(this is different from previsous versions where 'ajax' was used as default type or an error message was displayed).
+
+Advanced
+--------
+
+### Helpers
+
+Helpers provide a simple mechanism to extend the capabilities of fancyBox. There are two built-in helpers - 'overlay' and 'title'.
+You can disable them, set custom options or enable other helpers. Examples:
+
+    //Disable title helper
+    $(".fancybox").fancybox({
+        helpers:  {
+            title:  null
+        }
+    });
+
+    //Disable overlay helper
+    $(".fancybox").fancybox({
+        helpers:  {
+            overlay : null
+        }
+    });
+
+    //Change title position and overlay color
+    $(".fancybox").fancybox({
+        helpers:  {
+            title : {
+                type : 'inside'
+            },
+            overlay : {
+                css : {
+                    'background' : 'rgba(255,255,255,0.5)'
+                }
+            }
+        }
+    });
+
+    //Enable thumbnail helper and set custom options
+    $(".fancybox").fancybox({
+        helpers:  {
+            thumbs : {
+                width: 50,
+                height: 50
+            }
+        }
+    });
+
+
+### API
+
+Also available are event driven callback methods.  The `this` keyword refers to the current or upcoming object (depends on callback method). Here is how you can change title:
+
+    $(".fancybox").fancybox({
+        beforeLoad : function() {
+            this.title = 'Image ' + (this.index + 1) + ' of ' + this.group.length + (this.title ? ' - ' + this.title : '');
+
+            /*
+                "this.element" refers to current element, so you can, for example, use the "alt" attribute of the image to store the title:
+                this.title = $(this.element).find('img').attr('alt');
+            */
+        }
+    });
+
+It`s possible to open fancyBox programmatically in various ways:
+
+    //HTML content:
+    $.fancybox( '<div><h1>Lorem Lipsum</h1><p>Lorem lipsum</p></div>', {
+        title : 'Custom Title'
+    });
+
+    //DOM element:
+    $.fancybox( $("#inline"), {
+        title : 'Custom Title'
+    });
+
+    //Custom object:
+    $.fancybox({
+        href: 'example.jpg',
+        title : 'Custom Title'
+    });
+
+    //Array of objects:
+    $.fancybox([
+        {
+            href: 'example1.jpg',
+            title : 'Custom Title 1'
+        },
+        {
+            href: 'example2.jpg',
+            title : 'Custom Title 2'
+        }
+    ], {
+        padding: 0
+    });
+
+There are several methods that allow you to interact with and manipulate fancyBox, example:
+
+    //Close fancybox:
+    $.fancybox.close();
+
+There is a simply way to access wrapping elements using JS:
+
+    $.fancybox.wrap
+    $.fancybox.skin
+    $.fancybox.outer
+    $.fancybox.inner
+
+You can override CSS to customize the look. For example, make navigation arrows always visible,
+change width and move them outside of area (use this snippet after including fancybox.css):
+
+    .fancybox-nav span {
+        visibility: visible;
+    }
+
+    .fancybox-nav {
+        width: 80px;
+    }
+
+    .fancybox-prev {
+        left: -80px;
+    }
+
+    .fancybox-next {
+        right: -80px;
+    }
+
+In that case, you might want to increase space around box:
+
+    $(".fancybox").fancybox({
+        margin : [20, 60, 20, 60]
+    });
+
+
+Bug tracker
+-----------
+
+Have a bug? Please create an issue on GitHub at https://github.com/fancyapps/fancyBox/issues