sharkapps 0.1.16 → 0.1.17
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/app/controllers/appforma_controller.rb +1 -1
- data/app/views/appforma/_footer.html.erb +24 -21
- data/lib/sharkapps/account.rb +7 -1
- data/sharkapps.gemspec +2 -2
- metadata +4 -4
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.1.
|
|
1
|
+
0.1.17
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
class AppformaController < ApplicationController
|
|
2
2
|
skip_before_filter :ensure_canvas_connected_to_facebook
|
|
3
|
-
before_filter :set_tab_current_account, :except => [:intro, :not_authorized]
|
|
3
|
+
before_filter :set_tab_current_account, :except => [:intro, :not_authorized, :not_subscribed]
|
|
4
4
|
before_filter :set_edit_account, :only => [:not_authorized]
|
|
5
5
|
before_filter :set_locale, :except => [:intro, :not_subscribed]
|
|
6
6
|
skip_before_filter :check_account_authorized, :only => [:intro]
|
|
@@ -1,26 +1,29 @@
|
|
|
1
1
|
<div id="footer">
|
|
2
2
|
<h6 id="footer_disclaimer"><%= t('general.diclaimer')%></h6>
|
|
3
|
-
<%
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
<div id="
|
|
7
|
-
|
|
3
|
+
<% if @account.reseller.blank? %>
|
|
4
|
+
<% case @account.footer_state.to_i %>
|
|
5
|
+
<% when Account::LOGO_REGULAR %>
|
|
6
|
+
<div id="appforma_solo" class="appforma_logo">
|
|
7
|
+
<div id="logo_solo_image">
|
|
8
|
+
<%= link_to image_tag("https://s3.amazonaws.com/appforma_static/logos/logo_solo.png", :border => 0), "http://www.appforma.com", {:target => "_blank"}%>
|
|
9
|
+
</div>
|
|
10
|
+
<div id="logo_dot_link">
|
|
11
|
+
<%= link_to t('general.logo_link'), "http://www.appforma.com/products", {:target => "_blank"}%>
|
|
12
|
+
</div>
|
|
8
13
|
</div>
|
|
9
|
-
|
|
10
|
-
|
|
14
|
+
<% when Account::LOGO_DUAL %>
|
|
15
|
+
<div id="appforma_dual" class="appforma_logo"%>
|
|
16
|
+
<%= link_to image_tag("https://s3.amazonaws.com/appforma_static/logos/logo_poweredby.png", :border => 0), "http://www.appforma.com", {:target => "_blank"}%>
|
|
11
17
|
</div>
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
<%
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
</div>
|
|
24
|
-
<% end %>
|
|
25
|
-
|
|
18
|
+
<div id="logo_brand">
|
|
19
|
+
<%= white_label_image_helper(true) %>
|
|
20
|
+
</div>
|
|
21
|
+
<% when Account::LOGO_WHITE %>
|
|
22
|
+
<div id="logo_brand">
|
|
23
|
+
<%= white_label_image_helper %>
|
|
24
|
+
</div>
|
|
25
|
+
<% end %>
|
|
26
|
+
<% else %>
|
|
27
|
+
<%= link_to image_tag("https://s3.amazonaws.com/appforma_static/resellers/#{@account.reseller}_footer.png", :border => 0), @account.reseller_url, {:target => "_blank"}%>
|
|
28
|
+
<% end %>
|
|
26
29
|
</div>
|
data/lib/sharkapps/account.rb
CHANGED
|
@@ -16,7 +16,13 @@ class AppformaAccount < ActiveResource::Base
|
|
|
16
16
|
cur_account.trial_remaining = acc.trial_remaining
|
|
17
17
|
end
|
|
18
18
|
cur_account.last_approval_check = Time.now
|
|
19
|
-
|
|
19
|
+
if acc.reseller.blank?
|
|
20
|
+
cur_account.footer_state = acc.branding
|
|
21
|
+
else
|
|
22
|
+
cur_account.footer_state = 0
|
|
23
|
+
end
|
|
24
|
+
cur_account.reseller = acc.reseller
|
|
25
|
+
cur_account.reseller_url = acc.reseller_url
|
|
20
26
|
cur_account.save(false)
|
|
21
27
|
cur_account
|
|
22
28
|
end
|
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.17"
|
|
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-06-
|
|
12
|
+
s.date = %q{2012-06-20}
|
|
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: 57
|
|
5
5
|
prerelease: false
|
|
6
6
|
segments:
|
|
7
7
|
- 0
|
|
8
8
|
- 1
|
|
9
|
-
-
|
|
9
|
+
- 17
|
|
10
10
|
segments_generated: true
|
|
11
|
-
version: 0.1.
|
|
11
|
+
version: 0.1.17
|
|
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-06-
|
|
19
|
+
date: 2012-06-20 00:00:00 +03:00
|
|
20
20
|
default_executable:
|
|
21
21
|
dependencies:
|
|
22
22
|
- !ruby/object:Gem::Dependency
|