Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

testing albums branch

  • Loading branch information...
commit fe067355f37b727aecad12a67ff83683a9029bb1 1 parent 7228fb9
@juafrlo juafrlo authored
Showing with 220 additions and 183 deletions.
  1. +5 −0 CHANGELOG
  2. 0  LICENSE
  3. +2 −3 README.markdown
  4. 0  Rakefile
  5. 0  UPGRADING.markdown
  6. +1 −1  about.yml
  7. 0  app/controllers/activities_controller.rb
  8. 0  app/controllers/admin_controller.rb
  9. 0  app/controllers/ads_controller.rb
  10. 0  app/controllers/albums_controller.rb
  11. 0  app/controllers/application_controller.rb
  12. 0  app/controllers/base_controller.rb
  13. 0  app/controllers/categories_controller.rb
  14. 0  app/controllers/clippings_controller.rb
  15. 0  app/controllers/comment_sweeper.rb
  16. 0  app/controllers/comments_controller.rb
  17. 0  app/controllers/contests_controller.rb
  18. 0  app/controllers/events_controller.rb
  19. 0  app/controllers/favorite_sweeper.rb
  20. 0  app/controllers/favorites_controller.rb
  21. 0  app/controllers/forums_controller.rb
  22. 0  app/controllers/friendships_controller.rb
  23. 0  app/controllers/homepage_features_controller.rb
  24. 0  app/controllers/invitations_controller.rb
  25. 0  app/controllers/messages_controller.rb
  26. 0  app/controllers/metro_areas_controller.rb
  27. 0  app/controllers/moderators_controller.rb
  28. 0  app/controllers/monitorships_controller.rb
  29. 0  app/controllers/offerings_controller.rb
  30. 0  app/controllers/photo_manager_controller.rb
  31. 0  app/controllers/photos_controller.rb
  32. 0  app/controllers/post_sweeper.rb
  33. 0  app/controllers/posts_controller.rb
  34. 0  app/controllers/sb_posts_controller.rb
  35. 0  app/controllers/sessions_controller.rb
  36. 0  app/controllers/sitemap_controller.rb
  37. 0  app/controllers/skills_controller.rb
  38. 0  app/controllers/static_pages_controller.rb
  39. +2 −2 app/controllers/statistics_controller.rb
  40. 0  app/controllers/taggable_sweeper.rb
  41. 0  app/controllers/tags_controller.rb
  42. 0  app/controllers/theme_controller.rb
  43. 0  app/controllers/topics_controller.rb
  44. +1 −1  app/controllers/users_controller.rb
  45. 0  app/controllers/vote_sweeper.rb
  46. 0  app/controllers/votes_controller.rb
  47. 0  app/controllers/xmlrpc_controller.rb
  48. 0  app/helpers/ads_helper.rb
  49. 0  app/helpers/albums_helper.rb
  50. +13 −2 app/helpers/base_helper.rb
  51. 0  app/helpers/categories_helper.rb
  52. 0  app/helpers/clippings_helper.rb
  53. 0  app/helpers/comments_helper.rb
  54. 0  app/helpers/contests_helper.rb
  55. 0  app/helpers/forums_helper.rb
  56. 0  app/helpers/friendships_helper.rb
  57. 0  app/helpers/homepage_features_helper.rb
  58. 0  app/helpers/invitations_helper.rb
  59. 0  app/helpers/metro_areas_helper.rb
  60. 0  app/helpers/moderators_helper.rb
  61. 0  app/helpers/monitorships_helper.rb
  62. 0  app/helpers/offerings_helper.rb
  63. 0  app/helpers/photos_helper.rb
  64. 0  app/helpers/posts_helper.rb
  65. 0  app/helpers/sb_posts_helper.rb
  66. 0  app/helpers/sessions_helper.rb
  67. 0  app/helpers/sitemap_helper.rb
  68. 0  app/helpers/skills_helper.rb
  69. 0  app/helpers/statistics_helper.rb
  70. 0  app/helpers/tags_helper.rb
  71. 0  app/helpers/topics_helper.rb
  72. 0  app/helpers/users_helper.rb
  73. 0  app/models/ad.rb
  74. 0  app/models/album.rb
  75. 0  app/models/asset.rb
  76. 0  app/models/category.rb
  77. 0  app/models/choice.rb
  78. 0  app/models/clipping.rb
  79. 0  app/models/clipping_image.rb
  80. 0  app/models/comment.rb
  81. 0  app/models/contest.rb
  82. 0  app/models/country.rb
  83. 0  app/models/event.rb
  84. 0  app/models/favorite.rb
  85. 0  app/models/forum.rb
  86. 0  app/models/friendship.rb
  87. 0  app/models/friendship_status.rb
  88. 0  app/models/homepage_feature.rb
  89. 0  app/models/invitation.rb
  90. 0  app/models/message.rb
  91. 0  app/models/metro_area.rb
  92. 0  app/models/moderatorship.rb
  93. 0  app/models/monitorship.rb
  94. 0  app/models/offering.rb
  95. +10 −0 app/models/photo.rb
  96. 0  app/models/poll.rb
  97. 0  app/models/post.rb
  98. 0  app/models/role.rb
  99. 0  app/models/sb_post.rb
  100. 0  app/models/skill.rb
  101. 0  app/models/state.rb
  102. 0  app/models/static_page.rb
  103. 0  app/models/tag.rb
  104. 0  app/models/topic.rb
  105. +11 −3 app/models/user.rb
  106. 0  app/models/user_notifier.rb
  107. 0  app/models/user_observer.rb
  108. 0  app/models/vote.rb
  109. 0  app/views/activities/_activity.html.haml
  110. 0  app/views/activities/_icon.html.haml
  111. 0  app/views/activities/_unhandled_item.html.haml
  112. 0  app/views/activities/destroy.js.rjs
  113. +2 −2 app/views/activities/index.html.haml
  114. +1 −1  app/views/activities/network.html.haml
  115. +1 −1  app/views/admin/comments.html.haml
  116. +1 −1  app/views/admin/contests.html.haml
  117. 0  app/views/admin/messages.html.haml
  118. +3 −2 app/views/admin/users.html.haml
  119. +1 −1  app/views/ads/edit.html.haml
  120. +1 −1  app/views/ads/index.html.haml
  121. +1 −1  app/views/ads/new.html.haml
  122. +1 −1  app/views/ads/show.html.haml
  123. 0  app/views/albums/_form.html.erb
  124. 0  app/views/albums/edit.html.erb
  125. 0  app/views/albums/new.html.erb
  126. 0  app/views/albums/show.html.erb
  127. +2 −2 app/views/base/_about_nav.html.haml
  128. +2 −2 app/views/base/_homepage_banner_message.html.haml
  129. +1 −1  app/views/base/about.html.haml
  130. +1 −1  app/views/base/advertise.html.haml
  131. +2 −6 app/views/base/faq.html.haml
  132. 0  app/views/base/plaxo.html.haml
  133. +5 −5 app/views/base/site_index.html.haml
  134. 0  app/views/base/teaser.html.haml
  135. 0  app/views/categories/_tips.html.haml
  136. +1 −1  app/views/categories/edit.html.haml
  137. +1 −1  app/views/categories/index.html.haml
  138. +1 −1  app/views/categories/new.html.haml
  139. +4 −4 app/views/categories/show.html.haml
  140. 0  app/views/clippings/_clipping.html.haml
  141. 0  app/views/clippings/_images.html.haml
  142. 0  app/views/clippings/_meta.html.haml
  143. +2 −2 app/views/clippings/edit.html.haml
  144. +5 −4 app/views/clippings/index.html.haml
  145. 0  app/views/clippings/load_images_from_uri.js.rjs
  146. +2 −2 app/views/clippings/new.html.haml
  147. +2 −2 app/views/clippings/new_clipping.html.haml
  148. +4 −4 app/views/clippings/show.html.haml
  149. +3 −3 app/views/clippings/site_index.html.haml
  150. 0  app/views/comments/_comment.html.haml
  151. 0  app/views/comments/_comment_form.html.haml
  152. 0  app/views/comments/create.js.rjs
  153. +2 −2 app/views/comments/index.html.haml
  154. 0  app/views/contests/edit.html.erb
  155. +1 −1  app/views/contests/index.html.haml
  156. 0  app/views/contests/new.html.erb
  157. 0  app/views/contests/show.html.erb
  158. +1 −1  app/views/events/edit.html.haml
  159. +3 −3 app/views/events/index.html.haml
  160. +1 −1  app/views/events/new.html.haml
  161. +2 −2 app/views/events/show.html.haml
  162. 0  app/views/favorites/_favorite.html.haml
  163. 0  app/views/favorites/create.js.rjs
  164. 0  app/views/favorites/destroy.js.rjs
  165. +1 −1  app/views/favorites/index.html.haml
  166. 0  app/views/favorites/show.html.haml
  167. 0  app/views/forums/_form.html.haml
  168. +1 −1  app/views/forums/edit.html.haml
  169. +2 −2 app/views/forums/index.html.haml
  170. +1 −1  app/views/forums/new.html.haml
  171. +2 −2 app/views/forums/show.html.haml
  172. 0  app/views/friendships/_friendship.html.haml
  173. 0  app/views/friendships/_friendships.html.erb
  174. +1 −1  app/views/friendships/accepted.html.haml
  175. +1 −1  app/views/friendships/denied.html.haml
  176. 0  app/views/friendships/index.html.erb
  177. 0  app/views/friendships/index.xml.builder
  178. +1 −1  app/views/friendships/pending.html.haml
  179. +1 −1  app/views/friendships/show.html.haml
  180. 0  app/views/homepage_features/edit.html.erb
  181. +1 −1  app/views/homepage_features/index.html.haml
  182. 0  app/views/homepage_features/new.html.erb
  183. 0  app/views/homepage_features/show.html.erb
  184. 0  app/views/invitations/index.html.erb
  185. +2 −2 app/views/invitations/new.html.haml
  186. 0  app/views/layouts/_post.xml.builder
  187. 0  app/views/layouts/application.html.haml
  188. 0  app/views/layouts/beta.html.haml
  189. 0  app/views/messages/_form.html.haml
  190. +1 −1  app/views/messages/_inbox.html.haml
  191. +1 −1  app/views/messages/_sent.html.haml
  192. +1 −1  app/views/messages/_sidebar_nav.html.haml
  193. 0  app/views/messages/index.html.haml
  194. +1 −1  app/views/messages/new.html.haml
  195. +1 −1  app/views/messages/show.html.haml
  196. +1 −1  app/views/metro_areas/edit.html.haml
  197. +1 −1  app/views/metro_areas/index.html.haml
  198. +1 −1  app/views/metro_areas/new.html.haml
  199. +1 −1  app/views/metro_areas/show.html.haml
  200. 0  app/views/moderators/_toggle.html.erb
  201. 0  app/views/moderators/create.js.rjs
  202. 0  app/views/moderators/destroy.js.rjs
  203. 0  app/views/monitorships/create.js.rjs
  204. 0  app/views/monitorships/destroy.js.rjs
  205. +1 −1  app/views/offerings/_chooser.html.haml
  206. 0  app/views/photo_manager/index.html.erb
  207. 0  app/views/photos/_manage_photos.html.haml
  208. 0  app/views/photos/_show_image_list.html.haml
  209. +4 −3 app/views/photos/edit.html.haml
  210. +2 −2 app/views/photos/index.html.haml
  211. 0  app/views/photos/index.xml.builder
  212. 0  app/views/photos/manage_photos.js.rjs
  213. +5 −4 app/views/photos/new.html.haml
  214. +1 −1  app/views/photos/recent.html.haml
  215. +12 −9 app/views/photos/show.html.haml
  216. 0  app/views/photos/slideshow.html.erb
  217. 0  app/views/polls/_edit.html.haml
  218. 0  app/views/polls/_excerpt.html.haml
  219. 0  app/views/polls/_new.html.haml
  220. 0  app/views/polls/_poll_ui.html.haml
  221. 0  app/views/polls/_polls_sidebar.html.haml
  222. +1 −1  app/views/posts/_author_profile.html.haml
  223. 0  app/views/posts/_favorited_post.html.haml
  224. 0  app/views/posts/_post.html.haml
  225. 0  app/views/posts/_send_to_friend.html.erb
  226. 0  app/views/posts/_sidebar_post.html.haml
  227. +2 −2 app/views/posts/edit.html.haml
  228. +2 −2 app/views/posts/featured.html.haml
  229. +2 −2 app/views/posts/index.html.haml
  230. +2 −2 app/views/posts/manage.html.haml
  231. +3 −3 app/views/posts/new.html.haml
  232. +3 −3 app/views/posts/popular.html.haml
  233. 0  app/views/posts/preview.html.erb
  234. +2 −2 app/views/posts/recent.html.haml
  235. +4 −4 app/views/posts/show.html.haml
  236. 0  app/views/sb_posts/_dummy_forum_post.html.erb
  237. 0  app/views/sb_posts/_edit.html.erb
  238. 0  app/views/sb_posts/edit.html.erb
  239. 0  app/views/sb_posts/edit.js.rjs
  240. +2 −2 app/views/sb_posts/index.html.haml
  241. 0  app/views/sb_posts/index.xml.builder
  242. 0  app/views/sb_posts/monitored.html.erb
  243. 0  app/views/sb_posts/monitored.xml.builder
  244. 0  app/views/sb_posts/update.js.rjs
  245. +1 −1  app/views/sessions/new.html.haml
  246. +1 −1  app/views/shared/_admin_nav.html.haml
  247. 0  app/views/shared/_bio_help.html.haml
  248. +3 −0  app/views/shared/_box.html.haml
  249. +2 −2 app/views/shared/_footer_content.html.haml
  250. 0  app/views/shared/_header.html.haml
  251. 0  app/views/shared/_location_chooser.html.haml
  252. +1 −1  app/views/shared/_login_sidebar.html.haml
  253. 0  app/views/shared/_messages.html.haml
  254. 0  app/views/shared/_scripts_and_styles.html.haml
  255. 0  app/views/shared/_user_menu.html.haml
  256. +1 −1  app/views/sitemap/index.html.haml
  257. 0  app/views/sitemap/index.xml.builder
  258. +1 −1  app/views/skills/_sidebar_menu.html.haml
  259. +1 −1  app/views/skills/edit.html.haml
  260. +3 −3 app/views/skills/index.html.haml
  261. +1 −1  app/views/skills/new.html.haml
  262. +1 −1  app/views/skills/show.html.haml
  263. 0  app/views/static_pages/_form.html.erb
  264. 0  app/views/static_pages/edit.html.erb
  265. 0  app/views/static_pages/index.html.haml
  266. 0  app/views/static_pages/new.html.erb
  267. 0  app/views/static_pages/show.html.erb
  268. 0  app/views/static_pages/show_web.html.erb
  269. 0  app/views/statistics/activities.xml.builder
  270. +1 −1  app/views/statistics/index.html.haml
  271. +3 −3 app/views/tags/index.html.haml
  272. +6 −8 app/views/tags/show.html.haml
  273. 0  app/views/topics/_form.html.haml
  274. 0  app/views/topics/_recent_topics_sidebar.haml
  275. +1 −1  app/views/topics/edit.html.haml
  276. +2 −2 app/views/topics/new.html.haml
  277. +3 −3 app/views/topics/show.html.haml
  278. 0  app/views/topics/show.xml.builder
  279. 0  app/views/user_notifier/activation.html.erb
  280. 0  app/views/user_notifier/comment_notice.html.erb
  281. 0  app/views/user_notifier/follow_up_comment_notice.html.erb
  282. 0  app/views/user_notifier/follow_up_comment_notice_anonymous.rhtml
  283. 0  app/views/user_notifier/forgot_username.html.erb
  284. 0  app/views/user_notifier/friendship_accepted.rhtml
  285. 0  app/views/user_notifier/friendship_request.html.erb
  286. 0  app/views/user_notifier/message_notification.html.erb
  287. 0  app/views/user_notifier/new_forum_post_notice.html.erb
  288. 0  app/views/user_notifier/post_recommendation.html.erb
  289. 0  app/views/user_notifier/reset_password.html.erb
  290. 0  app/views/user_notifier/signup_invitation.html.erb
  291. 0  app/views/user_notifier/signup_notification.html.erb
  292. +2 −2 app/views/users/_dashboard_nav.html.haml
  293. 0  app/views/users/_profile_completeness.html.haml
  294. +2 −2 app/views/users/_profile_user_info_sidebar.html.haml
  295. +3 −3 app/views/users/_search_options.html.haml
  296. 0  app/views/users/_sidebar_user.html.haml
  297. 0  app/views/users/_skill.html.haml
  298. 0  app/views/users/_user.html.haml
  299. +3 −3 app/views/users/crop_profile_photo.html.haml
  300. +2 −2 app/views/users/dashboard.html.haml
Sorry, we could not display the entire diff because too many files (1,746) changed.
View
5 CHANGELOG 100644 → 100755
@@ -2,6 +2,10 @@
* haml/sass propagation (desert)
* upgrade documentation/rake tasks to fix old migrations
+= 1.0.3
+* Photo albums
+* Static pages
+
= 1.0.2
* Rails 2.3 compatibility
* RedCloth no longer required
@@ -10,6 +14,7 @@
* allow moderators/activity owners to delete activities
* only track login activity once per day
* allow anonymous commenters to choose whether they want to receive follow-up comment notices by e-mail
+* refactor views to use 'box' helper for logical content modules, allowing better flexibility when trying to customize layouts
= 1.0.1
* fixed error when cropping photos using file system storage
View
0  LICENSE 100644 → 100755
File mode changed
View
5 README.markdown 100644 → 100755
@@ -1,5 +1,4 @@
-CommunityEngine [v1.0.0]: Modifications to edge branch
-================
+CommunityEngine [v1.0.3]
Information at: [http://www.communityengine.org](http://www.communityengine.org)
@@ -21,7 +20,7 @@ Getting CommunityEngine Running
SHORT VERSION:
- rails your_app_name -m http://www.communityengine.org/install_template.rb
+ rails your_app_name -m http://www.communityengine.org/edge_install_template.rb
LONG VERSION:
View
0  Rakefile 100644 → 100755
File mode changed
View
0  UPGRADING.markdown 100644 → 100755
File mode changed
View
2  about.yml 100644 → 100755
@@ -4,4 +4,4 @@ homepage: http://www.missingmethod.com
summary: A social networking engine
description: Adds basic social networking capabilities to your existing application, including users, blogs, photos, clippings, favorites, and more.
license: MIT
-version: 1.0.2
+version: 1.0.3
View
0  app/controllers/activities_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/admin_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/ads_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/albums_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/application_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/base_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/categories_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/clippings_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/comment_sweeper.rb 100644 → 100755
File mode changed
View
0  app/controllers/comments_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/contests_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/events_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/favorite_sweeper.rb 100644 → 100755
File mode changed
View
0  app/controllers/favorites_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/forums_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/friendships_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/homepage_features_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/invitations_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/messages_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/metro_areas_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/moderators_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/monitorships_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/offerings_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/photo_manager_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/photos_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/post_sweeper.rb 100644 → 100755
File mode changed
View
0  app/controllers/posts_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/sb_posts_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/sessions_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/sitemap_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/skills_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/static_pages_controller.rb 100644 → 100755
File mode changed
View
4 app/controllers/statistics_controller.rb 100644 → 100755
@@ -6,8 +6,8 @@ class StatisticsController < BaseController
def index
@total_users = User.count(:conditions => ['activated_at IS NOT NULL'])
@unactivated_users = User.count(:conditions => ['activated_at IS NULL'])
- @yesterday_new_users = find_new_users(1.day.ago.midnight, Time.today.midnight)
- @today_new_users = find_new_users(Time.today.midnight, Time.today.tomorrow.midnight)
+ @yesterday_new_users = find_new_users(1.day.ago.midnight, Date.today.midnight)
+ @today_new_users = find_new_users(Date.today.midnight, Date.today.tomorrow.midnight)
# @active_users_count = Activity.find(:all, :group => "user_id", :conditions => ["created_at > ?", 1.month.ago]).size
@active_users_count = Activity.count(:all, :group => "user_id", :conditions => ["created_at > ?", 1.month.ago]).size
View
0  app/controllers/taggable_sweeper.rb 100644 → 100755
File mode changed
View
0  app/controllers/tags_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/theme_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/topics_controller.rb 100644 → 100755
File mode changed
View
2  app/controllers/users_controller.rb 100644 → 100755
@@ -409,7 +409,7 @@ def statistics
date = Date.new(params[:date][:year].to_i, params[:date][:month].to_i)
@month = Time.parse(date.to_s)
else
- @month = Time.today
+ @month = Date.today
end
start_date = @month.beginning_of_month
View
0  app/controllers/vote_sweeper.rb 100644 → 100755
File mode changed
View
0  app/controllers/votes_controller.rb 100644 → 100755
File mode changed
View
0  app/controllers/xmlrpc_controller.rb 100644 → 100755
File mode changed
View
0  app/helpers/ads_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/albums_helper.rb 100644 → 100755
File mode changed
View
15 app/helpers/base_helper.rb 100644 → 100755
@@ -50,8 +50,15 @@ def rounded(options={}, &content)
yield(content)
concat('<br class="clear" /><div class="box_bottom"></div></div>')
end
+
+ def block_to_partial(partial_name, html_options = {}, &block)
+ concat(render(:partial => partial_name, :locals => {:body => capture(&block), :html_options => html_options}))
+ end
-
+ def box(html_options = {}, &block)
+ block_to_partial('shared/box', html_options, &block)
+ end
+
def tag_cloud(tags, classes)
max, min = 0, 0
tags.each { |t|
@@ -259,7 +266,11 @@ def paginating_links(paginator, options = {}, html_options = {})
end
end
- content_tag(:div, pagination_info_for(paginator), :class => 'pagination_info') + (links || '')
+ if options[:show_info].eql?(false)
+ (links || '')
+ else
+ content_tag(:div, pagination_info_for(paginator), :class => 'pagination_info') + (links || '')
+ end
end
def pagination_info_for(paginator, options = {})
View
0  app/helpers/categories_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/clippings_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/comments_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/contests_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/forums_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/friendships_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/homepage_features_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/invitations_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/metro_areas_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/moderators_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/monitorships_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/offerings_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/photos_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/posts_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/sb_posts_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/sessions_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/sitemap_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/skills_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/statistics_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/tags_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/topics_helper.rb 100644 → 100755
File mode changed
View
0  app/helpers/users_helper.rb 100644 → 100755
File mode changed
View
0  app/models/ad.rb 100644 → 100755
File mode changed
View
0  app/models/album.rb 100644 → 100755
File mode changed
View
0  app/models/asset.rb 100644 → 100755
File mode changed
View
0  app/models/category.rb 100644 → 100755
File mode changed
View
0  app/models/choice.rb 100644 → 100755
File mode changed
View
0  app/models/clipping.rb 100644 → 100755
File mode changed
View
0  app/models/clipping_image.rb 100644 → 100755
File mode changed
View
0  app/models/comment.rb 100644 → 100755
File mode changed
View
0  app/models/contest.rb 100644 → 100755
File mode changed
View
0  app/models/country.rb 100644 → 100755
File mode changed
View
0  app/models/event.rb 100644 → 100755
File mode changed
View
0  app/models/favorite.rb 100644 → 100755
File mode changed
View
0  app/models/forum.rb 100644 → 100755
File mode changed
View
0  app/models/friendship.rb 100644 → 100755
File mode changed
View
0  app/models/friendship_status.rb 100644 → 100755
File mode changed
View
0  app/models/homepage_feature.rb 100644 → 100755
File mode changed
View
0  app/models/invitation.rb 100644 → 100755
File mode changed
View
0  app/models/message.rb 100644 → 100755
File mode changed
View
0  app/models/metro_area.rb 100644 → 100755
File mode changed
View
0  app/models/moderatorship.rb 100644 → 100755
File mode changed
View
0  app/models/monitorship.rb 100644 → 100755
File mode changed
View
0  app/models/offering.rb 100644 → 100755
File mode changed
View
10 app/models/photo.rb 100644 → 100755
@@ -61,6 +61,16 @@ def next_photo
self.user.photos.find(:first, :conditions => ['created_at > ?', created_at], :order => 'created_at ASC')
end
+ def previous_in_album
+ return nil unless self.album
+ self.user.photos.find(:first, :conditions => ['created_at < ? and album_id = ?', created_at, self.album.id], :order => 'created_at DESC')
+ end
+ def next_in_album
+ return nil unless self.album
+ self.user.photos.find(:first, :conditions => ['created_at > ? and album_id = ?', created_at, self.album_id], :order => 'created_at ASC')
+ end
+
+
def self.find_recent(options = {:limit => 3})
self.new_this_week.find(:all, :limit => options[:limit])
end
View
0  app/models/poll.rb 100644 → 100755
File mode changed
View
0  app/models/post.rb 100644 → 100755
File mode changed
View
0  app/models/role.rb 100644 → 100755
File mode changed
View
0  app/models/sb_post.rb 100644 → 100755
File mode changed
View
0  app/models/skill.rb 100644 → 100755
File mode changed
View
0  app/models/state.rb 100644 → 100755
File mode changed
View
0  app/models/static_page.rb 100644 → 100755
File mode changed
View
0  app/models/tag.rb 100644 → 100755
File mode changed
View
0  app/models/topic.rb 100644 → 100755
File mode changed
View
14 app/models/user.rb 100644 → 100755
@@ -17,8 +17,8 @@ class User < ActiveRecord::Base
before_save :encrypt_password, :whitelist_attributes
before_create :make_activation_code
after_create :update_last_login
- after_create {|user| UserNotifier.deliver_signup_notification(user) }
- after_save {|user| UserNotifier.deliver_activation(user) if user.recently_activated? }
+ after_create :deliver_signup_notification
+ after_save :deliver_activation
before_save :generate_login_slug
after_save :recount_metro_area_users
after_destroy :recount_metro_area_users
@@ -351,7 +351,15 @@ def friendship_exists_with?(friend)
# before filter
def generate_login_slug
- self.login_slug = self.login.gsub(/[^a-z1-9]+/i, '-')
+ self.login_slug = self.login.gsub(/[^a-z0-9]+/i, '-')
+ end
+
+ def deliver_activation
+ UserNotifier.deliver_activation(self) if self.recently_activated?
+ end
+
+ def deliver_signup_notification
+ UserNotifier.deliver_signup_notification(self)
end
def update_last_login
View
0  app/models/user_notifier.rb 100644 → 100755
File mode changed
View
0  app/models/user_observer.rb 100644 → 100755
File mode changed
View
0  app/models/vote.rb 100644 → 100755
File mode changed
View
0  app/views/activities/_activity.html.haml 100644 → 100755
File mode changed
View
0  app/views/activities/_icon.html.haml 100644 → 100755
File mode changed
View
0  app/views/activities/_unhandled_item.html.haml 100644 → 100755
File mode changed
View
0  app/views/activities/destroy.js.rjs 100644 → 100755
File mode changed
View
4 app/views/activities/index.html.haml 100644 → 100755
@@ -1,12 +1,12 @@
.yui-gc
.yui-u.first
- .box.fresh
+ -box :class => "fresh" do
%h3="What's fresh".l
=render :partial => "activities/activity", :collection => @activities
.pagination=paginating_links @activities if @activities.page_count > 1
.yui-u
- .box
+ -box do
%h3="Tags".l
- tag_cloud @popular_tags, %w(nube1 nube2 nube3 nube4 nube5) do |name, css_class|
= link_to name, tag_path(URI.escape(name, /[\/.?#]/)), :class => css_class
View
2  app/views/activities/network.html.haml 100644 → 100755
@@ -2,7 +2,7 @@
=render :partial => 'users/dashboard_nav'
#yui-main
- .yui-b.box.fresh
+ -box :class => 'yui-b fresh' do
-unless @activities.empty?
%h3=:activity_from_your_network.l
%table{:width => "100%"}
View
2  app/views/admin/comments.html.haml 100644 → 100755
@@ -4,7 +4,7 @@
- form_tag delete_selected_comments_path, :id => 'comments' do
#yui-main
- .yui-b.box
+ -box :class => "yui-b" do
%h3
= AppConfig.community_name
= :comments.l
View
2  app/views/admin/contests.html.haml 100644 → 100755
@@ -3,7 +3,7 @@
#yui-main
.yui-b
- .box
+ -box do
%h3= :contests.l
= link_to :new_contest.l, new_contest_path
View
0  app/views/admin/messages.html.haml 100644 → 100755
File mode changed
View
5 app/views/admin/users.html.haml 100644 → 100755
@@ -2,7 +2,7 @@
= render :partial => 'shared/admin_nav'
#yui-main
- .yui-b.box
+ -box :class => "yui-b" do
%h3
= AppConfig.community_name
= :members.l
@@ -25,7 +25,7 @@
%th=:actions.l
- @users.each do |user|
- %tr
+ %tr{:id => "user_#{user.id}"}
%td
= link_to h(user.login), user_path(user)
%td
@@ -35,6 +35,7 @@
%td
= link_to( :assume_id.l , assume_user_path(user) )
= (" | " + link_to(:activate.l, :controller => "/admin", :action => "activate_user", :id => user.id)) unless user.active?
+ = link_to_remote(image_tag('icons/delete.png', :plugin => 'community_engine'), {:url => user_path(user), :method => :delete, :success => visual_effect(:fade, "user_#{user.id}"), :confirm => "Are you sure you want to permanently delete this user"} )
-if @users.page_count > 1
.pagination= paginating_links @users, :link_to_current_page => true
View
2  app/views/ads/edit.html.haml 100644 → 100755
@@ -1,4 +1,4 @@
-.box
+-box do
%h3=:editing_ad.l
= error_messages_for :ad
- form_for(:ad, :url => ad_path(@ad), :html => { :method => :put, :class => "MainForm" }) do |f|
View
2  app/views/ads/index.html.haml 100644 → 100755
@@ -2,7 +2,7 @@
= render :partial => 'shared/admin_nav'
#yui-main
- .yui-b.box
+ -box :class => "yui-b" do
%h3= :ads.l
%table{"width"=>"100%"}
%tr
View
2  app/views/ads/new.html.haml 100644 → 100755
@@ -1,4 +1,4 @@
-.box
+-box do
%h3=:new_ad.l
= error_messages_for :ad
- form_for(:ad, :url => ads_path, :html => {:class => "MainForm" }) do |f|
View
2  app/views/ads/show.html.haml 100644 → 100755
@@ -1,4 +1,4 @@
-.box
+-box do
%h3=:showing_ad.l
%p
%b
View
0  app/views/albums/_form.html.erb 100644 → 100755
File mode changed
View
0  app/views/albums/edit.html.erb 100644 → 100755
File mode changed
View
0  app/views/albums/new.html.erb 100644 → 100755
File mode changed
View
0  app/views/albums/show.html.erb 100644 → 100755
File mode changed
View
4 app/views/base/_about_nav.html.haml 100644 → 100755
@@ -1,5 +1,5 @@
.yui-b
- .box
+ -box do
%h3=:about_site.l :site => AppConfig.community_name
%ul.list.checks
%li
@@ -9,7 +9,7 @@
%li
%a{:href=>"/advertise"}
=:advertise.l
- .box.alt
+ -box :class => "alt" do
%h3=:need_to_contact_us.l
%p
=:dont_wait_its.l
View
4 app/views/base/_homepage_banner_message.html.haml 100644 → 100755
@@ -1,7 +1,7 @@
#welcome
.yui-gc
.yui-u.first
- .box
+ -box do
%h2
=:get_started_banner.l :site=>AppConfig.community_name
%p
@@ -10,7 +10,7 @@
%a{:href=>"http://www.missingmethod.com/projects/community_engine"}
=:homepage_banner_download_msg.l
.yui-u
- .box
+ -box do
%h2
=:homepage_banner_signup_prompt.l
%p
View
2  app/views/base/about.html.haml 100644 → 100755
@@ -2,5 +2,5 @@
#yui-main
.yui-b
- .box
+ -box do
%h3=:your_about_text_goes_here.l
View
2  app/views/base/advertise.html.haml 100644 → 100755
@@ -2,7 +2,7 @@
#yui-main
.yui-b
- .box
+ -box do
%h3
=:advertise_on.l
=" #{AppConfig.community_name}"
View
8 app/views/base/faq.html.haml 100644 → 100755
@@ -2,7 +2,7 @@
#yui-main
.yui-b
- .box
+ -box do
%h3=:frequently_asked_questions.l
%h4#what_is_it
@@ -17,8 +17,4 @@
%h4#images_and_flash How do I embed images and flash using the rich text editor?
%p
- You can add images or flash media to your profile and your blog posts by using the image
- %img{:src=>"/plugin_assets/community_engine/javascripts/tiny_mce/themes/advanced/images/image.gif"}
- and media
- %img{:src=>"/plugin_assets/community_engine/javascripts/tiny_mce/plugins/media/images/media.gif"}
- buttons on the rich text editor.
+ You can add images or flash media to your profile and your blog posts by using the image and media buttons on the rich text editor.
View
0  app/views/base/plaxo.html.haml 100644 → 100755
File mode changed
View
10 app/views/base/site_index.html.haml 100644 → 100755
@@ -5,13 +5,13 @@
#yui-main
.yui-b
- .box.hfeed
+ -box :class => "hfeed" do
%h3
=:recent_posts.l
= render :partial => 'posts/post', :collection => @posts
.yui-b
- .box
+ -box do
%h3= :explore_site.l :site => AppConfig.community_name
%ul.list.checks
- Category.find(:all).each do |c|
@@ -19,7 +19,7 @@
%li= link_to :whats_popular.l, popular_url, {:class => 'popular'}
%li= link_to :find_an_expert.l, skills_path, {:class => 'users'}
- .box.alt
+ -box :class => "alt" do
%h3
= :whats_hot.l
@@ -29,13 +29,13 @@
%h6.all
%a{:href=>"/popular"}= :see_all.l
- .box.alt
+ -box :class => "alt" do
%h3
=:featured_writer.l
-@featured_writers.each do |user|
=render :partial => "users/sidebar_user", :locals => {:user => user}
- .box.alt
+ -box :class => "alt" do
%h3= :active_users.l
-@active_users.each do |user|
=render :partial => "users/sidebar_user", :locals => {:user => user}
View
0  app/views/base/teaser.html.haml 100644 → 100755
File mode changed
View
0  app/views/categories/_tips.html.haml 100644 → 100755
File mode changed
View
2  app/views/categories/edit.html.haml 100644 → 100755
@@ -2,7 +2,7 @@
= render :partial => 'shared/admin_nav'
#yui-main
- .yui-b.box
+ -box :class => "yui-b" do
%h3=:editing_category.l
- form_for(:category, :url => category_path(@category), :html => { :method => :put, :class => "MainForm" }) do |f|
View
2  app/views/categories/index.html.haml 100644 → 100755
@@ -3,7 +3,7 @@
#yui-main
.yui-b
- .box
+ -box do
%h3=:categories.l
%table{:width=>"100%"}
View
2  app/views/categories/new.html.haml 100644 → 100755
@@ -1,4 +1,4 @@
-.box
+-box do
%h3= :new_category.l
- form_for(:category, :url => categories_path, :html => {:class => "MainForm"}) do |f|
View
8 app/views/categories/show.html.haml 100644 → 100755
@@ -2,7 +2,7 @@
- @section = @category.name
.yui-b
- .box
+ -box do
- if logged_in?
%h3.signup=:have_something_to_contribute.l
%ul.list.checks
@@ -17,12 +17,12 @@
=:have_an_account.l
%a{:href=>"/login", :title=>:log_in_to_your.l+" #{AppConfig.community_name} "+:account.l}="&raquo; " + :login.l
- .box.alt
+ -box :class => "alt" do
%h3=:top_writers.l
- @active_users.each do |user|
= render :partial => "users/sidebar_user", :locals => {:user => user}
- .box.alt
+ -box :class => "alt" do
%h3=:popular_catgory.l(:name => @category.name)
%ul.list.page
- @popular_posts.each do |post|
@@ -31,7 +31,7 @@
#yui-main
.yui-b
- .box.hfeed
+ -box :class => "hfeed" do
%h3
=:show_category.l :category => @category.name
%ul.subnav
View
0  app/views/clippings/_clipping.html.haml 100644 → 100755
File mode changed
View
0  app/views/clippings/_images.html.haml 100644 → 100755
File mode changed
View
0  app/views/clippings/_meta.html.haml 100644 → 100755
File mode changed
View
4 app/views/clippings/edit.html.haml 100644 → 100755
@@ -1,11 +1,11 @@
.yui-b
- .box
+ -box do
%h3= :help.l
%p= :tags_are_keywords_you_use_to_organize_your_clippings_separate_multiple_tags_with_commas.l
#yui-main
.yui-b
- .box
+ -box do
%h3= :editing_clipping.l
%img{"src"=>"#{h @clipping.image_uri}"}
- form_for(:clipping, :url => user_clipping_path(@user, @clipping), :html => { :method => :put, :class => "MainForm" }) do |f|
View
9 app/views/clippings/index.html.haml 100644 → 100755
@@ -3,19 +3,20 @@
=render :partial => 'posts/author_profile', :locals => {:user => @user}
- if @is_current_user
- .box.alt
+ -box :class => "alt" do
%h3=:help.l
%p=:clippings_let_you_to_save_cool_images_from_around_the_web.l
%p=:drag_the_bookmarklet.l :site => AppConfig.community_name
%p=:when_you_see_an_image_you_like_on_the_web.l :site => AppConfig.community_name
- #clipping_tools.box.alt
+
+ -box :class => 'alt', :id => 'clipping_tools' do
%h3=:bookmarklet.l
%p=:drag_this_to_your_bookmarks_toolbar.l
%p= link_to "#{AppConfig.community_name} it!", clippings_link, :style=>"border:1px solid #ccc; background:#efefef; padding: 5px;", :title=>"#{AppConfig.community_name} "+:scrapbook.l
#yui-main
.yui-b
- #clippings.box.hfeed
+ -box :class => "hfeed", :id => 'clippings' do
%h3= link_to "#{:user_clippings.l :user =>@user.login}", user_clippings_path(@user)
- if @clippings.any?
-if @clippings.page_count > 1
@@ -27,7 +28,7 @@
- else
%p= @is_current_user ? :you_have_no_clippings_use_the_bookmarklet_on_the_right_to_add_some.l : :no_clippings_yet.l
- .box.alt#tag_list
+ -box :class => 'alt', :id => 'tag_list' do
%h3=:tags.l
- tag_cloud @tags, %w(nube1 nube2 nube3 nube4 nube5) do |name, css_class|
- css_class = css_class + (name.eql?(params[:tag_name]) ? " selected": "")
View
0  app/views/clippings/load_images_from_uri.js.rjs 100644 → 100755
File mode changed
View
4 app/views/clippings/new.html.haml 100644 → 100755
@@ -1,11 +1,11 @@
.yui-b
- .box
+ -box do
%h3= :help.l
%p= :clippings_are_a_way_to_save_images_you_like_from_around_the_web.l
#yui-main
.yui-b
- .box
+ -box do
%h3= :new_clipping.l
%img{"src"=>"#{h @clipping.image_uri}"}
- form_for(:clipping, :url => user_clippings_path(@user), :html => { :class => "MainForm" }) do |f|
View
4 app/views/clippings/new_clipping.html.haml 100644 → 100755
@@ -40,7 +40,7 @@
#doc3
#bd
.yui-g
- .yui-u.first.box
+ -box :class => "yui-u first" do
%h3
=:create_a_clipping.l
%p
@@ -86,7 +86,7 @@
}
return;
});
- .yui-u.box
+ -box :class => "yui-u" do
%h3=:create_a_post.l
- form_for(:post, :url => user_posts_path(current_user), :html => {:class => "MainForm"}) do |f|
= hidden_field_tag 'post[published_as]', 'live'
View
8 app/views/clippings/show.html.haml 100644 → 100755
@@ -5,12 +5,12 @@
=render :partial => 'posts/author_profile', :locals => {:user => @user}
- if @previous || @next
- .box.alt
+ -box :class => "alt" do
= link_to "<img src='#{@previous.image_uri(:thumb)}' /><br />&laquo; #{:previous.l} ", user_clipping_path(@user, @previous), :class => 'left' if @previous
= link_to "<img src='#{@next.image_uri(:thumb)}' /><br />#{:next.l} &raquo;", user_clipping_path(@user, @next), :class => 'right' if @next
- if @related.any?
- .box.alt
+ -box :class => "alt" do
%h3=:related_clippings_all_members.l
.centered
- @related.each do |clipping|
@@ -18,7 +18,7 @@
#yui-main
.yui-b
- .box.hfeed
+ -box :class => "hfeed" do
%h3= link_to :user_clippings.l(:user =>@user.login)
.hentry.main
- if @is_current_user
@@ -47,7 +47,7 @@
- @clipping.tags.each do |t|
%li=link_to( t.name, tag_url(t), :rel => 'tag')
- #comments.box.hfeed.comments
+ -box :class => 'hfeed comments', :id => 'comments' do
%h3=:clipping_comments.l
%h2=:add_your_comment.l
%p= render :partial => 'comments/comment_form', :locals => {:commentable => @clipping}
View
6 app/views/clippings/site_index.html.haml 100644 → 100755
@@ -2,7 +2,7 @@
#yui-main
.yui-b
- .box
+ -box do
%h3
= params[:recent] ? :recent.l : :popular.l
Clippings
@@ -21,7 +21,7 @@
%br
.yui-b
- .box
+ -box do
%h3 &nbsp;
=:clippings_let_you_to_save_cool_images_from_around_the_web.l
@@ -30,5 +30,5 @@
-else
=:to_get_started_with_clippings_first.l+" "
=link_to :create_an_account.l, signup_path
- .box.alt
+ -box :class => "alt" do
=link_to :view.l+" #{params[:recent] ? :popular.l : :recent.l} "+:clippings.l, site_clippings_path(:recent => !params[:recent])
View
0  app/views/comments/_comment.html.haml 100644 → 100755
File mode changed
View
0  app/views/comments/_comment_form.html.haml 100644 → 100755
File mode changed
View
0  app/views/comments/create.js.rjs 100644 → 100755
File mode changed
View
4 app/views/comments/index.html.haml 100644 → 100755
@@ -3,8 +3,8 @@
#yui-main
- if @comments.empty?
- #emptycomments= :no_comments_yet.l_with_args(:type => @commentable.class.to_s.underscore)
- .yui-b#comments.box.hfeed.comments
+ #emptycomments= :no_comments_found.l_with_args(:type => @commentable.class.to_s.underscore)
+ -box :class => 'yui-b hfeed comments', :id => 'comments' do
%h3
= :comments.l + " -"
= link_to @title, @back_url
View
0  app/views/contests/edit.html.erb 100644 → 100755
File mode changed
View
2  app/views/contests/index.html.haml 100644 → 100755
@@ -3,7 +3,7 @@
#yui-main
.yui-b
- .box
+ -box do
%h3= :contests.l
- @contests.each do |contest|
%h2
View
0  app/views/contests/new.html.erb 100644 → 100755
File mode changed
View
0  app/views/contests/show.html.erb 100644 → 100755
File mode changed
View
2  app/views/events/edit.html.haml 100644 → 100755
@@ -1,4 +1,4 @@
-.box
+-box do
%h3= :edit_event.l
= error_messages_for :event
- form_for(:event, :url => event_path(@event), :html => {:method => :put, :class => "MainForm"} ) do |f|
View
6 app/views/events/index.html.haml 100644 → 100755
@@ -2,16 +2,16 @@
.yui-b
- if @is_admin_user
- .box.alt.first_alt
+ -box :class => "alt first_alt" do
= link_to :post_an_event.l, new_event_path
- .box
+ -box do
%h3= :events.l
= :find_out_where_to_be_and_when_to_be_there.l
#yui-main
.yui-b
- .box
+ -box do
.pagination=paginating_links @events if @events.page_count > 1
View
2  app/views/events/new.html.haml 100644 → 100755
@@ -1,4 +1,4 @@
-.box
+-box do
%h3= :new_event.l
= error_messages_for :event
- form_for(:event, :url => events_path, :html => {:class => "MainForm"} ) do |f|
View
4 app/views/events/show.html.haml 100644 → 100755
@@ -1,13 +1,13 @@
- @section = 'events'
.yui-b
- .box.alt.first_alt
+ -box :class => "alt first_alt" do
- if @is_admin_user
= link_to :new_event.l, new_event_path
= link_to :see_all_events.l, events_path
#yui-main
- .yui-b.box
+ -box :class => "yui-b" do
%h3= @event.name
- if @event.user.eql?(current_user)
= link_to :edit_this_event.l, edit_event_path(@event)
View
0  app/views/favorites/_favorite.html.haml 100644 → 100755
File mode changed
View
0  app/views/favorites/create.js.rjs 100644 → 100755
File mode changed
View
0  app/views/favorites/destroy.js.rjs 100644 → 100755
File mode changed
View
2  app/views/favorites/index.html.haml 100644 → 100755
@@ -1,4 +1,4 @@
-.favorites.box
+-box :class => 'favorites' do
%h3= link_to "#{@user.login}'s "+:favorites.l, user_favorites_path(@user)
- @favorites.to_a.in_groups_of(2) do |group|
View
0  app/views/favorites/show.html.haml 100644 → 100755
File mode changed
View
0  app/views/forums/_form.html.haml 100644 → 100755
File mode changed
View
2  app/views/forums/edit.html.haml 100644 → 100755
@@ -1,4 +1,4 @@
-.box
+-box do
%h3= :edit_forum.l
%p= link_to :delete_this_forum.l, forum_path(@forum), :method => :delete, :class => "utility", :confirm => :are_you_sure.l
View
4 app/views/forums/index.html.haml 100644 → 100755
@@ -2,11 +2,11 @@
-@section = 'forums'
-if admin?
- .box.alt.first_alt
+ -box :class => "alt first_alt" do
%h3= :admin.l
%p= link_to :create_new_forum.l, new_forum_path, :class => "utility"
-.box
+-box do
.right=link_to :recent_posts.l, recent_forum_posts_path
%h3= :forums.l
View
2  app/views/forums/new.html.haml 100644 → 100755
@@ -1,4 +1,4 @@
-.box
+-box do
%h3= :new_forum.l
- form_for :forum, :url => forums_path, :html => {:class => "MainForm"} do |f|
= render :partial => "form", :object => f
View
4 app/views/forums/show.html.haml 100644 → 100755
@@ -2,13 +2,13 @@
- @section = 'forums'
- @page_title = @forum.name
-.box.alt.first_alt
+-box :class => "alt first_alt" do
= link_to :forums.l, forum_home_path
%span.arrow
&rarr;
= h @forum.name
-.box
+-box do
%p.subtitle
= feed_icon_tag @forum.name, forum_sb_posts_path(@forum, :format => :rss)
= pluralize @forum.topics_count, 'topic'.l
View
0  app/views/friendships/_friendship.html.haml 100644 → 100755
File mode changed
View
0  app/views/friendships/_friendships.html.erb 100644 → 100755
File mode changed
View
2  app/views/friendships/accepted.html.haml 100644 → 100755
@@ -2,7 +2,7 @@
#yui-main
.yui-b
- #friends.box
+ -box :id => "friends" do
%h3
= @friend_count
=:accepted_friendships.l
View
2  app/views/friendships/denied.html.haml 100644 → 100755
@@ -2,7 +2,7 @@
#yui-main
.yui-b
- #friends.box
+ -box :id => "friends" do
%h3
=:denied_friendships.l
.user_list= render :partial => "friendships/friendship", :collection => @friendships
View
0  app/views/friendships/index.html.erb 100644 → 100755
File mode changed
View
0  app/views/friendships/index.xml.builder 100644 → 100755
File mode changed
View
2  app/views/friendships/pending.html.haml 100644 → 100755
@@ -2,6 +2,6 @@
#yui-main
.yui-b
- #friends.box
+ -box :id => "friends" do
%h3= :pending_friendships.l
.user_list= render :partial => "friendships/friendship", :collection => @friendships
View
2  app/views/friendships/show.html.haml 100644 → 100755
@@ -1,4 +1,4 @@
-.box
+-box do
%h3=:friendship_request_detail.l
- if @friendship.initiator? && @friendship.pending?
=:waiting_for.l
View
0  app/views/homepage_features/edit.html.erb 100644 → 100755
File mode changed
View
2  app/views/homepage_features/index.html.haml 100644 → 100755
@@ -3,7 +3,7 @@
#yui-main
.yui-b
- .box
+ -box do
%h3= :homepage_features.l
= link_to :new_homepage_feature.l, new_homepage_feature_path
View
0  app/views/homepage_features/new.html.erb 100644 → 100755
File mode changed
View
0  app/views/homepage_features/show.html.erb 100644 → 100755
File mode changed
View
0  app/views/invitations/index.html.erb 100644 → 100755
File mode changed
View
4 app/views/invitations/new.html.haml 100644 → 100755
@@ -3,7 +3,7 @@
%script{"type"=>"text/javascript", "src"=>"http://www.plaxo.com/css/m/js/abc_launcher.js"}
.yui-b
- .box.alt.first_alt
+ -box :class => "alt first_alt" do
%h3=:spread_the_word.l
%p
=:the_more_people_you_invite_the_better.l
@@ -16,7 +16,7 @@
#yui-main
.yui-b
- .box
+ -box do
%h3=:invite_your_friends_to_join.l
- form_for(:invitation, :url => user_invitations_path(:user_id => @user.id ), :html => {:class => "MainForm"} ) do |f|
.right
View
0  app/views/layouts/_post.xml.builder 100644 → 100755
File mode changed
View
0  app/views/layouts/application.html.haml 100644 → 100755
File mode changed
View
0  app/views/layouts/beta.html.haml 100644 → 100755
File mode changed
View
0  app/views/messages/_form.html.haml 100644 → 100755
File mode changed
View
2  app/views/messages/_inbox.html.haml 100644 → 100755
@@ -2,7 +2,7 @@
#yui-main
.yui-b
- .box
+ -box do
%h3= :inbox.l
%table.messages{:border => 0, :width => '100%'}
View
2  app/views/messages/_sent.html.haml 100644 → 100755
@@ -1,6 +1,6 @@
#yui-main
.yui-b
- .box
+ -box do
%h3= :sent_messages.l
%table.messages{:border => 0, :width => '100%'}
View
2  app/views/messages/_sidebar_nav.html.haml 100644 → 100755
@@ -1,5 +1,5 @@
.yui-b.sidebar
- .box
+ -box do
%h3= :links.l
%ul.message_nav
%li{:class => "inbox#{@user.unread_messages? ? '_new': ''}"}
View
0  app/views/messages/index.html.haml 100644 → 100755
File mode changed
View
2  app/views/messages/new.html.haml 100644 → 100755
@@ -2,7 +2,7 @@
#yui-main
.yui-b
- .box
+ -box do
%h3= :compose_message.l
= error_messages_for :message
View
2  app/views/messages/show.html.haml 100644 → 100755
@@ -2,7 +2,7 @@
#yui-main
.yui-b
- .box
+ -box do
%h3
= :subject.l + ":"
=h @message.subject
View
2  app/views/metro_areas/edit.html.haml 100644 → 100755
@@ -1,4 +1,4 @@
-.box
+-box do
%h3= :editing_metro_area.l
= error_messages_for :metro_area
View
2  app/views/metro_areas/index.html.haml 100644 → 100755
@@ -3,7 +3,7 @@
#yui-main
.yui-b
- .box
+ -box do
%h3= :metro_areas.l
.pagination= paginating_links @metro_areas if @metro_areas.page_count > 1
View
2  app/views/metro_areas/new.html.haml 100644 → 100755
@@ -1,4 +1,4 @@
-.box
+-box do
%h3= :new_metro_area.l
= error_messages_for :metro_area
View
2  app/views/metro_areas/show.html.haml 100644 → 100755
@@ -1,4 +1,4 @@
-.box
+-box do
%h3=:showing_metro_area_details.l
View
0  app/views/moderators/_toggle.html.erb 100644 → 100755
File mode changed
View
0  app/views/moderators/create.js.rjs 100644 → 100755
File mode changed
View
0  app/views/moderators/destroy.js.rjs 100644 → 100755
File mode changed
View
0  app/views/monitorships/create.js.rjs 100644 → 100755
File mode changed
View
0  app/views/monitorships/destroy.js.rjs 100644 → 100755
File mode changed
View
2  app/views/offerings/_chooser.html.haml 100644 → 100755
@@ -1,7 +1,7 @@
- @user_skills = @user.offerings.collect{|o| o.skill}
- @skills = Skill.find(:all) - @user_skills
-.yui-g.box
+-box :class => "yui-g" do
%h3= :my_skills
.yui-u.first
%ul#skills.sortable
View
0  app/views/photo_manager/index.html.erb 100644 → 100755
File mode changed
View
0  app/views/photos/_manage_photos.html.haml 100644 → 100755
File mode changed
View
0  app/views/photos/_show_image_list.html.haml 100644 → 100755
File mode changed
View
7 app/views/photos/edit.html.haml 100644 → 100755
@@ -1,5 +1,5 @@
.yui-b
- .box
+ -box do
%h3= :help.l
%p
= :tags_are_keywords_you_use_to_organize_your_photos.l
@@ -7,10 +7,11 @@
|
= link_to :back_to_my_photos.l, user_photos_path(@user)
- .box.alt= link_to :delete_this_photo.l, user_photo_path(@user, @photo), :method => :delete, :confirm => :are_you_sure_you_want_to_delete_this_photo.l
+ -box :class => 'alt' do
+ = link_to :delete_this_photo.l, user_photo_path(@user, @photo), :method => :delete, :confirm => :are_you_sure_you_want_to_delete_this_photo.l
#yui-main
- .yui-b.box
+ -box :class => "yui-b" do
%h3= :editing_photo.l
= error_messages_for :photo
View
4 app/views/photos/index.html.haml 100644 → 100755
@@ -4,7 +4,7 @@
#yui-main
.yui-b
.yui-gd
- #tag_list.yui-u.box.first
+ -box :id => 'tag_list', :class => 'yui-u first' do
%h3=:tags.l
%ul.tags
- @tags.each do |tag|
@@ -14,7 +14,7 @@
- else
= link_to tag.name, user_photos_path(:user_id => @user, :tag_name => tag.name)
- #photos.yui-u.box
+ -box :id => "photos.yui-u" do
%h3= link_to :users_photos.l(:user=>@user.login), user_photos_path(@user)
= link_to( :new_photo.l, new_user_photo_path(@user), {:class => 'right'}) if @is_current_user
View
0  app/views/photos/index.xml.builder 100644 → 100755
File mode changed
View
0  app/views/photos/manage_photos.js.rjs 100644 → 100755
File mode changed
View
9 app/views/photos/new.html.haml 100644 → 100755
@@ -1,15 +1,16 @@
.yui-b
- .box
+ -box do
%h3 Tips
%p
=:photo_tip_1.l
%p
=:photo_tip_2.l
- .box.alt= link_to "&raquo; " + :back_to_my_photos.l, user_photos_path(@user)
+ -box :class => 'alt' do
+ = link_to "&raquo; " + :back_to_my_photos.l, user_photos_path(@user)
#yui-main
- #single_upload.yui-b.box
+ -box :id => "single_upload", :class => ".yui-b" do
%h3
=:new_photo.l
@@ -48,7 +49,7 @@
= :or.l
= link_to :cancel_and_go_back_to_photo_manager.l, user_photo_manager_index_path(current_user)
- #multiple_upload.yui-b.box{"style"=>"display:none;"}
+ -box :class => 'yui-b', :id => 'multiple_upload', :style => "display:none;" do
%h3
=:new_photos_multiple_uploader.l
View
2  app/views/photos/recent.html.haml 100644 → 100755
@@ -1,4 +1,4 @@
-.box
+-box do
%h3=:recent_photos.l
.pagination= paginating_links @photos if @photos.page_count > 1
View
21 app/views/photos/show.html.haml 100644 → 100755
@@ -2,13 +2,18 @@
.yui-b
= render :partial => 'posts/author_profile', :locals => {:user => @user}
- - if @previous || @next
- .photo_nav.box.alt
+ - if @photo.album
+ -box :class => "photo_nav alt" do
+ %h3= "#{:album.l}: #{link_to @photo.album.title, user_album_path(@user, @photo.album)}"
+ = link_to "<img src='#{@photo.previous_in_album.public_filename(:thumb)}' /><br />&laquo; " + :previous.l, user_photo_path(@user, @photo.previous_in_album), :class => 'left' if @photo.previous_in_album
+ = link_to "<img src='#{@photo.next_in_album.public_filename(:thumb)}' /><br />" + :next.l + "&raquo;", user_photo_path(@user, @photo.next_in_album), :class => 'right' if @photo.next_in_album
+ - elsif @previous || @next
+ -box :class => "photo_nav alt" do
= link_to "<img src='#{@previous.public_filename(:thumb)}' /><br />&laquo; " + :previous.l, user_photo_path(@user, @previous), :class => 'left' if @previous
= link_to "<img src='#{@next.public_filename(:thumb)}' /><br />" + :next.l + "&raquo;", user_photo_path(@user, @next), :class => 'right' if @next
- if @related.any?
- .box.alt
+ -box :class => "alt" do
%h3=:related_photos_all_members.l
.centered
- @related.each do |photo|
@@ -16,13 +21,13 @@
#yui-main
.yui-b
- .box.hfeed
+ -box :class => "hfeed" do
%h3
= link_to :users_photos.l_with_args(:user => @user.login), user_photos_path(@user)
\:
= link_to h(@photo.display_name), user_photo_path(@user, @photo)
- if @is_current_user
- .box.alt
+ -box :class => "alt" do
= link_to :make_this_my_profile_photo.l, change_profile_photo_user_path({:id => @user, :photo_id => @photo}), :method => :put
|
= link_to :edit_this_photo_details.l, edit_user_photo_path(@user, @photo) if @is_current_user
@@ -32,10 +37,8 @@
%p.centered= image_tag( @photo.public_filename, :class => "polaroid" )
%p= h @photo.description
%p= @photo.tags.collect{|t| link_to( h(t.name), tag_url(t), :class => 'tag') }.join(" ")
- - unless @photo.album.blank?
- %p= link_to @photo.album.title, user_album_path(@user, @photo.album)
-
- #comments.box.hfeed.comments
+
+ -box :class => "hfeed comments", :id => 'comments' do
%h3=:photo_comments.l
%h2=:add_your_comment.l
%p= render :partial => 'comments/comment_form', :locals => {:commentable => @photo}
View
0  app/views/photos/slideshow.html.erb 100644 → 100755
File mode changed
View
0  app/views/polls/_edit.html.haml 100644 → 100755
File mode changed
View
0  app/views/polls/_excerpt.html.haml 100644 → 100755
File mode changed
View
0  app/views/polls/_new.html.haml 100644 → 100755
File mode changed
View
0  app/views/polls/_poll_ui.html.haml 100644 → 100755
File mode changed
View
0  app/views/polls/_polls_sidebar.html.haml 100644 → 100755
File mode changed
View
2  app/views/posts/_author_profile.html.haml 100644 → 100755
@@ -1,4 +1,4 @@
-.box
+-box :class => 'alt first_alt' do
%h3=:author.l
%dl.vcard
%dt.photo
View
0  app/views/posts/_favorited_post.html.haml 100644 → 100755
File mode changed
View
0  app/views/posts/_post.html.haml 100644 → 100755
File mode changed
View
0  app/views/posts/_send_to_friend.html.erb 100644 → 100755
File mode changed
View
0  app/views/posts/_sidebar_post.html.haml 100644 → 100755
File mode changed
View
4 app/views/posts/edit.html.haml 100644 → 100755
@@ -1,5 +1,5 @@
.yui-b
- .box#category_tips
+ -box :id => 'category_tips' do
- if @post.contest
= render :partial => "contest"
- elsif @post.category
@@ -9,7 +9,7 @@
#yui-main
.yui-b
- .box
+ -box do
%h3=:editing_post.l
= error_messages_for :post
View
4 app/views/posts/featured.html.haml 100644 → 100755
@@ -2,14 +2,14 @@
.yui-b
- .box.alt.first_alt
+ -box :class => "alt first_alt" do
%h3= :featured_writers.l
- @featured_writers.each do |user|
= render :partial => "users/sidebar_user", :locals => {:user => user}
#yui-main
.yui-b
- .box.hfeed
+ -box :class => "hfeed" do
%h3=:featured_posts.l
.pagination=paginating_links @posts if @posts.page_count > 1
View
4 app/views/posts/index.html.haml 100644 → 100755
@@ -2,7 +2,7 @@
= render :partial => 'author_profile', :locals => {:user => @user}
- unless @popular_posts.empty?
- #posts.box.alt
+ -box :id => "posts", :class => 'alt' do
%h3=:popular_posts.l
%ul.list.page