Permalink
Browse files

Merge branch 'develop' of git.alabs.es:oiga.me into develop

  • Loading branch information...
2 parents 9fb72ca + 960639c commit 114945f9fbeeafc46c9f6254738214fe25536bc0 @andreslucena andreslucena committed Oct 31, 2012
Showing with 4,367 additions and 2,061 deletions.
  1. +1 −1 Capfile
  2. +3 −3 Gemfile
  3. +14 −16 Gemfile.lock
  4. +5 −6 README.md
  5. +0 −28 app/abilities/admins.rb
  6. +0 −45 app/abilities/editors.rb
  7. +0 −59 app/abilities/guests.rb
  8. +0 −59 app/abilities/users.rb
  9. +16 −5 app/assets/javascripts/campaigns.js
  10. +3 −0 app/assets/javascripts/categories.js.coffee
  11. +3 −0 app/assets/stylesheets/categories.css.scss
  12. +69 −0 app/assets/stylesheets/scaffolds.css.scss
  13. +1 −13 app/controllers/application_controller.rb
  14. +114 −17 app/controllers/campaigns_controller.rb
  15. +83 −0 app/controllers/categories_controller.rb
  16. +3 −0 app/controllers/donate_controller.rb
  17. +1 −0 app/controllers/pages_controller.rb
  18. +5 −7 app/controllers/sub_oigames_controller.rb
  19. +2 −0 app/helpers/categories_helper.rb
  20. +8 −0 app/mailers/fax_mailer.rb
  21. +28 −2 app/mailers/mailman.rb
  22. +33 −3 app/models/campaign.rb
  23. +6 −0 app/models/category.rb
  24. +18 −0 app/models/donation.rb
  25. +14 −0 app/models/fax.rb
  26. +1 −0 app/models/message.rb
  27. +1 −0 app/models/petition.rb
  28. +4 −7 app/models/user.rb
  29. +29 −0 app/pdfs/fax_pdf.rb
  30. +29 −0 app/views/campaigns/_fax_form.html.erb
  31. +12 −0 app/views/campaigns/_form.html.erb
  32. +2 −2 app/views/campaigns/_list_campaigns.html.erb
  33. +12 −12 app/views/campaigns/_options_dropdown.html.erb
  34. +1 −0 app/views/campaigns/_thanks.html.erb
  35. +11 −0 app/views/campaigns/fax.html.erb
  36. +1 −1 app/views/campaigns/feed.rss.builder
  37. +36 −1 app/views/campaigns/show.html.erb
  38. +25 −0 app/views/categories/_form.html.erb
  39. +6 −0 app/views/categories/edit.html.erb
  40. +25 −0 app/views/categories/index.html.erb
  41. +5 −0 app/views/categories/new.html.erb
  42. +15 −0 app/views/categories/show.html.erb
  43. +1 −0 app/views/fax_mailer/send_fax.text.erb
  44. +1 −1 app/views/mailman/inform_campaign_activated.html.erb
  45. +1 −1 app/views/mailman/inform_campaign_activated.text.erb
  46. +1 −0 app/views/mailman/send_message_to_fax_recipients.text.erb
  47. +25 −0 app/views/mailman/send_message_to_validate_fax.html.erb
  48. +3 −3 app/views/sub_oigames/index.html.erb
  49. +1 −0 config/application.rb
  50. +19 −3 config/authorization_rules.rb
  51. +26 −0 config/deploy/staging.rb
  52. +1 −1 config/environments/development.rb
  53. +1 −1 config/environments/production.rb
  54. +1 −1 config/environments/staging.rb
  55. +1 −1 config/environments/test.rb
  56. +1 −0 config/initializers/mime_types.rb
  57. +2 −0 config/locales/en.yml
  58. +7 −3 config/locales/es.yml
  59. +6 −0 config/routes.rb
  60. +2 −2 config/thin_staging.yml
  61. +10 −0 db/migrate/20120921074714_create_categories.rb
  62. +11 −0 db/migrate/20120921075031_fix_categories_campaign_relation.rb
  63. +5 −0 db/migrate/20120921092505_add_credit_to_campaigns.rb
  64. +11 −0 db/migrate/20120921092829_fix_add_credit_to_campaigns.rb
  65. +11 −0 db/migrate/20120921131939_create_donations.rb
  66. +5 −0 db/migrate/20120927094623_add_faxes_to_campaigns.rb
  67. +9 −0 db/migrate/20120927094845_change_faxes_to_numbers_in_campaigns.rb
  68. +13 −0 db/migrate/20120927095658_create_faxes.rb
  69. +5 −0 db/migrate/20121026005727_add_fax_counts_to_campaigns.rb
  70. +5 −0 db/migrate/20121026022228_add_body_to_faxes.rb
  71. +38 −9 db/schema.rb
  72. BIN public/assets/ajax-loader-5e37430718d20a1817faf62f07e7cd83.gif
  73. +22 −0 public/assets/application-5f2467b024e21ca3d3238bfe2a21cb4e.js
  74. BIN public/assets/application-5f2467b024e21ca3d3238bfe2a21cb4e.js.gz
  75. +22 −0 public/assets/application-c6bd8ac3035f40af86e5606831143f0b.js
  76. BIN public/assets/application-c6bd8ac3035f40af86e5606831143f0b.js.gz
  77. +1 −0 public/assets/application-f3219a2798d7dd9ed31db23b658fedd6.css
  78. BIN public/assets/application-f3219a2798d7dd9ed31db23b658fedd6.css.gz
  79. +346 −346 public/assets/application.css
  80. BIN public/assets/application.css.gz
  81. +21 −5 public/assets/application.js
  82. BIN public/assets/application.js.gz
  83. BIN public/assets/arrow-left-1a96c67334ee1b8d33555a3f98e7545b.png
  84. BIN public/assets/arrow-right-62f8744e3499081bbbf84a92d88ab249.png
  85. BIN public/assets/campaign-n-dcf4cf7c17bc20513e04b38ff330d770.jpg
  86. BIN public/assets/credit-cards-527994a3f4a4f9d7cb7b3ff5384c3231.jpg
  87. BIN public/assets/doit-b3640ac677885c2a923d360972ddb4a8.jpg
  88. BIN public/assets/facebook-fb4f9360249218bcef020f62e018d210.png
  89. BIN public/assets/favicon-a1c25a648585319d5105930b382c2353.png
  90. BIN public/assets/glyphicon-0006f46019bb85257a0419f02bf78dc3.png
  91. BIN public/assets/glyphicons-halflings-f6675c325532ec11a984d58e172b8e2a.png
  92. BIN public/assets/glyphicons-halflings-white-13553a5bf21ae3cc374006592488ec64.png
  93. BIN public/assets/google-b40c6b236986aaa2332f13b76e879579.png
  94. BIN public/assets/home-subscribe-2-4fb0bc5ac2d8ee04811fc6ce35404770.jpg
  95. BIN public/assets/home-subscribe-3-2461c9eaa00e98d2d14d7379de1dc4d3.jpg
  96. BIN public/assets/home-subscribe-f844bc4aa4ffd6afe2a16f9d2be3783a.jpg
  97. BIN public/assets/identica-1a6d3669b8733befcd2d491b5f09e578.png
  98. BIN public/assets/image_132_full-1138032abdff17675a42c5620b9ddd59.jpg
  99. +21 −0 public/assets/jqplot/MIT-LICENSE-c087a22f7bad7f6c58237c1ba0611018.txt
  100. +395 −0 public/assets/jqplot/changes-56eb5383ffc984248f224801d2985db8.txt
  101. +280 −0 public/assets/jqplot/gpl-2.0-3bc479cc5b1c19a0821d25bc8ad64715.txt
  102. BIN public/assets/jqplot/images/background-999d25bf14d741ec51ad975ca55470ae.jpg
  103. BIN public/assets/jqplot/images/basicline-89383443afde1d880139f02ab99d351c.png
  104. BIN public/assets/jqplot/images/basiclogaxis-2fdd162b2f28338f341bae6f507359c0.png
  105. BIN public/assets/jqplot/images/basiclogoptions-324af457de46e163c3f871f896fb36f2.png
  106. BIN public/assets/jqplot/images/basicoptions-addaade7a175e73806edbaf627782fc0.png
  107. BIN public/assets/jqplot/images/dualaxis-044098107d3fa36430f8fdf7ebeb2f0d.png
  108. BIN public/assets/jqplot/images/logo-56b9aea9a2ea21dc36c4a930aea7d73a.jpg
  109. BIN public/assets/jqplot/images/navdocs-e23a3bbf3fce6c527729b6e96b6f58f4.png
  110. BIN public/assets/jqplot/images/navdocsover-664c05aede28d9cff62a8567a3f91597.png
  111. BIN public/assets/jqplot/images/navdownload-41eff5072faa62fb9c1e263481855f67.png
  112. BIN public/assets/jqplot/images/navdownloadover-2021769d655ffd4290b4f3bcd52cb72d.png
  113. BIN public/assets/jqplot/images/navexamples-8733176b2915c367b35a492f8fe61e2e.png
  114. BIN public/assets/jqplot/images/navexamplesover-6a16fb1ffbf4b9f0dcd377159265bba1.png
  115. BIN public/assets/jqplot/images/navhome-419302a715b8ca8bcfe5eff472cfd4c3.png
  116. BIN public/assets/jqplot/images/navhome-9cbe2b056e8cb7218a8c0b3171041bd5.gif
  117. BIN public/assets/jqplot/images/navhomeover-f65614541002f3e06612548183c64f1e.png
  118. BIN public/assets/jqplot/images/new-4d5ba838e129ddedf134d9e75866757e.png
  119. BIN public/assets/jqplot/images/sample3-0bf9adfa1f999b0c06f78e6e21bf4bb5.png
  120. BIN public/assets/jqplot/images/samplesm-009bd5bd439ab3ab3967ced50485c822.png
  121. +53 −0 public/assets/jqplot/jqPlotCssStyling-f1ba1e3af90d45f8a6376062fd1e93e1.txt
  122. +276 −0 public/assets/jqplot/jqPlotOptions-24b7765054d489e2c5b1728d0a1c8b31.txt
  123. +144 −0 public/assets/jqplot/jsl-c3d74f278535da0bc924ee50e67358c3.conf
  124. +240 −0 public/assets/jqplot/optionsTutorial-5b929181f56f46039d7da2e9013294b9.txt
  125. +126 −0 public/assets/jqplot/usage-8c2822dbeef6eafffbca5556abbc1546.txt
  126. BIN public/assets/jquery-ui/ui-bg_flat_0_aaaaaa_40x100-a1eb3e0764573ed4b261ca742ed96ac3.png
  127. BIN public/assets/jquery-ui/ui-bg_flat_75_ffffff_40x100-841636c8f8d33987bb8d2f31e8ef92ca.png
  128. BIN public/assets/jquery-ui/ui-bg_glass_55_fbf9ee_1x400-bbb04adbe79f471d8c88a2bc691231b6.png
  129. BIN public/assets/jquery-ui/ui-bg_glass_65_ffffff_1x400-a30aa544902182c133dbb46ac40a08d2.png
  130. BIN public/assets/jquery-ui/ui-bg_glass_75_dadada_1x400-38ed9f33e066d6bee977c567d4b03650.png
  131. BIN public/assets/jquery-ui/ui-bg_glass_75_e6e6e6_1x400-3e20bce1b7b2f5dd47ca6ac361805162.png
  132. BIN public/assets/jquery-ui/ui-bg_glass_95_fef1ec_1x400-c723e9a2b50006c6054836a10b76bb84.png
  133. BIN public/assets/jquery-ui/ui-bg_highlight-soft_75_cccccc_1x100-081f36ef02c9233c6db45d2d566fbecd.png
  134. BIN public/assets/jquery-ui/ui-icons_222222_256x240-1bca65a97a49d7d05ab2f3dc83b97cd5.png
  135. BIN public/assets/jquery-ui/ui-icons_2e83ff_256x240-efb394f4417cc6bd4177a1999474e1eb.png
  136. BIN public/assets/jquery-ui/ui-icons_454545_256x240-17e6740beb176dd87da44be76c94bb47.png
  137. BIN public/assets/jquery-ui/ui-icons_888888_256x240-5b928d6b862809eb8130d7b7e0b51a1d.png
  138. BIN public/assets/jquery-ui/ui-icons_cd0a0a_256x240-635d34cf8bf22d711a729017ab9aaebe.png
  139. BIN public/assets/jquery.multiselect/arrow-dfb2f5f21502504ef1616210219dbf39.png
  140. BIN public/assets/jquery.multiselect/check-3a4fb4409731d1ccad33b0ff6a00b3ce.gif
  141. BIN public/assets/jquery.multiselect/delete-be2fd4187f3fb0a00212b646d9055991.png
  142. BIN public/assets/jquery.multiselect/download-be51e7ca224d5338fc55f9bac6d425ca.png
  143. BIN public/assets/jquery.multiselect/minus-2ffac06042d94208a02329ee872b5f37.png
  144. BIN public/assets/jquery.multiselect/plus-d0177f74bdd3974c4482c56851c8694c.png
  145. BIN public/assets/logo-a087119ca63cc090c7b5be1232948c95.png
  146. BIN public/assets/logo-alabs-3d9b5fa8430ddd303546492d15d51ca2.png
  147. BIN public/assets/logo-header-e54b282961dde6d951a732b93d10eb7b.png
  148. BIN public/assets/logo-small-82867b4d46a2c9311b3d1a19893c7758.png
  149. BIN public/assets/rails-be8732dac73d845ac5b142c8fb5f9fb0.png
  150. BIN public/assets/rails_admin/aristo/images/bg_fallback-55829c6af9b9af338904d5a0ed9c191d.png
  151. BIN public/assets/rails_admin/aristo/images/icon_sprite-555074e93c8d91f9f72d1a211d5a820e.png
  152. BIN public/assets/rails_admin/aristo/images/progress_bar-f2c649fbf555aafd4d55d58040db2990.gif
  153. BIN public/assets/rails_admin/aristo/images/slider_handles-18c8427ce2b4db2717a495e43f5b955a.png
  154. BIN public/assets/rails_admin/aristo/images/ui-icons_222222_256x240-4ffd13be9750b79d62db5d2f9670150c.png
  155. BIN public/assets/rails_admin/aristo/images/ui-icons_454545_256x240-db2a5b254322e84a22f467b70714c5e8.png
  156. BIN public/assets/rails_admin/bullet_black-fb925ccd168e60d6e5d815a6aece4589.png
  157. BIN public/assets/rails_admin/bullet_white-923b318d1e8c7c97a32ba0c20e7b6689.png
  158. BIN public/assets/rails_admin/calendar-13a6d7786e5a84a56ee878b51ece179c.png
  159. BIN public/assets/rails_admin/clock-6a8f47471bb53df6f88dff7d09e07ad1.png
  160. BIN public/assets/rails_admin/colorpicker/colorpicker_background-048f73d2197eb49e3a90ae38d2816cdd.png
  161. BIN public/assets/rails_admin/colorpicker/colorpicker_hex-99830a101d61209e6192df94b8ac7677.png
  162. BIN public/assets/rails_admin/colorpicker/colorpicker_hsb_b-b1f8c2ee6da94baff5c07edca08142f5.png
  163. BIN public/assets/rails_admin/colorpicker/colorpicker_hsb_h-ca3d3fef9d952ff650adbbf2589e0fdc.png
  164. BIN public/assets/rails_admin/colorpicker/colorpicker_hsb_s-b204264e2dfbc5022420ebff51bd33d1.png
  165. BIN public/assets/rails_admin/colorpicker/colorpicker_indic-a265cbcec55d8ebb2fa455406f3c4c67.gif
  166. BIN public/assets/rails_admin/colorpicker/colorpicker_overlay-e37c7a0e6722d79c2d831cbc4005c150.png
  167. BIN public/assets/rails_admin/colorpicker/colorpicker_rgb_b-b1f8c2ee6da94baff5c07edca08142f5.png
  168. BIN public/assets/rails_admin/colorpicker/colorpicker_rgb_g-b34aa4f0ac50eb748f24dfdb56bf0b8b.png
  169. BIN public/assets/rails_admin/colorpicker/colorpicker_rgb_r-84d6f5959f57751e0a799fa654f6e9f5.png
  170. BIN public/assets/rails_admin/colorpicker/colorpicker_select-3fc715e54e7039ee50b9592b338ef08f.gif
  171. BIN public/assets/rails_admin/colorpicker/colorpicker_submit-9f0dad7252e7a2c08a3102aac44ad57c.png
  172. BIN public/assets/rails_admin/colorpicker/custom_background-4918ca876d4c0ec452083963bb22cdd5.png
  173. BIN public/assets/rails_admin/colorpicker/custom_hex-adb6aff23343acff0818159a155129bd.png
  174. BIN public/assets/rails_admin/colorpicker/custom_hsb_b-e7f9c0f36f62239fe639c3b33d41c224.png
  175. BIN public/assets/rails_admin/colorpicker/custom_hsb_h-c6aaf092cb5c14b80ac215bcf328062c.png
  176. BIN public/assets/rails_admin/colorpicker/custom_hsb_s-851dc4536be362e46ff7ae5cd19bed8f.png
  177. BIN public/assets/rails_admin/colorpicker/custom_indic-65a0c54dc3dc71b411860099083cf3c8.gif
  178. BIN public/assets/rails_admin/colorpicker/custom_rgb_b-a2c88aa0598d36877955637d5d087ccb.png
  179. BIN public/assets/rails_admin/colorpicker/custom_rgb_g-8168396c69abb4711dc96f3eb3647c6a.png
  180. BIN public/assets/rails_admin/colorpicker/custom_rgb_r-635d35fb12152da3becbc6e1b988f1dd.png
  181. BIN public/assets/rails_admin/colorpicker/custom_submit-b7b697c57d76373fff9b2fd34f02e610.png
  182. BIN public/assets/rails_admin/colorpicker/select-e2db6ab623497966f4c045881155d859.png
  183. BIN public/assets/rails_admin/colorpicker/select2-6d33229ac6f20dbf9c0f0c1d3916177e.png
  184. BIN public/assets/rails_admin/colorpicker/slider-6e44c1f2cd6b11a4a50cc292373dd198.png
  185. +9 −0 public/assets/rails_admin/jquery.colorpicker-443fbf18f0ea44e061d33330fc99068d.js
  186. BIN public/assets/rails_admin/jquery.colorpicker-443fbf18f0ea44e061d33330fc99068d.js.gz
  187. +1 −0 public/assets/rails_admin/jquery.colorpicker-9b45d2697f2d0f573b542f2fdbe60432.css
  188. BIN public/assets/rails_admin/jquery.colorpicker-9b45d2697f2d0f573b542f2fdbe60432.css.gz
  189. +26 −26 public/assets/rails_admin/jquery.colorpicker.css
  190. BIN public/assets/rails_admin/jquery.colorpicker.css.gz
  191. BIN public/assets/rails_admin/jquery.colorpicker.js.gz
  192. BIN public/assets/rails_admin/logo-927c2ca4102e0140c47ef741790a0b64.png
  193. BIN public/assets/rails_admin/magnifier-a0121e705a11406d01cc2aa72af5670a.png
  194. BIN public/assets/rails_admin/multiselect/icon_sprite-555074e93c8d91f9f72d1a211d5a820e.png
  195. BIN ...ssets/rails_admin/multiselect/ui-icon-circle-triangle-n-dark-3a4de5f666ef99b65efa429d01355d0d.png
  196. BIN ...sets/rails_admin/multiselect/ui-icon-circle-triangle-n-light-63951a1feb158c987d5e473dc87ba1ad.png
  197. BIN ...ssets/rails_admin/multiselect/ui-icon-circle-triangle-s-dark-03eca32d57c6ea3674881671c1b92e89.png
  198. BIN ...sets/rails_admin/multiselect/ui-icon-circle-triangle-s-light-a02877fe58788fc6fa05616a3a57c8c8.png
  199. +22 −0 public/assets/rails_admin/rails_admin-098c85a65a34807f223ea4d0ec56b7ed.js
  200. BIN public/assets/rails_admin/rails_admin-098c85a65a34807f223ea4d0ec56b7ed.js.gz
  201. +1 −0 public/assets/rails_admin/rails_admin-157a12d873ed1217f5505d7152a08959.css
  202. BIN public/assets/rails_admin/rails_admin-157a12d873ed1217f5505d7152a08959.css.gz
  203. +1,371 −1,371 public/assets/rails_admin/rails_admin.css
  204. BIN public/assets/rails_admin/rails_admin.css.gz
  205. BIN public/assets/rails_admin/rails_admin.js.gz
  206. BIN public/assets/repeat-0bfe0e1719202baa9e388c317f360e63.jpg
  207. BIN public/assets/rss-f397ebf42203eaf76aa732432b1421a2.png
  208. BIN public/assets/sayit-32b58b6192f51871d31c10e328d91931.jpg
  209. BIN public/assets/slide1-1ecf8031d047fc2bed85f44ff2bd19e1.png
  210. BIN public/assets/slide2-293dec8f49c722dfce48e39692b1dd6f.png
  211. BIN public/assets/slide3-e0a558c65a713d529c9337edc81e1f76.png
  212. BIN public/assets/slideshow/arrows-300e6abb48b074a7bec7e24cfd723df2.png
  213. BIN public/assets/slideshow/bullets-7b4ea662c4166598d48d8bef77356483.png
  214. BIN public/assets/slideshow/loading-f4f3bf7283eaff292efbd1812a2ff134.gif
  215. BIN public/assets/sprite-icons-0a7acfcb632e9aa48ff24facd9428f20.png
  216. BIN public/assets/subscribe-wrapper-bg-d08b94bc823067b746c8c05d74adc21c.gif
  217. +1 −0 public/assets/tolk/application-ae09b922b150ae154e37b1b668931b57.css
  218. BIN public/assets/tolk/application-ae09b922b150ae154e37b1b668931b57.css.gz
  219. +12 −0 public/assets/tolk/application-d6f77ba79d726b1fa8ceadb0f1aa1481.js
  220. BIN public/assets/tolk/application-d6f77ba79d726b1fa8ceadb0f1aa1481.js.gz
  221. BIN public/assets/tolk/application.css.gz
  222. BIN public/assets/tolk/application.js.gz
  223. BIN public/assets/twitter-c59bd83db0662dc8d741e49b7362fd89.png
  224. BIN public/assets/view-fullscreen-44fcd3547ac4b8502aad6465d04aba4b.png
  225. BIN public/assets/wmd-buttons-132fba44e69099523c22178ef8a55540.png
  226. +8 −0 test/factories/categories.rb
  227. +9 −0 test/factories/donations.rb
  228. +11 −0 test/factories/faxes.rb
  229. +49 −0 test/functional/categories_controller_test.rb
  230. +7 −0 test/functional/fax_mailer_test.rb
  231. +7 −0 test/unit/category_test.rb
  232. +7 −0 test/unit/donation_test.rb
  233. +7 −0 test/unit/fax_test.rb
  234. +4 −0 test/unit/helpers/categories_helper_test.rb
View
@@ -1,7 +1,7 @@
load 'deploy' if respond_to?(:namespace) # cap2 differentiator
# Uncomment if you are using Rails' asset pipeline
-#load 'deploy/assets'
+load 'deploy/assets'
Dir['vendor/gems/*/recipes/*.rb','vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
View
@@ -60,7 +60,7 @@ gem 'thinking-sphinx', '2.0.10'
gem 'fb_graph'
#gem 'kaminari'
gem 'omniauth-facebook'
-gem 'omniauth-twitter'
+#gem 'omniauth-twitter'
gem 'rails_admin'
gem 'mailcatcher'
@@ -72,6 +72,6 @@ gem 'tolk'
gem 'will_paginate'
gem 'will_paginate-bootstrap'
-gem 'canard'
-
+#gem 'canard'
gem 'declarative_authorization'
+gem 'prawn'
View
@@ -18,6 +18,7 @@ GIT
GEM
remote: http://rubygems.org/
specs:
+ Ascii85 (1.0.2)
actionmailer (3.2.8)
actionpack (= 3.2.8)
mail (~> 2.4.4)
@@ -53,11 +54,7 @@ GEM
bcrypt-ruby (3.0.1)
bootstrap-sass (2.1.0.0)
builder (3.0.3)
- canard (0.4.0)
- cancan
- role_model
- cancan (1.6.8)
- capistrano (2.13.3)
+ capistrano (2.13.4)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
@@ -114,6 +111,7 @@ GEM
ffi (1.1.5)
geocoder (1.1.3)
haml (3.1.7)
+ hashery (2.0.1)
hashie (1.2.0)
highline (1.6.15)
hike (1.2.1)
@@ -164,12 +162,11 @@ GEM
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
- net-ssh (2.5.2)
+ net-ssh (2.6.1)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
newrelic_rpm (3.4.2)
nokogiri (1.5.5)
- oauth (0.4.7)
oauth2 (0.8.0)
faraday (~> 0.8)
httpauth (~> 0.1)
@@ -181,17 +178,18 @@ GEM
rack
omniauth-facebook (1.4.1)
omniauth-oauth2 (~> 1.1.0)
- omniauth-oauth (1.0.1)
- oauth
- omniauth (~> 1.0)
omniauth-oauth2 (1.1.0)
oauth2 (~> 0.8.0)
omniauth (~> 1.0)
- omniauth-twitter (0.0.13)
- multi_json (~> 1.3)
- omniauth-oauth (~> 1.0)
orm_adapter (0.4.0)
+ pdf-reader (1.2.0)
+ Ascii85 (~> 1.0.0)
+ hashery (~> 2.0)
+ ruby-rc4
polyglot (0.3.3)
+ prawn (0.12.0)
+ pdf-reader (>= 0.9.0)
+ ttfunk (~> 1.0.2)
pry (0.9.10)
coderay (~> 1.0.5)
method_source (~> 0.8)
@@ -271,7 +269,7 @@ GEM
remotipart (1.0.2)
riddle (1.5.3)
rmagick (2.13.1)
- role_model (0.7.1)
+ ruby-rc4 (0.1.5)
rubyzip (0.9.9)
sass (3.2.1)
sass-rails (3.2.3)
@@ -323,6 +321,7 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
+ ttfunk (1.0.3)
turn (0.9.6)
ansi
twitter (3.7.0)
@@ -349,7 +348,6 @@ PLATFORMS
ruby
DEPENDENCIES
- canard
capistrano
capistrano-ext
capybara
@@ -372,7 +370,7 @@ DEPENDENCIES
mysql2
newrelic_rpm
omniauth-facebook
- omniauth-twitter
+ prawn
pry-rails
query_reviewer!
rails (= 3.2.8)
View
@@ -26,20 +26,19 @@ Instalación de entorno de desarrollo
Instrucciones para Linux y MacOSX
-oiga.me necesita ruby 1.9.2, lo mejor es que te instales rvm o rbenv. Para hacerlo con rvm, por
+oiga.me necesita ruby 1.9, lo mejor es que te instales rvm o rbenv. Para hacerlo con rvm, por
ejemplo:
```shell
-$ bash < <(curl -s https://raw.github.com/wayneeseguin/rvm/master/binscripts/rvm-installer )
+$ curl -L https://get.rvm.io | bash -s stable --ruby
```
-y luego crea un archivo .rvmrc en la raiz del proyecto, que contenga: "rvm 1.9.2" (sin las comillas)
```shell
$ gem install bundler
$ bundle # en la carpeta raíz del proyecto
-$ rake db:create
-$ rake db:migrate
-$ bundle exec unicorn_rails
+$ bundle exec rake db:create
+$ bundle exec rake db:migrate
+$ bundle exec thin start -p 8080
```
Se necesitan las siguientes dependencias:
View
@@ -1,28 +0,0 @@
-Canard::Abilities.for(:admin) do
-
- # Define abilities for the user role here. For example:
- #
- # if user.admin?
- # can :manage, :all
- # else
- # can :read, :all
- # end
- #
- # The first argument to `can` is the action you are giving the user permission to do.
- # If you pass :manage it will apply to every action. Other common actions here are
- # :read, :create, :update and :destroy.
- #
- # The second argument is the resource the user can perform the action on. If you pass
- # :all it will apply to every resource. Otherwise pass a Ruby class of the resource.
- #
- # The third argument is an optional hash of conditions to further filter the objects.
- # For example, here the user can only update published articles.
- #
- # can :update, Article, :published => true
- #
- # See the wiki for details: https://github.com/ryanb/cancan/wiki/Defining-Abilities
-
- can :access, :rails_admin
- can :dashboard
- can :manage, :all
-end
View
@@ -1,45 +0,0 @@
-Canard::Abilities.for(:editor) do
-
- # Define abilities for the user role here. For example:
- #
- # if user.admin?
- # can :manage, :all
- # else
- # can :read, :all
- # end
- #
- # The first argument to `can` is the action you are giving the user permission to do.
- # If you pass :manage it will apply to every action. Other common actions here are
- # :read, :create, :update and :destroy.
- #
- # The second argument is the resource the user can perform the action on. If you pass
- # :all it will apply to every resource. Otherwise pass a Ruby class of the resource.
- #
- # The third argument is an optional hash of conditions to further filter the objects.
- # For example, here the user can only update published articles.
- #
- # can :update, Article, :published => true
- #
- # See the wiki for details: https://github.com/ryanb/cancan/wiki/Defining-Abilities
-
- cannot :access, :rails_admin # revoke access to rails_admin
- cannot :dashboard # revoke access to the dashboard
- can :manage, Campaign do |campaign|
- campaign.sub_oigame.nil?
- end
- cannot :participants, Campaign
- can :participants, Campaign do |campaign|
- campaign.user == user
- end
- can :manage, Campaign do |campaign|
- unless campaign.sub_oigame.nil?
- campaign.sub_oigame.users.include? user
- end
- end
- # sub_oigames
- cannot :read, SubOigame
- can :manage, SubOigame do |sub|
- sub.users.include? user
- end
- cannot :index, SubOigame
-end
View
@@ -1,59 +0,0 @@
-Canard::Abilities.for(:guest) do
-
- # Define abilities for the user role here. For example:
- #
- # if user.admin?
- # can :manage, :all
- # else
- # can :read, :all
- # end
- #
- # The first argument to `can` is the action you are giving the user permission to do.
- # If you pass :manage it will apply to every action. Other common actions here are
- # :read, :create, :update and :destroy.
- #
- # The second argument is the resource the user can perform the action on. If you pass
- # :all it will apply to every resource. Otherwise pass a Ruby class of the resource.
- #
- # The third argument is an optional hash of conditions to further filter the objects.
- # For example, here the user can only update published articles.
- #
- # can :update, Article, :published => true
- #
- # See the wiki for details: https://github.com/ryanb/cancan/wiki/Defining-Abilities
-
- cannot :access, :rails_admin # revoke access to rails_admin
- cannot :dashboard # revoke access to the dashboard
- can :read, Campaign, :moderated => false
- can :read, Campaign do |campaign|
- unless campaign.sub_oigame.nil?
- campaign.sub_oigame.users.include? user
- end
- end
- can :read, Campaign, :status => 'archived'
- can :create, Campaign
- can :update, Campaign, :moderated => false, :user => user
- can :participants, Campaign, :moderated => false, :user => user
- can :widget, Campaign, :moderated => false
- can :widget_iframe, Campaign, :moderated => false
- can :petition, Campaign, :moderated => false
- can :validate, Campaign, :moderated => false
- can :validated, Campaign, :moderated => false
- can :archived, Campaign, :status => 'archived'
- can :moderated, Campaign do |campaign|
- unless campaign.sub_oigame.nil?
- campaign.sub_oigame.users.include? user
- end
- end
- can :manage, Campaign do |campaign|
- unless campaign.sub_oigame.nil?
- campaign.sub_oigame.users.include? user
- end
- end
- # sub_oigames
- cannot :read, SubOigame
- can :manage, SubOigame do |sub|
- sub.users.include? user
- end
- cannot :index, SubOigame
-end
View
@@ -1,59 +0,0 @@
-Canard::Abilities.for(:user) do
-
- # Define abilities for the user role here. For example:
- #
- # if user.admin?
- # can :manage, :all
- # else
- # can :read, :all
- # end
- #
- # The first argument to `can` is the action you are giving the user permission to do.
- # If you pass :manage it will apply to every action. Other common actions here are
- # :read, :create, :update and :destroy.
- #
- # The second argument is the resource the user can perform the action on. If you pass
- # :all it will apply to every resource. Otherwise pass a Ruby class of the resource.
- #
- # The third argument is an optional hash of conditions to further filter the objects.
- # For example, here the user can only update published articles.
- #
- # can :update, Article, :published => true
- #
- # See the wiki for details: https://github.com/ryanb/cancan/wiki/Defining-Abilities
-
- cannot :access, :rails_admin # revoke access to rails_admin
- cannot :dashboard # revoke access to the dashboard
- can :read, Campaign, :moderated => false
- can :read, Campaign do |campaign|
- unless campaign.sub_oigame.nil?
- campaign.sub_oigame.users.include? user
- end
- end
- can :read, Campaign, :status => 'archived'
- can :create, Campaign
- can :update, Campaign, :moderated => false, :user => user
- can :participants, Campaign, :moderated => false, :user => user
- can :widget, Campaign, :moderated => false
- can :widget_iframe, Campaign, :moderated => false
- can :petition, Campaign, :moderated => false
- can :validate, Campaign, :moderated => false
- can :validated, Campaign, :moderated => false
- can :archived, Campaign, :status => 'archived'
- can :moderated, Campaign do |campaign|
- unless campaign.sub_oigame.nil?
- campaign.sub_oigame.users.include? user
- end
- end
- can :manage, Campaign do |campaign|
- unless campaign.sub_oigame.nil?
- campaign.sub_oigame.users.include? user
- end
- end
- # sub_oigames
- cannot :read, SubOigame
- can :manage, SubOigame do |sub|
- sub.users.include? user
- end
- cannot :index, SubOigame
-end
@@ -9,22 +9,33 @@ function draw_stats_chart(){
function switch_campaign_type(ctype) {
switch (ctype) {
case "petition":
- $(".form-campaign")
+ $(".form-campaign, .form-fax")
.hide("slow");
- $(".form-campaign input, .form-campaign textarea")
+ $(".form-campaign input, .form-campaign textarea, .form-fax input, .form-fax textarea")
.removeAttr("required");
break;
case "mailing":
+ $(".form-fax")
+ .hide("slow");
$(".form-campaign")
.show("slow")
.removeClass("hide");
- $(".form-campaign input, .form-campaign textarea")
+ $("form-campaign input, .form-campaign textarea")
.attr("required", "required");
break;
- default:
+ case "fax":
$(".form-campaign")
.hide("slow");
- $(".form-campaign input, .form-campaign textarea")
+ $(".form-fax")
+ .show("slow")
+ .removeClass("hide");
+ $(".form-fax input, .form-fax textarea")
+ .attr("required", "required");
+ break;
+ default:
+ $(".form-campaign, .form-fax")
+ .hide("slow");
+ $(".form-campaign input, .form-campaign textarea, .form-fax input .form-fax textarea")
.removeAttr("required");
break;
}
@@ -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/
@@ -0,0 +1,3 @@
+// Place all the styles related to the categories controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
Oops, something went wrong.

0 comments on commit 114945f

Please sign in to comment.