imagine_cms 3.0.28 → 3.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b0da21ae3d912e76bf2f0cc1f8d440a3bdd1f59
-  data.tar.gz: 7f17ed79a2c4176c47fd5ebd8bef128256017dc3
+  metadata.gz: 24219ad930d053e256b11501afe2189d3fd4a44f
+  data.tar.gz: dedcf2149c2a402048ae961a847754bba65a32b0
 SHA512:
-  metadata.gz: 43b675abb58a61b18c6c357fffba7fe3c124faeccdb917e653f634ed4641a411924e0678f7d97fe79487907c1d9848de187853da681dd39ca165a4b26bbd7fe7
-  data.tar.gz: 6828f401fc8713894bbfe52b5edbc3d184203e7cc8a5458bca3e8756146975dc954535a1120233b5c60f683b5f2b3b8d20c6281473da5673f9b1c071979e7aeb
+  metadata.gz: 5de4d279f700dc368a8de1c752e0716c49d3be1db81e7991fc971800dcc80eddc7e47f3c3b41e5e5022cc9dad4b16faa13ee66d9ae1fa8b91bd33c7348656e6a
+  data.tar.gz: ab20fd03d5344e17614193e6b70155d575328b8b3e3a1ea16dc7bf40420acff6768c39d0a64fff7d27c04957f1fb5a789966a025bbfef6ef0b32e49ea41f1023

data/app/assets/javascripts/imagine.js

@@ -720,37 +720,39 @@ function changeGalleryImage(galleryName, index) {
     var target = galleryName + '_image_' + index;
     var caption = galleryName + '_caption_' + index;
     if (!$(target)) return false;
-    
+
     var queue = Effect.Queues.get('global');
     queue.each(function(e) { e.cancel() });
-    
+
     for (var i = 0; i < gallerySize[galleryName]; i++) {
         el = $(galleryName + '_image_' + i);
         if (el.id != target && el.style.display != 'none') Effect.Fade(el, { duration: 0.6 });
-        
+
         el = $(galleryName + '_thumb_' + i);
         if (el) {
             if (i == index) {
-                el.style.borderColor = 'white';
+                el.oldOnmouseover = el.onmouseover;
+                el.oldOnmouseout = el.onmouseout;
                 el.onmouseover = null;
                 el.onmouseout = null;
+                el.addClassName('current');
             } else {
-                el.style.borderColor = '#6B6B6B';
-                el.onmouseover = function () { this.style.borderColor = 'white' };
-                el.onmouseout = function () { this.style.borderColor = '#6B6B6B' };
+                el.removeClassName('current');
+                if (!el.onmouseover) el.onmouseover = el.oldOnmouseover;
+                if (!el.onmouseout) el.onmouseout = el.oldOnmouseout;
             }
         }
     }
-    
+
     Effect.Appear(target, { duration: 0.6 });
-    
+
     if($(caption).innerHTML != '') {
         $(galleryName + '_caption').style.display = 'block';
         $(galleryName + '_caption').innerHTML = $(caption).innerHTML;
     } else {
         $(galleryName + '_caption').style.display = 'none';
     }
-    
+
     prevIndex = index == 0 ? gallerySize[galleryName] - 1 : index-1;
     nextIndex = index == gallerySize[galleryName] - 1 ? 0 : index+1;
     $(galleryName + '_prev_button').onclick = function () { changeGalleryImage(galleryName, prevIndex) };

data/app/assets/stylesheets/cropper.css

@@ -1,3 +1,19 @@
+/* obsolete -- use imagine_cms.css */
+
+.slideshow { padding: 10px 10px 5px; background-color: #d8d6cd; }
+.slideshow-images { width: 100%; height: 340px; margin: 15px auto; }
+.slideshow-image { width: 450px; height: 340px; position: absolute; }
+.slideshow-thumbs { margin-top: 20px; }
+.slideshow-thumb { float: left; border: 5px solid #fff; margin: 0 5px 5px 0; cursor: pointer; }
+.slideshow-nav { width: 243px; margin: 0 auto; }
+.slideshow-nav-button { cursor: pointer; color: white; }
+.slideshow-caption {
+  width: 100%; height: 80px; margin: 0 auto 40px; overflow: auto;
+  font-size: 14px; line-height: 18px; padding: 0; text-align: center; color: #fff;
+}
+.slideshow-close { position: absolute; top: -20px; right: -20px; }
+.slideshow cite { font-size: 140%; text-transform: uppercase; font-style: normal; font-weight: bold; color: #F17130; }
+
 .imgCrop_wrap {
 	/* width: 500px;   @done_in_js */
 	/* height: 375px;  @done_in_js */

data/app/assets/stylesheets/imagine_cms.css

@@ -0,0 +1,196 @@
+.slideshow { padding: 10px 10px 5px; background-color: #d8d6cd; }
+.slideshow-images { width: 100%; height: 340px; margin: 15px auto; }
+.slideshow-image { width: 450px; height: 340px; position: absolute; }
+.slideshow-thumbs { margin-top: 20px; }
+.slideshow-thumb { float: left; border: 5px solid #fff; margin: 0 5px 5px 0; cursor: pointer; }
+.slideshow-nav { width: 243px; margin: 0 auto; }
+.slideshow-nav-button { cursor: pointer; color: white; }
+.slideshow-caption {
+  width: 100%; height: 80px; margin: 0 auto 40px; overflow: auto;
+  font-size: 14px; line-height: 18px; padding: 0; text-align: center; color: #fff;
+}
+.slideshow-close { position: absolute; top: -20px; right: -20px; }
+.slideshow cite { font-size: 140%; text-transform: uppercase; font-style: normal; font-weight: bold; color: #F17130; }
+
+.imgCrop_wrap {
+	/* width: 500px;   @done_in_js */
+	/* height: 375px;  @done_in_js */
+	position: relative;
+	cursor: crosshair;
+}
+
+/* an extra classname is applied for Opera < 9.0 to fix it's lack of opacity support */
+.imgCrop_wrap.opera8 .imgCrop_overlay,
+.imgCrop_wrap.opera8 .imgCrop_clickArea { 
+	background-color: transparent;
+}
+
+/* fix for IE displaying all boxes at line-height by default, although they are still 1 pixel high until we combine them with the pointless span */
+.imgCrop_wrap,
+.imgCrop_wrap * {
+	font-size: 0;
+}
+
+.imgCrop_overlay {
+	background-color: #000;
+	opacity: 0.5;
+	filter:alpha(opacity=50);
+	position: absolute;
+	width: 100%;
+	height: 100%;
+}
+
+.imgCrop_selArea {
+	position: absolute;
+	/* @done_in_js 
+	top: 20px;
+	left: 20px;
+	width: 200px;
+	height: 200px;
+	background: transparent url(castle.jpg) no-repeat  -210px -110px;
+	*/
+	cursor: move;
+	z-index: 2;
+}
+
+/* clickArea is all a fix for IE 5.5 & 6 to allow the user to click on the given area */
+.imgCrop_clickArea {
+	width: 100%;
+	height: 100%;
+	background-color: #FFF;
+	opacity: 0.01;
+	filter:alpha(opacity=01);
+}
+
+.imgCrop_marqueeHoriz {
+	position: absolute;
+	width: 100%;
+	height: 1px;
+	background: transparent url(/assets/cropper/marqueeHoriz.gif) repeat-x 0 0;
+	z-index: 3;
+}
+
+.imgCrop_marqueeVert {
+	position: absolute;
+	height: 100%;
+	width: 1px;
+	background: transparent url(/assets/cropper/marqueeVert.gif) repeat-y 0 0;
+	z-index: 3;
+}
+
+/* 
+ *  FIX MARCHING ANTS IN IE
+ *	As IE <6 tries to load background images we can uncomment the follwoing hack 
+ *  to remove that issue, not as pretty - but is anything in IE?
+ *  And yes I do know that 'filter' is evil, but it will make it look semi decent in IE
+ *
+* html .imgCrop_marqueeHoriz,
+* html .imgCrop_marqueeVert {
+	background: transparent;
+	filter: Invert; 
+}
+* html .imgCrop_marqueeNorth { border-top: 1px dashed #000; }
+* html .imgCrop_marqueeEast  { border-right: 1px dashed #000; }
+* html .imgCrop_marqueeSouth { border-bottom: 1px dashed #000; }
+* html .imgCrop_marqueeWest  { border-left: 1px dashed #000; }
+*/
+
+.imgCrop_marqueeNorth { top: 0; left: 0; }
+.imgCrop_marqueeEast  { top: 0; right: 0; }
+.imgCrop_marqueeSouth { bottom: 0px; left: 0; }
+.imgCrop_marqueeWest  { top: 0; left: 0; }
+
+
+.imgCrop_handle {
+	position: absolute;
+	border: 1px solid #333;
+	width: 6px;
+	height: 6px;
+	background: #FFF;
+	opacity: 0.5;
+	filter:alpha(opacity=50);
+	z-index: 4;
+}
+
+/* fix IE 5 box model */
+* html .imgCrop_handle {
+	width: 8px;
+	height: 8px;
+	wid\th: 6px;
+	hei\ght: 6px;
+}
+
+.imgCrop_handleN {
+	top: -3px;
+	left: 0;
+	/* margin-left: 49%;    @done_in_js */
+	cursor: n-resize;
+}
+
+.imgCrop_handleNE { 
+	top: -3px;
+	right: -3px;
+	cursor: ne-resize;
+}
+
+.imgCrop_handleE {
+	top: 0;
+	right: -3px;
+	/* margin-top: 49%;    @done_in_js */
+	cursor: e-resize;
+}
+
+.imgCrop_handleSE {
+	right: -3px;
+	bottom: -3px;
+	cursor: se-resize;
+}
+
+.imgCrop_handleS {
+	right: 0;
+	bottom: -3px;
+	/* margin-right: 49%; @done_in_js */
+	cursor: s-resize;
+}
+
+.imgCrop_handleSW {
+	left: -3px;
+	bottom: -3px;
+	cursor: sw-resize;
+}
+
+.imgCrop_handleW {
+	top: 0;
+	left: -3px;
+	/* margin-top: 49%;  @done_in_js */
+	cursor: w-resize;
+}
+
+.imgCrop_handleNW {
+	top: -3px;
+	left: -3px;
+	cursor: nw-resize;
+}
+
+/**
+ * Create an area to click & drag around on as the default browser behaviour is to let you drag the image 
+ */
+.imgCrop_dragArea {
+	width: 100%;
+	height: 100%;
+	z-index: 200;
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+
+.imgCrop_previewWrap {
+	/* width: 200px;  @done_in_js */
+	/* height: 200px; @done_in_js */
+	overflow: hidden;
+	position: relative;
+}
+
+.imgCrop_previewWrap img {
+	position: absolute;
+}

data/app/controllers/management/cms_controller.rb

@@ -1176,13 +1176,12 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   def create_file_link
     @pg = CmsPage.find_by_id(params[:id])
     localfile = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, File.basename(params[:filename]))
+    @filename = localfile.split('/').map { |s| CGI::escape(s) }.join('/') + "?#{File.mtime(localfile).to_i}"
     
     bucket = ImagineCmsConfig['amazon_s3'][Rails.env]['file_bucket'] rescue nil
     prefix = ImagineCmsConfig['amazon_s3']['file_prefix'] rescue nil
     upload_to_s3(localfile, @pg, bucket, prefix)
     
-    @filename = localfile.split('/').map { |s| CGI::escape(s) }.join('/') + "?#{File.mtime(localfile).to_i}"
-    
     render :partial => 'create_file_link'
   end
   

data/app/views/cms/content/_photo_gallery.html.erb

@@ -0,0 +1,82 @@
+<%-
+  timeout ||= 0
+  captions = []
+  settings = HashObject.new({})
+  path = File.join(Rails.root, 'public', 'images', 'content', @pg.path, name)
+  
+  begin
+    captions = YAML.load(File.open(File.join(path, 'captions.yml')).read)
+  rescue
+  end
+  
+  autoplay = true
+  timeout = 6
+  
+  begin
+    settings = HashObject.new(YAML.load(File.open(File.join(path, 'settings.yml')).read))
+    timeout = settings.slide_duration.to_i
+    autoplay = (settings.autoplay == 'true')
+  rescue
+  end
+  
+  timeout = 5 if timeout < 1
+-%>
+<%= javascript_tag "gallerySize['#{name}'] = #{images.size};" %>
+
+<div class="slideshow">
+  
+  <div class="slideshow-images">
+    <%- images.each_with_index do |image, index| -%>
+      <table width="100%" id="<%= name %>_image_<%= index %>" class="<%= name %>_image slideshow-image" border="0" cellpadding="0" cellspacing="2" style="<%= index > 0 ? 'display: none;' : '' %>">
+        <tr>
+          <td align="center" style="vertical-align:middle;">
+            <%= image_tag '/' + image, :style => "border: 7px solid white" %>
+          </td>
+        </tr>
+      </table>
+    <%- end -%>
+    <br clear="all" />
+  </div>
+  
+  <div id="<%= name %>_caption" class="slideshow-caption" style="<%= "display: none;" if captions[1].blank? %>">
+    <%= captions[1] rescue '' %>
+  </div>
+  
+  <%- images.each_with_index do |image, index| -%>
+    <span id="<%= name %>_caption_<%= index %>" style="display: none;"><%= (captions[index + 1].to_s).gsub("\n", '<br/>') %></span>
+  <%- end -%>
+  
+
+  <div class="slideshow-nav">
+    <table width="100%" cellspacing="0" cellpadding="0" align="center">
+      <tr>
+        <td id="<%= name %>_prev_button" class="slideshow-nav-button" align="right" onclick="changeGalleryImage('<%= name %>', <%= images.size-1 %>);">
+          <img src="/assets/interface/photo_prev.gif" alt="prev" style="float: right; padding-right: 6px;" />
+        </td>
+        <td id="<%= name %>_play_button" class="slideshow-nav-button" style="<%= autoplay ? ' display: none' : '' %>" align="left" onclick="clearTimeout(galleryTimeouts['<%= name %>']); setTimeout(function () { advanceGallerySlideshow('<%= name %>', <%= timeout*1000 %>); }, <%= timeout*1000 %>); $('<%= name %>_play_button').hide(); $('<%= name %>_pause_button').show();">
+          <img src="/assets/interface/photo_play.gif" alt="play" style="float: left" />
+        </td>
+        <td id="<%= name %>_pause_button" class="slideshow-nav-button" style="<%= autoplay ? '' : ' display: none' %>" align="left" onclick="clearTimeout(galleryTimeouts['<%= name %>']); $('<%= name %>_pause_button').hide(); $('<%= name %>_play_button').show();">
+          <img src="/assets/interface/photo_pause.gif" alt="pause" style="float: left;" />
+        </td>
+        <td id="<%= name %>_next_button" class="slideshow-nav-button" align="left" onclick="changeGalleryImage('<%= name %>', 1);">
+          <img src="/assets/interface/photo_next.gif" alt="next" style="float: left; padding-left: 6px;" />
+        </td>
+      </tr>
+    </table>
+  </div>
+  
+  <%- unless settings.show_thumbs == 'false' -%>
+  <div class="slideshow-thumbs">
+    <%- thumbs.each_with_index do |thumb, index| -%>
+      <div id="<%= name %>_thumb_<%= index %>" class="<%= name %>_thumb slideshow-thumb<%= index == 0 ? ' current' : '' %>" onmouseover="$(this).addClassName('current');" onmouseout="$(this).removeClassName('current');" onclick="changeGalleryImage('<%= name %>', <%= index %>);">
+        <%= image_tag '/' + thumb, :width => 39, :height => 39, :style => "float: left;" %>
+      </div>
+    <%- end -%>
+    <br clear="all" />
+  </div>
+  <%- end -%>
+  
+</div>
+
+<%= javascript_tag("$('#{name}_play_button').onclick();") if autoplay %>

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "3.0.28"
+  VERSION = "3.0.29"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.28
+  version: 3.0.29
 platform: ruby
 authors:
 - Aaron Namba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -165,6 +165,10 @@ files:
 - app/assets/images/codepress/line-numbers.png
 - app/assets/images/cropper/marqueeHoriz.gif
 - app/assets/images/cropper/marqueeVert.gif
+- app/assets/images/interface/photo_next.gif
+- app/assets/images/interface/photo_pause.gif
+- app/assets/images/interface/photo_play.gif
+- app/assets/images/interface/photo_prev.gif
 - app/assets/images/management/btn_add.gif
 - app/assets/images/management/btn_archive.gif
 - app/assets/images/management/btn_delete.gif
@@ -310,6 +314,7 @@ files:
 - app/assets/stylesheets/codepress/languages/sql.css
 - app/assets/stylesheets/codepress/languages/text.css
 - app/assets/stylesheets/cropper.css
+- app/assets/stylesheets/imagine_cms.css
 - app/assets/stylesheets/imagine_controls.css
 - app/assets/stylesheets/management.css
 - app/controllers/cms/content_controller.rb
@@ -329,6 +334,7 @@ files:
 - app/models/user.rb
 - app/models/user_group.rb
 - app/sweepers/cms_content_sweeper.rb
+- app/views/cms/content/_photo_gallery.html.erb
 - app/views/cms/content/_search.html.erb
 - app/views/cms/content/_search_result.html.erb
 - app/views/cms/content/rss_feed.xml.builder