fanforce-app-factory 1.5.0 → 1.6.0

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.
Files changed (10) hide show
  1. data/lib/fanforce/app_factory/_init_sinatra.rb +1 -1
  2. data/lib/fanforce/app_factory/assets/css/config.scss +1 -0
  3. data/lib/fanforce/app_factory/assets/js/config.js +1 -0
  4. data/lib/fanforce/app_factory/assets/lib/common/layouts/_config.scss +27 -0
  5. data/lib/fanforce/app_factory/assets/lib/common/layouts/config.js +6 -0
  6. data/lib/fanforce/app_factory/config/core_config.rb +0 -18
  7. data/lib/fanforce/app_factory/layouts/config.haml +19 -0
  8. data/lib/fanforce/app_factory/version.rb +1 -1
  9. data/lib/fanforce/app_factory/views/config.haml +1 -0
  10. metadata +7 -1
data/lib/fanforce/app_factory/_init_sinatra.rb CHANGED
@@ -56,7 +56,7 @@ class FanforceApp::Sinatra < Sinatra::Base
56
56
  end
57
57
  page_path ||= page
58
58
 
59
- if options[:layout] and FanforceApp.config.has_layout_for(page)
59
+ if options[:layout]
60
60
  if File.exists?("#{app_dir}/layouts/#{options[:layout]}.haml")
61
61
  options[:layout] = :"../layouts/#{options[:layout]}"
62
62
  else
data/lib/fanforce/app_factory/assets/css/config.scss ADDED
@@ -0,0 +1 @@
1
+ @import 'common/layouts/config';
data/lib/fanforce/app_factory/assets/js/config.js ADDED
@@ -0,0 +1 @@
1
+ //= require common/layouts/add_edit_initiative
data/lib/fanforce/app_factory/assets/lib/common/layouts/_config.scss ADDED
@@ -0,0 +1,27 @@
1
+ //////////////////////////////////////////////////////////////////////////////////////////////////
2
+ // COMPASS AND BOOTSTRAP
3
+ //////////////////////////////////////////////////////////////////////////////////////////////////
4
+ @import 'compass/css3';
5
+ @import 'compass/utilities';
6
+ @import 'vendors/bootstrap/css/bootstrap.min.css';
7
+ @import 'vendors/font-awesome/css/font-awesome.min.css';
8
+
9
+ //////////////////////////////////////////////////////////////////////////////////////////////////
10
+ // COMMON
11
+ //////////////////////////////////////////////////////////////////////////////////////////////////
12
+ @import 'common/mixins';
13
+ @import 'common/variables';
14
+ @import 'common/tags';
15
+
16
+ @import 'common/module-page-loading';
17
+ @import 'common/module-saving-initiative';
18
+ @import 'common/module-add-initiative-footer';
19
+
20
+ //////////////////////////////////////////////////////////////////////////////////////////////////
21
+ // BASE STYLES (AS FEW AS POSSIBLE)
22
+ //////////////////////////////////////////////////////////////////////////////////////////////////
23
+
24
+ body { overflow:hidden; background: white;
25
+ .hide { display:none !important; }
26
+ .dropdown-menu { @include border-radius(4px); border:1px solid #aec7dd; @include box-shadow(1px 1px 3px rgba(0, 0, 0, 0.2), #ffffff 1px 1px 0 inset); background:#f7fafd; }
27
+ }
data/lib/fanforce/app_factory/assets/lib/common/layouts/config.js ADDED
@@ -0,0 +1,6 @@
1
+ //= require vendors/jquery/jquery.tmpl.debug
2
+ //= require vendors/jquery/jquery.inputHint
3
+ //= require vendors/bootstrap/js/bootstrap.min
4
+ //= require vendors/knockout/knockout.min
5
+ //= require vendors/knockout/knockout.custom-handlers
6
+ //= require vendors/underscore/underscore.debug
data/lib/fanforce/app_factory/config/core_config.rb CHANGED
@@ -3,19 +3,6 @@ class FanforceApp::CoreConfig
3
3
  attr_accessor :bugsnag, :bugsnag_enabled
4
4
  attr_reader :type
5
5
 
6
- PAGE_LAYOUTS_FOR = {
7
- index: true,
8
- dashboard: true,
9
- add_initiative: true,
10
- edit_initiative: true,
11
- convert_initiative: true,
12
- add_source: true,
13
- close_popup: true,
14
- engage: true,
15
- new_message: true,
16
- source_details: true,
17
- }
18
-
19
6
  def initialize(root_dir)
20
7
  @_id = ENV['FANFORCE_APP_ID']
21
8
  @root_dir = root_dir
@@ -26,11 +13,6 @@ class FanforceApp::CoreConfig
26
13
  @bugsnag = (ENV['BUGSNAG_API_KEY'].present?) ? {api_key: ENV['BUGSNAG_API_KEY']} : nil
27
14
  end
28
15
 
29
- def has_layout_for(page)
30
- return false if !page
31
- return PAGE_LAYOUTS_FOR[page.to_sym] == true
32
- end
33
-
34
16
  def show_error_details=(bool)
35
17
  @show_error_details = [true,1,'1'].include?(bool)
36
18
  end
data/lib/fanforce/app_factory/layouts/config.haml ADDED
@@ -0,0 +1,19 @@
1
+ <?xml version='1.0' encoding='utf-8' ?>
2
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
+ %html
4
+ %head
5
+ %title Fanforce
6
+ %meta{'http-equiv'=>'Content-Type', content:'text/html; charset=iso-8859-1'}/
7
+ %meta{'http-equiv'=>'Content-Language', content: 'en-us'}/
8
+ = stylesheet '/config.css'
9
+ :javascript
10
+ BASE_DOMAIN = #{Fanforce.base_domain.to_json}
11
+ API_DOMAIN = #{Fanforce.api_domain.to_json}
12
+ ASSETS_DOMAIN = #{Fanforce.assets_domain.to_json}
13
+
14
+ %body
15
+ = yield
16
+ = javascript '//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js'
17
+ = javascript "//#{Fanforce.eye_domain}/devforce.js#{'?DEBUG=1&DYNAMIC=1' if ENV['RACK_ENV']=='development'}"
18
+ = javascript '/config.js'
19
+ = yield_content :after_core_js
data/lib/fanforce/app_factory/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  class Fanforce
2
2
  module AppFactory
3
- VERSION = '1.5.0'
3
+ VERSION = '1.6.0'
4
4
  end
5
5
  end
data/lib/fanforce/app_factory/views/config.haml ADDED
@@ -0,0 +1 @@
1
+ %h2 Default Config Page
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fanforce-app-factory
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.0
4
+ version: 1.6.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -350,6 +350,7 @@ files:
350
350
  - lib/fanforce/app_factory/_init_sinatra.rb
351
351
  - lib/fanforce/app_factory/assets/css/add_edit_initiative.scss
352
352
  - lib/fanforce/app_factory/assets/css/add_source.scss
353
+ - lib/fanforce/app_factory/assets/css/config.scss
353
354
  - lib/fanforce/app_factory/assets/css/convert_initiative.scss
354
355
  - lib/fanforce/app_factory/assets/css/dashboard.scss
355
356
  - lib/fanforce/app_factory/assets/css/engage.scss
@@ -364,6 +365,7 @@ files:
364
365
  - lib/fanforce/app_factory/assets/js/add_edit_initiative.js
365
366
  - lib/fanforce/app_factory/assets/js/add_source.js
366
367
  - lib/fanforce/app_factory/assets/js/add_source_popup.js
368
+ - lib/fanforce/app_factory/assets/js/config.js
367
369
  - lib/fanforce/app_factory/assets/js/convert_initiative.js
368
370
  - lib/fanforce/app_factory/assets/js/dashboard.coffee
369
371
  - lib/fanforce/app_factory/assets/js/fanforce-engager.js
@@ -387,6 +389,7 @@ files:
387
389
  - lib/fanforce/app_factory/assets/lib/common/icons/initiative.png
388
390
  - lib/fanforce/app_factory/assets/lib/common/layouts/_add_edit_initiative.scss
389
391
  - lib/fanforce/app_factory/assets/lib/common/layouts/_add_source.scss
392
+ - lib/fanforce/app_factory/assets/lib/common/layouts/_config.scss
390
393
  - lib/fanforce/app_factory/assets/lib/common/layouts/_convert_initiative.scss
391
394
  - lib/fanforce/app_factory/assets/lib/common/layouts/_dashboard.scss
392
395
  - lib/fanforce/app_factory/assets/lib/common/layouts/_engage.scss
@@ -395,6 +398,7 @@ files:
395
398
  - lib/fanforce/app_factory/assets/lib/common/layouts/_source_details.scss
396
399
  - lib/fanforce/app_factory/assets/lib/common/layouts/add_edit_initiative.js
397
400
  - lib/fanforce/app_factory/assets/lib/common/layouts/add_source.js
401
+ - lib/fanforce/app_factory/assets/lib/common/layouts/config.js
398
402
  - lib/fanforce/app_factory/assets/lib/common/layouts/convert_initiative.js
399
403
  - lib/fanforce/app_factory/assets/lib/common/layouts/dashboard.js
400
404
  - lib/fanforce/app_factory/assets/lib/common/layouts/engage.js
@@ -462,6 +466,7 @@ files:
462
466
  - lib/fanforce/app_factory/controllers/base_controller.rb
463
467
  - lib/fanforce/app_factory/layouts/add_edit_initiative.haml
464
468
  - lib/fanforce/app_factory/layouts/add_source.haml
469
+ - lib/fanforce/app_factory/layouts/config.haml
465
470
  - lib/fanforce/app_factory/layouts/convert_initiative.haml
466
471
  - lib/fanforce/app_factory/layouts/dashboard.haml
467
472
  - lib/fanforce/app_factory/layouts/engage.haml
@@ -482,6 +487,7 @@ files:
482
487
  - lib/fanforce/app_factory/views/add_initiative.haml
483
488
  - lib/fanforce/app_factory/views/add_source.haml
484
489
  - lib/fanforce/app_factory/views/close_popup.haml
490
+ - lib/fanforce/app_factory/views/config.haml
485
491
  - lib/fanforce/app_factory/views/convert_initiative.haml
486
492
  - lib/fanforce/app_factory/views/dashboard.haml
487
493
  - lib/fanforce/app_factory/views/edit_initiative.haml