app/controllers/page_sweeper.rb app/controllers/pages_controller.rb app/models/page.rb app/views/pages/_form.html.haml app/views/pages/edit.html.haml app/views/pages/edit.html.haml~ app/views/pages/index.html.haml app/views/pages/index.html.haml~ app/views/pages/new.html.haml app/views/pages/show.html.haml app/views/pages/show.html.haml~ app/views/shared/_contact.html.haml app/views/shared/_explore.html.haml db/migrate/069_create_pages.rb db/migrate/070_add_pages.rb test/fixtures/pages.yml test/functional/pages_controller_test.rb test/unit/page_test.rb @@ -117,6 +117,10 @@ module BaseHelper case @controller.controller_name when 'base' title += tagline + when 'pages' + if @page and @page.title + title = @page.title + ' &raquo; ' + app_base + tagline + end when 'posts' if @post and @post.title title = @post.title + ' &raquo; ' + app_base + tagline app/helpers/base_helper.rb @@ -54,7 +54,7 @@ class Post < ActiveRecord::Base end def self.find_recent(options = {:limit => 5}) - self.recent.find :all, :limit => options[:limit] + self.recent.find :all, options end def self.find_popular(options = {} ) app/models/post.rb @@ -9,15 +9,9 @@ %h3 =:recent_posts.l = render :partial => 'posts/post', :collection => @posts - + %h6.all= link_to :see_all_recent_posts.l, recent_path .yui-b - -box do - %h3= :explore_site.l :site => AppConfig.community_name - %ul.list.checks - - Category.find(:all).each do |c| - %li= link_to c.name, category_path(c) - %li= link_to :whats_popular.l, popular_url, {:class => 'popular'} - %li= link_to :find_an_expert.l, skills_path, {:class => 'users'} + =render :partial => 'shared/explore' -box :class => "alt" do %h3 app/views/base/site_index.html.haml @@ -6,6 +6,6 @@ %p %em =:every_person_has_something_to_say.l -%p= :need_some_help_contact_our.l+" #{link_to :faq_section.l, faq_url}." + app/views/categories/_tips.html.haml @@ -2,20 +2,17 @@ = event.name = "(#{event.metro_area.to_s})" unless event.metro_area.blank? %p - %strong - %b= :when.l+":" - =h event.time_and_date + %b= :when.l+":" + =h event.time_and_date - unless event.location.blank? %br - %strong - %b= :where.l+":" - =h event.location - = link_to :map_it.l, "http://www.google.com/maps?q=#{URI::encode(event.location)}", :title=>:map_it.l, :target=>'_blank' + %b= :where.l+":" + =h event.location + = link_to :map_it.l, "http://www.google.com/maps?q=#{URI::encode(event.location)}", :title=>:map_it.l, :target=>'_blank' %br - %strong - %b=:rsvps.l+':' - - attending = event.attendees_count == 1 ? :is_attending_this_event.l : :are_attending_this_event.l - = pluralize(event.attendees_count, 'person') + ' ' + attending + %b=:rsvps.l+':' + - attending = event.attendees_count == 1 ? :is_attending_this_event.l : :are_attending_this_event.l + = pluralize(event.attendees_count, 'person') + ' ' + attending - if event.end_time > Time.now - if rsvp = event.rsvped?(current_user) = link_to :retract_rsvp.l, [event, rsvp], :confirm => :are_you_sure.l, :method=>:delete app/views/events/_event.html.haml @@ -7,16 +7,17 @@ = link_to :see_all_events.l, events_path #yui-main - -box :class => "yui-b" do - = render :partial=>'event', :locals=>{:event=>@event, :show_details_link=>false} - = @event.description - - unless @event.attendees.blank? - %p - %b=:attendees.l+':' - - @event.attendees.each do |user| - = link_to h(user.display_name), user_path(user) - - if (count = @event.attendees_for_user(user)) > 1 - = "(+#{count-1})" + .yui-b + -box :class=>'entry-content event-content' do + = render :partial=>'event', :locals=>{:event=>@event, :show_details_link=>false} + = @event.description + - unless @event.attendees.blank? + %p + %b=:attendees.l+':' + - @event.attendees.each do |user| + = link_to h(user.display_name), user_path(user) + - if (count = @event.attendees_for_user(user)) > 1 + = "(+#{count-1})" -box :class => 'hfeed comments', :id => 'comments' do %h3= :event_comments.l %h2= :add_your_comment.l app/views/events/show.html.haml @@ -42,15 +42,13 @@ %li %a{:href=>logout_url, :title=>:log_out_of_your.l + " #{AppConfig.community_name} " + :account.l} =:log_out.l - %li - %a{:href=>about_url, :title=>:what_is.l + " #{AppConfig.community_name}?"} - =:about.l - %li - %a{:href=>faq_url, :title=>:frequent_asked_questions.l} - =:faq.l + + - Page.find(:all).each do |page| + - if (logged_in? || page.page_public) + %li= link_to page.title, pages_path(page) - if @rss_title && @rss_url %li#rss= link_to :rss.l, @rss_url, {:title => @rss_title} %p - = :community_tagline.l \ No newline at end of file + = :community_tagline.l app/views/layouts/application.html.haml @@ -16,3 +16,4 @@ %li= link_to_unless_current :ads.l, ads_path %li= link_to_unless_current :comments.l, admin_comments_path %li= link_to_unless_current :tags.l, admin_tags_path + %li= link_to_unless_current :admin_pages.l, admin_pages_path app/views/shared/_admin_nav.html.haml @@ -13,8 +13,9 @@ %ul %li=link_to :home.l, '/' %li= link_to :users.l, users_path - %li= link_to :about.l, about_path - %li= link_to :faq.l, faq_path + - Page.find(:all).each do |page| + - if (logged_in? || page.page_public) + %li= link_to page.title, pages_path(page) %li=link_to :log_in.l, '/login' app/views/sitemap/index.html.haml @@ -5,10 +5,6 @@ %strong= :tags_are_one_word_descriptors_users_assign_to_blog_posts_pictures_and_clippings_on.l+" #{AppConfig.community_name}." %p %strong= :bigger_font_size_more_popular_tag.l - %p - =:for_more_information_on_tags_check_out_the.l - = link_to :faq.l, faq_url - =:page.l -box :class => "alt" do %h3= :search.l app/views/tags/index.html.haml @@ -47,10 +47,7 @@ -box :class => "alt" do =:tips.l = render :partial => 'shared/bio_help' - =:feel_free_to_embed_images_or_videos.l + "(" - %a{"href"=>"/faq#images_and_flash", "target"=>"new"} - =:how_do_i_do_that.l - ) + =:feel_free_to_embed_images_or_videos.l - if @user.vendor? = render :partial => 'offerings/chooser' app/views/users/edit.html.haml @@ -28,7 +28,12 @@ else end application '', :controller => "base", :action => "site_index" +# Pages +resources :pages, :path_prefix => '/admin', :name_prefix => 'admin_', :except => :show, :member => { :preview => :get } +pages "pages/:id", :controller => 'pages', :action => 'show' + # admin routes + admin_dashboard '/admin/dashboard', :controller => 'homepage_features', :action => 'index' admin_users '/admin/users', :controller => 'admin', :action => 'users' admin_messages '/admin/messages', :controller => 'admin', :action => 'messages' @@ -61,9 +66,7 @@ recent_rss '/recent.rss', :controller => 'posts', :action => 'recent', :format = rss_redirect '/rss', :controller => 'base', :action => 'rss_site_index' rss '/site_index.rss', :controller => 'base', :action => 'site_index', :format => 'rss' -about '/about', :controller => 'base', :action => 'about' advertise '/advertise', :controller => 'base', :action => 'advertise' -faq '/faq', :controller => 'base', :action => 'faq' css_help '/css_help', :controller => 'base', :action => 'css_help' edit_account_from_email '/account/edit', :controller => 'users', :action => 'edit_account' config/desert_routes.rb @@ -3,6 +3,7 @@ #en: about_me: About Me #en: about_site: About {{site}} #en: about_you: About You +#en: admin_pages: Pages #en: accept: Accept #en: accepted: accepted #en: accepted_friendships: Accepted Friendships @@ -47,6 +48,7 @@ #en: is_attending_this_event: is attending this event #en: are_you_sure: Are you sure? #en: are_you_sure_you_want_to_delete_this_photo: "Are you sure you want to delete this photo?" +#en: are_you_sure_you_want_to_delete_this_page: "Are you sure you want to delete this page?" #en: are_you_sure_you_want_to_delete_this_post: "Are you sure you want to delete this post?" #en: are_you_sure_you_want_to_permanently_delete_this_comment: "Are you sure you want to permanently delete this comment?" #en: are_you_sure_you_want_to_permanently_delete_this_user: Are you sure you want to permanently delete this user? @@ -85,6 +87,7 @@ #en: cancel_and_go_back_to_my_contests: cancel and go back to my contests #en: cancel_and_go_back_to_my_photos: cancel and go back to my photos #en: cancel_and_go_back_to_my_posts: cancel and go back to my posts +#en: cancel_and_go_back_to_pages: cancel and go back to pages #en: cannot_rsvp_for_an_event_that_has_already_happened: Cannot RSVP for an event that has already happened. #en: categories: Categories #en: category: Category @@ -151,6 +154,7 @@ #en: delete_this_event: Delete this event #en: delete_this_forum: Delete this forum #en: delete_this_photo: Delete this photo +#en: delete_this_page: Delete this page #en: delete_this_post: Delete this post? #en: delete_this_topic_forever: Delete this topic forever? #en: delete_this_user: Delete this user @@ -173,6 +177,7 @@ #en: edit_contest: Edit Contest #en: edit_event: Edit event #en: edit_forum: Edit forum +#en: edit_page: Edit page #en: edit_post: Edit post #en: edit_profile: Edit profile #en: edit_rsvp_for: Edit RSVP for @@ -314,10 +319,12 @@ #en: look_for_a_message_from: "Look for a message from: {{from}}" #en: looking_for_most_x: Looking for {{link}} #en: make_moderator: Make moderator +#en: make_page_public: Make this page public #en: make_my_profile_public: Make my profile public #en: make_this_my_profile_photo: Make this my profile photo #en: male: Male #en: manage_my: "Manage my:" +#en: manage_pages: Manage Pages #en: manage_posts: Manage Posts #en: map_it: Map It! #en: medium: Medium @@ -361,6 +368,7 @@ #en: new_invitation: New Invitation #en: new_invitation_from: New Invitation from #en: new_metro_area: New Metro Area +#en: new_page: New Page #en: new_photo: New photo. #en: new_photos_multiple_uploader: "New Photos &raquo; Multiple Uploader" #en: new_post: New post @@ -398,7 +406,12 @@ #en: optional_keywords_describing_this_topic_separated_by_commas: optional keywords describing this topic, separated by commas #en: or: or #en: page: page +#en: page_not_found: The page you are trying to view has been moved or no longer exists. +#en: page_was_successfully_created: Page was successfully created. +#en: page_was_successfully_deleted: Page was successfully deleted. +#en: page_was_successfully_updated: Page was successfully updated. #en: pages: "Pages:" +#en: page_tips: "Pages are a good place to put static content that you would rather not post to the blog or the forums." #en: password: Password #en: pending: pending #en: pending_friendships: Pending Friendships @@ -438,7 +451,9 @@ #en: posting_tips: "Posting Tips" #en: post_topic: Post topic #en: posts_photos_and_bookmarks: posts, photos and bookmarks +#en: pages_saved_with_draft_status_wont_appear_on_the_site_until_you_publish_them: Pages saved with 'draft' status won't appear on the site until you publish them. #en: posts_saved_with_draft_status_wont_appear_in_your_blog_until_you_publish_them: Posts saved with 'draft' status won't appear in your blog until you publish them. +#en: public: Public #en: preview: Preview #en: previewing_your_post: Previewing your post #en: previous: previous @@ -493,6 +508,7 @@ #en: save_and_continue_to_step_three: Save, and continue to step three #en: save_changes: Save Changes #en: save_forum: Save Forum +#en: save_page_as: "Save page as:" #en: save_post_as: "Save post as:" #en: save_reply: Save reply #en: says: says @@ -504,6 +520,7 @@ #en: see_all: SEE ALL #en: see_all_activity: See all activity #en: see_all_events: See all events +#en: see_all_recent_posts: See all recent posts #en: see_you_back_here_in_a_short_while: See you back here in a short while. #en: select_images_to_upload: Select Images to Upload #en: send: "Send" @@ -682,7 +699,9 @@ #en: whats_popular: What's Popular #en: when: When #en: where: Where +#en: when_checked_this_page_will_be_visible_to_anyone: "When checked, this page will be visible to anyone." #en: when_checked_your_profile_will_be_visible_to_anyone: "When checked, your profile will be visible to anyone." +#en: when_unchecked_this_page_will_only_be_visible_to_people_who_are_logged_in_to: When unchecked, this page will only be visible to people who are logged in to #en: when_unchecked_your_profile_will_only_be_visible_to_people_who_are_logged_in_to: When unchecked, your profile will only be visible to people who are logged in to #en: when_you_see_an_image_you_like_on_the_web: When you see an image you like on the Web, click the bookmarklet to save it to {{site}} #en: why_sign_up: Why Sign up? @@ -710,7 +729,8 @@ #en: you_last_logged_in_on: You last logged in on #en: you_may_want_to_use_your_company_logo_or_a_photo_of_one_of_your_products_: "You may want to use your company logo, or a photo of one of your products. " #en: you_must_vote_to_see_the_results: You must vote to see the resuts. -#en: your_about_text_goes_here: Your About Text Goes Here +#en: your_about_text_goes_here: Your About text goes here. +#en: your_faq_text_goes_here: Your FAQ text goes here. #en: your_changes_were_saved: Your changes were saved. #en: your_password_has_been_reset_and_emailed_to_you: Your password has been reset and emailed to you. #en: your_post_was_deleted: Your post was deleted. lang/base.yml @@ -23,6 +23,8 @@ en: about_site: "About {{site}}" #en: about_you: About You about_you: About You + #en: admin_pages: Pages + admin_pages: Pages #en: accept: Accept accept: Accept #en: accepted: accepted @@ -110,6 +112,8 @@ en: #en: are_you_sure: Are you sure? are_you_sure: Are you sure? #en: are_you_sure_you_want_to_delete_this_photo: "Are you sure you want to delete this photo?" + #en: are_you_sure_you_want_to_delete_this_page: "Are you sure you want to delete this page?" + are_you_sure_you_want_to_delete_this_page: "Are you sure you want to delete this page?" are_you_sure_you_want_to_delete_this_photo: "Are you sure you want to delete this photo?" #en: are_you_sure_you_want_to_delete_this_post: "Are you sure you want to delete this post?" are_you_sure_you_want_to_delete_this_post: "Are you sure you want to delete this post?" @@ -187,6 +191,8 @@ en: cancel_and_go_back_to_my_photos: cancel and go back to my photos #en: cancel_and_go_back_to_my_posts: cancel and go back to my posts cancel_and_go_back_to_my_posts: cancel and go back to my posts + #en: cancel_and_go_back_to_pages: cancel and go back to pages + cancel_and_go_back_to_pages: cancel and go back to pages #en: cannot_rsvp_for_an_event_that_has_already_happened: Cannot RSVP for an event that has already happened. cannot_rsvp_for_an_event_that_has_already_happened: Cannot RSVP for an event that has already happened. #en: categories: Categories @@ -315,6 +321,8 @@ en: delete_this_forum: Delete this forum #en: delete_this_photo: Delete this photo delete_this_photo: Delete this photo + #en: delete_this_page: Delete this page + delete_this_page: Delete this page #en: delete_this_post: Delete this post? delete_this_post: Delete this post? #en: delete_this_topic_forever: Delete this topic forever? @@ -359,6 +367,8 @@ en: edit_event: Edit event #en: edit_forum: Edit forum edit_forum: Edit forum + #en: edit_page: Edit page + edit_page: Edit page #en: edit_post: Edit post edit_post: Edit post #en: edit_profile: Edit profile @@ -641,6 +651,8 @@ en: looking_for_most_x: "Looking for {{link}}" #en: make_moderator: Make moderator make_moderator: Make moderator + #en: make_page_public: Make this page public + make_page_public: Make this page public #en: make_my_profile_public: Make my profile public make_my_profile_public: Make my profile public #en: make_this_my_profile_photo: Make this my profile photo @@ -649,6 +661,8 @@ en: male: Male #en: manage_my: "Manage my:" manage_my: "Manage my:" + #en: manage_pages: Manage Pages + manage_pages: Manage Pages #en: manage_posts: Manage Posts manage_posts: Manage Posts #en: medium: Medium @@ -735,6 +749,8 @@ en: new_invitation_from: New Invitation from #en: new_metro_area: New Metro Area new_metro_area: New Metro Area + #en: new_page: New Page + new_page: New Page #en: new_photo: New photo. new_photo: New photo. #en: new_photos_multiple_uploader: "New Photos &raquo; Multiple Uploader" @@ -809,8 +825,18 @@ en: or: or #en: page: page page: page + #en: page_not_found: The page you are trying to view has been moved or no longer exists. + page_not_found: The page you are trying to view has been moved or no longer exists. + #en: page_was_successfully_created: Page was successfully created. + page_was_successfully_created: Page was successfully created. + #en: page_was_successfully_deleted: Page was successfully deleted. + page_was_successfully_deleted: Page was successfully deleted. + #en: page_was_successfully_updated: Page was successfully updated. + page_was_successfully_updated: Page was successfully updated. #en: pages: "Pages:" pages: "Pages:" + #en: page_tips: "Pages are a good place to put static content that you would rather not post to the blog or the forums." + page_tips: "Pages are a good place to put static content that you would rather not post to the blog or the forums." #en: password: Password password: Password #en: pending: pending @@ -889,8 +915,12 @@ en: post_topic: Post topic #en: posts_photos_and_bookmarks: posts, photos and bookmarks posts_photos_and_bookmarks: posts, photos and bookmarks + #en: pages_saved_with_draft_status_wont_appear_on_the_site_until_you_publish_them: Pages saved with 'draft' status won't appear on the site until you publish them. + pages_saved_with_draft_status_wont_appear_on_the_site_until_you_publish_them: Pages saved with 'draft' status won't appear on the site until you publish them. #en: posts_saved_with_draft_status_wont_appear_in_your_blog_until_you_publish_them: "Posts saved with 'draft' status won't appear in your blog until you publish them." posts_saved_with_draft_status_wont_appear_in_your_blog_until_you_publish_them: "Posts saved with 'draft' status won't appear in your blog until you publish them." + #en: public: Public + public: Public #en: preview: Preview preview: Preview #en: previewing_your_post: Previewing your post @@ -1003,6 +1033,8 @@ en: save_changes: Save Changes #en: save_forum: Save Forum save_forum: Save Forum + #en: save_page_as: "Save page as:" + save_page_as: "Save page as:" #en: save_post_as: "Save post as:" save_post_as: "Save post as:" #en: save_reply: Save reply @@ -1025,6 +1057,8 @@ en: see_all_activity: See all activity #en: see_all_events: See all events see_all_events: See all events + #en: see_all_recent_posts: See all recent posts + see_all_recent_posts: See all recent posts #en: see_you_back_here_in_a_short_while: See you back here in a short while. see_you_back_here_in_a_short_while: See you back here in a short while. #en: select_images_to_upload: Select Images to Upload @@ -1347,8 +1381,13 @@ en: when: When #en: where: Where where: Where + #en: when_checked_this_page_will_be_visible_to_anyone: "When checked, this page will be visible to anyone." + when_checked_this_page_will_be_visible_to_anyone: "When checked, this page will be visible to anyone." #en: when_checked_your_profile_will_be_visible_to_anyone: "When checked, your profile will be visible to anyone." when_checked_your_profile_will_be_visible_to_anyone: "When checked, your profile will be visible to anyone." + #en: when_unchecked_this_page_will_only_be_visible_to_people_who_are_logged_in_to: When unchecked, this page will only be visible to people who are logged in to + when_unchecked_this_page_will_only_be_visible_to_people_who_are_logged_in_to: When unchecked, this page will only be visible to people who are logged in to + #en: when_unchecked_your_profile_will_only_be_visible_to_people_who_are_logged_in_to: When unchecked, your profile will only be visible to people who are logged in to when_unchecked_your_profile_will_only_be_visible_to_people_who_are_logged_in_to: "When unchecked, your profile will only be visible to people who are logged in to" #en: when_you_see_an_image_you_like_on_the_web: When you see an image you like on the Web, click the bookmarklet to save it to {{site}} @@ -1403,8 +1442,10 @@ en: you_may_want_to_use_your_company_logo_or_a_photo_of_one_of_your_products_: "You may want to use your company logo, or a photo of one of your products. " #en: you_must_vote_to_see_the_results: You must vote to see the resuts. you_must_vote_to_see_the_results: You must vote to see the resuts. - #en: your_about_text_goes_here: Your About Text Goes Here - your_about_text_goes_here: Your About Text Goes Here + #en: your_about_text_goes_here: Your About text goes here. + your_about_text_goes_here: Your About text goes here. + #en: your_faq_text_goes_here: Your FAQ text goes here. + your_faq_text_goes_here: Your FAQ text goes here. #en: your_changes_were_saved: Your changes were saved. your_changes_were_saved: Your changes were saved. #en: your_password_has_been_reset_and_emailed_to_you: Your password has been reset and emailed to you. lang/ui/en-US.yml @@ -302,6 +302,9 @@ margin-left: 10.4769em; /* about 140px */ *margin-left: 10.5em; /* for IE */ } +.page-content, .event-content{ +margin-left: 0px; /* Use formatting for blog post except for left margin */ +} .hentry .vcard h5{ float: left; public/stylesheets/screen.css @@ -36,10 +36,4 @@ class BaseControllerTest < ActionController::TestCase assert @controller.get_additional_homepage_data end - def test_should_get_about - get :about - assert_response :success - - end - end test/functional/base_controller_test.rb app/views/base/_about_nav.html.haml app/views/base/about.html.haml app/views/base/faq.html.haml 572b0334ee2a5a313286114bc4fb2b3ebfafdc5e 2b1d2c5c6dc06c8595ce872df83a56fff7609f7a bborn bruno.bornsztein@gmail.com http://github.com/bborn/communityengine/commit/6ebad9fd5cdb880e93488e304d538772c30fc0f4 6ebad9fd5cdb880e93488e304d538772c30fc0f4 2009-09-02T18:07:19-07:00 2009-09-02T18:07:19-07:00 Merge branch 'TRY-pages' of git://github.com/eksatx/communityengine into eksatx/TRY-pages/master Conflicts: lang/ui/en-US.yml 2cc66f97f92a7b0df582d3227adce018a5deccb0 bborn bruno.bornsztein@gmail.com