sharkapps 0.1.14 → 0.1.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION +1 -1
- data/app/views/appforma/_footer.html.erb +2 -6
- data/app/views/appforma/_header.html.erb +1 -1
- data/lib/sharkapps.rb +16 -9
- data/sharkapps.gemspec +2 -2
- metadata +4 -4
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.1.
|
|
1
|
+
0.1.15
|
|
@@ -15,15 +15,11 @@
|
|
|
15
15
|
<%= link_to image_tag("https://s3.amazonaws.com/appforma_static/logos/logo_poweredby.png", :border => 0), "http://www.appforma.com", {:target => "_blank"}%>
|
|
16
16
|
</div>
|
|
17
17
|
<div id="logo_brand">
|
|
18
|
-
|
|
19
|
-
<%= link_to image_tag(@account.image_logo.url(:dual)), @account.logo_link, {:target => "_blank"}%>
|
|
20
|
-
<% end %>
|
|
18
|
+
<%= white_label_image_helper(true) %>
|
|
21
19
|
</div>
|
|
22
20
|
<% when Account::LOGO_WHITE %>
|
|
23
21
|
<div id="logo_brand">
|
|
24
|
-
|
|
25
|
-
<%= link_to image_tag(@account.image_logo.url(:white)), @account.logo_link, {:target => "_blank"}%>
|
|
26
|
-
<% end %>
|
|
22
|
+
<%= white_label_image_helper %>
|
|
27
23
|
</div>
|
|
28
24
|
<% end %>
|
|
29
25
|
|
|
@@ -27,7 +27,7 @@ $(document).ready(function() {
|
|
|
27
27
|
top.location = "<%=@account.link_page(current_facebook_client) %>";
|
|
28
28
|
});
|
|
29
29
|
$('#edit').click(function() {
|
|
30
|
-
top.location = "<%="
|
|
30
|
+
top.location = "<%="#{Facebooker2.callback_url}account/#{@account.to_param}/edit"%>";
|
|
31
31
|
});
|
|
32
32
|
});
|
|
33
33
|
|
data/lib/sharkapps.rb
CHANGED
|
@@ -86,16 +86,23 @@ module SharkApps
|
|
|
86
86
|
end
|
|
87
87
|
|
|
88
88
|
def set_tab_current_account
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
89
|
+
if params[:wib_fbid]
|
|
90
|
+
@account = Account.find_or_create_by_fbid(params[:wib_fbid])
|
|
91
|
+
@isliked = true
|
|
92
|
+
@external = true
|
|
93
|
+
@wibiya_mode = true
|
|
94
|
+
else
|
|
95
|
+
#hack for fbml
|
|
96
|
+
temp = fb_load_facebook_params
|
|
97
|
+
page_id = temp["page"]["id"]
|
|
98
|
+
@account = Account.find_or_create_by_fbid(page_id)
|
|
99
|
+
#set the default locale if supported, and if the account doesn't have a locale set
|
|
100
|
+
if @account.respond_to? :locale and @account.locale.blank?
|
|
101
|
+
@account.locale = "il"
|
|
102
|
+
@account.save
|
|
103
|
+
end
|
|
104
|
+
@isliked = temp["page"]["liked"]
|
|
97
105
|
end
|
|
98
|
-
@isliked = temp["page"]["liked"]
|
|
99
106
|
end
|
|
100
107
|
|
|
101
108
|
def check_admin
|
data/sharkapps.gemspec
CHANGED
|
@@ -5,11 +5,11 @@
|
|
|
5
5
|
|
|
6
6
|
Gem::Specification.new do |s|
|
|
7
7
|
s.name = %q{sharkapps}
|
|
8
|
-
s.version = "0.1.
|
|
8
|
+
s.version = "0.1.15"
|
|
9
9
|
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
|
11
11
|
s.authors = ["Eyal Kedem"]
|
|
12
|
-
s.date = %q{2012-
|
|
12
|
+
s.date = %q{2012-05-28}
|
|
13
13
|
s.description = %q{integration utilities with the shark apps framework}
|
|
14
14
|
s.email = %q{ekedem@gmail.com}
|
|
15
15
|
s.extra_rdoc_files = [
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: sharkapps
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
hash:
|
|
4
|
+
hash: 5
|
|
5
5
|
prerelease: false
|
|
6
6
|
segments:
|
|
7
7
|
- 0
|
|
8
8
|
- 1
|
|
9
|
-
-
|
|
9
|
+
- 15
|
|
10
10
|
segments_generated: true
|
|
11
|
-
version: 0.1.
|
|
11
|
+
version: 0.1.15
|
|
12
12
|
platform: ruby
|
|
13
13
|
authors:
|
|
14
14
|
- Eyal Kedem
|
|
@@ -16,7 +16,7 @@ autorequire:
|
|
|
16
16
|
bindir: bin
|
|
17
17
|
cert_chain: []
|
|
18
18
|
|
|
19
|
-
date: 2012-
|
|
19
|
+
date: 2012-05-28 00:00:00 +03:00
|
|
20
20
|
default_executable:
|
|
21
21
|
dependencies:
|
|
22
22
|
- !ruby/object:Gem::Dependency
|