sharkapps 0.1.14 → 0.1.15

data/VERSION

@@ -1 +1 @@
-0.1.14
+0.1.15

data/app/views/appforma/_footer.html.erb

@@ -15,15 +15,11 @@
         <%= link_to image_tag("https://s3.amazonaws.com/appforma_static/logos/logo_poweredby.png", :border => 0), "http://www.appforma.com", {:target => "_blank"}%>
       </div>
       <div id="logo_brand">
-        <% if @account.image_logo.exists? %>
-          <%= link_to image_tag(@account.image_logo.url(:dual)), @account.logo_link, {:target => "_blank"}%>
-        <% end %>
+        <%= white_label_image_helper(true) %>
       </div>
     <% when Account::LOGO_WHITE %>
       <div id="logo_brand">
-        <% if @account.image_logo.exists? %>
-          <%= link_to image_tag(@account.image_logo.url(:white)), @account.logo_link, {:target => "_blank"}%>
-        <% end %>
+      <%= white_label_image_helper %>
       </div>
   <% end %>
   

data/app/views/appforma/_header.html.erb

@@ -27,7 +27,7 @@ $(document).ready(function() {
     top.location = "<%=@account.link_page(current_facebook_client) %>";
   });
   $('#edit').click(function() {
-    top.location = "<%="http://apps.facebook.com/#{SharkApps.canvas_name}/account/#{@account.to_param}/edit"%>";
+    top.location = "<%="#{Facebooker2.callback_url}account/#{@account.to_param}/edit"%>";
   });
 });
 

data/lib/sharkapps.rb

@@ -86,16 +86,23 @@ module SharkApps
     end
     
     def set_tab_current_account
-      #hack for fbml 
-      temp = fb_load_facebook_params 
-      page_id = temp["page"]["id"]
-      @account = Account.find_or_create_by_fbid(page_id)
-      #set the default locale if supported, and if the account doesn't have a locale set
-      if @account.respond_to? :locale and @account.locale.blank?
-        @account.locale = "il"
-        @account.save
+      if params[:wib_fbid]
+        @account = Account.find_or_create_by_fbid(params[:wib_fbid])
+        @isliked = true
+        @external = true
+        @wibiya_mode = true
+      else
+        #hack for fbml 
+        temp = fb_load_facebook_params 
+        page_id = temp["page"]["id"]
+        @account = Account.find_or_create_by_fbid(page_id)
+        #set the default locale if supported, and if the account doesn't have a locale set
+        if @account.respond_to? :locale and @account.locale.blank?
+          @account.locale = "il"
+          @account.save
+        end
+        @isliked = temp["page"]["liked"]
       end
-      @isliked = temp["page"]["liked"]
     end
     
     def check_admin

data/sharkapps.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sharkapps}
-  s.version = "0.1.14"
+  s.version = "0.1.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eyal Kedem"]
-  s.date = %q{2012-04-29}
+  s.date = %q{2012-05-28}
   s.description = %q{integration utilities with the shark apps framework}
   s.email = %q{ekedem@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sharkapps
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 1
-  - 14
+  - 15
   segments_generated: true
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors: 
 - Eyal Kedem
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-29 00:00:00 +03:00
+date: 2012-05-28 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency