portfolio 0.9.1.8 → 0.9.2

data/app/controllers/portfolio_controller.rb

@@ -1,11 +1,11 @@
 class PortfolioController < ApplicationController
-  
+
   before_filter :load_page, :only => [:index, :show, :empty]
-  
+
   def index
     redirect_to portfolio_url(PortfolioEntry.find_by_parent_id(nil, :order => "position ASC")) rescue error_404
   end
- 
+
   def show
 		begin
 			if params[:id]
@@ -13,13 +13,13 @@ class PortfolioController < ApplicationController
 			else
 				@master_entry = PortfolioEntry.find_by_parent_id(nil, :order => "position ASC")
 			end
-		
+
 			if params[:portfolio_id]
 				@portfolio_entry = @master_entry.children.find(params[:portfolio_id])
 			else
 				@portfolio_entry = @master_entry.children.first
 			end
-			
+
 			begin
 		    if params[:image_id]
 		      @image = @portfolio_entry.images[params[:image_id].to_i]
@@ -32,12 +32,14 @@ class PortfolioController < ApplicationController
 		rescue
 			error_404
 		end
+
+		render :partial => "main_image", :layout => false if request.xhr?
   end
-  
+
 protected
 
   def load_page
-    @page = Page.find_by_link_url('/portfolio', :include => [:parts]) 
+    @page = Page.find_by_link_url('/portfolio', :include => [:parts])
   end
- 
+
 end

data/app/views/portfolio/_main_image.html.erb

@@ -0,0 +1 @@
+<%= image_fu @image, :portfolio, :id => "portfolio_main_image" unless @image.nil? %>

data/app/views/portfolio/empty.html.erb

@@ -4,7 +4,7 @@
 	<div id='body_content_left' class='clearfix'>
 		<h1><%= @master_entry.title %></h1>
 		<p>
-	  	<em>We haven't entered anything in for this project yet.</em>
+	  	<em><%= t(:portfolio_no_entries, :default => "We haven't entered anything in for this project yet.") %></em>
 		</p>
 	</div>
 </div>

data/app/views/portfolio/show.html.erb

@@ -6,8 +6,8 @@
 		  <span><%= @master_entry.title %></span>
 			<%= select :portfolio_entry, :to_param, @master_entry.children.collect{|entry| [entry.title, entry.to_param] } %>
 		</h1>
-		
-		<%= image_fu @image, :portfolio, :id => "portfolio_main_image" unless @image.nil? %>
+
+		<%= render :partial => "main_image" %>
 	</div>
 	<div id='body_content_right' class='clearfix'>
 		<h2><%= @portfolio_entry.title %></h2>
@@ -15,9 +15,8 @@
 			<% (images = @portfolio_entry.images).each do |image| %>
 				<li class='<%= cycle("odd", "even") %>'>
 					<% className = (selected = images.index(image) == params[:image_id].to_i) ? "selected" : "pale" %>
-				  <%= link_to_if !selected, 
-									image_fu(image, :portfolio_thumb, :class => className), 
-									portfolio_image_url(@master_entry, @portfolio_entry, images.index(image)) %>
+				  <%= link_to	image_fu(image, :portfolio_thumb),
+				      portfolio_image_url(@master_entry, @portfolio_entry, images.index(image)), :class => className %>
 				</li>
 			<% end %>
 		</ul>
@@ -26,16 +25,35 @@
 <% content_for :head do %>
 	<%# remove these javascript_include_tag calls if they are included in your layout.
 	%>
-	<%= javascript_include_tag 'prototype', 'fastinit'  %>
+	<%= javascript_include_tag 'jquery' %>
 	<script type='text/javascript'>
-		FastInit.addOnLoad(function(){	
-			$$("ul#portfolio_images li img.pale").each(function(img){
-				img.setOpacity(0.3);
-			});
-			
-			$('portfolio_entry_to_param').observe('change', function(e){
+		$(document).ready(function(){
+			$("ul#portfolio_images li a.pale img").fadeTo(0, 0.3);
+
+			$('#portfolio_entry_to_param').change(function() {
 				window.location = "<%= portfolio_project_url(@master_entry, nil) %>" + this.value;
 			});
+
+      var clicked_on = null;
+			$("ul#portfolio_images li a").click(function(event) {
+			  if (!$(this).hasClass('selected')) {
+			    clicked_on = $(this);
+  			  $.get($(this).attr('href'), function(data, textStatus) {
+  			    if (textStatus == "success") {
+  			      $('#portfolio_main_image').before(data).remove();
+
+  			      $('ul#portfolio_images li a.selected').removeClass('selected').addClass('pale');
+
+  			      clicked_on.removeClass('pale').addClass('selected');
+  			      clicked_on.find('img').fadeTo(0, 1);
+
+  			      $("ul#portfolio_images li a.pale img").fadeTo(0, 0.3);
+  		      }
+  			  });
+  		  }
+
+        return false;
+			});
 		});
 	</script>
 <% end %>

data/rails/init.rb

@@ -3,13 +3,13 @@ Refinery::Plugin.register do |plugin|
 	plugin.title = "Portfolio"
 	plugin.description = "Manage a portfolio"
 	plugin.url = "/admin/#{plugin.title.downcase}"
-	plugin.version = '0.9.1.5'
+	plugin.version = '0.9.1.8'
 	plugin.menu_match = /admin\/((portfolio)|(portfolio_entries))/
 	plugin.activity = {
 		:class => PortfolioEntry,
-		:title => 'title', 
-		:url_prefix => 'edit', 
-		:created_image => "layout_add.png", 
+		:title => 'title',
+		:url_prefix => 'edit',
+		:created_image => "layout_add.png",
 		:updated_image => "layout_edit.png"
 	}
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: portfolio
 version: !ruby/object:Gem::Version 
-  version: 0.9.1.8
+  version: 0.9.2
 platform: ruby
 authors: 
 - Resolve Digital
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-21 00:00:00 +13:00
+date: 2010-01-19 00:00:00 +13:00
 default_executable: portfolio-install
 dependencies: []
 
@@ -37,6 +37,7 @@ files:
 - app/views/admin/portfolio_entries/edit.html.erb
 - app/views/admin/portfolio_entries/index.html.erb
 - app/views/admin/portfolio_entries/new.html.erb
+- app/views/portfolio/_main_image.html.erb
 - app/views/portfolio/empty.html.erb
 - app/views/portfolio/show.html.erb
 - bin/portfolio-install