Permalink
Browse files

Merge branch 'master' of github.com:bborn/communityengine

  • Loading branch information...
2 parents e5583f9 + 067ea82 commit 7822e1b19d7a9b43af95824996b7ddd2916ba7a8 @bborn committed Feb 26, 2014
View
@@ -43,7 +43,7 @@ Optional Configuration
To override the default configuration, create an `application_config.rb` file in `Rails.root/config`
-The application configuration defined in this file overrides the one defined in the [CommunityEngine gem](https://github.com/bborn/communityengine/blob/rails3/config/application_config.rb)
+The application configuration defined in this file overrides the one defined in the [CommunityEngine gem](https://github.com/bborn/communityengine/blob/master/config/application_config.rb)
This is where you can change commonly used configuration variables, like `configatron.community_name`, etc.
@@ -32,7 +32,7 @@
- @users.each do |user|
%tr{:id => "user_#{user.id}"}
%td
- = link_to_remote(image_tag('icons/delete.png'), {:url => user_path(user), :method => :delete, :success => visual_effect(:fade, "user_#{user.id}"), :confirm => "Are you sure you want to permanently delete this user"} )
+ = link_to_remote(image_tag('icons/delete.png'), {:url => user_path(user), :method => :delete, :success => visual_effect(:fade, "user_#{user.id}"), :confirm => "Are you sure you want to permanently delete this user?"} )
%td
-if !configatron.akismet_key.nil?
= link_to_remote(image_tag('icons/bad-flag.png'), {:url => user_path(user, :spam => true), :method => :delete, 500 => 'alert(\'Sorry, there was a server error\'); return false', :success => visual_effect(:fade, "user_#{user.id}"), :confirm => "Are you sure you want to permanently delete this user and mark it as spam!?"} )
@@ -41,14 +41,16 @@
%td
-if user.avatar
= image_tag user.avatar.photo.url(:thumb), :width => 25, :height => 25
- = link_to h(user.login), user_path(user)
+ = link_to_if user.active?, h(user.login), user_path(user)
%td
= h user.email
%td
= user.active? ? :active.l : :inactive.l
%td
- = link_to( :assume_id.l , assume_user_path(user), :method => :post )
- = " | #{link_to(:activate.l, :controller => "/admin", :action => "activate_user", :id => user.id)}".html_safe unless user.active?
+ -if user.active?
+ = link_to(:assume_id.l , assume_user_path(user), :method => :post)
+ -else
+ = link_to(:activate.l, :controller => "/admin", :action => "activate_user", :id => user.id)
%tfoot
%tr
@@ -1,5 +1,5 @@
-
--box :class => 'alt' do
+
+-box :class => 'alt first_alt' do
%h3= :metro_areas.l
- city_cloud @metro_areas_for_cloud, %w(nube1 nube2 nube3 nube4 nube5) do |city, css_class|
= link_to city.name, users_path(:metro_area_id => city.id), :class => css_class
@@ -3,10 +3,10 @@
%h3
=:why_sign_up.l
%ul.list.checks
- %li
- = :sign_up_reason_1.l
- %li
- = :sign_up_reason_2.l
+ %li
+ = :sign_up_reason_1.l
+ %li
+ = :sign_up_reason_2.l
-box :class => 'alt' do
%h3=:tips.l
View
@@ -1117,8 +1117,8 @@ en:
required: required
#en: required_we_will_send_a_confirmation_e_mail_to_the_address_you_enter: "(Required: We will send a confirmation e-mail to the address you enter.)"
required_we_will_send_a_confirmation_e_mail_to_the_address_you_enter: "(Required: We will send a confirmation e-mail to the address you enter.)"
- #en: required_you_must_be_at_least_years_old_to_sign_up: "(Required: you must be at least %{min_age} years old to sign up.)"
- required_you_must_be_at_least_years_old_to_sign_up: "(Required: you must be at least %{min_age} years old to sign up.)"
+ #en: required_you_must_be_at_least_years_old_to_sign_up: "(Required: You must be at least %{min_age} years old to sign up.)"
+ required_you_must_be_at_least_years_old_to_sign_up: "(Required: You must be at least %{min_age} years old to sign up.)"
#en: required_your_username_must_not_contain_numerals_spaces_or_special_characters: "(Required: Your username must not contain spaces or special characters.)"
required_your_username_must_not_contain_numerals_spaces_or_special_characters: "(Required: Your username must not contain spaces or special characters.)"
#en: resend_my_activation_e_mail: Resend my activation e-mail
@@ -1293,8 +1293,8 @@ en:
tags_are_keywords_you_use_to_organize_your_clippings_separate_multiple_tags_with_commas: Tags are keywords you use to organize your clippings. Separate multiple tags with commas.
#en: tags_are_keywords_you_use_to_organize_your_photos: Tags are keywords you use to organize your photos. Separate multiple tags with commas.
tags_are_keywords_you_use_to_organize_your_photos: Tags are keywords you use to organize your photos. Separate multiple tags with commas.
- #en: tags_are_one_word_descriptors_users_assign_to_blog_posts_pictures_and_clippings_on: Tags are one-word descriptors user assign to blog posts, pictures and clippings on
- tags_are_one_word_descriptors_users_assign_to_blog_posts_pictures_and_clippings_on: Tags are one-word descriptors user assign to blog posts, pictures and clippings on
+ #en: tags_are_one_word_descriptors_users_assign_to_blog_posts_pictures_and_clippings_on: Tags are one-word descriptors users assign to blog posts, pictures and clippings on
+ tags_are_one_word_descriptors_users_assign_to_blog_posts_pictures_and_clippings_on: Tags are one-word descriptors users assign to blog posts, pictures and clippings on
#en: tagged: tagged
tagged: tagged
#en: tags_page: tags page

0 comments on commit 7822e1b

Please sign in to comment.