diff options
| author | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-01-22 12:15:54 +0100 |
|---|---|---|
| committer | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-01-22 12:15:54 +0100 |
| commit | 52589919782d938a0ae007439a8d1a17a1056838 (patch) | |
| tree | b99060dbb2e56aa467203bf829e965c93e136d78 /app | |
| parent | 5d15c975b7d4509d786ab7b95ec61ed7ad166b14 (diff) | |
| parent | 186ce80e7b22920ea7d54c579f635eec2d1ee98f (diff) | |
Merge branch 'develop' of https://github.com/amooma/GS5 into develop
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/trigger.js.coffee | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/trigger.css.scss | 3 | ||||
| -rw-r--r-- | app/controllers/trigger_controller.rb | 11 | ||||
| -rw-r--r-- | app/helpers/trigger_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/trigger/fax.html.erb | 2 | ||||
| -rw-r--r-- | app/views/trigger/voicemail.html.erb | 4 |
6 files changed, 25 insertions, 0 deletions
diff --git a/app/assets/javascripts/trigger.js.coffee b/app/assets/javascripts/trigger.js.coffee new file mode 100644 index 0000000..7615679 --- /dev/null +++ b/app/assets/javascripts/trigger.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/stylesheets/trigger.css.scss b/app/assets/stylesheets/trigger.css.scss new file mode 100644 index 0000000..682b362 --- /dev/null +++ b/app/assets/stylesheets/trigger.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the trigger controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb new file mode 100644 index 0000000..e9821f6 --- /dev/null +++ b/app/controllers/trigger_controller.rb @@ -0,0 +1,11 @@ +class TriggerController < ApplicationController + def voicemail + # Something is triggered when ever a local script fetches this action. + # + end + + def fax + # Something is triggered when ever a local script fetches this action. + # + end +end diff --git a/app/helpers/trigger_helper.rb b/app/helpers/trigger_helper.rb new file mode 100644 index 0000000..0ababb3 --- /dev/null +++ b/app/helpers/trigger_helper.rb @@ -0,0 +1,2 @@ +module TriggerHelper +end diff --git a/app/views/trigger/fax.html.erb b/app/views/trigger/fax.html.erb new file mode 100644 index 0000000..822b2cb --- /dev/null +++ b/app/views/trigger/fax.html.erb @@ -0,0 +1,2 @@ +<h1>Trigger#fax</h1> +<p>Find me in app/views/trigger/fax.html.erb</p> diff --git a/app/views/trigger/voicemail.html.erb b/app/views/trigger/voicemail.html.erb new file mode 100644 index 0000000..9bafe17 --- /dev/null +++ b/app/views/trigger/voicemail.html.erb @@ -0,0 +1,4 @@ +<h1>Trigger#voicemail</h1> +<p>Find me in app/views/trigger/voicemail.html.erb</p> + +<%= debug(params) %> |